servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r487545 - in /incubator/servicemix/trunk/platforms/geronimo: deployer/src/resources/META-INF/geronimo-plugin.xml geronimo-plugins.xml servicemix/pom.xml servicemix/src/resources/META-INF/geronimo-plugin.xml
Date Fri, 15 Dec 2006 13:04:04 GMT
Author: gnodet
Date: Fri Dec 15 05:04:04 2006
New Revision: 487545

URL: http://svn.apache.org/viewvc?view=rev&rev=487545
Log:
Geronimo plugins can now be deployed. They are still disabled until G 1.2-beta is voted

Modified:
    incubator/servicemix/trunk/platforms/geronimo/deployer/src/resources/META-INF/geronimo-plugin.xml
    incubator/servicemix/trunk/platforms/geronimo/geronimo-plugins.xml
    incubator/servicemix/trunk/platforms/geronimo/servicemix/pom.xml
    incubator/servicemix/trunk/platforms/geronimo/servicemix/src/resources/META-INF/geronimo-plugin.xml

Modified: incubator/servicemix/trunk/platforms/geronimo/deployer/src/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/platforms/geronimo/deployer/src/resources/META-INF/geronimo-plugin.xml?view=diff&rev=487545&r1=487544&r2=487545
==============================================================================
--- incubator/servicemix/trunk/platforms/geronimo/deployer/src/resources/META-INF/geronimo-plugin.xml
(original)
+++ incubator/servicemix/trunk/platforms/geronimo/deployer/src/resources/META-INF/geronimo-plugin.xml
Fri Dec 15 05:04:04 2006
@@ -18,22 +18,22 @@
 
 -->
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
-  <name>ServiceMix deployer</name>
-  <module-id>org.apache.servicemix.geronimo/deployer/${servicemix-version}/car</module-id>
-  <category>Integration</category>
-  <description>This plugin Apache ServiceMix JBI container to Geronimo.</description>
-  <url>http://incubator.apache.org/servicemix</url>
-  <author>The ServiceMix development team</author>
-  <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-  <geronimo-version>1.1</geronimo-version>
-  <dependency>org.apache.servicemix.geronimo/servicemix//car</dependency>
-  <dependency>org.apache.servicemix.geronimo/deployer//jar</dependency>
-  <dependency>geronimo/geronimo-gbean-deployer//car</dependency>
-  <dependency>geronimo/j2ee-server//car</dependency>
-  <dependency>geronimo/j2ee-deployer//car</dependency>
-  <obsoletes>org.apache.servicemix.geronimo/deployer//car</obsoletes>
-  <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
-  <source-repository>http://people.apache.org/~chirino/incubator-activemq-4.0.2-RC3/maven2/</source-repository>
-  <source-repository>http://www.ibiblio.org/maven2/</source-repository>
-  <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
+    <name>ServiceMix Deployer</name>
+    <module-id>org.apache.servicemix.geronimo/deployer/${servicemix-version}/car</module-id>
+    <category>Integration</category>
+    <description>JBI artifacts deployer for Apache ServiceMix JBI container.</description>
+    <url>http://incubator.apache.org/servicemix</url>
+    <author>The ServiceMix development team</author>
+    <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
+    <geronimo-version>${geronimo-version}</geronimo-version>
+    <dependency>org.apache.servicemix.geronimo/servicemix//car</dependency>
+    <dependency>org.apache.servicemix.geronimo/deployer//jar</dependency>
+    <dependency>org.apache.geronimo/geronimo-gbean-deployer//car</dependency>
+    <dependency>org.apache.geronimo/j2ee-server//car</dependency>
+    <dependency>org.apache.geronimo/j2ee-deployer//car</dependency>
+    <obsoletes>org.apache.servicemix.geronimo/deployer//car</obsoletes>
+    <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
+    <source-repository>http://snapshots.repository.codehaus.org/</source-repository>
+    <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
+    <source-repository>http://www.ibiblio.org/maven2/</source-repository>
 </geronimo-plugin>

Modified: incubator/servicemix/trunk/platforms/geronimo/geronimo-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/platforms/geronimo/geronimo-plugins.xml?view=diff&rev=487545&r1=487544&r2=487545
==============================================================================
--- incubator/servicemix/trunk/platforms/geronimo/geronimo-plugins.xml (original)
+++ incubator/servicemix/trunk/platforms/geronimo/geronimo-plugins.xml Fri Dec 15 05:04:04
2006
@@ -1,57 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <geronimo-plugin-list xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
-  <plugin>
-    <name>ServiceMix Integration</name>
-    <module-id>org.apache.servicemix.geronimo/servicemix/3.0-incubating/car</module-id>
-    <category>Integration</category>
-    <description>This plugin Apache ServiceMix JBI container to Geronimo.</description>
-    <url>http://incubator.apache.org/servicemix</url>
-    <author>The ServiceMix development team</author>
-    <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>1.1</geronimo-version>
-    <dependency>geronimo/j2ee-server//car</dependency>
-    <dependency>org.apache.servicemix/servicemix-jbi//jar</dependency>
-    <dependency>org.apache.servicemix/servicemix-core//jar</dependency>
-    <dependency>org.apache.servicemix/servicemix-core//jar</dependency>
-    <dependency>org.apache.servicemix/servicemix-services//jar</dependency>
-    <dependency>incubator-activemq/activemq-core//jar</dependency>
-    <dependency>incubator-activemq/activeio-core//jar</dependency>
-    <dependency>wsdl4j/wsdl4j//jar</dependency>
-    <dependency>org.jencks/jencks//jar</dependency>
-    <dependency>commons-beanutils/commons-beanutils-core//jar</dependency>
-    <dependency>backport-util-concurrent/backport-util-concurrent//car</dependency>
-    <dependency>org.springframework/spring//jar</dependency>
-    <dependency>org.apache.xbean/xbean-spring//jar</dependency>
-    <dependency>org.apache.xbean/xbean-kernel//jar</dependency>
-    <dependency>org.apache.xbean/xbean-server//jar</dependency>
-    <obsoletes>org.apache.servicemix.geronimo/servicemix//car</obsoletes>
-    <source-repository>http://servicemix.org/geronimo/</source-repository>
-    <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
-    <source-repository>http://people.apache.org/~chirino/incubator-activemq-4.0.2-RC3/maven2/</source-repository>
-    <source-repository>http://www.ibiblio.org/maven2/</source-repository>
-    <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-  </plugin>
-  <plugin>
-    <name>ServiceMix deployer</name>
-    <module-id>org.apache.servicemix.geronimo/deployer/3.0-incubating/car</module-id>
-    <category>Integration</category>
-    <description>This plugin Apache ServiceMix JBI container to Geronimo.</description>
-    <url>http://incubator.apache.org/servicemix</url>
-    <author>The ServiceMix development team</author>
-    <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-    <geronimo-version>1.1</geronimo-version>
-    <dependency>org.apache.servicemix.geronimo/servicemix//car</dependency>
-    <dependency>org.apache.servicemix.geronimo/deployer//jar</dependency>
-    <dependency>geronimo/geronimo-gbean-deployer//car</dependency>
-    <dependency>geronimo/j2ee-server//car</dependency>
-    <dependency>geronimo/j2ee-deployer//car</dependency>
-    <obsoletes>org.apache.servicemix.geronimo/deployer//car</obsoletes>
-    <source-repository>http://servicemix.org/geronimo/</source-repository>
-    <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
-    <source-repository>http://people.apache.org/~chirino/incubator-activemq-4.0.2-RC3/maven2/</source-repository>
-    <source-repository>http://www.ibiblio.org/maven2/</source-repository>
-    <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-  </plugin>
-  <default-repository>http://servicemix.org/geronimo/</default-repository>
-  <default-repository>http://people.apache.org/repo/m2-incubating-repository/</default-repository>
+    <plugin>
+        <name>ServiceMix Integration</name>
+        <module-id>org.apache.servicemix.geronimo/servicemix/3.1-incubating-SNAPSHOT/car</module-id>
+        <category>Integration</category>
+        <description>This plugin integrates Apache ServiceMix JBI container to Apache
Geronimo.</description>
+        <url>http://incubator.apache.org/servicemix</url>
+        <author>The ServiceMix development team</author>
+        <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
+        <geronimo-version>1.2-beta</geronimo-version>
+        <dependency>org.apache.geronimo/j2ee-server//car</dependency>
+        <dependency>org.apache.servicemix/servicemix-jbi//jar</dependency>
+        <dependency>org.apache.servicemix/servicemix-core//jar</dependency>
+        <dependency>org.apache.servicemix/servicemix-services//jar</dependency>
+        <dependency>org.apache.activemq/activemq-core//jar</dependency>
+        <dependency>org.apache.activemq/activeio-core//jar</dependency>
+        <dependency>wsdl4j/wsdl4j//jar</dependency>
+        <dependency>org.jencks/jencks//jar</dependency>
+        <dependency>commons-beanutils/commons-beanutils-core//jar</dependency>
+        <dependency>backport-util-concurrent/backport-util-concurrent//car</dependency>
+        <dependency>org.springframework/spring-beans//jar</dependency>
+        <dependency>org.springframework/spring-core//jar</dependency>
+        <dependency>org.springframework/spring-context//jar</dependency>
+        <dependency>org.springframework/spring-dao//jar</dependency>
+        <dependency>org.springframework/spring-jmx//jar</dependency>
+        <dependency>org.apache.xbean/xbean-spring//jar</dependency>
+        <dependency>org.apache.xbean/xbean-kernel//jar</dependency>
+        <dependency>org.apache.xbean/xbean-server//jar</dependency>
+        <dependency>org.apache.xbean/xbean-classloader//jar</dependency>
+        <obsoletes>org.apache.servicemix.geronimo/servicemix//car</obsoletes>
+        <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
+        <source-repository>http://snapshots.repository.codehaus.org/</source-repository>
+        <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
+        <source-repository>http://www.ibiblio.org/maven2/</source-repository>
+    </plugin>
+    <plugin>
+        <name>ServiceMix Deployer</name>
+        <module-id>org.apache.servicemix.geronimo/deployer/${servicemix-version}/car</module-id>
+        <category>Integration</category>
+        <description>JBI artifacts deployer for Apache ServiceMix JBI container.</description>
+        <url>http://incubator.apache.org/servicemix</url>
+        <author>The ServiceMix development team</author>
+        <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
+        <geronimo-version>${geronimo-version}</geronimo-version>
+        <dependency>org.apache.servicemix.geronimo/servicemix//car</dependency>
+        <dependency>org.apache.servicemix.geronimo/deployer//jar</dependency>
+        <dependency>org.apache.geronimo/geronimo-gbean-deployer//car</dependency>
+        <dependency>org.apache.geronimo/j2ee-server//car</dependency>
+        <dependency>org.apache.geronimo/j2ee-deployer//car</dependency>
+        <obsoletes>org.apache.servicemix.geronimo/deployer//car</obsoletes>
+        <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
+        <source-repository>http://snapshots.repository.codehaus.org/</source-repository>
+        <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
+        <source-repository>http://www.ibiblio.org/maven2/</source-repository>
+    </plugin>
+    <default-repository>http://servicemix.org/geronimo/</default-repository>
+    <default-repository>http://people.apache.org/repo/m2-incubating-repository/</default-repository>
 </geronimo-plugin-list>

Modified: incubator/servicemix/trunk/platforms/geronimo/servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/platforms/geronimo/servicemix/pom.xml?view=diff&rev=487545&r1=487544&r2=487545
==============================================================================
--- incubator/servicemix/trunk/platforms/geronimo/servicemix/pom.xml (original)
+++ incubator/servicemix/trunk/platforms/geronimo/servicemix/pom.xml Fri Dec 15 05:04:04 2006
@@ -34,7 +34,7 @@
     <packaging>car</packaging>
 
     <dependencies>
-        <!-- Needed to download dependencies -->
+        <!-- Needed to download Geronimo dependencies -->
         <dependency>
             <groupId>org.apache.servicemix.geronimo</groupId>
             <artifactId>dependencies</artifactId>
@@ -58,16 +58,87 @@
             <version>3.1-incubating-SNAPSHOT</version>
         </dependency>
         <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-services</artifactId>
+            <version>3.1-incubating-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activeio-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>wsdl4j</groupId>
+            <artifactId>wsdl4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jencks</groupId>
+            <artifactId>jencks</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>${spring-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${spring-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-dao</artifactId>
+            <version>${spring-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jmx</artifactId>
+            <version>${spring-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-spring</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-kernel</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-classloader</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
+            <artifactId>transaction</artifactId>
             <version>${geronimo-version}</version>
-            <scope>provided</scope>
             <type>car</type>
         </dependency>
+        <!-- Only needed to build the car -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction</artifactId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo-version}</version>
+            <scope>provided</scope>
             <type>car</type>
         </dependency>
     </dependencies>

Modified: incubator/servicemix/trunk/platforms/geronimo/servicemix/src/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/platforms/geronimo/servicemix/src/resources/META-INF/geronimo-plugin.xml?view=diff&rev=487545&r1=487544&r2=487545
==============================================================================
--- incubator/servicemix/trunk/platforms/geronimo/servicemix/src/resources/META-INF/geronimo-plugin.xml
(original)
+++ incubator/servicemix/trunk/platforms/geronimo/servicemix/src/resources/META-INF/geronimo-plugin.xml
Fri Dec 15 05:04:04 2006
@@ -18,32 +18,36 @@
 
 -->
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
-  <name>ServiceMix Integration</name>
-  <module-id>org.apache.servicemix.geronimo/servicemix/${servicemix-version}/car</module-id>
-  <category>Integration</category>
-  <description>This plugin Apache ServiceMix JBI container to Geronimo.</description>
-  <url>http://incubator.apache.org/servicemix</url>
-  <author>The ServiceMix development team</author>
-  <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-  <geronimo-version>1.1</geronimo-version>
-  <dependency>geronimo/j2ee-server//car</dependency>
-  <dependency>org.apache.servicemix/servicemix-jbi//jar</dependency>
-  <dependency>org.apache.servicemix/servicemix-core//jar</dependency>
-  <dependency>org.apache.servicemix/servicemix-core//jar</dependency>
-  <dependency>org.apache.servicemix/servicemix-services//jar</dependency>
-  <dependency>incubator-activemq/activemq-core//jar</dependency>
-  <dependency>incubator-activemq/activeio-core//jar</dependency>
-  <dependency>wsdl4j/wsdl4j//jar</dependency>
-  <dependency>org.jencks/jencks//jar</dependency>
-  <dependency>commons-beanutils/commons-beanutils-core//jar</dependency>
-  <dependency>backport-util-concurrent/backport-util-concurrent//car</dependency>
-  <dependency>org.springframework/spring//jar</dependency>
-  <dependency>org.apache.xbean/xbean-spring//jar</dependency>
-  <dependency>org.apache.xbean/xbean-kernel//jar</dependency>
-  <dependency>org.apache.xbean/xbean-server//jar</dependency>
-  <obsoletes>org.apache.servicemix.geronimo/servicemix//car</obsoletes>
-  <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
-  <source-repository>http://people.apache.org/~chirino/incubator-activemq-4.0.2-RC3/maven2/</source-repository>
-  <source-repository>http://www.ibiblio.org/maven2/</source-repository>
-  <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
+    <name>ServiceMix Integration</name>
+    <module-id>org.apache.servicemix.geronimo/servicemix/${servicemix-version}/car</module-id>
+    <category>Integration</category>
+    <description>This plugin integrates Apache ServiceMix JBI container to Apache Geronimo.</description>
+    <url>http://incubator.apache.org/servicemix</url>
+    <author>The ServiceMix development team</author>
+    <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
+    <geronimo-version>${geronimo-version}</geronimo-version>
+    <dependency>org.apache.geronimo/j2ee-server//car</dependency>
+    <dependency>org.apache.servicemix/servicemix-jbi//jar</dependency>
+    <dependency>org.apache.servicemix/servicemix-core//jar</dependency>
+    <dependency>org.apache.servicemix/servicemix-services//jar</dependency>
+    <dependency>org.apache.activemq/activemq-core//jar</dependency>
+    <dependency>org.apache.activemq/activeio-core//jar</dependency>
+    <dependency>wsdl4j/wsdl4j//jar</dependency>
+    <dependency>org.jencks/jencks//jar</dependency>
+    <dependency>commons-beanutils/commons-beanutils-core//jar</dependency>
+    <dependency>backport-util-concurrent/backport-util-concurrent//car</dependency>
+    <dependency>org.springframework/spring-beans//jar</dependency>
+    <dependency>org.springframework/spring-core//jar</dependency>
+    <dependency>org.springframework/spring-context//jar</dependency>
+    <dependency>org.springframework/spring-dao//jar</dependency>
+    <dependency>org.springframework/spring-jmx//jar</dependency>
+    <dependency>org.apache.xbean/xbean-spring//jar</dependency>
+    <dependency>org.apache.xbean/xbean-kernel//jar</dependency>
+    <dependency>org.apache.xbean/xbean-server//jar</dependency>
+    <dependency>org.apache.xbean/xbean-classloader//jar</dependency>
+    <obsoletes>org.apache.servicemix.geronimo/servicemix//car</obsoletes>
+    <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
+    <source-repository>http://snapshots.repository.codehaus.org/</source-repository>
+    <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
+    <source-repository>http://www.ibiblio.org/maven2/</source-repository>
 </geronimo-plugin>



Mime
View raw message