Merge pull request #201 from justinhrobbins/feature_186

closes #186
justinhrobbins · Dec 27, 2015 · 40cfe7c · 40cfe7c
2 parents b1b83b3 + a2fa03f
commit 40cfe7c
Show file tree

Hide file tree

Showing 32 changed files with 31 additions and 32 deletions.
diff --git a/...main/resources/applicatonContext-akka.xml → ...urces/META-INF/applicatonContext-akka.xml b/...main/resources/applicatonContext-akka.xml → ...urces/META-INF/applicatonContext-akka.xml
diff --git a/...in/resources/applicatonContext-client.xml → ...ces/META-INF/applicatonContext-client.xml b/...in/resources/applicatonContext-client.xml → ...ces/META-INF/applicatonContext-client.xml
diff --git a/...ature_Tests/src/test/java/org/robbins/flashcards/webservices/FlashCardsAppResourceIT.java b/...ature_Tests/src/test/java/org/robbins/flashcards/webservices/FlashCardsAppResourceIT.java
@@ -17,7 +17,7 @@
 
 @Category(IntegrationTest.class)
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations = {"classpath*:applicatonContext-client.xml"})
+@ContextConfiguration(locations = {"classpath*:META-INF/applicatonContext-client.xml"})
 public class FlashCardsAppResourceIT {
 
     @Inject

diff --git a/..._Feature_Tests/src/test/java/org/robbins/flashcards/webservices/FlashCardsResourceIT.java b/..._Feature_Tests/src/test/java/org/robbins/flashcards/webservices/FlashCardsResourceIT.java
@@ -25,7 +25,7 @@
 import static org.junit.Assert.*;
 
 @Category(IntegrationTest.class)
-@ContextConfiguration(locations = {"classpath*:applicatonContext-client.xml"})
+@ContextConfiguration(locations = {"classpath*:META-INF/applicatonContext-client.xml"})
 public class FlashCardsResourceIT extends GenericEntityRestTest<FlashCardDto, Long> {
 
     // this entity will be created in @Before and we'll use it for our JUnit tests and

diff --git a/...hCards_Feature_Tests/src/test/java/org/robbins/flashcards/webservices/TagsResourceIT.java b/...hCards_Feature_Tests/src/test/java/org/robbins/flashcards/webservices/TagsResourceIT.java
@@ -26,7 +26,7 @@
 import static org.junit.Assert.assertTrue;
 
 @Category(IntegrationTest.class)
-@ContextConfiguration(locations = {"classpath*:applicatonContext-client.xml"})
+@ContextConfiguration(locations = {"classpath*:META-INF/applicatonContext-client.xml"})
 public class TagsResourceIT extends GenericEntityRestTest<TagDto, Long> {
 
     final static String TAG_NAME = "Web API Test 'Tag'";

diff --git a/...Cards_Feature_Tests/src/test/java/org/robbins/flashcards/webservices/UsersResourceIT.java b/...Cards_Feature_Tests/src/test/java/org/robbins/flashcards/webservices/UsersResourceIT.java
@@ -18,7 +18,7 @@
 import static org.junit.Assert.assertTrue;
 
 @Category(IntegrationTest.class)
-@ContextConfiguration(locations = {"classpath*:applicatonContext-client.xml"})
+@ContextConfiguration(locations = {"classpath*:META-INF/applicatonContext-client.xml"})
 public class UsersResourceIT extends GenericEntityRestTest<UserDto, Long> {
 
     private static final String OPEN_ID = "Web API Test 'openid'";

diff --git a/FlashCards_Feature_Tests/src/test/java/org/robbins/load/tester/LoadTesterIT.java b/FlashCards_Feature_Tests/src/test/java/org/robbins/load/tester/LoadTesterIT.java
@@ -26,7 +26,7 @@
 import junitparams.Parameters;
 
 @Ignore
-@ContextConfiguration(locations = {"classpath*:applicatonContext-loadtester.xml"})
+@ContextConfiguration(locations = {"classpath*:META-INF/applicatonContext-loadtester.xml"})
 @RunWith(JUnitParamsRunner.class)
 public class LoadTesterIT {
 

diff --git a/...esources/applicatonContext-loadtester.xml → ...META-INF/applicatonContext-loadtester.xml b/...esources/applicatonContext-loadtester.xml → ...META-INF/applicatonContext-loadtester.xml
@@ -3,7 +3,7 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <import resource="classpath:applicatonContext-akka.xml"/>
-    <import resource="classpath:applicatonContext-client.xml"/>
+    <import resource="classpath:META-INF/applicatonContext-akka.xml"/>
+    <import resource="classpath:META-INF/applicatonContext-client.xml"/>
 
 </beans>
diff --git a/...plicationContext-repository-cassandra.xml → ...plicationContext-repository-cassandra.xml b/...plicationContext-repository-cassandra.xml → ...plicationContext-repository-cassandra.xml
@@ -7,6 +7,6 @@
 
     <context:property-placeholder location="classpath:cassandra.properties" />
 
-    <import resource="classpath:applicationContext-repository-cassandraNamespace.xml" />
+    <import resource="classpath:META-INF/applicationContext-repository-cassandraNamespace.xmlspace.xml" />
 
 </beans>
diff --git a/...Context-repository-cassandraNamespace.xml → ...Context-repository-cassandraNamespace.xml b/...Context-repository-cassandraNamespace.xml → ...Context-repository-cassandraNamespace.xml
diff --git a/...st/java/org/robbins/flashcards/cassandra/repository/AbstractCassandraIntegrationTest.java b/...st/java/org/robbins/flashcards/cassandra/repository/AbstractCassandraIntegrationTest.java
@@ -17,7 +17,7 @@
 import javax.inject.Inject;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("classpath:test-applicationContext-repository-cassandra.xml")
+@ContextConfiguration("classpath:META-INF/test-applicationContext-repository-cassandra.xml")
 @TestExecutionListeners({CassandraUnitDependencyInjectionTestExecutionListener.class,
         DependencyInjectionTestExecutionListener.class,
         DirtiesContextTestExecutionListener.class})

diff --git a/...plicationContext-repository-cassandra.xml → ...plicationContext-repository-cassandra.xml b/...plicationContext-repository-cassandra.xml → ...plicationContext-repository-cassandra.xml
@@ -7,6 +7,6 @@
 
     <context:property-placeholder location="classpath:test-cassandra.properties" />
 
-    <import resource="classpath:applicationContext-repository-cassandraNamespace.xml" />
+    <import resource="classpath:META-INF/applicationContext-repository-cassandraNamespace.xml" />
 
 </beans>
diff --git a/.../resources/applicationContext-caching.xml → ...s/META-INF/applicationContext-caching.xml b/.../resources/applicationContext-caching.xml → ...s/META-INF/applicationContext-caching.xml
diff --git a/...sources/applicationContext-repository.xml → ...ETA-INF/applicationContext-repository.xml b/...sources/applicationContext-repository.xml → ...ETA-INF/applicationContext-repository.xml
@@ -4,17 +4,17 @@
     xsi:schemaLocation="http://www.springframework.org/schema/beans
     http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <import resource="classpath:applicationContext-caching.xml" />
+    <import resource="classpath:META-INF/applicationContext-caching.xml" />
 
     <beans profile="spring-data">
-        <import resource="classpath:applicationContext-repository-springdata.xml" />
+        <import resource="classpath:META-INF/applicationContext-repository-springdata.xml" />
     </beans>
 
     <beans profile="jpa">
-        <import resource="classpath:applicationContext-repository-jpa.xml" />
+        <import resource="classpath:META-INF/applicationContext-repository-jpa.xml" />
     </beans>
 
     <beans profile="cassandra">
-        <import resource="classpath:applicationContext-repository-cassandra.xml" />
+        <import resource="classpath:META-INF/applicationContext-repository-cassandra.xml" />
     </beans>
 </beans>
diff --git a/...ces/applicationContext-repository-jpa.xml → ...INF/applicationContext-repository-jpa.xml b/...ces/applicationContext-repository-jpa.xml → ...INF/applicationContext-repository-jpa.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
 
-    <import resource="classpath:applicationContext-repository-jpa-commons.xml" />
+    <import resource="classpath:META-INF/applicationContext-repository-jpa-commons.xml" />
 	<import resource="classpath:infrastructure.xml" />
 
     <context:component-scan base-package="org.robbins.flashcards.jpa.repository" />

diff --git a/...s_Repository_Jpa/src/test/java/org/robbins/flashcards/jpa/repository/TagRepositoryIT.java b/...s_Repository_Jpa/src/test/java/org/robbins/flashcards/jpa/repository/TagRepositoryIT.java
@@ -18,7 +18,7 @@
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 
-@ContextConfiguration("classpath:test-applicationContext-repository-jpa.xml")
+@ContextConfiguration("classpath:META-INF/test-applicationContext-repository-jpa.xml")
 @DatabaseSetup("classpath:test-flashCardsAppRepository.xml")
 @Category(IntegrationTest.class)
 public class TagRepositoryIT extends BaseIntegrationTest {

diff --git a/...est-applicationContext-repository-jpa.xml → ...est-applicationContext-repository-jpa.xml b/...est-applicationContext-repository-jpa.xml → ...est-applicationContext-repository-jpa.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
 
-    <import resource="classpath:applicationContext-repository-jpa-commons.xml" />
+    <import resource="classpath:META-INF/applicationContext-repository-jpa-commons.xml" />
 	<import resource="classpath:test-infrastructure.xml" />
 
     <context:component-scan base-package="org.robbins.flashcards.jpa.repository" />

diff --git a/...icationContext-repository-jpa-commons.xml → ...icationContext-repository-jpa-commons.xml b/...icationContext-repository-jpa-commons.xml → ...icationContext-repository-jpa-commons.xml
@@ -5,7 +5,7 @@
 	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
-    <import resource="classpath:applicatonContext-akka.xml"/>
+    <import resource="classpath:META-INF/applicatonContext-akka.xml"/>
 
 	<bean id="mapper" class="org.dozer.DozerBeanMapper">
 		<property name="mappingFiles">

diff --git a/...mmons/src/test/java/org/robbins/flashcards/repository/facade/impl/DefaultTagFacadeIT.java b/...mmons/src/test/java/org/robbins/flashcards/repository/facade/impl/DefaultTagFacadeIT.java
@@ -19,8 +19,8 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
-@ContextConfiguration({ "classpath:applicationContext-repository-jpa-commons.xml",
-    "classpath:test-applicationContext-repository-jpa-commons.xml" })
+@ContextConfiguration({"classpath:META-INF/applicationContext-repository-jpa-commons.xml",
+    "classpath:META-INF/test-applicationContext-repository-jpa-commons.xml" })
 @DatabaseSetup("classpath:test-flashCardsAppRepository.xml")
 @Profile("spring-data")
 @Category(IntegrationTest.class)

diff --git a/...licationContext-repository-springdata.xml → ...licationContext-repository-springdata.xml b/...licationContext-repository-springdata.xml → ...licationContext-repository-springdata.xml
@@ -7,7 +7,7 @@
                         http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa-1.1.xsd
                         http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
-	<import resource="classpath:applicationContext-repository-jpa-commons.xml" />
+	<import resource="classpath:META-INF/applicationContext-repository-jpa-commons.xml" />
 	<import resource="classpath:infrastructure.xml" />
 
     <context:component-scan base-package="org.robbins.flashcards.springdata.repository" />

diff --git a/...JPA/src/test/java/org/robbins/flashcards/repository/springdata/FlashCardRepositoryIT.java b/...JPA/src/test/java/org/robbins/flashcards/repository/springdata/FlashCardRepositoryIT.java
@@ -19,7 +19,7 @@
 
 import com.github.springtestdbunit.annotation.DatabaseSetup;
 
-@ContextConfiguration("classpath:test-applicationContext-repository-springdata.xml")
+@ContextConfiguration("classpath:META-INF/test-applicationContext-repository-springdata.xml")
 @DatabaseSetup("classpath:test-flashCardsAppRepository.xml")
 @Category(IntegrationTest.class)
 public class FlashCardRepositoryIT extends BaseIntegrationTest {

diff --git a/...gData_JPA/src/test/java/org/robbins/flashcards/repository/springdata/TagRepositoryIT.java b/...gData_JPA/src/test/java/org/robbins/flashcards/repository/springdata/TagRepositoryIT.java
@@ -19,7 +19,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
-@ContextConfiguration("classpath:test-applicationContext-repository-springdata.xml")
+@ContextConfiguration("classpath:META-INF/test-applicationContext-repository-springdata.xml")
 @DatabaseSetup("classpath:test-flashCardsAppRepository.xml")
 @Category(IntegrationTest.class)
 public class TagRepositoryIT extends BaseIntegrationTest {

diff --git a/...Data_JPA/src/test/java/org/robbins/flashcards/repository/springdata/UserRepositoryIT.java b/...Data_JPA/src/test/java/org/robbins/flashcards/repository/springdata/UserRepositoryIT.java
@@ -16,7 +16,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
-@ContextConfiguration("classpath:test-applicationContext-repository-springdata.xml")
+@ContextConfiguration("classpath:META-INF/test-applicationContext-repository-springdata.xml")
 @DatabaseSetup("classpath:test-flashCardsAppRepository.xml")
 @Category(IntegrationTest.class)
 public class UserRepositoryIT extends BaseIntegrationTest {

diff --git a/...licationContext-repository-springdata.xml → ...licationContext-repository-springdata.xml b/...licationContext-repository-springdata.xml → ...licationContext-repository-springdata.xml
@@ -8,7 +8,7 @@
                http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
                http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa-1.1.xsd">
 
-    <import resource="classpath:applicationContext-repository-jpa-commons.xml" />
+    <import resource="classpath:META-INF/applicationContext-repository-jpa-commons.xml" />
     <import resource="classpath:test-infrastructure.xml" />
 
     <bean id="loggedInUser" class="org.robbins.flashcards.dto.UserDto"

diff --git a/.../resources/applicationContext-service.xml → ...s/META-INF/applicationContext-service.xml b/.../resources/applicationContext-service.xml → ...s/META-INF/applicationContext-service.xml
diff --git a/.../main/resources/applicatonContext-aop.xml → ...ources/META-INF/applicatonContext-aop.xml b/.../main/resources/applicatonContext-aop.xml → ...ources/META-INF/applicatonContext-aop.xml
diff --git a/...in/resources/applicationContext-shiro.xml → ...ces/META-INF/applicationContext-shiro.xml b/...in/resources/applicationContext-shiro.xml → ...ces/META-INF/applicationContext-shiro.xml
diff --git a/...pplicationContext-springSecurity-http.xml → ...pplicationContext-springSecurity-http.xml b/...pplicationContext-springSecurity-http.xml → ...pplicationContext-springSecurity-http.xml
diff --git a/...plicationContext-springSecurity-oauth.xml → ...plicationContext-springSecurity-oauth.xml b/...plicationContext-springSecurity-oauth.xml → ...plicationContext-springSecurity-oauth.xml
diff --git a/...ces/applicationContext-springSecurity.xml → ...INF/applicationContext-springSecurity.xml b/...ces/applicationContext-springSecurity.xml → ...INF/applicationContext-springSecurity.xml
@@ -5,11 +5,11 @@
     http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <beans profile="security-http">
-        <import resource="classpath:applicationContext-springSecurity-http.xml" />
+        <import resource="classpath:META-INF/applicationContext-springSecurity-http.xml" />
     </beans>
 
     <beans profile="security-oauth">
-        <import resource="classpath:applicationContext-springSecurity-oauth.xml" />
+        <import resource="classpath:META-INF/applicationContext-springSecurity-oauth.xmloauth.xml" />
     </beans>
 
 </beans>

diff --git a/...ources/applicationContext-webServices.xml → ...TA-INF/applicationContext-webServices.xml b/...ources/applicationContext-webServices.xml → ...TA-INF/applicationContext-webServices.xml
diff --git a/FlashCards_WebServices/src/main/webapp/WEB-INF/web.xml b/FlashCards_WebServices/src/main/webapp/WEB-INF/web.xml
@@ -8,11 +8,10 @@
     <context-param>
         <param-name>contextConfigLocation</param-name>
         <param-value>
-            classpath*:applicationContext-repository.xml
-            classpath*:applicationContext-service.xml
-            classpath*:applicationContext-webServices.xml
-            classpath*:applicationContext-springSecurity.xml
-            <!-- classpath*:applicatonContext-aop.xml -->
+            classpath*:META-INF/applicationContext-repository.xml
+            classpath*:META-INF/applicationContext-service.xml
+            classpath*:META-INF/applicationContext-webServices.xml
+            classpath*:META-INF/applicationContext-springSecurity.xml
         </param-value>
     </context-param>