You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/10/25 12:45:47 UTC
svn commit: r1027038 - in
/tuscany/sca-java-1.x/trunk/tutorials/store/store-test: ./ META-INF/
client/ src/ src/main/ src/main/java/ src/main/resources/
src/main/resources/META-INF/ src/test/ src/test/java/ src/test/java/client/
src/test/java/test/ test/
Author: nash
Date: Mon Oct 25 10:45:46 2010
New Revision: 1027038
URL: http://svn.apache.org/viewvc?rev=1027038&view=rev
Log:
Merge r998521 Reorganize directory structure to make import into Eclipse work
Added:
tuscany/sca-java-1.x/trunk/tutorials/store/store-test/src/
- copied from r998521, tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/
tuscany/sca-java-1.x/trunk/tutorials/store/store-test/src/main/
- copied from r998521, tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/main/
tuscany/sca-java-1.x/trunk/tutorials/store/store-test/src/main/java/
- copied from r998521, tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/main/java/
tuscany/sca-java-1.x/trunk/tutorials/store/store-test/src/main/resources/
- copied from r998521, tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/main/resources/
tuscany/sca-java-1.x/trunk/tutorials/store/store-test/src/main/resources/META-INF/
- copied from r998521, tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/main/resources/META-INF/
tuscany/sca-java-1.x/trunk/tutorials/store/store-test/src/main/resources/META-INF/sca-contribution.xml
- copied unchanged from r998521, tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/main/resources/META-INF/sca-contribution.xml
tuscany/sca-java-1.x/trunk/tutorials/store/store-test/src/test/
- copied from r998521, tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/test/
tuscany/sca-java-1.x/trunk/tutorials/store/store-test/src/test/java/
- copied from r998521, tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/test/java/
tuscany/sca-java-1.x/trunk/tutorials/store/store-test/src/test/java/client/
- copied from r998521, tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/test/java/client/
tuscany/sca-java-1.x/trunk/tutorials/store/store-test/src/test/java/client/Shopper.java
- copied unchanged from r998521, tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/test/java/client/Shopper.java
tuscany/sca-java-1.x/trunk/tutorials/store/store-test/src/test/java/test/
- copied from r998521, tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/test/java/test/
tuscany/sca-java-1.x/trunk/tutorials/store/store-test/src/test/java/test/StoreSupplierTestCase.java
- copied unchanged from r998521, tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-test/src/test/java/test/StoreSupplierTestCase.java
Removed:
tuscany/sca-java-1.x/trunk/tutorials/store/store-test/META-INF/
tuscany/sca-java-1.x/trunk/tutorials/store/store-test/client/
tuscany/sca-java-1.x/trunk/tutorials/store/store-test/test/
Modified:
tuscany/sca-java-1.x/trunk/tutorials/store/store-test/pom.xml
Modified: tuscany/sca-java-1.x/trunk/tutorials/store/store-test/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/store/store-test/pom.xml?rev=1027038&r1=1027037&r2=1027038&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/store/store-test/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/store/store-test/pom.xml Mon Oct 25 10:45:46 2010
@@ -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>