[jboss-osgi-commits] JBoss-OSGI SVN: r94606 - in projects/jboss-osgi/trunk: reactor/framework/src/main/java/org/jboss/osgi/framework/bundle and 1 other directory.

Author: thomas.diesler(a)jboss.com Date: 2009-10-09 11:21:10 -0400 (Fri, 09 Oct 2009) New Revision: 94606 Modified: projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiSystemState.java Log: [JBOSGI-177] HttpService bundles need to import org.ops4j.pax.web.service Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-10-09 15:19:35 UTC (rev 94605) +++ projects/jboss-osgi/trunk/pom.xml 2009-10-09 15:21:10 UTC (rev 94606) @@ -58,7 +58,7 @@ <version.jboss.osgi.runtime.felix>2.0.0</version.jboss.osgi.runtime.felix> <version.jboss.osgi.runtime.jbossas>1.0.1</version.jboss.osgi.runtime.jbossas> <version.jboss.osgi.spi>1.0.2-SNAPSHOT</version.jboss.osgi.spi> - <version.jboss.osgi.webconsole>1.0.1</version.jboss.osgi.webconsole> + <version.jboss.osgi.webconsole>1.0.2-SNAPSHOT</version.jboss.osgi.webconsole> <version.jboss.osgi.xml.binding>2.0.1.SP1</version.jboss.osgi.xml.binding> <version.ops4j.pax.base>1.2.1</version.ops4j.pax.base> <version.ops4j.pax.web>0.7.0</version.ops4j.pax.web> Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java 2009-10-09 15:19:35 UTC (rev 94605) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java 2009-10-09 15:21:10 UTC (rev 94606) @@ -484,7 +484,6 @@ StringBuilder builder = new StringBuilder(); builder.append("Service{"); builder.append("id=").append(getServiceId()); - builder.append(" bundle=").append(getBundleState().getCanonicalName()); builder.append(" classes=").append(Arrays.asList(getClasses())); builder.append("}"); return builder.toString(); Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiSystemState.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiSystemState.java 2009-10-09 15:19:35 UTC (rev 94605) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiSystemState.java 2009-10-09 15:21:10 UTC (rev 94606) @@ -25,10 +25,12 @@ import java.io.InputStream; import java.net.URL; import java.util.Enumeration; +import java.util.Vector; import org.jboss.logging.Logger; import org.jboss.osgi.framework.metadata.OSGiMetaData; import org.jboss.osgi.spi.NotImplementedException; +import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; import org.osgi.framework.Constants; @@ -71,10 +73,32 @@ } @SuppressWarnings("unchecked") - public Enumeration findEntries(String path, String filePattern, boolean recurse) + public Enumeration<URL> findEntries(String path, String filePattern, boolean recurse) { log.warn("[JBOSGI-138] findEntries(" + path + "," + filePattern + "," + recurse + ")"); return null; + + // [Bug-1472] Clarify the semantic of resource API when called on the system bundle + // https://www.osgi.org/members/bugzilla/show_bug.cgi?id=1472 + /* + Vector<URL> entryList = new Vector<URL>(); + for (Bundle bundle : getBundleManager().getBundles()) + { + if (bundle != this) + { + Enumeration<URL> bundleEntries = bundle.findEntries(path, filePattern, recurse); + if (bundleEntries != null) + { + while(bundleEntries.hasMoreElements()) + { + URL next = bundleEntries.nextElement(); + entryList.add(next); + } + } + } + } + return (entryList.size() > 0 ? entryList.elements() : null); + */ } public URL getEntry(String path)