Skip to content

Commit 25de282

Browse files
committed
up
1 parent 317fe2b commit 25de282

File tree

14 files changed

+357
-286
lines changed

14 files changed

+357
-286
lines changed

springcore-beans/pom.xml

+74-56
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,86 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
44

5-
<groupId>jbr.spring</groupId>
6-
<artifactId>springcore-beans</artifactId>
7-
<version>0.1</version>
8-
<packaging>jar</packaging>
5+
<groupId>jbr.spring</groupId>
6+
<artifactId>springcore-beans</artifactId>
7+
<version>0.1</version>
8+
<packaging>jar</packaging>
99

10-
<name>springcore-beans</name>
11-
<url>http://maven.apache.org</url>
10+
<name>springcore-beans</name>
11+
<url>http://maven.apache.org</url>
1212

13-
<properties>
14-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15-
<spring.version>5.2.3.RELEASE</spring.version>
16-
</properties>
13+
<properties>
14+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15+
<java.version>1.8</java.version>
16+
<junit.version>4.12</junit.version>
17+
<spring.version>5.2.3.RELEASE</spring.version>
18+
</properties>
1719

18-
<dependencies>
19-
<dependency>
20-
<groupId>junit</groupId>
21-
<artifactId>junit</artifactId>
22-
<version>3.8.1</version>
23-
<scope>test</scope>
24-
</dependency>
25-
<!-- Spring Framework -->
26-
<dependency>
27-
<groupId>org.springframework</groupId>
28-
<artifactId>spring-core</artifactId>
29-
<version>${spring.version}</version>
30-
</dependency>
20+
<dependencies>
21+
<!-- Junit -->
22+
<dependency>
23+
<groupId>junit</groupId>
24+
<artifactId>junit</artifactId>
25+
<version>${junit.version}</version>
26+
<scope>test</scope>
27+
</dependency>
3128

32-
<dependency>
33-
<groupId>org.springframework</groupId>
34-
<artifactId>spring-beans</artifactId>
35-
<version>${spring.version}</version>
36-
</dependency>
29+
<!-- Spring Framework -->
30+
<dependency>
31+
<groupId>org.springframework</groupId>
32+
<artifactId>spring-core</artifactId>
33+
<version>${spring.version}</version>
34+
</dependency>
3735

38-
<dependency>
39-
<groupId>org.springframework</groupId>
40-
<artifactId>spring-context</artifactId>
41-
<version>${spring.version}</version>
42-
</dependency>
36+
<dependency>
37+
<groupId>org.springframework</groupId>
38+
<artifactId>spring-beans</artifactId>
39+
<version>${spring.version}</version>
40+
</dependency>
4341

44-
<dependency>
45-
<groupId>org.springframework</groupId>
46-
<artifactId>spring-test</artifactId>
47-
<version>${spring.version}</version>
48-
</dependency>
42+
<dependency>
43+
<groupId>org.springframework</groupId>
44+
<artifactId>spring-context</artifactId>
45+
<version>${spring.version}</version>
46+
</dependency>
4947

50-
<dependency>
51-
<groupId>org.springframework</groupId>
52-
<artifactId>spring-jdbc</artifactId>
53-
<version>${spring.version}</version>
54-
</dependency>
48+
<dependency>
49+
<groupId>org.springframework</groupId>
50+
<artifactId>spring-test</artifactId>
51+
<version>${spring.version}</version>
52+
</dependency>
5553

56-
<dependency>
57-
<groupId>org.springframework</groupId>
58-
<artifactId>spring-webmvc</artifactId>
59-
<version>${spring.version}</version>
60-
</dependency>
54+
<dependency>
55+
<groupId>org.springframework</groupId>
56+
<artifactId>spring-jdbc</artifactId>
57+
<version>${spring.version}</version>
58+
</dependency>
6159

62-
<dependency>
63-
<groupId>org.springframework</groupId>
64-
<artifactId>spring-aop</artifactId>
65-
<version>${spring.version}</version>
66-
</dependency>
67-
</dependencies>
60+
<dependency>
61+
<groupId>org.springframework</groupId>
62+
<artifactId>spring-webmvc</artifactId>
63+
<version>${spring.version}</version>
64+
</dependency>
65+
66+
<dependency>
67+
<groupId>org.springframework</groupId>
68+
<artifactId>spring-aop</artifactId>
69+
<version>${spring.version}</version>
70+
</dependency>
71+
</dependencies>
72+
73+
<build>
74+
<finalName>springcore-beans</finalName>
75+
<plugins>
76+
<plugin>
77+
<groupId>org.apache.maven.plugins</groupId>
78+
<artifactId>maven-compiler-plugin</artifactId>
79+
<configuration>
80+
<source>${java.version}</source>
81+
<target>${java.version}</target>
82+
</configuration>
83+
</plugin>
84+
</plugins>
85+
</build>
6886
</project>

springcore-containers/pom.xml

+73-56
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,86 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
44

5-
<groupId>jbr.spring</groupId>
6-
<artifactId>springcore-containers</artifactId>
7-
<version>0.1</version>
8-
<packaging>jar</packaging>
5+
<groupId>jbr.spring</groupId>
6+
<artifactId>springcore-containers</artifactId>
7+
<version>0.1</version>
8+
<packaging>jar</packaging>
99

10-
<name>springcore-containers</name>
11-
<url>http://maven.apache.org</url>
10+
<name>springcore-containers</name>
11+
<url>http://maven.apache.org</url>
1212

13-
<properties>
14-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15-
<spring.version>5.2.3.RELEASE</spring.version>
16-
</properties>
13+
<properties>
14+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15+
<java.version>1.8</java.version>
16+
<junit.version>4.12</junit.version>
17+
<spring.version>5.2.3.RELEASE</spring.version>
18+
</properties>
1719

18-
<dependencies>
19-
<dependency>
20-
<groupId>junit</groupId>
21-
<artifactId>junit</artifactId>
22-
<version>3.8.1</version>
23-
<scope>test</scope>
24-
</dependency>
20+
<dependencies>
21+
<!-- Junit -->
22+
<dependency>
23+
<groupId>junit</groupId>
24+
<artifactId>junit</artifactId>
25+
<version>${junit.version}</version>
26+
<scope>test</scope>
27+
</dependency>
2528

26-
<!-- Spring Framework -->
27-
<dependency>
28-
<groupId>org.springframework</groupId>
29-
<artifactId>spring-core</artifactId>
30-
<version>${spring.version}</version>
31-
</dependency>
29+
<!-- Spring Framework -->
30+
<dependency>
31+
<groupId>org.springframework</groupId>
32+
<artifactId>spring-core</artifactId>
33+
<version>${spring.version}</version>
34+
</dependency>
3235

33-
<dependency>
34-
<groupId>org.springframework</groupId>
35-
<artifactId>spring-beans</artifactId>
36-
<version>${spring.version}</version>
37-
</dependency>
36+
<dependency>
37+
<groupId>org.springframework</groupId>
38+
<artifactId>spring-beans</artifactId>
39+
<version>${spring.version}</version>
40+
</dependency>
3841

39-
<dependency>
40-
<groupId>org.springframework</groupId>
41-
<artifactId>spring-context</artifactId>
42-
<version>${spring.version}</version>
43-
</dependency>
42+
<dependency>
43+
<groupId>org.springframework</groupId>
44+
<artifactId>spring-context</artifactId>
45+
<version>${spring.version}</version>
46+
</dependency>
4447

45-
<dependency>
46-
<groupId>org.springframework</groupId>
47-
<artifactId>spring-test</artifactId>
48-
<version>${spring.version}</version>
49-
</dependency>
48+
<dependency>
49+
<groupId>org.springframework</groupId>
50+
<artifactId>spring-test</artifactId>
51+
<version>${spring.version}</version>
52+
</dependency>
5053

51-
<dependency>
52-
<groupId>org.springframework</groupId>
53-
<artifactId>spring-jdbc</artifactId>
54-
<version>${spring.version}</version>
55-
</dependency>
54+
<dependency>
55+
<groupId>org.springframework</groupId>
56+
<artifactId>spring-jdbc</artifactId>
57+
<version>${spring.version}</version>
58+
</dependency>
5659

57-
<dependency>
58-
<groupId>org.springframework</groupId>
59-
<artifactId>spring-webmvc</artifactId>
60-
<version>${spring.version}</version>
61-
</dependency>
60+
<dependency>
61+
<groupId>org.springframework</groupId>
62+
<artifactId>spring-webmvc</artifactId>
63+
<version>${spring.version}</version>
64+
</dependency>
6265

63-
<dependency>
64-
<groupId>org.springframework</groupId>
65-
<artifactId>spring-aop</artifactId>
66-
<version>${spring.version}</version>
67-
</dependency>
68-
</dependencies>
66+
<dependency>
67+
<groupId>org.springframework</groupId>
68+
<artifactId>spring-aop</artifactId>
69+
<version>${spring.version}</version>
70+
</dependency>
71+
</dependencies>
72+
73+
<build>
74+
<finalName>springcore-containers</finalName>
75+
<plugins>
76+
<plugin>
77+
<groupId>org.apache.maven.plugins</groupId>
78+
<artifactId>maven-compiler-plugin</artifactId>
79+
<configuration>
80+
<source>${java.version}</source>
81+
<target>${java.version}</target>
82+
</configuration>
83+
</plugin>
84+
</plugins>
85+
</build>
6986
</project>

springcore-containers/src/main/java/jbr/springcontainers/appcontext/ClasspathXml.java renamed to springcore-containers/src/main/java/jbr/spring/appcontext/ClasspathXml.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package jbr.springcontainers.appcontext;
1+
package jbr.spring.appcontext;
22

33
import org.springframework.context.ApplicationContext;
44
import org.springframework.context.support.ClassPathXmlApplicationContext;
55

6-
import jbr.springcontainers.model.Car;
7-
import jbr.springcontainers.model.Person;
6+
import jbr.spring.model.Car;
7+
import jbr.spring.model.Person;
88

99
/**
1010
* An example program for loading beans using Spring

springcore-containers/src/main/java/jbr/springcontainers/appcontext/FileSystemXml.java renamed to springcore-containers/src/main/java/jbr/spring/appcontext/FileSystemXml.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package jbr.springcontainers.appcontext;
1+
package jbr.spring.appcontext;
22

33
import org.springframework.context.ApplicationContext;
44
import org.springframework.context.support.FileSystemXmlApplicationContext;
55

6-
import jbr.springcontainers.model.Person;
6+
import jbr.spring.model.Person;
77

88
/**
99
* An example program for loading beans using Spring FileSystemXmlApplicationContext.
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package jbr.springcontainers.beanfactory;
1+
package jbr.spring.beanfactory;
22

33
import org.springframework.beans.factory.BeanFactory;
44
import org.springframework.beans.factory.xml.XmlBeanFactory;
55
import org.springframework.core.io.ClassPathResource;
66

7-
import jbr.springcontainers.model.Person;
7+
import jbr.spring.model.Person;
88

99
/**
1010
* An example program for loading beans using Spring BeanFactory.

springcore-containers/src/main/java/jbr/springcontainers/model/Car.java renamed to springcore-containers/src/main/java/jbr/spring/model/Car.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package jbr.springcontainers.model;
1+
package jbr.spring.model;
22

33
public class Car {
44

springcore-containers/src/main/java/jbr/springcontainers/model/Person.java renamed to springcore-containers/src/main/java/jbr/spring/model/Person.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package jbr.springcontainers.model;
1+
package jbr.spring.model;
22

33
/**
44
* Person Model Object.

0 commit comments

Comments
 (0)