Return-Path: 
 <scm-return-11552-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 94886 invoked from network); 24 Apr 2006 17:45:32 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 24 Apr 2006 17:45:32 -0000
Received: (qmail 16758 invoked by uid 500); 24 Apr 2006 17:45:30 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 16718 invoked by uid 500); 24 Apr 2006 17:45:29 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 16707 invoked by uid 99); 24 Apr 2006 17:45:29 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Apr 2006 10:45:29 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Mon, 24 Apr 2006 10:45:28 -0700
Received: (qmail 94498 invoked by uid 65534); 24 Apr 2006 17:45:05 -0000
Message-ID: <20060424174505.94488.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r396619 - in /geronimo/branches/1.1:
 configs/j2ee-server/src/plan/
 modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/
 modules/kernel/src/java/org/apache/geronimo/gbean/
 modules/kernel/src/java/org/apache/geronimo/gbean/runtime/...
Date: Mon, 24 Apr 2006 17:44:10 -0000
To: scm@geronimo.apache.org
From: dain@apache.org
X-Mailer: svnmailer-1.0.8
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: dain
Date: Mon Apr 24 10:44:00 2006
New Revision: 396619

URL: http://svn.apache.org/viewcvs?rev=396619&view=rev
Log:
Fixed bug where attribute value was preferred to reference when creating a gbean, so the value would be null.
Fixed but where attributes were set to presistent in GBeanInfoBuilder when there was a reference available.
Change all uses of objectName.toString() to objectName.getCanonicalName().

Modified:
    geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml
    geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/InvalidObjectNameException.java
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java
    geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingClient.java
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/jmx/KernelMBeanServer.java
    geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractDistributor.java

Modified: geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml?rev=396619&r1=396618&r2=396619&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml Mon Apr 24 10:44:00 2006
@@ -149,7 +149,6 @@
         <reference name="WebManagers"/>
         <reference name="EJBManagers"/>
         <reference name="JMSManagers"/>
-        <reference name="JMSManagers"/>
         <reference name="ThreadPools"/>
         <reference name="Repositories"/>
         <reference name="WritableRepos"/>

Modified: geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/InvalidObjectNameException.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/InvalidObjectNameException.java?rev=396619&r1=396618&r2=396619&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/InvalidObjectNameException.java (original)
+++ geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/InvalidObjectNameException.java Mon Apr 24 10:44:00 2006
@@ -25,7 +25,7 @@
     private final ObjectName objectName;
 
     public InvalidObjectNameException(ObjectName objectName) {
-        super(objectName.toString());
+        super(objectName.getCanonicalName());
         this.objectName = objectName;
     }
 

Modified: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java?rev=396619&r1=396618&r2=396619&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java (original)
+++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/GBeanInfoBuilder.java Mon Apr 24 10:44:00 2006
@@ -212,7 +212,7 @@
         for (int i = 0; i < persistentAttributes.length; i++) {
             String attributeName = persistentAttributes[i];
             GAttributeInfo attribute = (GAttributeInfo) attributes.get(attributeName);
-            if (attribute != null) {
+            if (attribute != null && !references.containsKey(attributeName)) {
                 if (isMagicAttribute(attribute)) {
                     // magic attributes can't be persistent
                     continue;

Modified: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java?rev=396619&r1=396618&r2=396619&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java (original)
+++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java Mon Apr 24 10:44:00 2006
@@ -916,11 +916,11 @@
             Iterator names = constructorInfo.getAttributeNames().iterator();
             for (int i = 0; i < parameters.length; i++) {
                 String name = (String) names.next();
-                if (attributeIndex.containsKey(name)) {
+                if (referenceIndex.containsKey(name)) {
+                    parameters[i] = getReferenceByName(name).getProxy();
+                } else if (attributeIndex.containsKey(name)) {
                     GBeanAttribute attribute = getAttributeByName(name);
                     parameters[i] = attribute.getPersistentValue();
-                } else if (referenceIndex.containsKey(name)) {
-                    parameters[i] = getReferenceByName(name).getProxy();
                 } else {
                     stateReason = "the service constructor definition contained the name '" + name + "' which is not a known attribute or reference of the service.";
                     throw new InvalidConfigurationException("Unknown attribute or reference name in constructor: referenceName=" + name + ", gbean=" + abstractName);

Modified: geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingClient.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingClient.java?rev=396619&r1=396618&r2=396619&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingClient.java (original)
+++ geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/remoting/jmx/JaasLoginServiceRemotingClient.java Mon Apr 24 10:44:00 2006
@@ -34,7 +34,7 @@
     static public JaasLoginServiceMBean create(String host, int port) throws IllegalArgumentException {
         URI target;
         try {
-            target = new URI("async", null, host, port, "/JMX", null, JaasLoginServiceRemotingServer.REQUIRED_OBJECT_NAME.toString());
+            target = new URI("async", null, host, port, "/JMX", null, JaasLoginServiceRemotingServer.REQUIRED_OBJECT_NAME.getCanonicalName());
             return create(target);
         } catch (URISyntaxException e) {
             throw new IllegalArgumentException("Bad host or port.");

Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java?rev=396619&r1=396618&r2=396619&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java (original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java Mon Apr 24 10:44:00 2006
@@ -78,7 +78,7 @@
     }
 
     public String getObjectName() {
-        return objectName.toString();
+        return objectName.getCanonicalName();
     }
 
     public AbstractName getAbstractName() {

Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/jmx/KernelMBeanServer.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/jmx/KernelMBeanServer.java?rev=396619&r1=396618&r2=396619&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/jmx/KernelMBeanServer.java (original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/jmx/KernelMBeanServer.java Mon Apr 24 10:44:00 2006
@@ -166,7 +166,7 @@
         try {
             gbeanInfo = kernel.getGBeanInfo(abstractName);
         } catch (GBeanNotFoundException e) {
-            throw new InstanceNotFoundException(name.toString());
+            throw new InstanceNotFoundException(name.getCanonicalName());
         } catch (InternalKernelException e) {
             throw new ReflectionException(unwrapInternalKernelException(e));
         }

Modified: geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractDistributor.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractDistributor.java?rev=396619&r1=396618&r2=396619&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractDistributor.java (original)
+++ geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractDistributor.java Mon Apr 24 10:44:00 2006
@@ -86,7 +86,7 @@
     }
 
     public String getStoreName() {
-        return storeName.toString();
+        return storeName.getCanonicalName();
     }
 
     /**