geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r813067 [2/3] - in /geronimo/sandbox/djencks/osgi/framework: ./ buildsupport/car-maven-plugin/ buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ buildsupport/car-maven-plugin/src/test/java/org/apache/geronimo...
Date Wed, 09 Sep 2009 18:18:53 GMT
Modified: geronimo/sandbox/djencks/osgi/framework/configs/jee-specs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/jee-specs/pom.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/jee-specs/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/jee-specs/pom.xml Wed Sep  9 18:18:48 2009
@@ -214,108 +214,6 @@
                     <deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
 
                     <category>JavaEE</category>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>j2ee-system</artifactId>
-                            <type>car</type>
-                            <import>classes</import>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.specs</groupId>
-                            <artifactId>geronimo-jacc_1.1_spec</artifactId>
-                            <type>jar</type>
-                            <dependencies>
-                                <dependency>
-                                    <groupId>org.apache.geronimo.specs</groupId>
-                                    <artifactId>${servletSpec}</artifactId>
-                                    <version>1.2</version>
-                                    <type>jar</type>
-                                </dependency>
-                                <dependency>
-                                    <groupId>org.apache.geronimo.specs</groupId>
-                                    <artifactId>geronimo-ejb_3.0_spec</artifactId>
-                                    <version>1.0.1</version>
-                                    <type>jar</type>
-                                </dependency>
-                            </dependencies>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.specs</groupId>
-                            <artifactId>geronimo-jsp_2.1_spec</artifactId>
-                            <type>jar</type>
-                            <dependencies>
-                                <dependency>
-                                    <groupId>org.apache.geronimo.specs</groupId>
-                                    <artifactId>${servletSpec}</artifactId>
-                                    <version>1.2</version>
-                                    <type>jar</type>
-                                </dependency>
-                                <dependency>
-                                    <groupId>org.apache.geronimo.specs</groupId>
-                                    <artifactId>geronimo-el_1.0_spec</artifactId>
-                                    <version>1.0.1</version>
-                                    <type>jar</type>
-                                </dependency>
-                            </dependencies>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>jstl</groupId>
-                            <artifactId>jstl</artifactId>
-                            <type>jar</type>
-                            <dependencies>
-                                <dependency>
-                                    <groupId>org.apache.geronimo.specs</groupId>
-                                    <artifactId>geronimo-jsp_2.1_spec</artifactId>
-                                    <version>1.0.1</version>
-                                    <type>jar</type>
-                                </dependency>
-                            </dependencies>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.specs</groupId>
-                            <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
-                            <type>jar</type>
-                            <dependencies>
-                                <dependency>
-                                    <groupId>org.apache.geronimo.specs</groupId>
-                                    <artifactId>geronimo-ejb_3.0_spec</artifactId>
-                                    <version>1.0.1</version>
-                                    <type>jar</type>
-                                </dependency>
-                            </dependencies>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.openejb</groupId>
-                            <artifactId>ejb31-api-experimental</artifactId>
-                            <type>jar</type>
-                            <dependencies>
-                                <dependency>
-                                    <groupId>org.apache.geronimo.specs</groupId>
-                                    <artifactId>geronimo-ejb_3.0_spec</artifactId>
-                                    <version>1.0.1</version>
-                                    <type>jar</type>
-                                </dependency>
-                            </dependencies>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.myfaces.core</groupId>
-                            <artifactId>myfaces-api</artifactId>
-                            <type>jar</type>
-                            <dependencies>
-                                <dependency>
-                                    <groupId>org.apache.geronimo.specs</groupId>
-                                    <artifactId>${servletSpec}</artifactId>
-                                    <version>1.2</version>
-                                    <type>jar</type>
-                                </dependency>
-                            </dependencies>
-                        </dependency>
-
-                    </dependencies>
 
                 </configuration>
             </plugin>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/pom.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/pom.xml Wed Sep  9 18:18:48 2009
@@ -98,8 +98,8 @@
         </dependency>
 
         <dependency>
-            <groupId>jline</groupId>
-            <artifactId>jline</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.jline</artifactId>
         </dependency>
 
         <!-- used by plugin installer -->

Modified: geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/src/main/history/dependencies.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/src/main/history/dependencies.xml Wed Sep  9 18:18:48 2009
@@ -3,177 +3,182 @@
     <module-id>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>jsr88-cli</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-common</artifactId>
+        <groupId>asm</groupId>
+        <artifactId>asm</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-kernel</artifactId>
+        <groupId>asm</groupId>
+        <artifactId>asm-commons</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
+        <groupId>cglib</groupId>
+        <artifactId>cglib-nodep</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-impl</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
+        <groupId>com.thoughtworks.xstream</groupId>
+        <artifactId>xstream</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-logging</artifactId>
+        <groupId>commons-cli</groupId>
+        <artifactId>commons-cli</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm</artifactId>
+        <groupId>commons-jexl</groupId>
+        <artifactId>commons-jexl</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm-commons</artifactId>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>cglib</groupId>
-        <artifactId>cglib-nodep</artifactId>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.osgi.core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-reflect</artifactId>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>slf4j</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.thoughtworks.xstream</groupId>
-        <artifactId>xstream</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-cli</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>xpp3</groupId>
-        <artifactId>xpp3_min</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-common</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-system</artifactId>
+        <artifactId>geronimo-crypto</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-cli</artifactId>
+        <artifactId>geronimo-deploy-config</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-crypto</artifactId>
+        <artifactId>geronimo-deploy-jsr88</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-jexl</groupId>
-        <artifactId>commons-jexl</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-tool</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jul-to-slf4j</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deployment</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-kernel</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-logging</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-deploy-jsr88</artifactId>
+        <artifactId>geronimo-plugin</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-plugin</artifactId>
+        <artifactId>geronimo-service-builder</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-archiver</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-system</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-utils</artifactId>
+        <groupId>org.apache.geronimo.plugins.classloaders</groupId>
+        <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-activation_1.1_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-container-default</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-component-api</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jaxb_2.1_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>commons-cli</groupId>
-        <artifactId>commons-cli</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-deploy-tool</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.jline</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-service-builder</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-deployment</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xmlbeans</groupId>
-        <artifactId>xmlbeans</artifactId>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-reflect</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>xml-resolver</groupId>
-        <artifactId>xml-resolver</artifactId>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-archiver</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>jline</groupId>
-        <artifactId>jline</artifactId>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-component-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.plugins.classloaders</groupId>
-        <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
-        <type>car</type>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-container-default</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-impl</artifactId>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-utils</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -182,8 +187,13 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-activation_1.1_spec</artifactId>
+        <groupId>stax</groupId>
+        <artifactId>stax-api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>xpp3</groupId>
+        <artifactId>xpp3_min</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/pom.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/online-deployer/pom.xml Wed Sep  9 18:18:48 2009
@@ -67,8 +67,8 @@
         </dependency>
 
         <dependency>
-            <groupId>jline</groupId>
-            <artifactId>jline</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.jline</artifactId>
         </dependency>
         
         <dependency>
@@ -89,8 +89,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-utils</artifactId>
+          <groupId>org.apache.geronimo.bundles</groupId>
+          <artifactId>plexus-utils</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/plugin/pom.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/plugin/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/plugin/pom.xml Wed Sep  9 18:18:48 2009
@@ -36,6 +36,16 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>plexus-archiver</artifactId>
+        </dependency>
+
+        <dependency>
+          <groupId>org.apache.geronimo.bundles</groupId>
+          <artifactId>plexus-utils</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer-bootstrap</artifactId>
             <version>${version}</version>
@@ -85,24 +95,24 @@
         </dependency>
         
         <dependency>
-            <groupId>org.codehaus.plexus</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>plexus-archiver</artifactId>
         </dependency>
-        
+
         <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-utils</artifactId>
+          <groupId>org.apache.geronimo.bundles</groupId>
+          <artifactId>plexus-utils</artifactId>
         </dependency>
         
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-container-default</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.codehaus.plexus</groupId>-->
+            <!--<artifactId>plexus-container-default</artifactId>-->
+        <!--</dependency>-->
         
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-component-api</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.codehaus.plexus</groupId>-->
+            <!--<artifactId>plexus-component-api</artifactId>-->
+        <!--</dependency>-->
     </dependencies>
     
     <build>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/plugin/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/plugin/src/main/history/dependencies.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/plugin/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/plugin/src/main/history/dependencies.xml Wed Sep  9 18:18:48 2009
@@ -3,17 +3,22 @@
     <module-id>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>plugin</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>plexus-archiver</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>plexus-utils</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-archiver</artifactId>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>slf4j</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -22,23 +27,18 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-container-default</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-system</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.plugins.classloaders</groupId>
-        <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>rmi-naming</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-component-api</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.plugins.classloaders</groupId>
+        <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+        <type>car</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/pom.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/pom.xml Wed Sep  9 18:18:48 2009
@@ -39,7 +39,7 @@
         <module>client-system</module>
         <module>j2ee-security</module>
         <module>j2ee-system</module>
-        <module>jee-specs</module>
+        <!--<module>jee-specs</module>-->
         <module>jsr88-cli</module>
         <module>jsr88-deploymentfactory</module>
         <module>offline-deployer</module>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/pom.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/pom.xml Wed Sep  9 18:18:48 2009
@@ -50,12 +50,12 @@
             <type>car</type>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>jee-specs</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>jee-specs</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
 
         <!-- thread pool has management interface -->
         <dependency>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/src/main/history/dependencies.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/rmi-naming/src/main/history/dependencies.xml Wed Sep  9 18:18:48 2009
@@ -3,12 +3,17 @@
     <module-id>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>rmi-naming</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>slf4j</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-naming</artifactId>
+        <artifactId>geronimo-core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -18,17 +23,22 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-kernel</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-management</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>jee-specs</artifactId>
-        <type>car</type>
+        <artifactId>geronimo-naming</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-core</artifactId>
+        <artifactId>geronimo-system</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -37,6 +47,16 @@
         <type>car</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jta_1.1_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-naming</artifactId>
         <type>jar</type>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/shutdown/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/shutdown/pom.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/shutdown/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/shutdown/pom.xml Wed Sep  9 18:18:48 2009
@@ -71,8 +71,8 @@
         </dependency>
 
         <dependency>
-            <groupId>jline</groupId>
-            <artifactId>jline</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.jline</artifactId>
         </dependency>
     </dependencies>
 

Modified: geronimo/sandbox/djencks/osgi/framework/configs/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/xmlbeans/pom.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/xmlbeans/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/xmlbeans/pom.xml Wed Sep  9 18:18:48 2009
@@ -38,8 +38,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.xmlbeans</groupId>
-            <artifactId>xmlbeans</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
         </dependency>
 
         <dependency>
@@ -79,10 +79,8 @@
                             <import>classes</import>
                         </dependency>
                         <dependency>
-                            <groupId>org.apache.xmlbeans</groupId>
-                            <artifactId>xmlbeans</artifactId>
-                            <type>jar</type>
-                            <import>classes</import>
+                            <groupId>org.apache.servicemix.bundles</groupId>
+                            <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
                         </dependency>
                     </dependencies>
                 </configuration>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/xmlbeans/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/xmlbeans/src/main/history/dependencies.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/xmlbeans/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/xmlbeans/src/main/history/dependencies.xml Wed Sep  9 18:18:48 2009
@@ -3,17 +3,22 @@
     <module-id>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>xmlbeans</artifactId>
-        <version>2.2-SNAPSHOT</version>
+        <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.xmlbeans</groupId>
-        <artifactId>xmlbeans</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>j2ee-system</artifactId>
         <type>car</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>stax</groupId>
+        <artifactId>stax-api</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Copied: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java (from r811772, geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/ModuleConfigurer.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java?p2=geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java&p1=geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/ModuleConfigurer.java&r1=811772&r2=813067&rev=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/ModuleConfigurer.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java Wed Sep  9 18:18:48 2009
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.deployment;
+package org.apache.geronimo.deployment.spi;
 
 import javax.enterprise.deploy.spi.DeploymentConfiguration;
 import javax.enterprise.deploy.model.DeployableObject;

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java Wed Sep  9 18:18:48 2009
@@ -34,7 +34,7 @@
 import javax.enterprise.deploy.spi.exceptions.TargetException;
 import javax.enterprise.deploy.spi.status.ProgressObject;
 
-import org.apache.geronimo.deployment.ModuleConfigurer;
+import org.apache.geronimo.deployment.spi.ModuleConfigurer;
 
 /**
  * Implementation of a disconnected JSR88 DeploymentManager.

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/BaseDeploymentFactory.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/BaseDeploymentFactory.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/BaseDeploymentFactory.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/BaseDeploymentFactory.java Wed Sep  9 18:18:48 2009
@@ -34,7 +34,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.geronimo.deployment.ModuleConfigurer;
+import org.apache.geronimo.deployment.spi.ModuleConfigurer;
 import org.apache.geronimo.deployment.plugin.DisconnectedDeploymentManager;
 import org.apache.geronimo.deployment.plugin.jmx.LocalDeploymentManager;
 import org.apache.geronimo.deployment.plugin.jmx.RemoteDeploymentManager;

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryWithKernel.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryWithKernel.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryWithKernel.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryWithKernel.java Wed Sep  9 18:18:48 2009
@@ -25,7 +25,7 @@
 import javax.enterprise.deploy.spi.factories.DeploymentFactory;
 import javax.enterprise.deploy.shared.factories.DeploymentFactoryManager;
 
-import org.apache.geronimo.deployment.ModuleConfigurer;
+import org.apache.geronimo.deployment.spi.ModuleConfigurer;
 import org.apache.geronimo.deployment.plugin.jmx.RemoteDeploymentManager;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java Wed Sep  9 18:18:48 2009
@@ -36,7 +36,7 @@
 import javax.enterprise.deploy.spi.exceptions.TargetException;
 import javax.enterprise.deploy.spi.status.ProgressObject;
 
-import org.apache.geronimo.deployment.ModuleConfigurer;
+import org.apache.geronimo.deployment.spi.ModuleConfigurer;
 import org.apache.geronimo.deployment.plugin.TargetImpl;
 import org.apache.geronimo.deployment.plugin.TargetModuleIDImpl;
 import org.apache.geronimo.deployment.plugin.local.CommandSupport;

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/LocalDeploymentManager.java Wed Sep  9 18:18:48 2009
@@ -23,7 +23,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.geronimo.deployment.ModuleConfigurer;
+import org.apache.geronimo.deployment.spi.ModuleConfigurer;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.kernel.GBeanNotFoundException;

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java Wed Sep  9 18:18:48 2009
@@ -41,7 +41,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.geronimo.deployment.ModuleConfigurer;
+import org.apache.geronimo.deployment.spi.ModuleConfigurer;
 import org.apache.geronimo.deployment.plugin.GeronimoDeploymentManager;
 import org.apache.geronimo.deployment.plugin.local.AbstractDeployCommand;
 import org.apache.geronimo.deployment.plugin.local.DistributeCommand;

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/pom.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-tool/pom.xml Wed Sep  9 18:18:48 2009
@@ -58,8 +58,8 @@
         </dependency>
 
         <dependency>
-            <groupId>jline</groupId>
-            <artifactId>jline</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.jline</artifactId>
         </dependency>
     </dependencies>
     

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/pom.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deployment/pom.xml Wed Sep  9 18:18:48 2009
@@ -40,8 +40,8 @@
         </dependency>
         
         <dependency>
-            <groupId>org.apache.xmlbeans</groupId>
-            <artifactId>xmlbeans</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
         </dependency>
 
         <!--<dependency>-->
@@ -51,8 +51,8 @@
         <!--</dependency>-->
 
         <dependency>
-            <groupId>xml-resolver</groupId>
-            <artifactId>xml-resolver</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java Wed Sep  9 18:18:48 2009
@@ -211,7 +211,7 @@
         if (gbeanType.isArray()) {
             throw new IllegalArgumentException("GBean is an array type: gbeanType=" + gbeanType.getName());
         }
-        Set allTypes = ClassLoading.getAllTypes(gbeanType);
+        Set<Class> allTypes = ClassLoading.getAllTypes(gbeanType);
         for (Iterator iterator = allTypes.iterator(); iterator.hasNext();) {
             Class type = (Class) iterator.next();
             addInterface(type);

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/ClassLoading.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/ClassLoading.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/ClassLoading.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/ClassLoading.java Wed Sep  9 18:18:48 2009
@@ -385,28 +385,28 @@
         return Array.newInstance(type, dimensions).getClass();
     }
 
-    public static Set getAllTypes(Class type) {
-        Set allTypes = new LinkedHashSet();
+    public static Set<Class> getAllTypes(Class type) {
+        Set<Class> allTypes = new LinkedHashSet<Class>();
         allTypes.add(type);
         allTypes.addAll(getAllSuperClasses(type));
         allTypes.addAll(getAllInterfaces(type));
         return allTypes;
     }
 
-    private static Set getAllSuperClasses(Class clazz) {
-        Set allSuperClasses = new LinkedHashSet();
+    private static Set<Class> getAllSuperClasses(Class clazz) {
+        Set<Class> allSuperClasses = new LinkedHashSet<Class>();
         for (Class superClass = clazz.getSuperclass(); superClass != null; superClass = superClass.getSuperclass()) {
             allSuperClasses.add(superClass);
         }
         return allSuperClasses;
     }
 
-    private static Set getAllInterfaces(Class clazz) {
-        Set allInterfaces = new LinkedHashSet();
-        LinkedList stack = new LinkedList();
+    private static Set<Class> getAllInterfaces(Class clazz) {
+        Set<Class> allInterfaces = new LinkedHashSet<Class>();
+        LinkedList<Class> stack = new LinkedList<Class>();
         stack.addAll(Arrays.asList(clazz.getInterfaces()));
         while (!stack.isEmpty()) {
-            Class intf = (Class) stack.removeFirst();
+            Class intf = stack.removeFirst();
             if (!allInterfaces.contains(intf)) {
                 allInterfaces.add(intf);
                 stack.addAll(Arrays.asList(intf.getInterfaces()));

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java Wed Sep  9 18:18:48 2009
@@ -71,15 +71,15 @@
     private final ShutdownHook shutdownHook;
     private boolean online = true;
 
-    public KernelConfigurationManager(@ParamSpecial(type= SpecialAttributeType.kernel)Kernel kernel,
-                                      @ParamReference(name = "Stores")Collection<ConfigurationStore> stores,
-                                      @ParamReference(name = "AttributeStore")ManageableAttributeStore attributeStore,
-                                      @ParamReference(name = "PersistentConfigurationList")PersistentConfigurationList configurationList,
-                                      @ParamReference(name = "ArtifactManager")ArtifactManager artifactManager,
-                                      @ParamReference(name = "ArtifactResolver") ArtifactResolver artifactResolver,
-                                      @ParamReference(name = "Repositories")Collection<ListableRepository> repositories,
-                                      @ParamReference(name = "Watchers")Collection<DeploymentWatcher> watchers,
-                                      @ParamSpecial(type= SpecialAttributeType.bundleContext)BundleContext bundleContext) {
+    public KernelConfigurationManager(@ParamSpecial(type = SpecialAttributeType.kernel) Kernel kernel,
+                                      @ParamReference(name = "Stores") Collection<ConfigurationStore> stores,
+                                      @ParamReference(name = "AttributeStore", namingType = "AttributeStore") ManageableAttributeStore attributeStore,
+                                      @ParamReference(name = "PersistentConfigurationList") PersistentConfigurationList configurationList,
+                                      @ParamReference(name = "ArtifactManager", namingType = "ArtifactManager") ArtifactManager artifactManager,
+                                      @ParamReference(name = "ArtifactResolver", namingType = "ArtifactResolver") ArtifactResolver artifactResolver,
+                                      @ParamReference(name = "Repositories") Collection<ListableRepository> repositories,
+                                      @ParamReference(name = "Watchers") Collection<DeploymentWatcher> watchers,
+                                      @ParamSpecial(type = SpecialAttributeType.bundleContext) BundleContext bundleContext) {
 
         super(stores,
                 createArtifactResolver(artifactResolver, artifactManager, repositories),
@@ -169,8 +169,10 @@
         // add parents to the parents reference collection
         LinkedHashSet<AbstractName> parentNames = new LinkedHashSet<AbstractName>();
         for (Artifact resolvedParentId : resolvedParentIds) {
-            AbstractName parentName = Configuration.getConfigurationAbstractName(resolvedParentId);
-            parentNames.add(parentName);
+            if (isConfiguration(resolvedParentId)) {
+                AbstractName parentName = Configuration.getConfigurationAbstractName(resolvedParentId);
+                parentNames.add(parentName);
+            }
         }
         gbeanData.addDependencies(parentNames);
 
@@ -200,7 +202,7 @@
             }
             Map<Artifact, Configuration> moreLoadedConfigurations = new LinkedHashMap<Artifact, Configuration>(loadedConfigurations);
             moreLoadedConfigurations.put(dependencyNode.getId(), configuration);
-            for (Map.Entry<String, ConfigurationData> childEntry: configurationData.getChildConfigurations().entrySet()) {
+            for (Map.Entry<String, ConfigurationData> childEntry : configurationData.getChildConfigurations().entrySet()) {
                 ConfigurationResolver childResolver = configurationResolver.createChildResolver(childEntry.getKey());
                 Configuration child = doLoad(childEntry.getValue(), resolvedParentIds, moreLoadedConfigurations, childResolver);
                 configuration.addChild(child);

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/classloading/MavenDependencyResolver.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/classloading/MavenDependencyResolver.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/classloading/MavenDependencyResolver.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/classloading/MavenDependencyResolver.java Wed Sep  9 18:18:48 2009
@@ -57,19 +57,19 @@
     }
 
     void addDependencies(GlobalClassLoaderRegister register, InputStream dependencyDeclaration, Artifact docSourceArtifact) {
-        SAXParserFactory factory = SAXParserFactory.newInstance();
-        try {
-            SAXParser parser = factory.newSAXParser();
-            parser.parse(dependencyDeclaration, new DependencySAXHandler(register, docSourceArtifact));
-        } catch (NullPointerException e) {
-            log.error("error parsing " + dependencyDeclaration, e);
-        } catch (SAXException e) {
-            log.error("error parsing " + dependencyDeclaration, e);
-        } catch (ParserConfigurationException e) {
-            log.error("error parsing " + dependencyDeclaration, e);
-        } catch (IOException e) {
-            //missing/unreadable file
-        }
+//        SAXParserFactory factory = SAXParserFactory.newInstance();
+//        try {
+//            SAXParser parser = factory.newSAXParser();
+//            parser.parse(dependencyDeclaration, new DependencySAXHandler(register, docSourceArtifact));
+//        } catch (NullPointerException e) {
+//            log.error("error parsing " + dependencyDeclaration, e);
+//        } catch (SAXException e) {
+//            log.error("error parsing " + dependencyDeclaration, e);
+//        } catch (ParserConfigurationException e) {
+//            log.error("error parsing " + dependencyDeclaration, e);
+//        } catch (IOException e) {
+//            //missing/unreadable file
+//        }
     }
     
     protected InputStream locateDependencyDeclaration(URL url) throws IOException {

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/pom.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/pom.xml Wed Sep  9 18:18:48 2009
@@ -18,20 +18,21 @@
 
 <!-- $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">
 
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <artifactId>modules</artifactId>
         <groupId>org.apache.geronimo.framework</groupId>
         <version>3.0-SNAPSHOT</version>
     </parent>
-    
+
     <artifactId>geronimo-plugin</artifactId>
     <packaging>bundle</packaging>
     <name>Geronimo Framework, Modules :: Plugin</name>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
@@ -67,8 +68,15 @@
 
         <!-- archiver seems to need to be same version as maven uses ??? -->
         <dependency>
-            <groupId>org.codehaus.plexus</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>plexus-archiver</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>plexus-utils</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.testsupport</groupId>

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/GeronimoSourceRepository.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/GeronimoSourceRepository.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/GeronimoSourceRepository.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/GeronimoSourceRepository.java Wed Sep  9 18:18:48 2009
@@ -30,7 +30,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.SortedSet;
-import java.util.LinkedHashSet;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 
@@ -49,6 +48,7 @@
 import org.apache.geronimo.system.configuration.RepositoryConfigurationStore;
 import org.apache.geronimo.system.plugin.model.PluginListType;
 import org.apache.geronimo.system.plugin.model.PluginType;
+import org.apache.geronimo.system.plugin.model.PluginXmlUtil;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/LocalSourceRepository.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/LocalSourceRepository.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/LocalSourceRepository.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/LocalSourceRepository.java Wed Sep  9 18:18:48 2009
@@ -34,6 +34,7 @@
 import org.apache.geronimo.kernel.repository.Maven2Repository;
 import org.apache.geronimo.kernel.repository.MissingDependencyException;
 import org.apache.geronimo.system.plugin.model.PluginListType;
+import org.apache.geronimo.system.plugin.model.PluginXmlUtil;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Wed Sep  9 18:18:48 2009
@@ -98,6 +98,7 @@
 import org.apache.geronimo.system.plugin.model.PluginType;
 import org.apache.geronimo.system.plugin.model.PrerequisiteType;
 import org.apache.geronimo.system.plugin.model.PropertyType;
+import org.apache.geronimo.system.plugin.model.PluginXmlUtil;
 import org.apache.geronimo.system.repository.Maven2Repository;
 import org.apache.geronimo.system.serverinfo.BasicServerInfo;
 import org.apache.geronimo.system.serverinfo.ServerInfo;

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/RemoteSourceRepository.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/RemoteSourceRepository.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/RemoteSourceRepository.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/RemoteSourceRepository.java Wed Sep  9 18:18:48 2009
@@ -44,6 +44,7 @@
 import org.apache.geronimo.kernel.repository.WriteableRepository;
 import org.apache.geronimo.kernel.util.XmlUtil;
 import org.apache.geronimo.system.plugin.model.PluginListType;
+import org.apache.geronimo.system.plugin.model.PluginXmlUtil;
 import org.apache.geronimo.crypto.encoders.Base64;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-plugin/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java Wed Sep  9 18:18:48 2009
@@ -35,6 +35,7 @@
 import org.apache.geronimo.system.plugin.model.GbeanType;
 import org.apache.geronimo.system.plugin.model.PluginArtifactType;
 import org.apache.geronimo.system.plugin.model.PluginType;
+import org.apache.geronimo.system.plugin.model.PluginXmlUtil;
 import org.apache.geronimo.testsupport.DOMUtils;
 import org.w3c.dom.Document;
 

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/pom.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/pom.xml Wed Sep  9 18:18:48 2009
@@ -39,18 +39,19 @@
             <artifactId>geronimo-management</artifactId>
             <version>${version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>rmi-naming</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jacc_1.1_spec</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -75,6 +76,13 @@
             <version>${version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     
     <build>

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/AbstractTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/AbstractTest.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/AbstractTest.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/AbstractTest.java Wed Sep  9 18:18:48 2009
@@ -38,6 +38,7 @@
 import org.apache.geronimo.gbean.MultiGBeanInfoFactory;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelFactory;
+import org.apache.geronimo.kernel.osgi.MockBundleContext;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.security.jaas.ConfigurationEntryFactory;
 import org.apache.geronimo.security.jaas.GeronimoLoginConfiguration;
@@ -63,7 +64,9 @@
     protected boolean needLoginConfiguration = true;
 
     protected void setUp() throws Exception {
-        kernel = KernelFactory.newInstance(bundle).createKernel("test.kernel");
+        bundleContext = new MockBundleContext(getClass().getClassLoader(), BASEDIR.getAbsolutePath(), null, null);
+
+        kernel = KernelFactory.newInstance(bundleContext).createKernel("test.kernel");
         kernel.boot();
 
         GBeanData gbean;
@@ -73,14 +76,14 @@
             gbean = buildGBeanData("name", "ServerInfo", BasicServerInfo.class);
             serverInfo = gbean.getAbstractName();
             gbean.setAttribute("baseDirectory", BASEDIR.getAbsolutePath());
-            kernel.loadGBean(gbean, ServerInfo.class.getClassLoader());
+            kernel.loadGBean(gbean, bundleContext);
             kernel.startGBean(serverInfo);
         }
         if (needLoginConfiguration) {
             gbean = buildGBeanData("name", "LoginConfiguration", GeronimoLoginConfiguration.class);
             loginConfiguration = gbean.getAbstractName();
             gbean.setReferencePattern("Configurations", new AbstractNameQuery(ConfigurationEntryFactory.class.getName()));
-            kernel.loadGBean(gbean, GeronimoLoginConfiguration.class.getClassLoader());
+            kernel.loadGBean(gbean, bundleContext);
             kernel.startGBean(loginConfiguration);
         }
 

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/AbstractLoginModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/AbstractLoginModuleTest.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/AbstractLoginModuleTest.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/AbstractLoginModuleTest.java Wed Sep  9 18:18:48 2009
@@ -46,13 +46,13 @@
 
         gbean = setupTestLoginModule();
         testCE = gbean.getAbstractName();
-        kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
+        kernel.loadGBean(gbean, bundleContext);
 
         gbean = buildGBeanData("name", "PropertiesLoginModuleUse", JaasLoginModuleUse.class);
         AbstractName testUseName = gbean.getAbstractName();
         gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
         gbean.setReferencePattern("LoginModule", testCE);
-        kernel.loadGBean(gbean, JaasLoginModuleUse.class.getClassLoader());
+        kernel.loadGBean(gbean, bundleContext);
 
         gbean = buildGBeanData("name", "PropertiesSecurityRealm", GenericSecurityRealm.class);
         testRealm = gbean.getAbstractName();
@@ -61,7 +61,7 @@
         gbean.setReferencePattern("LoginModuleConfiguration", testUseName);
         gbean.setReferencePattern("ServerInfo", serverInfo);
         gbean.setAttribute("global", Boolean.TRUE);
-        kernel.loadGBean(gbean, GenericSecurityRealm.class.getClassLoader());
+        kernel.loadGBean(gbean, bundleContext);
 
         gbean = buildGBeanData("name", "NeverFailLoginModule", LoginModuleGBean.class);
         neverFailModule = gbean.getAbstractName();
@@ -69,14 +69,14 @@
         gbean.setAttribute("options", null);
         gbean.setAttribute("loginDomainName", "NeverFailDomain");
         gbean.setAttribute("wrapPrincipals", Boolean.TRUE);
-        kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
+        kernel.loadGBean(gbean, bundleContext);
         kernel.startGBean(neverFailModule);
 
         gbean = buildGBeanData("name", "PropertiesLoginModuleUse2", JaasLoginModuleUse.class);
         AbstractName propsUseName = gbean.getAbstractName();
         gbean.setAttribute("controlFlag", LoginModuleControlFlag.OPTIONAL);
         gbean.setReferencePattern("LoginModule", testCE);
-        kernel.loadGBean(gbean, JaasLoginModuleUse.class.getClassLoader());
+        kernel.loadGBean(gbean, bundleContext);
         kernel.startGBean(propsUseName);
 
         gbean = buildGBeanData("name", "NeverFailLoginModuleUse", JaasLoginModuleUse.class);
@@ -84,7 +84,7 @@
         gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
         gbean.setReferencePattern("LoginModule", neverFailModule);
         gbean.setReferencePattern("Next", propsUseName);
-        kernel.loadGBean(gbean, JaasLoginModuleUse.class.getClassLoader());
+        kernel.loadGBean(gbean, bundleContext);
         kernel.startGBean(neverFailUseName);
 
         gbean = buildGBeanData("name", "PropertiesSecurityRealm2", GenericSecurityRealm.class);
@@ -94,7 +94,7 @@
         gbean.setReferencePattern("LoginModuleConfiguration", neverFailUseName);
         gbean.setReferencePattern("ServerInfo", serverInfo);
         gbean.setAttribute("global", Boolean.TRUE);
-        kernel.loadGBean(gbean, GenericSecurityRealm.class.getClassLoader());
+        kernel.loadGBean(gbean, bundleContext);
 
         kernel.startGBean(loginConfiguration);
         kernel.startGBean(testCE);

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java Wed Sep  9 18:18:48 2009
@@ -30,6 +30,7 @@
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelFactory;
+import org.apache.geronimo.kernel.osgi.MockBundleContext;
 import org.apache.geronimo.security.AbstractTest;
 import org.apache.geronimo.security.ContextManager;
 import org.apache.geronimo.security.IdentificationPrincipal;
@@ -44,7 +45,7 @@
  */
 public class ConfigurationEntryTest extends AbstractTest {
     
-    protected Kernel kernel;
+//    protected Kernel kernel;
     protected AbstractName serverInfo;
     protected AbstractName loginConfiguration;
     protected AbstractName testUPCred;
@@ -111,7 +112,9 @@
     }
 
     protected void setUp() throws Exception {
-        kernel = KernelFactory.newInstance(bundle).createKernel("test.kernel");
+//        super.setUp();
+        bundleContext = new MockBundleContext(getClass().getClassLoader(), BASEDIR.getAbsolutePath(), null, null);
+        kernel = KernelFactory.newInstance(bundleContext).createKernel("test.kernel");
         kernel.boot();
 
         GBeanData gbean;
@@ -121,13 +124,13 @@
         gbean = buildGBeanData("name", "ServerInfo", BasicServerInfo.class);
         serverInfo = gbean.getAbstractName();
         gbean.setAttribute("baseDirectory", BASEDIR.getAbsolutePath());
-        kernel.loadGBean(gbean, ServerInfo.class.getClassLoader());
+        kernel.loadGBean(gbean, bundleContext);
         kernel.startGBean(serverInfo);
 
         gbean = buildGBeanData("new", "LoginConfiguration", GeronimoLoginConfiguration.class);
         loginConfiguration = gbean.getAbstractName();
         gbean.setReferencePattern("Configurations", new AbstractNameQuery(ConfigurationEntryFactory.class.getName()));
-        kernel.loadGBean(gbean, GeronimoLoginConfiguration.class.getClassLoader());
+        kernel.loadGBean(gbean, bundleContext);
 
         gbean = buildGBeanData("name", "PropertiesLoginModule", LoginModuleGBean.class);
         testProperties = gbean.getAbstractName();
@@ -138,13 +141,13 @@
         gbean.setAttribute("options", props);
         gbean.setAttribute("loginDomainName", "TestProperties");
         gbean.setAttribute("wrapPrincipals", Boolean.TRUE);
-        kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
+        kernel.loadGBean(gbean, bundleContext);
 
         gbean = buildGBeanData("name", "GeronimoPasswordCredentialLoginModule", LoginModuleGBean.class);
         testUPCred = gbean.getAbstractName();
         gbean.setAttribute("loginModuleClass", "org.apache.geronimo.security.realm.providers.GeronimoPasswordCredentialLoginModule");
         gbean.setAttribute("options", new HashMap<String, Object>());
-        kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
+        kernel.loadGBean(gbean, bundleContext);
 
         gbean = buildGBeanData    ("name", "AuditLoginModule", LoginModuleGBean.class);
         testCE = gbean.getAbstractName();
@@ -152,27 +155,27 @@
         props = new HashMap<String, Object>();
         props.put("file", new File(BASEDIR, "target/login-audit.log").getPath());
         gbean.setAttribute("options", props);
-        kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
+        kernel.loadGBean(gbean, bundleContext);
 
         gbean = buildGBeanData("name", "GeronimoPasswordCredentialLoginModuleUse", JaasLoginModuleUse.class);
         AbstractName testUseName3 = gbean.getAbstractName();
         gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
         gbean.setReferencePattern("LoginModule", testUPCred);
-        kernel.loadGBean(gbean, JaasLoginModuleUse.class.getClassLoader());
+        kernel.loadGBean(gbean, bundleContext);
 
         gbean = buildGBeanData("name", "AuditLoginModuleUse", JaasLoginModuleUse.class);
         AbstractName testUseName2 = gbean.getAbstractName();
         gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
         gbean.setReferencePattern("LoginModule", testCE);
         gbean.setReferencePattern("Next", testUseName3);
-        kernel.loadGBean(gbean, JaasLoginModuleUse.class.getClassLoader());
+        kernel.loadGBean(gbean, bundleContext);
 
         gbean = buildGBeanData("name", "PropertiesLoginModuleUse", JaasLoginModuleUse.class);
         AbstractName testUseName1 = gbean.getAbstractName();
         gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
         gbean.setReferencePattern("LoginModule", testProperties);
         gbean.setReferencePattern("Next", testUseName2);
-        kernel.loadGBean(gbean, JaasLoginModuleUse.class.getClassLoader());
+        kernel.loadGBean(gbean, bundleContext);
 
         gbean = buildGBeanData("name", "PropertiesSecurityRealm", GenericSecurityRealm.class);
         testRealm = gbean.getAbstractName();
@@ -180,7 +183,7 @@
         gbean.setReferencePattern("LoginModuleConfiguration", testUseName1);
         gbean.setReferencePattern("ServerInfo", serverInfo);
         gbean.setAttribute("global", Boolean.TRUE);
-        kernel.loadGBean(gbean, GenericSecurityRealm.class.getClassLoader());
+        kernel.loadGBean(gbean, bundleContext);
 
         kernel.startGBean(loginConfiguration);
         kernel.startGBean(testCE);

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginKerberosNonGeronimoTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginKerberosNonGeronimoTest.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginKerberosNonGeronimoTest.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginKerberosNonGeronimoTest.java Wed Sep  9 18:18:48 2009
@@ -64,14 +64,14 @@
         props.put("useTicketCache", "true");
         props.put("doNotPrompt", "true");
         gbean.setAttribute("options", props);
-        kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
+        kernel.loadGBean(gbean, bundleContext);
 
         gbean = buildGBeanData("name", "kerberosConfigurationEntry", DirectConfigurationEntry.class);
         kerberosCE = gbean.getAbstractName();
         gbean.setAttribute("applicationConfigName", "kerberos-foobar");
         gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
         gbean.setReferencePattern("Module", kerberosLM);
-        kernel.loadGBean(gbean, DirectConfigurationEntry.class.getClassLoader());
+        kernel.loadGBean(gbean, bundleContext);
 
         kernel.startGBean(loginConfiguration);
         kernel.startGBean(kerberosLM);

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginKerberosTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginKerberosTest.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginKerberosTest.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginKerberosTest.java Wed Sep  9 18:18:48 2009
@@ -52,19 +52,19 @@
         props.put("useTicketCache", "true");
         props.put("doNotPrompt", "true");
         gbean.setAttribute("options", props);
-        kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
+        kernel.loadGBean(gbean, bundleContext);
 
         gbean = buildGBeanData("name", "KerberosLoginModuleUse", JaasLoginModuleUse.class);
         AbstractName testUseName = gbean.getAbstractName();
         gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
         gbean.setReferencePattern("LoginModule", kerberosLM);
-        kernel.loadGBean(gbean, JaasLoginModuleUse.class.getClassLoader());
+        kernel.loadGBean(gbean, bundleContext);
 
         gbean = buildGBeanData("name", "KerberosSecurityRealm", GenericSecurityRealm.class);
         kerberosRealm = gbean.getAbstractName();
         gbean.setAttribute("realmName", "TOOLAZYDOGS.COM");
         gbean.setReferencePattern("LoginModuleConfiguration", testUseName);
-        kernel.loadGBean(gbean, GenericSecurityRealm.class.getClassLoader());
+        kernel.loadGBean(gbean, bundleContext);
         kernel.startGBean(kerberosLM);
         kernel.startGBean(testUseName);
         kernel.startGBean(kerberosRealm);

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/TimeoutTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/TimeoutTest.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/TimeoutTest.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/TimeoutTest.java Wed Sep  9 18:18:48 2009
@@ -64,13 +64,13 @@
         gbean.setAttribute("options", props);
         gbean.setAttribute("loginDomainName", "PropertiesDomain");
         gbean.setAttribute("wrapPrincipals", Boolean.TRUE);
-        kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
+        kernel.loadGBean(gbean, bundleContext);
 
         gbean = buildGBeanData("name", "PropertiesLoginModuleUse", JaasLoginModuleUse.class);
         AbstractName testUseName = gbean.getAbstractName();
         gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
         gbean.setReferencePattern("LoginModule", testCE);
-        kernel.loadGBean(gbean, JaasLoginModuleUse.class.getClassLoader());
+        kernel.loadGBean(gbean, bundleContext);
 
         gbean = buildGBeanData("name", "PropertiesSecurityRealm", GenericSecurityRealm.class);
         testRealm = gbean.getAbstractName();
@@ -78,7 +78,7 @@
         gbean.setReferencePattern("LoginModuleConfiguration", testUseName);
         gbean.setReferencePattern("ServerInfo", serverInfo);
         gbean.setAttribute("global", Boolean.TRUE);
-        kernel.loadGBean(gbean, GenericSecurityRealm.class.getClassLoader());
+        kernel.loadGBean(gbean, bundleContext);
 
         kernel.startGBean(loginConfiguration);
         kernel.startGBean(testCE);

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/pom.xml?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/pom.xml Wed Sep  9 18:18:48 2009
@@ -29,7 +29,7 @@
 
     <artifactId>geronimo-service-builder</artifactId>
     <!--wipes out xmlbeans classes-->
-    <!--<packaging>bundle</packaging>-->
+    <packaging>bundle</packaging>
     <name>Geronimo Framework, Modules :: Service Builder</name>
     
     <dependencies>
@@ -42,8 +42,8 @@
 
         <!-- required for environment dconfigbean support -->
         <dependency>
-            <groupId>org.apache.xmlbeans</groupId>
-            <artifactId>xmlbeans</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
         </dependency>
 
         <dependency>
@@ -76,22 +76,33 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
+                <version>2.3.3-SNAPSHOT</version>
             </plugin>
-            
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+                        <Import-Package>org.apache.xmlbeans.impl.schema,*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+
             <!--
             HACK: Copy XmlBeans generated schemas.
             -->
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>buildsupport-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>copy-xmlbeans-schemas</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+            <!--<plugin>-->
+                <!--<groupId>org.apache.geronimo.buildsupport</groupId>-->
+                <!--<artifactId>buildsupport-maven-plugin</artifactId>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<goals>-->
+                            <!--<goal>copy-xmlbeans-schemas</goal>-->
+                        <!--</goals>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+            <!--</plugin>-->
         </plugins>
     </build>
 

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java?rev=813067&r1=813066&r2=813067&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java Wed Sep  9 18:18:48 2009
@@ -47,6 +47,7 @@
 import org.apache.geronimo.gbean.annotation.ParamReference;
 import org.apache.geronimo.gbean.annotation.ParamSpecial;
 import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
+import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.Naming;
@@ -68,6 +69,7 @@
 /**
  * @version $Rev$ $Date$
  */
+@GBean(j2eeType = "ConfigBuilder")
 public class ServiceConfigBuilder implements ConfigurationBuilder, GBeanLifecycle {
     private final Environment defaultEnvironment;
     private final Collection<Repository> repositories;
@@ -207,7 +209,7 @@
         return buildConfiguration(inPlaceDeployment, configId, configType, jar, configurationStores, artifactResolver, targetConfigurationStore);
     }
 
-    public DeploymentContext buildConfiguration(boolean inPlaceDeployment, Artifact configId, ModuleType moduleType, JarFile jar, Collection<ConfigurationStore> configurationStores, ArtifactResolver artifactResolver, ConfigurationStore targetConfigurationStore) throws DeploymentException, IOException {
+    private DeploymentContext buildConfiguration(boolean inPlaceDeployment, Artifact configId, ModuleType moduleType, JarFile jar, Collection<ConfigurationStore> configurationStores, ArtifactResolver artifactResolver, ConfigurationStore targetConfigurationStore) throws DeploymentException, IOException {
         ArtifactType type = moduleType.getEnvironment().isSetModuleId() ? moduleType.getEnvironment().getModuleId() : moduleType.getEnvironment().addNewModuleId();
         type.setArtifactId(configId.getArtifactId());
         type.setGroupId(configId.getGroupId());



Mime
View raw message