You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by bs...@apache.org on 2007/07/04 08:42:47 UTC
svn commit: r553098 - in /incubator/servicemix/trunk:
core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jmx/ConnectorServerFactoryBean.java
web/servicemix-web-console/src/main/java/org/apache/servicemix/web/model/ProxyManager.java
Author: bsnyder
Date: Tue Jul 3 23:42:46 2007
New Revision: 553098
URL: http://svn.apache.org/viewvc?view=rev&rev=553098
Log:
Fixes to match newer Spring APIs when setting an object name.
Modified:
incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jmx/ConnectorServerFactoryBean.java
incubator/servicemix/trunk/web/servicemix-web-console/src/main/java/org/apache/servicemix/web/model/ProxyManager.java
Modified: incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jmx/ConnectorServerFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jmx/ConnectorServerFactoryBean.java?view=diff&rev=553098&r1=553097&r2=553098
==============================================================================
--- incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jmx/ConnectorServerFactoryBean.java (original)
+++ incubator/servicemix/trunk/core/servicemix-core/src/main/java/org/apache/servicemix/jbi/jmx/ConnectorServerFactoryBean.java Tue Jul 3 23:42:46 2007
@@ -70,7 +70,7 @@
private boolean daemon = false;
private boolean threaded = false;
private Map environment;
- private String objectName;
+ private Object objectName;
private int registrationBehavior = REGISTRATION_FAIL_ON_EXISTING;
private MBeanServer server;
private static final Constants constants = new Constants(ConnectorServerFactoryBean.class);
@@ -103,7 +103,7 @@
* @throws MalformedObjectNameException if the <code>ObjectName</code> is malformed
* @see org.springframework.jmx.support.ConnectorServerFactoryBean#setObjectName(java.lang.String)
*/
- public void setObjectName(String objectName) throws MalformedObjectNameException {
+ public void setObjectName(Object objectName) throws MalformedObjectNameException {
this.objectName = objectName;
}
Modified: incubator/servicemix/trunk/web/servicemix-web-console/src/main/java/org/apache/servicemix/web/model/ProxyManager.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/web/servicemix-web-console/src/main/java/org/apache/servicemix/web/model/ProxyManager.java?view=diff&rev=553098&r1=553097&r2=553098
==============================================================================
--- incubator/servicemix/trunk/web/servicemix-web-console/src/main/java/org/apache/servicemix/web/model/ProxyManager.java (original)
+++ incubator/servicemix/trunk/web/servicemix-web-console/src/main/java/org/apache/servicemix/web/model/ProxyManager.java Tue Jul 3 23:42:46 2007
@@ -44,7 +44,7 @@
MBeanProxyFactoryBean factory = new MBeanProxyFactoryBean();
factory.setServer(server);
try {
- factory.setObjectName(name.toString());
+ factory.setObjectName(name);
} catch (MalformedObjectNameException e) {
throw new IllegalStateException(e);
}