You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2006/06/01 04:31:40 UTC
svn commit: r410718 - in /geronimo/trunk: applications/magicGball/
applications/magicGball/src/plan/
applications/magicGball/src/webapp/WEB-INF/ configs/client-corba/
configs/client-security/src/plan/ configs/j2ee-corba/
modules/j2ee-schema/src/java/or...
Author: djencks
Date: Wed May 31 19:31:39 2006
New Revision: 410718
URL: http://svn.apache.org/viewvc?rev=410718&view=rev
Log:
GERONIMO-2040 port changes from 1.1 branch. This does not yet work for me on trunk, but the changes all appear necessary anyway
Modified:
geronimo/trunk/applications/magicGball/project.properties
geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml
geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-plan.xml
geronimo/trunk/applications/magicGball/src/webapp/WEB-INF/web.xml
geronimo/trunk/configs/client-corba/project.xml
geronimo/trunk/configs/client-security/src/plan/plan.xml
geronimo/trunk/configs/j2ee-corba/project.xml
geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java
Modified: geronimo/trunk/applications/magicGball/project.properties
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/magicGball/project.properties?rev=410718&r1=410717&r2=410718&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/project.properties (original)
+++ geronimo/trunk/applications/magicGball/project.properties Wed May 31 19:31:39 2006
@@ -30,3 +30,6 @@
# set eclipse project name (used in eclipse plugin V1.11 onwards)
maven.eclipse.project.name=${geronimo.maven.eclipse.applications.project.prefix}${pom.artifactId}
+
+PlanORBSSLHost=localhost
+PlanORBSSLPort=2001
Modified: geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml?rev=410718&r1=410717&r2=410718&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml (original)
+++ geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml Wed May 31 19:31:39 2006
@@ -1,19 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<application
- xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
- configId="org/apache/geronimo/MagicGBallCorbaNoSec"
- parentId="geronimo/j2ee-server-corba/1.0/car">
-
- <import>
- <uri>org/apache/geronimo/Security</uri>
- </import>
+ xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+ <!--configId="org/apache/geronimo/MagicGBallCorbaNoSec"-->
+ <!--parentId="geronimo/j2ee-server-corba/1.0/car">-->
+<!---->
+ <!--<import>-->
+ <!--<uri>org/apache/geronimo/Security</uri>-->
+ <!--</import>-->
+ <environment>
+ <moduleId>
+ <groupId>geronimo</groupId>
+ <artifactId>magicGBall-corba-nosec</artifactId>
+ <version>${pom.currentVersion}</version>
+ <type>car</type>
+ </moduleId>
+ <dependencies>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>j2ee-corba</artifactId>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ <hidden-classes/>
+ <non-overridable-classes/>
+ </environment>
<module>
<ejb>magicGball-ejb-${geronimo_version}.jar</ejb>
<openejb-jar
- xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.0"
- configId="MagicGBallEJB"
- parentId="org/apache/geronimo/ServerCORBA">
+ xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
+ <!--configId="MagicGBallEJB"-->
+ <!--parentId="org/apache/geronimo/ServerCORBA">-->
<enterprise-beans>
<session>
@@ -22,25 +39,71 @@
<tss-link>IdentityTokenNoSecurity </tss-link>
</session>
</enterprise-beans>
+ <gbean name="IdentityTokenNoSecurity" class="org.openejb.corba.TSSBean">
+ <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>
+
</openejb-jar>
</module>
<module>
<web>magicGball-${geronimo_version}.war</web>
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0" configId="MagicGBallWAR">
- <context-priority-classloader>false</context-priority-classloader>
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
+ <!--configId="MagicGBallWAR">-->
</web-app>
</module>
<module>
<java>magicGball-client-${geronimo_version}.jar</java>
- <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client"
- configId="client"
- clientConfigId="org/apache/geronimo/MagicGBallClientNoSec"
- clientParentId="org/apache/geronimo/ClientCORBA">
- <import>
- <uri>org/apache/geronimo/ClientSecurity</uri>
- </import>
+ <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1">
+ <!--configId="client"-->
+ <!--clientConfigId="org/apache/geronimo/MagicGBallClientNoSec"-->
+ <!--clientParentId="org/apache/geronimo/ClientCORBA">-->
+ <!--<import>-->
+ <!--<uri>org/apache/geronimo/ClientSecurity</uri>-->
+ <!--</import>-->
+ <client-environment>
+ <moduleId>
+ <groupId>geronimo</groupId>
+ <artifactId>magicGBall-corba-nosec-client</artifactId>
+ <version>${pom.currentVersion}</version>
+ <type>car</type>
+ </moduleId>
+ <dependencies>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>client-corba</artifactId>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ <hidden-classes/>
+ <non-overridable-classes/>
+ </client-environment>
+ <server-environment>
+ </server-environment>
+
<ejb-ref>
<ref-name>mGball</ref-name>
<ns-corbaloc>corbaloc::localhost:1050/NameService</ns-corbaloc>
@@ -49,6 +112,30 @@
</ejb-ref>
<realm-name>client-properties-realm</realm-name>
<callback-handler>org.acme.MagicGBallCallbackHandler</callback-handler>
+ <gbean name="NoSecurity" class="org.openejb.corba.CSSBean">
+ <reference name="ThreadPool">
+ <name>DefaultThreadPool</name>
+ </reference>
+ <reference name="TransactionContextManager">
+ <name>TransactionContextManager</name>
+ </reference>
+ <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
+ <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>
+
</application-client>
</module>
Modified: geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-plan.xml?rev=410718&r1=410717&r2=410718&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-plan.xml (original)
+++ geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-plan.xml Wed May 31 19:31:39 2006
@@ -1,46 +1,111 @@
<?xml version="1.0" encoding="UTF-8"?>
<application
- xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
- configId="org/apache/geronimo/MagicGBallCorba"
+ xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+<!-- configId="org/apache/geronimo/MagicGBallCorba"
parentId="org/apache/geronimo/ServerCORBA">
<import>
<uri>org/apache/geronimo/Security</uri>
</import>
+ -->
+ <environment>
+ <moduleId>
+ <groupId>geronimo</groupId>
+ <artifactId>magicGBall-corba-ssl</artifactId>
+ <version>${pom.currentVersion}</version>
+ <type>car</type>
+ </moduleId>
+ <dependencies>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>j2ee-corba</artifactId>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ <hidden-classes/>
+ <non-overridable-classes/>
+ </environment>
<module>
<ejb>magicGball-ejb-${geronimo_version}.jar</ejb>
<openejb-jar
- xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.0"
- configId="MagicGBallEJB"
+ xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
+<!-- configId="MagicGBallEJB"
parentId="org/apache/geronimo/ServerCORBA">
-
+ -->
<enterprise-beans>
<session>
<ejb-name>MagicGBall</ejb-name>
<jndi-name>MagicGBall</jndi-name>
- <tss-link>SSLClientPassword </tss-link>
+ <tss-link>SSLClientPassword</tss-link>
</session>
</enterprise-beans>
+ <gbean name="SSLClientPassword" class="org.openejb.corba.TSSBean">
+ <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>
+
</openejb-jar>
</module>
<module>
<web>magicGball-${geronimo_version}.war</web>
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0" configId="MagicGBallWAR">
- <context-priority-classloader>false</context-priority-classloader>
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
+ <!--configId="MagicGBallWAR">-->
</web-app>
</module>
<module>
<java>magicGball-client-${geronimo_version}.jar</java>
- <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client"
- configId="client"
- clientConfigId="org/apache/geronimo/MagicGBallClient"
- clientParentId="org/apache/geronimo/ClientCORBA">
- <import>
- <uri>org/apache/geronimo/ClientSecurity</uri>
- </import>
+ <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1">
+ <!--configId="client"-->
+ <!--clientConfigId="org/apache/geronimo/MagicGBallClient"-->
+ <!--clientParentId="org/apache/geronimo/ClientCORBA">-->
+ <!--<import>-->
+ <!--<uri>org/apache/geronimo/ClientSecurity</uri>-->
+ <!--</import>-->
+ <client-environment>
+ <moduleId>
+ <groupId>geronimo</groupId>
+ <artifactId>magicGBall-corba-ssl-client</artifactId>
+ <version>${pom.currentVersion}</version>
+ <type>car</type>
+ </moduleId>
+ <dependencies>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>client-corba</artifactId>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ <hidden-classes/>
+ <non-overridable-classes/>
+ </client-environment>
+ <server-environment>
+ </server-environment>
<ejb-ref>
<ref-name>mGball</ref-name>
<ns-corbaloc>corbaloc::localhost:1050/NameService</ns-corbaloc>
@@ -49,6 +114,45 @@
</ejb-ref>
<realm-name>client-properties-realm</realm-name>
<callback-handler>org.acme.MagicGBallCallbackHandler</callback-handler>
+ <gbean name="SSLClientPassword" class="org.openejb.corba.CSSBean">
+ <reference name="ThreadPool">
+ <name>DefaultThreadPool</name>
+ </reference>
+ <reference name="TransactionContextManager">
+ <name>TransactionContextManager</name>
+ </reference>
+ <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
+ <attribute name="description">SSLClientPassword</attribute>
+ <xml-attribute name="nssConfig">
+ <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>
+ <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="system" password="manager" domain="default"/>
+ <css:sasMech>
+ <css:ITTAbsent/>
+ </css:sasMech>
+ </css:compoundSecMech>
+ </css:compoundSecMechTypeList>
+ </css:css>
+ </xml-attribute>
+ </gbean>
+
</application-client>
</module>
@@ -65,10 +169,10 @@
<dep:gbean name="default"
class="org.apache.geronimo.security.realm.GenericSecurityRealm"
- xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.0">
+ xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
<dep:attribute name="realmName">default</dep:attribute>
<dep:xml-reference name="LoginModuleConfiguration">
- <lc:login-config xmlns:lc="http://geronimo.apache.org/xml/ns/loginconfig">
+ <lc:login-config xmlns:lc="http://geronimo.apache.org/xml/ns/loginconfig-1.1">
<lc:login-module control-flag="REQUIRED" server-side="true">
<lc:login-domain-name>default</lc:login-domain-name>
<lc:login-module-class>org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</lc:login-module-class>
@@ -78,13 +182,9 @@
</lc:login-config>
</dep:xml-reference>
<dep:reference name="ServerInfo">
- <dep:application>null</dep:application>
- <dep:module>org/apache/geronimo/System</dep:module>
<dep:name>ServerInfo</dep:name>
</dep:reference>
<dep:reference name="LoginService">
- <dep:application>null</dep:application>
- <dep:module>org/apache/geronimo/Security</dep:module>
<dep:name>JaasLoginService</dep:name>
</dep:reference>
</dep:gbean>
Modified: geronimo/trunk/applications/magicGball/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/magicGball/src/webapp/WEB-INF/web.xml?rev=410718&r1=410717&r2=410718&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/src/webapp/WEB-INF/web.xml (original)
+++ geronimo/trunk/applications/magicGball/src/webapp/WEB-INF/web.xml Wed May 31 19:31:39 2006
@@ -21,6 +21,6 @@
<ejb-ref-type>Session</ejb-ref-type>
<local-home>org.acme.MagicGBallLocalHome</local-home>
<local>org.acme.MagicGBallLocal</local>
- <ejb-link>magicGball-ejb-1.0.jar#MagicGBall</ejb-link>
+ <ejb-link>magicGball-ejb-1.2-SNAPSHOT.jar#MagicGBall</ejb-link>
</ejb-local-ref>
</web-app>
Modified: geronimo/trunk/configs/client-corba/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-corba/project.xml?rev=410718&r1=410717&r2=410718&view=diff
==============================================================================
--- geronimo/trunk/configs/client-corba/project.xml (original)
+++ geronimo/trunk/configs/client-corba/project.xml Wed May 31 19:31:39 2006
@@ -72,7 +72,7 @@
<!-- parent config -->
<dependency>
<groupId>geronimo</groupId>
- <artifactId>client</artifactId>
+ <artifactId>client-security</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
<properties>
Modified: geronimo/trunk/configs/client-security/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-security/src/plan/plan.xml?rev=410718&r1=410717&r2=410718&view=diff
==============================================================================
--- geronimo/trunk/configs/client-security/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/client-security/src/plan/plan.xml Wed May 31 19:31:39 2006
@@ -30,7 +30,6 @@
<!-- required -->
<gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
<reference name="ServerInfo">
- <module>geronimo/client-system/${pom.currentVersion}/car</module>
<name>ServerInfo</name>
</reference>
<attribute name="policyConfigurationFactory">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
@@ -93,7 +92,6 @@
</lc:login-config>
</xml-reference>
<reference name="ServerInfo">
- <module>geronimo/client-system/${pom.currentVersion}/car</module>
<name>ServerInfo</name>
</reference>
<reference name="LoginService">
Modified: geronimo/trunk/configs/j2ee-corba/project.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-corba/project.xml?rev=410718&r1=410717&r2=410718&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-corba/project.xml (original)
+++ geronimo/trunk/configs/j2ee-corba/project.xml Wed May 31 19:31:39 2006
@@ -90,6 +90,16 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>openejb</artifactId>
+ <version>${geronimo_version}</version>
+ <type>car</type>
+ <properties>
+ <geronimo.import>true</geronimo.import>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
<version>${geronimo_version}</version>
</dependency>
@@ -187,14 +197,6 @@
<groupId>tranql</groupId>
<artifactId>tranql</artifactId>
<version>${tranql_version}</version>
- </dependency>
- <dependency>
- <groupId>openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <version>${openejb_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
</dependency>
<dependency>
<groupId>howl</groupId>
Modified: geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java?rev=410718&r1=410717&r2=410718&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java (original)
+++ geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java Wed May 31 19:31:39 2006
@@ -69,6 +69,8 @@
GERONIMO_SCHEMA_CONVERSIONS.put("gbean", new GBeanElementConverter());
GERONIMO_SCHEMA_CONVERSIONS.put("environment", new NamespaceElementConverter(GERONIMO_SERVICE_NAMESPACE));
+ GERONIMO_SCHEMA_CONVERSIONS.put("client-environment", new NamespaceElementConverter(GERONIMO_SERVICE_NAMESPACE));
+ GERONIMO_SCHEMA_CONVERSIONS.put("server-environment", new NamespaceElementConverter(GERONIMO_SERVICE_NAMESPACE));
}
private SchemaConversionUtils() {