You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2006/04/24 19:44:10 UTC
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/...
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();
}
/**