You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/11 01:35:09 UTC
svn commit: r420661 - in
/geronimo/sandbox/svkmerge/m2migration/applications/uddi-db: pom.xml
src/webapp/
Author: jdillon
Date: Mon Jul 10 16:35:08 2006
New Revision: 420661
URL: http://svn.apache.org/viewvc?rev=420661&view=rev
Log:
The uddi-db module is only needed to create the initial derby DB files,
and should not build a webapp... which is done in uddi-server
Removed:
geronimo/sandbox/svkmerge/m2migration/applications/uddi-db/src/webapp/
Modified:
geronimo/sandbox/svkmerge/m2migration/applications/uddi-db/pom.xml
Modified: geronimo/sandbox/svkmerge/m2migration/applications/uddi-db/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/uddi-db/pom.xml?rev=420661&r1=420660&r2=420661&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/uddi-db/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/uddi-db/pom.xml Mon Jul 10 16:35:08 2006
@@ -45,35 +45,10 @@
<url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/applications/uddi-db</url>
</scm>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>juddi</groupId>
- <artifactId>juddi</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Required for JSPC compilation -->
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- </dependency>
- </dependencies>
-
<build>
- <resources>
- <resource>
- <directory>${pom.basedir}/target/resources</directory>
- </resource>
- </resources>
-
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -84,7 +59,7 @@
</goals>
<configuration>
<tasks>
- <property name="derby.system.home" value="${project.build.directory}/resources/META-INF/${pom.artifactId}/var/derby"/>
+ <property name="derby.system.home" value="${project.build.directory}/classes/META-INF/${pom.artifactId}/var/derby"/>
<property name="derby.storage.fileSyncTransactionLog" value="true"/>
<delete dir="${derby.system.home}"/>
@@ -102,7 +77,7 @@
<!--
- NOTE: Due to a rather annonying bug with antrun which does not
+ HACK: Due to a rather annonying bug with antrun which does not
pick up plugin dependencies properly when run from the reactor
we have to go around the broken dependency system and reference
the artifact directly.
@@ -128,21 +103,6 @@
<version>${derbyVersion}</version>
</dependency>
</dependencies>
- </plugin>
-
- <!--
-
- FIXME: For some reason the JspC plugin is causing AntRun to execute twice :-(
-
- -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jspc-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
</plugin>
</plugins>
</build>