Author: gnodet
Date: Mon Sep 4 14:47:29 2006
New Revision: 440192
URL: http://svn.apache.org/viewvc?view=rev&rev=440192
Log:
Enhancements to factory beans for jmx connetor and rmi registry.
Use these factories inside ServiceMix management layer
Fix junit tests
Move some test directories inside target
Modified:
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/ConnectorServerFactoryBean.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/MBeanServerContext.java
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/RmiRegistryFactoryBean.java
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/AbstractManagementTest.java
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementContextTest.java
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/DeployAndListServiceAssemblyTasksTest.java
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/InstallComponentTaskTest.java
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/JbiTaskSupport.java
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/servicedesc/EndpointReferenceBuilderTest.java
incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jms/client.xml
incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/multiple-flows.xml
Modified:
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/ConnectorServerFactoryBean.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/ConnectorServerFactoryBean.java?view=diff&rev=440192&r1=440191&r2=440192
==============================================================================
---
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/ConnectorServerFactoryBean.java
(original)
+++
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/ConnectorServerFactoryBean.java
Mon Sep 4 14:47:29 2006
@@ -27,19 +27,29 @@
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
+import org.springframework.core.Constants;
+import org.springframework.jmx.support.MBeanRegistrationSupport;
public class ConnectorServerFactoryBean implements FactoryBean,
InitializingBean, DisposableBean{
private Log log = LogFactory.getLog(ConnectorServerFactoryBean.class);
+ private org.springframework.jmx.support.ConnectorServerFactoryBean csfb =
new org.springframework.jmx.support.ConnectorServerFactoryBean();
private String serviceUrl =
org.springframework.jmx.support.ConnectorServerFactoryBean.DEFAULT_SERVICE_URL;
- private org.springframework.jmx.support.ConnectorServerFactoryBean csfb =
new org.springframework.jmx.support.ConnectorServerFactoryBean();
+ private boolean daemon = false;
+ private boolean threaded = false;
+ private Map environment;
+ private String objectName;
+ private int registrationBehavior;
+ private MBeanServer server;
+ private static final Constants constants = new
Constants(MBeanRegistrationSupport.class);
+
/**
* @param daemon
* @see
org.springframework.jmx.support.ConnectorServerFactoryBean#setDaemon(boolean)
*/
public void setDaemon(boolean daemon) {
- csfb.setDaemon(daemon);
+ this.daemon = daemon;
}
/**
@@ -47,7 +57,7 @@
* @see
org.springframework.jmx.support.ConnectorServerFactoryBean#setEnvironment(java.util.Properties)
*/
public void setEnvironment(Properties environment) {
- csfb.setEnvironment(environment);
+ this.environment = environment;
}
/**
@@ -55,7 +65,7 @@
* @see
org.springframework.jmx.support.ConnectorServerFactoryBean#setEnvironmentMap(java.util.Map)
*/
public void setEnvironmentMap(Map environment) {
- csfb.setEnvironmentMap(environment);
+ this.environment = environment;
}
/**
@@ -64,7 +74,7 @@
* @see
org.springframework.jmx.support.ConnectorServerFactoryBean#setObjectName(java.lang.String)
*/
public void setObjectName(String objectName) throws
MalformedObjectNameException {
- csfb.setObjectName(objectName);
+ this.objectName = objectName;
}
/**
@@ -72,7 +82,7 @@
* @see
org.springframework.jmx.support.MBeanRegistrationSupport#setRegistrationBehavior(int)
*/
public void setRegistrationBehavior(int registrationBehavior) {
- csfb.setRegistrationBehavior(registrationBehavior);
+ this.registrationBehavior = registrationBehavior;
}
/**
@@ -80,7 +90,7 @@
* @see
org.springframework.jmx.support.MBeanRegistrationSupport#setRegistrationBehaviorName(java.lang.String)
*/
public void setRegistrationBehaviorName(String registrationBehavior) {
- csfb.setRegistrationBehaviorName(registrationBehavior);
+
setRegistrationBehavior(constants.asNumber(registrationBehavior).intValue());
}
/**
@@ -88,7 +98,7 @@
* @see
org.springframework.jmx.support.MBeanRegistrationSupport#setServer(javax.management.MBeanServer)
*/
public void setServer(MBeanServer server) {
- csfb.setServer(server);
+ this.server = server;
}
/**
@@ -120,13 +130,26 @@
}
public void afterPropertiesSet() throws Exception {
+ csfb = new
org.springframework.jmx.support.ConnectorServerFactoryBean();
+ csfb.setDaemon(daemon);
+ csfb.setThreaded(threaded);
+ csfb.setRegistrationBehavior(registrationBehavior);
+ csfb.setEnvironmentMap(environment);
+ csfb.setObjectName(objectName);
csfb.setServiceUrl(serviceUrl);
+ csfb.setServer(server);
csfb.afterPropertiesSet();
log.info("JMX connector available at: " + serviceUrl);
}
public void destroy() throws Exception {
- csfb.destroy();
+ if (csfb != null) {
+ try {
+ csfb.destroy();
+ } finally {
+ csfb = null;
+ }
+ }
}
}
Modified:
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/MBeanServerContext.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/MBeanServerContext.java?view=diff&rev=440192&r1=440191&r2=440192
==============================================================================
---
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/MBeanServerContext.java
(original)
+++
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/MBeanServerContext.java
Mon Sep 4 14:47:29 2006
@@ -18,19 +18,14 @@
import java.io.IOException;
import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.rmi.registry.LocateRegistry;
+import java.rmi.RemoteException;
import java.util.List;
-import javax.management.Attribute;
import javax.management.JMException;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
-import javax.management.remote.JMXConnectorServer;
-import javax.management.remote.JMXConnectorServerFactory;
-import javax.management.remote.JMXServiceURL;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -60,8 +55,8 @@
private int connectorPort=1099;
private String connectorPath="/jmxrmi";
private AtomicBoolean started=new AtomicBoolean(false);
- private JMXConnectorServer connectorServer;
- private ObjectName namingServiceObjectName;
+ private ConnectorServerFactoryBean connectorServerFactoryBean;
+ private RmiRegistryFactoryBean rmiRegistryFactoryBean;
public MBeanServerContext(){
this(null);
@@ -75,47 +70,60 @@
// lets force the MBeanServer to be created if needed
if (started.compareAndSet(false, true)) {
getMBeanServer();
- if (connectorServer != null) {
+ if (createConnector) {
try {
- getMBeanServer().invoke(namingServiceObjectName, "start",
null, null);
- }
- catch (Throwable ignore) {
+ rmiRegistryFactoryBean = new RmiRegistryFactoryBean();
+ rmiRegistryFactoryBean.setPort(connectorPort);
+ rmiRegistryFactoryBean.afterPropertiesSet();
+ } catch (Exception e) {
+ log.warn("Failed to start rmi registry: " +
e.getMessage());
+ if (log.isDebugEnabled()) {
+ log.debug("Failed to start rmi registry", e);
+ }
}
- Thread t = new Thread("JMX connector") {
- public void run() {
- try {
- JMXConnectorServer server = connectorServer;
- if (started.get() && server != null) {
- server.start();
- log.info("JMX consoles can connect to " +
server.getAddress());
- }
- }
- catch (IOException e) {
- log.warn("Failed to start jmx connector: " +
e.getMessage());
- }
+ try {
+ connectorServerFactoryBean = new
ConnectorServerFactoryBean();
+ //connectorServerFactoryBean.setDaemon(true);
+
connectorServerFactoryBean.setObjectName("connector:name=rmi");
+ //connectorServerFactoryBean.setThreaded(true);
+ connectorServerFactoryBean.setServer(getMBeanServer());
+ String serviceUrl =
"service:jmx:rmi:///jndi/rmi://localhost:" + connectorPort + connectorPath;
+ connectorServerFactoryBean.setServiceUrl(serviceUrl);
+ connectorServerFactoryBean.afterPropertiesSet();
+ } catch (Exception e) {
+ log.warn("Failed to start jmx connector: " +
e.getMessage());
+ if (log.isDebugEnabled()) {
+ log.debug("Failed to create jmx connector", e);
}
- };
- t.setDaemon(true);
- t.start();
+ }
}
- }
+ }
}
public void stop() throws IOException {
if (started.compareAndSet(true, false)) {
- JMXConnectorServer server = connectorServer;
- connectorServer = null;
- if (server != null) {
+ if (connectorServerFactoryBean != null) {
try {
- server.stop();
- }
- catch (IOException e) {
+ connectorServerFactoryBean.destroy();
+ } catch (Exception e) {
log.warn("Failed to stop jmx connector: " +
e.getMessage());
+ if (log.isDebugEnabled()) {
+ log.debug("Failed to stop jmx connector", e);
+ }
+ } finally {
+ connectorServerFactoryBean = null;
}
+ }
+ if (rmiRegistryFactoryBean != null) {
try {
- getMBeanServer().invoke(namingServiceObjectName, "stop",
null, null);
- }
- catch (Throwable ignore) {
+ rmiRegistryFactoryBean.destroy();
+ } catch (RemoteException e) {
+ log.warn("Failed to stop rmi registry: " + e.getMessage());
+ if (log.isDebugEnabled()) {
+ log.debug("Failed to stop rmi registry", e);
+ }
+ } finally {
+ rmiRegistryFactoryBean = null;
}
}
if (locallyCreateMBeanServer && beanServer != null) {
@@ -356,41 +364,7 @@
protected MBeanServer createMBeanServer() throws
MalformedObjectNameException,IOException{
MBeanServer
mbeanServer=MBeanServerFactory.createMBeanServer(jmxDomainName);
locallyCreateMBeanServer=true;
- if(createConnector){
- createConnector(mbeanServer);
- }
return mbeanServer;
- }
-
- /**
- * @param mbeanServer
- * @throws MalformedObjectNameException
- * @throws MalformedURLException
- * @throws IOException
- */
- private void createConnector(MBeanServer mbeanServer) throws
MalformedObjectNameException,MalformedURLException,
- IOException{
- // Create the NamingService, needed by JSR 160
- try{
- LocateRegistry.createRegistry(connectorPort);
-
namingServiceObjectName=ObjectName.getInstance("naming:type=rmiregistry");
- // Do not use the createMBean as the mx4j jar may not be in the
- // same class loader than the server
- Class cl=Class.forName("mx4j.tools.naming.NamingService");
-
mbeanServer.registerMBean(cl.newInstance(),namingServiceObjectName);
- // mbeanServer.createMBean("mx4j.tools.naming.NamingService",
namingServiceObjectName, null);
- // set the naming port
- Attribute attr=new Attribute("Port",new Integer(connectorPort));
- mbeanServer.setAttribute(namingServiceObjectName,attr);
- mbeanServer.invoke(namingServiceObjectName, "start", null, null);
- }catch(Throwable e){
- log.debug("Failed to create local registry",e);
- }
- // Create the JMXConnectorServer
- String
serviceURL="service:jmx:rmi:///jndi/rmi://localhost:"+connectorPort+connectorPath;
- JMXServiceURL url=new JMXServiceURL(serviceURL);
-
connectorServer=JMXConnectorServerFactory.newJMXConnectorServer(url,null,mbeanServer);
- log.info("JMX connector available at: " + serviceURL);
}
public String getConnectorPath(){
Modified:
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/RmiRegistryFactoryBean.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/RmiRegistryFactoryBean.java?view=diff&rev=440192&r1=440191&r2=440192
==============================================================================
---
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/RmiRegistryFactoryBean.java
(original)
+++
incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/RmiRegistryFactoryBean.java
Mon Sep 4 14:47:29 2006
@@ -16,6 +16,7 @@
*/
package org.apache.servicemix.jbi.management;
+import java.rmi.RemoteException;
import java.rmi.registry.LocateRegistry;
import java.rmi.registry.Registry;
import java.rmi.server.UnicastRemoteObject;
@@ -28,8 +29,39 @@
private int port = Registry.REGISTRY_PORT;
private Registry registry;
+ private boolean locate = false;
+ private boolean create = true;
+ private boolean locallyCreated = false;
/**
+ * @return the create
+ */
+ public boolean isCreate() {
+ return create;
+ }
+
+ /**
+ * @param create the create to set
+ */
+ public void setCreate(boolean create) {
+ this.create = create;
+ }
+
+ /**
+ * @return the locate
+ */
+ public boolean isLocate() {
+ return locate;
+ }
+
+ /**
+ * @param locate the locate to set
+ */
+ public void setLocate(boolean locate) {
+ this.locate = locate;
+ }
+
+ /**
* @return the port
*/
public int getPort() {
@@ -55,13 +87,27 @@
return true;
}
- public void afterPropertiesSet() throws Exception {
- registry = LocateRegistry.createRegistry(getPort());
- }
-
- public void destroy() throws Exception {
- if (registry != null) {
- UnicastRemoteObject.unexportObject(registry, true);
+ public void afterPropertiesSet() throws RemoteException {
+ if (registry == null && locate) {
+ try {
+ Registry reg = LocateRegistry.getRegistry(getPort());
+ reg.list();
+ registry = reg;
+ } catch (RemoteException e) {
+ // ignore
+ }
+ }
+ if (registry == null && create) {
+ registry = LocateRegistry.createRegistry(getPort());
+ locallyCreated = true;
+ }
+ }
+
+ public void destroy() throws RemoteException {
+ if (registry != null && locallyCreated) {
+ Registry reg = registry;
+ registry = null;
+ UnicastRemoteObject.unexportObject(reg, true);
}
}
Modified:
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/AbstractManagementTest.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/AbstractManagementTest.java?view=diff&rev=440192&r1=440191&r2=440192
==============================================================================
---
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/AbstractManagementTest.java
(original)
+++
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/installation/AbstractManagementTest.java
Mon Sep 4 14:47:29 2006
@@ -50,10 +50,10 @@
shutdownContainer();
if (clean) {
Thread.sleep(1000);
- assertTrue(FileUtil.deleteFile(new File("testWDR")));
+ assertTrue(FileUtil.deleteFile(new File("target/testWDR")));
}
container = new JBIContainer();
- container.setRootDir("testWDR");
+ container.setRootDir("target/testWDR");
initContainer();
container.init();
container.start();
Modified:
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementContextTest.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementContextTest.java?view=diff&rev=440192&r1=440191&r2=440192
==============================================================================
---
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementContextTest.java
(original)
+++
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/ManagementContextTest.java
Mon Sep 4 14:47:29 2006
@@ -68,7 +68,6 @@
}
public void testRemote() throws Exception {
- Thread.sleep(5000);
// The address of the connector server
JMXServiceURL url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://"
+ namingHost + ":" + namingPort + jndiPath);
@@ -98,7 +97,6 @@
log.info("STATE = " + mc.getCurrentState());
mc.stop();
log.info("STATE = " + mc.getCurrentState());
- mc.shutDown();
}
public void testComponent() throws Exception {
Modified:
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/DeployAndListServiceAssemblyTasksTest.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/DeployAndListServiceAssemblyTasksTest.java?view=diff&rev=440192&r1=440191&r2=440192
==============================================================================
---
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/DeployAndListServiceAssemblyTasksTest.java
(original)
+++
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/DeployAndListServiceAssemblyTasksTest.java
Mon Sep 4 14:47:29 2006
@@ -32,7 +32,7 @@
private DeployServiceAssemblyTask deployServiceAssembliesTask;
- private File rootDir = new File("testWDIR");
+ private File rootDir = new File("target/testWDIR");
private ListServiceAssembliesTask listServiceAssembliesTask;
Modified:
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/InstallComponentTaskTest.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/InstallComponentTaskTest.java?view=diff&rev=440192&r1=440191&r2=440192
==============================================================================
---
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/InstallComponentTaskTest.java
(original)
+++
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/InstallComponentTaskTest.java
Mon Sep 4 14:47:29 2006
@@ -17,8 +17,18 @@
package org.apache.servicemix.jbi.management.task;
import java.io.File;
-import java.net.URL;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.util.jar.JarOutputStream;
+import java.util.zip.ZipEntry;
+import javax.jbi.JBIException;
+import javax.jbi.component.Bootstrap;
+import javax.jbi.component.InstallationContext;
+import javax.management.ObjectName;
+
+import org.apache.servicemix.jbi.installation.AbstractManagementTest;
+import org.apache.servicemix.jbi.installation.Bootstrap1;
import org.apache.servicemix.jbi.util.FileUtil;
import org.apache.tools.ant.Project;
@@ -30,7 +40,7 @@
private InstallComponentTask installComponentTask;
- private File rootDir = new File("testWDIR");
+ private File rootDir = new File("target/testWDIR");
/*
* @see TestCase#setUp()
*/
@@ -52,16 +62,40 @@
}
public void testInstallation() throws Exception {
- URL url =
getClass().getClassLoader().getResource("org/apache/servicemix/jbi/installation/testarchive.jar");
- if (url != null) {
- String file = url.getFile();
- installComponentTask.setFile(file);
- installComponentTask.init();
- installComponentTask.execute();
- File testFile = new File(rootDir, "components" + File.separator
- + "ComponentTest");
- assertTrue(testFile.exists());
- FileUtil.deleteFile(rootDir);
- }
+ Bootstrap1.setDelegate(new Bootstrap() {
+ public void cleanUp() throws JBIException {
+ }
+ public ObjectName getExtensionMBeanName() {
+ return null;
+ }
+ public void init(InstallationContext installContext) throws
JBIException {
+ }
+ public void onInstall() throws JBIException {
+ }
+ public void onUninstall() throws JBIException {
+ }
+ });
+ String installJarUrl =
createInstallerArchive("component1").getAbsolutePath();
+ installComponentTask.setFile(installJarUrl);
+ installComponentTask.init();
+ installComponentTask.execute();
+ File testFile = new File(rootDir, "components" + File.separator
+ + "component1");
+ assertTrue(testFile.exists());
+ FileUtil.deleteFile(rootDir);
+ }
+
+ protected File createInstallerArchive(String jbi) throws Exception {
+ InputStream is = AbstractManagementTest.class.getResourceAsStream(jbi
+ "-jbi.xml");
+ File jar = File.createTempFile("jbi", ".zip");
+ JarOutputStream jos = new JarOutputStream(new FileOutputStream(jar));
+ jos.putNextEntry(new ZipEntry("META-INF/jbi.xml"));
+ byte[] buffer = new byte[is.available()];
+ is.read(buffer);
+ jos.write(buffer);
+ jos.closeEntry();
+ jos.close();
+ is.close();
+ return jar;
}
}
Modified:
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/JbiTaskSupport.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/JbiTaskSupport.java?view=diff&rev=440192&r1=440191&r2=440192
==============================================================================
---
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/JbiTaskSupport.java
(original)
+++
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/management/task/JbiTaskSupport.java
Mon Sep 4 14:47:29 2006
@@ -42,10 +42,6 @@
container.init();
container.start();
- // Need to sleep as the jmx remote connector
- // is started in another thread
- Thread.sleep(5000);
-
remoteConnection = new JbiTask(){
protected void doExecute(AdminCommandsServiceMBean acs) throws
Exception {
}
Modified:
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/servicedesc/EndpointReferenceBuilderTest.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/servicedesc/EndpointReferenceBuilderTest.java?view=diff&rev=440192&r1=440191&r2=440192
==============================================================================
---
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/servicedesc/EndpointReferenceBuilderTest.java
(original)
+++
incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/servicedesc/EndpointReferenceBuilderTest.java
Mon Sep 4 14:47:29 2006
@@ -41,8 +41,8 @@
log.info(new SourceTransformer().toString(df));
Element e = (Element) df.getFirstChild();
assertEquals("http://java.sun.com/jbi/end-point-reference";,
e.getNamespaceURI());
- assertEquals("end-point-reference", e.getNodeName());
- assertEquals("myEndpoint",
e.getAttributeNodeNS("http://java.sun.com/jbi/end-point-reference";,
"end-point-name"));
+ assertEquals("end-point-reference", e.getLocalName());
+ assertEquals("myEndpoint",
e.getAttributeNodeNS("http://java.sun.com/jbi/end-point-reference";,
"end-point-name").getValue());
assertEquals(new QName("http://foo.bar.com";, "myService"),
DOMUtil.createQName(e,
e.getAttributeNS("http://java.sun.com/jbi/end-point-reference";,
"service-name")));
}
Modified:
incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jms/client.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jms/client.xml?view=diff&rev=440192&r1=440191&r2=440192
==============================================================================
---
incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jms/client.xml
(original)
+++
incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/jms/client.xml
Mon Sep 4 14:47:29 2006
@@ -27,7 +27,6 @@
<sm:container id="jbi"
flowName="cluster"
- name="jbi"
embedded="true" />
<bean id="client"
Modified:
incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/multiple-flows.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/multiple-flows.xml?view=diff&rev=440192&r1=440191&r2=440192
==============================================================================
---
incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/multiple-flows.xml
(original)
+++
incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/nmr/flow/multiple-flows.xml
Mon Sep 4 14:47:29 2006
@@ -22,27 +22,27 @@
<sm:container name="local" flowNames="seda,jms" embedded="true">
<sm:activationSpecs>
- <sm:activationSpec id="localSender" endpoint="localSender"
destinationService="localReceiver">
+ <sm:activationSpec sm:id="localSender" endpoint="localSender"
destinationService="localReceiver">
<sm:component>
<bean class="org.apache.servicemix.tck.SenderComponent" />
</sm:component>
</sm:activationSpec>
- <sm:activationSpec id="remoteSender" endpoint="remoteSender"
destinationService="remoteReceiver">
+ <sm:activationSpec sm:id="remoteSender" endpoint="remoteSender"
destinationService="remoteReceiver">
<sm:component>
<bean class="org.apache.servicemix.tck.SenderComponent" />
</sm:component>
</sm:activationSpec>
- <sm:activationSpec id="clusteredSender" endpoint="clusteredSender"
destinationService="clusteredReceiver">
+ <sm:activationSpec sm:id="clusteredSender" endpoint="clusteredSender"
destinationService="clusteredReceiver">
<sm:component>
<bean class="org.apache.servicemix.tck.SenderComponent" />
</sm:component>
</sm:activationSpec>
- <sm:activationSpec id="localReceiver" service="localReceiver">
+ <sm:activationSpec sm:id="localReceiver" service="localReceiver">
<sm:component>
<bean class="org.apache.servicemix.tck.ReceiverComponent" />
</sm:component>
</sm:activationSpec>
- <sm:activationSpec id="clusteredReceiver" service="clusteredReceiver">
+ <sm:activationSpec sm:id="clusteredReceiver"
service="clusteredReceiver">
<sm:component>
<bean class="org.apache.servicemix.tck.ReceiverComponent" />
</sm:component>
@@ -52,12 +52,12 @@
<sm:container name="remote" flowNames="seda,jms" embedded="true">
<sm:activationSpecs>
- <sm:activationSpec id="remoteReceiver" service="remoteReceiver">
+ <sm:activationSpec sm:id="remoteReceiver" service="remoteReceiver">
<sm:component>
<bean class="org.apache.servicemix.tck.ReceiverComponent" />
</sm:component>
</sm:activationSpec>
- <sm:activationSpec id="clusteredReceiver" service="clusteredReceiver">
+ <sm:activationSpec sm:id="clusteredReceiver"
service="clusteredReceiver">
<sm:component>
<bean class="org.apache.servicemix.tck.ReceiverComponent" />
</sm:component>
