[jboss-osgi-commits] JBoss-OSGI SVN: r101157 - in projects/jboss-osgi/projects/bundles/husky/trunk: .settings and 5 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Fri Feb 19 07:13:23 EST 2010
Author: thomas.diesler at jboss.com
Date: 2010-02-19 07:13:22 -0500 (Fri, 19 Feb 2010)
New Revision: 101157
Removed:
projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/
Modified:
projects/jboss-osgi/projects/bundles/husky/trunk/.settings/org.eclipse.jdt.core.prefs
projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/HuskyCapability.java
projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/runtime/osgi/HuskyActivator.java
projects/jboss-osgi/projects/bundles/husky/trunk/src/test/resources/context/context-basic.bnd
projects/jboss-osgi/projects/bundles/husky/trunk/src/test/resources/jboss-osgi-framework.properties
Log:
split testing from husky
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/.settings/org.eclipse.jdt.core.prefs 2010-02-19 12:05:35 UTC (rev 101156)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/.settings/org.eclipse.jdt.core.prefs 2010-02-19 12:13:22 UTC (rev 101157)
@@ -1,4 +1,4 @@
-#Wed Feb 17 12:15:46 CET 2010
+#Fri Feb 19 13:11:57 CET 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2010-02-19 12:05:35 UTC (rev 101156)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml 2010-02-19 12:13:22 UTC (rev 101157)
@@ -44,6 +44,7 @@
<version.apache.felix.log>1.0.0</version.apache.felix.log>
<version.jboss.osgi.jmx>1.0.4-SNAPSHOT</version.jboss.osgi.jmx>
<version.jboss.osgi.runtime.felix>2.0.2.SP1-SNAPSHOT</version.jboss.osgi.runtime.felix>
+ <version.jboss.osgi.testing>1.0.0-SNAPSHOT</version.jboss.osgi.testing>
<version.jboss.osgi.deployment>1.0.2-SNAPSHOT</version.jboss.osgi.deployment>
<version.osgi>4.2.0</version.osgi>
</properties>
@@ -119,6 +120,12 @@
<version>${version.jboss.osgi.runtime.felix}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-testing</artifactId>
+ <version>${version.jboss.osgi.testing}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -132,7 +139,6 @@
<Bundle-Activator>org.jboss.osgi.husky.runtime.osgi.HuskyActivator</Bundle-Activator>
<Export-Package>
org.jboss.osgi.husky;version=${version},
- org.jboss.osgi.testing;version=${version},
</Export-Package>
<Import-Package>
javax.management*,
@@ -149,17 +155,10 @@
org.osgi.framework;version="[1.5,2.0)",
org.osgi.jmx.framework;version="[1.0,2.0)",
org.osgi.util.tracker;version="[1.4,2.0)",
-
- <!-- ignore client side -->
- !org.jboss.osgi.deployment.deployer,
- !org.jboss.osgi.spi.framework,
- !org.osgi.framework.launch,
- !org.osgi.service.packageadmin,
</Import-Package>
<Private-Package>
org.jboss.osgi.husky.internal,
org.jboss.osgi.husky.runtime*,
- org.jboss.osgi.testing.internal,
</Private-Package>
<Embed-Transitive>true</Embed-Transitive>
<Embed-Dependency>
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/HuskyCapability.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/HuskyCapability.java 2010-02-19 12:05:35 UTC (rev 101156)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/HuskyCapability.java 2010-02-19 12:13:22 UTC (rev 101157)
@@ -26,10 +26,9 @@
import org.jboss.osgi.husky.runtime.Connector;
import org.jboss.osgi.jmx.JMXCapability;
import org.jboss.osgi.spi.capability.Capability;
-import org.jboss.osgi.testing.OSGiRuntime;
/**
- * Adds the Husky testing capability to the {@link OSGiRuntime}
+ * Adds the Husky testing capability to the OSGiRuntime
* under test.
*
* It is ignored if a Husky connector is already registered.
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/runtime/osgi/HuskyActivator.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/runtime/osgi/HuskyActivator.java 2010-02-19 12:05:35 UTC (rev 101156)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/husky/runtime/osgi/HuskyActivator.java 2010-02-19 12:13:22 UTC (rev 101157)
@@ -38,7 +38,7 @@
* starts the {@link SocketConnector}.
*
* Finally it starts the {@link HuskyExtender}, which is a {@link BundleListener}
- * that looks for manifest headers called {@link HuskyExtender#HEADER_TEST_PACKAGE}.
+ * that looks for manifest headers called {@link ManifestProcessor#HEADER_TEST_PACKAGE}.
*
*
* @author Thomas.Diesler at jboss.com
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/test/resources/context/context-basic.bnd
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/test/resources/context/context-basic.bnd 2010-02-19 12:05:35 UTC (rev 101156)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/test/resources/context/context-basic.bnd 2010-02-19 12:13:22 UTC (rev 101157)
@@ -5,10 +5,10 @@
Export-Package: org.jboss.test.osgi.husky.context
Import-Package: \
- org.jboss.osgi.spi.capability, \
- org.jboss.osgi.husky, \
- org.jboss.osgi.testing, \
- org.junit, \
- org.osgi.framework
+ org.jboss.osgi.spi.capability;version="[1.0,2.0)", \
+ org.jboss.osgi.husky;version="[1.0,2.0)", \
+ org.jboss.osgi.testing;version="[1.0,2.0)", \
+ org.junit;version="[4.6,5.0)", \
+ org.osgi.framework;version="[1.5,2.0)"
Test-Package: org.jboss.test.osgi.husky.context
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/test/resources/jboss-osgi-framework.properties
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/test/resources/jboss-osgi-framework.properties 2010-02-19 12:05:35 UTC (rev 101156)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/test/resources/jboss-osgi-framework.properties 2010-02-19 12:13:22 UTC (rev 101157)
@@ -27,6 +27,7 @@
org.jboss.osgi.spi.management;version=1.0, \
org.jboss.osgi.spi.service;version=1.0, \
org.jboss.osgi.spi.util;version=1.0, \
+ org.jboss.osgi.testing;version=1.0, \
org.jboss.virtual;version=2.1, \
org.osgi.framework;version=1.5
More information about the jboss-osgi-commits
mailing list