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/12/14 23:12:07 UTC

svn commit: r487372 - in /incubator/servicemix/trunk/platforms/geronimo: dependencies/pom.xml deployer/src/plan/geronimo-service.xml pom.xml

Author: gnodet
Date: Thu Dec 14 14:12:07 2006
New Revision: 487372

URL: http://svn.apache.org/viewvc?view=rev&rev=487372
Log:
Geronimo plugins now compiles against the G 1.2-beta

Modified:
    incubator/servicemix/trunk/platforms/geronimo/dependencies/pom.xml
    incubator/servicemix/trunk/platforms/geronimo/deployer/src/plan/geronimo-service.xml
    incubator/servicemix/trunk/platforms/geronimo/pom.xml

Modified: incubator/servicemix/trunk/platforms/geronimo/dependencies/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/platforms/geronimo/dependencies/pom.xml?view=diff&rev=487372&r1=487371&r2=487372
==============================================================================
--- incubator/servicemix/trunk/platforms/geronimo/dependencies/pom.xml (original)
+++ incubator/servicemix/trunk/platforms/geronimo/dependencies/pom.xml Thu Dec 14 14:12:07 2006
@@ -36,259 +36,13 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transformer-agent</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-system</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>rmi-naming</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-server</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-security</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-corba-yoko</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>directory</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>ldap-realm</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>system-database</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>activemq-broker</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>activemq</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client-system</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client-security</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client-corba-yoko</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>javamail</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo-version}</version>
             <type>car</type>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-deployer</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb-deployer</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb-corba-deployer</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>persistence-jpa10-deployer</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis-deployer</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>hot-deployer</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client-deployer</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty-clustering-builder-wadi</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty-clustering-wadi</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>welcome-jetty</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>webconsole-jetty</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>remote-deploy-jetty</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>uddi-jetty</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>shutdown</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>sharedlib</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-       <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openjpa</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>online-deployer</artifactId>
+            <artifactId>j2ee-server</artifactId>
             <version>${geronimo-version}</version>
             <type>car</type>
         </dependency>

Modified: incubator/servicemix/trunk/platforms/geronimo/deployer/src/plan/geronimo-service.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/platforms/geronimo/deployer/src/plan/geronimo-service.xml?view=diff&rev=487372&r1=487371&r2=487372
==============================================================================
--- incubator/servicemix/trunk/platforms/geronimo/deployer/src/plan/geronimo-service.xml (original)
+++ incubator/servicemix/trunk/platforms/geronimo/deployer/src/plan/geronimo-service.xml Thu Dec 14 14:12:07 2006
@@ -19,7 +19,7 @@
 <!--
 Configuration for ServiceMix deployer.
 -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
 
     <gbean name="ServiceMixConfigBuilder" class="org.apache.servicemix.geronimo.ServiceMixConfigBuilder">
         <reference name="Repositories" />

Modified: incubator/servicemix/trunk/platforms/geronimo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/platforms/geronimo/pom.xml?view=diff&rev=487372&r1=487371&r2=487372
==============================================================================
--- incubator/servicemix/trunk/platforms/geronimo/pom.xml (original)
+++ incubator/servicemix/trunk/platforms/geronimo/pom.xml Thu Dec 14 14:12:07 2006
@@ -35,11 +35,25 @@
     <packaging>pom</packaging>
   
     <properties>
+        <geronimo-version>1.2-beta</geronimo-version>
         <geronimoVersion>${geronimo-version}</geronimoVersion>
         <car-maven-plugin-version>${geronimo-version}</car-maven-plugin-version>
         <geronimoSchemaVersion>1.2</geronimoSchemaVersion>
         <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car</gbeanDeployer>
     </properties>
+    
+    <repositories>
+      <repository>
+        <id>dain</id>
+        <url>http://people.apache.org/~dain/stage</url>
+      </repository>
+    </repositories>
+    <pluginRepositories>
+      <pluginRepository>
+        <id>dain</id>
+        <url>http://people.apache.org/~dain/stage</url>
+      </pluginRepository>
+    </pluginRepositories>
     
     <modules>
         <module>servicemix-service</module>