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:22:05 UTC
svn commit: r1027445 - in
/tuscany/sca-java-1.x/trunk/tutorials/store/store-db: ./ build.xml pom.xml
Author: nash
Date: Tue Oct 26 10:22:05 2010
New Revision: 1027445
URL: http://svn.apache.org/viewvc?rev=1027445&view=rev
Log:
Merge r1002074 Use hand-built build.xml file containing code to create the sample database
Added:
tuscany/sca-java-1.x/trunk/tutorials/store/store-db/build.xml
- copied unchanged from r1002074, tuscany/sca-java-1.x/branches/sca-java-1.6.1/tutorials/store/store-db/build.xml
Modified:
tuscany/sca-java-1.x/trunk/tutorials/store/store-db/ (props changed)
tuscany/sca-java-1.x/trunk/tutorials/store/store-db/pom.xml
Propchange: tuscany/sca-java-1.x/trunk/tutorials/store/store-db/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Oct 26 10:22:05 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-db/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/store/store-db/pom.xml?rev=1027445&r1=1027444&r2=1027445&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/store/store-db/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/store/store-db/pom.xml Tue Oct 26 10:22:05 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,13 @@
<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>
<version>1.3</version>
@@ -108,6 +85,7 @@
</execution>
<!-- Shutdown DB in order to be able to run unit tests -->
+ <!-- commented out because the unit tests don't use this database
<execution>
<id>shutdown-database-sothat-test-can-run</id>
<phase>process-test-resources</phase>
@@ -120,6 +98,7 @@
<skipOnConnectionError>true</skipOnConnectionError>
</configuration>
</execution>
+ -->
</executions>
</plugin>
</plugins>