geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r506793 - in /geronimo/server/trunk: assemblies/geronimo-jetty6-jee5/pom.xml configs/client-corba-yoko/pom.xml configs/client-corba-yoko/src/plan/plan.xml configs/j2ee-corba-yoko/pom.xml configs/openejb-corba-deployer/pom.xml configs/pom.xml
Date Tue, 13 Feb 2007 01:41:34 GMT
Author: djencks
Date: Mon Feb 12 17:41:33 2007
New Revision: 506793

URL: http://svn.apache.org/viewvc?view=rev&rev=506793
Log:
Start hooking up corba configs

Modified:
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml
    geronimo/server/trunk/configs/client-corba-yoko/pom.xml
    geronimo/server/trunk/configs/client-corba-yoko/src/plan/plan.xml
    geronimo/server/trunk/configs/j2ee-corba-yoko/pom.xml
    geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml
    geronimo/server/trunk/configs/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml?view=diff&rev=506793&r1=506792&r2=506793
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml Mon Feb 12 17:41:33 2007
@@ -107,12 +107,12 @@
             <type>car</type>
         </dependency>
 
-        <!--dependency>
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-corba-yoko</artifactId>
             <version>${version}</version>
             <type>car</type>
-        </dependency-->
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -191,12 +191,12 @@
             <type>car</type>
         </dependency>
 
-        <!--dependency>
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-corba-yoko</artifactId>
             <version>${version}</version>
             <type>car</type>
-        </dependency-->
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -226,12 +226,12 @@
             <type>car</type>
         </dependency>
 
-        <!--dependency>
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb-corba-deployer</artifactId>
+            <artifactId>geronimo-corba-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
-        </dependency-->
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/trunk/configs/client-corba-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-corba-yoko/pom.xml?view=diff&rev=506793&r1=506792&r2=506793
==============================================================================
--- geronimo/server/trunk/configs/client-corba-yoko/pom.xml (original)
+++ geronimo/server/trunk/configs/client-corba-yoko/pom.xml Mon Feb 12 17:41:33 2007
@@ -55,25 +55,32 @@
             <!--<artifactId>geronimo-ejb_3.0_spec</artifactId>-->
         <!--</dependency>-->
 
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-webservices-builder</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
+
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-webservices-builder</artifactId>
-            <version>${version}</version>
+            <groupId>org.apache.openejb</groupId>
+            <artifactId>openejb-client</artifactId>
         </dependency>
-
+        <!-- client CORBABean needs the ApplicationServer class -->
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-corba</artifactId>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-corba</artifactId>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-yoko</artifactId>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-yoko</artifactId>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
@@ -113,9 +120,9 @@
                 <configuration>
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbcorbaDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${j2eeDeployer}</deploymentConfig>-->
+                        <!--<deploymentConfig>${openejbDeployer}</deploymentConfig>-->
+                        <!--<deploymentConfig>${openejbcorbaDeployer}</deploymentConfig>-->
                     </deploymentConfigs>
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/configs/client-corba-yoko/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-corba-yoko/src/plan/plan.xml?view=diff&rev=506793&r1=506792&r2=506793
==============================================================================
--- geronimo/server/trunk/configs/client-corba-yoko/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client-corba-yoko/src/plan/plan.xml Mon Feb 12 17:41:33
2007
@@ -19,6 +19,18 @@
 <!-- $Rev$ $Date$ -->
 
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="CORBASSLConfig" class="org.apache.geronimo.corba.security.config.ssl.SSLConfigGBean">
+        <attribute name="keyStore">geronimo-default</attribute>
+        <attribute name="keyAlias">geronimo</attribute>
+        <attribute name="trustStore">geronimo-default</attribute>
+        <attribute name="algorithm">Default</attribute>
+        <attribute name="protocol">SSL</attribute>
+        <reference name="KeystoreManager">
+            <name>KeystoreManager</name>
+        </reference>
+    </gbean>
+
     <gbean name="DyanmicStubClassLoader" class="org.apache.geronimo.corba.util.DynamicStubClassLoaderGBean"/>
 
     <gbean name="ORBConfigAdapter" class="org.apache.geronimo.yoko.ORBConfigAdapterGBean"/>
@@ -36,17 +48,6 @@
 
     </gbean>
 
-    <gbean name="CORBASSLConfig" class="org.apache.geronimo.corba.security.config.ssl.SSLConfigGBean">
-        <attribute name="keyStore">geronimo-default</attribute>
-        <attribute name="keyAlias">geronimo</attribute>
-        <attribute name="trustStore">geronimo-default</attribute>
-        <attribute name="algorithm">Default</attribute>
-        <attribute name="protocol">SSL</attribute>
-        <reference name="KeystoreManager">
-            <name>KeystoreManager</name>
-        </reference>
-    </gbean>
-
 
     <gbean name="Server" class="org.apache.geronimo.corba.CORBABeanGBean">
         <reference name="ConfigAdapter">
@@ -57,94 +58,5 @@
         </reference>
     </gbean>
 
-<!-- a few sample css beans for the app client -->
-    <!--
-    <gbean name="SSLClientCert" class="org.apache.geronimo.corba.CSSBeanGBean">
-        <reference name="TransactionManager">
-            <module>geronimo/client/${version}/car</module>
-            <name>TransactionManager</name>
-        </reference>
-        <reference name="ConfigAdapter">
-            <name>ORBConfigAdapter</name>
-        </reference>
-        <reference name="SSLConfig">
-            <name>CORBASSLConfig</name>
-        </reference>
-        <attribute name="description">SSLClientCert</attribute>
-        <xml-attribute name="cssConfig">
-            <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
-                <css:compoundSecMechTypeList>
-                    <css:compoundSecMech>
-                        <css:SSL>
-                            <css:supports>Integrity Confidentiality EstablishTrustInTarget
-                                EstablishTrustInClient</css:supports>
-                            <css:requires>Integrity Confidentiality EstablishTrustInClient</css:requires>
-                        </css:SSL>
-                        <css:sasMech>
-                            <css:ITTAbsent/>
-                        </css:sasMech>
-                    </css:compoundSecMech>
-                </css:compoundSecMechTypeList>
-            </css:css>
-        </xml-attribute>
-    </gbean>
-
-    <gbean name="SSLClientPassword" class="org.apache.geronimo.corba.CSSBeanGBean">
-        <reference name="TransactionManager">
-            <module>geronimo/client/${version}/car</module>
-            <name>TransactionManager</name>
-        </reference>
-        <reference name="ConfigAdapter">
-            <name>ORBConfigAdapter</name>
-        </reference>
-        <reference name="SSLConfig">
-            <name>CORBASSLConfig</name>
-        </reference>
-        <attribute name="description">SSLClientPassword</attribute>
-        <xml-attribute name="cssConfig">
-            <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
-                <css:compoundSecMechTypeList>
-                    <css:compoundSecMech>
-                        <css:SSL>
-                            <css:supports>Integrity Confidentiality EstablishTrustInClient</css:supports>
-                            <css:requires>Integrity Confidentiality</css:requires>
-                        </css:SSL>
-                        <css:GSSUPDynamic domain="default"/>
-                        <css:sasMech>
-                            <css:ITTAbsent/>
-                        </css:sasMech>
-                    </css:compoundSecMech>
-                </css:compoundSecMechTypeList>
-            </css:css>
-        </xml-attribute>
-    </gbean>
-
-    <gbean name="NoSecurity" class="org.apache.geronimo.corba.CSSBeanGBean">
-        <reference name="TransactionManager">
-            <module>geronimo/client/${version}/car</module>
-            <name>TransactionManager</name>
-        </reference>
-        <reference name="ConfigAdapter">
-            <name>ORBConfigAdapter</name>
-        </reference>
-        <reference name="SSLConfig">
-            <name>CORBASSLConfig</name>
-        </reference>
-        <attribute name="description">NoSecurity</attribute>
-        <xml-attribute name="cssConfig">
-            <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
-                <css:compoundSecMechTypeList>
-                    <css:compoundSecMech>
-                        <css:SSL>
-                            <css:supports>Integrity Confidentiality EstablishTrustInTarget
-                                EstablishTrustInClient</css:supports>
-                            <css:requires></css:requires>
-                        </css:SSL>
-                    </css:compoundSecMech>
-                </css:compoundSecMechTypeList>
-            </css:css>
-        </xml-attribute>
-    </gbean>
-    -->
 
 </module>

Modified: geronimo/server/trunk/configs/j2ee-corba-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-corba-yoko/pom.xml?view=diff&rev=506793&r1=506792&r2=506793
==============================================================================
--- geronimo/server/trunk/configs/j2ee-corba-yoko/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-corba-yoko/pom.xml Mon Feb 12 17:41:33 2007
@@ -35,12 +35,12 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-server</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>j2ee-server</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -50,22 +50,24 @@
         </dependency>
 
         <!-- to enforce build order -->
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb-corba-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>test</scope>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>openejb-corba-deployer</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+            <!--<scope>test</scope>-->
+        <!--</dependency>-->
 
         <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-corba</artifactId>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-corba</artifactId>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-yoko</artifactId>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-yoko</artifactId>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
@@ -90,7 +92,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb-corba-deployer</artifactId>
+            <artifactId>geronimo-corba-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -105,8 +107,8 @@
                 <configuration>
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbcorbaDeployer}</deploymentConfig>
+                        <!--<deploymentConfig>${openejbDeployer}</deploymentConfig>-->
+                        <deploymentConfig>${geronimocorbaDeployer}</deploymentConfig>
                     </deploymentConfigs>
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml?view=diff&rev=506793&r1=506792&r2=506793
==============================================================================
--- geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml Mon Feb 12 17:41:33 2007
@@ -29,28 +29,40 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     
-    <artifactId>openejb-corba-deployer</artifactId>
-    <name>Geronimo Configs :: OpenEJB CORBA Deployer</name>
+    <artifactId>geronimo-corba-deployer</artifactId>
+    <name>Geronimo Configs :: Geronimo CORBA Deployer</name>
     <packaging>car</packaging>
     
     <dependencies>
     
+        <!-- ideally we wouldn't need this -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
+            <scope>runtime</scope>
+        </dependency>
+
+        <!-- maybe gbean-deployer?? -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
         </dependency>
 
         <!-- ideally we wouldn't need this -->
         <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-corba</artifactId>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-corba</artifactId>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-corba-builder</artifactId>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-corba-builder</artifactId>
+            <version>${version}</version>
         </dependency>
 
     </dependencies>

Modified: geronimo/server/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?view=diff&rev=506793&r1=506792&r2=506793
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Mon Feb 12 17:41:33 2007
@@ -43,7 +43,7 @@
         <clientDeployer>org.apache.geronimo.configs/client-deployer/${version}/car</clientDeployer>
         <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${version}/car</connectorDeployer>
         <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${version}/car</openejbDeployer>
-        <!--openejbcorbaDeployer>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car</openejbcorbaDeployer-->
+        <geronimocorbaDeployer>org.apache.geronimo.configs/geronimo-corba-deployer/${version}/car</geronimocorbaDeployer>
         <axisDeployer>org.apache.geronimo.configs/axis-deployer/${version}/car</axisDeployer>
 		<cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${version}/car</cxfDeployer>
 		<axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${version}/car</axis2Deployer>
@@ -110,7 +110,7 @@
         <module>axis</module>
         <module>axis-deployer</module>
         <module>client</module>
-        <!--module>client-corba-yoko</module-->
+        <module>client-corba-yoko</module>
         <module>client-deployer</module>
         <module>client-security</module>
         <module>client-system</module>
@@ -118,10 +118,11 @@
         <module>connector-deployer</module>
         <module>clustering</module>
         <module>directory</module>
+        <module>geronimo-corba-deployer</module>
         <module>geronimo-gbean-deployer</module>
         <module>hot-deployer</module>
         <module>jee-specs</module>
-        <!--module>j2ee-corba-yoko</module-->
+        <module>j2ee-corba-yoko</module>
         <module>j2ee-deployer</module>
         <module>j2ee-security</module>
         <module>j2ee-server</module>
@@ -135,7 +136,6 @@
         <module>online-deployer</module>
         <module>openejb</module>
         <module>openejb-deployer</module>
-        <!--module>openejb-corba-deployer</module-->
         <module>remote-deploy-jetty</module>
         <module>remote-deploy-tomcat</module>
         <module>rmi-naming</module>



Mime
View raw message