summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-09-18 18:56:34 +0000
committernash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-09-18 18:56:34 +0000
commitb796454ac3a94879f122cc19ddec5a7ff87fe5ee (patch)
tree855dc1b34f90566d909f652bebf2e88bcf4a4647
parent1272f24f0777b78178fb2e239849e1e2e1b2c693 (diff)
Reorganize directory structure to make import into Eclipse work
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@998521 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/pom.xml25
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/main/resources/META-INF/sca-contribution.xml (renamed from sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/test/java/client/Shopper.java (renamed from sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/client/Shopper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/test/java/test/StoreSupplierTestCase.java (renamed from sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/test/StoreSupplierTestCase.java)0
4 files changed, 8 insertions, 17 deletions
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/pom.xml
index aeacb725a1..0fb04a3f25 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/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/branches/sca-java-1.6.1/tutorials/store/store-test/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/main/resources/META-INF/sca-contribution.xml
index a75087aca1..a75087aca1 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/client/Shopper.java b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/test/java/client/Shopper.java
index f8643d4c52..f8643d4c52 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/client/Shopper.java
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/test/java/client/Shopper.java
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/test/StoreSupplierTestCase.java b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/test/java/test/StoreSupplierTestCase.java
index 9cea47fbc8..9cea47fbc8 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/test/StoreSupplierTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/test/java/test/StoreSupplierTestCase.java