geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r367143 - in /geronimo/branches/1.0/modules/naming-builder/src: java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java schema/geronimo-naming-1.0.xsd
Date Mon, 09 Jan 2006 00:32:19 GMT
Author: ammulder
Date: Sun Jan  8 16:32:16 2006
New Revision: 367143

URL: http://svn.apache.org/viewcvs?rev=367143&view=rev
Log:
Fix resource-env-ref mapping by admin-object-name (GERONIMO-1435)

Modified:
    geronimo/branches/1.0/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
    geronimo/branches/1.0/modules/naming-builder/src/schema/geronimo-naming-1.0.xsd

Modified: geronimo/branches/1.0/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java?rev=367143&r1=367142&r2=367143&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
(original)
+++ geronimo/branches/1.0/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
Sun Jan  8 16:32:16 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/branches/1.0/modules/naming-builder/src/schema/geronimo-naming-1.0.xsd
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/naming-builder/src/schema/geronimo-naming-1.0.xsd?rev=367143&r1=367142&r2=367143&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/naming-builder/src/schema/geronimo-naming-1.0.xsd (original)
+++ geronimo/branches/1.0/modules/naming-builder/src/schema/geronimo-naming-1.0.xsd Sun Jan
 8 16:32:16 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"/>



Mime
View raw message