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/10/13 21:37:31 UTC

svn commit: r463796 - in /incubator/servicemix/trunk/geronimo: deployer/src/resources/META-INF/geronimo-plugin.xml geronimo-plugins.xml servicemix/src/resources/META-INF/geronimo-plugin.xml

Author: gnodet
Date: Fri Oct 13 12:37:30 2006
New Revision: 463796

URL: http://svn.apache.org/viewvc?view=rev&rev=463796
Log:
Fix geronimo plugins

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

Modified: incubator/servicemix/trunk/geronimo/deployer/src/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo/deployer/src/resources/META-INF/geronimo-plugin.xml?view=diff&rev=463796&r1=463795&r2=463796
==============================================================================
--- incubator/servicemix/trunk/geronimo/deployer/src/resources/META-INF/geronimo-plugin.xml (original)
+++ incubator/servicemix/trunk/geronimo/deployer/src/resources/META-INF/geronimo-plugin.xml Fri Oct 13 12:37:30 2006
@@ -18,7 +18,7 @@
 
 -->
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
-  <name>Quartz Scheduler Integration</name>
+  <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>
@@ -27,16 +27,13 @@
   <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://incubator.apache.org/servicemix/dist/servicemix-3.0-M2-incubating/m2/</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/maven-snapshot-repository/</source-repository>
-  <config-xml-content>
-    <gbean name="ServiceMixConfigBuilder" xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
-    </gbean>
-  </config-xml-content>
+  <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
 </geronimo-plugin>

Added: incubator/servicemix/trunk/geronimo/geronimo-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo/geronimo-plugins.xml?view=auto&rev=463796
==============================================================================
--- incubator/servicemix/trunk/geronimo/geronimo-plugins.xml (added)
+++ incubator/servicemix/trunk/geronimo/geronimo-plugins.xml Fri Oct 13 12:37:30 2006
@@ -0,0 +1,57 @@
+<?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>
+</geronimo-plugin-list>

Modified: incubator/servicemix/trunk/geronimo/servicemix/src/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo/servicemix/src/resources/META-INF/geronimo-plugin.xml?view=diff&rev=463796&r1=463795&r2=463796
==============================================================================
--- incubator/servicemix/trunk/geronimo/servicemix/src/resources/META-INF/geronimo-plugin.xml (original)
+++ incubator/servicemix/trunk/geronimo/servicemix/src/resources/META-INF/geronimo-plugin.xml Fri Oct 13 12:37:30 2006
@@ -18,7 +18,7 @@
 
 -->
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
-  <name>Quartz Scheduler Integration</name>
+  <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>
@@ -26,6 +26,7 @@
   <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>
@@ -41,16 +42,8 @@
   <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://incubator.apache.org/servicemix/dist/servicemix-3.0-M2-incubating/m2/</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/maven-snapshot-repository/</source-repository>
-  <config-xml-content>
-    <gbean name="ServiceMixThreadPool" xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
-    </gbean>
-    <gbean name="ServiceMixWorkManager" xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
-    </gbean>
-    <gbean name="ServiceMixJBIContainer" xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
-    </gbean>
-  </config-xml-content>
+  <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
 </geronimo-plugin>