You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/04/28 13:18:02 UTC
svn commit: r397863 - in /incubator/servicemix/trunk: etc/project.xml
servicemix-wsn2005/maven.xml servicemix-wsn2005/project.xml
Author: gnodet
Date: Fri Apr 28 04:17:58 2006
New Revision: 397863
URL: http://svn.apache.org/viewcvs?rev=397863&view=rev
Log:
Fix build in M1
Modified:
incubator/servicemix/trunk/etc/project.xml
incubator/servicemix/trunk/servicemix-wsn2005/maven.xml
incubator/servicemix/trunk/servicemix-wsn2005/project.xml
Modified: incubator/servicemix/trunk/etc/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/etc/project.xml?rev=397863&r1=397862&r2=397863&view=diff
==============================================================================
--- incubator/servicemix/trunk/etc/project.xml (original)
+++ incubator/servicemix/trunk/etc/project.xml Fri Apr 28 04:17:58 2006
@@ -290,15 +290,6 @@
<include>**/*</include>
</includes>
</resource>
- <resource>
- <directory>..</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE</include>
- <include>DISCLAIMER</include>
- <include>NOTICE</include>
- </includes>
- </resource>
</resources>
</build>
Modified: incubator/servicemix/trunk/servicemix-wsn2005/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/maven.xml?rev=397863&r1=397862&r2=397863&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/maven.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/maven.xml Fri Apr 28 04:17:58 2006
@@ -24,9 +24,7 @@
xmlns:artifact="artifact">
<preGoal name="java:compile">
- <!--
<attainGoal name="xbean:generate" />
- -->
<attainGoal name="jaxws:compile"/>
</preGoal>
@@ -42,8 +40,8 @@
<classpath refid="test.classpath" />
</taskdef>
<xsdGenerate
- destFile="${basedir}/target/servicemix-wsn2005-${pom.currentVersion}.xsd" namespace="http://servicemix.apache.org/wsn2005/1.0"
- classpathref="test.classpath" srcdir="${basedir}/src/main/java" metaInfDir="${basedir}/target/generated/"/>
+ destFile="${basedir}/target/servicemix-wsn2005-${pom.currentVersion}.xsd" namespace="http://servicemix.apache.org/wsn/1.0"
+ classpathref="test.classpath" srcdir="${basedir}/src/main/java/org/apache/servicemix/wsn/spring" metaInfDir="${basedir}/target/generated/"/>
<copy file="${basedir}/target/servicemix-wsn2005-${pom.currentVersion}.xsd" todir="${basedir}/target/generated/"/>
<copy file="${basedir}/target/servicemix-wsn2005-${pom.currentVersion}.xsd" todir="${basedir}/../xdocs"/>
<copy file="${basedir}/target/servicemix-wsn2005-${pom.currentVersion}.xsd.html" todir="${basedir}/../xdocs"/>
Modified: incubator/servicemix/trunk/servicemix-wsn2005/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/project.xml?rev=397863&r1=397862&r2=397863&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/project.xml Fri Apr 28 04:17:58 2006
@@ -262,4 +262,21 @@
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>target/generated</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
</project>