Author: thomas.diesler(a)jboss.com
Date: 2010-03-16 12:18:49 -0400 (Tue, 16 Mar 2010)
New Revision: 102467
Modified:
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/internal/OSGiBootstrapBean.java
projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java
projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSAdaptor30.java
projects/jboss-osgi/trunk/pom.xml
Log:
Update to to vfs30 protocol handlers
Modified:
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/internal/OSGiBootstrapBean.java
===================================================================
---
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/internal/OSGiBootstrapBean.java 2010-03-16
15:34:28 UTC (rev 102466)
+++
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/internal/OSGiBootstrapBean.java 2010-03-16
16:18:49 UTC (rev 102467)
@@ -57,6 +57,7 @@
private static Logger log;
private static final String JAVA_PROTOCOL_HANDLERS =
"java.protocol.handler.pkgs";
+ private static final String DEFAULT_JAVA_PROTOCOL_HANDLERS =
"org.jboss.net.protocol|org.jboss.virtual.protocol|org.jboss.vfs.protocol";
private static final String JBOSS_BIND_ADDRESS = "jboss.bind.address";
private static final String OSGI_SERVER_NAME = "osgi.server.name";
@@ -108,7 +109,7 @@
defaults.setProperty(OSGI_SERVER_NAME, serverName);
defaults.setProperty(OSGI_SERVER_HOME, osgiServerHome);
defaults.setProperty(JBOSS_BIND_ADDRESS, bindAddress);
- defaults.setProperty(JAVA_PROTOCOL_HANDLERS,
"org.jboss.net.protocol|org.jboss.virtual.protocol");
+ defaults.setProperty(JAVA_PROTOCOL_HANDLERS, DEFAULT_JAVA_PROTOCOL_HANDLERS);
log.debug("JBoss OSGi System Properties");
log.debug(" " + OSGI_SERVER_HOME + "=" + osgiServerHome);
Modified:
projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java
===================================================================
---
projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java 2010-03-16
15:34:28 UTC (rev 102466)
+++
projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/internal/OSGiRuntimeImpl.java 2010-03-16
16:18:49 UTC (rev 102467)
@@ -154,7 +154,16 @@
Collections.reverse(bundleInfos);
for (BundleInfo info : bundleInfos)
- failsafeUninstall(bundles.remove(info.getLocation()));
+ {
+ OSGiBundle bundle = bundles.get(info.getLocation());
+ failsafeStop(bundle);
+ }
+
+ for (BundleInfo info : bundleInfos)
+ {
+ OSGiBundle bundle = bundles.remove(info.getLocation());
+ failsafeUninstall(bundle);
+ }
}
List<Capability> dependencies = new
ArrayList<Capability>(capability.getDependencies());
@@ -409,6 +418,21 @@
return AbstractVFS.getRoot(target.toURI().toURL());
}
+ private void failsafeStop(OSGiBundle bundle)
+ {
+ if (bundle != null)
+ {
+ try
+ {
+ bundle.stop();
+ }
+ catch (Exception ex)
+ {
+ log.warn("Cannot stop bundle: " + bundle, ex);
+ }
+ }
+ }
+
private void failsafeUninstall(OSGiBundle bundle)
{
if (bundle != null)
Modified:
projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSAdaptor30.java
===================================================================
---
projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSAdaptor30.java 2010-03-16
15:34:28 UTC (rev 102466)
+++
projects/jboss-osgi/projects/vfs/trunk/vfs30/src/main/java/org/jboss/osgi/vfs30/VFSAdaptor30.java 2010-03-16
16:18:49 UTC (rev 102467)
@@ -101,7 +101,7 @@
private boolean acceptForMount(org.jboss.vfs.VirtualFile nativeFile)
{
boolean accept = false;
- if (nativeFile.isFile() == false)
+ if (nativeFile.isFile() == true)
{
String rootName = nativeFile.getName();
for (String suffix : suffixes)
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2010-03-16 15:34:28 UTC (rev 102466)
+++ projects/jboss-osgi/trunk/pom.xml 2010-03-16 16:18:49 UTC (rev 102467)
@@ -461,7 +461,7 @@
</property>
<property>
<name>java.protocol.handler.pkgs</name>
-
<value>org.jboss.net.protocol|org.jboss.virtual.protocol</value>
+ <value>org.jboss.vfs.protocol</value>
</property>
<property>
<name>jndi.server.port</name>