[servicemix-scm] Fixed the shared library testcase

[pdodds]

Commit in servicemix/base/src on MAIN
test/resources/org/servicemix/jbi/deployment/SharedLibrary.xml	+14	-16	1.1 -> 1.2
main/java/org/servicemix/jbi/deployment/impl/JbiNamespaceProcessor.java	+5	-2	1.5 -> 1.6
	+19	-18

2 modified files

Fixed the shared library testcase

---

servicemix/base/src/test/resources/org/servicemix/jbi/deployment

SharedLibrary.xml 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- SharedLibrary.xml	19 Aug 2005 12:54:21 -0000	1.1
+++ SharedLibrary.xml	19 Aug 2005 16:22:54 -0000	1.2
@@ -1,20 +1,18 @@

 <?xml version="1.0"?>
 <!-- jbi.xml file for a sample shared library. -->

-<jbi
-    version="1.0"
-    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 ./jbi.xsd">

+<jbi version="1.0" 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 ./jbi.xsd">

 

-<!-- identification information about this shared library-->
-    <shared-library>
-        <identification>
-            <name>TestSharedLibrary</name>
-            <description>This is a test shared library.</description>
-        </identification>
-        <shared-library-class-path>
-            <path-element>.</path-element>
-            <path-element>test.jar</path-element>
-         </shared-library-class-path>
-    </shared-library>

+	<!-- identification information about this shared library-->
+	<shared-library>
+		<identification>
+			<name>TestSharedLibrary</name>
+			<description>This is a test shared library.</description>
+		</identification>
+		<shared-library-class-path>
+			<path-element>.</path-element>
+			<path-element>test.jar</path-element>
+		</shared-library-class-path>
+	</shared-library>

 </jbi>

---

servicemix/base/src/main/java/org/servicemix/jbi/deployment/impl

JbiNamespaceProcessor.java 1.5 -> 1.6

diff -u -r1.5 -r1.6
--- JbiNamespaceProcessor.java	8 Aug 2005 00:42:57 -0000	1.5
+++ JbiNamespaceProcessor.java	19 Aug 2005 16:22:57 -0000	1.6
@@ -31,11 +31,12 @@

 import org.servicemix.jbi.deployment.ServiceAssembly;
 import org.servicemix.jbi.deployment.ServiceUnit;
 import org.servicemix.jbi.deployment.Services;

+import org.servicemix.jbi.deployment.SharedLibrary;

 import org.servicemix.jbi.deployment.SharedLibraryList;
 import org.servicemix.jbi.deployment.Target;
 
 /**

- * @version $Revision: 1.5 $

+ * @version $Revision: 1.6 $

  */
 public class JbiNamespaceProcessor extends CompositeElementProcessor {
 	public static final String JBI_NAMESPACE = "http://java.sun.com/xml/ns/jbi";

@@ -66,7 +67,9 @@

 		registerBeanPropertyProcessor("services", Services.class);
 		registerBeanProcessor("service-unit", ServiceUnit.class);
 		registerBeanPropertyProcessor("target", Target.class);

-

+		registerBeanPropertyProcessor("shared-library", SharedLibrary.class);
+		registerBeanPropertyProcessor("shared-library-class-path", ClassPath.class);
+		

 		sharedListProcessor = registerBeanProcessor("shared-library-list",
 				SharedLibraryList.class, "name");
 	}

CVSspam 0.2.8