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 [14/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/relea...

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/AbstractStreamReaderTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/AbstractStreamReaderTest.java?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/AbstractStreamReaderTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/AbstractStreamReaderTest.java Tue Feb 21 15:40:05 2006
@@ -1,179 +1,179 @@
-/*
- * 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.jbi.jaxp;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.TestCase;
-
-/**
- * @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
- * @since Oct 26, 2004
- */
-public abstract class AbstractStreamReaderTest
-    extends TestCase
-{
-    public void testSingleElement(XMLStreamReader reader) throws Exception
-    {
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
-        assertTrue(reader.hasNext());
-        assertEquals("root", reader.getLocalName());
-        assertEquals(1, reader.getNamespaceCount());
-        assertEquals(XMLStreamReader.NAMESPACE, reader.next());
-        
-        assertEquals(1, reader.getNamespaceCount());
-        assertEquals("", reader.getNamespacePrefix(0));
-        assertEquals("urn:test", reader.getNamespaceURI(0));
-        
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.END_ELEMENT, reader.next());
-    }
-    
-    public void testTextChild(XMLStreamReader reader) throws Exception
-    {
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.NAMESPACE, reader.next());
-        
-        assertEquals(1, reader.getNamespaceCount());
-        assertEquals("", reader.getNamespacePrefix(0));
-        assertEquals("urn:test", reader.getNamespaceURI(0));
-        
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.CHARACTERS, reader.next());
-        
-        assertEquals("Hello World", reader.getText());
-        
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.END_ELEMENT, reader.next());
-    }
-
-    public void testMixedContent(XMLStreamReader reader) throws Exception
-    {
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.NAMESPACE, reader.next());
-        
-        assertEquals("root", reader.getLocalName());
-        assertEquals(1, reader.getNamespaceCount());
-        assertEquals("", reader.getNamespacePrefix(0));
-        assertEquals("urn:test", reader.getNamespaceURI(0));
-        
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.CHARACTERS, reader.next());
-        assertEquals("Hello World", reader.getText());
-
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
-        assertEquals("element", reader.getLocalName());
-
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.END_ELEMENT, reader.next());
-        
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.CHARACTERS, reader.next());
-        assertEquals(" more text", reader.getText());
-
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.END_ELEMENT, reader.next());
-    }
-
-    public void testAttributes(XMLStreamReader reader) throws Exception
-    {
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
-        
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.ATTRIBUTE, reader.next());
-        
-        // first attribute
-        assertEquals(2, reader.getAttributeCount());
-        assertTrue(reader.getAttributePrefix(0) == null || reader.getAttributePrefix(0).equals(""));
-        assertEquals("att1", reader.getAttributeLocalName(0));
-        assertTrue(reader.getAttributeNamespace(0) == null || 
-                   reader.getAttributeNamespace(0).equals(""));
-        assertEquals("value1", reader.getAttributeValue(0));
-        assertEquals("value1", reader.getAttributeValue("", "att1"));        
-        
-        QName q = reader.getAttributeName(0);
-        assertEquals("", q.getNamespaceURI());
-        assertEquals("", q.getPrefix());
-        assertEquals("att1", q.getLocalPart());
-
-        // second attribute
-        assertEquals("p", reader.getAttributePrefix(1));
-        assertEquals("att2", reader.getAttributeLocalName(1));
-        assertEquals("urn:test2", reader.getAttributeNamespace(1));
-        assertEquals("value2", reader.getAttributeValue(1));
-        assertEquals("value2", reader.getAttributeValue("urn:test2", "att2"));        
-        
-        q = reader.getAttributeName(1);
-        assertEquals("urn:test2", q.getNamespaceURI());
-        assertEquals("p", q.getPrefix());
-        assertEquals("att2", q.getLocalPart());
-
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.ATTRIBUTE, reader.next());
-        
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.NAMESPACE, reader.next());
-        
-        assertEquals(2, reader.getNamespaceCount());
-        assertEquals("", reader.getNamespacePrefix(0));
-        assertEquals("urn:test", reader.getNamespaceURI(0));
-        assertEquals("p", reader.getNamespacePrefix(1));
-        assertEquals("urn:test2", reader.getNamespaceURI(1));
-        
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.NAMESPACE, reader.next());
-        
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.END_ELEMENT, reader.next());
-    }
-    
-    public void testElementChild(XMLStreamReader reader) throws Exception
-    {
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
-        
-        assertEquals("root", reader.getLocalName());
-        assertEquals("urn:test", reader.getNamespaceURI());
-        assertEquals("", reader.getPrefix());
-        
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.NAMESPACE, reader.next());
-        
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
-        
-        assertEquals("child", reader.getLocalName());
-        assertEquals("urn:test2", reader.getNamespaceURI());
-        assertEquals("a", reader.getPrefix());
-        
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.NAMESPACE, reader.next());        
-        
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.END_ELEMENT, reader.next());
-        
-        assertTrue(reader.hasNext());
-        assertEquals(XMLStreamReader.END_ELEMENT, reader.next());
-    }
-}
+/*
+ * 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.jbi.jaxp;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamReader;
+
+import junit.framework.TestCase;
+
+/**
+ * @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
+ * @since Oct 26, 2004
+ */
+public abstract class AbstractStreamReaderTest
+    extends TestCase
+{
+    public void testSingleElement(XMLStreamReader reader) throws Exception
+    {
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
+        assertTrue(reader.hasNext());
+        assertEquals("root", reader.getLocalName());
+        assertEquals(1, reader.getNamespaceCount());
+        assertEquals(XMLStreamReader.NAMESPACE, reader.next());
+        
+        assertEquals(1, reader.getNamespaceCount());
+        assertEquals("", reader.getNamespacePrefix(0));
+        assertEquals("urn:test", reader.getNamespaceURI(0));
+        
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.END_ELEMENT, reader.next());
+    }
+    
+    public void testTextChild(XMLStreamReader reader) throws Exception
+    {
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.NAMESPACE, reader.next());
+        
+        assertEquals(1, reader.getNamespaceCount());
+        assertEquals("", reader.getNamespacePrefix(0));
+        assertEquals("urn:test", reader.getNamespaceURI(0));
+        
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.CHARACTERS, reader.next());
+        
+        assertEquals("Hello World", reader.getText());
+        
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.END_ELEMENT, reader.next());
+    }
+
+    public void testMixedContent(XMLStreamReader reader) throws Exception
+    {
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.NAMESPACE, reader.next());
+        
+        assertEquals("root", reader.getLocalName());
+        assertEquals(1, reader.getNamespaceCount());
+        assertEquals("", reader.getNamespacePrefix(0));
+        assertEquals("urn:test", reader.getNamespaceURI(0));
+        
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.CHARACTERS, reader.next());
+        assertEquals("Hello World", reader.getText());
+
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
+        assertEquals("element", reader.getLocalName());
+
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.END_ELEMENT, reader.next());
+        
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.CHARACTERS, reader.next());
+        assertEquals(" more text", reader.getText());
+
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.END_ELEMENT, reader.next());
+    }
+
+    public void testAttributes(XMLStreamReader reader) throws Exception
+    {
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
+        
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.ATTRIBUTE, reader.next());
+        
+        // first attribute
+        assertEquals(2, reader.getAttributeCount());
+        assertTrue(reader.getAttributePrefix(0) == null || reader.getAttributePrefix(0).equals(""));
+        assertEquals("att1", reader.getAttributeLocalName(0));
+        assertTrue(reader.getAttributeNamespace(0) == null || 
+                   reader.getAttributeNamespace(0).equals(""));
+        assertEquals("value1", reader.getAttributeValue(0));
+        assertEquals("value1", reader.getAttributeValue("", "att1"));        
+        
+        QName q = reader.getAttributeName(0);
+        assertEquals("", q.getNamespaceURI());
+        assertEquals("", q.getPrefix());
+        assertEquals("att1", q.getLocalPart());
+
+        // second attribute
+        assertEquals("p", reader.getAttributePrefix(1));
+        assertEquals("att2", reader.getAttributeLocalName(1));
+        assertEquals("urn:test2", reader.getAttributeNamespace(1));
+        assertEquals("value2", reader.getAttributeValue(1));
+        assertEquals("value2", reader.getAttributeValue("urn:test2", "att2"));        
+        
+        q = reader.getAttributeName(1);
+        assertEquals("urn:test2", q.getNamespaceURI());
+        assertEquals("p", q.getPrefix());
+        assertEquals("att2", q.getLocalPart());
+
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.ATTRIBUTE, reader.next());
+        
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.NAMESPACE, reader.next());
+        
+        assertEquals(2, reader.getNamespaceCount());
+        assertEquals("", reader.getNamespacePrefix(0));
+        assertEquals("urn:test", reader.getNamespaceURI(0));
+        assertEquals("p", reader.getNamespacePrefix(1));
+        assertEquals("urn:test2", reader.getNamespaceURI(1));
+        
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.NAMESPACE, reader.next());
+        
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.END_ELEMENT, reader.next());
+    }
+    
+    public void testElementChild(XMLStreamReader reader) throws Exception
+    {
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
+        
+        assertEquals("root", reader.getLocalName());
+        assertEquals("urn:test", reader.getNamespaceURI());
+        assertEquals("", reader.getPrefix());
+        
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.NAMESPACE, reader.next());
+        
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
+        
+        assertEquals("child", reader.getLocalName());
+        assertEquals("urn:test2", reader.getNamespaceURI());
+        assertEquals("a", reader.getPrefix());
+        
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.NAMESPACE, reader.next());        
+        
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.END_ELEMENT, reader.next());
+        
+        assertTrue(reader.hasNext());
+        assertEquals(XMLStreamReader.END_ELEMENT, reader.next());
+    }
+}

Propchange: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/AbstractStreamReaderTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReaderTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReaderTest.java?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReaderTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReaderTest.java Tue Feb 21 15:40:05 2006
@@ -1,62 +1,62 @@
-/*
- * 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.jbi.jaxp;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.StringWriter;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import junit.framework.TestCase;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.w3c.dom.Document;
-
-public class FragmentStreamReaderTest extends TestCase {
-
-	private static final Log log = LogFactory.getLog(FragmentStreamReaderTest.class);
-	
-	public void testStaxSource() throws Exception {
-		InputStream is = getClass().getResourceAsStream("test.xml");
-		XMLStreamReader xsr = XMLInputFactory.newInstance().createXMLStreamReader(is);
-        xsr = new ExtendedXMLStreamReader(xsr);
-		xsr.nextTag();
-		log.info(xsr.getName());
-		xsr.nextTag();
-		log.info(xsr.getName());
-		XMLStreamReader fsr = new FragmentStreamReader(xsr);
-		StaxSource ss = new StaxSource(fsr);
-        StringWriter buffer = new StringWriter();
-        Transformer transformer = TransformerFactory.newInstance().newTransformer();
-        transformer.transform(ss, new StreamResult(buffer));
-        log.info(buffer.toString());
-        DocumentBuilderFactory dbf =DocumentBuilderFactory.newInstance();
-        dbf.setNamespaceAware(true);
-		Document doc = dbf.newDocumentBuilder().parse(new ByteArrayInputStream(buffer.toString().getBytes()));
-		StringWriter buffer2 = new StringWriter();
-        transformer.transform(new DOMSource(doc), new StreamResult(buffer2));
-        log.info(buffer2.toString());
-	}
-	
-}
+/*
+ * 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.jbi.jaxp;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.StringWriter;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import junit.framework.TestCase;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.w3c.dom.Document;
+
+public class FragmentStreamReaderTest extends TestCase {
+
+	private static final Log log = LogFactory.getLog(FragmentStreamReaderTest.class);
+	
+	public void testStaxSource() throws Exception {
+		InputStream is = getClass().getResourceAsStream("test.xml");
+		XMLStreamReader xsr = XMLInputFactory.newInstance().createXMLStreamReader(is);
+        xsr = new ExtendedXMLStreamReader(xsr);
+		xsr.nextTag();
+		log.info(xsr.getName());
+		xsr.nextTag();
+		log.info(xsr.getName());
+		XMLStreamReader fsr = new FragmentStreamReader(xsr);
+		StaxSource ss = new StaxSource(fsr);
+        StringWriter buffer = new StringWriter();
+        Transformer transformer = TransformerFactory.newInstance().newTransformer();
+        transformer.transform(ss, new StreamResult(buffer));
+        log.info(buffer.toString());
+        DocumentBuilderFactory dbf =DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
+		Document doc = dbf.newDocumentBuilder().parse(new ByteArrayInputStream(buffer.toString().getBytes()));
+		StringWriter buffer2 = new StringWriter();
+        transformer.transform(new DOMSource(doc), new StreamResult(buffer2));
+        log.info(buffer2.toString());
+	}
+	
+}

Propchange: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReaderTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/StaxSourceTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/StaxSourceTest.java?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/StaxSourceTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/StaxSourceTest.java Tue Feb 21 15:40:05 2006
@@ -1,77 +1,77 @@
-/*
- * 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.jbi.jaxp;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.StringWriter;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.jbi.jaxp.StaxSource;
-import org.w3c.dom.Document;
-
-import junit.framework.TestCase;
-
-public class StaxSourceTest extends TestCase {
-
-    private static final Log log = LogFactory.getLog(StaxSourceTest.class);
-
-    public void testStaxSourceOnStream() throws Exception {
-        InputStream is = getClass().getResourceAsStream("test.xml");
-        XMLStreamReader xsr = XMLInputFactory.newInstance().createXMLStreamReader(is);
-        StaxSource ss = new StaxSource(xsr);
-        StringWriter buffer = new StringWriter();
-        Transformer transformer = TransformerFactory.newInstance().newTransformer();
-        transformer.transform(ss, new StreamResult(buffer));
-        log.info(buffer.toString());
-        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-        dbf.setNamespaceAware(true);
-        Document doc = dbf.newDocumentBuilder().parse(new ByteArrayInputStream(buffer.toString().getBytes()));
-        StringWriter buffer2 = new StringWriter();
-        transformer.transform(new DOMSource(doc), new StreamResult(buffer2));
-        log.info(buffer2.toString());
-    }
-
-    public void testStaxSourceOnDOM() throws Exception {
-        InputStream is = getClass().getResourceAsStream("test.xml");
-        XMLStreamReader xsr = XMLInputFactory.newInstance().createXMLStreamReader(is);
-        StaxSource ss = new StaxSource(xsr);
-        Transformer transformer = TransformerFactory.newInstance().newTransformer();
-        DOMResult result = new DOMResult();
-        transformer.transform(ss, result);
-        assertNotNull(result.getNode());
-    }
-
-    public void testStaxToDOM() throws Exception {
-        InputStream is = getClass().getResourceAsStream("test.xml");
-        XMLStreamReader xsr = XMLInputFactory.newInstance().createXMLStreamReader(is);
-        StaxSource ss = new StaxSource(xsr);
-        DOMSource src = new SourceTransformer().toDOMSource(ss);
-        assertNotNull(src);
-        assertNotNull(src.getNode());
-    }
-
-}
+/*
+ * 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.jbi.jaxp;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.StringWriter;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.servicemix.jbi.jaxp.StaxSource;
+import org.w3c.dom.Document;
+
+import junit.framework.TestCase;
+
+public class StaxSourceTest extends TestCase {
+
+    private static final Log log = LogFactory.getLog(StaxSourceTest.class);
+
+    public void testStaxSourceOnStream() throws Exception {
+        InputStream is = getClass().getResourceAsStream("test.xml");
+        XMLStreamReader xsr = XMLInputFactory.newInstance().createXMLStreamReader(is);
+        StaxSource ss = new StaxSource(xsr);
+        StringWriter buffer = new StringWriter();
+        Transformer transformer = TransformerFactory.newInstance().newTransformer();
+        transformer.transform(ss, new StreamResult(buffer));
+        log.info(buffer.toString());
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setNamespaceAware(true);
+        Document doc = dbf.newDocumentBuilder().parse(new ByteArrayInputStream(buffer.toString().getBytes()));
+        StringWriter buffer2 = new StringWriter();
+        transformer.transform(new DOMSource(doc), new StreamResult(buffer2));
+        log.info(buffer2.toString());
+    }
+
+    public void testStaxSourceOnDOM() throws Exception {
+        InputStream is = getClass().getResourceAsStream("test.xml");
+        XMLStreamReader xsr = XMLInputFactory.newInstance().createXMLStreamReader(is);
+        StaxSource ss = new StaxSource(xsr);
+        Transformer transformer = TransformerFactory.newInstance().newTransformer();
+        DOMResult result = new DOMResult();
+        transformer.transform(ss, result);
+        assertNotNull(result.getNode());
+    }
+
+    public void testStaxToDOM() throws Exception {
+        InputStream is = getClass().getResourceAsStream("test.xml");
+        XMLStreamReader xsr = XMLInputFactory.newInstance().createXMLStreamReader(is);
+        StaxSource ss = new StaxSource(xsr);
+        DOMSource src = new SourceTransformer().toDOMSource(ss);
+        assertNotNull(src);
+        assertNotNull(src.getNode());
+    }
+
+}

Propchange: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/StaxSourceTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamReaderTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamReaderTest.java?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamReaderTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamReaderTest.java Tue Feb 21 15:40:05 2006
@@ -1,154 +1,154 @@
-/*
- * 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.jbi.jaxp;
-
-import java.io.OutputStream;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
- * @since Oct 26, 2004
- */
-public class W3CDOMStreamReaderTest
-    extends AbstractStreamReaderTest
-{
-    
-    
-    public void testSingleElement() throws Exception
-    {
-        Document doc = getDocument();
-        Element e = doc.createElementNS("urn:test","root");
-        e.setAttribute("xmlns", "urn:test");
-        doc.appendChild(e);
-        
-        assertEquals(1, e.getAttributes().getLength());
-        System.out.println("start: " + XMLStreamReader.START_ELEMENT);
-        System.out.println("attr: " + XMLStreamReader.ATTRIBUTE);
-        System.out.println("ns: " + XMLStreamReader.NAMESPACE);
-        System.out.println("chars: " + XMLStreamReader.CHARACTERS);
-        System.out.println("end: " + XMLStreamReader.END_ELEMENT);
-        
-        writeXml(doc,System.out);
-        W3CDOMStreamReader reader = new W3CDOMStreamReader(doc.getDocumentElement());
-        testSingleElement(reader);
-    }
-    
-    private Document getDocument() throws Exception{
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        factory.setNamespaceAware(true);
-        Document doc = factory.newDocumentBuilder().newDocument();
-        return doc;
-    }
-    
-    
-    public void testTextChild() throws Exception
-    {
-        Document doc = getDocument();
-        Element e = doc.createElementNS( "urn:test","root");
-        e.setAttribute("xmlns", "urn:test");
-        doc.appendChild(e);
-        Node text = doc.createTextNode("Hello World");
-        e.appendChild(text);
-        
-        writeXml(doc,System.out);
-        
-        W3CDOMStreamReader reader = new W3CDOMStreamReader(e);
-        testTextChild(reader);
-    }
-    
-    
-    public void testMixedContent() throws Exception
-    {
-        Document doc = getDocument();
-        Element e = doc.createElementNS( "urn:test","test:root");
-        e.setAttribute("xmlns", "urn:test");
-        doc.appendChild(e);
-        Node text = doc.createTextNode("Hello World");
-        e.appendChild(text);
-        Element child = doc.createElement("element");
-        e.appendChild(child);
-        text = doc.createTextNode(" more text");
-        e.appendChild(text);
-        
-        writeXml(doc,System.out);
-        
-        W3CDOMStreamReader reader = new W3CDOMStreamReader(e);
-        testMixedContent(reader);
-    }
-    
-    
-    public void testAttributes() throws Exception
-    {
-        Document doc = getDocument();
-        
-        Element e = doc.createElementNS("urn:test","root");
-        e.setAttribute("xmlns", "urn:test");
-        doc.appendChild(e);
-        e.setAttribute("att1", "value1");
-        
-        Attr attr = doc.createAttributeNS("urn:test2","att2");
-        attr.setValue("value2");
-        attr.setPrefix("p");
-        
-        e.setAttribute("xmlns:p", "urn:test2");
-        
-        e.setAttributeNode(attr);
-        writeXml(doc,System.out);
-        
-        W3CDOMStreamReader reader = new W3CDOMStreamReader(doc.getDocumentElement());
-        
-        testAttributes(reader);
-    }
-    
-    public void testElementChild() throws Exception
-    {
-        Document doc = getDocument();
-        Element e = doc.createElementNS("urn:test","root");
-        e.setAttribute("xmlns", "urn:test");
-        Element child =  doc.createElementNS("urn:test2","child");
-        child.setAttribute("xmlns:a", "urn:test2");
-        
-        child.setPrefix("a");
-        e.appendChild(child);
-        doc.appendChild(e);
-        writeXml(doc,System.out);
-        
-        W3CDOMStreamReader reader = new W3CDOMStreamReader(e);
-        testElementChild(reader);
-    }
-    
-    protected void writeXml(Document doc, OutputStream out) throws TransformerException {
-        TransformerFactory tf = TransformerFactory.newInstance();
-        //identity
-        Transformer t = tf.newTransformer();
-        t.setOutputProperty(OutputKeys.INDENT, "yes");
-        t.transform(new DOMSource(doc), new StreamResult(out));
-    }
-}
+/*
+ * 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.jbi.jaxp;
+
+import java.io.OutputStream;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+
+/**
+ * @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
+ * @since Oct 26, 2004
+ */
+public class W3CDOMStreamReaderTest
+    extends AbstractStreamReaderTest
+{
+    
+    
+    public void testSingleElement() throws Exception
+    {
+        Document doc = getDocument();
+        Element e = doc.createElementNS("urn:test","root");
+        e.setAttribute("xmlns", "urn:test");
+        doc.appendChild(e);
+        
+        assertEquals(1, e.getAttributes().getLength());
+        System.out.println("start: " + XMLStreamReader.START_ELEMENT);
+        System.out.println("attr: " + XMLStreamReader.ATTRIBUTE);
+        System.out.println("ns: " + XMLStreamReader.NAMESPACE);
+        System.out.println("chars: " + XMLStreamReader.CHARACTERS);
+        System.out.println("end: " + XMLStreamReader.END_ELEMENT);
+        
+        writeXml(doc,System.out);
+        W3CDOMStreamReader reader = new W3CDOMStreamReader(doc.getDocumentElement());
+        testSingleElement(reader);
+    }
+    
+    private Document getDocument() throws Exception{
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        factory.setNamespaceAware(true);
+        Document doc = factory.newDocumentBuilder().newDocument();
+        return doc;
+    }
+    
+    
+    public void testTextChild() throws Exception
+    {
+        Document doc = getDocument();
+        Element e = doc.createElementNS( "urn:test","root");
+        e.setAttribute("xmlns", "urn:test");
+        doc.appendChild(e);
+        Node text = doc.createTextNode("Hello World");
+        e.appendChild(text);
+        
+        writeXml(doc,System.out);
+        
+        W3CDOMStreamReader reader = new W3CDOMStreamReader(e);
+        testTextChild(reader);
+    }
+    
+    
+    public void testMixedContent() throws Exception
+    {
+        Document doc = getDocument();
+        Element e = doc.createElementNS( "urn:test","test:root");
+        e.setAttribute("xmlns", "urn:test");
+        doc.appendChild(e);
+        Node text = doc.createTextNode("Hello World");
+        e.appendChild(text);
+        Element child = doc.createElement("element");
+        e.appendChild(child);
+        text = doc.createTextNode(" more text");
+        e.appendChild(text);
+        
+        writeXml(doc,System.out);
+        
+        W3CDOMStreamReader reader = new W3CDOMStreamReader(e);
+        testMixedContent(reader);
+    }
+    
+    
+    public void testAttributes() throws Exception
+    {
+        Document doc = getDocument();
+        
+        Element e = doc.createElementNS("urn:test","root");
+        e.setAttribute("xmlns", "urn:test");
+        doc.appendChild(e);
+        e.setAttribute("att1", "value1");
+        
+        Attr attr = doc.createAttributeNS("urn:test2","att2");
+        attr.setValue("value2");
+        attr.setPrefix("p");
+        
+        e.setAttribute("xmlns:p", "urn:test2");
+        
+        e.setAttributeNode(attr);
+        writeXml(doc,System.out);
+        
+        W3CDOMStreamReader reader = new W3CDOMStreamReader(doc.getDocumentElement());
+        
+        testAttributes(reader);
+    }
+    
+    public void testElementChild() throws Exception
+    {
+        Document doc = getDocument();
+        Element e = doc.createElementNS("urn:test","root");
+        e.setAttribute("xmlns", "urn:test");
+        Element child =  doc.createElementNS("urn:test2","child");
+        child.setAttribute("xmlns:a", "urn:test2");
+        
+        child.setPrefix("a");
+        e.appendChild(child);
+        doc.appendChild(e);
+        writeXml(doc,System.out);
+        
+        W3CDOMStreamReader reader = new W3CDOMStreamReader(e);
+        testElementChild(reader);
+    }
+    
+    protected void writeXml(Document doc, OutputStream out) throws TransformerException {
+        TransformerFactory tf = TransformerFactory.newInstance();
+        //identity
+        Transformer t = tf.newTransformer();
+        t.setOutputProperty(OutputKeys.INDENT, "yes");
+        t.transform(new DOMSource(doc), new StreamResult(out));
+    }
+}

Propchange: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamReaderTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/PubSubTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/PubSubTest.java?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/PubSubTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/PubSubTest.java Tue Feb 21 15:40:05 2006
@@ -1,95 +1,95 @@
-/*
- * 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.jbi.nmr;
-
-import javax.jbi.messaging.MessageExchange;
-import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
-import org.apache.servicemix.jbi.container.ActivationSpec;
-import org.apache.servicemix.jbi.container.JBIContainer;
-import org.apache.servicemix.jbi.container.SubscriptionSpec;
-import org.apache.servicemix.jbi.resolver.SubscriptionFilter;
-import org.apache.servicemix.tck.ReceiverComponent;
-import org.apache.servicemix.tck.SenderComponent;
-
-public class PubSubTest extends TestCase {
-
-    private SenderComponent sender;
-    private JBIContainer container;
-
-    protected void setUp() throws Exception {
-        container = new JBIContainer();
-        container.setUseMBeanServer(true);
-        container.setCreateMBeanServer(false);
-        container.setFlowName("seda");
-        container.init();
-        container.start();
-        
-        sender = new SenderComponent();
-        ActivationSpec as = new ActivationSpec("source",sender);
-        as.setService(new QName("http://www.test.com","source"));
-        as.setFailIfNoDestinationEndpoint(false);
-        container.activateComponent(as);
-    }
-
-    protected void tearDown() throws Exception {
-        container.shutDown();
-    }
-    
-    public void testPubSub() throws Exception {
-    	ReceiverComponent recListener = new ReceiverComponent();
-        container.activateComponent(createReceiverAS("receiver",recListener));
-        sender.sendMessages(1);
-        recListener.getMessageList().assertMessagesReceived(1);
-    }
-    
-    public void testPubSubFiltered() throws Exception {
-    	ReceiverComponent recListener = new ReceiverComponent();
-        container.activateComponent(createReceiverASFiltered("receiver",recListener));
-        sender.sendMessages(1, false);
-        recListener.getMessageList().assertMessagesReceived(1);
-    }
-
-    private ActivationSpec createReceiverAS(String id, Object component) {
-        ActivationSpec as = new ActivationSpec(id, component);
-        SubscriptionSpec ss = new SubscriptionSpec();
-        ss.setService(new QName("http://www.test.com","source"));
-        as.setSubscriptions(new SubscriptionSpec[] { ss });
-        as.setFailIfNoDestinationEndpoint(false);
-        return as;
-    }
-
-    private ActivationSpec createReceiverASFiltered(String id, Object component) {
-        ActivationSpec as = new ActivationSpec(id, component);
-        SubscriptionSpec ss = new SubscriptionSpec();
-        ss.setService(new QName("http://www.test.com","source"));
-        ss.setFilter(new Filter());
-        as.setSubscriptions(new SubscriptionSpec[] { ss });
-        as.setFailIfNoDestinationEndpoint(false);
-        return as;
-    }
-
-    public static class Filter implements SubscriptionFilter {
-
-        public boolean matches(MessageExchange arg0) {
-            System.out.println("Matches");
-            return true;
-        }
-        
-    }
-}
+/*
+ * 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.jbi.nmr;
+
+import javax.jbi.messaging.MessageExchange;
+import javax.xml.namespace.QName;
+
+import junit.framework.TestCase;
+
+import org.apache.servicemix.jbi.container.ActivationSpec;
+import org.apache.servicemix.jbi.container.JBIContainer;
+import org.apache.servicemix.jbi.container.SubscriptionSpec;
+import org.apache.servicemix.jbi.resolver.SubscriptionFilter;
+import org.apache.servicemix.tck.ReceiverComponent;
+import org.apache.servicemix.tck.SenderComponent;
+
+public class PubSubTest extends TestCase {
+
+    private SenderComponent sender;
+    private JBIContainer container;
+
+    protected void setUp() throws Exception {
+        container = new JBIContainer();
+        container.setUseMBeanServer(true);
+        container.setCreateMBeanServer(false);
+        container.setFlowName("seda");
+        container.init();
+        container.start();
+        
+        sender = new SenderComponent();
+        ActivationSpec as = new ActivationSpec("source",sender);
+        as.setService(new QName("http://www.test.com","source"));
+        as.setFailIfNoDestinationEndpoint(false);
+        container.activateComponent(as);
+    }
+
+    protected void tearDown() throws Exception {
+        container.shutDown();
+    }
+    
+    public void testPubSub() throws Exception {
+    	ReceiverComponent recListener = new ReceiverComponent();
+        container.activateComponent(createReceiverAS("receiver",recListener));
+        sender.sendMessages(1);
+        recListener.getMessageList().assertMessagesReceived(1);
+    }
+    
+    public void testPubSubFiltered() throws Exception {
+    	ReceiverComponent recListener = new ReceiverComponent();
+        container.activateComponent(createReceiverASFiltered("receiver",recListener));
+        sender.sendMessages(1, false);
+        recListener.getMessageList().assertMessagesReceived(1);
+    }
+
+    private ActivationSpec createReceiverAS(String id, Object component) {
+        ActivationSpec as = new ActivationSpec(id, component);
+        SubscriptionSpec ss = new SubscriptionSpec();
+        ss.setService(new QName("http://www.test.com","source"));
+        as.setSubscriptions(new SubscriptionSpec[] { ss });
+        as.setFailIfNoDestinationEndpoint(false);
+        return as;
+    }
+
+    private ActivationSpec createReceiverASFiltered(String id, Object component) {
+        ActivationSpec as = new ActivationSpec(id, component);
+        SubscriptionSpec ss = new SubscriptionSpec();
+        ss.setService(new QName("http://www.test.com","source"));
+        ss.setFilter(new Filter());
+        as.setSubscriptions(new SubscriptionSpec[] { ss });
+        as.setFailIfNoDestinationEndpoint(false);
+        return as;
+    }
+
+    public static class Filter implements SubscriptionFilter {
+
+        public boolean matches(MessageExchange arg0) {
+            System.out.println("Matches");
+            return true;
+        }
+        
+    }
+}

Propchange: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/PubSubTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/util/FileUtilTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/util/FileUtilTest.java?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/util/FileUtilTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/util/FileUtilTest.java Tue Feb 21 15:40:05 2006
@@ -1,116 +1,116 @@
-/*
- * 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.jbi.util;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-public class FileUtilTest extends TestCase {
-
-	private static File WORKDIR = new File("target/servicemix-test");
-	
-	protected void setUp() throws Exception {
-		FileUtil.deleteFile(WORKDIR);
-		WORKDIR.mkdirs();
-	}
-	
-	public void testDeleteFile() throws Exception {
-		File f = new File(WORKDIR, "test.txt");
-		assertFalse(f.exists());
-		assertTrue(f.createNewFile());
-		assertTrue(f.exists());
-		assertFalse(f.isDirectory());
-		assertTrue(f.isFile());
-		assertTrue(FileUtil.deleteFile(f));
-		assertFalse(f.exists());
-	}
-	
-	/*
-	 * This test only works on windows, as
-	 * writing to a file does not prevent its 
-	 * deletion on unix systems.
-	 *
-	public void testDeleteLockedFile() throws Exception {
-		File f = new File(WORKDIR, "test.txt");
-		assertFalse(f.exists());
-		OutputStream os = new FileOutputStream(f);
-		try {
-			Writer w = new OutputStreamWriter(os);
-			w.write("hello");
-			w.flush();
-			assertTrue(f.exists());
-			assertFalse(FileUtil.deleteFile(f));
-			assertTrue(f.exists());
-		} finally {
-			os.close();
-		}
-		assertTrue(f.exists());
-		assertTrue(FileUtil.deleteFile(f));
-		assertFalse(f.exists());
-	}
-	*/
-	
-	public void testDeleteDir() throws Exception {
-		File f = new File(WORKDIR, "testdir");
-		assertFalse(f.exists());
-		assertTrue(f.mkdir());
-		assertTrue(f.exists());
-		assertTrue(f.isDirectory());
-		assertFalse(f.isFile());
-		assertTrue(FileUtil.deleteFile(f));
-		assertFalse(f.exists());
-	}
-	
-	/*
-	 * This test only works on windows, as
-	 * writing to a file does not prevent its 
-	 * deletion on unix systems.
-	 *
-	public void testDeleteDirWithLockedFile() throws Exception {
-		File f = new File(WORKDIR, "testdir");
-		assertFalse(f.exists());
-		assertTrue(f.mkdir());
-		assertTrue(f.exists());
-		assertTrue(f.isDirectory());
-		assertFalse(f.isFile());
-		File f2 = new File(f, "test.txt");
-		assertFalse(f2.exists());
-		File f3 = new File(f, "test2.txt");
-		assertFalse(f3.exists());
-		assertTrue(f3.createNewFile());
-		assertTrue(f3.exists());
-		OutputStream os = new FileOutputStream(f2);
-		try {
-			Writer w = new OutputStreamWriter(os);
-			w.write("hello");
-			w.flush();
-			assertTrue(f2.exists());
-			assertFalse(FileUtil.deleteFile(f));
-			assertTrue(f.exists());
-			assertTrue(f2.exists());
-		} finally {
-			os.close();
-		}
-		assertFalse(f3.exists());
-		assertTrue(f2.exists());
-		assertTrue(f.exists());
-		assertTrue(FileUtil.deleteFile(f));
-		assertFalse(f.exists());
-	}
-	*/
-	
-}
+/*
+ * 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.jbi.util;
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+public class FileUtilTest extends TestCase {
+
+	private static File WORKDIR = new File("target/servicemix-test");
+	
+	protected void setUp() throws Exception {
+		FileUtil.deleteFile(WORKDIR);
+		WORKDIR.mkdirs();
+	}
+	
+	public void testDeleteFile() throws Exception {
+		File f = new File(WORKDIR, "test.txt");
+		assertFalse(f.exists());
+		assertTrue(f.createNewFile());
+		assertTrue(f.exists());
+		assertFalse(f.isDirectory());
+		assertTrue(f.isFile());
+		assertTrue(FileUtil.deleteFile(f));
+		assertFalse(f.exists());
+	}
+	
+	/*
+	 * This test only works on windows, as
+	 * writing to a file does not prevent its 
+	 * deletion on unix systems.
+	 *
+	public void testDeleteLockedFile() throws Exception {
+		File f = new File(WORKDIR, "test.txt");
+		assertFalse(f.exists());
+		OutputStream os = new FileOutputStream(f);
+		try {
+			Writer w = new OutputStreamWriter(os);
+			w.write("hello");
+			w.flush();
+			assertTrue(f.exists());
+			assertFalse(FileUtil.deleteFile(f));
+			assertTrue(f.exists());
+		} finally {
+			os.close();
+		}
+		assertTrue(f.exists());
+		assertTrue(FileUtil.deleteFile(f));
+		assertFalse(f.exists());
+	}
+	*/
+	
+	public void testDeleteDir() throws Exception {
+		File f = new File(WORKDIR, "testdir");
+		assertFalse(f.exists());
+		assertTrue(f.mkdir());
+		assertTrue(f.exists());
+		assertTrue(f.isDirectory());
+		assertFalse(f.isFile());
+		assertTrue(FileUtil.deleteFile(f));
+		assertFalse(f.exists());
+	}
+	
+	/*
+	 * This test only works on windows, as
+	 * writing to a file does not prevent its 
+	 * deletion on unix systems.
+	 *
+	public void testDeleteDirWithLockedFile() throws Exception {
+		File f = new File(WORKDIR, "testdir");
+		assertFalse(f.exists());
+		assertTrue(f.mkdir());
+		assertTrue(f.exists());
+		assertTrue(f.isDirectory());
+		assertFalse(f.isFile());
+		File f2 = new File(f, "test.txt");
+		assertFalse(f2.exists());
+		File f3 = new File(f, "test2.txt");
+		assertFalse(f3.exists());
+		assertTrue(f3.createNewFile());
+		assertTrue(f3.exists());
+		OutputStream os = new FileOutputStream(f2);
+		try {
+			Writer w = new OutputStreamWriter(os);
+			w.write("hello");
+			w.flush();
+			assertTrue(f2.exists());
+			assertFalse(FileUtil.deleteFile(f));
+			assertTrue(f.exists());
+			assertTrue(f2.exists());
+		} finally {
+			os.close();
+		}
+		assertFalse(f3.exists());
+		assertTrue(f2.exists());
+		assertTrue(f.exists());
+		assertTrue(FileUtil.deleteFile(f));
+		assertFalse(f.exists());
+	}
+	*/
+	
+}

Propchange: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/util/FileUtilTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-core/src/test/resources/log4j-tests.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/resources/log4j-tests.properties?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/resources/log4j-tests.properties (original)
+++ incubator/servicemix/trunk/servicemix-core/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-core/src/test/resources/log4j-tests.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/installation/sa1-jbi.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/installation/sa1-jbi.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/installation/sa1-jbi.xml (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/installation/sa1-jbi.xml Tue Feb 21 15:40:05 2006
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbi xmlns="http://java.sun.com/xml/ns/jbi" 
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jbi" 
-     version="1.0">
-  <component type="service-engine">
-    <identification>
-      <name>component2</name>
-      <description>component2</description>
-    </identification>
-    <component-class-name description="component2">org.apache.servicemix.jbi.installation.Component2</component-class-name>
-    <component-class-path>
-    </component-class-path>
-    <bootstrap-class-name>org.apache.servicemix.jbi.installation.Bootstrap2</bootstrap-class-name>
-    <bootstrap-class-path>
-    </bootstrap-class-path>
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<jbi xmlns="http://java.sun.com/xml/ns/jbi" 
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jbi" 
+     version="1.0">
+  <component type="service-engine">
+    <identification>
+      <name>component2</name>
+      <description>component2</description>
+    </identification>
+    <component-class-name description="component2">org.apache.servicemix.jbi.installation.Component2</component-class-name>
+    <component-class-path>
+    </component-class-path>
+    <bootstrap-class-name>org.apache.servicemix.jbi.installation.Bootstrap2</bootstrap-class-name>
+    <bootstrap-class-path>
+    </bootstrap-class-path>
+  </component>
 </jbi>

Propchange: incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/installation/sa1-jbi.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/jaxp/test.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/jaxp/test.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/jaxp/test.xml (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/jaxp/test.xml Tue Feb 21 15:40:05 2006
@@ -1,9 +1,9 @@
-<?xml version="1.0"?>
-<test firstAtt="toto" secondAtt="titit" xmlns:u="uri:test3">
-  <u:hello u:id="3">world</u:hello>
-  <!-- A comment -->
-  <child xmlns="uri:test" atr1="val1" xmlns:t="uri:test2" t:atr2="val2">
-    <child2> t i u </child2>
-    <child3 xmlns=""/>
-  </child>
+<?xml version="1.0"?>
+<test firstAtt="toto" secondAtt="titit" xmlns:u="uri:test3">
+  <u:hello u:id="3">world</u:hello>
+  <!-- A comment -->
+  <child xmlns="uri:test" atr1="val1" xmlns:t="uri:test2" t:atr2="val2">
+    <child2> t i u </child2>
+    <child3 xmlns=""/>
+  </child>
 </test>

Propchange: incubator/servicemix/trunk/servicemix-core/src/test/resources/org/apache/servicemix/jbi/jaxp/test.xml
------------------------------------------------------------------------------
    svn:eol-style = native

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

Modified: incubator/servicemix/trunk/servicemix-gbean/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-gbean/project.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-gbean/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-gbean/project.xml Tue Feb 21 15:40:05 2006
@@ -1,136 +1,136 @@
-<?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.
-    
--->
-
-<!DOCTYPE project>
-<project>
-    <pomVersion>3</pomVersion>
-    <extend>${basedir}/../etc/project.xml</extend>
-
-    <name>ServiceMix :: GBeans</name>
-    <id>servicemix-gbean</id>
-    <shortDescription>Geronimo / GBean support</shortDescription>
-    <description>ServiceMix GBeans used for integration into Apache Geronimo</description>
-  
-    <package>org.apache.servicemix.gbean</package>
-    <packageGroups>
-      <packageGroup>
-        <title>Geronimo / GBean support</title>
-        <packages>org.apache.servicemix.gbean</packages>
-      </packageGroup>
-    </packageGroups>
- 
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-    <dependencies>
-    
-      <dependency>
-        <groupId>${pom.groupId}</groupId>
-        <artifactId>servicemix-jbi</artifactId>
-        <version>${pom.currentVersion}</version>
-        <properties>
-          <eclipse.dependency>true</eclipse.dependency>
-        </properties>
-      </dependency>
-      <dependency>
-        <groupId>${pom.groupId}</groupId>
-        <artifactId>servicemix-core</artifactId>
-        <version>${pom.currentVersion}</version>
-        <properties>
-          <eclipse.dependency>true</eclipse.dependency>
-        </properties>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-spring</artifactId>
-        <version>${xbean_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>springframework</groupId>
-        <artifactId>spring</artifactId>
-        <version>${spring_version}</version>
-      </dependency>      
-      <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>${commons_logging_version}</version>
-      </dependency>
-      
-      <!-- Geronimo JARs -->
-      <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-kernel</artifactId>
-        <version>${geronimo_kernel_version}</version>
-      </dependency>      
-      <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-deployment</artifactId>
-        <version>${geronimo_deployment_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-common</artifactId>
-        <version>${geronimo_common_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-j2ee</artifactId>
-        <version>${geronimo_j2ee_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-transaction</artifactId>
-        <version>${geronimo_transaction_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-        <version>${geronimo_spec_jta_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-        <version>${geronimo_spec_j2ee_connector_version}</version>
-      </dependency>
-      <!-- dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-system</artifactId>
-        <version>${geronimo_system_version}</version>
-      </dependency -->
-      <!-- dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-connector</artifactId>
-        <version>${geronimo_connector_version}</version>
-      </dependency -->      
-
-      <dependency>
-        <groupId>jencks</groupId>
-        <artifactId>jencks</artifactId>
-        <version>${jencks_version}</version>
-      </dependency>
-
-      <!-- dependency>
-        <groupId>mx4j</groupId>
-        <artifactId>mx4j</artifactId>
-        <version>${mx4j_version}</version>
-      </dependency -->
-      
-    </dependencies>  
-</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.
+    
+-->
+
+<!DOCTYPE project>
+<project>
+    <pomVersion>3</pomVersion>
+    <extend>${basedir}/../etc/project.xml</extend>
+
+    <name>ServiceMix :: GBeans</name>
+    <id>servicemix-gbean</id>
+    <shortDescription>Geronimo / GBean support</shortDescription>
+    <description>ServiceMix GBeans used for integration into Apache Geronimo</description>
+  
+    <package>org.apache.servicemix.gbean</package>
+    <packageGroups>
+      <packageGroup>
+        <title>Geronimo / GBean support</title>
+        <packages>org.apache.servicemix.gbean</packages>
+      </packageGroup>
+    </packageGroups>
+ 
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+    <dependencies>
+    
+      <dependency>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>servicemix-jbi</artifactId>
+        <version>${pom.currentVersion}</version>
+        <properties>
+          <eclipse.dependency>true</eclipse.dependency>
+        </properties>
+      </dependency>
+      <dependency>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>servicemix-core</artifactId>
+        <version>${pom.currentVersion}</version>
+        <properties>
+          <eclipse.dependency>true</eclipse.dependency>
+        </properties>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-spring</artifactId>
+        <version>${xbean_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>springframework</groupId>
+        <artifactId>spring</artifactId>
+        <version>${spring_version}</version>
+      </dependency>      
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>${commons_logging_version}</version>
+      </dependency>
+      
+      <!-- Geronimo JARs -->
+      <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-kernel</artifactId>
+        <version>${geronimo_kernel_version}</version>
+      </dependency>      
+      <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-deployment</artifactId>
+        <version>${geronimo_deployment_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-common</artifactId>
+        <version>${geronimo_common_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-j2ee</artifactId>
+        <version>${geronimo_j2ee_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-transaction</artifactId>
+        <version>${geronimo_transaction_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+        <version>${geronimo_spec_jta_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+        <version>${geronimo_spec_j2ee_connector_version}</version>
+      </dependency>
+      <!-- dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-system</artifactId>
+        <version>${geronimo_system_version}</version>
+      </dependency -->
+      <!-- dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-connector</artifactId>
+        <version>${geronimo_connector_version}</version>
+      </dependency -->      
+
+      <dependency>
+        <groupId>jencks</groupId>
+        <artifactId>jencks</artifactId>
+        <version>${jencks_version}</version>
+      </dependency>
+
+      <!-- dependency>
+        <groupId>mx4j</groupId>
+        <artifactId>mx4j</artifactId>
+        <version>${mx4j_version}</version>
+      </dependency -->
+      
+    </dependencies>  
+</project>

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

Modified: incubator/servicemix/trunk/servicemix-gbean/src/main/resources/META-INF/DISCLAIMER.txt
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-gbean/src/main/resources/META-INF/DISCLAIMER.txt?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-gbean/src/main/resources/META-INF/DISCLAIMER.txt (original)
+++ incubator/servicemix/trunk/servicemix-gbean/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-gbean/src/main/resources/META-INF/DISCLAIMER.txt
------------------------------------------------------------------------------
    svn:eol-style = native

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

Modified: incubator/servicemix/trunk/servicemix-http/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/maven.xml?rev=379627&r1=379626&r2=379627&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/maven.xml (original)
+++ incubator/servicemix/trunk/servicemix-http/maven.xml Tue Feb 21 15:40:05 2006
@@ -1,52 +1,52 @@
-<?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:ant="jelly:ant"
-    xmlns:artifact="artifact">
-
-  <!-- redefined "build" goal from parent pom -->
-  <goal name="default" prereqs="clean, jar:install, jbi:install"/>  
-  <goal name="nightly" prereqs="clean, jar:install, jbi:install, jar:deploy, jbi:deploy"/>
-
-  <postGoal name="java:compile">
-    <attainGoal name="xbean:generate" />
-  </postGoal>
-
-  <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-http-${pom.currentVersion}.xsd" namespace="http://servicemix.apache.org/http/1.0"
-    		classpathref="test.classpath" srcdir="${basedir}/src/main/java"  metaInfDir="${basedir}/target/generated/"/>
-  	<copy file="${basedir}/target/servicemix-http-${pom.currentVersion}.xsd" todir="${basedir}/target/generated/"/>
-  	<copy file="${basedir}/target/servicemix-http-${pom.currentVersion}.xsd" todir="${basedir}/../xdocs"/>    
-    <copy file="${basedir}/target/servicemix-http-${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:ant="jelly:ant"
+    xmlns:artifact="artifact">
+
+  <!-- redefined "build" goal from parent pom -->
+  <goal name="default" prereqs="clean, jar:install, jbi:install"/>  
+  <goal name="nightly" prereqs="clean, jar:install, jbi:install, jar:deploy, jbi:deploy"/>
+
+  <postGoal name="java:compile">
+    <attainGoal name="xbean:generate" />
+  </postGoal>
+
+  <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-http-${pom.currentVersion}.xsd" namespace="http://servicemix.apache.org/http/1.0"
+    		classpathref="test.classpath" srcdir="${basedir}/src/main/java"  metaInfDir="${basedir}/target/generated/"/>
+  	<copy file="${basedir}/target/servicemix-http-${pom.currentVersion}.xsd" todir="${basedir}/target/generated/"/>
+  	<copy file="${basedir}/target/servicemix-http-${pom.currentVersion}.xsd" todir="${basedir}/../xdocs"/>    
+    <copy file="${basedir}/target/servicemix-http-${pom.currentVersion}.xsd.html" todir="${basedir}/../xdocs"/>
+  </goal>
+  
+</project>

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