geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r452621 [3/3] - in /geronimo/server/trunk: ./ applications/magicGball/magicGball-ear/src/main/resources/ assemblies/ assemblies/geronimo-jetty-j2ee/ assemblies/geronimo-jetty-j2ee/src/main/var/config/ assemblies/geronimo-tomcat-j2ee/ assemb...
Date Tue, 03 Oct 2006 21:01:46 GMT
Added: geronimo/server/trunk/configs/j2ee-corba-yoko/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-corba-yoko/src/plan/plan.xml?view=auto&rev=452621
==============================================================================
--- geronimo/server/trunk/configs/j2ee-corba-yoko/src/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/j2ee-corba-yoko/src/plan/plan.xml Tue Oct  3 14:01:44 2006
@@ -0,0 +1,447 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2004-2005 The Apache Software Foundation
+
+    Licensed 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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+
+    <!-- CORBA -->
+    <gbean name="DynamicORBStubClassLoader" class="org.apache.openejb.corba.util.DynamicStubClassLoaderGBean">
+        <dependency>
+            <name>ORBConfigAdapter</name>
+        </dependency>
+    </gbean>
+
+    <gbean name="ORBConfigAdapter" class="org.apache.openejb.yoko.ORBConfigAdapterGBean"/>
+
+    <gbean name="NameServer" class="org.apache.openejb.corba.NameServiceGBean">
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+        <reference name="configAdapter">
+            <name>ORBConfigAdapter</name>
+        </reference>
+        <attribute name="port">${PlanCOSNamingPort}</attribute>
+        <attribute name="host">${PlanCOSNamingHost}</attribute>
+    </gbean>
+
+    <gbean name="CORBASSLConfig" class="org.apache.openejb.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>
+
+    <!-- connections require SSL, no client cert, client logs in with password, no identity
token -->
+    <gbean name="Server" class="org.apache.openejb.corba.CORBABeanGBean">
+        <attribute name="host">${PlanORBSSLHost}</attribute>
+        <attribute name="port">${PlanORBSSLPort}</attribute>
+        <reference name="configAdapter">
+            <name>ORBConfigAdapter</name>
+        </reference>
+        <reference name="nameService">
+            <name>NameServer</name>
+        </reference>
+        <xml-attribute name="tssConfig">
+            <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+                <tss:default-principal>
+                    <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"
name="guest"/>
+                </tss:default-principal>
+                <tss:SSL port="${PlanORBSSLPort}" hostname="${PlanORBSSLHost}">
+                    <tss:supports>Integrity Confidentiality EstablishTrustInTarget</tss:supports>
+                    <tss:requires>Integrity Confidentiality</tss:requires>
+                </tss:SSL>
+                <tss:compoundSecMechTypeList>
+                    <tss:compoundSecMech>
+                        <tss:GSSUP required="true" targetName="default"/>
+                        <tss:sasMech>
+                            <tss:identityTokenTypes>
+                                <tss:ITTAbsent/>
+                            </tss:identityTokenTypes>
+                        </tss:sasMech>
+                    </tss:compoundSecMech>
+                </tss:compoundSecMechTypeList>
+            </tss:tss>
+        </xml-attribute>
+    </gbean>
+
+    <!-- orb with no security whatsoever -->
+    <gbean name="UnprotectedServer" class="org.apache.openejb.corba.CORBABeanGBean">
+        <attribute name="host">${PlanORBHost}</attribute>
+        <attribute name="port">${PlanORBPort}</attribute>
+        <reference name="configAdapter">
+            <name>ORBConfigAdapter</name>
+        </reference>
+        <reference name="nameService">
+            <name>NameServer</name>
+        </reference>
+        <xml-attribute name="tssConfig">
+            <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+                <tss:default-principal>
+                    <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"
name="guest"/>
+                </tss:default-principal>
+                <tss:compoundSecMechTypeList>
+                    <tss:compoundSecMech>
+                        <tss:GSSUP required="true" targetName="default"/>
+                        <tss:sasMech>
+                            <tss:identityTokenTypes>
+                                <tss:ITTAbsent/>
+                            </tss:identityTokenTypes>
+                        </tss:sasMech>
+                    </tss:compoundSecMech>
+                </tss:compoundSecMechTypeList>
+            </tss:tss>
+        </xml-attribute>
+    </gbean>
+
+<!-- tss bean examples, specify requirements for connection to orb.  Provide a ref in
an ejb -->
+    <!--
+    <gbean name="SSLClientCert" class="org.apache.openejb.corba.TSSBeanGBean">
+        <attribute name="POAName">SSLClientCert</attribute>
+        <reference name="Server">
+            <name>Server</name>
+        </reference>
+        <xml-attribute name="tssConfig">
+            <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+                <tss:default-principal>
+                    <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"
name="guest"/>
+                </tss:default-principal>
+                <tss:SSL port="${PlanORBSSLPort}" hostname="${PlanORBSSLHost}">
+                    <tss:supports>Integrity Confidentiality EstablishTrustInTarget
EstablishTrustInClient</tss:supports>
+                    <tss:requires>Integrity Confidentiality EstablishTrustInClient</tss:requires>
+                </tss:SSL>
+                <tss:compoundSecMechTypeList>
+                    <tss:compoundSecMech>
+                        <tss:sasMech>
+                            <tss:identityTokenTypes>
+                                <tss:ITTAbsent/>
+                            </tss:identityTokenTypes>
+                        </tss:sasMech>
+                    </tss:compoundSecMech>
+                </tss:compoundSecMechTypeList>
+            </tss:tss>
+        </xml-attribute>
+    </gbean>
+
+    <gbean name="SSLClientPassword" class="org.apache.openejb.corba.TSSBeanGBean">
+        <attribute name="POAName">SSLClientPassword</attribute>
+        <reference name="Server">
+            <name>Server</name>
+        </reference>
+        <xml-attribute name="tssConfig">
+            <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+                <tss:default-principal>
+                    <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"
name="guest"/>
+                </tss:default-principal>
+                <tss:SSL port="${PlanORBSSLPort}" hostname="${PlanORBSSLHost}">
+                    <tss:supports>Integrity Confidentiality EstablishTrustInTarget</tss:supports>
+                    <tss:requires>Integrity Confidentiality</tss:requires>
+                </tss:SSL>
+                <tss:compoundSecMechTypeList>
+                    <tss:compoundSecMech>
+                        <tss:GSSUP required="true" targetName="default"/>
+                        <tss:sasMech>
+                            <tss:identityTokenTypes>
+                                <tss:ITTAbsent/>
+                            </tss:identityTokenTypes>
+                        </tss:sasMech>
+                    </tss:compoundSecMech>
+                </tss:compoundSecMechTypeList>
+            </tss:tss>
+        </xml-attribute>
+    </gbean>
+
+    <gbean name="SSLIdentityToken" class="org.apache.openejb.corba.TSSBeanGBean">
+        <attribute name="POAName">SSLIdentityToken</attribute>
+        <reference name="Server">
+            <name>Server</name>
+        </reference>
+        <xml-attribute name="tssConfig">
+            <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+                <tss:default-principal>
+                    <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"
name="guest"/>
+                </tss:default-principal>
+                <tss:SSL port="${PlanORBSSLPort}" hostname="${PlanORBSSLHost}">
+                    <tss:supports>Integrity Confidentiality EstablishTrustInTarget</tss:supports>
+                    <tss:requires>Integrity Confidentiality</tss:requires>
+                </tss:SSL>
+                <tss:compoundSecMechTypeList>
+                    <tss:compoundSecMech>
+                        <tss:sasMech>
+                            <tss:identityTokenTypes>
+                                <tss:ITTAnonymous/>
+                                <tss:ITTPrincipalNameGSSUP principal-class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"/>
+                                <tss:ITTDistinguishedName/>
+                                <tss:ITTX509CertChain/>
+                            </tss:identityTokenTypes>
+                        </tss:sasMech>
+                    </tss:compoundSecMech>
+                </tss:compoundSecMechTypeList>
+            </tss:tss>
+        </xml-attribute>
+    </gbean>
+
+    <gbean name="IdentityTokenNoSecurity" class="org.apache.openejb.corba.TSSBeanGBean">
+        <attribute name="POAName">IdentityTokenNoSecurity</attribute>
+        <reference name="Server">
+            <name>UnprotectedServer</name>
+        </reference>
+        <xml-attribute name="tssConfig">
+            <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+                <tss:default-principal>
+                    <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"
name="guest"/>
+                </tss:default-principal>
+                <tss:compoundSecMechTypeList>
+                    <tss:compoundSecMech>
+                        <tss:sasMech>
+                            <tss:identityTokenTypes>
+                                <tss:ITTAnonymous/>
+                                <tss:ITTPrincipalNameGSSUP principal-class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"/>
+                                <tss:ITTDistinguishedName/>
+                                <tss:ITTX509CertChain/>
+                            </tss:identityTokenTypes>
+                        </tss:sasMech>
+                    </tss:compoundSecMech>
+                </tss:compoundSecMechTypeList>
+            </tss:tss>
+        </xml-attribute>
+    </gbean>
+
+    <gbean name="SSLClientCertIdentityToken" class="org.apache.openejb.corba.TSSBeanGBean">
+        <attribute name="POAName">SSLClientCertIdentityToken</attribute>
+        <reference name="Server">
+            <name>Server</name>
+        </reference>
+        <xml-attribute name="tssConfig">
+            <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+                <tss:default-principal>
+                    <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"
name="guest"/>
+                </tss:default-principal>
+                <tss:SSL port="${PlanORBSSLPort}" hostname="${PlanORBSSLHost}">
+                    <tss:supports>Integrity Confidentiality EstablishTrustInTarget
EstablishTrustInClient</tss:supports>
+                    <tss:requires>Integrity Confidentiality EstablishTrustInClient</tss:requires>
+                </tss:SSL>
+                <tss:compoundSecMechTypeList>
+                    <tss:compoundSecMech>
+                        <tss:sasMech>
+                            <tss:identityTokenTypes>
+                                <tss:ITTAnonymous/>
+                                <tss:ITTPrincipalNameGSSUP principal-class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"/>
+                                <tss:ITTDistinguishedName/>
+                                <tss:ITTX509CertChain/>
+                            </tss:identityTokenTypes>
+                        </tss:sasMech>
+                    </tss:compoundSecMech>
+                </tss:compoundSecMechTypeList>
+            </tss:tss>
+        </xml-attribute>
+    </gbean>
+-->
+    <!--CSS beans for client security.  These specify what the client is willing to provide
-->
+    <!--
+    <gbean name="SSLClientCert" class="org.apache.openejb.corba.CSSBeanGBean">
+        <reference name="TransactionManager">
+            <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.openejb.corba.CSSBeanGBean">
+        <reference name="TransactionManager">
+            <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:GSSUPStatic username="j2ee" password="j2ee" domain="default"/>
+                        <css:sasMech>
+                            <css:ITTAbsent/>
+                        </css:sasMech>
+                    </css:compoundSecMech>
+                </css:compoundSecMechTypeList>
+            </css:css>
+        </xml-attribute>
+    </gbean>
+
+    <gbean name="SSLIdentityTokenPrincipal" class="org.apache.openejb.corba.CSSBeanGBean">
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
+        </reference>
+        <reference name="configAdapter">
+            <name>ORBConfigAdapter</name>
+        </reference>
+        <reference name="SSLConfig">
+            <name>CORBASSLConfig</name>
+        </reference>
+        <attribute name="description">SSLIdentityTokenPrincipal</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:sasMech>
+                            <css:ITTPrincipalNameDynamic principal-class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"/>
+                        </css:sasMech>
+                    </css:compoundSecMech>
+                </css:compoundSecMechTypeList>
+            </css:css>
+        </xml-attribute>
+    </gbean>
+
+    <gbean name="SSLIdentityTokenCert" class="org.apache.openejb.corba.CSSBeanGBean">
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
+        </reference>
+        <reference name="configAdapter">
+            <name>ORBConfigAdapter</name>
+        </reference>
+        <reference name="SSLConfig">
+            <name>CORBASSLConfig</name>
+        </reference>
+        <attribute name="description">SSLIdentityTokenCert</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:sasMech>
+                            <css:ITTPrincipalNameDynamic principal-class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"/>
+                        </css:sasMech>
+                    </css:compoundSecMech>
+                </css:compoundSecMechTypeList>
+            </css:css>
+        </xml-attribute>
+    </gbean>
+
+    <gbean name="NoSecurityIdentityTokenPrincipal" class="org.apache.openejb.corba.CSSBeanGBean">
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
+        </reference>
+        <reference name="configAdapter">
+            <name>ORBConfigAdapter</name>
+        </reference>
+        <reference name="SSLConfig">
+            <name>CORBASSLConfig</name>
+        </reference>
+        <attribute name="description">NoSecurityIdentityTokenPrincipal</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:sasMech>
+                            <css:ITTPrincipalNameDynamic principal-class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"/>
+                        </css:sasMech>
+                    </css:compoundSecMech>
+                </css:compoundSecMechTypeList>
+            </css:css>
+        </xml-attribute>
+    </gbean>
+
+    <gbean name="NoSecurityIdentityTokenCert" class="org.apache.openejb.corba.CSSBeanGBean">
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
+        </reference>
+        <reference name="configAdapter">
+            <name>ORBConfigAdapter</name>
+        </reference>
+        <reference name="SSLConfig">
+            <name>CORBASSLConfig</name>
+        </reference>
+        <attribute name="description">NoSecurityIdentityTokenCert</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:sasMech>
+                            <css:ITTPrincipalNameDynamic principal-class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"/>
+                        </css:sasMech>
+                    </css:compoundSecMech>
+                </css:compoundSecMechTypeList>
+            </css:css>
+        </xml-attribute>
+    </gbean>
+
+    <gbean name="NoSecurity" class="org.apache.openejb.corba.CSSBeanGBean">
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
+        </reference>
+        <reference name="configAdapter">
+            <name>ORBConfigAdapter</name>
+        </reference>
+        <reference name="SSLConfig">
+            <name>CORBASSLConfig</name>
+        </reference>
+        <attribute name="description">NoSecurity</attribute>
+        <attribute name="cssArgs"></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>

Propchange: geronimo/server/trunk/configs/j2ee-corba-yoko/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/configs/j2ee-corba-yoko/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/configs/j2ee-corba-yoko/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/configs/j2ee-corba-yoko/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-corba-yoko/src/site/site.xml?view=auto&rev=452621
==============================================================================
--- geronimo/server/trunk/configs/j2ee-corba-yoko/src/site/site.xml (added)
+++ geronimo/server/trunk/configs/j2ee-corba-yoko/src/site/site.xml Tue Oct  3 14:01:44 2006
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 The Apache Software Foundation
+
+    Licensed 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.
+-->
+
+<!-- $Id: site.xml 432950 2006-08-20 07:30:07Z jdillon $ -->
+
+<project name="${project.name}">
+    
+    <body>
+        
+        ${parentProject}
+        
+        ${modules}
+        
+        ${reports}
+        
+    </body>
+
+</project>
+
+

Propchange: geronimo/server/trunk/configs/j2ee-corba-yoko/src/site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/configs/j2ee-corba-yoko/src/site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/configs/j2ee-corba-yoko/src/site/site.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/configs/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb/pom.xml?view=diff&rev=452621&r1=452620&r2=452621
==============================================================================
--- geronimo/server/trunk/configs/openejb/pom.xml (original)
+++ geronimo/server/trunk/configs/openejb/pom.xml Tue Oct  3 14:01:44 2006
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
   Copyright 2006 The Apache Software Foundation
-  
+
   Licensed 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.
@@ -31,7 +31,7 @@
     <artifactId>openejb</artifactId>
     <name>Geronimo Configs :: OpenEJB</name>
     <packaging>car</packaging>
-    
+
     <dependencies>
 
         <dependency>
@@ -73,12 +73,17 @@
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-core</artifactId>
         </dependency>
-        
+
+        <dependency>
+            <groupId>org.apache.yoko</groupId>
+            <artifactId>yoko-spec-corba</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>concurrent</groupId>
             <artifactId>concurrent</artifactId>
         </dependency>
 
     </dependencies>
-    
+
 </project>

Modified: geronimo/server/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?view=diff&rev=452621&r1=452620&r2=452621
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Tue Oct  3 14:01:44 2006
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright 2006 The Apache Software Foundation
-    
+
     Licensed 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.
@@ -18,7 +18,7 @@
 <!-- $Rev$ $Date$ -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    
+
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -32,14 +32,14 @@
     <artifactId>configs</artifactId>
     <name>Geronimo Configs</name>
     <packaging>pom</packaging>
-    
+
     <properties>
         <!-- This property is required by the car:package mojo -->
         <geronimoVersion>${pom.version}</geronimoVersion>
-        
+
         <!-- This property is required to process geronimo-plugin.xml (for m2 & m2)
-->
         <pom.currentVersion>${pom.version}</pom.currentVersion>
-        
+
         <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car</gbeanDeployer>
         <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car</j2eeDeployer>
         <clientDeployer>org.apache.geronimo.configs/client-deployer/${pom.version}/car</clientDeployer>
@@ -48,7 +48,7 @@
         <axisDeployer>org.apache.geronimo.configs/axis-deployer/${pom.version}/car</axisDeployer>
         <tomcatDeployer>org.apache.geronimo.configs/tomcat-deployer/${pom.version}/car</tomcatDeployer>
         <jettyDeployer>org.apache.geronimo.configs/jetty-deployer/${pom.version}/car</jettyDeployer>
-        
+
         <!-- Common plan properties -->
         <PlanServerHostname>0.0.0.0</PlanServerHostname>
         <PlanClientAddresses>127.0.0.1</PlanClientAddresses>
@@ -61,16 +61,21 @@
         <PlanActiveMQPort>61616</PlanActiveMQPort>
         <PlanCOSNamingHost>localhost</PlanCOSNamingHost>
         <PlanCOSNamingPort>1050</PlanCOSNamingPort>
+        <PlanCOSSunNamingPort>1050</PlanCOSSunNamingPort>
+        <PlanORBHost>localhost</PlanORBHost>
+        <PlanORBPort>6882</PlanORBPort>
+        <PlanORBSunPort>6882</PlanORBSunPort>
         <PlanORBSSLHost>localhost</PlanORBSSLHost>
         <PlanORBSSLPort>2001</PlanORBSSLPort>
+        <PlanORBSunSSLPort>2001</PlanORBSunSSLPort>
         <PlanJMXPort>9999</PlanJMXPort>
     </properties>
-    
+
     <build>
         <!--
-        
+
         NOTE: Don't add to extentions here, or JCL will freak out about multipule versions.
-        
+
         <extensions>
             <extension>
                 <groupId>org.apache.geronimo.plugins</groupId>
@@ -79,7 +84,7 @@
             </extension>
         </extensions>
         -->
-        
+
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -90,15 +95,15 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>car-maven-plugin</artifactId>
-                
+
                 <!-- Install as extention to allow 'car' packaging to be used. -->
                 <extensions>true</extensions>
-                
+
                 <configuration>
                     <archive>
                         <!-- Do not include META-INF/maven to avoid long file problems
on windows -->
@@ -115,7 +120,8 @@
         <module>axis</module>
         <module>axis-deployer</module>
         <module>client</module>
-        <module>client-corba</module>
+        <module>client-corba-yoko</module>
+        <module>client-corba-sun</module>
         <module>client-deployer</module>
         <module>client-security</module>
         <module>client-system</module>
@@ -124,12 +130,11 @@
         <module>clustering</module>
         <module>webconsole-jetty</module>
         <module>webconsole-tomcat</module>
-        <!-- <module>daytrader-jetty</module> -->
-        <!-- <module>daytrader-tomcat</module> -->
         <module>directory</module>
         <module>geronimo-gbean-deployer</module>
         <module>hot-deployer</module>
-        <module>j2ee-corba</module>
+        <module>j2ee-corba-sun</module>
+        <module>j2ee-corba-yoko</module>
         <module>j2ee-deployer</module>
         <module>j2ee-security</module>
         <module>j2ee-server</module>
@@ -171,5 +176,5 @@
         <module>dojo-jetty</module>
         <module>dojo-tomcat</module>
     </modules>
-    
+
 </project>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=452621&r1=452620&r2=452621
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Oct  3 14:01:44 2006
@@ -173,7 +173,7 @@
                 <artifactId>geronimo-servlet_2.4_spec</artifactId>
                 <version>1.0.1</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.xbean</groupId>
                 <artifactId>xbean-naming</artifactId>
@@ -400,6 +400,24 @@
             </dependency>
 
             <dependency>
+                <groupId>org.apache.yoko</groupId>
+                <artifactId>yoko-core</artifactId>
+                <version>1.0-incubating-M1-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.yoko</groupId>
+                <artifactId>yoko-spec-corba</artifactId>
+                <version>1.0-incubating-M1-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.yoko</groupId>
+                <artifactId>yoko-rmi</artifactId>
+                <version>1.0-incubating-M1-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
                 <version>3.8.1</version>
@@ -583,6 +601,18 @@
             </dependency>
 
             <dependency>
+                <groupId>org.apache.openejb</groupId>
+                <artifactId>openejb-yoko</artifactId>
+                <version>2.2-incubating-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.openejb</groupId>
+                <artifactId>openejb-sunorb</artifactId>
+                <version>2.2-incubating-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
                 <groupId>tranql</groupId>
                 <artifactId>tranql-connector</artifactId>
                 <version>1.2</version>
@@ -1116,7 +1146,7 @@
 
         <!--
         NOTE: This profile is used to enable plugin prefixes for easy command-line usage,
as in:
-        
+
               mvn -Ptools geronimo:start
         -->
         <profile>
@@ -1138,7 +1168,7 @@
                         <groupId>org.apache.geronimo.genesis.plugins</groupId>
                         <artifactId>tools-maven-plugin</artifactId>
                     </plugin>
-                    
+
                     <plugin>
                         <groupId>org.apache.geronimo.genesis.plugins</groupId>
                         <artifactId>maven-maven-plugin</artifactId>
@@ -1146,7 +1176,7 @@
                 </plugins>
             </build>
         </profile>
-        
+
         <!--
         NOTE: The staged build is used to get around a problem with Maven
               and extension plugins.
@@ -1209,10 +1239,10 @@
                 <module>modules</module>
                 <module>maven-plugins</module>
                 <module>applications</module>
-                
+
                 <!--
                 NOTE: Probably do not want to publish these to the repo...  Or do we?
-                
+
                 <module>configs</module>
                 <module>assemblies</module>
                 -->
@@ -1236,13 +1266,13 @@
                 <module>applications</module>
             </modules>
         </profile>
-        
+
         <profile>
             <id>sign-artifacts</id>
-            
+
             <!--
             NOTE: To use you need to enable this profile and pass in the passphrase:
-                  
+
                   mvn -Psign-artifacts -Dpassphrase=thephrase
             -->
             <build>
@@ -1263,7 +1293,7 @@
                 </plugins>
             </build>
         </profile>
-        
+
     </profiles>
 
 </project>



Mime
View raw message