You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2006/01/09 01:34:58 UTC
svn commit: r367145 - in /geronimo/trunk/modules/naming-builder/src:
java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
schema/geronimo-naming-1.0.xsd
Author: ammulder
Date: Sun Jan 8 16:34:55 2006
New Revision: 367145
URL: http://svn.apache.org/viewcvs?rev=367145&view=rev
Log:
Merge fix to GERONIMO-1435 from branch.
Modified:
geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
geronimo/trunk/modules/naming-builder/src/schema/geronimo-naming-1.0.xsd
Modified: geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java?rev=367145&r1=367144&r2=367145&view=diff
==============================================================================
--- geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java (original)
+++ geronimo/trunk/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java Sun Jan 8 16:34:55 2006
@@ -308,7 +308,7 @@
throw new DeploymentException("Could not construct module URI", e);
}
}
- containerId = refContext.getAdminObjectContainerId(moduleURI, gerResourceEnvRef.getMessageDestinationLink().trim(), context);
+ containerId = refContext.getAdminObjectContainerId(moduleURI, gerResourceEnvRef.getAdminObjectLink().trim(), context);
} else if (gerResourceEnvRef.isSetTargetName()) {
containerId = getStringValue(gerResourceEnvRef.getTargetName());
} else {
Modified: geronimo/trunk/modules/naming-builder/src/schema/geronimo-naming-1.0.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming-builder/src/schema/geronimo-naming-1.0.xsd?rev=367145&r1=367144&r2=367145&view=diff
==============================================================================
--- geronimo/trunk/modules/naming-builder/src/schema/geronimo-naming-1.0.xsd (original)
+++ geronimo/trunk/modules/naming-builder/src/schema/geronimo-naming-1.0.xsd Sun Jan 8 16:34:55 2006
@@ -139,7 +139,14 @@
<xsd:element name="ref-name" type="xsd:string"/>
<xsd:choice>
<xsd:group ref="gernaming:objectNameGroup"/>
- <xsd:element name="message-destination-link" type="xsd:string"/>
+ <xsd:element name="message-destination-link" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation>
+ This element is deprecated and should not be used. Use admin-object-link instead.
+ That is effectively a renamed version of this.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
<xsd:sequence>
<xsd:element name="admin-object-module" type="xsd:string" minOccurs="0"/>
<xsd:element name="admin-object-link" type="xsd:string"/>