[jboss-cvs] JBossAS SVN: r89542 - in projects/jboss-osgi/trunk: bundles/common/src/main/java/org/jboss/osgi/common/internal and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri May 29 18:35:40 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-05-29 18:35:40 -0400 (Fri, 29 May 2009)
New Revision: 89542
Modified:
projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context/BlueprintContextTestCase.java
projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/internal/SimpleDeployerService.java
projects/jboss-osgi/trunk/distribution/runtime/bin/run.conf
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/microcontainer/MicrocontainerTestCase.java
Log:
Simple URL deployment should not get started
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-05-29 22:02:05 UTC (rev 89541)
+++ projects/jboss-osgi/trunk/blueprint/testsuite/src/test/java/org/jboss/test/osgi/blueprint/context/BlueprintContextTestCase.java 2009-05-29 22:35:40 UTC (rev 89542)
@@ -33,7 +33,6 @@
import org.jboss.osgi.spi.testing.OSGiTest;
import org.jboss.osgi.spi.testing.capability.BlueprintCapability;
import org.jboss.osgi.spi.testing.capability.HuskyCapability;
-import org.jboss.osgi.spi.testing.capability.JMXCapability;
import org.jboss.osgi.spi.testing.capability.MicrocontainerCapability;
import org.junit.After;
import org.junit.Before;
@@ -65,7 +64,6 @@
if (context == null)
{
runtime = getDefaultRuntime();
- runtime.addCapability(new JMXCapability());
runtime.addCapability(new HuskyCapability());
runtime.addCapability(new MicrocontainerCapability());
runtime.addCapability(new BlueprintCapability());
Modified: projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/internal/SimpleDeployerService.java
===================================================================
--- projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/internal/SimpleDeployerService.java 2009-05-29 22:02:05 UTC (rev 89541)
+++ projects/jboss-osgi/trunk/bundles/common/src/main/java/org/jboss/osgi/common/internal/SimpleDeployerService.java 2009-05-29 22:35:40 UTC (rev 89542)
@@ -101,13 +101,15 @@
undeploy(info.getLocation());
}
+ // Note, in contrary to deploy(BundleInfo[]) this
+ // method does not start the bundle. The client
+ // is expected to do that
public void deploy(URL url) throws Exception
{
Bundle bundle = context.installBundle(url.toExternalForm());
log.log(LogService.LOG_INFO, "Installed: " + bundle);
deployments.put(url.toExternalForm(), bundle);
registerManagedBundle(bundle);
- bundle.start();
}
public void undeploy(URL url) throws Exception
Modified: projects/jboss-osgi/trunk/distribution/runtime/bin/run.conf
===================================================================
--- projects/jboss-osgi/trunk/distribution/runtime/bin/run.conf 2009-05-29 22:02:05 UTC (rev 89541)
+++ projects/jboss-osgi/trunk/distribution/runtime/bin/run.conf 2009-05-29 22:35:40 UTC (rev 89542)
@@ -29,7 +29,7 @@
fi
# Sample JPDA settings for remote socket debuging
-#JAVA_OPTS="$JAVA_OPTS -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"
+#JAVA_OPTS="$JAVA_OPTS -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"
# Sample JPDA settings for shared memory debugging
#JAVA_OPTS="$JAVA_OPTS -Xrunjdwp:transport=dt_shmem,server=y,suspend=n,address=jboss"
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-05-29 22:02:05 UTC (rev 89541)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/RemoteRuntime.java 2009-05-29 22:35:40 UTC (rev 89542)
@@ -203,6 +203,13 @@
return new RemotePackageAdmin(this);
}
+ @Override
+ public void shutdown()
+ {
+ super.shutdown();
+ getPackageAdmin().refreshPackages(null);
+ }
+
RemoteFramework getRemoteFramework()
{
try
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-05-29 22:02:05 UTC (rev 89541)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java 2009-05-29 22:35:40 UTC (rev 89542)
@@ -44,7 +44,6 @@
import org.jboss.osgi.spi.testing.OSGiRuntime;
import org.jboss.osgi.spi.testing.OSGiTest;
import org.jboss.osgi.spi.testing.OSGiTestHelper;
-import org.jboss.osgi.spi.testing.capability.JMXCapability;
import org.jboss.osgi.spi.testing.capability.JNDICapability;
import org.jboss.osgi.spi.testing.capability.MicrocontainerCapability;
import org.junit.AfterClass;
More information about the jboss-cvs-commits
mailing list