[jboss-osgi-commits] JBoss-OSGI SVN: r89596 - in projects/jboss-osgi/trunk: 3rdparty/jaxb/src/main/java/org/jboss/osgi/jaxb/internal and 30 other directories.

Monday, 1 June 2009

Author: thomas.diesler(a)jboss.com
Date: 2009-06-01 07:44:11 -0400 (Mon, 01 Jun 2009)
New Revision: 89596

Added:
  
projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/log/SystemLogService.java
  
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/management/ManagedBundleService.java
  
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/BlueprintService.java
  
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/JAXBService.java
  
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/RemoteLogService.java
  
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/XMLBindingService.java
  
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/BlueprintCapability.java
   projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/Capability.java
  
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/ConfigAdminCapability.java
  
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/HttpCapability.java
  
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/HuskyCapability.java
  
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/JAXBCapability.java
  
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/JMXCapability.java
  
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/JNDICapability.java
  
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/MicrocontainerCapability.java
  
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/RemoteLogCapability.java
  
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/XMLBindingCapability.java
  
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/XMLParserCapability.java
Removed:
   projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/service/
   projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/capability/
Modified:
   projects/jboss-osgi/trunk/3rdparty/jaxb/.project
   projects/jboss-osgi/trunk/3rdparty/jaxb/pom.xml
  
projects/jboss-osgi/trunk/3rdparty/jaxb/src/main/java/org/jboss/osgi/jaxb/internal/JAXBServiceActivator.java
   projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/pom.xml
  
projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java
  
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/extender/BlueprintActivator.java
  
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context/BlueprintContextTestCase.java
  
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/context/context-basic.bnd
   projects/jboss-osgi/trunk/bundles/common/pom.xml
  
projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/internal/SystemDeployerService.java
  
projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/log/LogServiceTracker.java
  
projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java
  
projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleServiceImpl.java
   projects/jboss-osgi/trunk/bundles/remotelog/pom.xml
  
projects/jboss-osgi/trunk/bundles/remotelog/src/main/java/org/jboss/osgi/service/remotelog/internal/RemoteLogServiceActivator.java
   projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties
  
projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java
   projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/context/context-basic.bnd
  
projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml
  
projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml
  
projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml
  
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java
  
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java
  
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java
  
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java
  
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java
  
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java
  
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java
  
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java
  
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/bootstrap/CapabilityTestCase.java
  
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java
  
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGI36TestCase.java
Log:
Refactor Capabilities

Modified: projects/jboss-osgi/trunk/3rdparty/jaxb/.project
===================================================================

--- projects/jboss-osgi/trunk/3rdparty/jaxb/.project	2009-06-01 11:16:00 UTC (rev 89595)
+++ projects/jboss-osgi/trunk/3rdparty/jaxb/.project	2009-06-01 11:44:11 UTC (rev 89596)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>apache-xerces-bundle</name>
+	<name>jboss-osgi-jaxb</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -17,7 +17,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 	</natures>
 </projectDescription>

Modified: projects/jboss-osgi/trunk/3rdparty/jaxb/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/3rdparty/jaxb/pom.xml	2009-06-01 11:16:00 UTC (rev 89595)
+++ projects/jboss-osgi/trunk/3rdparty/jaxb/pom.xml	2009-06-01 11:44:11 UTC (rev 89596)
@@ -21,6 +21,11 @@
 
   <dependencies>
     <dependency>
+      <groupId>org.jboss.osgi</groupId>
+      <artifactId>jboss-osgi-spi</artifactId>
+    </dependency>
+    
+    <dependency>
       <groupId>com.sun.xml.bind</groupId>
       <artifactId>jaxb-impl</artifactId>
       <version>${version.xml.bind}</version>
@@ -71,7 +76,7 @@
 
               <!-- import -->
               org.jboss.osgi.common.log;version=1.0, 
-              org.jboss.osgi.common.service;version=1.0, 
+              org.jboss.osgi.spi.service;version=1.0, 
               org.osgi.framework, 
               org.osgi.service.log,
               

Modified:
projects/jboss-osgi/trunk/3rdparty/jaxb/src/main/java/org/jboss/osgi/jaxb/internal/JAXBServiceActivator.java
===================================================================
---
projects/jboss-osgi/trunk/3rdparty/jaxb/src/main/java/org/jboss/osgi/jaxb/internal/JAXBServiceActivator.java	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/3rdparty/jaxb/src/main/java/org/jboss/osgi/jaxb/internal/JAXBServiceActivator.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -24,7 +24,7 @@
 //$Id$
 
 import org.jboss.osgi.common.log.LogServiceTracker;
-import org.jboss.osgi.common.service.JAXBService;
+import org.jboss.osgi.spi.service.JAXBService;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.log.LogService;

Modified: projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/pom.xml	2009-06-01 11:16:00 UTC
(rev 89595)
+++ projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/pom.xml	2009-06-01 11:44:11 UTC
(rev 89596)
@@ -41,6 +41,11 @@
       <artifactId>jboss-osgi-common</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.osgi.bundles</groupId>
+      <artifactId>jboss-osgi-jaxb</artifactId>
+      <scope>provided</scope>
+    </dependency>
     
     <!-- Provided Dependencies -->
     <dependency>
@@ -79,7 +84,7 @@
               org.apache.xerces.*, 
               org.jboss.logging,
               org.jboss.osgi.common.log;version=1.0,
-              org.jboss.osgi.common.service;version=1.0,
+              org.jboss.osgi.spi.service;version=1.0,
               org.jboss.util*, 
               org.osgi.framework, 
               org.osgi.service.log,

Modified:
projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java
===================================================================
---
projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/3rdparty/jboss-xml-binding/src/main/java/org/jboss/osgi/jbossxb/internal/XMLBindingActivator.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -27,7 +27,7 @@
 import javax.xml.parsers.SAXParserFactory;
 
 import org.jboss.osgi.common.log.LogServiceTracker;
-import org.jboss.osgi.common.service.XMLBindingService;
+import org.jboss.osgi.spi.service.XMLBindingService;
 import org.jboss.xb.binding.parser.sax.SaxJBossXBParser;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;

Modified:
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/extender/BlueprintActivator.java
===================================================================
---
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/extender/BlueprintActivator.java	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/blueprint/impl/src/main/java/org/jboss/osgi/blueprint/extender/BlueprintActivator.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -23,7 +23,7 @@
 
 //$Id$
 
-import org.jboss.osgi.common.service.BlueprintService;
+import org.jboss.osgi.spi.service.BlueprintService;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleListener;

Modified:
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context/BlueprintContextTestCase.java
===================================================================
---
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context/BlueprintContextTestCase.java	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context/BlueprintContextTestCase.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -28,12 +28,12 @@
 
 import org.jboss.osgi.husky.BridgeFactory;
 import org.jboss.osgi.husky.annotation.ProvideContext;
+import org.jboss.osgi.spi.testing.BlueprintCapability;
+import org.jboss.osgi.spi.testing.HuskyCapability;
+import org.jboss.osgi.spi.testing.MicrocontainerCapability;
 import org.jboss.osgi.spi.testing.OSGiBundle;
 import org.jboss.osgi.spi.testing.OSGiRuntime;
 import org.jboss.osgi.spi.testing.OSGiTest;
-import org.jboss.osgi.spi.testing.capability.BlueprintCapability;
-import org.jboss.osgi.spi.testing.capability.HuskyCapability;
-import org.jboss.osgi.spi.testing.capability.MicrocontainerCapability;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified:
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/context/context-basic.bnd
===================================================================
---
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/context/context-basic.bnd	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/context/context-basic.bnd	2009-06-01
11:44:11 UTC (rev 89596)
@@ -8,7 +8,6 @@
 	org.jboss.osgi.husky, \
 	org.jboss.osgi.husky.annotation, \
 	org.jboss.osgi.spi.testing, \
-	org.jboss.osgi.spi.testing.capability, \
 	org.junit, \
 	org.osgi.framework, \
 	org.osgi.service.blueprint.* 

Modified: projects/jboss-osgi/trunk/bundles/common/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundles/common/pom.xml	2009-06-01 11:16:00 UTC (rev 89595)
+++ projects/jboss-osgi/trunk/bundles/common/pom.xml	2009-06-01 11:44:11 UTC (rev 89596)
@@ -20,8 +20,8 @@
     <dependency>
       <groupId>org.jboss.osgi</groupId>
       <artifactId>jboss-osgi-spi</artifactId>
-      <scope>provided</scope>
     </dependency>
+    
     <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging-spi</artifactId>

Modified:
projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/internal/SystemDeployerService.java
===================================================================
---
projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/internal/SystemDeployerService.java	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/internal/SystemDeployerService.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -30,7 +30,7 @@
 import java.util.Map;
 
 import org.jboss.osgi.common.log.LogServiceTracker;
-import org.jboss.osgi.common.service.ManagedBundleService;
+import org.jboss.osgi.spi.management.ManagedBundleService;
 import org.jboss.osgi.spi.service.BundleInfo;
 import org.jboss.osgi.spi.service.DeployerService;
 import org.osgi.framework.Bundle;

Modified:
projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/log/LogServiceTracker.java
===================================================================
---
projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/log/LogServiceTracker.java	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/log/LogServiceTracker.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -23,7 +23,6 @@
 
 //$Id$
 
-import org.jboss.osgi.common.service.SystemLogService;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.log.LogService;

Copied:
projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/log/SystemLogService.java
(from rev 89588,
projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/service/SystemLogService.java)
===================================================================
---
projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/log/SystemLogService.java	
                       (rev 0)
+++
projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/log/SystemLogService.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -0,0 +1,115 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.common.log;
+
+//$Id$
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.log.LogService;
+
+/**
+ * A basic LogService that writes to System.out
+ * 
+ * @author thomas.diesler(a)jboss.com
+ * @since 11-Apr-2009
+ */
+public class SystemLogService implements LogService
+{
+   private BundleContext context;
+   
+   public SystemLogService(BundleContext context)
+   {
+      this.context = context;
+   }
+
+   public void log(int level, String message)
+   {
+      logInternal(null, level, message, null);
+   }
+
+   public void log(int level, String message, Throwable exception)
+   {
+      logInternal(null, level, message, exception);
+   }
+
+   public void log(ServiceReference sr, int level, String message)
+   {
+      logInternal(sr, level, message, null);
+   }
+
+   public void log(ServiceReference sr, int level, String message, Throwable exception)
+   {
+      logInternal(sr, level, message, exception);
+   }
+
+   private void logInternal(ServiceReference sref, int level, String message, Throwable
exception)
+   {
+      long time = System.currentTimeMillis();
+      Bundle bundle = context.getBundle();
+      
+      String bndStr = bundle.getSymbolicName();
+      
+      String srefStr = null;
+      if (sref != null && sref.getBundle() != null)
+         srefStr = sref.getBundle().getSymbolicName();
+      
+      String t = new SimpleDateFormat("dd-MMM-yyyy HH:mm.ss.SSS").format(new
Date(time));
+      String l = " " + logLevel(level);
+      String s = srefStr != null ? ",sref=" + srefStr : "";
+      String b = ",bnd=" + bndStr;
+      String m = ",msg=" + message;
+      String e = exception != null ? ",ex=" + exception : "";
+      
+      System.out.println("[" + t + l + b + s + m + e + "]");
+
+      if (exception != null)
+         exception.printStackTrace(System.out);
+   }
+
+   private String logLevel(int level)
+   {
+      String logLevel;
+      switch (level)
+      {
+         case LogService.LOG_DEBUG:
+            logLevel = "DEBUG";
+            break;
+         case LogService.LOG_INFO:
+            logLevel = "INFO";
+            break;
+         case LogService.LOG_WARNING:
+            logLevel = "WARN";
+            break;
+         case LogService.LOG_ERROR:
+            logLevel = "ERROR";
+            break;
+         default:
+            logLevel = "Level=" + level;
+      }
+      return logLevel;
+   }
+}
\ No newline at end of file

Modified:
projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java
===================================================================
---
projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/JMXServiceActivator.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -32,7 +32,7 @@
 import javax.naming.StringRefAddr;
 
 import org.jboss.osgi.common.log.LogServiceTracker;
-import org.jboss.osgi.common.service.ManagedBundleService;
+import org.jboss.osgi.spi.management.ManagedBundleService;
 import org.jboss.osgi.spi.management.ManagedFramework;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;

Modified:
projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleServiceImpl.java
===================================================================
---
projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleServiceImpl.java	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/bundles/jmx/src/main/java/org/jboss/osgi/jmx/internal/ManagedBundleServiceImpl.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -28,8 +28,8 @@
 import javax.management.ObjectName;
 
 import org.jboss.osgi.common.log.LogServiceTracker;
-import org.jboss.osgi.common.service.ManagedBundleService;
 import org.jboss.osgi.spi.management.ManagedBundle;
+import org.jboss.osgi.spi.management.ManagedBundleService;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.log.LogService;

Modified: projects/jboss-osgi/trunk/bundles/remotelog/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundles/remotelog/pom.xml	2009-06-01 11:16:00 UTC (rev
89595)
+++ projects/jboss-osgi/trunk/bundles/remotelog/pom.xml	2009-06-01 11:44:11 UTC (rev
89596)
@@ -62,9 +62,9 @@
            
<Export-Package>org.jboss.osgi.service.remotelog;version=${version}</Export-Package>
             <Import-Package>
               org.jboss.osgi.common.log;version=1.0, 
-              org.jboss.osgi.common.service;version=1.0, 
               org.jboss.osgi.spi;version=1.0, 
               org.jboss.osgi.spi.logging;version=1.0,
+              org.jboss.osgi.spi.service;version=1.0, 
               
               org.osgi.framework,
               org.osgi.service.log,

Modified:
projects/jboss-osgi/trunk/bundles/remotelog/src/main/java/org/jboss/osgi/service/remotelog/internal/RemoteLogServiceActivator.java
===================================================================
---
projects/jboss-osgi/trunk/bundles/remotelog/src/main/java/org/jboss/osgi/service/remotelog/internal/RemoteLogServiceActivator.java	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/bundles/remotelog/src/main/java/org/jboss/osgi/service/remotelog/internal/RemoteLogServiceActivator.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -25,9 +25,9 @@
 
 import java.util.Properties;
 
-import org.jboss.osgi.common.service.RemoteLogService;
 import org.jboss.osgi.service.remotelog.RemoteLogListener;
 import org.jboss.osgi.spi.logging.RemoteLogReaderService;
+import org.jboss.osgi.spi.service.RemoteLogService;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 

Modified: projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties
===================================================================
---
projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties	2009-06-01
11:44:11 UTC (rev 89596)
@@ -47,7 +47,6 @@
    org.jboss.osgi.spi.management;version=1.0, \
    org.jboss.osgi.spi.service;version=1.0, \
    org.jboss.osgi.spi.testing;version=1.0, \
-   org.jboss.osgi.spi.testing.capability;version=1.0, \
    org.jboss.virtual, \
    org.jboss.virtual.plugins.registry, \
    org.jboss.virtual.plugins.context.jar, \

Modified:
projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java
===================================================================
---
projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -27,11 +27,11 @@
 
 import org.jboss.osgi.husky.BridgeFactory;
 import org.jboss.osgi.husky.annotation.ProvideContext;
+import org.jboss.osgi.spi.testing.HuskyCapability;
+import org.jboss.osgi.spi.testing.JMXCapability;
 import org.jboss.osgi.spi.testing.OSGiBundle;
 import org.jboss.osgi.spi.testing.OSGiRuntime;
 import org.jboss.osgi.spi.testing.OSGiTestHelper;
-import org.jboss.osgi.spi.testing.capability.HuskyCapability;
-import org.jboss.osgi.spi.testing.capability.JMXCapability;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Modified:
projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/context/context-basic.bnd
===================================================================
---
projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/context/context-basic.bnd	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/context/context-basic.bnd	2009-06-01
11:44:11 UTC (rev 89596)
@@ -8,7 +8,6 @@
 	org.jboss.osgi.husky, \
 	org.jboss.osgi.husky.annotation, \
 	org.jboss.osgi.spi.testing, \
-	org.jboss.osgi.spi.testing.capability, \
 	org.junit, \
 	org.osgi.framework 
 

Modified:
projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
---
projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml	2009-06-01
11:44:11 UTC (rev 89596)
@@ -37,7 +37,6 @@
             org.jboss.osgi.spi.management;version=1.0,
             org.jboss.osgi.spi.service;version=1.0,
             org.jboss.osgi.spi.testing;version=1.0,
-            org.jboss.osgi.spi.testing.capability;version=1.0,
 
             <!-- jboss -->
             org.jboss.logging

Modified:
projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
---
projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml	2009-06-01
11:44:11 UTC (rev 89596)
@@ -34,7 +34,6 @@
             org.jboss.osgi.spi.management;version=1.0,
             org.jboss.osgi.spi.service;version=1.0,
             org.jboss.osgi.spi.testing;version=1.0,
-            org.jboss.osgi.spi.testing.capability;version=1.0,
             
             <!-- jboss -->
             org.jboss.logging,

Modified:
projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
---
projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml	2009-06-01
11:44:11 UTC (rev 89596)
@@ -36,7 +36,6 @@
             org.jboss.osgi.spi.management;version=1.0,
             org.jboss.osgi.spi.service;version=1.0,
             org.jboss.osgi.spi.testing;version=1.0,
-            org.jboss.osgi.spi.testing.capability;version=1.0,
             
             <!-- jboss -->
             org.jboss.logging,

Copied:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/management/ManagedBundleService.java
(from rev 89588,
projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/service/ManagedBundleService.java)
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/management/ManagedBundleService.java	
                       (rev 0)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/management/ManagedBundleService.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.management;
+
+//$Id$
+
+import org.osgi.framework.Bundle;
+
+
+/**
+ * A Service that registers/unregisters the management view 
+ * of a bundle. 
+ * 
+ * @author thomas.diesler(a)jboss.com
+ * @since 29-May-2009
+ */
+public interface ManagedBundleService
+{
+   /**
+    * Register a managed bundle
+    */
+   ManagedBundle register(Bundle bundle);
+   
+   /**
+    * Unregister a managed bundle
+    */
+   void unregister(Bundle bundle);
+}
\ No newline at end of file

Copied:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/BlueprintService.java
(from rev 89588,
projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/service/BlueprintService.java)
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/BlueprintService.java	
                       (rev 0)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/BlueprintService.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.service;
+
+//$Id$
+
+/**
+ * A marker service that is registered by jboss-osgi-blueprint
+ * 
+ * @author thomas.diesler(a)jboss.com
+ * @since 29-May-2009
+ */
+public interface BlueprintService
+{
+}
\ No newline at end of file

Copied:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/JAXBService.java
(from rev 89588,
projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/service/JAXBService.java)
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/JAXBService.java	  
                     (rev 0)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/JAXBService.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.service;
+
+//$Id$
+
+/**
+ * A marker service that is registered by jboss-osgi-jaxb
+ * 
+ * @author thomas.diesler(a)jboss.com
+ * @since 29-May-2009
+ */
+public interface JAXBService
+{
+}
\ No newline at end of file

Copied:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/RemoteLogService.java
(from rev 89588,
projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/service/RemoteLogService.java)
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/RemoteLogService.java	
                       (rev 0)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/RemoteLogService.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.service;
+
+//$Id$
+
+/**
+ * A marker service that is registered by jboss-osgi-remotelog
+ * 
+ * @author thomas.diesler(a)jboss.com
+ * @since 29-May-2009
+ */
+public interface RemoteLogService
+{
+}
\ No newline at end of file

Copied:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/XMLBindingService.java
(from rev 89588,
projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/service/XMLBindingService.java)
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/XMLBindingService.java	
                       (rev 0)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/XMLBindingService.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.service;
+
+//$Id$
+
+/**
+ * A marker service that is registered by jboss-osgi-xml-binding
+ * 
+ * @author thomas.diesler(a)jboss.com
+ * @since 29-May-2009
+ */
+public interface XMLBindingService
+{
+}
\ No newline at end of file

Copied:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/BlueprintCapability.java
(from rev 89588,
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/capability/BlueprintCapability.java)
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/BlueprintCapability.java	
                       (rev 0)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/BlueprintCapability.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.testing;
+
+import org.jboss.osgi.spi.service.BlueprintService;
+
+//$Id$
+
+/**
+ * [TODO]
+ * 
+ * @author thomas.diesler(a)jboss.com
+ * @since 05-May-2009
+ */
+public class BlueprintCapability extends Capability
+{
+   public BlueprintCapability()
+   {
+      super (BlueprintService.class.getName());
+      
+      addBundle("bundles/jboss-osgi-blueprint.jar");
+   }
+}
\ No newline at end of file

Copied:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/Capability.java
(from rev 89588,
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/capability/Capability.java)
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/Capability.java	   
                    (rev 0)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/Capability.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -0,0 +1,80 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.testing;
+
+//$Id$
+
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
+/**
+ * [TODO]
+ * 
+ * @author thomas.diesler(a)jboss.com
+ * @since 05-May-2009
+ */
+public abstract class Capability
+{
+   private String serviceName;
+   private Properties props = new Properties();
+   
+   private Set<Capability> dependencies = new LinkedHashSet<Capability>();
+   private Set<String> bundles = new LinkedHashSet<String>();
+
+   public Capability(String serviceName)
+   {
+      this.serviceName = serviceName;
+   }
+
+   public String getServiceName()
+   {
+      return serviceName;
+   }
+
+   public Properties getProperties()
+   {
+      return props;
+   }
+
+   protected void addBundle(String bundle)
+   {
+      bundles.add(bundle);
+   }
+
+   protected void addDependency(Capability dependency)
+   {
+      dependencies.add(dependency);
+   }
+
+   public List<Capability> getDependencies()
+   {
+      return new ArrayList<Capability>(dependencies);
+   }
+   
+   public List<String> getBundles()
+   {
+      return new ArrayList<String>(bundles);
+   }
+}
\ No newline at end of file

Copied:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/ConfigAdminCapability.java
(from rev 89588,
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/capability/ConfigAdminCapability.java)
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/ConfigAdminCapability.java	
                       (rev 0)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/ConfigAdminCapability.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.testing;
+
+import org.osgi.service.cm.ConfigurationAdmin;
+
+
+//$Id$
+
+/**
+ * [TODO]
+ * 
+ * @author thomas.diesler(a)jboss.com
+ * @since 05-May-2009
+ */
+public class ConfigAdminCapability extends Capability
+{
+   public ConfigAdminCapability()
+   {
+      super(ConfigurationAdmin.class.getName());
+      addBundle("bundles/org.apache.felix.metatype.jar");
+      addBundle("bundles/org.apache.felix.configadmin.jar");
+   }
+}
\ No newline at end of file

Copied:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/HttpCapability.java
(from rev 89588,
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/capability/HttpCapability.java)
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/HttpCapability.java	
                       (rev 0)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/HttpCapability.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.testing;
+
+import java.util.Properties;
+
+import org.osgi.service.http.HttpService;
+
+
+//$Id$
+
+/**
+ * [TODO]
+ * 
+ * @author thomas.diesler(a)jboss.com
+ * @since 05-May-2009
+ */
+public class HttpCapability extends Capability
+{
+   public HttpCapability()
+   {
+      super(HttpService.class.getName());
+      
+      Properties props = getProperties();
+      props.setProperty("org.osgi.service.http.port", "8090");
+
+      addBundle("bundles/org.apache.felix.http.jetty.jar");
+   }
+}
\ No newline at end of file

Copied:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/HuskyCapability.java
(from rev 89588,
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/capability/HuskyCapability.java)
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/HuskyCapability.java	
                       (rev 0)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/HuskyCapability.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.testing;
+
+//$Id$
+
+
+/**
+ * [TODO]
+ * 
+ * @author thomas.diesler(a)jboss.com
+ * @since 05-May-2009
+ */
+public class HuskyCapability extends Capability
+{
+   public HuskyCapability()
+   {
+      super("org.jboss.osgi.husky.runtime.Connector");
+      
+      addDependency(new JMXCapability());
+      addBundle("bundles/jboss-osgi-husky.jar");
+   }
+}
\ No newline at end of file

Copied:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/JAXBCapability.java
(from rev 89588,
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/capability/JAXBCapability.java)
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/JAXBCapability.java	
                       (rev 0)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/JAXBCapability.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.testing;
+
+import org.jboss.osgi.spi.service.JAXBService;
+
+//$Id$
+
+
+/**
+ * [TODO]
+ * 
+ * @author thomas.diesler(a)jboss.com
+ * @since 05-May-2009
+ */
+public class JAXBCapability extends Capability
+{
+   public JAXBCapability()
+   {
+      super(JAXBService.class.getName());
+      
+      addDependency(new XMLParserCapability());
+      addBundle("bundles/jboss-osgi-jaxb.jar");
+   }
+}
\ No newline at end of file

Copied:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/JMXCapability.java
(from rev 89588,
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/capability/JMXCapability.java)
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/JMXCapability.java	
                       (rev 0)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/JMXCapability.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.testing;
+
+//$Id$
+
+import java.util.Properties;
+
+import javax.management.MBeanServer;
+
+/**
+ * [TODO]
+ * 
+ * @author thomas.diesler(a)jboss.com
+ * @since 05-May-2009
+ */
+public class JMXCapability extends Capability
+{
+   public JMXCapability()
+   {
+      super(MBeanServer.class.getName());
+      
+      Properties props = getProperties();
+      props.setProperty("org.jboss.osgi.jmx.host",
System.getProperty("jboss.bind.address", "localhost"));
+      props.setProperty("org.jboss.osgi.jmx.rmi.port", "1198");
+      
+      addBundle("bundles/jboss-osgi-jmx.jar");
+   }
+}
\ No newline at end of file

Copied:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/JNDICapability.java
(from rev 89588,
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/capability/JNDICapability.java)
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/JNDICapability.java	
                       (rev 0)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/JNDICapability.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.testing;
+
+//$Id$
+
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+
+/**
+ * [TODO]
+ * 
+ * @author thomas.diesler(a)jboss.com
+ * @since 05-May-2009
+ */
+public class JNDICapability extends Capability
+{
+   public JNDICapability()
+   {
+      super(InitialContext.class.getName());
+      
+      Properties props = getProperties();
+      props.setProperty("org.jboss.osgi.jndi.host",
System.getProperty("jboss.bind.address", "localhost"));
+      props.setProperty("org.jboss.osgi.jndi.rmi.port", "1198");
+      props.setProperty("org.jboss.osgi.jndi.port", "1199");
+      
+      addBundle("bundles/jboss-osgi-common-core.jar");
+      addBundle("bundles/jboss-osgi-jndi.jar");
+   }
+}
\ No newline at end of file

Copied:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/MicrocontainerCapability.java
(from rev 89594,
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/capability/MicrocontainerCapability.java)
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/MicrocontainerCapability.java	
                       (rev 0)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/MicrocontainerCapability.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.testing;
+
+//$Id$
+
+import org.jboss.osgi.spi.service.MicrocontainerService;
+
+/**
+ * [TODO]
+ * 
+ * @author thomas.diesler(a)jboss.com
+ * @since 05-May-2009
+ */
+public class MicrocontainerCapability extends Capability
+{
+   public MicrocontainerCapability()
+   {
+      super(MicrocontainerService.class.getName());
+      
+      addDependency(new JMXCapability());
+      addDependency(new XMLBindingCapability());
+      addBundle("bundles/jboss-osgi-microcontainer.jar");
+   }
+}
\ No newline at end of file

Modified:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -26,7 +26,6 @@
 import javax.naming.NamingException;
 
 import org.jboss.osgi.spi.logging.LogEntryCache;
-import org.jboss.osgi.spi.testing.capability.Capability;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.InvalidSyntaxException;
 

Copied:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/RemoteLogCapability.java
(from rev 89588,
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/capability/RemoteLogCapability.java)
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/RemoteLogCapability.java	
                       (rev 0)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/RemoteLogCapability.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.testing;
+
+//$Id$
+
+import java.util.Properties;
+
+import org.jboss.osgi.spi.service.RemoteLogService;
+
+
+
+/**
+ * [TODO]
+ * 
+ * @author thomas.diesler(a)jboss.com
+ * @since 05-May-2009
+ */
+public class RemoteLogCapability extends Capability
+{
+   public RemoteLogCapability()
+   {
+      super(RemoteLogService.class.getName());
+      
+      Properties props = getProperties();
+      props.setProperty("org.jboss.osgi.service.remote.log.reader",
"true");
+      props.setProperty("org.jboss.osgi.service.remote.log.host",
System.getProperty("jboss.bind.address", "localhost"));
+      props.setProperty("org.jboss.osgi.service.remote.log.port",
"5400");
+      
+      addBundle("bundles/jboss-osgi-remotelog.jar");
+   }
+}
\ No newline at end of file

Copied:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/XMLBindingCapability.java
(from rev 89588,
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/capability/XMLBindingCapability.java)
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/XMLBindingCapability.java	
                       (rev 0)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/XMLBindingCapability.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.testing;
+
+import org.jboss.osgi.spi.service.XMLBindingService;
+
+
+//$Id$
+
+
+/**
+ * [TODO]
+ * 
+ * @author thomas.diesler(a)jboss.com
+ * @since 05-May-2009
+ */
+public class XMLBindingCapability extends Capability
+{
+   public XMLBindingCapability()
+   {
+      super (XMLBindingService.class.getName());
+      
+      addDependency(new JAXBCapability());
+      addBundle("bundles/jboss-osgi-common-core.jar");
+      addBundle("bundles/jboss-osgi-xml-binding.jar");
+   }
+}
\ No newline at end of file

Copied:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/XMLParserCapability.java
(from rev 89588,
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/capability/XMLParserCapability.java)
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/XMLParserCapability.java	
                       (rev 0)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/XMLParserCapability.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.spi.testing;
+
+import javax.xml.parsers.SAXParserFactory;
+
+
+
+//$Id$
+
+
+/**
+ * [TODO]
+ * 
+ * @author thomas.diesler(a)jboss.com
+ * @since 05-May-2009
+ */
+public class XMLParserCapability extends Capability
+{
+   public XMLParserCapability()
+   {
+      super(SAXParserFactory.class.getName());
+      
+      addBundle("bundles/jboss-osgi-apache-xerces.jar");
+   }
+}
\ No newline at end of file

Modified:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -36,11 +36,11 @@
 import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
 import org.jboss.osgi.spi.framework.OSGiFramework;
 import org.jboss.osgi.spi.logging.LogEntryCache;
+import org.jboss.osgi.spi.testing.Capability;
 import org.jboss.osgi.spi.testing.OSGiBundle;
 import org.jboss.osgi.spi.testing.OSGiPackageAdmin;
 import org.jboss.osgi.spi.testing.OSGiServiceReference;
 import org.jboss.osgi.spi.testing.OSGiTestHelper;
-import org.jboss.osgi.spi.testing.capability.Capability;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;

Modified:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -39,11 +39,11 @@
 
 import org.jboss.logging.Logger;
 import org.jboss.osgi.spi.logging.LogEntryCache;
+import org.jboss.osgi.spi.testing.Capability;
 import org.jboss.osgi.spi.testing.OSGiBundle;
 import org.jboss.osgi.spi.testing.OSGiRuntime;
 import org.jboss.osgi.spi.testing.OSGiServiceReference;
 import org.jboss.osgi.spi.testing.OSGiTestHelper;
-import org.jboss.osgi.spi.testing.capability.Capability;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.Constants;
 import org.osgi.service.log.LogReaderService;

Modified:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java
===================================================================
---
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -42,7 +42,7 @@
 import org.jboss.osgi.spi.testing.OSGiPackageAdmin;
 import org.jboss.osgi.spi.testing.OSGiServiceReference;
 import org.jboss.osgi.spi.testing.OSGiTestHelper;
-import org.jboss.osgi.spi.testing.capability.RemoteLogCapability;
+import org.jboss.osgi.spi.testing.RemoteLogCapability;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.InvalidSyntaxException;

Modified:
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java
===================================================================
---
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -29,12 +29,12 @@
 import java.io.InputStreamReader;
 import java.net.URL;
 
+import org.jboss.osgi.spi.testing.ConfigAdminCapability;
+import org.jboss.osgi.spi.testing.HttpCapability;
 import org.jboss.osgi.spi.testing.OSGiBundle;
 import org.jboss.osgi.spi.testing.OSGiRuntime;
 import org.jboss.osgi.spi.testing.OSGiTest;
 import org.jboss.osgi.spi.testing.OSGiTestHelper;
-import org.jboss.osgi.spi.testing.capability.ConfigAdminCapability;
-import org.jboss.osgi.spi.testing.capability.HttpCapability;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;

Modified:
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java
===================================================================
---
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -30,12 +30,12 @@
 import javax.naming.InitialContext;
 
 import org.jboss.osgi.spi.management.MBeanProxy;
+import org.jboss.osgi.spi.testing.JMXCapability;
+import org.jboss.osgi.spi.testing.JNDICapability;
 import org.jboss.osgi.spi.testing.OSGiBundle;
 import org.jboss.osgi.spi.testing.OSGiRuntime;
 import org.jboss.osgi.spi.testing.OSGiTest;
 import org.jboss.osgi.spi.testing.OSGiTestHelper;
-import org.jboss.osgi.spi.testing.capability.JMXCapability;
-import org.jboss.osgi.spi.testing.capability.JNDICapability;
 import org.jboss.test.osgi.example.jmx.bundle.FooMBean;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;

Modified:
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java
===================================================================
---
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -29,11 +29,11 @@
 import javax.naming.InitialContext;
 import javax.naming.NameNotFoundException;
 
+import org.jboss.osgi.spi.testing.JNDICapability;
 import org.jboss.osgi.spi.testing.OSGiBundle;
 import org.jboss.osgi.spi.testing.OSGiRuntime;
 import org.jboss.osgi.spi.testing.OSGiTest;
 import org.jboss.osgi.spi.testing.OSGiTestHelper;
-import org.jboss.osgi.spi.testing.capability.JNDICapability;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;

Modified:
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java
===================================================================
---
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -41,11 +41,11 @@
 import org.jboss.osgi.spi.management.ManagedFrameworkMBean;
 import org.jboss.osgi.spi.service.DeployerService;
 import org.jboss.osgi.spi.service.MicrocontainerServiceMBean;
+import org.jboss.osgi.spi.testing.JNDICapability;
+import org.jboss.osgi.spi.testing.MicrocontainerCapability;
 import org.jboss.osgi.spi.testing.OSGiRuntime;
 import org.jboss.osgi.spi.testing.OSGiTest;
 import org.jboss.osgi.spi.testing.OSGiTestHelper;
-import org.jboss.osgi.spi.testing.capability.JNDICapability;
-import org.jboss.osgi.spi.testing.capability.MicrocontainerCapability;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;

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-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties	2009-06-01
11:44:11 UTC (rev 89596)
@@ -28,20 +28,8 @@
   	org.jboss.virtual.plugins.context.jar, \
   	org.jboss.virtual.plugins.vfs.helpers, \
   	org.jboss.virtual.protocol, \
-  	org.osgi.framework;version=1.4, \
-    org.apache.log4j, \
-    org.jboss.util, \
-    org.jboss.util.id, \
-    org.jboss.util.threadpool, \
-    org.jboss.util.propertyeditor 
+  	org.osgi.framework;version=1.4
 
-# These are needed by jboss-remoting
-#   org.apache.log4j, \
-#   org.jboss.util, \
-#   org.jboss.util.id, \
-#   org.jboss.util.threadpool, \
-#   org.jboss.util.propertyeditor 
-
 # Bundles that need to be installed with the Framework automatically 
 org.jboss.osgi.spi.framework.autoInstall=\
 	file://${test.archive.directory}/bundles/org.osgi.compendium.jar

Modified:
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/CapabilityTestCase.java
===================================================================
---
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/CapabilityTestCase.java	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/CapabilityTestCase.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -33,17 +33,17 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.SAXParserFactory;
 
-import org.jboss.osgi.common.service.JAXBService;
-import org.jboss.osgi.common.service.XMLBindingService;
+import org.jboss.osgi.spi.service.JAXBService;
+import org.jboss.osgi.spi.service.XMLBindingService;
+import org.jboss.osgi.spi.testing.JAXBCapability;
+import org.jboss.osgi.spi.testing.JMXCapability;
+import org.jboss.osgi.spi.testing.JNDICapability;
 import org.jboss.osgi.spi.testing.OSGiBundle;
 import org.jboss.osgi.spi.testing.OSGiRuntime;
 import org.jboss.osgi.spi.testing.OSGiServiceReference;
 import org.jboss.osgi.spi.testing.OSGiTest;
-import org.jboss.osgi.spi.testing.capability.JAXBCapability;
-import org.jboss.osgi.spi.testing.capability.JMXCapability;
-import org.jboss.osgi.spi.testing.capability.JNDICapability;
-import org.jboss.osgi.spi.testing.capability.XMLBindingCapability;
-import org.jboss.osgi.spi.testing.capability.XMLParserCapability;
+import org.jboss.osgi.spi.testing.XMLBindingCapability;
+import org.jboss.osgi.spi.testing.XMLParserCapability;
 import org.junit.Test;
 import org.osgi.framework.BundleException;
 

Modified:
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java
===================================================================
---
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -31,10 +31,10 @@
 import java.io.File;
 import java.io.FileReader;
 
+import org.jboss.osgi.spi.testing.ConfigAdminCapability;
 import org.jboss.osgi.spi.testing.OSGiBundle;
 import org.jboss.osgi.spi.testing.OSGiRuntime;
 import org.jboss.osgi.spi.testing.OSGiTest;
-import org.jboss.osgi.spi.testing.capability.ConfigAdminCapability;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
 

Modified:
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGI36TestCase.java
===================================================================
---
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGI36TestCase.java	2009-06-01
11:16:00 UTC (rev 89595)
+++
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGI36TestCase.java	2009-06-01
11:44:11 UTC (rev 89596)
@@ -28,12 +28,12 @@
 
 import org.jboss.osgi.spi.management.MBeanProxy;
 import org.jboss.osgi.spi.management.MBeanProxyException;
+import org.jboss.osgi.spi.testing.JMXCapability;
+import org.jboss.osgi.spi.testing.JNDICapability;
+import org.jboss.osgi.spi.testing.MicrocontainerCapability;
 import org.jboss.osgi.spi.testing.OSGiRuntime;
 import org.jboss.osgi.spi.testing.OSGiTest;
 import org.jboss.osgi.spi.testing.OSGiTestHelper;
-import org.jboss.osgi.spi.testing.capability.JMXCapability;
-import org.jboss.osgi.spi.testing.capability.JNDICapability;
-import org.jboss.osgi.spi.testing.capability.MicrocontainerCapability;
 import org.jboss.test.osgi.jbossas.jbosgi36.mbean.FooMBean;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

[jboss-osgi-commits] JBoss-OSGI SVN: r89596 - in projects/jboss-osgi/trunk: 3rdparty/jaxb/src/main/java/org/jboss/osgi/jaxb/internal and 30 other directories.