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

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

Author: thomas.diesler at jboss.com
Date: 2010-04-07 05:46:57 -0400 (Wed, 07 Apr 2010)
New Revision: 103623

Modified:
   projects/jboss-osgi/trunk/pom.xml
   projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/processor/PublisherInterceptor.java
   projects/jboss-osgi/trunk/testsuite/example/src/test/resources/log4j.xml
   projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Fix HttpService binding to user bundle.
Update to jboss-osgi-deployer-1.0.7-SNAPSHOT
Fix remote runtime test suite

Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml	2010-04-07 09:44:09 UTC (rev 103622)
+++ projects/jboss-osgi/trunk/pom.xml	2010-04-07 09:46:57 UTC (rev 103623)
@@ -58,7 +58,7 @@
     <version.jboss.osgi.blueprint>1.0.0.Beta2</version.jboss.osgi.blueprint>
     <version.jboss.osgi.common>1.0.4</version.jboss.osgi.common>
     <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
-    <version.jboss.osgi.deployers>1.0.6</version.jboss.osgi.deployers>
+    <version.jboss.osgi.deployers>1.0.7-SNAPSHOT</version.jboss.osgi.deployers>
     <version.jboss.osgi.deployment>1.0.2</version.jboss.osgi.deployment>
     <version.jboss.osgi.equinox>3.5.2</version.jboss.osgi.equinox>
     <version.jboss.osgi.felix>2.0.4</version.jboss.osgi.felix>

Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/processor/PublisherInterceptor.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/processor/PublisherInterceptor.java	2010-04-07 09:44:09 UTC (rev 103622)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/interceptor/processor/PublisherInterceptor.java	2010-04-07 09:46:57 UTC (rev 103623)
@@ -96,12 +96,12 @@
 
    private HttpService getHttpService(InvocationContext context, boolean required)
    {
-      BundleContext syscontext = context.getSystemContext();
-      ServiceReference sref = syscontext.getServiceReference(HttpService.class.getName());
+      BundleContext bndContext = context.getBundle().getBundleContext();
+      ServiceReference sref = bndContext.getServiceReference(HttpService.class.getName());
       if (sref == null && required == true)
          throw new IllegalStateException("Required HttpService not available");
 
-      HttpService httpService = (HttpService)syscontext.getService(sref);
+      HttpService httpService = (HttpService)bndContext.getService(sref);
       return httpService;
    }
 }

Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/log4j.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/log4j.xml	2010-04-07 09:44:09 UTC (rev 103622)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/log4j.xml	2010-04-07 09:46:57 UTC (rev 103623)
@@ -32,10 +32,11 @@
   <!-- Limit categories -->
   <!-- ================ -->
 
-  <!-- Show jboss deployer traces -->  
+  <!-- Show jboss traces - ->  
   <category name="org.jboss">
     <priority value="TRACE" />
   </category>
+  -->
 
   <!-- ======================= -->
   <!-- Setup the Root category -->

Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml	2010-04-07 09:44:09 UTC (rev 103622)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml	2010-04-07 09:46:57 UTC (rev 103623)
@@ -427,14 +427,6 @@
       <properties>
         <target.container.excludes>org/jboss/test/osgi/jbossas/**</target.container.excludes>
       </properties>
-      <dependencies>
-        <dependency>
-          <groupId>org.jboss.osgi.runtime</groupId>
-          <artifactId>jmx-invoker-adaptor-client</artifactId>
-          <version>${version.jmx.invoker.adaptor.client}</version>
-          <type>pom</type>
-        </dependency>
-      </dependencies>
     </profile>
 
     <!--