[jboss-cvs] JBossAS SVN: r97030 - in projects/jboss-osgi/trunk: testsuite and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-11-26 09:42:11 -0500 (Thu, 26 Nov 2009)
New Revision: 97030

Modified:
   projects/jboss-osgi/trunk/pom.xml
   projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties
   projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java
   projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Update dependencies

Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml	2009-11-26 14:41:11 UTC (rev 97029)
+++ projects/jboss-osgi/trunk/pom.xml	2009-11-26 14:42:11 UTC (rev 97030)
@@ -49,7 +49,7 @@
     <version.apache.felix.log>1.0.0</version.apache.felix.log>
     <version.apache.felix.metatype>1.0.2</version.apache.felix.metatype>
     <version.izpack>4.3.1</version.izpack>
-    <version.jboss.osgi.apache.xerces>2.9.1.SP2</version.jboss.osgi.apache.xerces>
+    <version.jboss.osgi.apache.xerces>2.9.1-SNAPSHOT</version.jboss.osgi.apache.xerces>
     <version.jboss.osgi.blueprint>1.0.0.Alpha3</version.jboss.osgi.blueprint>
     <version.jboss.osgi.common>1.0.3</version.jboss.osgi.common>
     <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
@@ -57,7 +57,7 @@
     <version.jboss.osgi.framework>1.0.0.Alpha2-SNAPSHOT</version.jboss.osgi.framework>
     <version.jboss.osgi.hotdeploy>1.0.3</version.jboss.osgi.hotdeploy>
     <version.jboss.osgi.husky>1.0.2-SNAPSHOT</version.jboss.osgi.husky>
-    <version.jboss.osgi.jaxb>2.1.10.SP2</version.jboss.osgi.jaxb>
+    <version.jboss.osgi.jaxb>2.1.10-SNAPSHOT</version.jboss.osgi.jaxb>
     <version.jboss.osgi.jmx>1.0.2</version.jboss.osgi.jmx>
     <version.jboss.osgi.jndi>1.0.1</version.jboss.osgi.jndi>
     <version.jboss.osgi.jta>1.0.0</version.jboss.osgi.jta>
@@ -69,7 +69,7 @@
     <version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi>
     <version.jboss.osgi.webapp>0.7.2-SNAPSHOT</version.jboss.osgi.webapp>
     <version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole>
-    <version.jboss.osgi.xml.binding>2.0.1-SNAPSHOT</version.jboss.osgi.xml.binding>
+    <version.jboss.osgi.xml.binding>2.0.2-SNAPSHOT</version.jboss.osgi.xml.binding>
     <version.ops4j.pax.web>0.7.2-SNAPSHOT</version.ops4j.pax.web>
     <version.osgi>4.2.0</version.osgi>
     

Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties	2009-11-26 14:41:11 UTC (rev 97029)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties	2009-11-26 14:42:11 UTC (rev 97030)
@@ -32,11 +32,11 @@
   	org.jboss.osgi.spi.management;version=1.0, \
   	org.jboss.osgi.spi.service;version=1.0, \
   	org.jboss.osgi.spi.util;version=1.0, \
-  	org.jboss.virtual, \
-  	org.jboss.virtual.plugins.registry, \
-  	org.jboss.virtual.plugins.context.jar, \
-  	org.jboss.virtual.plugins.vfs.helpers, \
-  	org.jboss.virtual.protocol, \
+  	org.jboss.virtual;version=2.1, \
+  	org.jboss.virtual.plugins.registry;version=2.1, \
+  	org.jboss.virtual.plugins.context.jar;version=2.1, \
+  	org.jboss.virtual.plugins.vfs.helpers;version=2.1, \
+  	org.jboss.virtual.protocol;version=2.1, \
   	org.osgi.framework;version=1.5
   	
 

Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java	2009-11-26 14:41:11 UTC (rev 97029)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/capabilities/CapabilityTestCase.java	2009-11-26 14:42:11 UTC (rev 97030)
@@ -35,8 +35,8 @@
 
 import org.jboss.osgi.jaxb.JAXBCapability;
 import org.jboss.osgi.jaxb.JAXBService;
+import org.jboss.osgi.jbossxb.UnmarshallerService;
 import org.jboss.osgi.jbossxb.XMLBindingCapability;
-import org.jboss.osgi.jbossxb.XMLBindingService;
 import org.jboss.osgi.jmx.JMXCapability;
 import org.jboss.osgi.jndi.JNDICapability;
 import org.jboss.osgi.spi.capability.LogServiceCapability;
@@ -128,8 +128,8 @@
          
          runtime.addCapability(new XMLBindingCapability());
          
-         OSGiServiceReference saxRef = runtime.getServiceReference(XMLBindingService.class.getName());
-         assertNotNull("XMLBindingService registered", saxRef);
+         OSGiServiceReference saxRef = runtime.getServiceReference(UnmarshallerService.class.getName());
+         assertNotNull("UnmarshallerService registered", saxRef);
       }
       finally
       {

Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml	2009-11-26 14:41:11 UTC (rev 97029)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml	2009-11-26 14:42:11 UTC (rev 97030)
@@ -130,9 +130,19 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.osgi.bundles</groupId>
+      <artifactId>jboss-osgi-microcontainer</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.osgi.bundles</groupId>
       <artifactId>jboss-osgi-webapp</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.osgi.bundles</groupId>
+      <artifactId>jboss-osgi-xml-binding</artifactId>
+      <scope>provided</scope>
+    </dependency>
 
     <!-- OPS4J -->
     <dependency>