Author: mszefler
Date: Fri Feb 16 17:50:23 2007
New Revision: 508680
URL: http://svn.apache.org/viewvc?view=rev&rev=508680
Log:
Fix axis build
Modified:
incubator/ode/trunk/axis2-war/build.xml
incubator/ode/trunk/axis2-war/pom.xml
Modified: incubator/ode/trunk/axis2-war/build.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/axis2-war/build.xml?view=diff&rev=508680&r1=508679&r2=508680
==============================================================================
--- incubator/ode/trunk/axis2-war/build.xml (original)
+++ incubator/ode/trunk/axis2-war/build.xml Fri Feb 16 17:50:23 2007
@@ -45,25 +45,6 @@
There's no way to get it as a single dependency,
so grab all the dependencies into the scratch directory
and process the one we need. -->
- <artifact:dependencies filesetId="dependency.derby.hib"
useScope="runtime">
- <dependency groupId="org.apache.ode"
artifactId="ode-dao-hibernate-db-derby"
- version="${maven.project.version}" type="tar"/>
- </artifact:dependencies>
- <artifact:dependencies filesetId="dependency.derby.jpa"
useScope="runtime">
- <dependency groupId="org.apache.ode"
artifactId="ode-jpa-ojpa-derby"
- version="${maven.project.version}" type="tar"/>
- </artifact:dependencies>
-
- <copy todir="${maven.project.build.directory}/scratch" flatten="true">
- <fileSet refid="dependency.derby.jpa"/>
- </copy>
- <untar
src="${maven.project.build.directory}/scratch/ode-jpa-ojpa-derby-${maven.project.version}.tar"
- dest="${maven.project.build.directory}/resources/jpadb"/>
- <copy todir="${maven.project.build.directory}/scratch" flatten="true">
- <fileSet refid="dependency.derby.hib"/>
- </copy>
- <untar
src="${maven.project.build.directory}/scratch/ode-dao-hibernate-db-derby-${maven.project.version}.tar"
- dest="${maven.project.build.directory}/resources/hibdb"/>
<!-- Dirty, mean and ugly but will work for now -->
<copy todir="${maven.project.build.directory}/resources"
Modified: incubator/ode/trunk/axis2-war/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/axis2-war/pom.xml?view=diff&rev=508680&r1=508679&r2=508680
==============================================================================
--- incubator/ode/trunk/axis2-war/pom.xml (original)
+++ incubator/ode/trunk/axis2-war/pom.xml Fri Feb 16 17:50:23 2007
@@ -73,6 +73,51 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+
<artifactId>dependency-maven-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>unpack-jpa</id>
+
<phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.directory}/resources</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+
<groupId>org.apache.ode</groupId>
+
<artifactId>ode-jpa-ojpa-derby</artifactId>
+
<version>${pom.version}</version>
+
<type>tar</type>
+
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>unpack-hib</id>
+
<phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.directory}/resources</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+
<groupId>org.apache.ode</groupId>
+
<artifactId>ode-dao-hibernate-db-derby</artifactId>
+
<version>${pom.version}</version>
+
<type>tar</type>
+
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+
+ </plugin>
+ <plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>6.0.1</version>
