diff options
| author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-25 10:45:46 +0000 |
|---|---|---|
| committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-25 10:45:46 +0000 |
| commit | da78b75b8dd4e807d4f29276c4e8c5c97908e7ff (patch) | |
| tree | 4fd3710c8fc3563e6c619ef2d90c2b26400b84c1 | |
| parent | ad8eb1a32fde339d580994811ae7cfeb346076cf (diff) | |
Merge r998521 Reorganize directory structure to make import into Eclipse work
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027038 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | sca-java-1.x/trunk/tutorials/store/store-test/pom.xml | 25 | ||||
| -rw-r--r-- | sca-java-1.x/trunk/tutorials/store/store-test/src/main/resources/META-INF/sca-contribution.xml (renamed from sca-java-1.x/trunk/tutorials/store/store-test/META-INF/sca-contribution.xml) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/trunk/tutorials/store/store-test/src/test/java/client/Shopper.java (renamed from sca-java-1.x/trunk/tutorials/store/store-test/client/Shopper.java) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/trunk/tutorials/store/store-test/src/test/java/test/StoreSupplierTestCase.java (renamed from sca-java-1.x/trunk/tutorials/store/store-test/test/StoreSupplierTestCase.java) | 0 |
4 files changed, 8 insertions, 17 deletions
diff --git a/sca-java-1.x/trunk/tutorials/store/store-test/pom.xml b/sca-java-1.x/trunk/tutorials/store/store-test/pom.xml index 57398bc876..f533a0cd04 100644 --- a/sca-java-1.x/trunk/tutorials/store/store-test/pom.xml +++ b/sca-java-1.x/trunk/tutorials/store/store-test/pom.xml @@ -182,22 +182,13 @@ </dependencies> <build> - <finalName>${artifactId}</finalName> - <sourceDirectory>${basedir}/client</sourceDirectory> - <testSourceDirectory>${basedir}</testSourceDirectory> - <resources> - <resource> - <directory>${basedir}</directory> - <excludes> - <exclude>**/.*/**</exclude> - <exclude>**/*.java</exclude> - <exclude>pom.xml</exclude> - <exclude>build.xml</exclude> - <exclude>target/**</exclude> - </excludes> - </resource> - </resources> - <plugins> + <finalName>${artifactId}</finalName> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + <plugins> <plugin> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-maven-ant-generator</artifactId> @@ -213,7 +204,7 @@ </execution> </executions> </plugin> - </plugins> + </plugins> </build> </project> diff --git a/sca-java-1.x/trunk/tutorials/store/store-test/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/tutorials/store/store-test/src/main/resources/META-INF/sca-contribution.xml index a75087aca1..a75087aca1 100644 --- a/sca-java-1.x/trunk/tutorials/store/store-test/META-INF/sca-contribution.xml +++ b/sca-java-1.x/trunk/tutorials/store/store-test/src/main/resources/META-INF/sca-contribution.xml diff --git a/sca-java-1.x/trunk/tutorials/store/store-test/client/Shopper.java b/sca-java-1.x/trunk/tutorials/store/store-test/src/test/java/client/Shopper.java index f8643d4c52..f8643d4c52 100644 --- a/sca-java-1.x/trunk/tutorials/store/store-test/client/Shopper.java +++ b/sca-java-1.x/trunk/tutorials/store/store-test/src/test/java/client/Shopper.java diff --git a/sca-java-1.x/trunk/tutorials/store/store-test/test/StoreSupplierTestCase.java b/sca-java-1.x/trunk/tutorials/store/store-test/src/test/java/test/StoreSupplierTestCase.java index 9cea47fbc8..9cea47fbc8 100644 --- a/sca-java-1.x/trunk/tutorials/store/store-test/test/StoreSupplierTestCase.java +++ b/sca-java-1.x/trunk/tutorials/store/store-test/src/test/java/test/StoreSupplierTestCase.java |