Title: [891] trunk/servicemix-jms: Fix build problems
Revision
891
Author
gnt
Date
2005-11-22 04:11:20 -0500 (Tue, 22 Nov 2005)

Log Message

Fix build problems

Modified Paths


Added Paths

Property Changed

  • trunk/servicemix-common/
  • trunk/servicemix-jms/
  • trunk/servicemix-jsr181/
  • trunk/tooling/maven-jbi-plugin/

Diff

Property changes: trunk/servicemix-common

Name: svn:ignore
   + target
.classpath
.project

Modified: trunk/servicemix-gbean/maven.xml (890 => 891)

--- trunk/servicemix-gbean/maven.xml	2005-11-22 08:43:46 UTC (rev 890)
+++ trunk/servicemix-gbean/maven.xml	2005-11-22 09:11:20 UTC (rev 891)
@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<project default="installGeronimo"
+<project default="default"
     xmlns:ant="jelly:ant"
     xmlns:deploy="geronimo:deploy">
 
-    <goal name="installGeronimo">
-        <ant:delete dir="${maven.build.dir}/geronimo"/>
-        <deploy:unpackServer
-            geronimoVersion="1.0-SNAPSHOT"/>
-    </goal>
-
 </project>

Property changes: trunk/servicemix-jms

Name: svn:ignore
   + target
.classpath
.project

Modified: trunk/servicemix-jms/project.xml (890 => 891)

--- trunk/servicemix-jms/project.xml	2005-11-22 08:43:46 UTC (rev 890)
+++ trunk/servicemix-jms/project.xml	2005-11-22 09:11:20 UTC (rev 891)
@@ -25,7 +25,7 @@
       <dependency>
         <groupId>servicemix</groupId>
         <artifactId>maven-jbi-plugin</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>${pom.currentVersion}</version>
         <type>plugin</type>
       </dependency>
     

Property changes: trunk/servicemix-jsr181

Name: svn:ignore
   + .classpath
.project
target

Modified: trunk/servicemix-jsr181/project.xml (890 => 891)

--- trunk/servicemix-jsr181/project.xml	2005-11-22 08:43:46 UTC (rev 890)
+++ trunk/servicemix-jsr181/project.xml	2005-11-22 09:11:20 UTC (rev 891)
@@ -22,6 +22,13 @@
     <!-- ============ -->
     <dependencies>
     
+      <dependency>
+        <groupId>servicemix</groupId>
+        <artifactId>maven-jbi-plugin</artifactId>
+        <version>${pom.currentVersion}</version>
+        <type>plugin</type>
+      </dependency>
+    
       <!-- JBI bundled dependencies -->
       <dependency>
         <groupId>servicemix</groupId>

Property changes: trunk/tooling/maven-jbi-plugin

Name: svn:ignore
   - target
.project
   + target
.project
.classpath
.project

Added: trunk/tooling/maven-jbi-plugin/maven.xml (890 => 891)

--- trunk/tooling/maven-jbi-plugin/maven.xml	2005-11-22 08:43:46 UTC (rev 890)
+++ trunk/tooling/maven-jbi-plugin/maven.xml	2005-11-22 09:11:20 UTC (rev 891)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project default="default"
+  xmlns:j="jelly:core"
+  xmlns:u="jelly:util"
+  xmlns:ant="jelly:ant"
+  xmlns:maven="jelly:maven">
+
+  <goal name="default" prereqs="clean, plugin:repository-install, plugin:install-now"/>
+
+  <goal name="nightly" prereqs="clean, plugin:repository-install, plugin:install-now, plugin:repository-deploy"/>
+
+</project>

Modified: trunk/tooling/maven-jbi-plugin/plugin.jelly (890 => 891)

--- trunk/tooling/maven-jbi-plugin/plugin.jelly	2005-11-22 08:43:46 UTC (rev 890)
+++ trunk/tooling/maven-jbi-plugin/plugin.jelly	2005-11-22 09:11:20 UTC (rev 891)
@@ -148,7 +148,7 @@
         description="Install the jbi installer in the local repository">
      
      <artifact:install
-        artifact="${maven.build.dir}/${maven.final.name}.zip"
+        artifact="${maven.build.dir}/${maven.jbi.final.name}"
         type="zip"
         project="${pom}"/> 
   
@@ -162,7 +162,7 @@
         description="Install the snapshot version of the jbi installer in the local repository">
         
       <artifact:install-snapshot
-        artifact="${maven.build.dir}/${maven.final.name}.zip"
+        artifact="${maven.build.dir}/${maven.jbi.final.name}"
         type="zip"
         project="${pom}"/> 
         
@@ -176,7 +176,7 @@
         description="Deploys the jbi installer to the remote repository">
 
      <artifact:deploy
-        artifact="${maven.build.dir}/${maven.final.name}.zip"
+        artifact="${maven.build.dir}/${maven.jbi.final.name}"
         type="zip"
         project="${pom}"/>   
         
@@ -190,7 +190,7 @@
         description="Deploys the snapshot version of the jbi to remote repository">  
 
      <artifact:deploy-snapshot
-        artifact="${maven.build.dir}/${maven.final.name}.zip"
+        artifact="${maven.build.dir}/${maven.jbi.final.name}"
         type="zip"
         project="${pom}"/>    
         

Modified: trunk/tooling/maven-jbi-plugin/project.properties (890 => 891)

--- trunk/tooling/maven-jbi-plugin/project.properties	2005-11-22 08:43:46 UTC (rev 890)
+++ trunk/tooling/maven-jbi-plugin/project.properties	2005-11-22 09:11:20 UTC (rev 891)
@@ -17,3 +17,4 @@
 # -------------------------------------------------------------------
 # P R O J E C T  P R O P E R T I E S
 # -------------------------------------------------------------------
+maven.multiproject.type=plugin

Modified: trunk/tooling/maven-jbi-plugin/project.xml (890 => 891)

--- trunk/tooling/maven-jbi-plugin/project.xml	2005-11-22 08:43:46 UTC (rev 890)
+++ trunk/tooling/maven-jbi-plugin/project.xml	2005-11-22 09:11:20 UTC (rev 891)
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- 
 	/*
 	* Copyright 2005 Unity Systems, LLC 
@@ -17,21 +16,15 @@
 	* limitations under the License.
 	*/
 -->
-
 <project>
-	<pomVersion>3</pomVersion>
-	<id>maven-jbi-plugin</id>
-	<groupId>servicemix</groupId>
+    <pomVersion>3</pomVersion>
+    <extend>${basedir}/../../etc/project.xml</extend>
+
 	<name>Maven JBI Plugin</name>
-	<currentVersion>2.0-SNAPSHOT</currentVersion>
+	<id>maven-jbi-plugin</id>
 	<description>JBI Plugin for Maven</description>
 	<shortDescription>JBI Plugin for Maven</shortDescription>
-	<developers>
-		<developer>
-			<name>Guillaume Nodet</name>
-			<id>gnt</id>
-		</developer>
-	</developers>
+
 	<dependencies>
     <dependency>
       <groupId>commons-jelly</groupId>

Modified: trunk/tooling/maven-sar-plugin/project.xml (890 => 891)

--- trunk/tooling/maven-sar-plugin/project.xml	2005-11-22 08:43:46 UTC (rev 890)
+++ trunk/tooling/maven-sar-plugin/project.xml	2005-11-22 09:11:20 UTC (rev 891)
@@ -19,19 +19,13 @@
  -->
 
 <project>  
-  <pomVersion>3</pomVersion>
-  <id>maven-sar-plugin</id>
+    <pomVersion>3</pomVersion>
+    <extend>${basedir}/../../etc/project.xml</extend>
+
   <name>Maven SAR Plugin</name>
-  <currentVersion>0.1</currentVersion>
+  <id>maven-sar-plugin</id>
   <description>JBoss SAR Plugin for Maven</description>
   <shortDescription>JBoss SAR Plugin for Maven</shortDescription>
-  <developers>
-    <developer>
-      <name>Philip Dodds</name>
-      <id>pdodds</id>
-      <email>Unity Systems</email>      
-    </developer>    
-  </developers>
   <dependencies/>
   <build>
 		<!-- This section is compulsory -->

Reply via email to