svn commit: r384226 - in /incubator/servicemix/trunk: etc/maven.xml tooling/servicemix-packaging-descriptors/maven.xml

[gn...@apache.org]

Author: gnodet
Date: Wed Mar  8 06:46:50 2006
New Revision: 384226

URL: http://svn.apache.org/viewcvs?rev=384226&view=rev
Log:
Fix build for maven 1.0.2

Modified:
    incubator/servicemix/trunk/etc/maven.xml
    incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/maven.xml

Modified: incubator/servicemix/trunk/etc/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/etc/maven.xml?rev=384226&r1=384225&r2=384226&view=diff
==============================================================================
--- incubator/servicemix/trunk/etc/maven.xml (original)
+++ incubator/servicemix/trunk/etc/maven.xml Wed Mar  8 06:46:50 2006
@@ -36,33 +36,35 @@
   <goal name="nightly" prereqs="rebuild, deploy"/>
   
   <goal name="build">
-    <j:if test="${maven.multiproject.type == 'jar' || maven.multiproject.type == null}">
+    <j:set var="multiprojectType" value="${maven.multiproject.type}"/>
+    <j:if test="${multiprojectType == 'jar' || multiprojectType == null}">
       <attainGoal name="jar:install" />
     </j:if>
-    <j:if test="${maven.multiproject.type == 'jbi'}">
+    <j:if test="${multiprojectType == 'jbi'}">
       <attainGoal name="build-jbi" />
     </j:if>
-    <j:if test="${maven.multiproject.type == 'war'}">
+    <j:if test="${multiprojectType == 'war'}">
       <attainGoal name="war:install" />
     </j:if>
-    <j:if test="${maven.multiproject.type == 'plugin'}">
+    <j:if test="${multiprojectType == 'plugin'}">
       <attainGoal name="plugin:repository-install" />
       <attainGoal name="plugin:install-now" />
     </j:if>
   </goal>
   <goal name="build-jbi" prereqs="jar:install,jbi:install"/>
   <goal name="deploy">
-    <j:if test="${maven.multiproject.type == 'jar'}">
+    <j:set var="multiprojectType" value="${maven.multiproject.type}"/>
+    <j:if test="${multiprojectType == 'jar' || multiprojectType == null}">
       <attainGoal name="jar:deploy" />
     </j:if>
-    <j:if test="${maven.multiproject.type == 'jbi'}">
+    <j:if test="${multiprojectType == 'jbi'}">
       <attainGoal name="jar:deploy" />
       <attainGoal name="jbi:deploy" />
     </j:if>
-    <j:if test="${maven.multiproject.type == 'war'}">
+    <j:if test="${multiprojectType == 'war'}">
       <attainGoal name="war:deploy" />
     </j:if>
-    <j:if test="${maven.multiproject.type == 'plugin'}">
+    <j:if test="${multiprojectType == 'plugin'}">
       <attainGoal name="plugin:repository-deploy" />
     </j:if>
   </goal>

Modified: incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/maven.xml?rev=384226&r1=384225&r2=384226&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/maven.xml (original)
+++ incubator/servicemix/trunk/tooling/servicemix-packaging-descriptors/maven.xml Wed Mar  8 06:46:50 2006
@@ -35,23 +35,45 @@
 
 	<!-- redefined "build" goal from parent pom -->
 	<goal name="generate">
-		<echo message="Compiling the JBI descriptor schema..." />
 		<mkdir dir="${basedir}/target/generated" />
 		<taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask"
 			fork="true">
 			<classpath refid="maven.dependency.classpath" />
 		</taskdef>
+
+		<echo message="Compiling the JBI descriptor schema..." />
+    <java classname="com.sun.tools.xjc.XJCFacade" 
+          fork="true" failOnError="true"
+          classpathref="maven.dependency.classpath">
+      <arg value="-d"/>
+      <arg value="${basedir}/target/generated"/>
+      <arg value="-p"/>
+      <arg value="org.apache.servicemix.descriptors.jbi"/>
+      <arg value="${basedir}/src/main/resources/jbi.xsd"/>
+    </java>
+    <!--
 		<xjc schema="${basedir}/src/main/resources/jbi.xsd"
 			package="org.apache.servicemix.descriptors.jbi"
 			destdir="${basedir}/target/generated" />
+			-->
 
 		<echo
 			message="Compiling the deployment assets descriptor schema..." />
+    <java classname="com.sun.tools.xjc.XJCFacade" 
+          fork="true" failOnError="true"
+          classpathref="maven.dependency.classpath">
+      <arg value="-d"/>
+      <arg value="${basedir}/target/generated"/>
+      <arg value="-p"/>
+      <arg value="org.apache.servicemix.descriptors.assets"/>
+      <arg value="${basedir}/src/main/resources/packaging-assets.xsd"/>
+    </java>
+    <!--
 		<xjc
 			schema="${basedir}/src/main/resources/packaging-assets.xsd"
 			package="org.apache.servicemix.descriptors.packaging.assets"
 			destdir="${basedir}/target/generated" />
-		
+		-->
 	</goal>
 
 </project>