[jboss-cvs] JBossAS SVN: r89660 - in projects/jboss-osgi/trunk: blueprint/testsuite/src/test/resources and 20 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 2 06:59:10 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-06-02 06:59:10 -0400 (Tue, 02 Jun 2009)
New Revision: 89660
Added:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/BlueprintCapability.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/Capability.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/ConfigAdminCapability.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/HttpCapability.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/HuskyCapability.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/JAXBCapability.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/JMXCapability.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/JNDICapability.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/MicrocontainerCapability.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/RemoteLogCapability.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/XMLBindingCapability.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/XMLParserCapability.java
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/package.html
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/package.html
Removed:
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
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/resources/context/context-basic.bnd
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties
projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-equinox.properties
projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties
projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-knopflerfish.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/husky/testsuite/src/test/resources/jboss-osgi-felix.properties
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/OSGiTest.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/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:
Move capabilities to separate package
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-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context/BlueprintContextTestCase.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -28,9 +28,9 @@
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.capability.BlueprintCapability;
+import org.jboss.osgi.spi.capability.HuskyCapability;
+import org.jboss.osgi.spi.capability.MicrocontainerCapability;
import org.jboss.osgi.spi.testing.OSGiBundle;
import org.jboss.osgi.spi.testing.OSGiRuntime;
import org.jboss.osgi.spi.testing.OSGiTest;
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-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/context/context-basic.bnd 2009-06-02 10:59:10 UTC (rev 89660)
@@ -7,6 +7,7 @@
Import-Package: \
org.jboss.osgi.husky, \
org.jboss.osgi.husky.annotation, \
+ org.jboss.osgi.spi.capability, \
org.jboss.osgi.spi.testing, \
org.junit, \
org.osgi.framework, \
Modified: projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties 2009-06-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties 2009-06-02 10:59:10 UTC (rev 89660)
@@ -18,10 +18,10 @@
org.osgi.framework.system.packages.extra=\
org.jboss.logging, \
org.jboss.osgi.spi;version=1.0, \
+ org.jboss.osgi.spi.capability;version=1.0, \
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/distribution/runtime/conf/jboss-osgi-equinox.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-equinox.properties 2009-06-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-equinox.properties 2009-06-02 10:59:10 UTC (rev 89660)
@@ -74,6 +74,7 @@
org.jboss.logging, \
org.jboss.net.protocol, \
org.jboss.osgi.spi;version=1.0, \
+ org.jboss.osgi.spi.capability;version=1.0, \
org.jboss.osgi.spi.logging;version=1.0, \
org.jboss.osgi.spi.management;version=1.0, \
org.jboss.osgi.spi.service;version=1.0, \
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-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties 2009-06-02 10:59:10 UTC (rev 89660)
@@ -43,6 +43,7 @@
org.jboss.logging, \
org.jboss.net.protocol, \
org.jboss.osgi.spi;version=1.0, \
+ org.jboss.osgi.spi.capability;version=1.0, \
org.jboss.osgi.spi.logging;version=1.0, \
org.jboss.osgi.spi.management;version=1.0, \
org.jboss.osgi.spi.service;version=1.0, \
Modified: projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-knopflerfish.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-knopflerfish.properties 2009-06-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-knopflerfish.properties 2009-06-02 10:59:10 UTC (rev 89660)
@@ -70,6 +70,7 @@
org.osgi.service.packageadmin;version=1.2, \
org.osgi.service.startlevel;version=1.1, \
org.jboss.osgi.spi;version=1.0, \
+ org.jboss.osgi.spi.capability;version=1.0, \
org.jboss.osgi.spi.logging;version=1.0, \
org.jboss.osgi.spi.management;version=1.0, \
org.jboss.osgi.spi.service;version=1.0, \
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-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/husky/testsuite/src/test/java/org/jboss/test/osgi/husky/context/ContextTestCase.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -27,8 +27,8 @@
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.capability.HuskyCapability;
+import org.jboss.osgi.spi.capability.JMXCapability;
import org.jboss.osgi.spi.testing.OSGiBundle;
import org.jboss.osgi.spi.testing.OSGiRuntime;
import org.jboss.osgi.spi.testing.OSGiTestHelper;
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-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/context/context-basic.bnd 2009-06-02 10:59:10 UTC (rev 89660)
@@ -7,6 +7,7 @@
Import-Package: \
org.jboss.osgi.husky, \
org.jboss.osgi.husky.annotation, \
+ org.jboss.osgi.spi.capability, \
org.jboss.osgi.spi.testing, \
org.junit, \
org.osgi.framework
Modified: projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/jboss-osgi-felix.properties 2009-06-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/husky/testsuite/src/test/resources/jboss-osgi-felix.properties 2009-06-02 10:59:10 UTC (rev 89660)
@@ -22,10 +22,10 @@
org.osgi.framework.system.packages.extra=\
org.jboss.logging, \
org.jboss.osgi.spi;version=1.0, \
+ org.jboss.osgi.spi.capability;version=1.0, \
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.osgi.framework;version=1.4
# Bundles that need to be installed with the Framework automatically
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-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml 2009-06-02 10:59:10 UTC (rev 89660)
@@ -33,6 +33,7 @@
<!-- jboss-osgi -->
org.jboss.osgi.spi;version=1.0,
+ org.jboss.osgi.spi.capability;version=1.0,
org.jboss.osgi.spi.logging;version=1.0,
org.jboss.osgi.spi.management;version=1.0,
org.jboss.osgi.spi.service;version=1.0,
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-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml 2009-06-02 10:59:10 UTC (rev 89660)
@@ -30,6 +30,7 @@
<!-- jboss-osgi -->
org.jboss.osgi.spi;version=1.0,
+ org.jboss.osgi.spi.capability;version=1.0,
org.jboss.osgi.spi.logging;version=1.0,
org.jboss.osgi.spi.management;version=1.0,
org.jboss.osgi.spi.service;version=1.0,
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-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml 2009-06-02 10:59:10 UTC (rev 89660)
@@ -32,6 +32,7 @@
<!-- jboss-osgi -->
org.jboss.osgi.spi;version=1.0,
+ org.jboss.osgi.spi.capability;version=1.0,
org.jboss.osgi.spi.logging;version=1.0,
org.jboss.osgi.spi.management;version=1.0,
org.jboss.osgi.spi.service;version=1.0,
Copied: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/BlueprintCapability.java (from rev 89656, 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/capability/BlueprintCapability.java (rev 0)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/BlueprintCapability.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -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.capability;
+
+//$Id$
+
+import org.jboss.osgi.spi.service.BlueprintService;
+import org.jboss.osgi.spi.testing.OSGiRuntime;
+
+/**
+ * Adds the Blueprint capability to the {@link OSGiRuntime}
+ * under test.
+ *
+ * It is ignored if the {@link BlueprintService} is already registered.
+ *
+ * Installed bundles: jboss-osgi-blueprint.jar
+ *
+ * @author thomas.diesler at 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/capability/Capability.java (from rev 89656, 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/capability/Capability.java (rev 0)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/Capability.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -0,0 +1,103 @@
+/*
+ * 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.capability;
+
+//$Id$
+
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
+import org.jboss.osgi.spi.testing.OSGiRuntime;
+
+/**
+ * An abstract OSGi capability that can be installed in an
+ * {@link OSGiRuntime}.
+ *
+ * The capability is only installed if the service name given in the constructor
+ * is not already registered with the OSGi framework.
+ *
+ * It maintains an ordered set of dependent capabilities and bundles that
+ * must be installed to provide the functionality advertised by this capability.
+ *
+ * @author thomas.diesler at 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>();
+
+ /**
+ * Construct a capability that is identified by the given service name.
+ * If the service name is already registered with the {@link OSGiRuntime}
+ * adding this capability does nothing.
+ */
+ public Capability(String serviceName)
+ {
+ this.serviceName = serviceName;
+ }
+
+ /**
+ * Get the service name associated with this capability.
+ */
+ public String getServiceName()
+ {
+ return serviceName;
+ }
+
+ /**
+ * Get system properties provided by this capability.
+ *
+ * Adding this capability will set the associated system properties
+ * if a propperty is not set already.
+ */
+ public Properties getProperties()
+ {
+ return props;
+ }
+
+ public List<Capability> getDependencies()
+ {
+ return new ArrayList<Capability>(dependencies);
+ }
+
+ public List<String> getBundles()
+ {
+ return new ArrayList<String>(bundles);
+ }
+
+ protected void addBundle(String bundle)
+ {
+ bundles.add(bundle);
+ }
+
+ protected void addDependency(Capability dependency)
+ {
+ dependencies.add(dependency);
+ }
+}
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/ConfigAdminCapability.java (from rev 89649, 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/capability/ConfigAdminCapability.java (rev 0)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/ConfigAdminCapability.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -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.capability;
+
+//$Id$
+
+import org.jboss.osgi.spi.testing.OSGiRuntime;
+import org.osgi.service.cm.ConfigurationAdmin;
+
+/**
+ * Adds the OSGi compedium ConfigAdmin capability to the {@link OSGiRuntime}
+ * under test.
+ *
+ * It is ignored if the {@link ConfigurationAdmin} is already registered.
+ *
+ * Installed bundles: org.apache.felix.metatype.jar, org.apache.felix.configadmin.jar
+ *
+ * @author thomas.diesler at 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/capability/HttpCapability.java (from rev 89656, 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/capability/HttpCapability.java (rev 0)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/HttpCapability.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -0,0 +1,60 @@
+/*
+ * 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.capability;
+
+//$Id$
+
+import java.util.Properties;
+
+import org.jboss.osgi.spi.testing.OSGiRuntime;
+import org.osgi.service.http.HttpService;
+
+/**
+ * Adds the {@link HttpService} capability to the {@link OSGiRuntime}
+ * under test.
+ *
+ * It is ignored if the {@link HttpService} is already registered.
+ *
+ * Installed bundles: org.apache.felix.http.jetty.jar
+ *
+ * Default properties set by this capability
+ *
+ * <table>
+ * <tr><th>Property</th><th>Value</th></tr>
+ * <tr><td>org.osgi.service.http.port</td><td>8090</td></tr>
+ * </table>
+ *
+ * @author thomas.diesler at 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/capability/HuskyCapability.java (from rev 89656, 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/capability/HuskyCapability.java (rev 0)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/HuskyCapability.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -0,0 +1,52 @@
+/*
+ * 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.capability;
+
+import org.jboss.osgi.spi.testing.OSGiRuntime;
+
+
+//$Id$
+
+
+/**
+ * Adds the Husky testing capability to the {@link OSGiRuntime}
+ * under test.
+ *
+ * It is ignored if a Husky connector is already registered.
+ *
+ * Dependent capabilities: {@link JMXCapability}.
+ *
+ * Installed bundles: jboss-osgi-husky.jar
+ *
+ * @author thomas.diesler at 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/capability/JAXBCapability.java (from rev 89656, 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/capability/JAXBCapability.java (rev 0)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/JAXBCapability.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -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.capability;
+
+//$Id$
+
+import org.jboss.osgi.spi.service.JAXBService;
+import org.jboss.osgi.spi.testing.OSGiRuntime;
+
+/**
+ * Adds the JAXB capability to the {@link OSGiRuntime}
+ * under test.
+ *
+ * It is ignored if the {@link JAXBService} is already registered.
+ *
+ * Dependent capabilities: {@link XMLParserCapability}.
+ *
+ * Installed bundles: jboss-osgi-jaxb.jar
+ *
+ * @author thomas.diesler at 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/capability/JMXCapability.java (from rev 89656, 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/capability/JMXCapability.java (rev 0)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/JMXCapability.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -0,0 +1,63 @@
+/*
+ * 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.capability;
+
+//$Id$
+
+import java.util.Properties;
+
+import javax.management.MBeanServer;
+
+import org.jboss.osgi.spi.testing.OSGiRuntime;
+
+/**
+ * Adds the JMX capability to the {@link OSGiRuntime}
+ * under test.
+ *
+ * It is ignored if the {@link MBeanServer} is already registered.
+ *
+ * Installed bundles: jboss-osgi-jmx.jar
+ *
+ * Default properties set by this capability
+ *
+ * <table>
+ * <tr><th>Property</th><th>Value</th></tr>
+ * <tr><td>org.jboss.osgi.jmx.host</td><td>${jboss.bind.address}</td></tr>
+ * <tr><td>org.jboss.osgi.jmx.rmi.port</td><td>1198</td></tr>
+ * </table>
+ *
+ * @author thomas.diesler at 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/capability/JNDICapability.java (from rev 89656, 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/capability/JNDICapability.java (rev 0)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/JNDICapability.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -0,0 +1,66 @@
+/*
+ * 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.capability;
+
+//$Id$
+
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+
+import org.jboss.osgi.spi.testing.OSGiRuntime;
+
+/**
+ * Adds the JNDI capability to the {@link OSGiRuntime}
+ * under test.
+ *
+ * It is ignored if the {@link InitialContext} is already registered.
+ *
+ * Installed bundles: jboss-osgi-common-core.jar, jboss-osgi-jndi.jar
+ *
+ * Default properties set by this capability
+ *
+ * <table>
+ * <tr><th>Property</th><th>Value</th></tr>
+ * <tr><td>org.jboss.osgi.jndi.host</td><td>${jboss.bind.address}</td></tr>
+ * <tr><td>org.jboss.osgi.jndi.rmi.port</td><td>1198</td></tr>
+ * <tr><td>org.jboss.osgi.jndi.port</td><td>1199</td></tr>
+ * </table>
+ *
+ * @author thomas.diesler at 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/capability/MicrocontainerCapability.java (from rev 89656, 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/capability/MicrocontainerCapability.java (rev 0)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/MicrocontainerCapability.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -0,0 +1,52 @@
+/*
+ * 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.capability;
+
+//$Id$
+
+import org.jboss.osgi.spi.service.MicrocontainerService;
+import org.jboss.osgi.spi.testing.OSGiRuntime;
+
+/**
+ * Adds the Microcontainer capability to the {@link OSGiRuntime}
+ * under test.
+ *
+ * It is ignored if the {@link MicrocontainerService} is already registered.
+ *
+ * Dependent capabilities: {@link JMXCapability}, {@link XMLBindingCapability}.
+ *
+ * Installed bundles: jboss-osgi-microcontainer.jar
+ *
+ * @author thomas.diesler at 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
Copied: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/RemoteLogCapability.java (from rev 89656, 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/capability/RemoteLogCapability.java (rev 0)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/RemoteLogCapability.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -0,0 +1,65 @@
+/*
+ * 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.capability;
+
+//$Id$
+
+import java.util.Properties;
+
+import org.jboss.osgi.spi.service.RemoteLogService;
+import org.jboss.osgi.spi.testing.OSGiRuntime;
+
+/**
+ * Adds the RemoteLog capability to the {@link OSGiRuntime}
+ * under test.
+ *
+ * It is ignored if the {@link RemoteLogService} is already registered.
+ *
+ * Installed bundles: jboss-osgi-remotelog.jar
+ *
+ * Default properties set by this capability
+ *
+ * <table>
+ * <tr><th>Property</th><th>Value</th></tr>
+ * <tr><td>org.jboss.osgi.service.remote.log.reader</td><td>true</td></tr>
+ * <tr><td>org.jboss.osgi.service.remote.log.host</td><td>${jboss.bind.address}</td></tr>
+ * <tr><td>org.jboss.osgi.service.remote.log.port</td><td>5400</td></tr>
+ * </table>
+ *
+ *
+ * @author thomas.diesler at 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/capability/XMLBindingCapability.java (from rev 89656, 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/capability/XMLBindingCapability.java (rev 0)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/XMLBindingCapability.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -0,0 +1,52 @@
+/*
+ * 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.capability;
+
+//$Id$
+
+import org.jboss.osgi.spi.service.XMLBindingService;
+import org.jboss.osgi.spi.testing.OSGiRuntime;
+
+/**
+ * Adds the JBossXB capability to the {@link OSGiRuntime}
+ * under test.
+ *
+ * It is ignored if the {@link XMLBindingService} is already registered.
+ *
+ * Dependent capabilities: {@link JAXBCapability}.
+ *
+ * Installed bundles: jboss-osgi-common-core.jar, jboss-osgi-xml-binding.jar
+ *
+ * @author thomas.diesler at 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/capability/XMLParserCapability.java (from rev 89656, projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/XMLParserCapability.java)
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/XMLParserCapability.java (rev 0)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/capability/XMLParserCapability.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -0,0 +1,49 @@
+/*
+ * 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.capability;
+
+//$Id$
+
+import javax.xml.parsers.SAXParserFactory;
+
+import org.jboss.osgi.spi.testing.OSGiRuntime;
+
+/**
+ * Adds the XML parser capability to the {@link OSGiRuntime}
+ * under test.
+ *
+ * It is ignored if the {@link SAXParserFactory} is already registered.
+ *
+ * Installed bundles: jboss-osgi-apache-xerces.jar
+ *
+ * @author thomas.diesler at 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
Added: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/package.html
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/package.html (rev 0)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/service/package.html 2009-06-02 10:59:10 UTC (rev 89660)
@@ -0,0 +1,5 @@
+<html>
+<body>
+A collection of SPI provided services.
+</body>
+</html>
Deleted: 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/BlueprintCapability.java 2009-06-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/BlueprintCapability.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -1,47 +0,0 @@
-/*
- * 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.BlueprintService;
-
-/**
- * Adds the Blueprint capability to the {@link OSGiRuntime}
- * under test.
- *
- * It is ignored if the {@link BlueprintService} is already registered.
- *
- * Installed bundles: jboss-osgi-blueprint.jar
- *
- * @author thomas.diesler at 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
Deleted: 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/Capability.java 2009-06-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/Capability.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -1,101 +0,0 @@
-/*
- * 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;
-
-/**
- * An abstract OSGi capability that can be installed in an
- * {@link OSGiRuntime}.
- *
- * The capability is only installed if the service name given in the constructor
- * is not already registered with the OSGi framework.
- *
- * It maintains an ordered set of dependent capabilities and bundles that
- * must be installed to provide the functionality advertised by this capability.
- *
- * @author thomas.diesler at 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>();
-
- /**
- * Construct a capability that is identified by the given service name.
- * If the service name is already registered with the {@link OSGiRuntime}
- * adding this capability does nothing.
- */
- public Capability(String serviceName)
- {
- this.serviceName = serviceName;
- }
-
- /**
- * Get the service name associated with this capability.
- */
- public String getServiceName()
- {
- return serviceName;
- }
-
- /**
- * Get system properties provided by this capability.
- *
- * Adding this capability will set the associated system properties
- * if a propperty is not set already.
- */
- public Properties getProperties()
- {
- return props;
- }
-
- public List<Capability> getDependencies()
- {
- return new ArrayList<Capability>(dependencies);
- }
-
- public List<String> getBundles()
- {
- return new ArrayList<String>(bundles);
- }
-
- protected void addBundle(String bundle)
- {
- bundles.add(bundle);
- }
-
- protected void addDependency(Capability dependency)
- {
- dependencies.add(dependency);
- }
-}
\ No newline at end of file
Deleted: 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/ConfigAdminCapability.java 2009-06-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/ConfigAdminCapability.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -1,47 +0,0 @@
-/*
- * 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.osgi.service.cm.ConfigurationAdmin;
-
-/**
- * Adds the OSGi compedium ConfigAdmin capability to the {@link OSGiRuntime}
- * under test.
- *
- * It is ignored if the {@link ConfigurationAdmin} is already registered.
- *
- * Installed bundles: org.apache.felix.metatype.jar, org.apache.felix.configadmin.jar
- *
- * @author thomas.diesler at 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
Deleted: 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/HttpCapability.java 2009-06-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/HttpCapability.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -1,59 +0,0 @@
-/*
- * 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.osgi.service.http.HttpService;
-
-/**
- * Adds the {@link HttpService} capability to the {@link OSGiRuntime}
- * under test.
- *
- * It is ignored if the {@link HttpService} is already registered.
- *
- * Installed bundles: org.apache.felix.http.jetty.jar
- *
- * Default properties set by this capability
- *
- * <table>
- * <tr><th>Property</th><th>Value</th></tr>
- * <tr><td>org.osgi.service.http.port</td><td>8090</td></tr>
- * </table>
- *
- * @author thomas.diesler at 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
Deleted: 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/HuskyCapability.java 2009-06-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/HuskyCapability.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -1,50 +0,0 @@
-/*
- * 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$
-
-
-/**
- * Adds the Husky testing capability to the {@link OSGiRuntime}
- * under test.
- *
- * It is ignored if a Husky connector is already registered.
- *
- * Dependent capabilities: {@link JMXCapability}.
- *
- * Installed bundles: jboss-osgi-husky.jar
- *
- * @author thomas.diesler at 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
Deleted: 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/JAXBCapability.java 2009-06-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/JAXBCapability.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -1,50 +0,0 @@
-/*
- * 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.JAXBService;
-
-/**
- * Adds the JAXB capability to the {@link OSGiRuntime}
- * under test.
- *
- * It is ignored if the {@link JAXBService} is already registered.
- *
- * Dependent capabilities: {@link XMLParserCapability}.
- *
- * Installed bundles: jboss-osgi-jaxb.jar
- *
- * @author thomas.diesler at 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
Deleted: 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/JMXCapability.java 2009-06-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/JMXCapability.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -1,61 +0,0 @@
-/*
- * 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;
-
-/**
- * Adds the JMX capability to the {@link OSGiRuntime}
- * under test.
- *
- * It is ignored if the {@link MBeanServer} is already registered.
- *
- * Installed bundles: jboss-osgi-jmx.jar
- *
- * Default properties set by this capability
- *
- * <table>
- * <tr><th>Property</th><th>Value</th></tr>
- * <tr><td>org.jboss.osgi.jmx.host</td><td>${jboss.bind.address}</td></tr>
- * <tr><td>org.jboss.osgi.jmx.rmi.port</td><td>1198</td></tr>
- * </table>
- *
- * @author thomas.diesler at 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
Deleted: 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/JNDICapability.java 2009-06-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/JNDICapability.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -1,64 +0,0 @@
-/*
- * 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;
-
-/**
- * Adds the JNDI capability to the {@link OSGiRuntime}
- * under test.
- *
- * It is ignored if the {@link InitialContext} is already registered.
- *
- * Installed bundles: jboss-osgi-common-core.jar, jboss-osgi-jndi.jar
- *
- * Default properties set by this capability
- *
- * <table>
- * <tr><th>Property</th><th>Value</th></tr>
- * <tr><td>org.jboss.osgi.jndi.host</td><td>${jboss.bind.address}</td></tr>
- * <tr><td>org.jboss.osgi.jndi.rmi.port</td><td>1198</td></tr>
- * <tr><td>org.jboss.osgi.jndi.port</td><td>1199</td></tr>
- * </table>
- *
- * @author thomas.diesler at 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
Deleted: 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/MicrocontainerCapability.java 2009-06-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/MicrocontainerCapability.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -1,51 +0,0 @@
-/*
- * 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;
-
-/**
- * Adds the Microcontainer capability to the {@link OSGiRuntime}
- * under test.
- *
- * It is ignored if the {@link MicrocontainerService} is already registered.
- *
- * Dependent capabilities: {@link JMXCapability}, {@link XMLBindingCapability}.
- *
- * Installed bundles: jboss-osgi-microcontainer.jar
- *
- * @author thomas.diesler at 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-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiRuntime.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -25,6 +25,8 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import org.jboss.osgi.spi.capability.Capability;
+import org.jboss.osgi.spi.capability.RemoteLogCapability;
import org.jboss.osgi.spi.logging.LogEntryCache;
import org.osgi.framework.BundleException;
import org.osgi.framework.InvalidSyntaxException;
Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiTest.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiTest.java 2009-06-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/OSGiTest.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -35,7 +35,7 @@
/**
* An abstract OSGi Test.
*
- * This is a convenience wrapper for the functionality provided
+ * {@link OSGiTest} is a convenience wrapper for the functionality provided
* by {@link OSGiTestHelper}.
*
* @author Thomas.Diesler at jboss.org
Deleted: 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/RemoteLogCapability.java 2009-06-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/RemoteLogCapability.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -1,64 +0,0 @@
-/*
- * 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;
-
-/**
- * Adds the RemoteLog capability to the {@link OSGiRuntime}
- * under test.
- *
- * It is ignored if the {@link RemoteLogService} is already registered.
- *
- * Installed bundles: jboss-osgi-remotelog.jar
- *
- * Default properties set by this capability
- *
- * <table>
- * <tr><th>Property</th><th>Value</th></tr>
- * <tr><td>org.jboss.osgi.service.remote.log.reader</td><td>true</td></tr>
- * <tr><td>org.jboss.osgi.service.remote.log.host</td><td>${jboss.bind.address}</td></tr>
- * <tr><td>org.jboss.osgi.service.remote.log.port</td><td>5400</td></tr>
- * </table>
- *
- *
- * @author thomas.diesler at 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
Deleted: 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/XMLBindingCapability.java 2009-06-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/XMLBindingCapability.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -1,51 +0,0 @@
-/*
- * 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.XMLBindingService;
-
-/**
- * Adds the JBossXB capability to the {@link OSGiRuntime}
- * under test.
- *
- * It is ignored if the {@link XMLBindingService} is already registered.
- *
- * Dependent capabilities: {@link JAXBCapability}.
- *
- * Installed bundles: jboss-osgi-common-core.jar, jboss-osgi-xml-binding.jar
- *
- * @author thomas.diesler at 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
Deleted: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/XMLParserCapability.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/XMLParserCapability.java 2009-06-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/XMLParserCapability.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -1,47 +0,0 @@
-/*
- * 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 javax.xml.parsers.SAXParserFactory;
-
-/**
- * Adds the XML parser capability to the {@link OSGiRuntime}
- * under test.
- *
- * It is ignored if the {@link SAXParserFactory} is already registered.
- *
- * Installed bundles: jboss-osgi-apache-xerces.jar
- *
- * @author thomas.diesler at 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-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/EmbeddedRuntime.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -33,10 +33,10 @@
import javax.management.MBeanServerConnection;
import javax.management.MBeanServerFactory;
+import org.jboss.osgi.spi.capability.Capability;
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.OSGiRuntime;
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-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -38,8 +38,8 @@
import javax.naming.NamingException;
import org.jboss.logging.Logger;
+import org.jboss.osgi.spi.capability.Capability;
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;
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-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -31,6 +31,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import org.jboss.osgi.spi.capability.RemoteLogCapability;
import org.jboss.osgi.spi.logging.LogEntryCache;
import org.jboss.osgi.spi.logging.RemoteLogReaderService;
import org.jboss.osgi.spi.management.MBeanProxy;
@@ -43,7 +44,6 @@
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.RemoteLogCapability;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
import org.osgi.framework.InvalidSyntaxException;
Added: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/package.html
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/package.html (rev 0)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/package.html 2009-06-02 10:59:10 UTC (rev 89660)
@@ -0,0 +1,5 @@
+<html>
+<body>
+OSGi test support classes and interfaces.
+</body>
+</html>
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-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/http/HttpServiceTestCase.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -29,8 +29,8 @@
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.capability.ConfigAdminCapability;
+import org.jboss.osgi.spi.capability.HttpCapability;
import org.jboss.osgi.spi.testing.OSGiBundle;
import org.jboss.osgi.spi.testing.OSGiRuntime;
import org.jboss.osgi.spi.testing.OSGiTest;
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-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jmx/JMXTestCase.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -29,9 +29,9 @@
import javax.management.ObjectName;
import javax.naming.InitialContext;
+import org.jboss.osgi.spi.capability.JMXCapability;
+import org.jboss.osgi.spi.capability.JNDICapability;
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;
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-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/jndi/JNDITestCase.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -29,7 +29,7 @@
import javax.naming.InitialContext;
import javax.naming.NameNotFoundException;
-import org.jboss.osgi.spi.testing.JNDICapability;
+import org.jboss.osgi.spi.capability.JNDICapability;
import org.jboss.osgi.spi.testing.OSGiBundle;
import org.jboss.osgi.spi.testing.OSGiRuntime;
import org.jboss.osgi.spi.testing.OSGiTest;
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-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -37,12 +37,12 @@
import javax.management.ObjectName;
+import org.jboss.osgi.spi.capability.JNDICapability;
+import org.jboss.osgi.spi.capability.MicrocontainerCapability;
import org.jboss.osgi.spi.management.MBeanProxy;
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;
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-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/CapabilityTestCase.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -33,17 +33,17 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.SAXParserFactory;
+import org.jboss.osgi.spi.capability.JAXBCapability;
+import org.jboss.osgi.spi.capability.JMXCapability;
+import org.jboss.osgi.spi.capability.JNDICapability;
+import org.jboss.osgi.spi.capability.XMLBindingCapability;
+import org.jboss.osgi.spi.capability.XMLParserCapability;
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.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-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi41/OSGI41TestCase.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -31,7 +31,7 @@
import java.io.File;
import java.io.FileReader;
-import org.jboss.osgi.spi.testing.ConfigAdminCapability;
+import org.jboss.osgi.spi.capability.ConfigAdminCapability;
import org.jboss.osgi.spi.testing.OSGiBundle;
import org.jboss.osgi.spi.testing.OSGiRuntime;
import org.jboss.osgi.spi.testing.OSGiTest;
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-02 10:19:12 UTC (rev 89659)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGI36TestCase.java 2009-06-02 10:59:10 UTC (rev 89660)
@@ -26,11 +26,11 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
+import org.jboss.osgi.spi.capability.JMXCapability;
+import org.jboss.osgi.spi.capability.JNDICapability;
+import org.jboss.osgi.spi.capability.MicrocontainerCapability;
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.OSGiBundle;
import org.jboss.osgi.spi.testing.OSGiRuntime;
import org.jboss.osgi.spi.testing.OSGiTest;
More information about the jboss-cvs-commits
mailing list