• R/O
  • SSH
  • HTTPS

masme: 提交


Commit MetaInfo

修訂40 (tree)
時間2011-03-14 22:14:35
作者kenjift

Log Message

version up spring to 3. 0.5

Change Summary

差異

--- trunk/struts-web/pom.xml (revision 39)
+++ trunk/struts-web/pom.xml (revision 40)
@@ -61,8 +61,8 @@
6161 </dependency>
6262 <dependency>
6363 <groupId>org.springframework</groupId>
64- <artifactId>spring-webmvc-struts</artifactId>
65- <version>2.5.1</version>
64+ <artifactId>spring-struts</artifactId>
65+ <version>${spring.version}</version>
6666 </dependency>
6767 <!-- masme -->
6868 <dependency>
--- trunk/struts/pom.xml (revision 39)
+++ trunk/struts/pom.xml (revision 40)
@@ -43,8 +43,8 @@
4343 </dependency>
4444 <dependency>
4545 <groupId>org.springframework</groupId>
46- <artifactId>spring-webmvc-struts</artifactId>
47- <version>2.5.1</version>
46+ <artifactId>spring-struts</artifactId>
47+ <version>${spring.version}</version>
4848 </dependency>
4949 <!-- masme -->
5050 <dependency>
--- trunk/core/src/test/java/jp/sourceforge/masme/dao/MaintenanceTargetDaoTest.java (revision 39)
+++ trunk/core/src/test/java/jp/sourceforge/masme/dao/MaintenanceTargetDaoTest.java (revision 40)
@@ -8,29 +8,20 @@
88 import jp.sourceforge.masme.test.entity.CustomerWork;
99
1010 import org.hibernate.SessionFactory;
11-import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
11+import org.springframework.beans.factory.annotation.Autowired;
12+import org.springframework.test.context.ContextConfiguration;
13+import org.springframework.test.context.junit38.AbstractTransactionalJUnit38SpringContextTests;
1214
13-public class MaintenanceTargetDaoTest extends
14- AbstractTransactionalDataSourceSpringContextTests {
15+@ContextConfiguration(locations={"/jp/sourceforge/masme/dao/MaintenanceTargetDaoTest.xml"})
16+public class MaintenanceTargetDaoTest extends AbstractTransactionalJUnit38SpringContextTests {
1517
18+ @Autowired
1619 private MaintenanceTargetDaoImpl dao;
1720 private Class targetClass = CustomerWork.class;
21+ @Autowired
1822 private SessionFactory sessionFactory;
1923
20- @Override
21- protected String getConfigPath() {
22- return "/jp/sourceforge/masme/dao/MaintenanceTargetDaoTest.xml";
23- }
2424
25- public void setSessionFactory(SessionFactory sessionFactory) {
26- this.sessionFactory = sessionFactory;
27- }
28-
29- @Override
30- protected void onSetUpInTransaction() throws Exception {
31- super.onSetUpInTransaction();
32- }
33-
3425 public void testLoadAll() {
3526 CompanyWork c = createCompanyWork("1", "toyota");
3627 dao.save(c);
@@ -50,10 +41,6 @@
5041 dao.loadEditAll(targetClass);
5142 }
5243
53- public void setMaintenanceTargetDaoImpl(MaintenanceTargetDaoImpl dao) {
54- this.dao = dao;
55- }
56-
5744 public static CustomerWork createCustomerWork(String id, String name,
5845 CompanyWork companyWork) {
5946 CustomerWork work = new CustomerWork();
--- trunk/pom.xml (revision 39)
+++ trunk/pom.xml (revision 40)
@@ -22,6 +22,8 @@
2222 <compile.source>1.5</compile.source>
2323 <compile.target>1.5</compile.target>
2424 <masme.version>0.3</masme.version>
25+ <spring.version>3.0.5.RELEASE</spring.version>
26+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2527 </properties>
2628
2729 <repositories>
@@ -177,13 +179,23 @@
177179 <!-- spring -->
178180 <dependency>
179181 <groupId>org.springframework</groupId>
180- <artifactId>spring</artifactId>
181- <version>2.5.1</version>
182+ <artifactId>spring-core</artifactId>
183+ <version>${spring.version}</version>
182184 </dependency>
183185 <dependency>
184186 <groupId>org.springframework</groupId>
187+ <artifactId>spring-context</artifactId>
188+ <version>${spring.version}</version>
189+ </dependency>
190+ <dependency>
191+ <groupId>org.springframework</groupId>
192+ <artifactId>spring-orm</artifactId>
193+ <version>${spring.version}</version>
194+ </dependency>
195+ <dependency>
196+ <groupId>org.springframework</groupId>
185197 <artifactId>spring-test</artifactId>
186- <version>2.5.1</version>
198+ <version>${spring.version}</version>
187199 <scope>test</scope>
188200 </dependency>
189201
Show on old repository browser