Return-Path: 
 <scm-return-48090-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
X-Original-To: apmail-geronimo-scm-archive@www.apache.org
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id A0E949312
	for <apmail-geronimo-scm-archive@www.apache.org>;
 Tue, 17 Jan 2012 08:46:15 +0000 (UTC)
Received: (qmail 63369 invoked by uid 500); 17 Jan 2012 08:46:13 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 63190 invoked by uid 500); 17 Jan 2012 08:46:09 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 63040 invoked by uid 99); 17 Jan 2012 08:46:08 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jan 2012 08:46:08 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jan 2012 08:46:04 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id B1DFC2388993;
	Tue, 17 Jan 2012 08:45:42 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1232339 - in /geronimo/server/trunk:
 framework/configs/j2ee-system/src/main/history/
 framework/features/framework/ plugingroups/wab-jetty/
 plugingroups/wab-jetty/src/main/history/ plugingroups/wab-tomcat/
 plugingroups/wab-tomcat/src/main/h...
Date: Tue, 17 Jan 2012 08:45:41 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120117084542.B1DFC2388993@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: djencks
Date: Tue Jan 17 08:45:41 2012
New Revision: 1232339

URL: http://svn.apache.org/viewvc?rev=1232339&view=rev
Log:
fix up build for karaf changes and modules that aren't built currently

Modified:
    geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/features/framework/pom.xml
    geronimo/server/trunk/plugingroups/wab-jetty/pom.xml
    geronimo/server/trunk/plugingroups/wab-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml
    geronimo/server/trunk/plugingroups/wab-tomcat/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/clustering/clustering/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/clustering/farming/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/clustering/pom.xml
    geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/pom.xml

Modified: geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml?rev=1232339&r1=1232338&r2=1232339&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml Tue Jan 17 08:45:41 2012
@@ -78,6 +78,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-bundleutils</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-finder</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/framework/features/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/features/framework/pom.xml?rev=1232339&r1=1232338&r2=1232339&view=diff
==============================================================================
--- geronimo/server/trunk/framework/features/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/features/framework/pom.xml Tue Jan 17 08:45:41 2012
@@ -267,6 +267,15 @@
             <classifier>features</classifier>
         </dependency>
         <dependency>
+            <groupId>org.apache.karaf.management</groupId>
+            <artifactId>org.apache.karaf.management.server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.prefs</artifactId>
          </dependency>

Modified: geronimo/server/trunk/plugingroups/wab-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/wab-jetty/pom.xml?rev=1232339&r1=1232338&r2=1232339&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/wab-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/wab-jetty/pom.xml Tue Jan 17 08:45:41 2012
@@ -57,12 +57,12 @@
             <type>car</type>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>offline-deployer</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>offline-deployer</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>hot-deployer</artifactId>

Modified: geronimo/server/trunk/plugingroups/wab-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/wab-jetty/src/main/history/dependencies.xml?rev=1232339&r1=1232338&r2=1232339&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/wab-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/wab-jetty/src/main/history/dependencies.xml Tue Jan 17 08:45:41 2012
@@ -52,11 +52,6 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>offline-deployer</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework.plugingroups</groupId>
         <artifactId>framework</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml?rev=1232339&r1=1232338&r2=1232339&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml Tue Jan 17 08:45:41 2012
@@ -57,12 +57,12 @@
             <type>car</type>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>offline-deployer</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>offline-deployer</artifactId>-->
+            <!--<version>${project.version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>hot-deployer</artifactId>

Modified: geronimo/server/trunk/plugingroups/wab-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/wab-tomcat/src/main/history/dependencies.xml?rev=1232339&r1=1232338&r2=1232339&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/wab-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/wab-tomcat/src/main/history/dependencies.xml Tue Jan 17 08:45:41 2012
@@ -52,11 +52,6 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>offline-deployer</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework.plugingroups</groupId>
         <artifactId>framework</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/clustering/clustering/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering/src/main/history/dependencies.xml?rev=1232339&r1=1232338&r2=1232339&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/clustering/clustering/src/main/history/dependencies.xml Tue Jan 17 08:45:41 2012
@@ -13,6 +13,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deployment</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-service-builder</artifactId>
         <type>jar</type>
     </dependency>
@@ -31,4 +36,14 @@
         <artifactId>geronimo-clustering</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/clustering/farming/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/farming/src/main/history/dependencies.xml?rev=1232339&r1=1232338&r2=1232339&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/farming/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/clustering/farming/src/main/history/dependencies.xml Tue Jan 17 08:45:41 2012
@@ -28,6 +28,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deployment</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-service-builder</artifactId>
         <type>jar</type>
     </dependency>
@@ -52,8 +57,13 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-bundleutils</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/pom.xml?rev=1232339&r1=1232338&r2=1232339&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/pom.xml Tue Jan 17 08:45:41 2012
@@ -41,11 +41,11 @@
         <module>geronimo-plugin-farm</module>
         <module>clustering</module>
         <module>wadi-clustering</module>
-        <module>farming</module>
-        <module>plugin-farm</module>
-        <module>plugin-farm-member</module>
+        <!--<module>farming</module>-->
+        <!--<module>plugin-farm</module>-->
+        <!--<module>plugin-farm-member</module>-->
         <!--<module>geronimo-plugin-farm-node</module>-->
-        <module>plugin-farm-datasource</module>
+        <!--<module>plugin-farm-datasource</module>-->
     </modules>
 
     <profiles>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/history/dependencies.xml?rev=1232339&r1=1232338&r2=1232339&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/src/main/history/dependencies.xml Tue Jan 17 08:45:41 2012
@@ -258,6 +258,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-bundleutils</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-finder</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/pom.xml?rev=1232339&r1=1232338&r2=1232339&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/pom.xml Tue Jan 17 08:45:41 2012
@@ -33,10 +33,14 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>wadi-clustering</artifactId>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-clustering</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-clustering-wadi</artifactId>
             <version>${project.version}</version>
-            <type>car</type>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/src/main/history/dependencies.xml?rev=1232339&r1=1232338&r2=1232339&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/src/main/history/dependencies.xml Tue Jan 17 08:45:41 2012
@@ -42,6 +42,11 @@
         <type>car</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-service-builder</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-openejb-clustering-wadi</artifactId>
         <type>jar</type>
@@ -58,16 +63,36 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-atinject_1.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-ejb_3.1_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-el_2.2_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jaxb_2.2_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jms_1.1_spec</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml?rev=1232339&r1=1232338&r2=1232339&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/pluto/pluto-support/src/main/history/dependencies.xml Tue Jan 17 08:45:41 2012
@@ -113,6 +113,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-bundleutils</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-finder</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=1232339&r1=1232338&r2=1232339&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Tue Jan 17 08:45:41 2012
@@ -158,7 +158,7 @@
         <module>axis</module>
         <module>axis2</module>
         <module>client</module>
-        <!--<module>clustering</module>-->
+        <module>clustering</module>
         <module>connector-1_6</module>
         <module>console</module>
         <module>corba</module>