diff --git a/dependency-injection/build.gradle b/dependency-injection/build.gradle deleted file mode 100644 index 968636154d..0000000000 --- a/dependency-injection/build.gradle +++ /dev/null @@ -1,43 +0,0 @@ -apply plugin: 'java' -apply plugin: 'eclipse' - -allprojects { - apply plugin: 'java' - sourceCompatibility = 1.6 - targetCompatibility = 1.6 -} - -repositories { - mavenCentral() -} - -sourceSets { - main { - resources.srcDirs = ["src/main/java","src/main/resources"] - } - test { - resources.srcDirs = ["src/main/java", "src/main/resources", "src/test/resources"] - } -} - -configurations { - compile -} - -test { - testLogging { - events 'started', 'passed' - } -} - -dependencies { - testCompile('junit:junit:4.11') - testCompile('org.mockito:mockito-all:1.10.19') - testCompile group: 'org.springframework', name: 'spring-test', version: '4.2.6.RELEASE' - testCompile group: 'org.springframework', name: 'spring-core', version: '4.2.6.RELEASE' - testCompile group: 'org.springframework', name: 'spring-beans', version: '4.2.6.RELEASE' - testCompile group: 'org.springframework', name: 'spring-context', version: '4.2.6.RELEASE' - testCompile group: 'javax.inject', name: 'javax.inject', version: '1' - - testRuntime('junit:junit:4.11') -} diff --git a/dependency-injection/docs/inject-qualifier-demo-classdiagram.png b/dependency-injection/docs/inject-qualifier-demo-classdiagram.png deleted file mode 100644 index 7366999ec1..0000000000 Binary files a/dependency-injection/docs/inject-qualifier-demo-classdiagram.png and /dev/null differ diff --git a/dependency-injection/docs/inject-qualifier-demo-classdiagram.xml b/dependency-injection/docs/inject-qualifier-demo-classdiagram.xml deleted file mode 100644 index 704801bdf2..0000000000 --- a/dependency-injection/docs/inject-qualifier-demo-classdiagram.xml +++ /dev/null @@ -1 +0,0 @@ -7VptbyI3EP41SO2Hi1iWl+RjAuSuUpqml6jX+xQZ1uz6zrumXhPC/fqb8Y7ZV0IaXqpGICTWw3hsz/N4Zmxo+cP4+aNm8+h3FXDZ6rSD55Y/anU6XrvvwwdKVpmk3yZBqEVASrngXvzgridJFyLgaUnRKCWNmJeFU5UkfGpKMqa1WpbVZkqWR52z0I2YC+6nTNalX0Rgokx63unn8k9chJEb2etfZN9M2PR7qNUiofFaHX9mX9nXMXO2aKFpxAK1LIj8MfhVKwWW8Sl+HnKJvnVuy/pdb/h2PW/NE5rblg5uHmbl1s4DcAU1lTaRClXC5DiXXtn1cbTQhlZkYgmPHjzCoHr1N8lt4ys2znq2GVwiMmh1zpOHSCSZ9FrAjLIu37gxK2IDWxgFonwGN0rNaZz6KmnhqVroKa0D2pY3TIectAaZCFdY6Eae+chVzGHKoKC5ZEY8lcnAiFPhWi/3KzyQa5vdTHN5YnJBRq8Fl8GfCybFTHD9W/INaDzisarBkS5FLFmCfi94eqYS40DCNtgJwZ+jKXiEaxA8cW0EEPqSvjDovKtpJGRww1ZqgR5JDbDVta4ipcUPMMvcGPC1NoQGML+ocY89CTTNU9C5c2Bgz0x0w1IUoM5UScnmqZisJxwDLCK5UsaomJTcSpEQQyUVLAMc4PbPC6jjWrmLPc2IUhwaEAOW+abuuq0YFTd0h+LVLqCTiQLoH1qdPosRiGSS4ge0Jfo+nbMEnkN8Bj7IYMRhjwQ8ma5gQZkODFdUa/mXYPxST4TRTK/yDk4/EE9O9y3jwtQ3j1u29sIkoHNhHjVyA2yWejmxU6PVd+7gT5Ql/qzACBI5wks+QwvNdId5T0US3lidUTeXfCaoUbSMhOH3IMc5LSGfYdQBezNpg1UkAliRjXqGGZYxGOk6VyIxlh69K3gDi4YY6XqwriG0ATfXhjeqazNUCayPQT/oxmF7LDlukQZmu4Dxama71LSN2d3u7sQmEwVi14CVohqxMmBdNrUx7F+jGgMWNgMRjA82I3yw5ktQ+3WoUVSFULIJl3cqFUYotK8z3Qq0R0BvQEhtQ+98d/B6DeA1xoMQEmByCVl4KTTPU9UfiU1djw+fxrePo/Hd+HY0vh1+9R7/AoVgU9BosP/Lry9GtieVWyuFkD1MtvOmyQJjqhPb0PMU9Y4U9Qa0IbZGvT2kc48i7P+rVObPwthhzroX1MSBvLP2gJp3XAtwBlaN1vKrimuKIsXi2iP09lddU9c7pByoOEacE8Au8/nUdiayeVKvHF9wKcPhnRoxeeM4nXZlnHY21fVRaot+t505KadXNoOcbGufvIp/RL9C4G6su07HhwMcH+jbfq8MsTs9F8KP128IPxcVhr4l/NDJpXyaaNsKJstL90ZDjD8lm9cmG7efdimxG9F2erugTXntVGLvDb0eeXAbensosekusFpiwxVmtkehmDzt2GNg7vA9xo71qCTad3l4NvBwX61LRKjc/HMnqNZuhcpxIhXm2EPesHruar5QBRL3j3/F6iZTrI8SZSKuT2XSscskVxfRNvT79cy5rpZL165OuBMR6pftp0ppp7i73lq7lEqNgO8l8Nbv2U+10o74NRRLjfjtoVjymm6TT9XSf7FrG8qlw+3a+nn2M/9nAbe39kpmC8Q29W10JPoKixtMj5XM/RqsaRsjsHtIht3KdZVf31qNJek+MmH9FPlOfVy5l/HPj+jk+mnPlcrvxLveBR1tXkoOh3Gus/F+ndt3t9euciI6HcO59RPTO3Nu/Qq/KcMdyLv1Y8g7827PXWu7qDs4GHehmf8nLvvtJP/joT/+CQ== \ No newline at end of file diff --git a/dependency-injection/pom.xml b/dependency-injection/pom.xml index f87d061a53..8fdc22999f 100644 --- a/dependency-injection/pom.xml +++ b/dependency-injection/pom.xml @@ -9,8 +9,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 0.0.1-SNAPSHOT war - @Resource vs @Inject vs @Autowired - Accompanying the demonstration of the use of the annotations related to injection mechanisms, namely @Resource, @Inject, and @Autowired + Resource vs Inject vs Autowired + Accompanying the demonstration of the use of the annotations related to injection mechanisms, namely Resource, Inject, and Autowired @@ -56,8 +56,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs maven-compiler-plugin - 1.6 - 1.6 + 1.8 + 1.8 diff --git a/dependency-injection/src/test/resources/applicationContextTest-@Autowired-Name.xml b/dependency-injection/src/test/resources/applicationContextTest-@Autowired-Name.xml deleted file mode 100644 index d7fe3abcb3..0000000000 --- a/dependency-injection/src/test/resources/applicationContextTest-@Autowired-Name.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - diff --git a/dependency-injection/src/test/resources/applicationContextTest-@Autowired-Qualifier.xml b/dependency-injection/src/test/resources/applicationContextTest-@Autowired-Qualifier.xml deleted file mode 100644 index d7fe3abcb3..0000000000 --- a/dependency-injection/src/test/resources/applicationContextTest-@Autowired-Qualifier.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - diff --git a/dependency-injection/src/test/resources/applicationContextTest-@Autowired-Type.xml b/dependency-injection/src/test/resources/applicationContextTest-@Autowired-Type.xml deleted file mode 100644 index c65b85ccf4..0000000000 --- a/dependency-injection/src/test/resources/applicationContextTest-@Autowired-Type.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/dependency-injection/src/test/resources/applicationContextTest-@Inject-Name.xml b/dependency-injection/src/test/resources/applicationContextTest-@Inject-Name.xml deleted file mode 100644 index 610e8687a7..0000000000 --- a/dependency-injection/src/test/resources/applicationContextTest-@Inject-Name.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/dependency-injection/src/test/resources/applicationContextTest-@Inject-Qualifier.xml b/dependency-injection/src/test/resources/applicationContextTest-@Inject-Qualifier.xml deleted file mode 100644 index 627ec37914..0000000000 --- a/dependency-injection/src/test/resources/applicationContextTest-@Inject-Qualifier.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - diff --git a/dependency-injection/src/test/resources/applicationContextTest-@Inject-Type.xml b/dependency-injection/src/test/resources/applicationContextTest-@Inject-Type.xml deleted file mode 100644 index 405164e603..0000000000 --- a/dependency-injection/src/test/resources/applicationContextTest-@Inject-Type.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/dependency-injection/src/test/resources/applicationContextTest-@Resource-NameType.xml b/dependency-injection/src/test/resources/applicationContextTest-@Resource-NameType.xml deleted file mode 100644 index 82cbe97157..0000000000 --- a/dependency-injection/src/test/resources/applicationContextTest-@Resource-NameType.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - diff --git a/dependency-injection/src/test/resources/applicationContextTest-@Resource-Qualifier.xml b/dependency-injection/src/test/resources/applicationContextTest-@Resource-Qualifier.xml deleted file mode 100644 index 1680a6f66a..0000000000 --- a/dependency-injection/src/test/resources/applicationContextTest-@Resource-Qualifier.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - -