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/26 12:28:52 UTC

svn commit: r1027449 - in /tuscany/sca-java-1.x/trunk/tutorials/store/store-eu: ./ build.xml pom.xml

Author: nash
Date: Tue Oct 26 10:28:52 2010
New Revision: 1027449

URL: http://svn.apache.org/viewvc?rev=1027449&view=rev
Log:
Merge r1002075 Use hand-built build.xml file containing code to create the sample database

Added:
    tuscany/sca-java-1.x/trunk/tutorials/store/store-eu/build.xml
      - copied unchanged from r1002075, tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-eu/build.xml
Modified:
    tuscany/sca-java-1.x/trunk/tutorials/store/store-eu/   (props changed)
    tuscany/sca-java-1.x/trunk/tutorials/store/store-eu/pom.xml

Propchange: tuscany/sca-java-1.x/trunk/tutorials/store/store-eu/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Oct 26 10:28:52 2010
@@ -1,17 +1,19 @@
 target
+work
+dojo
 *.iws
 *.ipr
 *.iml
-.project
-.classpath
+derby.log
 maven.log
+maven-eclipse.xml
+build-dependency.xml
 velocity.log*
 junit*.properties
 surefire*.properties
+.project
+.classpath
 .settings
 .deployables
 .wtpmodules
-build.xml
-work
-derby.log
-
+.externalToolBuilders

Modified: tuscany/sca-java-1.x/trunk/tutorials/store/store-eu/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/store/store-eu/pom.xml?rev=1027449&r1=1027448&r2=1027449&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/store/store-eu/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/store/store-eu/pom.xml Tue Oct 26 10:28:52 2010
@@ -35,14 +35,6 @@
        </repository>
     </repositories>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.7-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-    
     <build>
        <finalName>${artifactId}</finalName>
        <sourceDirectory>${basedir}</sourceDirectory>
@@ -53,28 +45,12 @@
                   <exclude>**/*.java</exclude>
                   <exclude>**/.*/**</exclude>
                   <exclude>pom.xml</exclude>
-                  <exclude>build.xml</exclude>
+                  <exclude>build*.xml</exclude>
                   <exclude>target/**</exclude>
               </excludes>
           </resource>
        </resources>
        <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.7-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <pathToRootDir>../../..</pathToRootDir>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
 	        <plugin>
 	             <groupId>org.codehaus.mojo</groupId>
 	             <artifactId>sql-maven-plugin</artifactId>