geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r889020 - in /geronimo/sandbox/failover: controller-as-repo/pom.xml geronimo-tomcat-farm-controller/pom.xml
Date Wed, 09 Dec 2009 23:33:12 GMT
Author: djencks
Date: Wed Dec  9 23:33:11 2009
New Revision: 889020

URL: http://svn.apache.org/viewvc?rev=889020&view=rev
Log:
make build against 2.2

Modified:
    geronimo/sandbox/failover/controller-as-repo/pom.xml
    geronimo/sandbox/failover/geronimo-tomcat-farm-controller/pom.xml

Modified: geronimo/sandbox/failover/controller-as-repo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/controller-as-repo/pom.xml?rev=889020&r1=889019&r2=889020&view=diff
==============================================================================
--- geronimo/sandbox/failover/controller-as-repo/pom.xml (original)
+++ geronimo/sandbox/failover/controller-as-repo/pom.xml Wed Dec  9 23:33:11 2009
@@ -8,7 +8,7 @@
 
     <properties>
         <!-- This property is required by the car:package mojo -->
-        <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
+        <geronimoVersion>2.2</geronimoVersion>
 
     </properties>
 

Modified: geronimo/sandbox/failover/geronimo-tomcat-farm-controller/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/geronimo-tomcat-farm-controller/pom.xml?rev=889020&r1=889019&r2=889020&view=diff
==============================================================================
--- geronimo/sandbox/failover/geronimo-tomcat-farm-controller/pom.xml (original)
+++ geronimo/sandbox/failover/geronimo-tomcat-farm-controller/pom.xml Wed Dec  9 23:33:11
2009
@@ -18,7 +18,8 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <artifactId>clustering</artifactId>
         <groupId>org.apache.geronimo.plugins</groupId>
@@ -30,11 +31,12 @@
     <name>Geronim Plugin Farm Controller Server Assembly for Tomcat</name>
     <packaging>server-assembly</packaging>
 
-    <description>An assembly that extends the tomcat javaee assembly with the plugin
farm controller plugin.</description>
+    <description>An assembly that extends the tomcat javaee assembly with the plugin
farm controller plugin.
+    </description>
 
     <properties>
         <!-- This property is required by the car:package mojo -->
-        <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
+        <geronimoVersion>2.2</geronimoVersion>
     </properties>
 
 
@@ -42,119 +44,25 @@
 
         <dependency>
             <groupId>org.apache.geronimo.plugingroups</groupId>
-            <artifactId>framework</artifactId>
+            <artifactId>javaee5-tomcat</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.plugingroups</groupId>
-            <artifactId>web-tomcat</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.plugingroups</groupId>
-            <artifactId>jms</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.plugingroups</groupId>
-            <artifactId>ejb</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.plugingroups</groupId>
-            <artifactId>webservices-axis2</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.plugingroups</groupId>
-            <artifactId>webservices-cxf</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.plugingroups</groupId>
-            <artifactId>persistence</artifactId>
-            <version>${version}</version>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>plugin-farm</artifactId>
+            <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
-<!--
-        <dependency>
-            <groupId>org.apache.geronimo.plugingroups</groupId>
-            <artifactId>clustering</artifactId>
-            <version>${version}</version>
-            <type>jar</type>
-        </dependency>
--->
-<!-- stuff not from above plugingroups, yet in tomcat-javaee5 assembly -->
-    <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>activemq-console-tomcat</artifactId>
-            <version>${version}</version>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>debugviews-console-tomcat</artifactId>
-            <version>${version}</version>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>plugin-console-tomcat</artifactId>
-            <version>${version}</version>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>sysdb-console-tomcat</artifactId>
-            <version>${version}</version>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>mconsole-tomcat</artifactId>
-            <version>${version}</version>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>plancreator-console-tomcat</artifactId>
-            <version>${version}</version>
-        <type>car</type>
-    </dependency>
-
-    <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>mejb</artifactId>
-            <version>${version}</version>
-        <type>car</type>
-    </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>plugin-farm</artifactId>
+            <artifactId>controller-as-repo</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
-    <dependency>
-    <groupId>org.apache.geronimo.configs</groupId>
-    <artifactId>controller-as-repo</artifactId>
-            <version>${version}</version>
-        <type>car</type>
-    </dependency>
-
     </dependencies>
 
     <build>
@@ -179,8 +87,10 @@
                         <serverInstance>
                             <name>default</name>
                             <configFile>var/config/config.xml</configFile>
-                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
-                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties
+                            </configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.
+                            </configSubstitutionsPrefix>
                             <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
                         </serverInstance>
                         <serverInstance>
@@ -191,15 +101,19 @@
                         <serverInstance>
                             <name>offline</name>
                             <configFile>var/config/offline-deployer-config.xml</configFile>
-                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
-                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties
+                            </configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.
+                            </configSubstitutionsPrefix>
                             <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
                         </serverInstance>
                         <serverInstance>
                             <name>jsr88</name>
                             <configFile>var/config/jsr88-configurer-config.xml</configFile>
-                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
-                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties
+                            </configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.
+                            </configSubstitutionsPrefix>
                             <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
                         </serverInstance>
                     </servers>



Mime
View raw message