servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r383904 - in /incubator/servicemix/trunk: ./ etc/ servicemix-assembly/ servicemix-bpe/ servicemix-components/ servicemix-console/ servicemix-http/ servicemix-jbi/ servicemix-jms/ servicemix-jsr181/ servicemix-lwcontainer/ servicemix-sca/ se...
Date Tue, 07 Mar 2006 15:11:46 GMT
Author: gnodet
Date: Tue Mar  7 07:11:43 2006
New Revision: 383904

URL: http://svn.apache.org/viewcvs?rev=383904&view=rev
Log:
SM-341: integrate eclipse plugins in the build
Put more logic in etc/maven.xml and less in each modules

Added:
    incubator/servicemix/trunk/tooling/maven-eclipse-plugin-plugin/project.properties
Modified:
    incubator/servicemix/trunk/etc/maven.xml
    incubator/servicemix/trunk/maven.xml
    incubator/servicemix/trunk/project.properties
    incubator/servicemix/trunk/servicemix-assembly/maven.xml
    incubator/servicemix/trunk/servicemix-bpe/maven.xml
    incubator/servicemix/trunk/servicemix-bpe/project.properties
    incubator/servicemix/trunk/servicemix-components/maven.xml
    incubator/servicemix/trunk/servicemix-console/maven.xml
    incubator/servicemix/trunk/servicemix-http/maven.xml
    incubator/servicemix/trunk/servicemix-http/project.properties
    incubator/servicemix/trunk/servicemix-jbi/maven.xml
    incubator/servicemix/trunk/servicemix-jms/maven.xml
    incubator/servicemix/trunk/servicemix-jms/project.properties
    incubator/servicemix/trunk/servicemix-jsr181/maven.xml
    incubator/servicemix/trunk/servicemix-jsr181/project.properties
    incubator/servicemix/trunk/servicemix-lwcontainer/maven.xml
    incubator/servicemix/trunk/servicemix-lwcontainer/project.properties
    incubator/servicemix/trunk/servicemix-sca/maven.xml
    incubator/servicemix/trunk/servicemix-sca/project.properties
    incubator/servicemix/trunk/servicemix-soap/maven.xml
    incubator/servicemix/trunk/servicemix-wsn2005/maven.xml
    incubator/servicemix/trunk/servicemix-wsn2005/project.properties
    incubator/servicemix/trunk/tooling/maven-jbi-plugin/maven.xml
    incubator/servicemix/trunk/tooling/maven-jbi-plugin/plugin.properties

Modified: incubator/servicemix/trunk/etc/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/etc/maven.xml?rev=383904&r1=383903&r2=383904&view=diff
==============================================================================
--- incubator/servicemix/trunk/etc/maven.xml (original)
+++ incubator/servicemix/trunk/etc/maven.xml Tue Mar  7 07:11:43 2006
@@ -30,9 +30,42 @@
     <touch file="${maven.repo.local}/servicemix/jars/${pom.artifactId}-${pom.currentVersion}.jar"/>
   </postGoal>
   
-  <goal name="default" prereqs="jar:install"/>
-
-  <goal name="nightly" prereqs="clean, jar:install, jar:deploy"/>
+  <!-- Public goals -->
+  <goal name="default" prereqs="build"/>
+  <goal name="rebuild" prereqs="clean, default"/>
+  <goal name="nightly" prereqs="rebuild, deploy"/>
+  
+  <goal name="build">
+    <j:if test="${maven.multiproject.type == 'jar' || maven.multiproject.type == null}">
+      <attainGoal name="jar:install" />
+    </j:if>
+    <j:if test="${maven.multiproject.type == 'jbi'}">
+      <attainGoal name="jar:install" />
+      <attainGoal name="jbi:install" />
+    </j:if>
+    <j:if test="${maven.multiproject.type == 'war'}">
+      <attainGoal name="war:install" />
+    </j:if>
+    <j:if test="${maven.multiproject.type == 'plugin'}">
+      <attainGoal name="plugin:repository-install" />
+      <attainGoal name="plugin:install-now" />
+    </j:if>
+  </goal>
+  <goal name="deploy">
+    <j:if test="${maven.multiproject.type == 'jar'}">
+      <attainGoal name="jar:deploy" />
+    </j:if>
+    <j:if test="${maven.multiproject.type == 'jbi'}">
+      <attainGoal name="jar:deploy" />
+      <attainGoal name="jbi:deploy" />
+    </j:if>
+    <j:if test="${maven.multiproject.type == 'war'}">
+      <attainGoal name="war:deploy" />
+    </j:if>
+    <j:if test="${maven.multiproject.type == 'plugin'}">
+      <attainGoal name="plugin:repository-deploy" />
+    </j:if>
+  </goal>
 
   <postGoal name="clean:clean">
     <delete failonerror="false" dir="ActiveMQ"/>

Modified: incubator/servicemix/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/maven.xml?rev=383904&r1=383903&r2=383904&view=diff
==============================================================================
--- incubator/servicemix/trunk/maven.xml (original)
+++ incubator/servicemix/trunk/maven.xml Tue Mar  7 07:11:43 2006
@@ -176,7 +176,7 @@
       <ant:echo>| Cleaning: repo </ant:echo>
       <ant:echo>+----------------------------------------</ant:echo>
       <ant:delete quiet="false">
-        <ant:fileset dir="${maven.repo.local}/servicemix">
+        <ant:fileset dir="${maven.repo.local}/incubator-servicemix">
           <ant:include name="**/servicemix*.*"/>
         </ant:fileset>
       </ant:delete>

Modified: incubator/servicemix/trunk/project.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/project.properties?rev=383904&r1=383903&r2=383904&view=diff
==============================================================================
--- incubator/servicemix/trunk/project.properties (original)
+++ incubator/servicemix/trunk/project.properties Tue Mar  7 07:11:43 2006
@@ -93,7 +93,10 @@
   servicemix-lwcontainer/project.xml,\
   servicemix-bpe/project.xml,\
   servicemix-wsn2005/project.xml,\
-  servicemix-assembly/project.xml
+  servicemix-assembly/project.xml,\
+  tooling/maven-eclipse-plugin-plugin/project.xml,\
+  tooling/servicemix-packaging-descriptors/project.xml,\
+  tooling/servicemix-packaging-eclipse-plugin/project.xml
 
 
 # ------------------------------------------------------------------------

Modified: incubator/servicemix/trunk/servicemix-assembly/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/maven.xml?rev=383904&r1=383903&r2=383904&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/maven.xml (original)
+++ incubator/servicemix/trunk/servicemix-assembly/maven.xml Tue Mar  7 07:11:43 2006
@@ -65,11 +65,6 @@
         </j:forEach>
     </preGoal>
 
-    <goal name="rebuild">
-        <attainGoal name="clean"/>
-        <attainGoal name="default"/>
-    </goal>
-
     <goal name="dist:prepare-bin-filesystem"
           prereqs="jar:install"
           description="Builds the binary distribution file system.">
@@ -79,7 +74,6 @@
       be archived.
     -->
     
-    <ant:delete dir="${maven.dist.bin.assembly.dir}"/>
     <ant:mkdir dir="${maven.dist.bin.assembly.dir}"/>
     <ant:mkdir dir="${maven.build.dir}/unjar"/>
 
@@ -201,7 +195,6 @@
 
     <!-- S O U R C E  D I S T R I B U T I O N -->
 
-    <ant:delete dir="${maven.dist.src.assembly.dir}" />
     <ant:mkdir dir="${maven.dist.src.assembly.dir}" />
 
     <ant:echo>

Modified: incubator/servicemix/trunk/servicemix-bpe/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-bpe/maven.xml?rev=383904&r1=383903&r2=383904&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-bpe/maven.xml (original)
+++ incubator/servicemix/trunk/servicemix-bpe/maven.xml Tue Mar  7 07:11:43 2006
@@ -18,16 +18,8 @@
     
 -->
 
-<project default="default"
-    xmlns:ant="jelly:ant">
-
-  <!-- redefined "build" goal from parent pom -->
-  <goal name="default" prereqs="jar:install, jbi:install"/>
-        
-  <goal name="nightly" prereqs="clean, jar:install, jbi:install, jar:deploy, jbi:deploy"/>
-
-  <goal name="default">
-    <attainGoal name="build"/>
-  </goal> 
+<project default="default" xmlns:ant="jelly:ant">
+    
+    <!-- default goal is defined in /etc/ -->
 
 </project>

Modified: incubator/servicemix/trunk/servicemix-bpe/project.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-bpe/project.properties?rev=383904&r1=383903&r2=383904&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-bpe/project.properties (original)
+++ incubator/servicemix/trunk/servicemix-bpe/project.properties Tue Mar  7 07:11:43 2006
@@ -1,3 +1,25 @@
+# -------------------------------------------------------------------
+# Copyright 2001-2004 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+#  
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -------------------------------------------------------------------
+# $Rev: 356022 $ $Date: 2005-12-11 12:58:34 -0800 (dim., 11 déc. 2005) $
+# -------------------------------------------------------------------
+# P R O J E C T  P R O P E R T I E S
+# -------------------------------------------------------------------
+
+maven.multiproject.type=jbi
+
 jbi.component.class.name = org.apache.servicemix.bpe.BPEComponent
 jbi.bootstrap.class.name = org.apache.servicemix.bpe.BPEBootstrap
 jbi.component.type=service-engine

Modified: incubator/servicemix/trunk/servicemix-components/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/maven.xml?rev=383904&r1=383903&r2=383904&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/maven.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/maven.xml Tue Mar  7 07:11:43 2006
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!--
 
-    Copyright 2004 The Apache Software Foundation
+    Copyright 2005 The Apache Software Foundation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -18,13 +18,8 @@
     
 -->
 
-<project default="default"
-    xmlns:j="jelly:core"
-    xmlns:u="jelly:util"
-    xmlns:ant="jelly:ant"
-    xmlns:util="jelly:util"
-    xmlns:artifact="artifact">
+<project default="default" xmlns:ant="jelly:ant">
     
     <!-- default goal is defined in /etc/ -->
-    
+
 </project>

Modified: incubator/servicemix/trunk/servicemix-console/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-console/maven.xml?rev=383904&r1=383903&r2=383904&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-console/maven.xml (original)
+++ incubator/servicemix/trunk/servicemix-console/maven.xml Tue Mar  7 07:11:43 2006
@@ -15,13 +15,11 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
+    
 -->
 
 <project default="default" xmlns:ant="jelly:ant">
-
-  <!-- redefined "build" goal from parent to create a war instead -->
-  <goal name="default" prereqs="war:install"/>
-  
-  <goal name="nightly" prereqs="clean, war:install, war:deploy"/>
+    
+    <!-- default goal is defined in /etc/ -->
 
 </project>

Modified: incubator/servicemix/trunk/servicemix-http/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/maven.xml?rev=383904&r1=383903&r2=383904&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/maven.xml (original)
+++ incubator/servicemix/trunk/servicemix-http/maven.xml Tue Mar  7 07:11:43 2006
@@ -22,10 +22,6 @@
     xmlns:ant="jelly:ant"
     xmlns:artifact="artifact">
 
-  <!-- redefined "build" goal from parent pom -->
-  <goal name="default" prereqs="clean, jar:install, jbi:install"/>  
-  <goal name="nightly" prereqs="clean, jar:install, jbi:install, jar:deploy, jbi:deploy"/>
-
   <postGoal name="java:compile">
     <attainGoal name="xbean:generate" />
   </postGoal>

Modified: incubator/servicemix/trunk/servicemix-http/project.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/project.properties?rev=383904&r1=383903&r2=383904&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/project.properties (original)
+++ incubator/servicemix/trunk/servicemix-http/project.properties Tue Mar  7 07:11:43 2006
@@ -18,6 +18,8 @@
 # P R O J E C T  P R O P E R T I E S
 # -------------------------------------------------------------------
 
+maven.multiproject.type=jbi
+
 jbi.component.class.name = org.apache.servicemix.http.HttpComponent
 jbi.bootstrap.class.name = org.apache.servicemix.http.HttpBootstrap
 jbi.component.type=binding-component

Modified: incubator/servicemix/trunk/servicemix-jbi/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jbi/maven.xml?rev=383904&r1=383903&r2=383904&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jbi/maven.xml (original)
+++ incubator/servicemix/trunk/servicemix-jbi/maven.xml Tue Mar  7 07:11:43 2006
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!--
 
-    Copyright 2004 The Apache Software Foundation
+    Copyright 2005 The Apache Software Foundation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -18,13 +18,8 @@
     
 -->
 
-<project default="default" 
-         xmlns:j="jelly:core"
-	 xmlns:u="jelly:util"
-	 xmlns:ant="jelly:ant"
-	 xmlns:util="jelly:util"
-         xmlns:artifact="artifact">
-         
-  <!-- default goal is defined in /etc/ -->
-         
+<project default="default" xmlns:ant="jelly:ant">
+    
+    <!-- default goal is defined in /etc/ -->
+
 </project>

Modified: incubator/servicemix/trunk/servicemix-jms/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jms/maven.xml?rev=383904&r1=383903&r2=383904&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jms/maven.xml (original)
+++ incubator/servicemix/trunk/servicemix-jms/maven.xml Tue Mar  7 07:11:43 2006
@@ -18,12 +18,8 @@
     
 -->
 
-<project default="default" 
-  xmlns:ant="jelly:ant"
-  xmlns:artifact="artifact">
+<project default="default" xmlns:ant="jelly:ant">
+    
+    <!-- default goal is defined in /etc/ -->
 
-  <!-- redefined "default" goal from parent pom -->
-  <goal name="default" prereqs="clean, jar:install, jbi:install"/>  
-  <goal name="nightly" prereqs="clean, jar:install, jbi:install, jar:deploy, jbi:deploy"/>
-  
 </project>

Modified: incubator/servicemix/trunk/servicemix-jms/project.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jms/project.properties?rev=383904&r1=383903&r2=383904&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jms/project.properties (original)
+++ incubator/servicemix/trunk/servicemix-jms/project.properties Tue Mar  7 07:11:43 2006
@@ -18,6 +18,8 @@
 # P R O J E C T  P R O P E R T I E S
 # -------------------------------------------------------------------
 
+maven.multiproject.type=jbi
+
 jbi.component.class.name = org.apache.servicemix.jms.JmsComponent
 jbi.bootstrap.class.name = org.apache.servicemix.jms.JmsBootstrap
 jbi.component.type=binding-component

Modified: incubator/servicemix/trunk/servicemix-jsr181/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/maven.xml?rev=383904&r1=383903&r2=383904&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/maven.xml (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/maven.xml Tue Mar  7 07:11:43 2006
@@ -22,11 +22,6 @@
     xmlns:ant="jelly:ant"
     xmlns:artifact="artifact">
 
-  <!-- redefined "build" goal from parent pom -->
-  <goal name="default" prereqs="jar:install, jbi:install"/>
-        
-  <goal name="nightly" prereqs="clean, jar:install, jbi:install, jar:deploy, jbi:deploy"/>
-
   <postGoal name="java:compile">
     <attainGoal name="xbean:generate" />
   </postGoal>

Modified: incubator/servicemix/trunk/servicemix-jsr181/project.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/project.properties?rev=383904&r1=383903&r2=383904&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/project.properties (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/project.properties Tue Mar  7 07:11:43 2006
@@ -18,6 +18,8 @@
 # P R O J E C T  P R O P E R T I E S
 # -------------------------------------------------------------------
 
+maven.multiproject.type=jbi
+
 jbi.component.class.name = org.apache.servicemix.jsr181.Jsr181Component
 jbi.bootstrap.class.name = org.apache.servicemix.jsr181.Jsr181Bootstrap
 jbi.component.type=service-engine

Modified: incubator/servicemix/trunk/servicemix-lwcontainer/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-lwcontainer/maven.xml?rev=383904&r1=383903&r2=383904&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-lwcontainer/maven.xml (original)
+++ incubator/servicemix/trunk/servicemix-lwcontainer/maven.xml Tue Mar  7 07:11:43 2006
@@ -15,14 +15,11 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
+    
 -->
 
-<project default="default"
-    xmlns:ant="jelly:ant"
-    xmlns:artifact="artifact">
-
-  <!-- redefined "build" goal from parent pom -->
-  <goal name="default" prereqs="clean, jar:install, jbi:install"/>
-  <goal name="nightly" prereqs="clean, jar:install, jbi:install, jar:deploy, jbi:deploy"/>
+<project default="default" xmlns:ant="jelly:ant">
+    
+    <!-- default goal is defined in /etc/ -->
 
 </project>

Modified: incubator/servicemix/trunk/servicemix-lwcontainer/project.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-lwcontainer/project.properties?rev=383904&r1=383903&r2=383904&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-lwcontainer/project.properties (original)
+++ incubator/servicemix/trunk/servicemix-lwcontainer/project.properties Tue Mar  7 07:11:43
2006
@@ -21,5 +21,7 @@
 jbi.component.class.name = org.apache.servicemix.lwcontainer.LwContainerComponent
 jbi.bootstrap.class.name = org.apache.servicemix.lwcontainer.LwContainerBootstrap
 jbi.component.type=service-engine
+
 maven.jbi.src=${basedir}/src/main/resources
+maven.multiproject.type=jbi
 

Modified: incubator/servicemix/trunk/servicemix-sca/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-sca/maven.xml?rev=383904&r1=383903&r2=383904&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-sca/maven.xml (original)
+++ incubator/servicemix/trunk/servicemix-sca/maven.xml Tue Mar  7 07:11:43 2006
@@ -22,10 +22,6 @@
   xmlns:ant="jelly:ant"
   xmlns:artifact="artifact">
 
-  <!-- redefined "default" goal from parent pom -->
-  <goal name="default" prereqs="clean, jar:install, jbi:install"/>  
-  <goal name="nightly" prereqs="clean, jar:install, jbi:install, jar:deploy, jbi:deploy"/>
-  
   <postGoal name="java:compile">
     <!--
     <attainGoal name="xbean:generate" />

Modified: incubator/servicemix/trunk/servicemix-sca/project.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-sca/project.properties?rev=383904&r1=383903&r2=383904&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-sca/project.properties (original)
+++ incubator/servicemix/trunk/servicemix-sca/project.properties Tue Mar  7 07:11:43 2006
@@ -19,7 +19,7 @@
 # -------------------------------------------------------------------
 # Build Properties
 # -------------------------------------------------------------------
-maven.multiproject.type=jar
+maven.multiproject.type=jbi
 
 maven.compile.source=1.5
 maven.compile.target=1.5

Modified: incubator/servicemix/trunk/servicemix-soap/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-soap/maven.xml?rev=383904&r1=383903&r2=383904&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-soap/maven.xml (original)
+++ incubator/servicemix/trunk/servicemix-soap/maven.xml Tue Mar  7 07:11:43 2006
@@ -15,13 +15,11 @@
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
+    
 -->
 
 <project default="default" xmlns:ant="jelly:ant">
-
-  <!-- redefined "build" goal from parent to create a war instead -->
-  <goal name="default" prereqs="jar:install"/>
-  
-  <goal name="nightly" prereqs="clean, jar:install, jar:deploy"/>
+    
+    <!-- default goal is defined in /etc/ -->
 
 </project>

Modified: incubator/servicemix/trunk/servicemix-wsn2005/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/maven.xml?rev=383904&r1=383903&r2=383904&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/maven.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/maven.xml Tue Mar  7 07:11:43 2006
@@ -23,10 +23,6 @@
          xmlns:maven="jelly:maven"
          xmlns:artifact="artifact">
 
-         <!-- redefined "build" goal from parent pom -->
-	 <goal name="default" prereqs="clean, jar:install, jbi:install"/>
-	 <goal name="nightly" prereqs="clean, jar:install, jbi:install, jar:deploy, jbi:deploy"/>
-	             
 	 <preGoal name="java:compile">
            <attainGoal name="jaxws:compile"/>
          </preGoal>

Modified: incubator/servicemix/trunk/servicemix-wsn2005/project.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/project.properties?rev=383904&r1=383903&r2=383904&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/project.properties (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/project.properties Tue Mar  7 07:11:43 2006
@@ -38,7 +38,7 @@
 # -------------------------------------------------------------------
 # Build Properties
 # -------------------------------------------------------------------
-maven.multiproject.type=jar
+maven.multiproject.type=jbi
 
 maven.compile.source=1.5
 maven.compile.target=1.5

Added: incubator/servicemix/trunk/tooling/maven-eclipse-plugin-plugin/project.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven-eclipse-plugin-plugin/project.properties?rev=383904&view=auto
==============================================================================
--- incubator/servicemix/trunk/tooling/maven-eclipse-plugin-plugin/project.properties (added)
+++ incubator/servicemix/trunk/tooling/maven-eclipse-plugin-plugin/project.properties Tue
Mar  7 07:11:43 2006
@@ -0,0 +1,20 @@
+# -------------------------------------------------------------------
+# Copyright 2001-2004 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+#  
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -------------------------------------------------------------------
+# $Rev: 372200 $ $Date: 2006-01-25 13:01:54 +0100 (mer., 25 janv. 2006) $
+# -------------------------------------------------------------------
+# P R O J E C T  P R O P E R T I E S
+# -------------------------------------------------------------------
+maven.multiproject.type=plugin

Modified: incubator/servicemix/trunk/tooling/maven-jbi-plugin/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven-jbi-plugin/maven.xml?rev=383904&r1=383903&r2=383904&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven-jbi-plugin/maven.xml (original)
+++ incubator/servicemix/trunk/tooling/maven-jbi-plugin/maven.xml Tue Mar  7 07:11:43 2006
@@ -24,9 +24,6 @@
   xmlns:ant="jelly:ant"
   xmlns:maven="jelly:maven">
 
-  <goal name="default" prereqs="plugin:repository-install, plugin:install-now"/>
-  <goal name="nightly" prereqs="clean, plugin:repository-install, plugin:install-now,
plugin:repository-deploy"/>
-  
   <!-- Executed when calling multiproject:deploy from root -->
   <goal name="plugin:deploy" 
           description="Deploys javadoc binary" prereqs="javadoc:install">

Modified: incubator/servicemix/trunk/tooling/maven-jbi-plugin/plugin.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven-jbi-plugin/plugin.properties?rev=383904&r1=383903&r2=383904&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven-jbi-plugin/plugin.properties (original)
+++ incubator/servicemix/trunk/tooling/maven-jbi-plugin/plugin.properties Tue Mar  7 07:11:43
2006
@@ -23,7 +23,7 @@
 # Location of where SAR sources (non-java) are located.
 maven.jbi.build.dir=${maven.build.dir}/jbi
 maven.jbi.build.lib=${maven.jbi.build.dir}/lib
-maven.jbi.final.name=${pom.artifactId}-installer-${pom.currentVersion}.zip
+maven.jbi.final.name=${pom.artifactId}-${pom.currentVersion}.zip
 maven.jbi.index=false
 maven.jbi.src=${maven.src.dir}/jbi
 maven.jbi.src.includes=**



Mime
View raw message