8:37 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2009-11-23 09:37:50 -0500 (Mon, 23 Nov 2009)
New Revision: 96737
Removed:
projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/NoopResolverImpl.java
Modified:
projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
projects/jboss-osgi/trunk/testsuite/functional/pom.xml
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
Log:
Remove ResolverPlugin from all configurations
Modified:
projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
---
projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-23
14:20:56 UTC (rev 96736)
+++
projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-23
14:37:50 UTC (rev 96737)
@@ -71,9 +71,6 @@
</list>
</property>
</bean>
- <bean name="OSGiBundleResolver"
class="org.jboss.osgi.framework.resolver.internal.basic.BasicResolverImpl">
- <constructor><parameter><inject bean="OSGiBundleManager"
/></parameter></constructor>
- </bean>
<bean name="OSGiFrameworkEventsPlugin"
class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager"
/></parameter></constructor>
<property name="synchronous">true</property>
Deleted:
projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/NoopResolverImpl.java
===================================================================
---
projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/NoopResolverImpl.java 2009-11-23
14:20:56 UTC (rev 96736)
+++
projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/NoopResolverImpl.java 2009-11-23
14:37:50 UTC (rev 96737)
@@ -1,99 +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.framework.resolver.internal;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.jboss.osgi.framework.bundle.OSGiBundleManager;
-import org.jboss.osgi.framework.resolver.AbstractResolver;
-import org.jboss.osgi.framework.resolver.ExportPackage;
-import org.jboss.osgi.framework.resolver.ResolverBundle;
-import org.osgi.framework.Bundle;
-
-/**
- * A dummy resolver that always that performs no internal resolution.
- *
- * When this resolver is installed into the framework, only the functionality that is
build
- * into the Microcontainer will be used to resolve the bundles. Additional contraints
might
- * be modeled by the OSGi Capability/Requirement implementations.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 23-Nov-2009
- */
-public class NoopResolverImpl extends AbstractResolver
-{
- public NoopResolverImpl(OSGiBundleManager bundleManager)
- {
- super(bundleManager);
- }
-
- @Override
- public ResolverBundle addBundle(Bundle bundle)
- {
- // Ignore the system bundle
- if (bundle.getBundleId() == 0)
- return null;
-
- return super.addBundle(bundle);
- }
-
- public ExportPackage getExporter(Bundle importer, String packageName)
- {
- return null;
- }
-
- // Always return the complete list of unresolved bundles
- public List<ResolverBundle> resolve(List<Bundle> bundles)
- {
- // Get the list of unresolved resBundles
- List<ResolverBundle> unresolved = new ArrayList<ResolverBundle>();
- if (bundles == null)
- {
- for (ResolverBundle aux : getBundles())
- {
- if (aux.isResolved() == false)
- unresolved.add(aux);
- }
- }
- else
- {
- for (Bundle bundle : bundles)
- {
- ResolverBundle aux = getBundle(bundle);
- if (aux == null)
- throw new IllegalStateException("Cannot obtain resBundle for: "
+ bundle);
-
- if (aux.isResolved() == false)
- unresolved.add(aux);
- }
- }
- return Collections.unmodifiableList(unresolved);
- }
-
- // Always return true for the suggested match
- public boolean match(Bundle importer, Bundle exporter, String packageName)
- {
- return true;
- }
-}
\ No newline at end of file
Modified:
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
---
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-23
14:20:56 UTC (rev 96736)
+++
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-23
14:37:50 UTC (rev 96737)
@@ -71,9 +71,6 @@
</list>
</property>
</bean>
- <bean name="OSGiBundleResolver"
class="org.jboss.osgi.framework.resolver.internal.basic.BasicResolverImpl">
- <constructor><parameter><inject bean="OSGiBundleManager"
/></parameter></constructor>
- </bean>
<bean name="OSGiFrameworkEventsPlugin"
class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager"
/></parameter></constructor>
<property name="synchronous">true</property>
Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-11-23 14:20:56 UTC (rev
96736)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-11-23 14:37:50 UTC (rev
96737)
@@ -264,6 +264,7 @@
<exclude>org/jboss/test/osgi/jbosgi99/**</exclude>
<exclude>org/jboss/test/osgi/jbosgi108/**</exclude>
<exclude>org/jboss/test/osgi/jbosgi143/**</exclude>
+ <exclude>org/jboss/test/osgi/jbosgi151/**</exclude>
<exclude>org/jboss/test/osgi/service/microcontainer/**</exclude>
<!-- [JBOSGI-204] Failure in Bundle.start() uninstalls the bundle
-->
<exclude>org/jboss/test/osgi/jbosgi99/**</exclude>
@@ -311,6 +312,7 @@
<exclude>org/jboss/test/osgi/jbosgi41/**</exclude>
<exclude>org/jboss/test/osgi/jbosgi108/**</exclude>
<exclude>org/jboss/test/osgi/jbosgi143/**</exclude>
+ <exclude>org/jboss/test/osgi/jbosgi151/**</exclude>
<exclude>org/jboss/test/osgi/service/microcontainer/**</exclude>
<!-- [JBOSGI-204] Failure in Bundle.start() uninstalls the bundle
-->
<exclude>org/jboss/test/osgi/jbosgi99/**</exclude>
Modified:
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
---
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-23
14:20:56 UTC (rev 96736)
+++
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-23
14:37:50 UTC (rev 96737)
@@ -72,9 +72,6 @@
</list>
</property>
</bean>
- <bean name="OSGiBundleResolver"
class="org.jboss.osgi.framework.resolver.internal.basic.BasicResolverImpl">
- <constructor><parameter><inject bean="OSGiBundleManager"
/></parameter></constructor>
- </bean>
<bean name="OSGiFrameworkEventsPlugin"
class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl">
<constructor><parameter><inject bean="OSGiBundleManager"
/></parameter></constructor>
</bean>