djencks 2005/03/09 01:00:45
Modified: modules/assembly/src/plan j2ee-deployer-plan.xml
j2ee-server-plan.xml
Log:
keep the list of openorb jars in only one place, and make it complete.
Convert the C/TSSConfigEditors to xml-attributes. Fix the tss schema, and the
xml in that schema.
Revision Changes Path
1.39 +4 -0 openejb/modules/assembly/src/plan/j2ee-deployer-plan.xml
Index: j2ee-deployer-plan.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/j2ee-deployer-plan.xml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- j2ee-deployer-plan.xml 6 Mar 2005 02:49:24 -0000 1.38
+++ j2ee-deployer-plan.xml 9 Mar 2005 06:00:45 -0000 1.39
@@ -115,7 +115,11 @@
<gbean name="ServiceBuilder"
class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<reference
name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
+ <reference name="XmlAttributeBuilders"><name>*</name></reference>
</gbean>
+
+ <gbean name="CSSAttributeBuilder"
class="org.openejb.corba.security.config.css.CSSConfigEditor"/>
+ <gbean name="TSSAttributeBuilder"
class="org.openejb.corba.security.config.tss.TSSConfigEditor"/>
<gbean name="EARBuilder"
class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
1.64 +26 -58 openejb/modules/assembly/src/plan/j2ee-server-plan.xml
Index: j2ee-server-plan.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/j2ee-server-plan.xml,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- j2ee-server-plan.xml 8 Mar 2005 04:08:24 -0000 1.63
+++ j2ee-server-plan.xml 9 Mar 2005 06:00:45 -0000 1.64
@@ -106,30 +106,6 @@
<uri>antlr/jars/antlr-${antlr_version}.jar</uri>
</dependency>
- <dependency>
- <uri>openorb/jars/openorb-orb-${openorb_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>openorb/jars/openorb-tools-${openorb_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>openorb/jars/openorb-ins-${openorb_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>openorb/jars/openorb-pss-${openorb_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>openorb/jars/openorb-ssl-${openorb_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>openorb/jars/openorb-orb-omg-${openorb_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>openorb/jars/openorb-ots-${openorb_version}.jar</uri>
- </dependency>
- <dependency>
- <uri>bouncycastle/jars/bcprov-${bouncycastle_version}.jar</uri>
- </dependency>
<!-- required for rar 1.5 to load realms -->
<dependency>
@@ -323,6 +299,9 @@
<reference name="XmlAttributeBuilders"><name>*</name></reference>
</gbean>
+ <gbean name="CSSAttributeBuilder"
class="org.openejb.corba.security.config.css.CSSConfigEditor"/>
+ <gbean name="TSSAttributeBuilder"
class="org.openejb.corba.security.config.tss.TSSConfigEditor"/>
+
<gbean name="EARBuilder"
class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
<attribute
name="defaultParentId">org/apache/geronimo/Server</attribute>
<attribute
name="transactionContextManagerObjectName">openejb.server:name=TransactionContextManager,*</attribute>
@@ -391,26 +370,23 @@
secure.server.allowUnsecure=false
</attribute>
- <attribute name="tssConfig">
- <![CDATA[
-
- <tss xmlns="http://www.openejb.org/xml/ns/corba-tss-config_1_0";>
- <SSL port="684" hostname="localhost"
SSLContextFinderClass="org.openorb.orb.ssl.JSSEContextFinder">
- <supports>Integrity Confidentiality
EstablishTrustInTarget EstablishTrustInClient</supports>
- <requires>Integrity Confidentiality
EstablishTrustInClient</requires>
- </SSL>
- <compoundSecMechTypeList>
- <compoundSecMech>
- <GSSUP targetName="geronimo-properties-realm"/>
- <sasMech>
- <identityTokenTypes>ITTAbsent ITTAnonymous
ITTPrincipalName</identityTokenTypes>
- </sasMech>
- </compoundSecMech>
- </compoundSecMechTypeList>
- </tss>
-
- ]]>
- </attribute>
+ <xml-attribute name="tssConfig">
+ <tss:tss
xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config_1_0";>
+ <tss:SSL port="684" hostname="localhost">
+<!--
SSLContextFinderClass="org.openorb.orb.ssl.JSSEContextFinder"-->
+ <tss:supports>Integrity Confidentiality
EstablishTrustInTarget EstablishTrustInClient</tss:supports>
+ <tss:requires>Integrity Confidentiality
EstablishTrustInClient</tss:requires>
+ </tss:SSL>
+ <tss:compoundSecMechTypeList>
+ <tss:compoundSecMech>
+ <tss:GSSUP targetName="geronimo-properties-realm"/>
+ <tss:sasMech>
+ <tss:identityTokenTypes>ITTAbsent ITTAnonymous
ITTPrincipalName</tss:identityTokenTypes>
+ </tss:sasMech>
+ </tss:compoundSecMech>
+ </tss:compoundSecMechTypeList>
+ </tss:tss>
+ </xml-attribute>
</gbean>
<gbean gbeanName="openejb.CORBA:type=NameServer"
class="org.openejb.corba.OpenORBNameBean">
@@ -427,13 +403,9 @@
<reference
name="Server"><gbean-name>openejb.CORBA:type=Server</gbean-name></reference>
<reference
name="Containers"><gbean-name>openejb.server:EJBModule=org/openejb/scenario001,*</gbean-name></reference>
<reference
name="TieLoader"><gbean-name>openejb.CORBA:type=TieLoader,name=ClasspathTieLoader</gbean-name></reference>
- <attribute name="tssConfig">
- <![CDATA[
-
- <tss inherit="true"
xmlns="http://www.openejb.org/xml/ns/corba-tss-config_1_0"/>
-
- ]]>
- </attribute>
+ <xml-attribute name="tssConfig">
+ <tss:tss inherit="true"
xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config_1_0"/>
+ </xml-attribute>
</gbean>
<gbean gbeanName="openejb.CORBA:type=CSS,domain=IOR7"
class="org.openejb.corba.CSSBean">
@@ -459,13 +431,9 @@
secure.server.allowUnsecure=false
</attribute>
- <attribute name="cssConfig">
- <![CDATA[
-
- <css xmlns="http://www.openejb.org/xml/ns/corba-css-config_1_0"/>
-
- ]]>
- </attribute>
+ <xml-attribute name="cssConfig">
+ <css:css
xmlns:css="http://www.openejb.org/xml/ns/corba-css-config_1_0"/>
+ </xml-attribute>
</gbean>
<gbean gbeanName="openejb.CORBA:type=OpenORBUtil"
class="org.openejb.corba.util.OpenORBUtil">
