[jboss-cvs] JBossAS SVN: r73046 - in projects/demos/osgi: bootstrap/src/org/jboss/system/classloader and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun May 4 22:43:37 EDT 2008
Author: alesj
Date: 2008-05-04 22:43:37 -0400 (Sun, 04 May 2008)
New Revision: 73046
Modified:
projects/demos/osgi/bootstrap/src/org/jboss/system/classloader/CapabilityFilter.java
projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/ClassloadingDescribeDeployer.java
projects/demos/osgi/osgi.iws
Log:
Code refactoring #2.
Modified: projects/demos/osgi/bootstrap/src/org/jboss/system/classloader/CapabilityFilter.java
===================================================================
--- projects/demos/osgi/bootstrap/src/org/jboss/system/classloader/CapabilityFilter.java 2008-05-05 02:34:03 UTC (rev 73045)
+++ projects/demos/osgi/bootstrap/src/org/jboss/system/classloader/CapabilityFilter.java 2008-05-05 02:43:37 UTC (rev 73046)
@@ -21,10 +21,12 @@
*/
package org.jboss.system.classloader;
+import java.util.Set;
+
import org.jboss.classloader.plugins.ClassLoaderUtils;
import org.jboss.classloader.spi.filter.ClassFilter;
-import org.jboss.classloading.plugins.metadata.PackageCapability;
import org.jboss.classloading.spi.metadata.Capability;
+import org.jboss.classloading.spi.metadata.ExportPackages;
/**
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
@@ -53,10 +55,11 @@
public boolean matchesPackageName(String packageName)
{
- if (capability instanceof PackageCapability)
+ if (capability instanceof ExportPackages)
{
- PackageCapability pc = (PackageCapability)capability;
- if (pc.getPackageNames(null).contains(packageName))
+ ExportPackages ep = (ExportPackages)capability;
+ Set<String> packages = ep.getPackageNames(null);
+ if (packages != null && packages.contains(packageName))
return true;
}
Modified: projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/ClassloadingDescribeDeployer.java
===================================================================
--- projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/ClassloadingDescribeDeployer.java 2008-05-05 02:34:03 UTC (rev 73045)
+++ projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/ClassloadingDescribeDeployer.java 2008-05-05 02:43:37 UTC (rev 73046)
@@ -54,7 +54,7 @@
protected ClassLoaderPolicy determinePolicy()
{
MockClassLoaderPolicy policy = new MockClassLoaderPolicy(unit.getSimpleName());
- VFSDeploymentUnit vfsUnit = VFSDeploymentUnit.class.cast(unit);
+ VFSDeploymentUnit vfsUnit = (VFSDeploymentUnit)unit;
policy.setRoot(vfsUnit.getRoot());
policy.setDelegates(getDelegates());
return policy;
@@ -70,8 +70,10 @@
if (capability.resolves(this, requirement))
return new FilteredDelegateLoader(getPolicy(), new CapabilityFilter(capability));
}
+ // none of the capabilities match - don't put it as delegate
+ return null;
}
- return null;
+ return super.getDelegateLoader(module, requirement);
}
};
}
Modified: projects/demos/osgi/osgi.iws
===================================================================
--- projects/demos/osgi/osgi.iws 2008-05-05 02:34:03 UTC (rev 73045)
+++ projects/demos/osgi/osgi.iws 2008-05-05 02:43:37 UTC (rev 73046)
@@ -49,7 +49,7 @@
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/ClassloadingDescribeDeployer.java" afterPath="$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/ClassloadingDescribeDeployer.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/osgi.iws" afterPath="$PROJECT_DIR$/osgi.iws" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/CapabilityFilter.java" afterPath="$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/CapabilityFilter.java" />
</list>
</component>
<component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
@@ -191,15 +191,80 @@
</provider>
</entry>
</file>
- <file leaf-file-name="ClassloadingDescribeDeployer.java" pinned="false" current="true" current-in-tab="true">
+ <file leaf-file-name="ClassloadingDescribeDeployer.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/ClassloadingDescribeDeployer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="62" column="42" selection-start="2917" selection-end="2917" vertical-scroll-proportion="0.43503937">
+ <state line="56" column="63" selection-start="2727" selection-end="2727" vertical-scroll-proportion="0.33464566">
<folding />
</state>
</provider>
</entry>
</file>
+ <file leaf-file-name="CapabilityFilter.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/CapabilityFilter.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="60" column="44" selection-start="2165" selection-end="2165" vertical-scroll-proportion="0.6692913">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="Capability.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/metadata/Capability.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="33" column="17" selection-start="1290" selection-end="1290" vertical-scroll-proportion="0.18405512">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="PackageCapability.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/plugins/metadata/PackageCapability.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="82" column="22" selection-start="2702" selection-end="2702" vertical-scroll-proportion="0.9251968">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="ExportPackages.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/metadata/ExportPackages.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="41" column="0" selection-start="1415" selection-end="1415" vertical-scroll-proportion="0.31791338">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="Module.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/dependency/Module.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="498" column="45" selection-start="13691" selection-end="13691" vertical-scroll-proportion="0.38976377">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="ClassFilter.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloader/2.0.0.Beta12/jboss-classloader-2.0.0.Beta12-sources.jar!/org/jboss/classloader/spi/filter/ClassFilter.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="70" column="11" selection-start="2426" selection-end="2426" vertical-scroll-proportion="0.7864173">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="ClassLoaderPolicyModule.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/dependency/policy/ClassLoaderPolicyModule.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="182" column="25" selection-start="6164" selection-end="6164" vertical-scroll-proportion="0.6820866">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
</leaf>
</component>
<component name="FindManager">
@@ -1153,120 +1218,118 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/plugins/metadata/PackageCapability.java">
+ <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloader/2.0.0.Beta12/jboss-classloader-2.0.0.Beta12-sources.jar!/org/jboss/classloader/spi/filter/LazyFilteredDelegateLoader.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="82" column="22" selection-start="2702" selection-end="2702" vertical-scroll-proportion="0.66032064">
+ <state line="48" column="45" selection-start="1810" selection-end="1810" vertical-scroll-proportion="0.45991984">
<folding />
</state>
</provider>
</entry>
- <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloader/2.0.0.Beta12/jboss-classloader-2.0.0.Beta12-sources.jar!/org/jboss/classloader/plugins/ClassLoaderUtils.java">
+ <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloader/2.0.0.Beta12/jboss-classloader-2.0.0.Beta12-sources.jar!/org/jboss/classloader/spi/ClassLoaderPolicy.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="127" column="30" selection-start="3967" selection-end="3967" vertical-scroll-proportion="0.33266532">
+ <state line="83" column="28" selection-start="2920" selection-end="2920" vertical-scroll-proportion="0.749499">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/CapabilityFilter.java">
+ <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloader/2.0.0.Beta12/jboss-classloader-2.0.0.Beta12-sources.jar!/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="39" column="6" selection-start="1583" selection-end="1583" vertical-scroll-proportion="0.3236473">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="550" column="18" selection-start="17289" selection-end="17289" vertical-scroll-proportion="0.12825651">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/PropertyClassloaderMetaDataDeployer.java">
+ <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/MockClassLoaderPolicy.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="66" column="58" selection-start="2718" selection-end="2718" vertical-scroll-proportion="0.4308617">
+ <state line="326" column="0" selection-start="8421" selection-end="8421" vertical-scroll-proportion="4.2414827">
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="jar://$M2_REPO$/org/jboss/deployers/jboss-deployers-vfs/2.0.0.Beta15/jboss-deployers-vfs-2.0.0.Beta15-sources.jar!/org/jboss/deployers/vfs/plugins/classloader/VFSDeploymentClassLoaderPolicyModule.java">
+ <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloader/2.0.0.Beta12/jboss-classloader-2.0.0.Beta12-sources.jar!/org/jboss/classloader/spi/ClassLoaderSystem.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="136" column="40" selection-start="4677" selection-end="4677" vertical-scroll-proportion="0.49398798">
+ <state line="49" column="22" selection-start="1828" selection-end="1828" vertical-scroll-proportion="-2.175197">
<folding />
</state>
</provider>
</entry>
- <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading-vfs/2.0.0.Beta12/jboss-classloading-vfs-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/vfs/policy/VFSClassLoaderPolicy.java">
+ <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/dependency/Domain.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="311" column="19" selection-start="7685" selection-end="7685" vertical-scroll-proportion="0.33266532">
+ <state line="156" column="31" selection-start="4880" selection-end="4880" vertical-scroll-proportion="0.7322835">
<folding />
</state>
</provider>
</entry>
- <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloader/2.0.0.Beta12/jboss-classloader-2.0.0.Beta12-sources.jar!/org/jboss/classloader/spi/filter/LazyFilteredDelegateLoader.java">
+ <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/dependency/ClassLoading.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="48" column="45" selection-start="1810" selection-end="1810" vertical-scroll-proportion="0.45991984">
+ <state line="78" column="18" selection-start="2478" selection-end="2478" vertical-scroll-proportion="0.84940946">
<folding />
</state>
</provider>
</entry>
- <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloader/2.0.0.Beta12/jboss-classloader-2.0.0.Beta12-sources.jar!/org/jboss/classloader/spi/ClassLoaderPolicy.java">
+ <entry file="file://$PROJECT_DIR$/bootstrap/resources/bootstrap-beans.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="83" column="28" selection-start="2920" selection-end="2920" vertical-scroll-proportion="0.749499">
+ <state line="156" column="85" selection-start="7675" selection-end="7675" vertical-scroll-proportion="0.4874372">
<folding />
</state>
</provider>
</entry>
- <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloader/2.0.0.Beta12/jboss-classloader-2.0.0.Beta12-sources.jar!/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java">
+ <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/dependency/policy/ClassLoaderPolicyModule.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="550" column="18" selection-start="17289" selection-end="17289" vertical-scroll-proportion="0.12825651">
+ <state line="182" column="25" selection-start="6164" selection-end="6164" vertical-scroll-proportion="0.6820866">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/MockClassLoaderPolicy.java">
+ <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloader/2.0.0.Beta12/jboss-classloader-2.0.0.Beta12-sources.jar!/org/jboss/classloader/spi/filter/ClassFilter.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="326" column="0" selection-start="8421" selection-end="8421" vertical-scroll-proportion="4.2414827">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="70" column="11" selection-start="2426" selection-end="2426" vertical-scroll-proportion="0.7864173">
+ <folding />
</state>
</provider>
</entry>
- <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloader/2.0.0.Beta12/jboss-classloader-2.0.0.Beta12-sources.jar!/org/jboss/classloader/spi/ClassLoaderSystem.java">
+ <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/metadata/Capability.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="49" column="22" selection-start="1828" selection-end="1828" vertical-scroll-proportion="-2.175197">
+ <state line="33" column="17" selection-start="1290" selection-end="1290" vertical-scroll-proportion="0.18405512">
<folding />
</state>
</provider>
</entry>
- <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/dependency/Domain.java">
+ <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/dependency/Module.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="156" column="31" selection-start="4880" selection-end="4880" vertical-scroll-proportion="0.7322835">
+ <state line="498" column="45" selection-start="13691" selection-end="13691" vertical-scroll-proportion="0.38976377">
<folding />
</state>
</provider>
</entry>
- <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/dependency/Module.java">
+ <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/ClassloadingDescribeDeployer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="635" column="26" selection-start="17037" selection-end="17037" vertical-scroll-proportion="0.53149605">
+ <state line="56" column="63" selection-start="2727" selection-end="2727" vertical-scroll-proportion="0.33464566">
<folding />
</state>
</provider>
</entry>
- <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/dependency/ClassLoading.java">
+ <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/CapabilityFilter.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="78" column="18" selection-start="2478" selection-end="2478" vertical-scroll-proportion="0.84940946">
- <folding />
+ <state line="60" column="44" selection-start="2165" selection-end="2165" vertical-scroll-proportion="0.6692913">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/bootstrap/resources/bootstrap-beans.xml">
+ <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/spi/metadata/ExportPackages.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="156" column="85" selection-start="7675" selection-end="7675" vertical-scroll-proportion="0.4874372">
+ <state line="41" column="0" selection-start="1415" selection-end="1415" vertical-scroll-proportion="0.31791338">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/ClassloadingDescribeDeployer.java">
+ <entry file="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/org/jboss/classloading/plugins/metadata/PackageCapability.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="62" column="42" selection-start="2917" selection-end="2917" vertical-scroll-proportion="0.43503937">
+ <state line="82" column="22" selection-start="2702" selection-end="2702" vertical-scroll-proportion="0.9251968">
<folding />
</state>
</provider>
More information about the jboss-cvs-commits
mailing list