You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ch...@apache.org on 2006/02/22 00:40:29 UTC

svn commit: r379627 [9/34] - in /incubator/servicemix/trunk: ./ etc/ sandbox/servicemix-wsn-1.2/src/sa/META-INF/ sandbox/servicemix-wsn-1.2/src/su/META-INF/ servicemix-assembly/ servicemix-assembly/src/main/assembly/ servicemix-assembly/src/main/releas...

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/saaj/SaajMarshalerTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/saaj/SaajMarshalerTest.java?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/saaj/SaajMarshalerTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/saaj/SaajMarshalerTest.java Tue Feb 21 15:40:05 2006
@@ -1,122 +1,122 @@
-/*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.components.saaj;
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-
-import javax.jbi.messaging.NormalizedMessage;
-import javax.xml.namespace.QName;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.MimeHeaders;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.TestCase;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.jbi.jaxp.SourceTransformer;
-import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.jbi.messaging.NormalizedMessageImpl;
-import org.apache.servicemix.jbi.util.DOMUtil;
-import org.apache.xpath.CachedXPathAPI;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.traversal.NodeIterator;
-
-public class SaajMarshalerTest extends TestCase {
-
-	private static final transient Log log = LogFactory.getLog(SaajMarshalerTest.class); 
-	
-	public void testAxisToNMS() throws Exception {
-		MessageFactory messageFactory = new org.apache.axis.soap.MessageFactoryImpl();
-		testToNMS(messageFactory);
-	}
-	
-	public void testAxisCreateSOAPMessage() throws Exception {
-		MessageFactory messageFactory = new org.apache.axis.soap.MessageFactoryImpl();
-		testCreateSOAPMessage(messageFactory);
-	}
-	
-	/*
-	public void testAxis2() throws Exception {
-		MessageFactory messageFactory = new org.apache.axis2.saaj.MessageFactoryImpl();
-		testFactory(messageFactory);
-	}
-	*/
-	
-	public void testSunToNMS() throws Exception {
-		MessageFactory messageFactory = new com.sun.xml.messaging.saaj.soap.MessageFactoryImpl();
-		testToNMS(messageFactory);
-	}
-	
-	/*
-	public void testSunCreateSOAPMessage() throws Exception {
-		MessageFactory messageFactory = new com.sun.xml.messaging.saaj.soap.MessageFactoryImpl();
-		testCreateSOAPMessage(messageFactory);
-	}
-	*/
-	
-	protected void testToNMS(MessageFactory messageFactory) throws Exception {
-		MimeHeaders headers = new MimeHeaders();
-		headers.addHeader("Content-Type", "text/xml;");
-		InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/servicemix/components/http/soap-response.xml");
-		SOAPMessage sm = messageFactory.createMessage(headers, is);
-		NormalizedMessage nm = new NormalizedMessageImpl();
-		new SaajMarshaler().toNMS(nm, sm);
-
-        Node node = new SourceTransformer().toDOMNode(new SourceTransformer().toStreamSource(nm.getContent()));
-        log.info(new SourceTransformer().toString(node));
-		
-        CachedXPathAPI cachedXPathAPI = new CachedXPathAPI();
-        NodeIterator iterator = cachedXPathAPI.selectNodeIterator(node, "//*[local-name() = 'userId']");
-        Element root = (Element) iterator.nextNode();
-        QName qname = DOMUtil.createQName(root, root.getAttributeNS("http://www.w3.org/2001/XMLSchema-instance", "type"));
-        assertEquals("http://www.w3.org/2001/XMLSchema", qname.getNamespaceURI());
-        assertEquals("string", qname.getLocalPart());
-	}
-	
-	protected void testCreateSOAPMessage(MessageFactory messageFactory) throws Exception { 
-        MimeHeaders headers = new MimeHeaders(); 
-        headers.addHeader("Content-Type", "text/xml;"); 
-         
-        InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/servicemix/components/saaj/xml-request.xml");         
-        log.info("Raw XML: " + new SourceTransformer().toString(new StreamSource(is))); 
-         
-        is = getClass().getClassLoader().getResourceAsStream("org/apache/servicemix/components/saaj/xml-request.xml");         
-        NormalizedMessage nm = new NormalizedMessageImpl(); 
-        nm.setContent(new StreamSource(is)); 
-           
-        SaajMarshaler marshaler = new SaajMarshaler();
-        marshaler.setMessageFactory(messageFactory);
-        SOAPMessage msg = marshaler.createSOAPMessage(nm);
-        
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        msg.writeTo(baos);
-        String soapEnv = new String(baos.toByteArray());
-        log.info("Prepared SOAP: " + soapEnv); 
-        Node node2 = new SourceTransformer().toDOMNode(new StringSource(soapEnv)); 
-          
-        CachedXPathAPI cachedXPathAPI = new CachedXPathAPI(); 
-        NodeIterator iterator = cachedXPathAPI.selectNodeIterator(node2, "//*[local-name() = 'userId']"); 
-        Element root = (Element) iterator.nextNode(); 
-        QName qname = DOMUtil.createQName(root, root.getAttributeNS("http://www.w3.org/2001/XMLSchema-instance", "type")); 
-        assertEquals("http://www.w3.org/2001/XMLSchema", qname.getNamespaceURI()); 
-        assertEquals("string", qname.getLocalPart()); 
-    } 
-
-}
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.servicemix.components.saaj;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+
+import javax.jbi.messaging.NormalizedMessage;
+import javax.xml.namespace.QName;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.MimeHeaders;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.transform.stream.StreamSource;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.servicemix.jbi.jaxp.SourceTransformer;
+import org.apache.servicemix.jbi.jaxp.StringSource;
+import org.apache.servicemix.jbi.messaging.NormalizedMessageImpl;
+import org.apache.servicemix.jbi.util.DOMUtil;
+import org.apache.xpath.CachedXPathAPI;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.traversal.NodeIterator;
+
+public class SaajMarshalerTest extends TestCase {
+
+	private static final transient Log log = LogFactory.getLog(SaajMarshalerTest.class); 
+	
+	public void testAxisToNMS() throws Exception {
+		MessageFactory messageFactory = new org.apache.axis.soap.MessageFactoryImpl();
+		testToNMS(messageFactory);
+	}
+	
+	public void testAxisCreateSOAPMessage() throws Exception {
+		MessageFactory messageFactory = new org.apache.axis.soap.MessageFactoryImpl();
+		testCreateSOAPMessage(messageFactory);
+	}
+	
+	/*
+	public void testAxis2() throws Exception {
+		MessageFactory messageFactory = new org.apache.axis2.saaj.MessageFactoryImpl();
+		testFactory(messageFactory);
+	}
+	*/
+	
+	public void testSunToNMS() throws Exception {
+		MessageFactory messageFactory = new com.sun.xml.messaging.saaj.soap.MessageFactoryImpl();
+		testToNMS(messageFactory);
+	}
+	
+	/*
+	public void testSunCreateSOAPMessage() throws Exception {
+		MessageFactory messageFactory = new com.sun.xml.messaging.saaj.soap.MessageFactoryImpl();
+		testCreateSOAPMessage(messageFactory);
+	}
+	*/
+	
+	protected void testToNMS(MessageFactory messageFactory) throws Exception {
+		MimeHeaders headers = new MimeHeaders();
+		headers.addHeader("Content-Type", "text/xml;");
+		InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/servicemix/components/http/soap-response.xml");
+		SOAPMessage sm = messageFactory.createMessage(headers, is);
+		NormalizedMessage nm = new NormalizedMessageImpl();
+		new SaajMarshaler().toNMS(nm, sm);
+
+        Node node = new SourceTransformer().toDOMNode(new SourceTransformer().toStreamSource(nm.getContent()));
+        log.info(new SourceTransformer().toString(node));
+		
+        CachedXPathAPI cachedXPathAPI = new CachedXPathAPI();
+        NodeIterator iterator = cachedXPathAPI.selectNodeIterator(node, "//*[local-name() = 'userId']");
+        Element root = (Element) iterator.nextNode();
+        QName qname = DOMUtil.createQName(root, root.getAttributeNS("http://www.w3.org/2001/XMLSchema-instance", "type"));
+        assertEquals("http://www.w3.org/2001/XMLSchema", qname.getNamespaceURI());
+        assertEquals("string", qname.getLocalPart());
+	}
+	
+	protected void testCreateSOAPMessage(MessageFactory messageFactory) throws Exception { 
+        MimeHeaders headers = new MimeHeaders(); 
+        headers.addHeader("Content-Type", "text/xml;"); 
+         
+        InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/servicemix/components/saaj/xml-request.xml");         
+        log.info("Raw XML: " + new SourceTransformer().toString(new StreamSource(is))); 
+         
+        is = getClass().getClassLoader().getResourceAsStream("org/apache/servicemix/components/saaj/xml-request.xml");         
+        NormalizedMessage nm = new NormalizedMessageImpl(); 
+        nm.setContent(new StreamSource(is)); 
+           
+        SaajMarshaler marshaler = new SaajMarshaler();
+        marshaler.setMessageFactory(messageFactory);
+        SOAPMessage msg = marshaler.createSOAPMessage(nm);
+        
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        msg.writeTo(baos);
+        String soapEnv = new String(baos.toByteArray());
+        log.info("Prepared SOAP: " + soapEnv); 
+        Node node2 = new SourceTransformer().toDOMNode(new StringSource(soapEnv)); 
+          
+        CachedXPathAPI cachedXPathAPI = new CachedXPathAPI(); 
+        NodeIterator iterator = cachedXPathAPI.selectNodeIterator(node2, "//*[local-name() = 'userId']"); 
+        Element root = (Element) iterator.nextNode(); 
+        QName qname = DOMUtil.createQName(root, root.getAttributeNS("http://www.w3.org/2001/XMLSchema-instance", "type")); 
+        assertEquals("http://www.w3.org/2001/XMLSchema", qname.getNamespaceURI()); 
+        assertEquals("string", qname.getLocalPart()); 
+    } 
+
+}

Propchange: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/saaj/SaajMarshalerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xslt/OptionalAxisQueriesTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xslt/OptionalAxisQueriesTest.java?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xslt/OptionalAxisQueriesTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xslt/OptionalAxisQueriesTest.java Tue Feb 21 15:40:05 2006
@@ -1,76 +1,76 @@
-/*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.servicemix.components.xslt;
-
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
-import org.apache.servicemix.tck.TestSupport;
-import org.apache.servicemix.tck.MessageList;
-
-import javax.xml.namespace.QName;
-
-
-public class OptionalAxisQueriesTest extends TestSupport {
-
-    public void testOptionalAxisQuery() throws Exception {
-        QName service = new QName("http://servicemix.org/cheese/", "transformer");
-
-       String message = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
-               "    <prod:resolveItemXrefResponse " +
-               "           xmlns:prod=\"http://foo.org/prod\" " +
-               "           xmlns:xsi=\"http://foo.org/msi\"" +
-               "           xmlns:ms=\"http://foo.org/ms\">" +
-               "      <prod:response xsi:type=\"wn4:HashMap\">" +
-               "        <ms:Keys>" +
-               "          <ms:Item xsi:type=\"d:string\">DESCR</ms:Item>" +
-               "          <ms:Item xsi:type=\"d:string\">LIST</ms:Item>" +
-               "          <ms:Item xsi:type=\"d:string\">XREF</ms:Item>" +
-               "          <ms:Item xsi:type=\"d:string\">MSTR</ms:Item>" +
-               "        </ms:Keys>" +
-               "        <ms:Values>" +
-               "          <ms:Item xsi:type=\"d:string\">PPR,CPY,20#,84B,LGL,WE</ms:Item>" +
-               "          <ms:Item xsi:type=\"d:double\">17.25</ms:Item>" +
-               "          <ms:Item xsi:type=\"d:string\">EXP8514</ms:Item>" +
-               "          <ms:Item xsi:type=\"d:string\">10040300</ms:Item>" +
-               "        </ms:Values>" +
-               "      </prod:response>" +
-               "    </prod:resolveItemXrefResponse>";
-
-        // send a custom xml message
-        sendMessages(service, 1, message);
-        assertMessagesReceived(1);
-
-        MessageList messageList1 = assertMessagesReceived("service1", 1);
-        MessageList messageList2 = assertMessagesReceived("service2", 1);
-        MessageList messageList3 = assertMessagesReceived("service3", 1);
-        MessageList messageList4 = assertMessagesReceived("service4", 1);
-        MessageList messageList5 = assertMessagesReceived("service5", 1);
-        MessageList messageList6 = assertMessagesReceived("service6", 1);
-
-        assertMessageHeader(messageList1, 0, "foo", "PPR,CPY,20#,84B,LGL,WE");
-        assertMessageHeader(messageList2, 0, "foo", "17.25");
-        assertMessageHeader(messageList3, 0, "foo", "EXP8514");
-        assertMessageHeader(messageList4, 0, "foo", "10040300");
-        assertMessageHeader(messageList5, 0, "foo", "4");
-        assertMessageHeader(messageList6, 0, "foo", "PPR,CPY,20#,84B,LGL,WE");
-
-    }
-
-    protected AbstractXmlApplicationContext createBeanFactory() {
-        return new ClassPathXmlApplicationContext("org/apache/servicemix/components/xslt/optional-axis-example.xml");
-    }
-
-}
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.servicemix.components.xslt;
+
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.servicemix.tck.TestSupport;
+import org.apache.servicemix.tck.MessageList;
+
+import javax.xml.namespace.QName;
+
+
+public class OptionalAxisQueriesTest extends TestSupport {
+
+    public void testOptionalAxisQuery() throws Exception {
+        QName service = new QName("http://servicemix.org/cheese/", "transformer");
+
+       String message = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+               "    <prod:resolveItemXrefResponse " +
+               "           xmlns:prod=\"http://foo.org/prod\" " +
+               "           xmlns:xsi=\"http://foo.org/msi\"" +
+               "           xmlns:ms=\"http://foo.org/ms\">" +
+               "      <prod:response xsi:type=\"wn4:HashMap\">" +
+               "        <ms:Keys>" +
+               "          <ms:Item xsi:type=\"d:string\">DESCR</ms:Item>" +
+               "          <ms:Item xsi:type=\"d:string\">LIST</ms:Item>" +
+               "          <ms:Item xsi:type=\"d:string\">XREF</ms:Item>" +
+               "          <ms:Item xsi:type=\"d:string\">MSTR</ms:Item>" +
+               "        </ms:Keys>" +
+               "        <ms:Values>" +
+               "          <ms:Item xsi:type=\"d:string\">PPR,CPY,20#,84B,LGL,WE</ms:Item>" +
+               "          <ms:Item xsi:type=\"d:double\">17.25</ms:Item>" +
+               "          <ms:Item xsi:type=\"d:string\">EXP8514</ms:Item>" +
+               "          <ms:Item xsi:type=\"d:string\">10040300</ms:Item>" +
+               "        </ms:Values>" +
+               "      </prod:response>" +
+               "    </prod:resolveItemXrefResponse>";
+
+        // send a custom xml message
+        sendMessages(service, 1, message);
+        assertMessagesReceived(1);
+
+        MessageList messageList1 = assertMessagesReceived("service1", 1);
+        MessageList messageList2 = assertMessagesReceived("service2", 1);
+        MessageList messageList3 = assertMessagesReceived("service3", 1);
+        MessageList messageList4 = assertMessagesReceived("service4", 1);
+        MessageList messageList5 = assertMessagesReceived("service5", 1);
+        MessageList messageList6 = assertMessagesReceived("service6", 1);
+
+        assertMessageHeader(messageList1, 0, "foo", "PPR,CPY,20#,84B,LGL,WE");
+        assertMessageHeader(messageList2, 0, "foo", "17.25");
+        assertMessageHeader(messageList3, 0, "foo", "EXP8514");
+        assertMessageHeader(messageList4, 0, "foo", "10040300");
+        assertMessageHeader(messageList5, 0, "foo", "4");
+        assertMessageHeader(messageList6, 0, "foo", "PPR,CPY,20#,84B,LGL,WE");
+
+    }
+
+    protected AbstractXmlApplicationContext createBeanFactory() {
+        return new ClassPathXmlApplicationContext("org/apache/servicemix/components/xslt/optional-axis-example.xml");
+    }
+
+}

Propchange: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xslt/OptionalAxisQueriesTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/broker.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/broker.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/broker.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/broker.xml Tue Feb 21 15:40:05 2006
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://activemq.org/config/1.0">
-
-  <broker persistent="false">
-
-    <transportConnectors>
-      <transportConnector uri="tcp://localhost:61626" />
-    </transportConnectors>
-
-  </broker>
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://activemq.org/config/1.0">
+
+  <broker persistent="false">
+
+    <transportConnectors>
+      <transportConnector uri="tcp://localhost:61626" />
+    </transportConnectors>
+
+  </broker>
+
+</beans>

Propchange: incubator/servicemix/trunk/servicemix-components/src/test/resources/broker.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/jndi.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/jndi.properties?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/jndi.properties (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/jndi.properties Tue Feb 21 15:40:05 2006
@@ -1,28 +1,28 @@
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = tcp://localhost:61626
-
-# use the following property to embed a broker inside this JVM
-#useEmbeddedBroker = true
-
-# use the following property to specify a class path resource or URL
-# used to configure an embedded broker using the XML configuration file
-#brokerXmlConfig = file:src/conf/sample-conf/default.xml
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as. 
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.MyQueue = example.MyQueue
-
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
+# START SNIPPET: jndi
+
+java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
+
+# use the following property to configure the default connector
+java.naming.provider.url = tcp://localhost:61626
+
+# use the following property to embed a broker inside this JVM
+#useEmbeddedBroker = true
+
+# use the following property to specify a class path resource or URL
+# used to configure an embedded broker using the XML configuration file
+#brokerXmlConfig = file:src/conf/sample-conf/default.xml
+
+# use the following property to specify the JNDI name the connection factory
+# should appear as. 
+#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
+
+# register some queues in JNDI using the form
+# queue.[jndiName] = [physicalName]
+queue.MyQueue = example.MyQueue
+
+
+# register some topics in JNDI using the form
+# topic.[jndiName] = [physicalName]
+topic.MyTopic = example.MyTopic
+
+# END SNIPPET: jndi

Propchange: incubator/servicemix/trunk/servicemix-components/src/test/resources/jndi.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/log4j-tests.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/log4j-tests.properties?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/log4j-tests.properties (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/log4j-tests.properties Tue Feb 21 15:40:05 2006
@@ -1,21 +1,21 @@
-#
-# The logging properties used during tests..
-#
-log4j.rootLogger=DEBUG, out
-
-log4j.logger.org.apache.activemq=INFO
-log4j.logger.org.apache.activemq.spring=WARN
-log4j.logger.org.apache.activemq.store.journal=INFO
-log4j.logger.org.activeio.journal=INFO
-
-# CONSOLE appender not used by default
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-
-# File appender
-log4j.appender.out=org.apache.log4j.FileAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-log4j.appender.out.file=target/servicemix-test.log
-log4j.appender.out.append=true
+#
+# The logging properties used during tests..
+#
+log4j.rootLogger=DEBUG, out
+
+log4j.logger.org.apache.activemq=INFO
+log4j.logger.org.apache.activemq.spring=WARN
+log4j.logger.org.apache.activemq.store.journal=INFO
+log4j.logger.org.activeio.journal=INFO
+
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+# File appender
+log4j.appender.out=org.apache.log4j.FileAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.appender.out.file=target/servicemix-test.log
+log4j.appender.out.append=true

Propchange: incubator/servicemix/trunk/servicemix-components/src/test/resources/log4j-tests.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/log4j.properties?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/log4j.properties (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/log4j.properties Tue Feb 21 15:40:05 2006
@@ -1,21 +1,21 @@
-#
-# The logging properties used during tests..
-#
-log4j.rootLogger=DEBUG, stdout
-
-log4j.logger.org.apache.activemq=INFO
-log4j.logger.org.apache.activemq.spring=WARN
-log4j.logger.org.apache.activemq.store.journal=INFO
-log4j.logger.org.activeio.journal=INFO
-
-# CONSOLE appender not used by default
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-
-# File appender
-log4j.appender.out=org.apache.log4j.FileAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-log4j.appender.out.file=target/servicemix-test.log
-log4j.appender.out.append=true
+#
+# The logging properties used during tests..
+#
+log4j.rootLogger=DEBUG, stdout
+
+log4j.logger.org.apache.activemq=INFO
+log4j.logger.org.apache.activemq.spring=WARN
+log4j.logger.org.apache.activemq.store.journal=INFO
+log4j.logger.org.activeio.journal=INFO
+
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+# File appender
+log4j.appender.out=org.apache.log4j.FileAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.appender.out.file=target/servicemix-test.log
+log4j.appender.out.append=true

Propchange: incubator/servicemix/trunk/servicemix-components/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/file/binary-example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/file/binary-example.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/file/binary-example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/file/binary-example.xml Tue Feb 21 15:40:05 2006
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns:sm="http://servicemix.apache.org/config/1.0" 
-	   xmlns:foo="http://servicemix.org/cheese/">
-
-  <!-- the JBI container -->
-  <sm:container id="jbi" embedded="true">
-    <sm:activationSpecs>
-
-      <!-- START SNIPPET: poll -->
-      <sm:activationSpec componentName="filePoller" service="foo:filePoller" destinationService="foo:fileSender">
-        <sm:component><bean class="org.apache.servicemix.components.file.FilePoller">
-          <property name="file" value="target/test-data/in"/>
-          <property name="period" value="100"/>
-          <property name="marshaler">
-            <bean class="org.apache.servicemix.components.util.BinaryFileMarshaler" />
-          </property>
-        </bean></sm:component>
-      </sm:activationSpec>
-      <!-- END SNIPPET: poll -->
-
-      <!-- START SNIPPET: send -->
-      <sm:activationSpec componentName="fileSender" service="foo:fileSender">
-        <sm:component><bean class="org.apache.servicemix.components.file.FileWriter">
-          <property name="directory" value="target/test-data/out"/>
-          <property name="marshaler">
-            <bean class="org.apache.servicemix.components.util.BinaryFileMarshaler" />
-          </property>
-        </bean></sm:component>
-      </sm:activationSpec>
-      <!-- END SNIPPET: send -->
-
-    </sm:activationSpecs>
-  </sm:container>
-
-  <bean id="client" class="org.apache.servicemix.client.DefaultServiceMixClient">
-    <constructor-arg ref="jbi"/>
-  </bean>
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns:sm="http://servicemix.apache.org/config/1.0" 
+	   xmlns:foo="http://servicemix.org/cheese/">
+
+  <!-- the JBI container -->
+  <sm:container id="jbi" embedded="true">
+    <sm:activationSpecs>
+
+      <!-- START SNIPPET: poll -->
+      <sm:activationSpec componentName="filePoller" service="foo:filePoller" destinationService="foo:fileSender">
+        <sm:component><bean class="org.apache.servicemix.components.file.FilePoller">
+          <property name="file" value="target/test-data/in"/>
+          <property name="period" value="100"/>
+          <property name="marshaler">
+            <bean class="org.apache.servicemix.components.util.BinaryFileMarshaler" />
+          </property>
+        </bean></sm:component>
+      </sm:activationSpec>
+      <!-- END SNIPPET: poll -->
+
+      <!-- START SNIPPET: send -->
+      <sm:activationSpec componentName="fileSender" service="foo:fileSender">
+        <sm:component><bean class="org.apache.servicemix.components.file.FileWriter">
+          <property name="directory" value="target/test-data/out"/>
+          <property name="marshaler">
+            <bean class="org.apache.servicemix.components.util.BinaryFileMarshaler" />
+          </property>
+        </bean></sm:component>
+      </sm:activationSpec>
+      <!-- END SNIPPET: send -->
+
+    </sm:activationSpecs>
+  </sm:container>
+
+  <bean id="client" class="org.apache.servicemix.client.DefaultServiceMixClient">
+    <constructor-arg ref="jbi"/>
+  </bean>
+</beans>

Propchange: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/file/binary-example.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/http/soap-response.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/http/soap-response.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/http/soap-response.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/http/soap-response.xml Tue Feb 21 15:40:05 2006
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<e:Envelope xmlns:e="http://schemas.xmlsoap.org/soap/envelope/"
-xmlns:d="http://www.w3.org/2001/XMLSchema"
-xmlns:i="http://www.w3.org/2001/XMLSchema-instance"
-xmlns:wn0="http://systinet.com/xsd/SchemaTypes/"
-xmlns:wn1="http://systinet.com/wsdl/com/cexp/coe/bob/ws/customer/"
-xmlns:wn2="http://systinet.com/soap-jta/"
-xmlns:wn3="http://systinet.com/wsdl/com/cexp/coe/bob/services/order/pojo/">
-  <e:Body>
-    <wn1:getCustomerInfo>
-      <wn1:userId i:type="d:string">akayali</wn1:userId>
-    </wn1:getCustomerInfo>
-  </e:Body>
-</e:Envelope>
+<?xml version="1.0" encoding="UTF-8"?>
+<e:Envelope xmlns:e="http://schemas.xmlsoap.org/soap/envelope/"
+xmlns:d="http://www.w3.org/2001/XMLSchema"
+xmlns:i="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:wn0="http://systinet.com/xsd/SchemaTypes/"
+xmlns:wn1="http://systinet.com/wsdl/com/cexp/coe/bob/ws/customer/"
+xmlns:wn2="http://systinet.com/soap-jta/"
+xmlns:wn3="http://systinet.com/wsdl/com/cexp/coe/bob/services/order/pojo/">
+  <e:Body>
+    <wn1:getCustomerInfo>
+      <wn1:userId i:type="d:string">akayali</wn1:userId>
+    </wn1:getCustomerInfo>
+  </e:Body>
+</e:Envelope>

Propchange: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/http/soap-response.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/http/ws-example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/http/ws-example.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/http/ws-example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/http/ws-example.xml Tue Feb 21 15:40:05 2006
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns:sm="http://servicemix.apache.org/config/1.0" 
-	   xmlns:foo="http://servicemix.org/cheese/">
-
-  <!-- the JBI container -->
-  <sm:container id="jbi" embedded="true">
-    <sm:activationSpecs>
-
-      <!-- START SNIPPET: binding -->
-      <sm:activationSpec componentName="httpReceiver" service="foo:httpBinding" destinationService="foo:httpSender2">
-        <sm:component><bean class="org.apache.servicemix.components.http.HttpSoapConnector">
-          <property name="host" value="localhost"/>
-          <property name="port" value="8912"/>
-        </bean></sm:component>
-      </sm:activationSpec>
-      <!-- END SNIPPET: binding -->
-
-      <sm:activationSpec componentName="httpSender2" service="foo:httpSender2">
-        <sm:component><bean class="org.apache.servicemix.components.http.HttpSoapInvoker">
-          <property name="url" value="http://localhost:8913"/>
-        </bean></sm:component>
-      </sm:activationSpec>
-      
-      <sm:activationSpec componentName="httpReceiver2" service="foo:httpBinding2" destinationService="foo:stockQuote">
-        <sm:component><bean class="org.apache.servicemix.components.http.HttpSoapConnector">
-          <property name="host" value="localhost"/>
-          <property name="port" value="8913"/>
-        </bean></sm:component>
-      </sm:activationSpec>
-      
-      <sm:activationSpec componentName="stockQuote" service="foo:stockQuote">
-        <sm:component><bean class="org.apache.servicemix.components.util.EchoComponent">
-        </bean></sm:component>
-      </sm:activationSpec>
-    </sm:activationSpecs>
-  </sm:container>
-
-  <bean id="client" class="org.apache.servicemix.client.DefaultServiceMixClient">
-    <constructor-arg ref="jbi"/>
-  </bean>
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns:sm="http://servicemix.apache.org/config/1.0" 
+	   xmlns:foo="http://servicemix.org/cheese/">
+
+  <!-- the JBI container -->
+  <sm:container id="jbi" embedded="true">
+    <sm:activationSpecs>
+
+      <!-- START SNIPPET: binding -->
+      <sm:activationSpec componentName="httpReceiver" service="foo:httpBinding" destinationService="foo:httpSender2">
+        <sm:component><bean class="org.apache.servicemix.components.http.HttpSoapConnector">
+          <property name="host" value="localhost"/>
+          <property name="port" value="8912"/>
+        </bean></sm:component>
+      </sm:activationSpec>
+      <!-- END SNIPPET: binding -->
+
+      <sm:activationSpec componentName="httpSender2" service="foo:httpSender2">
+        <sm:component><bean class="org.apache.servicemix.components.http.HttpSoapInvoker">
+          <property name="url" value="http://localhost:8913"/>
+        </bean></sm:component>
+      </sm:activationSpec>
+      
+      <sm:activationSpec componentName="httpReceiver2" service="foo:httpBinding2" destinationService="foo:stockQuote">
+        <sm:component><bean class="org.apache.servicemix.components.http.HttpSoapConnector">
+          <property name="host" value="localhost"/>
+          <property name="port" value="8913"/>
+        </bean></sm:component>
+      </sm:activationSpec>
+      
+      <sm:activationSpec componentName="stockQuote" service="foo:stockQuote">
+        <sm:component><bean class="org.apache.servicemix.components.util.EchoComponent">
+        </bean></sm:component>
+      </sm:activationSpec>
+    </sm:activationSpecs>
+  </sm:container>
+
+  <bean id="client" class="org.apache.servicemix.client.DefaultServiceMixClient">
+    <constructor-arg ref="jbi"/>
+  </bean>
+
+</beans>

Propchange: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/http/ws-example.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/broker.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/broker.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/broker.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/broker.xml Tue Feb 21 15:40:05 2006
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://activemq.org/config/1.0">
-
-  <broker persistent="false">
-
-    <transportConnectors>
-      <transportConnector uri="jabber://localhost:6222" />
-    </transportConnectors>
-
-  </broker>
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://activemq.org/config/1.0">
+
+  <broker persistent="false">
+
+    <transportConnectors>
+      <transportConnector uri="jabber://localhost:6222" />
+    </transportConnectors>
+
+  </broker>
+
+</beans>

Propchange: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jabber/broker.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example-cluster.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example-cluster.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example-cluster.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example-cluster.xml Tue Feb 21 15:40:05 2006
@@ -1,95 +1,95 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns:sm="http://servicemix.apache.org/config/1.0" 
-	   xmlns:foo="http://servicemix.org/cheese/">
-
-  <bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean" singleton="true">
-    <property name="config" value="classpath:broker.xml"/>
-  </bean>
-
-  <!-- the JBI container -->
-  <sm:container id="jbi" depends-on="broker" embedded="true" 
-  				flowName="jms?brokerURL=tcp://localhost:61626">
-    <sm:activationSpecs>
-
-      <sm:activationSpec componentName="myJmsSender" service="foo:myJmsSender">
-        <sm:component><bean class="org.apache.servicemix.components.jms.JmsSenderComponent">
-          <property name="template">
-            <bean class="org.springframework.jms.core.JmsTemplate">
-              <property name="connectionFactory">
-                <ref local="jmsFactory"/>
-              </property>
-              <property name="defaultDestinationName" value="test.org.apache.servicemix.example.1"/>
-              <property name="pubSubDomain" value="true"/>
-            </bean>
-          </property>
-        </bean></sm:component>
-      </sm:activationSpec>
-
-      <sm:activationSpec componentName="myJmsReceiver" service="foo:myJmsReceiver" destinationService="foo:receiver">
-        <sm:component><bean class="org.apache.servicemix.components.jms.JmsReceiverComponent">
-          <property name="template">
-            <bean class="org.springframework.jms.core.JmsTemplate">
-              <property name="connectionFactory">
-                <ref local="jmsFactory"/>
-              </property>
-              <property name="defaultDestinationName" value="test.org.apache.servicemix.example.1"/>
-              <property name="pubSubDomain" value="true"/>
-            </bean>
-          </property>
-        </bean></sm:component>
-      </sm:activationSpec>
-
-      <sm:activationSpec componentName="receiver" service="foo:receiver">
-        <sm:component><bean class="org.apache.servicemix.tck.ReceiverComponent"/></sm:component>
-      </sm:activationSpec>
-
-
-      <!-- just to test that we are sending messages, lets trace the messages we receive -->
-      <sm:activationSpec componentName="jmsTrace" service="foo:jmsTrace" destinationService="foo:trace">
-        <sm:component><bean class="org.apache.servicemix.components.jms.JmsReceiverComponent">
-          <property name="template">
-            <bean class="org.springframework.jms.core.JmsTemplate">
-              <property name="connectionFactory">
-                <ref local="jmsFactory"/>
-              </property>
-              <property name="defaultDestinationName" value="test.org.apache.servicemix.example.1"/>
-              <property name="pubSubDomain" value="true"/>
-            </bean>
-          </property>
-        </bean></sm:component>
-      </sm:activationSpec>
-
-      <!--
-      <sm:activationSpec componentName="jmsTrace" service="foo:trace">
-        <sm:component><bean class="org.apache.servicemix.components.util.TraceComponent"/></sm:component>
-      </sm:activationSpec>
-      -->
-
-      <sm:activationSpec componentName="jmsTrace" service="foo:trace">
-        <sm:component><bean class="org.apache.servicemix.components.groovy.GroovyComponent">
-          <property name="disableOutput" value="true"/>
-          <property name="scriptText">
-            <value>
-              <![CDATA[
-log.info "Received message $inMessage with body: $inMessage.bodyText"
-              ]]>
-            </value>
-          </property>
-        </bean></sm:component>
-      </sm:activationSpec>
-    </sm:activationSpecs>
-  </sm:container>
-
-  <bean id="client" class="org.apache.servicemix.client.DefaultServiceMixClient">
-    <constructor-arg ref="jbi"/>
-  </bean>
-
-  <bean id="jmsFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
-    <property name="connectionFactory">
-      <bean class="org.apache.activemq.ActiveMQConnectionFactory">
-        <property name="brokerURL" value="tcp://localhost:61626" />
-      </bean>
-    </property>
-  </bean>
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns:sm="http://servicemix.apache.org/config/1.0" 
+	   xmlns:foo="http://servicemix.org/cheese/">
+
+  <bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean" singleton="true">
+    <property name="config" value="classpath:broker.xml"/>
+  </bean>
+
+  <!-- the JBI container -->
+  <sm:container id="jbi" depends-on="broker" embedded="true" 
+  				flowName="jms?brokerURL=tcp://localhost:61626">
+    <sm:activationSpecs>
+
+      <sm:activationSpec componentName="myJmsSender" service="foo:myJmsSender">
+        <sm:component><bean class="org.apache.servicemix.components.jms.JmsSenderComponent">
+          <property name="template">
+            <bean class="org.springframework.jms.core.JmsTemplate">
+              <property name="connectionFactory">
+                <ref local="jmsFactory"/>
+              </property>
+              <property name="defaultDestinationName" value="test.org.apache.servicemix.example.1"/>
+              <property name="pubSubDomain" value="true"/>
+            </bean>
+          </property>
+        </bean></sm:component>
+      </sm:activationSpec>
+
+      <sm:activationSpec componentName="myJmsReceiver" service="foo:myJmsReceiver" destinationService="foo:receiver">
+        <sm:component><bean class="org.apache.servicemix.components.jms.JmsReceiverComponent">
+          <property name="template">
+            <bean class="org.springframework.jms.core.JmsTemplate">
+              <property name="connectionFactory">
+                <ref local="jmsFactory"/>
+              </property>
+              <property name="defaultDestinationName" value="test.org.apache.servicemix.example.1"/>
+              <property name="pubSubDomain" value="true"/>
+            </bean>
+          </property>
+        </bean></sm:component>
+      </sm:activationSpec>
+
+      <sm:activationSpec componentName="receiver" service="foo:receiver">
+        <sm:component><bean class="org.apache.servicemix.tck.ReceiverComponent"/></sm:component>
+      </sm:activationSpec>
+
+
+      <!-- just to test that we are sending messages, lets trace the messages we receive -->
+      <sm:activationSpec componentName="jmsTrace" service="foo:jmsTrace" destinationService="foo:trace">
+        <sm:component><bean class="org.apache.servicemix.components.jms.JmsReceiverComponent">
+          <property name="template">
+            <bean class="org.springframework.jms.core.JmsTemplate">
+              <property name="connectionFactory">
+                <ref local="jmsFactory"/>
+              </property>
+              <property name="defaultDestinationName" value="test.org.apache.servicemix.example.1"/>
+              <property name="pubSubDomain" value="true"/>
+            </bean>
+          </property>
+        </bean></sm:component>
+      </sm:activationSpec>
+
+      <!--
+      <sm:activationSpec componentName="jmsTrace" service="foo:trace">
+        <sm:component><bean class="org.apache.servicemix.components.util.TraceComponent"/></sm:component>
+      </sm:activationSpec>
+      -->
+
+      <sm:activationSpec componentName="jmsTrace" service="foo:trace">
+        <sm:component><bean class="org.apache.servicemix.components.groovy.GroovyComponent">
+          <property name="disableOutput" value="true"/>
+          <property name="scriptText">
+            <value>
+              <![CDATA[
+log.info "Received message $inMessage with body: $inMessage.bodyText"
+              ]]>
+            </value>
+          </property>
+        </bean></sm:component>
+      </sm:activationSpec>
+    </sm:activationSpecs>
+  </sm:container>
+
+  <bean id="client" class="org.apache.servicemix.client.DefaultServiceMixClient">
+    <constructor-arg ref="jbi"/>
+  </bean>
+
+  <bean id="jmsFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
+    <property name="connectionFactory">
+      <bean class="org.apache.activemq.ActiveMQConnectionFactory">
+        <property name="brokerURL" value="tcp://localhost:61626" />
+      </bean>
+    </property>
+  </bean>
+
+</beans>

Propchange: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jms/example-cluster.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jmx/example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jmx/example.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jmx/example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jmx/example.xml Tue Feb 21 15:40:05 2006
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns:sm="http://servicemix.apache.org/config/1.0" 
-	   xmlns:foo="http://servicemix.apache.org/cheese/">
-
-  <!-- the JBI container -->
-  <sm:container id="jbi" embedded="true" useMBeanServer="true" createMBeanServer="true">
-    <sm:activationSpecs>
-    
-      <sm:activationSpec componentName="trace"
-            			 endpoint="trace" 
-            			 service="foo:trace">
-        <sm:component>
-        	<bean class="org.apache.servicemix.components.util.TraceComponent"/>
-        </sm:component>
-      </sm:activationSpec>
-
-      <sm:activationSpec componentName="jmxMonitor"
-                 		 service="foo:jmxMonitor" 
-                 		 endpoint="jmxMonitor"
-                 		 destinationService="foo:receiver">
-        <sm:component>
-         	<bean class="org.apache.servicemix.components.jmx.CounterMonitorComponent">
-          		<property name="observedObjectName" value="org.apache.servicemix:container=defaultJBI,type=Component,name=trace,subtype=Statistics"/>
-          		<property name="attributeName" value="inboundExchangeCount" />
-          		<property name="threshold">
-          		  <bean class="java.lang.Long">
-    				<constructor-arg value="1"/>
-          		  </bean>
-          		</property>
-          		<property name="offset">
-          		  <bean class="java.lang.Long">
-    				<constructor-arg value="1"/>
-          		  </bean>
-          		</property>
-          		<property name="granularityPeriod" value="10" />
-	        </bean>
-	    </sm:component>
-      </sm:activationSpec>
-
-      <sm:activationSpec componentName="receiver"
-            			 endpoint="receiver" 
-            			 service="foo:receiver">
-        <sm:component>
-        	<bean class="org.apache.servicemix.tck.ReceiverComponent"/>
-        </sm:component>
-      </sm:activationSpec>
-
-    </sm:activationSpecs>
-  </sm:container>
-
-  <bean id="client" class="org.apache.servicemix.client.DefaultServiceMixClient">
-    <constructor-arg ref="jbi"/>
-    <constructor-arg>
-      <sm:activationSpec destinationService="foo:trace" />
-    </constructor-arg>
-  </bean>
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns:sm="http://servicemix.apache.org/config/1.0" 
+	   xmlns:foo="http://servicemix.apache.org/cheese/">
+
+  <!-- the JBI container -->
+  <sm:container id="jbi" embedded="true" useMBeanServer="true" createMBeanServer="true">
+    <sm:activationSpecs>
+    
+      <sm:activationSpec componentName="trace"
+            			 endpoint="trace" 
+            			 service="foo:trace">
+        <sm:component>
+        	<bean class="org.apache.servicemix.components.util.TraceComponent"/>
+        </sm:component>
+      </sm:activationSpec>
+
+      <sm:activationSpec componentName="jmxMonitor"
+                 		 service="foo:jmxMonitor" 
+                 		 endpoint="jmxMonitor"
+                 		 destinationService="foo:receiver">
+        <sm:component>
+         	<bean class="org.apache.servicemix.components.jmx.CounterMonitorComponent">
+          		<property name="observedObjectName" value="org.apache.servicemix:container=defaultJBI,type=Component,name=trace,subtype=Statistics"/>
+          		<property name="attributeName" value="inboundExchangeCount" />
+          		<property name="threshold">
+          		  <bean class="java.lang.Long">
+    				<constructor-arg value="1"/>
+          		  </bean>
+          		</property>
+          		<property name="offset">
+          		  <bean class="java.lang.Long">
+    				<constructor-arg value="1"/>
+          		  </bean>
+          		</property>
+          		<property name="granularityPeriod" value="10" />
+	        </bean>
+	    </sm:component>
+      </sm:activationSpec>
+
+      <sm:activationSpec componentName="receiver"
+            			 endpoint="receiver" 
+            			 service="foo:receiver">
+        <sm:component>
+        	<bean class="org.apache.servicemix.tck.ReceiverComponent"/>
+        </sm:component>
+      </sm:activationSpec>
+
+    </sm:activationSpecs>
+  </sm:container>
+
+  <bean id="client" class="org.apache.servicemix.client.DefaultServiceMixClient">
+    <constructor-arg ref="jbi"/>
+    <constructor-arg>
+      <sm:activationSpec destinationService="foo:trace" />
+    </constructor-arg>
+  </bean>
+
+</beans>

Propchange: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/jmx/example.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/quartz/example-cluster.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/quartz/example-cluster.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/quartz/example-cluster.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/quartz/example-cluster.xml Tue Feb 21 15:40:05 2006
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns:sm="http://servicemix.apache.org/config/1.0" 
-	   xmlns:my="http://servicemix.org/cheese/">
-
-  <!-- the JBI container -->
-  <sm:container id="jbi" embedded="true" 
-  				flowName="jms?brokerURL=tcp://localhost:61626">
-    <sm:activationSpecs>
-
-      <!-- START SNIPPET: timer -->
-      <sm:activationSpec componentName="timer" service="my:timer" destinationService="my:receiver">
-        <sm:component><bean class="org.apache.servicemix.components.quartz.QuartzComponent">
-          <property name="triggers">
-            <map>
-              <entry>
-                <key>
-                  <bean class="org.quartz.SimpleTrigger">
-                    <property name="repeatInterval" value="200"/>
-                    <property name="repeatCount" value="20"/>
-                  </bean>
-                </key>
-                  <bean class="org.quartz.JobDetail">
-                    <property name="name" value="My Example Job"/>
-                    <property name="group" value="ServiceMix"/>
-                  </bean>
-              </entry>
-            </map>
-          </property>
-        </bean></sm:component>
-      </sm:activationSpec>
-      <!-- END SNIPPET: timer -->
-
-      <sm:activationSpec componentName="receiver" service="my:receiver">
-        <sm:component><bean class="org.apache.servicemix.tck.ReceiverComponent"/></sm:component>
-      </sm:activationSpec>
-    </sm:activationSpecs>
-  </sm:container>
-
-  <bean id="client" class="org.apache.servicemix.client.DefaultServiceMixClient">
-    <constructor-arg ref="jbi"/>
-  </bean>
-
-  <bean id="jmsFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
-    <property name="connectionFactory">
-      <bean class="org.apache.activemq.ActiveMQConnectionFactory">
-        <property name="brokerURL" value="vm://localhost"/>
-      </bean>
-    </property>
-  </bean>
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns:sm="http://servicemix.apache.org/config/1.0" 
+	   xmlns:my="http://servicemix.org/cheese/">
+
+  <!-- the JBI container -->
+  <sm:container id="jbi" embedded="true" 
+  				flowName="jms?brokerURL=tcp://localhost:61626">
+    <sm:activationSpecs>
+
+      <!-- START SNIPPET: timer -->
+      <sm:activationSpec componentName="timer" service="my:timer" destinationService="my:receiver">
+        <sm:component><bean class="org.apache.servicemix.components.quartz.QuartzComponent">
+          <property name="triggers">
+            <map>
+              <entry>
+                <key>
+                  <bean class="org.quartz.SimpleTrigger">
+                    <property name="repeatInterval" value="200"/>
+                    <property name="repeatCount" value="20"/>
+                  </bean>
+                </key>
+                  <bean class="org.quartz.JobDetail">
+                    <property name="name" value="My Example Job"/>
+                    <property name="group" value="ServiceMix"/>
+                  </bean>
+              </entry>
+            </map>
+          </property>
+        </bean></sm:component>
+      </sm:activationSpec>
+      <!-- END SNIPPET: timer -->
+
+      <sm:activationSpec componentName="receiver" service="my:receiver">
+        <sm:component><bean class="org.apache.servicemix.tck.ReceiverComponent"/></sm:component>
+      </sm:activationSpec>
+    </sm:activationSpecs>
+  </sm:container>
+
+  <bean id="client" class="org.apache.servicemix.client.DefaultServiceMixClient">
+    <constructor-arg ref="jbi"/>
+  </bean>
+
+  <bean id="jmsFactory" class="org.apache.activemq.pool.PooledConnectionFactory">
+    <property name="connectionFactory">
+      <bean class="org.apache.activemq.ActiveMQConnectionFactory">
+        <property name="brokerURL" value="vm://localhost"/>
+      </bean>
+    </property>
+  </bean>
+
+</beans>

Propchange: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/quartz/example-cluster.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/saaj/xml-request.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/saaj/xml-request.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/saaj/xml-request.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/saaj/xml-request.xml Tue Feb 21 15:40:05 2006
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wn1:getCustomerInfo 
-	xmlns:d="http://www.w3.org/2001/XMLSchema"
-	xmlns:i="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:wn0="http://systinet.com/xsd/SchemaTypes/"
-	xmlns:wn1="http://systinet.com/wsdl/com/cexp/coe/bob/ws/customer/"
-	xmlns:wn2="http://systinet.com/soap-jta/"
-	xmlns:wn3="http://systinet.com/wsdl/com/cexp/coe/bob/services/order/pojo/">
-	
-	<wn1:userId i:type="d:string">akayali</wn1:userId>
-	
+<?xml version="1.0" encoding="UTF-8"?>
+<wn1:getCustomerInfo 
+	xmlns:d="http://www.w3.org/2001/XMLSchema"
+	xmlns:i="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:wn0="http://systinet.com/xsd/SchemaTypes/"
+	xmlns:wn1="http://systinet.com/wsdl/com/cexp/coe/bob/ws/customer/"
+	xmlns:wn2="http://systinet.com/soap-jta/"
+	xmlns:wn3="http://systinet.com/wsdl/com/cexp/coe/bob/services/order/pojo/">
+	
+	<wn1:userId i:type="d:string">akayali</wn1:userId>
+	
 </wn1:getCustomerInfo>

Propchange: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/saaj/xml-request.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/optional-axis-example.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/optional-axis-example.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/optional-axis-example.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/optional-axis-example.xml Tue Feb 21 15:40:05 2006
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns:sm="http://servicemix.apache.org/config/1.0"
-    xmlns:foo="http://servicemix.org/cheese/">
-
-    <sm:container id="jbi" embedded="true">
-        <sm:activationSpecs>
-
-            <sm:activationSpec componentName="transformer" service="foo:transformer">
-                <sm:component>
-                    <bean class="org.apache.servicemix.components.xslt.XsltComponent">
-                        <property name="xsltResource" value="classpath:org/apache/servicemix/components/xslt/optional-axis.xsl"/>
-
-                        <!-- lets disable automatic output of the result of the transform; only if we perform
-                            an invoke in the XSLT will we invoke another endpoint -->
-                        <property name="disableOutput" value="true"/>
-                    </bean>
-                </sm:component>
-            </sm:activationSpec>
-
-
-            <sm:activationSpec componentName="service1" service="foo:service1">
-                <sm:component>
-                    <bean class="org.apache.servicemix.tck.ReceiverComponent"/>
-                </sm:component>
-            </sm:activationSpec>
-
-            <sm:activationSpec componentName="service2" service="foo:service2">
-               <sm:component><bean class="org.apache.servicemix.tck.ReceiverComponent"/></sm:component>
-            </sm:activationSpec>
-
-            <sm:activationSpec componentName="service3" service="foo:service3">
-               <sm:component><bean class="org.apache.servicemix.tck.ReceiverComponent"/></sm:component>
-            </sm:activationSpec>
-
-            <sm:activationSpec componentName="service4" service="foo:service4">
-               <sm:component><bean class="org.apache.servicemix.tck.ReceiverComponent"/></sm:component>
-            </sm:activationSpec>
-
-            <sm:activationSpec componentName="service5" service="foo:service5">
-               <sm:component><bean class="org.apache.servicemix.tck.ReceiverComponent"/></sm:component>
-            </sm:activationSpec>
-
-            <sm:activationSpec componentName="service6" service="foo:service6">
-               <sm:component><bean class="org.apache.servicemix.tck.ReceiverComponent"/></sm:component>
-            </sm:activationSpec>
-
-            <sm:activationSpec componentName="receiver" service="foo:receiver">
-                <sm:component>
-                    <bean class="org.apache.servicemix.tck.ReceiverComponent"/>
-                </sm:component>
-            </sm:activationSpec>
-
-
-            <sm:activationSpec componentName="trace" service="foo:trace">
-                <sm:component>
-                    <bean class="org.apache.servicemix.components.util.TraceComponent"/>
-                </sm:component>
-            </sm:activationSpec>
-
-        </sm:activationSpecs>
-    </sm:container>
-
-    <bean id="client" class="org.apache.servicemix.client.DefaultServiceMixClient">
-        <constructor-arg ref="jbi"/>
-    </bean>
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns:sm="http://servicemix.apache.org/config/1.0"
+    xmlns:foo="http://servicemix.org/cheese/">
+
+    <sm:container id="jbi" embedded="true">
+        <sm:activationSpecs>
+
+            <sm:activationSpec componentName="transformer" service="foo:transformer">
+                <sm:component>
+                    <bean class="org.apache.servicemix.components.xslt.XsltComponent">
+                        <property name="xsltResource" value="classpath:org/apache/servicemix/components/xslt/optional-axis.xsl"/>
+
+                        <!-- lets disable automatic output of the result of the transform; only if we perform
+                            an invoke in the XSLT will we invoke another endpoint -->
+                        <property name="disableOutput" value="true"/>
+                    </bean>
+                </sm:component>
+            </sm:activationSpec>
+
+
+            <sm:activationSpec componentName="service1" service="foo:service1">
+                <sm:component>
+                    <bean class="org.apache.servicemix.tck.ReceiverComponent"/>
+                </sm:component>
+            </sm:activationSpec>
+
+            <sm:activationSpec componentName="service2" service="foo:service2">
+               <sm:component><bean class="org.apache.servicemix.tck.ReceiverComponent"/></sm:component>
+            </sm:activationSpec>
+
+            <sm:activationSpec componentName="service3" service="foo:service3">
+               <sm:component><bean class="org.apache.servicemix.tck.ReceiverComponent"/></sm:component>
+            </sm:activationSpec>
+
+            <sm:activationSpec componentName="service4" service="foo:service4">
+               <sm:component><bean class="org.apache.servicemix.tck.ReceiverComponent"/></sm:component>
+            </sm:activationSpec>
+
+            <sm:activationSpec componentName="service5" service="foo:service5">
+               <sm:component><bean class="org.apache.servicemix.tck.ReceiverComponent"/></sm:component>
+            </sm:activationSpec>
+
+            <sm:activationSpec componentName="service6" service="foo:service6">
+               <sm:component><bean class="org.apache.servicemix.tck.ReceiverComponent"/></sm:component>
+            </sm:activationSpec>
+
+            <sm:activationSpec componentName="receiver" service="foo:receiver">
+                <sm:component>
+                    <bean class="org.apache.servicemix.tck.ReceiverComponent"/>
+                </sm:component>
+            </sm:activationSpec>
+
+
+            <sm:activationSpec componentName="trace" service="foo:trace">
+                <sm:component>
+                    <bean class="org.apache.servicemix.components.util.TraceComponent"/>
+                </sm:component>
+            </sm:activationSpec>
+
+        </sm:activationSpecs>
+    </sm:container>
+
+    <bean id="client" class="org.apache.servicemix.client.DefaultServiceMixClient">
+        <constructor-arg ref="jbi"/>
+    </bean>
+
+</beans>

Propchange: incubator/servicemix/trunk/servicemix-components/src/test/resources/org/apache/servicemix/components/xslt/optional-axis-example.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/servicemix/trunk/servicemix-console/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/servicemix/trunk/servicemix-console/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/servicemix/trunk/servicemix-console/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-console/src/main/java/org/apache/servicemix/console/JBIComponentsPortlet.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-console/src/main/java/org/apache/servicemix/console/JBIComponentsPortlet.java?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-console/src/main/java/org/apache/servicemix/console/JBIComponentsPortlet.java (original)
+++ incubator/servicemix/trunk/servicemix-console/src/main/java/org/apache/servicemix/console/JBIComponentsPortlet.java Tue Feb 21 15:40:05 2006
@@ -1,94 +1,94 @@
-package org.apache.servicemix.console;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-import javax.jbi.management.LifeCycleMBean;
-import javax.management.ObjectName;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.RenderRequest;
-
-import org.apache.servicemix.jbi.management.ManagementContextMBean;
-
-public class JBIComponentsPortlet extends ServiceMixPortlet {
-
-	   public static class ComponentInfo {
-	        private String name;
-	        private String type;
-	        private String state;
-	        
-	        public String getType() {
-	            return type;
-	        }
-	        public void setType(String type) {
-	            this.type = type;
-	        }
-	        public String getName() {
-	            return name;
-	        }
-	        public void setName(String name) {
-	            this.name = name;
-	        }
-	        public String getState() {
-	            return state;
-	        }
-	        public void setState(String state) {
-	            this.state = state;
-	        }
-	    }
-	    
-	    protected void fillViewRequest(RenderRequest request) throws Exception {
-	        LifeCycleMBean container = getJBIContainer();
-	        ManagementContextMBean management = getManagementContext();
-	        SortedMap components = new TreeMap();
-	        ObjectName[] bcs = management.getBindingComponents();
-	        for (int i = 0; i < bcs.length; i++) {
-	            ComponentInfo info = new ComponentInfo();
-	            info.name =  getAttribute(bcs[i], "name");
-	            info.type =  "Binding Component";
-	            info.state =  getAttribute(bcs[i], "currentState");
-	            components.put(info.name, info);
-	        }
-	        ObjectName[] ses = management.getEngineComponents();
-	        for (int i = 0; i < ses.length; i++) {
-	            ComponentInfo info = new ComponentInfo();
-	            info.name =  getAttribute(ses[i], "name");
-	            info.type =  "Service Engine";
-	            info.state =  getAttribute(ses[i], "currentState");
-	            if (components.containsKey(info.name)) {
-	            	((ComponentInfo) components.get(info.name)).type = "Unknown";
-	            } else {
-		            components.put(info.name, info);
-	            }
-	        }
-	        List infos = new ArrayList(components.values());
-	        request.setAttribute("components", infos);
-	    }
-	    
-	    protected String getAttribute(ObjectName name, String attribute) {
-	        try {
-	            return (String) getServerConnection().getAttribute(name, attribute);
-	        } catch (Exception e) {
-	            log.error("Could not retrieve attribute '" + attribute + "' for mbean '" + name + "'");
-	            return null;
-	        }
-	    }
-
-	    protected void doProcessAction(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception {
-	        String action = actionRequest.getParameter("action");
-	        String name   = actionRequest.getParameter("name");
-	        System.err.println("doProcessAction: " + action + " for " + name);
-	        ManagementContextMBean management = getManagementContext();
-	        if ("stop".equals(action)) {
-	        	management.stopComponent(name);
-	        } else if ("start".equals(action)) {
-	        	management.startComponent(name);
-	        } else if ("shutdown".equals(action)) {
-	        	management.shutDownComponent(name);
-	        }
-	    }
-}
+package org.apache.servicemix.console;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+import javax.jbi.management.LifeCycleMBean;
+import javax.management.ObjectName;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.RenderRequest;
+
+import org.apache.servicemix.jbi.management.ManagementContextMBean;
+
+public class JBIComponentsPortlet extends ServiceMixPortlet {
+
+	   public static class ComponentInfo {
+	        private String name;
+	        private String type;
+	        private String state;
+	        
+	        public String getType() {
+	            return type;
+	        }
+	        public void setType(String type) {
+	            this.type = type;
+	        }
+	        public String getName() {
+	            return name;
+	        }
+	        public void setName(String name) {
+	            this.name = name;
+	        }
+	        public String getState() {
+	            return state;
+	        }
+	        public void setState(String state) {
+	            this.state = state;
+	        }
+	    }
+	    
+	    protected void fillViewRequest(RenderRequest request) throws Exception {
+	        LifeCycleMBean container = getJBIContainer();
+	        ManagementContextMBean management = getManagementContext();
+	        SortedMap components = new TreeMap();
+	        ObjectName[] bcs = management.getBindingComponents();
+	        for (int i = 0; i < bcs.length; i++) {
+	            ComponentInfo info = new ComponentInfo();
+	            info.name =  getAttribute(bcs[i], "name");
+	            info.type =  "Binding Component";
+	            info.state =  getAttribute(bcs[i], "currentState");
+	            components.put(info.name, info);
+	        }
+	        ObjectName[] ses = management.getEngineComponents();
+	        for (int i = 0; i < ses.length; i++) {
+	            ComponentInfo info = new ComponentInfo();
+	            info.name =  getAttribute(ses[i], "name");
+	            info.type =  "Service Engine";
+	            info.state =  getAttribute(ses[i], "currentState");
+	            if (components.containsKey(info.name)) {
+	            	((ComponentInfo) components.get(info.name)).type = "Unknown";
+	            } else {
+		            components.put(info.name, info);
+	            }
+	        }
+	        List infos = new ArrayList(components.values());
+	        request.setAttribute("components", infos);
+	    }
+	    
+	    protected String getAttribute(ObjectName name, String attribute) {
+	        try {
+	            return (String) getServerConnection().getAttribute(name, attribute);
+	        } catch (Exception e) {
+	            log.error("Could not retrieve attribute '" + attribute + "' for mbean '" + name + "'");
+	            return null;
+	        }
+	    }
+
+	    protected void doProcessAction(ActionRequest actionRequest, ActionResponse actionResponse) throws Exception {
+	        String action = actionRequest.getParameter("action");
+	        String name   = actionRequest.getParameter("name");
+	        System.err.println("doProcessAction: " + action + " for " + name);
+	        ManagementContextMBean management = getManagementContext();
+	        if ("stop".equals(action)) {
+	        	management.stopComponent(name);
+	        } else if ("start".equals(action)) {
+	        	management.startComponent(name);
+	        } else if ("shutdown".equals(action)) {
+	        	management.shutDownComponent(name);
+	        }
+	    }
+}

Propchange: incubator/servicemix/trunk/servicemix-console/src/main/java/org/apache/servicemix/console/JBIComponentsPortlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-console/src/main/resources/META-INF/DISCLAIMER.txt
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-console/src/main/resources/META-INF/DISCLAIMER.txt?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-console/src/main/resources/META-INF/DISCLAIMER.txt (original)
+++ incubator/servicemix/trunk/servicemix-console/src/main/resources/META-INF/DISCLAIMER.txt Tue Feb 21 15:40:05 2006
@@ -1,7 +1,7 @@
-ActiveMQ is an effort undergoing incubation at the Apache Software Foundation
-(ASF), sponsored by the Geronimo PMC. Incubation is required of all newly
-accepted projects until a further review indicates that the infrastructure,
-communications, and decision making process have stabilized in a manner
-consistent with other successful ASF projects. While incubation status is not
-necessarily a reflection of the completeness or stability of the code, it does
+ActiveMQ is an effort undergoing incubation at the Apache Software Foundation
+(ASF), sponsored by the Geronimo PMC. Incubation is required of all newly
+accepted projects until a further review indicates that the infrastructure,
+communications, and decision making process have stabilized in a manner
+consistent with other successful ASF projects. While incubation status is not
+necessarily a reflection of the completeness or stability of the code, it does
 indicate that the project has yet to be fully endorsed by the ASF.

Propchange: incubator/servicemix/trunk/servicemix-console/src/main/resources/META-INF/DISCLAIMER.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/servicemix/trunk/servicemix-console/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-core/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/maven.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/maven.xml (original)
+++ incubator/servicemix/trunk/servicemix-core/maven.xml Tue Feb 21 15:40:05 2006
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
-
-    Copyright 2005 The Apache Software Foundation
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-
-<project default="default"
-         xmlns:j="jelly:core"
-         xmlns:u="jelly:util"
-         xmlns:ant="jelly:ant"
-         xmlns:util="jelly:util"
-         xmlns:artifact="artifact">
-
-  <postGoal name="java:compile">
-    <attainGoal name="xbean:generate" />
-  </postGoal>
-  
-  <goal name="setclasspath" prereqs="java:compile, test:compile">
-    <path id="test.classpath">
-      <pathelement path="${maven.build.dest}"/>
-      <pathelement path="target/classes"/>
-      <pathelement path="target/test-classes"/>
-      <path refid="maven.dependency.classpath"/>
-    </path>
-  </goal>
-  
-  <goal name="xbean:generate" description="Generates the XBean XSD, documentation and META-INF/services files.">
-    <path id="test.classpath">
-      <pathelement path="${maven.build.dest}" />
-      <pathelement path="${basedir}/target/classes" />
-      <pathelement path="${basedir}/target/test-classes" />
-      <path refid="maven.dependency.classpath" />
-    </path>
-
-    <taskdef name="xsdGenerate" classname="org.apache.xbean.spring.generator.MappingGeneratorTask">
-      <classpath refid="test.classpath" />
-    </taskdef>
-    
-    <xsdGenerate destFile="${basedir}/target/servicemix-${pom.currentVersion}.xsd" 
-                 namespace="http://servicemix.apache.org/config/1.0"
-    		 classpathref="test.classpath" srcdir="${basedir}/src/main/java"  
-    		 metaInfDir="${basedir}/target/generated/"/>
-    
-    <copy file="${basedir}/target/servicemix-${pom.currentVersion}.xsd" 
-          todir="${basedir}/target/generated/"/>
-    
-    <copy file="${basedir}/target/servicemix-${pom.currentVersion}.xsd" 
-          todir="${basedir}/../xdocs"/>    
-    
-    <copy file="${basedir}/target/servicemix-${pom.currentVersion}.xsd.html" 
-          todir="${basedir}/../xdocs"/>
-  
-  </goal>
-
-</project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+
+    Copyright 2005 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+
+<project default="default"
+         xmlns:j="jelly:core"
+         xmlns:u="jelly:util"
+         xmlns:ant="jelly:ant"
+         xmlns:util="jelly:util"
+         xmlns:artifact="artifact">
+
+  <postGoal name="java:compile">
+    <attainGoal name="xbean:generate" />
+  </postGoal>
+  
+  <goal name="setclasspath" prereqs="java:compile, test:compile">
+    <path id="test.classpath">
+      <pathelement path="${maven.build.dest}"/>
+      <pathelement path="target/classes"/>
+      <pathelement path="target/test-classes"/>
+      <path refid="maven.dependency.classpath"/>
+    </path>
+  </goal>
+  
+  <goal name="xbean:generate" description="Generates the XBean XSD, documentation and META-INF/services files.">
+    <path id="test.classpath">
+      <pathelement path="${maven.build.dest}" />
+      <pathelement path="${basedir}/target/classes" />
+      <pathelement path="${basedir}/target/test-classes" />
+      <path refid="maven.dependency.classpath" />
+    </path>
+
+    <taskdef name="xsdGenerate" classname="org.apache.xbean.spring.generator.MappingGeneratorTask">
+      <classpath refid="test.classpath" />
+    </taskdef>
+    
+    <xsdGenerate destFile="${basedir}/target/servicemix-${pom.currentVersion}.xsd" 
+                 namespace="http://servicemix.apache.org/config/1.0"
+    		 classpathref="test.classpath" srcdir="${basedir}/src/main/java"  
+    		 metaInfDir="${basedir}/target/generated/"/>
+    
+    <copy file="${basedir}/target/servicemix-${pom.currentVersion}.xsd" 
+          todir="${basedir}/target/generated/"/>
+    
+    <copy file="${basedir}/target/servicemix-${pom.currentVersion}.xsd" 
+          todir="${basedir}/../xdocs"/>    
+    
+    <copy file="${basedir}/target/servicemix-${pom.currentVersion}.xsd.html" 
+          todir="${basedir}/../xdocs"/>
+  
+  </goal>
+
+</project>

Propchange: incubator/servicemix/trunk/servicemix-core/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-core/project.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/project.properties?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/project.properties (original)
+++ incubator/servicemix/trunk/servicemix-core/project.properties Tue Feb 21 15:40:05 2006
@@ -1,20 +1,20 @@
-# -------------------------------------------------------------------
-# Copyright 2001-2004 The Apache Software Foundation.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#      http://www.apache.org/licenses/LICENSE-2.0
-#  
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -------------------------------------------------------------------
-# $Rev: 356022 $ $Date: 2005-12-11 12:58:34 -0800 (dim., 11 déc. 2005) $
-# -------------------------------------------------------------------
-# P R O J E C T  P R O P E R T I E S
-# -------------------------------------------------------------------
-
+# -------------------------------------------------------------------
+# Copyright 2001-2004 The Apache Software Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+#  
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -------------------------------------------------------------------
+# $Rev: 356022 $ $Date: 2005-12-11 12:58:34 -0800 (dim., 11 déc. 2005) $
+# -------------------------------------------------------------------
+# P R O J E C T  P R O P E R T I E S
+# -------------------------------------------------------------------
+

Propchange: incubator/servicemix/trunk/servicemix-core/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native