geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r690859 [3/6] - in /geronimo/server/trunk: ./ assemblies/geronimo-jetty6-javaee5/ buildsupport/car-maven-plugin/ buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ buildsupport/car-maven-plugin/src/test/java/o...
Date Mon, 01 Sep 2008 06:30:48 GMT
Modified: geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -13,42 +13,97 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-j2ee</artifactId>
+        <artifactId>jee-specs</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>jee-specs</artifactId>
+        <artifactId>client-system</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-management</artifactId>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-loader</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-javaagent</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openjpa</groupId>
+        <artifactId>openjpa</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>asm-finder</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-jee</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.codehaus.swizzle</groupId>
+        <artifactId>swizzle-stream</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-openejb</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-client</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-reflect</artifactId>
+        <artifactId>xbean-naming</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>client-system</artifactId>
-        <type>car</type>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-core</artifactId>
+        <artifactId>geronimo-j2ee</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-crypto</artifactId>
+        <artifactId>geronimo-management</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-naming</artifactId>
+        <groupId>wsdl4j</groupId>
+        <artifactId>wsdl4j</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-client</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>net.sourceforge.serp</groupId>
+        <artifactId>serp</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-server</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -57,18 +112,23 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-openejb</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-naming</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-client</artifactId>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-ejbd</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-naming</artifactId>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-core</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml Sun Aug 31 23:30:25 2008
@@ -43,6 +43,7 @@
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector-builder</artifactId>
             <version>${version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/client/geronimo-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/geronimo-client/pom.xml Sun Aug 31 23:30:25 2008
@@ -44,12 +44,24 @@
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-security</artifactId>
             <version>${version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.geronimo.components</groupId>
+                    <artifactId>geronimo-jaspi</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>jee-specs</artifactId>
+            <version>${version}</version>
+            <type>car</type>
         </dependency>
 
         <!-- g-j2ee, jta spec, connector spec comes transitively from this -->
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-transaction</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/plugins/clustering/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/clustering/pom.xml Sun Aug 31 23:30:25 2008
@@ -79,10 +79,6 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                     <category>Clustering</category>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/trunk/plugins/clustering/farming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/farming/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/farming/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/farming/pom.xml Sun Aug 31 23:30:25 2008
@@ -79,10 +79,6 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                     <category>Clustering</category>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml Sun Aug 31 23:30:25 2008
@@ -64,6 +64,13 @@
             <groupId>org.codehaus.wadi</groupId>
             <artifactId>wadi-tribes</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl104-over-slf4j</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml Sun Aug 31 23:30:25 2008
@@ -95,10 +95,6 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                     <category>Clustering</category>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/concurrent/geronimo-concurrent-builder/pom.xml Sun Aug 31 23:30:25 2008
@@ -39,6 +39,10 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-concurrent_1.0_spec</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/trunk/plugins/concurrent/geronimo-concurrent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/concurrent/geronimo-concurrent/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/concurrent/geronimo-concurrent/pom.xml (original)
+++ geronimo/server/trunk/plugins/concurrent/geronimo-concurrent/pom.xml Sun Aug 31 23:30:25 2008
@@ -48,6 +48,12 @@
         </dependency>
 
         <dependency>
+            <!-- for constants -->
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+            <version>${version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-naming</artifactId>
             <version>${version}</version>

Modified: geronimo/server/trunk/plugins/connector/client-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/client-transaction/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/client-transaction/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/client-transaction/pom.xml Sun Aug 31 23:30:25 2008
@@ -64,33 +64,33 @@
             <version>${version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.components</groupId>
-            <artifactId>geronimo-connector</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-transaction</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.components</groupId>
-            <artifactId>geronimo-transaction</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-persistence-jpa10</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-transformer</artifactId>
-            <version>${version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.components</groupId>-->
+            <!--<artifactId>geronimo-connector</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-transaction</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.components</groupId>-->
+            <!--<artifactId>geronimo-transaction</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-persistence-jpa10</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-transformer</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
     </dependencies>
 
     <build>
@@ -100,10 +100,6 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <category>Geronimo Core</category>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
                             <config-xml-content load="false"/>

Modified: geronimo/server/trunk/plugins/connector/client-transaction/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/client-transaction/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/client-transaction/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/connector/client-transaction/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -17,16 +17,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-persistence-jpa10</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-transformer</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>client-security</artifactId>
         <type>car</type>
@@ -46,4 +36,9 @@
         <artifactId>client</artifactId>
         <type>car</type>
     </dependency>
+    <dependency>
+        <groupId>org.objectweb.howl</groupId>
+        <artifactId>howl</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml Sun Aug 31 23:30:25 2008
@@ -44,6 +44,13 @@
             <artifactId>geronimo-deploy-config</artifactId>
             <version>${version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>jee-specs</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Sun Aug 31 23:30:25 2008
@@ -647,16 +647,18 @@
         return activationSpecInfos;
     }
 
-    private void setUpDynamicGBean(String activationSpecClassName, GBeanInfoBuilder infoBuilder, Set<String> ignore, ClassLoader cl, boolean decapitalize) throws DeploymentException {
+    private void setUpDynamicGBean(String adapterClassName, GBeanInfoBuilder infoBuilder, Set<String> ignore, ClassLoader cl, boolean decapitalize) throws DeploymentException {
         //add all javabean properties that have both getter and setter.  Ignore the "required" flag from the dd.
         Map<String, String> getters = new HashMap<String, String>();
         Set<String> setters = new HashSet<String>();
         Method[] methods;
         try {
-            Class activationSpecClass = cl.loadClass(activationSpecClassName);
+            Class activationSpecClass = cl.loadClass(adapterClassName);
             methods = activationSpecClass.getMethods();
         } catch (ClassNotFoundException e) {
-            throw new DeploymentException("Can not load activation spec class", e);
+            throw new DeploymentException("Can not load adapter class in classloader " + cl, e);
+        } catch (NoClassDefFoundError e) {
+            throw new DeploymentException("Can not load adapter class in classloader " + cl, e);
         }
         for (Method method : methods) {
             String methodName = method.getName();

Modified: geronimo/server/trunk/plugins/connector/geronimo-connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector/pom.xml Sun Aug 31 23:30:25 2008
@@ -77,10 +77,10 @@
         </dependency>
 
         <!-- needed for passwordcredential realm-->
-        <dependency>
-            <groupId>regexp</groupId>
-            <artifactId>regexp</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>regexp</groupId>-->
+            <!--<artifactId>regexp</artifactId>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
@@ -90,6 +90,11 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl104-over-slf4j</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/plugins/connector/geronimo-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-transaction/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-transaction/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-transaction/pom.xml Sun Aug 31 23:30:25 2008
@@ -27,11 +27,11 @@
         <artifactId>connector</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
-    
+
     <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-transaction</artifactId>
     <name>Geronimo Plugins, Connector :: Transaction</name>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.components</groupId>
@@ -53,18 +53,21 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.1_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.objectweb.howl</groupId>
             <artifactId>howl</artifactId>
         </dependency>
+
     </dependencies>
-    
+
 </project>
 

Modified: geronimo/server/trunk/plugins/connector/transaction/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/transaction/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/transaction/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/connector/transaction/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -27,21 +27,6 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-persistence-jpa10</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-transformer</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-core</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.components</groupId>
         <artifactId>geronimo-transaction</artifactId>
         <type>jar</type>
@@ -56,4 +41,9 @@
         <artifactId>howl</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-persistence-jpa10</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml Sun Aug 31 23:30:25 2008
@@ -85,12 +85,6 @@
         </dependency>
         
         <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
             <groupId>javax.portlet</groupId>
             <artifactId>portlet-api</artifactId>
             <scope>provided</scope>
@@ -108,6 +102,12 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
     
   <!-- Build configuration -->

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/ApacheConfigPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/ApacheConfigPortlet.java?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/ApacheConfigPortlet.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/apache/jk/ApacheConfigPortlet.java Sun Aug 31 23:30:25 2008
@@ -49,11 +49,11 @@
             return;
         }
         String mode = renderRequest.getParameter(MODE_KEY);
-        ApacheModel model = (ApacheModel)getModel(renderRequest);
+        ApacheModel model = getModel(renderRequest);
         if(mode == null || mode.equals("")) {
             mode = getDefaultMode();
         }
-        MultiPageAbstractHandler handler = (MultiPageAbstractHandler)helpers.get(mode);
+        MultiPageAbstractHandler handler = helpers.get(mode);
         try {
             if(handler != null) {
                 handler.renderView(renderRequest, renderResponse, model);

Modified: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/MultiPagePortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/MultiPagePortlet.java?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/MultiPagePortlet.java (original)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/MultiPagePortlet.java Sun Aug 31 23:30:25 2008
@@ -16,26 +16,26 @@
  */
 package org.apache.geronimo.console;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.commons.fileupload.portlet.PortletFileUpload;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileUploadException;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
+import javax.portlet.PortletConfig;
 import javax.portlet.PortletException;
+import javax.portlet.PortletRequest;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 import javax.portlet.WindowState;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletRequest;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.io.IOException;
+
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.portlet.PortletFileUpload;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A base class for porlets consisting on multiple JSPs with before and after

Modified: geronimo/server/trunk/plugins/console/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-jetty/pom.xml Sun Aug 31 23:30:25 2008
@@ -144,10 +144,6 @@
                     </module>
                     <category>Administration</category>
                     <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/console/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-tomcat/pom.xml Sun Aug 31 23:30:25 2008
@@ -144,10 +144,6 @@
                     </module>
                     <category>Administration</category>
                     <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml Sun Aug 31 23:30:25 2008
@@ -62,16 +62,6 @@
             <type>car</type>
         </dependency>
 
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-
         <!-- to force build order -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -117,10 +107,6 @@
                     </module>
                     <category>Administration</category>
                     <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -7,11 +7,6 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>commons-fileupload</groupId>
-        <artifactId>commons-fileupload</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console-jetty</artifactId>
         <type>car</type>
@@ -26,9 +21,4 @@
         <artifactId>plugin</artifactId>
         <type>car</type>
     </dependency>
-    <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml Sun Aug 31 23:30:25 2008
@@ -62,16 +62,6 @@
             <type>car</type>
         </dependency>
 
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-
         <!-- to force build order -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -117,10 +107,6 @@
                     </module>
                     <category>Administration</category>
                     <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -12,11 +12,6 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>commons-fileupload</groupId>
-        <artifactId>commons-fileupload</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>j2ee-deployer</artifactId>
         <type>car</type>
@@ -26,9 +21,4 @@
         <artifactId>plugin</artifactId>
         <type>car</type>
     </dependency>
-    <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml Sun Aug 31 23:30:25 2008
@@ -115,8 +115,15 @@
         </dependency>
         
         <dependency>
-            <groupId>org.apache.xmlbeans</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>xmlbeans</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml Sun Aug 31 23:30:25 2008
@@ -68,6 +68,56 @@
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.activmq</groupId>
+                    <artifactId>activmq-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.openejb</groupId>
+                    <artifactId>openejb-loader</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.openejb</groupId>
+                    <artifactId>openejb-javaagent</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.openejb</groupId>
+                    <artifactId>asm-finder</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.openejb</groupId>
+                    <artifactId>openejb-jee</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.openjpa</groupId>
+                    <artifactId>openjpa</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.sourceforge.serp</groupId>
+                    <artifactId>serp</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>wedl4j</groupId>
+                    <artifactId>wedl4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.swizzle</groupId>
+                    <artifactId>swizzle-stream</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-collections</groupId>
+                    <artifactId>commons-collections</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-lang</groupId>
+                    <artifactId>commons-lang</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>wsdl4j</groupId>
+                    <artifactId>wsdl4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -124,10 +174,6 @@
                         <deploymentConfig>${openejbcorbaDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <category>Geronimo Core</category>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
                             <config-xml-content load="false"/>

Modified: geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -7,11 +7,6 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-client</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.yoko</groupId>
         <artifactId>yoko-rmi-impl</artifactId>
         <type>jar</type>
@@ -32,11 +27,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-core</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>client-security</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml Sun Aug 31 23:30:25 2008
@@ -36,15 +36,22 @@
         <!-- g-kernel, g-security, g-transaction, g-management comes transistively -->
         <!-- from this via g-connector -->
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-openejb</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</artifactId>
             <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.yoko</groupId>
             <artifactId>yoko-spec-corba</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib-nodep</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABean.java?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABean.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABean.java Sun Aug 31 23:30:25 2008
@@ -22,25 +22,21 @@
 
 import javax.ejb.spi.HandleDelegate;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.gbean.GBeanLifecycle;
-import org.apache.geronimo.gbean.InvalidConfigurationException; 
-import org.apache.geronimo.corba.security.ServerPolicy;
-import org.apache.geronimo.corba.security.ServerPolicyFactory;
 import org.apache.geronimo.corba.security.config.ConfigAdapter;
 import org.apache.geronimo.corba.security.config.ssl.SSLConfig;
 import org.apache.geronimo.corba.security.config.tss.TSSConfig;
 import org.apache.geronimo.corba.security.config.tss.TSSSSLTransportConfig;
 import org.apache.geronimo.corba.security.config.tss.TSSTransportMechConfig;
 import org.apache.geronimo.corba.util.Util;
-import org.apache.geronimo.openejb.OpenEjbSystem; 
-import org.omg.CORBA.Any;
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.gbean.InvalidConfigurationException;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.Policy;
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.POAHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -68,8 +64,7 @@
     private POA rootPOA;
     private NameService nameService;
     private AbstractName abstractName;
-    private OpenEjbSystem ejbSystem; 
-    // ORB-specific policy overrides we need to add to POA policies created by 
+    // ORB-specific policy overrides we need to add to POA policies created by
     // child TSSBeans.  
     private Policy[] policyOverrides = null; 
 
@@ -81,7 +76,6 @@
         this.host = null;
         this.abstractName = null;
         this.policyOverrides = null; 
-        this.ejbSystem = null;
     }
 
     /**
@@ -90,20 +84,20 @@
      * @param abstractName
      *               The server-created abstract name for this bean instance.
      * @param configAdapter
-     *               The ORB ConfigAdapter used to interface with the
-     *               JVM-configured ORB instance.
+ *               The ORB ConfigAdapter used to interface with the
+ *               JVM-configured ORB instance.
      * @param host   The hostname we publish ourselves under.
      * @param listenerPort
-     *               The initial listener port to use.
+*               The initial listener port to use.
      * @param classLoader
-     *               The ClassLoader used for ORB context class loading.
+*               The ClassLoader used for ORB context class loading.
      * @param nameService
-     *               The initial name service the created ORB will use
-     *               for object resolution.
+*               The initial name service the created ORB will use
+*               for object resolution.
      * @param ssl    The SSL configuration, including the KeystoreManager.
      *
      */
-    public CORBABean(AbstractName abstractName, ConfigAdapter configAdapter, String host, int listenerPort, ClassLoader classLoader, NameService nameService, OpenEjbSystem ejbSystem, SSLConfig ssl) {
+    public CORBABean(AbstractName abstractName, ConfigAdapter configAdapter, String host, int listenerPort, ClassLoader classLoader, NameService nameService, SSLConfig ssl) {
         this.abstractName = abstractName;
         this.classLoader = classLoader;
         this.configAdapter = configAdapter;
@@ -112,7 +106,6 @@
         this.host = host;
         this.listenerPort = listenerPort;
         this.policyOverrides = null; 
-        this.ejbSystem = ejbSystem; 
     }
 
     /**
@@ -242,11 +235,6 @@
             // TSSBeans are going to need our rootPOA instance, so resolve this now.
             org.omg.CORBA.Object obj = orb.resolve_initial_references("RootPOA");
             rootPOA = POAHelper.narrow(obj);
-            // if we have an OpenEjbSystem reference, inform the ejb subsystem 
-            // there's now an ORB available for the JNDI context. 
-            if (ejbSystem != null) {
-                ejbSystem.setORBContext(orb, getHandleDelegate()); 
-            }
         } catch (NoSuchMethodError e) {
             log.error("Incorrect level of org.omg.CORBA classes found.\nLikely cause is an incorrect java.endorsed.dirs configuration"); 
             throw new InvalidConfigurationException("CORBA usage requires Yoko CORBA spec classes in java.endorsed.dirs classpath", e); 

Modified: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABeanGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABeanGBean.java?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABeanGBean.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABeanGBean.java Sun Aug 31 23:30:25 2008
@@ -57,9 +57,8 @@
         infoBuilder.addReference("ConfigAdapter", ConfigAdapter.class, NameFactory.ORB_CONFIG);
         infoBuilder.addReference("SSLConfig", SSLConfig.class, NameFactory.CORBA_SSL);
         infoBuilder.addReference("NameService", NameService.class, NameFactory.CORBA_NAME_SERVICE);
-        infoBuilder.addReference("OpenEjbSystem", OpenEjbSystem.class);
-        
-        infoBuilder.setConstructor(new String[]{"abstractName", "ConfigAdapter", "host", "port", "classLoader", "NameService", "OpenEjbSystem", "SSLConfig"});
+
+        infoBuilder.setConstructor(new String[]{"abstractName", "ConfigAdapter", "host", "port", "classLoader", "NameService", "SSLConfig"});
 
         GBEAN_INFO = infoBuilder.getBeanInfo();
     }

Added: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBean.java?rev=690859&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBean.java (added)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBean.java Sun Aug 31 23:30:25 2008
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.corba;
+
+import org.apache.geronimo.openejb.OpenEjbSystem;
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.corba.security.config.ConfigAdapter;
+import org.apache.geronimo.corba.security.config.ssl.SSLConfig;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class CORBAEjbBean extends CORBABean {
+
+    private final OpenEjbSystem ejbSystem;
+
+    /**
+     * Instantiate a CORBABean instance.
+     *
+     * @param abstractName  The server-created abstract name for this bean instance.
+     * @param configAdapter The ORB ConfigAdapter used to interface with the
+     *                      JVM-configured ORB instance.
+     * @param host          The hostname we publish ourselves under.
+     * @param listenerPort  The initial listener port to use.
+     * @param classLoader   The ClassLoader used for ORB context class loading.
+     * @param nameService   The initial name service the created ORB will use
+     *                      for object resolution.
+     * @param ssl           The SSL configuration, including the KeystoreManager.
+     */
+    public CORBAEjbBean(AbstractName abstractName, ConfigAdapter configAdapter, String host, int listenerPort, ClassLoader classLoader, NameService nameService, OpenEjbSystem ejbSystem, SSLConfig ssl) {
+        super(abstractName, configAdapter, host, listenerPort, classLoader, nameService, ssl);
+        this.ejbSystem = ejbSystem;
+    }
+
+    /**
+     * Start the ORB associated with this bean instance.
+     *
+     * @throws Exception
+     */
+    @Override
+    public void doStart() throws Exception {
+        super.doStart();
+        // if we have an OpenEjbSystem reference, inform the ejb subsystem
+        // there's now an ORB available for the JNDI context.
+        if (ejbSystem != null) {
+            ejbSystem.setORBContext(getORB(), getHandleDelegate());
+        }
+    }
+}

Propchange: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBeanGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBeanGBean.java?rev=690859&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBeanGBean.java (added)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBeanGBean.java Sun Aug 31 23:30:25 2008
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.corba;
+
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.openejb.OpenEjbSystem;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class CORBAEjbBeanGBean {
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(CORBAEjbBeanGBean.class, "OpenEJB ORB Adapter", CORBAEjbBean.class, CORBABeanGBean.GBEAN_INFO, NameFactory.CORBA_SERVICE);
+
+        infoBuilder.addReference("OpenEjbSystem", OpenEjbSystem.class);
+
+        infoBuilder.setConstructor(new String[]{"abstractName", "ConfigAdapter", "host", "port", "classLoader", "NameService", "OpenEjbSystem", "SSLConfig"});
+
+        GBEAN_INFO = infoBuilder.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+}

Propchange: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBeanGBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBeanGBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEjbBeanGBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaEjbBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaEjbBean.java?rev=690859&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaEjbBean.java (added)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaEjbBean.java Sun Aug 31 23:30:25 2008
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.apache.geronimo.corba;
+
+import org.apache.geronimo.openejb.OpenEjbSystem;
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.corba.security.config.ConfigAdapter;
+import org.apache.geronimo.corba.security.config.ssl.SSLConfig;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class CORBAEjbBean extends CORBABean {
+
+    private final OpenEjbSystem ejbSystem;
+
+    /**
+     * Instantiate a CORBABean instance.
+     *
+     * @param abstractName  The server-created abstract name for this bean instance.
+     * @param configAdapter The ORB ConfigAdapter used to interface with the
+     *                      JVM-configured ORB instance.
+     * @param host          The hostname we publish ourselves under.
+     * @param listenerPort  The initial listener port to use.
+     * @param classLoader   The ClassLoader used for ORB context class loading.
+     * @param nameService   The initial name service the created ORB will use
+     *                      for object resolution.
+     * @param ssl           The SSL configuration, including the KeystoreManager.
+     */
+    public CORBAEjbBean(AbstractName abstractName, ConfigAdapter configAdapter, String host, int listenerPort, ClassLoader classLoader, NameService nameService, OpenEjbSystem ejbSystem, SSLConfig ssl) {
+        super(abstractName, configAdapter, host, listenerPort, classLoader, nameService, ssl);
+        this.ejbSystem = ejbSystem;
+    }
+
+    /**
+     * Start the ORB associated with this bean instance.
+     *
+     * @throws Exception
+     */
+    @Override
+    public void doStart() throws Exception {
+        super.doStart();
+        // if we have an OpenEjbSystem reference, inform the ejb subsystem
+        // there's now an ORB available for the JNDI context.
+        if (ejbSystem != null) {
+            ejbSystem.setORBContext(getORB(), getHandleDelegate());
+        }
+    }
+}

Propchange: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaEjbBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaEjbBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaEjbBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/plugins/corba/geronimo-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-yoko/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-yoko/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-yoko/pom.xml Sun Aug 31 23:30:25 2008
@@ -49,10 +49,27 @@
 
         <!-- g-j2ee, g-core come from this -->
         <!-- g-util comes via g-system -->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-security</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-kernel</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-j2ee</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-security</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</artifactId>
             <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/corba/geronimo-yoko/src/test/java/org/apache/geronimo/yoko/TSSConfigEditorTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-yoko/src/test/java/org/apache/geronimo/yoko/TSSConfigEditorTest.java?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-yoko/src/test/java/org/apache/geronimo/yoko/TSSConfigEditorTest.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-yoko/src/test/java/org/apache/geronimo/yoko/TSSConfigEditorTest.java Sun Aug 31 23:30:25 2008
@@ -70,7 +70,7 @@
         Naming naming = new Jsr77Naming();
         AbstractName testName = naming.createRootName(new Artifact("test", "stuff", "", "ear"), "gbean", NameFactory.CORBA_SERVICE) ;
         ConfigAdapter configAdapter = new org.apache.geronimo.yoko.ORBConfigAdapter();
-        CORBABean corbaBean = new CORBABean(testName, configAdapter, "localhost", 8050, classLoader, null, null, null);
+        CORBABean corbaBean = new CORBABean(testName, configAdapter, "localhost", 8050, classLoader, null, null);
         XmlObject xmlObject = getXmlObject(TEST_XML4);
         TSSConfigEditor editor = new TSSConfigEditor();
         Object o = editor.getValue(xmlObject, null, classLoader);

Modified: geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/pom.xml Sun Aug 31 23:30:25 2008
@@ -111,10 +111,6 @@
                         <!--<deploymentConfig>${openejbDeployer}</deploymentConfig>-->
                         <deploymentConfig>${openejbcorbaDeployer}</deploymentConfig>
                     </deploymentConfigs>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                     <category>EJB</category>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -12,11 +12,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.yoko</groupId>
-        <artifactId>yoko-spec-corba</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.bcel</groupId>
         <artifactId>bcel</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/plan/plan.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/plan/plan.xml Sun Aug 31 23:30:25 2008
@@ -52,7 +52,7 @@
     </gbean>
 
     <!-- connections require SSL, no client cert, client logs in with password, no identity token -->
-    <gbean name="Server" class="org.apache.geronimo.corba.CORBABeanGBean">
+    <gbean name="Server" class="org.apache.geronimo.corba.CORBAEjbBeanGBean">
         <attribute name="host">${PlanORBSSLHost}</attribute>
         <attribute name="port">${PlanORBSSLPort}</attribute>
         <reference name="ConfigAdapter">
@@ -89,7 +89,7 @@
     </gbean>
 
     <!-- orb with no security whatsoever -->
-    <gbean name="UnprotectedServer" class="org.apache.geronimo.corba.CORBABeanGBean">
+    <gbean name="UnprotectedServer" class="org.apache.geronimo.corba.CORBAEjbBeanGBean">
         <attribute name="host">${PlanORBHost}</attribute>
         <attribute name="port">${PlanORBPort}</attribute>
         <reference name="ConfigAdapter">

Modified: geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml Sun Aug 31 23:30:25 2008
@@ -73,9 +73,6 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>false</value>
-                    </useMavenDependencies>
                     <category>EJB Container</category>
                     <dependencies>
                         <dependency>
@@ -84,21 +81,6 @@
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-corba-builder</artifactId>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>j2ee-deployer</artifactId>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-corba</artifactId>
-                            <type>jar</type>
-                        </dependency>
                     </dependencies>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml Sun Aug 31 23:30:25 2008
@@ -64,28 +64,14 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>false</value>
-                    </useMavenDependencies>
                     <category>Web Services</category>
                     <dependencies>
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>jaxws-deployer</artifactId>
-                        <type>car</type>
-                      </dependency>
-                      <dependency>
-                        <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>cxf</artifactId>
                         <type>car</type>
                         <import>classes</import>
                       </dependency>
-                      <dependency>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>geronimo-cxf-builder</artifactId>
-                        <type>jar</type>
-                        <import>classes</import>
-                      </dependency>
                     </dependencies>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml Sun Aug 31 23:30:25 2008
@@ -71,17 +71,10 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>false</value>
-                    </useMavenDependencies>
                     <category>Web Services</category>
                     <dependencies>
                         <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>jaxws-ejb-deployer</artifactId>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
+                            <!-- really? -->
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>cxf-deployer</artifactId>
                             <type>car</type>
@@ -93,12 +86,6 @@
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-cxf-ejb-builder</artifactId>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
                     </dependencies>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml Sun Aug 31 23:30:25 2008
@@ -73,10 +73,6 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                     <category>Web Services</category>
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/plugins/cxf/cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf/pom.xml Sun Aug 31 23:30:25 2008
@@ -46,12 +46,12 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-server</artifactId>
-            <type>car</type>
-            <version>${version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>j2ee-server</artifactId>-->
+            <!--<type>car</type>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>

Modified: geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -8,17 +8,27 @@
     </module-id>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-ws-addr</artifactId>
+        <artifactId>cxf-tools-common</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.ws.commons.schema</groupId>
+        <artifactId>XmlSchema</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-frontend-simple</artifactId>
+        <artifactId>cxf-rt-core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-tools-common</artifactId>
+        <artifactId>cxf-api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-bindings-soap</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -33,18 +43,13 @@
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-api</artifactId>
+        <artifactId>cxf-rt-frontend-simple</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>webservices-common</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>spring</artifactId>
-        <type>car</type>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-databinding-jaxb</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
@@ -53,17 +58,22 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-server</artifactId>
+        <artifactId>webservices-common</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>spring</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-common-utilities</artifactId>
+        <artifactId>cxf-rt-transports-http</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-frontend-jaxws</artifactId>
+        <artifactId>cxf-rt-ws-addr</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -72,23 +82,13 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-transports-http</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-cxf</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-core</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-databinding-jaxb</artifactId>
+        <artifactId>cxf-rt-frontend-jaxws</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -97,13 +97,13 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.ws.commons.schema</groupId>
-        <artifactId>XmlSchema</artifactId>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-common-utilities</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.cxf</groupId>
-        <artifactId>cxf-rt-bindings-soap</artifactId>
+        <groupId>com.sun.xml.fastinfoset</groupId>
+        <artifactId>FastInfoset</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/pom.xml Sun Aug 31 23:30:25 2008
@@ -54,9 +54,10 @@
 
         <!-- g-j2ee comes from this via g-openejb -->
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-cxf</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>cxf</artifactId>
             <version>${version}</version>
+            <type>car</type>
         </dependency>
 
        <dependency>

Modified: geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml Sun Aug 31 23:30:25 2008
@@ -34,9 +34,10 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-webservices</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>webservices-common</artifactId>
             <version>${version}</version>
+            <type>car</type>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml Sun Aug 31 23:30:25 2008
@@ -56,13 +56,13 @@
             <type>war</type>
             <scope>provided</scope>
         </dependency>
-
+<!--
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>console-core</artifactId>
             <version>${version}</version>
         </dependency>
-
+-->
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>console-jetty</artifactId>
@@ -71,6 +71,7 @@
         </dependency>
 
         <dependency>
+<!-- really? -->
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${version}</version>
@@ -84,39 +85,6 @@
             <type>car</type>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-naming</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-management</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-j2ee</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.directwebremoting</groupId>
-            <artifactId>dwr</artifactId>
-        </dependency>
-
         <!-- for jspc. why is this needed? -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -153,10 +121,6 @@
                     </module>
                     <category>Debug</category>
                     <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
                             <prerequisite>

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -12,53 +12,18 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.directwebremoting</groupId>
-        <artifactId>dwr</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-j2ee</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console-jetty</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-management</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>dojo-legacy-jetty6</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-kernel</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-servlet_2.5_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-naming</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-gbean-deployer</artifactId>
         <type>car</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>console-core</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>



Mime
View raw message