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/10 23:36:46 UTC
svn commit: r462587 - in /geronimo/server/trunk:
configs/client-deployer/src/plan/
modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/
Author: djencks
Date: Tue Oct 10 14:36:45 2006
New Revision: 462587
URL: http://svn.apache.org/viewvc?view=rev&rev=462587
Log:
GERONIMO-2383 Forgot the isMergeEnvironment in a couple builders. Give client builder its own ref builders
Modified:
geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml
geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.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=462587&r1=462586&r2=462587
==============================================================================
--- geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml Tue Oct 10 14:36:45 2006
@@ -38,10 +38,10 @@
<name>PersistenceContextRefBuilder</name>
</pattern>
<pattern>
- <name>ResourceRefBuilder</name>
+ <name>ClientResourceRefBuilder</name>
</pattern>
<pattern>
- <name>AdminObjectRefBuilder</name>
+ <name>ClientAdminObjectRefBuilder</name>
</pattern>
<pattern>
<name>EnvironmentEntryBuilder</name>
@@ -105,6 +105,13 @@
</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/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java?view=diff&rev=462587&r1=462586&r2=462587
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java Tue Oct 10 14:36:45 2006
@@ -67,6 +67,9 @@
messageDestinationRefQNameSet = buildQNameSet(eeNamespaces, "message-destination-ref");
}
+ protected boolean willMergeEnvironment(XmlObject specDD, XmlObject plan) {
+ return specDD.selectChildren(adminOjbectRefQNameSet).length > 0 || specDD.selectChildren(messageDestinationRefQNameSet).length > 0;
+ }
public void initContext(XmlObject specDD, XmlObject plan, Configuration localConfiguration, Configuration remoteConfiguration, Module module) throws DeploymentException {
XmlObject[] specDestinations = convert(specDD.selectChildren(messageDestinationQNameSet), J2EE_CONVERTER, MessageDestinationType.type);
Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java?view=diff&rev=462587&r1=462586&r2=462587
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java Tue Oct 10 14:36:45 2006
@@ -67,6 +67,10 @@
resourceRefQNameSet = buildQNameSet(eeNamespaces, "resource-ref");
}
+ protected boolean willMergeEnvironment(XmlObject specDD, XmlObject plan) {
+ return specDD.selectChildren(resourceRefQNameSet).length > 0;
+ }
+
public void buildNaming(XmlObject specDD, XmlObject plan, Configuration localConfiguration, Configuration remoteConfiguration, Module module, Map componentContext) throws DeploymentException {
XmlObject[] resourceRefsUntyped = convert(specDD.selectChildren(resourceRefQNameSet), J2EE_CONVERTER, ResourceRefType.type);
XmlObject[] gerResourceRefsUntyped = plan == null? NO_REFS: plan.selectChildren(GER_RESOURCE_REF_QNAME_SET);
Re: svn commit: r462587 - in /geronimo/server/trunk: configs/client-deployer/src/plan/ modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/
Posted by David Jencks <da...@yahoo.com>.
On Oct 11, 2006, at 1:21 AM, Jacek Laskowski wrote:
> On 10/10/06, djencks@apache.org <dj...@apache.org> wrote:
>> Author: djencks
>> Date: Tue Oct 10 14:36:45 2006
>> New Revision: 462587
>>
>> URL: http://svn.apache.org/viewvc?view=rev&rev=462587
>> Log:
>> GERONIMO-2383 Forgot the isMergeEnvironment in a couple builders.
>> Give client builder its own ref builders
> ...
>> + protected boolean willMergeEnvironment(XmlObject specDD,
>> XmlObject plan) {
>> + return specDD.selectChildren
>> (adminOjbectRefQNameSet).length > 0 || specDD.selectChildren
>> (messageDestinationRefQNameSet).length > 0;
>> + }
> ...
>> + protected boolean willMergeEnvironment(XmlObject specDD,
>> XmlObject plan) {
>> + return specDD.selectChildren(resourceRefQNameSet).length
>> > 0;
>> + }
>> +
>
> I'm kind of confused. You wrote isMergeEnvironment in the commit log
> whereas the method name starts with 'will'. I think you were right in
> your commit log as it tests not does something.
The patch is right, this is a protected method in
AbstractNamingBuilder, and depending on the answer we proceed to
merge environments or not.
The method name might not be ideal, but changing it would be a much
bigger patch.
thanks
david jencks
>
> Jacek
>
> --
> Jacek Laskowski
> http://www.laskowski.net.pl
Re: svn commit: r462587 - in /geronimo/server/trunk: configs/client-deployer/src/plan/ modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/
Posted by Jacek Laskowski <ja...@laskowski.net.pl>.
On 10/10/06, djencks@apache.org <dj...@apache.org> wrote:
> Author: djencks
> Date: Tue Oct 10 14:36:45 2006
> New Revision: 462587
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=462587
> Log:
> GERONIMO-2383 Forgot the isMergeEnvironment in a couple builders. Give client builder its own ref builders
...
> + protected boolean willMergeEnvironment(XmlObject specDD, XmlObject plan) {
> + return specDD.selectChildren(adminOjbectRefQNameSet).length > 0 || specDD.selectChildren(messageDestinationRefQNameSet).length > 0;
> + }
...
> + protected boolean willMergeEnvironment(XmlObject specDD, XmlObject plan) {
> + return specDD.selectChildren(resourceRefQNameSet).length > 0;
> + }
> +
I'm kind of confused. You wrote isMergeEnvironment in the commit log
whereas the method name starts with 'will'. I think you were right in
your commit log as it tests not does something.
Jacek
--
Jacek Laskowski
http://www.laskowski.net.pl