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/10/18 10:46:38 UTC
svn commit: r465177 - in /geronimo/server/trunk:
configs/client-deployer/src/plan/ configs/connector-deployer/src/plan/
configs/j2ee-deployer/src/plan/
modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/
Author: djencks
Date: Wed Oct 18 01:46:37 2006
New Revision: 465177
URL: http://svn.apache.org/viewvc?view=rev&rev=465177
Log:
GERONIMO-2499 OPENEJB-280. Allow naming builders to collide on one QNameSet but not both. Hook up the new corba NamingBuilders for corba ejb refs and binding to corba name server
Modified:
geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml
geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java
Modified: geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml?view=diff&rev=465177&r1=465176&r2=465177
==============================================================================
--- geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml Wed Oct 18 01:46:37 2006
@@ -53,6 +53,9 @@
<name>OpenEjbClientRemoteRefBuilder</name>
</pattern>
<pattern>
+ <name>OpenEjbClientCorbaRefBuilder</name>
+ </pattern>
+ <pattern>
<name>CorbaRefBuilder</name>
</pattern>
</references>
@@ -83,35 +86,5 @@
</xml-attribute>
</gbean>
-
- <gbean name="ClientConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
- <attribute name="defaultMaxSize">10</attribute>
- <attribute name="defaultMinSize">0</attribute>
- <attribute name="defaultBlockingTimeoutMilliseconds">5000</attribute>
- <attribute name="defaultIdleTimeoutMinutes">15</attribute>
- <attribute name="defaultXATransactionCaching">true</attribute>
- <attribute name="defaultXAThreadCaching">false</attribute>
- <reference name="ServiceBuilders">
- <name>GBeanBuilder</name>
- </reference>
- <xml-attribute name="defaultEnvironment">
- <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
- <dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>client-transaction</artifactId>
- <type>car</type>
- </dependency>
- </dependencies>
- </environment>
- </xml-attribute>
- </gbean>
-
- <gbean name="ClientResourceRefBuilder" class="org.apache.geronimo.connector.deployment.ResourceRefBuilder">
- <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
- </gbean>
- <gbean name="ClientAdminObjectRefBuilder" class="org.apache.geronimo.connector.deployment.AdminObjectRefBuilder">
- <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
- </gbean>
</module>
Modified: geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml?view=diff&rev=465177&r1=465176&r2=465177
==============================================================================
--- geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml Wed Oct 18 01:46:37 2006
@@ -54,4 +54,34 @@
<attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
</gbean>
+ <gbean name="ClientConnectorBuilder" class="org.apache.geronimo.connector.deployment.ConnectorModuleBuilder">
+ <attribute name="defaultMaxSize">10</attribute>
+ <attribute name="defaultMinSize">0</attribute>
+ <attribute name="defaultBlockingTimeoutMilliseconds">5000</attribute>
+ <attribute name="defaultIdleTimeoutMinutes">15</attribute>
+ <attribute name="defaultXATransactionCaching">true</attribute>
+ <attribute name="defaultXAThreadCaching">false</attribute>
+ <reference name="ServiceBuilders">
+ <name>GBeanBuilder</name>
+ </reference>
+ <xml-attribute name="defaultEnvironment">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>client-transaction</artifactId>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ </environment>
+ </xml-attribute>
+ </gbean>
+
+ <gbean name="ClientResourceRefBuilder" class="org.apache.geronimo.connector.deployment.ResourceRefBuilder">
+ <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
+ </gbean>
+ <gbean name="ClientAdminObjectRefBuilder" class="org.apache.geronimo.connector.deployment.AdminObjectRefBuilder">
+ <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
+ </gbean>
+
</module>
Modified: geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml?view=diff&rev=465177&r1=465176&r2=465177
==============================================================================
--- geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml Wed Oct 18 01:46:37 2006
@@ -122,6 +122,9 @@
<name>OpenEjbLocalRefBuilder</name>
</pattern>
<pattern>
+ <name>OpenEjbCorbaRefBuilder</name>
+ </pattern>
+ <pattern>
<name>CorbaRefBuilder</name>
</pattern>
</references>
Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java?view=diff&rev=465177&r1=465176&r2=465177
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/NamingBuilderCollection.java Wed Oct 18 01:46:37 2006
@@ -45,10 +45,10 @@
private QNameSet planQNames = QNameSet.EMPTY;
public NamingBuilderCollection(Collection builders, final QName basePlanElementName) {
- this.builders = builders == null? Collections.EMPTY_SET: builders;
+ this.builders = builders == null ? Collections.EMPTY_SET : builders;
this.basePlanElementName = basePlanElementName;
if (builders instanceof ReferenceCollection) {
- ((ReferenceCollection)builders).addReferenceCollectionListener(new ReferenceCollectionListener() {
+ ((ReferenceCollection) builders).addReferenceCollectionListener(new ReferenceCollectionListener() {
public void memberAdded(ReferenceCollectionEvent event) {
addBuilder(event.getMember());
@@ -56,9 +56,9 @@
public void memberRemoved(ReferenceCollectionEvent event) {
Object builder = event.getMember();
- QNameSet builderSpecQNames = ((NamingBuilder)builder).getSpecQNameSet();
+ QNameSet builderSpecQNames = ((NamingBuilder) builder).getSpecQNameSet();
specQNames = specQNames.intersect(builderSpecQNames.inverse());
- QNameSet builderPlanQNames = ((NamingBuilder)builder).getPlanQNameSet();
+ QNameSet builderPlanQNames = ((NamingBuilder) builder).getPlanQNameSet();
planQNames = planQNames.intersect(builderPlanQNames.inverse());
XmlBeansUtil.unregisterSubstitutionGroupElements(basePlanElementName, builderPlanQNames);
}
@@ -71,25 +71,22 @@
}
private void addBuilder(Object builder) {
- QNameSet builderSpecQNames = ((NamingBuilder)builder).getSpecQNameSet();
- QNameSet builderPlanQNames = ((NamingBuilder)builder).getPlanQNameSet();
+ QNameSet builderSpecQNames = ((NamingBuilder) builder).getSpecQNameSet();
+ QNameSet builderPlanQNames = ((NamingBuilder) builder).getPlanQNameSet();
if (builderSpecQNames == null) {
throw new IllegalStateException("Builder " + builder + " is missing spec qnames");
}
if (builderPlanQNames == null) {
throw new IllegalStateException("Builder " + builder + " is missing plan qnames");
}
- if (!specQNames.isDisjoint(builderSpecQNames)) {
- throw new IllegalArgumentException("Duplicate builderSpecQNames in builder set: " + builderSpecQNames);
- }
- if (!planQNames.isDisjoint(builderPlanQNames)) {
- throw new IllegalArgumentException("Duplicate builderPlanQNames in builder set: " + builderPlanQNames);
+ if (!specQNames.isDisjoint(builderSpecQNames) && !planQNames.isDisjoint(builderPlanQNames)) {
+ throw new IllegalArgumentException("Duplicate builderSpecQNames in builder set: " + builderSpecQNames + " and duplicate builderPlanQNames in builder set: " + builderPlanQNames);
}
try {
specQNames = specQNames.union(builderSpecQNames);
planQNames = planQNames.union(builderPlanQNames);
} catch (NullPointerException e) {
- throw (IllegalArgumentException)new IllegalArgumentException("could not merge qnamesets for builder " + builder).initCause(e);
+ throw (IllegalArgumentException) new IllegalArgumentException("could not merge qnamesets for builder " + builder).initCause(e);
}
//really?