[jboss-cvs] JBossAS SVN: r73040 - in projects/demos/osgi: acme1 and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun May 4 17:33:38 EDT 2008
Author: alesj
Date: 2008-05-04 17:33:38 -0400 (Sun, 04 May 2008)
New Revision: 73040
Added:
projects/demos/osgi/bootstrap/src/org/jboss/system/classloader/CapabilityFilter.java
projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/ClassloadingDescribeDeployer.java
Removed:
projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/ClassloadingDeployer.java
projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/MockTopLevelClassLoaderSystemDeployer.java
Modified:
projects/demos/osgi/acme1/acme1.iml
projects/demos/osgi/acme1/src/META-INF/acme-clmd.properties
projects/demos/osgi/acme2/acme2.iml
projects/demos/osgi/bootstrap/bootstrap.iml
projects/demos/osgi/bootstrap/resources/bootstrap-beans.xml
projects/demos/osgi/bootstrap/src/org/jboss/system/classloader/MockClassLoaderPolicy.java
projects/demos/osgi/bootstrap/src/org/jboss/system/classloader/PackageVisitor.java
projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/PropertyClassloaderMetaDataDeployer.java
projects/demos/osgi/foo/foo.iml
projects/demos/osgi/foo/src/META-INF/foo-clmd.properties
projects/demos/osgi/osgi.ipr
projects/demos/osgi/osgi.iws
Log:
Fixed demo, to work against current MC code.
Modified: projects/demos/osgi/acme1/acme1.iml
===================================================================
--- projects/demos/osgi/acme1/acme1.iml 2008-05-04 19:10:20 UTC (rev 73039)
+++ projects/demos/osgi/acme1/acme1.iml 2008-05-04 21:33:38 UTC (rev 73040)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
+<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="BuildJarSettings">
<containerInfo>
<containerElement type="module" name="acme1">
@@ -11,8 +11,6 @@
<setting name="buildJar" value="true" />
<setting name="mainClass" value="" />
</component>
- <component name="DependecySynchronizer" />
- <component name="ModuleRootManager" />
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
@@ -23,7 +21,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-logging-spi.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.CR1/lib/jboss-logging-spi.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: projects/demos/osgi/acme1/src/META-INF/acme-clmd.properties
===================================================================
--- projects/demos/osgi/acme1/src/META-INF/acme-clmd.properties 2008-05-04 19:10:20 UTC (rev 73039)
+++ projects/demos/osgi/acme1/src/META-INF/acme-clmd.properties 2008-05-04 21:33:38 UTC (rev 73040)
@@ -1,3 +1,3 @@
domain=FooBarDomain
-capabilities=org.jboss.acme.ales:1|org.jboss.acme.ales.impl:1|org.jboss.acme.scott:1|org.jboss.acme.scott.impl:1|org.jboss.acme.print:1||org.jboss.acme:1
+capabilities=org.jboss.acme.ales:1|org.jboss.acme.ales.impl:1|org.jboss.acme.scott:1|org.jboss.acme.scott.impl:1|org.jboss.acme.print:1|org.jboss.acme:1
Modified: projects/demos/osgi/acme2/acme2.iml
===================================================================
--- projects/demos/osgi/acme2/acme2.iml 2008-05-04 19:10:20 UTC (rev 73039)
+++ projects/demos/osgi/acme2/acme2.iml 2008-05-04 21:33:38 UTC (rev 73040)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
+<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="BuildJarSettings">
<containerInfo>
<containerElement type="module" name="acme2">
@@ -11,8 +11,6 @@
<setting name="buildJar" value="true" />
<setting name="mainClass" value="" />
</component>
- <component name="DependecySynchronizer" />
- <component name="ModuleRootManager" />
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
@@ -23,7 +21,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-logging-spi.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.CR1/lib/jboss-logging-spi.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: projects/demos/osgi/bootstrap/bootstrap.iml
===================================================================
--- projects/demos/osgi/bootstrap/bootstrap.iml 2008-05-04 19:10:20 UTC (rev 73039)
+++ projects/demos/osgi/bootstrap/bootstrap.iml 2008-05-04 21:33:38 UTC (rev 73040)
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
- <component name="DependecySynchronizer" />
- <component name="ModuleRootManager" />
+<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
@@ -9,457 +7,43 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module-library" exported="">
+ <orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/mc_trunk/jboss-dependency.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../microcontainer/vfs-alter-jar/target/jboss-vfs.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
+ <orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/mc_trunk/jboss-kernel.jar!/" />
+ <root url="file://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.CR1/lib" />
+ <root url="file://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.CR1/lib/endorsed" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/../../../microcontainer/kernel/target/jboss-kernel-sources.jar!/" />
+ <root url="jar://$M2_REPO$/org/jboss/cl/jboss-classloader/2.0.0.Beta12/jboss-classloader-2.0.0.Beta12-sources.jar!/" />
+ <root url="jar://$M2_REPO$/org/jboss/cl/jboss-classloading/2.0.0.Beta12/jboss-classloading-2.0.0.Beta12-sources.jar!/" />
+ <root url="jar://$M2_REPO$/org/jboss/cl/jboss-classloading-vfs/2.0.0.Beta12/jboss-classloading-vfs-2.0.0.Beta12-sources.jar!/" />
+ <root url="jar://$M2_REPO$/org/jboss/deployers/jboss-deployers-impl/2.0.0.Beta15/jboss-deployers-impl-2.0.0.Beta15-sources.jar!/" />
+ <root url="jar://$M2_REPO$/org/jboss/deployers/jboss-deployers-client-spi/2.0.0.Beta15/jboss-deployers-client-spi-2.0.0.Beta15-sources.jar!/" />
+ <root url="file://$M2_REPO$/org/jboss/cl" />
+ <root url="jar://$M2_REPO$/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.0.Beta15/jboss-deployers-vfs-spi-2.0.0.Beta15-sources.jar!/" />
+ <root url="jar://$M2_REPO$/org/jboss/deployers/jboss-deployers-core-spi/2.0.0.Beta15/jboss-deployers-core-spi-2.0.0.Beta15-sources.jar!/" />
+ <root url="jar://$M2_REPO$/org/jboss/deployers/jboss-deployers-spi/2.0.0.Beta15/jboss-deployers-spi-2.0.0.Beta15-sources.jar!/" />
+ <root url="jar://$M2_REPO$/org/jboss/deployers/jboss-deployers-structure-spi/2.0.0.Beta15/jboss-deployers-structure-spi-2.0.0.Beta15-sources.jar!/" />
+ <root url="jar://$M2_REPO$/org/jboss/deployers/jboss-deployers-client/2.0.0.Beta15/jboss-deployers-client-2.0.0.Beta15-sources.jar!/" />
+ <root url="jar://$M2_REPO$/org/jboss/deployers/jboss-deployers-vfs/2.0.0.Beta15/jboss-deployers-vfs-2.0.0.Beta15-sources.jar!/" />
+ <root url="jar://$M2_REPO$/org/jboss/deployers/jboss-deployers-core/2.0.0.Beta15/jboss-deployers-core-2.0.0.Beta15-sources.jar!/" />
+ <root url="jar://$M2_REPO$/org/jboss/microcontainer/jboss-dependency/2.0.0.Beta14/jboss-dependency-2.0.0.Beta14-sources.jar!/" />
+ <root url="jar://$M2_REPO$/org/jboss/microcontainer/jboss-kernel/2.0.0.Beta14/jboss-kernel-2.0.0.Beta14-sources.jar!/" />
</SOURCES>
+ <jarDirectory url="file://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.CR1/lib" recursive="false" />
+ <jarDirectory url="file://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.CR1/lib/endorsed" recursive="false" />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/mc_trunk/jboss-deployers-impl.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../microcontainer/deployers-impl/target/jboss-deployers-impl-sources.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/mc_trunk/jboss-deployers-client.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/mc_trunk/jboss-managed.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/mc_trunk/jboss-deployers-core.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/mc_trunk/jboss-deployers-structure-spi.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../microcontainer/deployers-structure-spi/target/jboss-deployers-structure-spi-sources.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/mc_trunk/jboss-deployers-core-spi.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/mc_trunk/jboss-deployers-vfs-spi.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/mc_trunk/jboss-container.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/mc_trunk/jboss-classloader.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../microcontainer/classloader/target/jboss-classloader-sources.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/mc_trunk/jboss-deployers-vfs.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/mc_trunk/jboss-deployers-spi.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/mc_trunk/jboss-deployers-client-spi.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/mc_trunk/jboss-aop-mc-int.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/mc_trunk/jboss-metatype.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library" exported="">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss-vfs/target/jboss-vfs.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../jboss-vfs/target/jboss-vfs-sources.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-aop-deployer-jdk50.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/javassist.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/stax-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/dom4j.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-common-core.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-aop-jdk50.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-aop-jboss5.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/jaxb-impl.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/getopt.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-classloading-spi.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-xml-binding.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/trove.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/osgi.core.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-aop-jboss4-jdk50.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/concurrent.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-logging-jdk.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-logging-spi.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/activation.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/jaxb-xjc.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/wstx.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-system-jmx.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/endorsed/jaxb-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/endorsed/xalan.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/endorsed/xercesImpl.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/endorsed/resolver.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/endorsed/xml-apis.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/endorsed/serializer.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-system.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-j2se.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-jmx.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/jboss-logging-log4j.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../jboss5/trunk/build/output/jboss-5.0.0.Beta4/lib/log4j-boot.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: projects/demos/osgi/bootstrap/resources/bootstrap-beans.xml
===================================================================
--- projects/demos/osgi/bootstrap/resources/bootstrap-beans.xml 2008-05-04 19:10:20 UTC (rev 73039)
+++ projects/demos/osgi/bootstrap/resources/bootstrap-beans.xml 2008-05-04 21:33:38 UTC (rev 73040)
@@ -16,46 +16,33 @@
<constructor factoryClass="org.jboss.system.classloader.NoAnnotationURLClassLoader" factoryMethod="createClassLoader">
<parameter>
<array elementClass="java.net.URL">
- <!-- VFS -->
- <value>${jboss.lib.url}/jboss-vfs.jar</value>
- <!-- ClassLoader -->
- <value>${jboss.lib.url}/jboss-classloading-spi.jar</value>
- <value>${jboss.lib.url}/jboss-classloader.jar</value>
- <value>${jboss.lib.url}/osgi.core.jar</value>
- <!-- Deployers -->
- <value>${jboss.lib.url}/jboss-metatype.jar</value>
- <value>${jboss.lib.url}/jboss-managed.jar</value>
- <value>${jboss.lib.url}/jboss-deployers-core-spi.jar</value>
- <value>${jboss.lib.url}/jboss-deployers-core.jar</value>
- <value>${jboss.lib.url}/jboss-deployers-client-spi.jar</value>
- <value>${jboss.lib.url}/jboss-deployers-client.jar</value>
- <value>${jboss.lib.url}/jboss-deployers-structure-spi.jar</value>
- <value>${jboss.lib.url}/jboss-deployers-spi.jar</value>
- <value>${jboss.lib.url}/jboss-deployers-impl.jar</value>
- <value>${jboss.lib.url}/jboss-deployers-vfs-spi.jar</value>
- <value>${jboss.lib.url}/jboss-deployers-vfs.jar</value>
- <!-- System -->
- <value>${jboss.lib.url}/jboss-system.jar</value>
- <!-- JMX -->
- <value>${jboss.lib.url}/jboss-j2se.jar</value>
- <value>${jboss.lib.url}/jboss-mbeans.jar</value>
- <value>${jboss.lib.url}/jboss-jmx.jar</value>
- <value>${jboss.lib.url}/jboss-system-jmx.jar</value>
- <value>${jboss.lib.url}/dom4j.jar</value>
- <!-- AOP -->
- <value>${jboss.lib.url}/jboss-aop-jdk50.jar</value>
- <value>${jboss.lib.url}/jboss-aop-deployer-jdk50.jar</value>
- <value>${jboss.lib.url}/jboss-aop-mc-int.jar</value>
- <!-- Kill once we use the new classloaders -->
- <value>${jboss.lib.url}/jboss-aop-jboss4-jdk50.jar</value>
- <value>${jboss.lib.url}/jboss-aop-jboss5.jar</value>
- <value>${jboss.lib.url}/trove.jar</value>
- <!-- JAXB - shouldn't this be in endorsed? -->
- <value>${jboss.lib.url}/activation.jar</value>
- <value>${jboss.lib.url}/jaxb-api.jar</value>
- <value>${jboss.lib.url}/jaxb-impl.jar</value>
- <value>${jboss.lib.url}/stax-api.jar</value>
- <value>${jboss.lib.url}/wstx.jar</value>
+ <!-- Deployers -->
+ <value>${jboss.lib.url}/jboss-deployers-core-spi.jar</value>
+ <value>${jboss.lib.url}/jboss-deployers-core.jar</value>
+ <value>${jboss.lib.url}/jboss-deployers-client-spi.jar</value>
+ <value>${jboss.lib.url}/jboss-deployers-client.jar</value>
+ <value>${jboss.lib.url}/jboss-deployers-structure-spi.jar</value>
+ <value>${jboss.lib.url}/jboss-deployers-spi.jar</value>
+ <value>${jboss.lib.url}/jboss-deployers-impl.jar</value>
+ <value>${jboss.lib.url}/jboss-deployers-vfs-spi.jar</value>
+ <value>${jboss.lib.url}/jboss-deployers-vfs.jar</value>
+ <!-- System -->
+ <value>${jboss.lib.url}/jboss-system.jar</value>
+ <!-- JMX -->
+ <value>${jboss.lib.url}/jboss-j2se.jar</value>
+ <value>${jboss.lib.url}/jboss-mbeans.jar</value>
+ <value>${jboss.lib.url}/jboss-jmx.jar</value>
+ <value>${jboss.lib.url}/jboss-system-jmx.jar</value>
+ <value>${jboss.lib.url}/dom4j.jar</value>
+ <!-- AOP -->
+ <value>${jboss.lib.url}/jboss-aop-deployer-jdk50.jar</value>
+ <value>${jboss.lib.url}/jboss-aop-jboss4-jdk50.jar</value>
+ <value>${jboss.lib.url}/jboss-aop-jboss5.jar</value>
+ <!-- JAXB - shouldn't this be in endorsed? -->
+ <value>${jboss.lib.url}/activation.jar</value>
+ <value>${jboss.lib.url}/jaxb-impl.jar</value>
+ <value>${jboss.lib.url}/stax-api.jar</value>
+ <value>${jboss.lib.url}/wstx.jar</value>
</array>
</parameter>
</constructor>
@@ -91,7 +78,7 @@
</bean>
<!-- A declared structure descriptor deployer -->
- <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"></bean>
+ <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"/>
<!-- JAR Structure -->
<bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
@@ -161,15 +148,16 @@
<bean name="ClassLoaderSystem" class="org.jboss.classloader.spi.ClassLoaderSystem">
<constructor factoryClass="org.jboss.classloader.spi.ClassLoaderSystem" factoryMethod="getInstance"/>
</bean>
- <bean name="ClassLoading" class="org.jboss.deployers.plugins.classloading.ClassLoading"/>
+ <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading">
+ <incallback method="addModule" state="Configured"/>
+ <uncallback method="removeModule" state="Configured"/>
+ </bean>
<bean name="HackClassLoaderMetaDataDeployer" class="org.jboss.system.deployers.PropertyClassloaderMetaDataDeployer"/>
- <bean name="ClassloadingDeployer" class="org.jboss.system.deployers.ClassloadingDeployer">
- <constructor>
- <parameter><inject bean="ClassLoading"/></parameter>
- </constructor>
+ <bean name="ClassloadingDeployer" class="org.jboss.system.deployers.ClassloadingDescribeDeployer">
+ <property name="classLoading"><inject bean="ClassLoading"/></property>
</bean>
- <bean name="VFSClassLoaderDeployer" class="org.jboss.system.deployers.MockTopLevelClassLoaderSystemDeployer">
+ <bean name="VFSClassLoaderDeployer" class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer">
<property name="classLoading"><inject bean="ClassLoading"/></property>
<property name="system"><inject bean="ClassLoaderSystem"/></property>
</bean>
Added: projects/demos/osgi/bootstrap/src/org/jboss/system/classloader/CapabilityFilter.java
===================================================================
--- projects/demos/osgi/bootstrap/src/org/jboss/system/classloader/CapabilityFilter.java (rev 0)
+++ projects/demos/osgi/bootstrap/src/org/jboss/system/classloader/CapabilityFilter.java 2008-05-04 21:33:38 UTC (rev 73040)
@@ -0,0 +1,65 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.system.classloader;
+
+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;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class CapabilityFilter implements ClassFilter
+{
+ private Capability capability;
+
+ public CapabilityFilter(Capability capability)
+ {
+ if (capability == null)
+ throw new IllegalArgumentException("Null capability.");
+
+ this.capability = capability;
+ }
+
+ public boolean matchesClassName(String className)
+ {
+ return matchesPackageName(ClassLoaderUtils.getClassPackageName(className));
+ }
+
+ public boolean matchesResourcePath(String resourcePath)
+ {
+ return matchesPackageName(ClassLoaderUtils.getResourcePackageName(resourcePath));
+ }
+
+ public boolean matchesPackageName(String packageName)
+ {
+ if (capability instanceof PackageCapability)
+ {
+ PackageCapability pc = (PackageCapability)capability;
+ if (pc.getPackageNames(null).contains(packageName))
+ return true;
+ }
+
+ return false;
+ }
+}
Modified: projects/demos/osgi/bootstrap/src/org/jboss/system/classloader/MockClassLoaderPolicy.java
===================================================================
--- projects/demos/osgi/bootstrap/src/org/jboss/system/classloader/MockClassLoaderPolicy.java 2008-05-04 19:10:20 UTC (rev 73039)
+++ projects/demos/osgi/bootstrap/src/org/jboss/system/classloader/MockClassLoaderPolicy.java 2008-05-04 21:33:38 UTC (rev 73040)
@@ -41,7 +41,7 @@
import org.jboss.classloader.spi.DelegateLoader;
import org.jboss.classloader.spi.PackageInformation;
import org.jboss.classloader.spi.filter.ClassFilter;
-import org.jboss.deployers.structure.spi.classloading.ExportAll;
+import org.jboss.classloading.spi.metadata.ExportAll;
import org.jboss.logging.Logger;
import org.jboss.virtual.VFSUtils;
import org.jboss.virtual.VirtualFile;
@@ -139,7 +139,7 @@
return name;
}
- protected DelegateLoader getExported()
+ public DelegateLoader getExported()
{
return null;
}
@@ -341,17 +341,7 @@
@Override
public URL getResource(String path)
{
- if (paths == null)
- return null;
-
- for (int i = 0; i < paths.length; ++i)
- {
- if (path.startsWith(paths[i]))
- {
- return findFileURL(path);
- }
- }
- return null;
+ return findFileURL(path);
}
@Override
@@ -472,7 +462,6 @@
super.toLongString(builder);
}
-
@Override
public String toString()
{
Modified: projects/demos/osgi/bootstrap/src/org/jboss/system/classloader/PackageVisitor.java
===================================================================
--- projects/demos/osgi/bootstrap/src/org/jboss/system/classloader/PackageVisitor.java 2008-05-04 19:10:20 UTC (rev 73039)
+++ projects/demos/osgi/bootstrap/src/org/jboss/system/classloader/PackageVisitor.java 2008-05-04 21:33:38 UTC (rev 73040)
@@ -26,7 +26,7 @@
import java.util.List;
import java.util.Set;
-import org.jboss.deployers.structure.spi.classloading.ExportAll;
+import org.jboss.classloading.spi.metadata.ExportAll;
import org.jboss.virtual.VirtualFile;
import org.jboss.virtual.VirtualFileVisitor;
import org.jboss.virtual.VisitorAttributes;
Deleted: projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/ClassloadingDeployer.java
===================================================================
--- projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/ClassloadingDeployer.java 2008-05-04 19:10:20 UTC (rev 73039)
+++ projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/ClassloadingDeployer.java 2008-05-04 21:33:38 UTC (rev 73040)
@@ -1,54 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.system.deployers;
-
-import org.jboss.deployers.plugins.classloading.ClassLoading;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployer;
-import org.jboss.deployers.spi.deployer.DeploymentStages;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class ClassloadingDeployer extends AbstractRealDeployer
-{
- private ClassLoading classLoading;
-
- public ClassloadingDeployer(ClassLoading classLoading)
- {
- setStage(DeploymentStages.DESCRIBE);
- if (classLoading == null)
- throw new IllegalArgumentException("Null classloading");
- this.classLoading = classLoading;
- }
-
- protected void internalDeploy(DeploymentUnit deploymentUnit) throws DeploymentException
- {
- classLoading.addDeploymentUnit(deploymentUnit);
- }
-
- protected void internalUndeploy(DeploymentUnit deploymentUnit)
- {
- classLoading.removeDeploymentUnit(deploymentUnit);
- }
-}
Copied: projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/ClassloadingDescribeDeployer.java (from rev 69695, projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/ClassloadingDeployer.java)
===================================================================
--- projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/ClassloadingDescribeDeployer.java (rev 0)
+++ projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/ClassloadingDescribeDeployer.java 2008-05-04 21:33:38 UTC (rev 73040)
@@ -0,0 +1,75 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.system.deployers;
+
+import java.util.List;
+
+import org.jboss.classloader.spi.ClassLoaderPolicy;
+import org.jboss.classloader.spi.DelegateLoader;
+import org.jboss.classloader.spi.filter.FilteredDelegateLoader;
+import org.jboss.classloading.spi.dependency.Module;
+import org.jboss.classloading.spi.dependency.policy.ClassLoaderPolicyModule;
+import org.jboss.classloading.spi.metadata.Capability;
+import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
+import org.jboss.classloading.spi.metadata.Requirement;
+import org.jboss.deployers.plugins.classloading.AbstractClassLoaderDescribeDeployer;
+import org.jboss.deployers.plugins.classloading.AbstractDeploymentClassLoaderPolicyModule;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.system.classloader.MockClassLoaderPolicy;
+import org.jboss.system.classloader.CapabilityFilter;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class ClassloadingDescribeDeployer extends AbstractClassLoaderDescribeDeployer
+{
+ protected ClassLoaderPolicyModule createModule(final DeploymentUnit unit, ClassLoadingMetaData metaData) throws DeploymentException
+ {
+ return new AbstractDeploymentClassLoaderPolicyModule(unit)
+ {
+ protected ClassLoaderPolicy determinePolicy()
+ {
+ MockClassLoaderPolicy policy = new MockClassLoaderPolicy(unit.getSimpleName());
+ VFSDeploymentUnit vfsUnit = (VFSDeploymentUnit)unit;
+ policy.setRoot(vfsUnit.getRoot());
+ policy.setDelegates(getDelegates());
+ return policy;
+ }
+
+ public DelegateLoader getDelegateLoader(Module module, Requirement requirement)
+ {
+ List<Capability> capabilities = getCapabilities();
+ if (capabilities != null && capabilities.isEmpty() == false)
+ {
+ for(Capability capability : capabilities)
+ {
+ if (capability.resolves(this, requirement))
+ return new FilteredDelegateLoader(getPolicy(), new CapabilityFilter(capability));
+ }
+ }
+ return null;
+ }
+ };
+ }
+}
Deleted: projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/MockTopLevelClassLoaderSystemDeployer.java
===================================================================
--- projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/MockTopLevelClassLoaderSystemDeployer.java 2008-05-04 19:10:20 UTC (rev 73039)
+++ projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/MockTopLevelClassLoaderSystemDeployer.java 2008-05-04 21:33:38 UTC (rev 73040)
@@ -1,49 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, 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.system.deployers;
-
-import org.jboss.classloader.spi.ClassLoaderPolicy;
-import org.jboss.deployers.plugins.classloading.AbstractTopLevelClassLoaderSystemDeployer;
-import org.jboss.deployers.plugins.classloading.Module;
-import org.jboss.deployers.structure.spi.DeploymentContext;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentContext;
-import org.jboss.system.classloader.MockClassLoaderPolicy;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class MockTopLevelClassLoaderSystemDeployer extends AbstractTopLevelClassLoaderSystemDeployer
-{
- @Override
- protected ClassLoaderPolicy createTopLevelClassLoaderPolicy(DeploymentContext context, Module module) throws Exception
- {
- MockClassLoaderPolicy policy = new MockClassLoaderPolicy(context.getName());
- policy.setRoot(((VFSDeploymentContext)context).getRoot());
- policy.setImportAll(module.isImportAll());
- policy.setDelegates(module.getDelegates());
- policy.setPathsAndPackageNames(module.getPackageNames());
-
- context.getTransientAttachments().addAttachment(ClassLoaderPolicy.class, policy);
-
- return policy;
- }
-}
Modified: projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/PropertyClassloaderMetaDataDeployer.java
===================================================================
--- projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/PropertyClassloaderMetaDataDeployer.java 2008-05-04 19:10:20 UTC (rev 73039)
+++ projects/demos/osgi/bootstrap/src/org/jboss/system/deployers/PropertyClassloaderMetaDataDeployer.java 2008-05-04 21:33:38 UTC (rev 73040)
@@ -26,14 +26,13 @@
import java.util.List;
import java.util.Properties;
-import org.jboss.deployers.structure.spi.classloading.Capability;
-import org.jboss.deployers.structure.spi.classloading.ClassLoaderMetaData;
-import org.jboss.deployers.structure.spi.classloading.Requirement;
-import org.jboss.deployers.structure.spi.classloading.Version;
-import org.jboss.deployers.structure.spi.classloading.VersionRange;
-import org.jboss.deployers.structure.spi.classloading.helpers.PackageCapabilityImpl;
-import org.jboss.deployers.structure.spi.classloading.helpers.RequirePackageImpl;
-import org.jboss.deployers.structure.spi.classloading.helpers.VersionImpl;
+import org.jboss.classloading.plugins.metadata.PackageCapability;
+import org.jboss.classloading.plugins.metadata.PackageRequirement;
+import org.jboss.classloading.spi.metadata.Capability;
+import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
+import org.jboss.classloading.spi.metadata.Requirement;
+import org.jboss.classloading.spi.version.Version;
+import org.jboss.classloading.spi.version.VersionRange;
import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.virtual.VirtualFile;
@@ -41,15 +40,15 @@
/**
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
-public class PropertyClassloaderMetaDataDeployer extends AbstractVFSParsingDeployer<ClassLoaderMetaData>
+public class PropertyClassloaderMetaDataDeployer extends AbstractVFSParsingDeployer<ClassLoadingMetaData>
{
public PropertyClassloaderMetaDataDeployer()
{
- super(ClassLoaderMetaData.class);
+ super(ClassLoadingMetaData.class);
setSuffix("-clmd.properties");
}
- protected ClassLoaderMetaData parse(VFSDeploymentUnit unit, VirtualFile file, ClassLoaderMetaData clmd) throws Exception
+ protected ClassLoadingMetaData parse(VFSDeploymentUnit unit, VirtualFile file, ClassLoadingMetaData clmd) throws Exception
{
Properties properties = new Properties();
InputStream inputStream = file.openStream();
@@ -61,7 +60,7 @@
{
inputStream.close();
}
- ClassLoaderMetaData metaData = new ClassLoaderMetaData();
+ ClassLoadingMetaData metaData = new ClassLoadingMetaData();
metaData.setName(unit.getName());
metaData.setDomain(properties.getProperty("domain", unit.getName()));
metaData.setParentDomain(properties.getProperty("parent_domain"));
@@ -83,8 +82,8 @@
{
String[] pv = c.split(":");
String pckg = pv[0];
- Version version = pv.length > 1 ? VersionImpl.parseVersion(pv[1]) : Version.DEFAULT_VERSION;
- list.add(new PackageCapabilityImpl(pckg, version));
+ Version version = pv.length > 1 ? Version.parseVersion(pv[1]) : Version.DEFAULT_VERSION;
+ list.add(new PackageCapability(pckg, version));
}
}
return list;
@@ -105,11 +104,11 @@
if (pv.length > 1)
{
String[] vr = pv[1].split(",");
- Version low = VersionImpl.parseVersion(vr[0].substring(1));
- Version high = VersionImpl.parseVersion(vr[1].substring(0, vr[1].length() - 1));
+ Version low = Version.parseVersion(vr[0].substring(1));
+ Version high = Version.parseVersion(vr[1].substring(0, vr[1].length() - 1));
range = new VersionRange(low, vr[0].charAt(0) == '[', high, vr[1].charAt(vr[1].length() - 1) == ']');
}
- list.add(new RequirePackageImpl(pckg, range));
+ list.add(new PackageRequirement(pckg, range));
}
}
return list;
Modified: projects/demos/osgi/foo/foo.iml
===================================================================
--- projects/demos/osgi/foo/foo.iml 2008-05-04 19:10:20 UTC (rev 73039)
+++ projects/demos/osgi/foo/foo.iml 2008-05-04 21:33:38 UTC (rev 73040)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
+<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="BuildJarSettings">
<containerInfo>
<containerElement type="module" name="foo">
@@ -11,8 +11,6 @@
<setting name="buildJar" value="true" />
<setting name="mainClass" value="" />
</component>
- <component name="DependecySynchronizer" />
- <component name="ModuleRootManager" />
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
Modified: projects/demos/osgi/foo/src/META-INF/foo-clmd.properties
===================================================================
--- projects/demos/osgi/foo/src/META-INF/foo-clmd.properties 2008-05-04 19:10:20 UTC (rev 73039)
+++ projects/demos/osgi/foo/src/META-INF/foo-clmd.properties 2008-05-04 21:33:38 UTC (rev 73040)
@@ -1,3 +1,3 @@
domain=FooBarDomain
-requirements=org.jboss.acme.ales:[1,2)|org.jboss.acme.scott:[2,3)
+requirements=org.jboss.acme.ales:[1,2)|org.jboss.acme.scott:[3,4)
capabilities=org.jboss.foo
Modified: projects/demos/osgi/osgi.ipr
===================================================================
--- projects/demos/osgi/osgi.ipr 2008-05-04 19:10:20 UTC (rev 73039)
+++ projects/demos/osgi/osgi.ipr 2008-05-04 21:33:38 UTC (rev 73040)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project version="4" relativePaths="false">
+<project relativePaths="false" version="4">
<component name="AntConfiguration">
<defaultAnt bundledAnt="true" />
</component>
@@ -33,11 +33,12 @@
<entry name="?*.tld" />
</wildcardResourcePatterns>
</component>
- <component name="DataSourceManagerImpl" />
<component name="DependenciesAnalyzeManager">
<option name="myForwardDirection" value="false" />
</component>
- <component name="DependencyValidationManager" />
+ <component name="DependencyValidationManager">
+ <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+ </component>
<component name="EclipseCompilerSettings">
<option name="DEBUGGING_INFO" value="true" />
<option name="GENERATE_NO_WARNINGS" value="true" />
@@ -53,14 +54,13 @@
<option name="MAXIMUM_HEAP_SIZE" value="128" />
</component>
<component name="EntryPointsManager">
- <entry_points />
+ <entry_points version="2.0" />
</component>
<component name="ExportToHTMLSettings">
<option name="PRINT_LINE_NUMBERS" value="false" />
<option name="OPEN_IN_BROWSER" value="false" />
<option name="OUTPUT_DIRECTORY" />
</component>
- <component name="GUI Designer component loader factory" />
<component name="IdProvider" IDEtalkID="ED1D880B207A6A31E339B3CFD9BB6FC2" />
<component name="InspectionProjectProfileManager">
<option name="PROJECT_PROFILE" value="Project Default" />
@@ -70,28 +70,9 @@
<profile version="1.0" is_locked="false">
<option name="myName" value="Project Default" />
<option name="myLocal" value="false" />
- <used_levels>
- <error>
- <option name="myName" value="ERROR" />
- <option name="myVal" value="400" />
- </error>
- <warning>
- <option name="myName" value="WARNING" />
- <option name="myVal" value="300" />
- </warning>
- <information>
- <option name="myName" value="INFO" />
- <option name="myVal" value="200" />
- </information>
- <server>
- <option name="myName" value="SERVER PROBLEM" />
- <option name="myVal" value="100" />
- </server>
- </used_levels>
<inspection_tool class="PointlessBooleanExpression" level="WARNING" enabled="false">
<option name="m_ignoreExpressionsContainingConstants" value="false" />
</inspection_tool>
- <inspection_tool class="PersistenceDataSourceORMInspection" level="ERROR" enabled="false" />
<inspection_tool class="JavadocReference" level="INFO" enabled="true" />
<inspection_tool class="JavaDoc" level="INFO" enabled="true">
<option name="TOP_LEVEL_CLASS_OPTIONS">
@@ -124,6 +105,7 @@
</inspection_tool>
</profile>
</profiles>
+ <list size="0" />
</component>
<component name="JavacSettings">
<option name="DEBUGGING_INFO" value="true" />
@@ -310,6 +292,7 @@
</item>
</group>
</component>
+ <component name="ProjectFileVersion" converted="true" />
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/acme1/acme1.iml" filepath="$PROJECT_DIR$/acme1/acme1.iml" />
@@ -321,7 +304,6 @@
<component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/classes" />
</component>
- <component name="ProjectRunConfigurationManager" />
<component name="RmicSettings">
<option name="IS_EANABLED" value="false" />
<option name="DEBUGGING_INFO" value="true" />
@@ -329,11 +311,12 @@
<option name="GENERATE_IIOP_STUBS" value="false" />
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
</component>
- <component name="StarteamVcsAdapter" />
<component name="TeamCityRootDirectoryHolder">
<option name="myRelativeRootDirectory" />
</component>
- <component name="VssVcs" />
+ <component name="VcsDirectoryMappings">
+ <mapping directory="" vcs="svn" />
+ </component>
<component name="com.intellij.jsf.UserDefinedFacesConfigs">
<option name="USER_DEFINED_CONFIGS">
<value>
@@ -341,12 +324,13 @@
</value>
</option>
</component>
- <component name="libraryTable" />
<component name="uidesigner-configuration">
<option name="INSTRUMENT_CLASSES" value="true" />
<option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" />
<option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" />
</component>
- <UsedPathMacros />
+ <UsedPathMacros>
+ <macro name="M2_REPO" />
+ </UsedPathMacros>
</project>
Modified: projects/demos/osgi/osgi.iws
===================================================================
--- projects/demos/osgi/osgi.iws 2008-05-04 19:10:20 UTC (rev 73039)
+++ projects/demos/osgi/osgi.iws 2008-05-04 21:33:38 UTC (rev 73040)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project version="4" relativePaths="false">
- <component name="BookmarkManager" />
+<project relativePaths="false" version="4">
<component name="BuildServerSettings">
<option name="HISTORY" value="" />
<option name="LOGIN" value="" />
@@ -19,6 +18,20 @@
<option name="FILTER_BY_STATUS" value="false" />
<option name="SHOW_CLOSE_PROMPT" value="true" />
</component>
+ <component name="CCaseConfig">
+ <option name="checkoutReserved" value="false" />
+ <option name="markExternalChangeAsUpToDate" value="true" />
+ <option name="checkInUseHijack" value="true" />
+ <option name="useUcmModel" value="true" />
+ <option name="isOffline" value="false" />
+ <option name="synchOutside" value="false" />
+ <option name="isHistoryResticted" value="true" />
+ <option name="useIdenticalSwitch" value="true" />
+ <option name="synchActivitiesOnRefresh" value="true" />
+ <option name="lastScr" value="" />
+ <option name="scrTextFileName" value="" />
+ <option name="historyRevisionsNumber" value="4" />
+ </component>
<component name="ChangeBrowserSettings">
<option name="MAIN_SPLITTER_PROPORTION" value="0.3" />
<option name="MESSAGES_SPLITTER_PROPORTION" value="0.8" />
@@ -34,25 +47,34 @@
<option name="USER" value="" />
</component>
<component name="ChangeListManager">
- <list default="true" name="Default" comment="" />
+ <list default="true" name="Default" comment="">
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/CapabilityFilter.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/acme2/acme2.iml" afterPath="$PROJECT_DIR$/acme2/acme2.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/foo/src/META-INF/foo-clmd.properties" afterPath="$PROJECT_DIR$/foo/src/META-INF/foo-clmd.properties" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/PropertyClassloaderMetaDataDeployer.java" afterPath="$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/PropertyClassloaderMetaDataDeployer.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/PackageVisitor.java" afterPath="$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/PackageVisitor.java" />
+ <change type="DELETED" beforePath="C:\projects\demos\osgi\bootstrap\src\org\jboss\system\deployers\MockTopLevelClassLoaderSystemDeployer.java" afterPath="" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/foo/foo.iml" afterPath="$PROJECT_DIR$/foo/foo.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bootstrap/bootstrap.iml" afterPath="$PROJECT_DIR$/bootstrap/bootstrap.iml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bootstrap/resources/bootstrap-beans.xml" afterPath="$PROJECT_DIR$/bootstrap/resources/bootstrap-beans.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/MockClassLoaderPolicy.java" afterPath="$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/MockClassLoaderPolicy.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/osgi.ipr" afterPath="$PROJECT_DIR$/osgi.ipr" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/acme1/acme1.iml" afterPath="$PROJECT_DIR$/acme1/acme1.iml" />
+ <change type="MOVED" beforePath="C:\projects\demos\osgi\bootstrap\src\org\jboss\system\deployers\ClassloadingDeployer.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$/acme1/src/META-INF/acme-clmd.properties" afterPath="$PROJECT_DIR$/acme1/src/META-INF/acme-clmd.properties" />
+ </list>
</component>
- <component name="ChangeListSynchronizer" />
- <component name="ChangesViewManager" flattened_view="true" />
- <component name="CheckinPanelState" />
+ <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
<component name="Commander">
<leftPanel />
<rightPanel />
<splitter proportion="0.5" />
</component>
- <component name="CompilerWorkspaceConfiguration">
- <option name="COMPILE_IN_BACKGROUND" value="false" />
- <option name="AUTO_SHOW_ERRORS_IN_EDITOR" value="true" />
- <option name="CLOSE_MESSAGE_VIEW_IF_SUCCESS" value="true" />
- <option name="COMPILE_DEPENDENT_FILES" value="false" />
- <option name="CLEAR_OUTPUT_DIRECTORY" value="false" />
- <option name="ASSERT_NOT_NULL" value="true" />
+ <component name="CreatePatchCommitExecutor">
+ <option name="PATCH_PATH" value="" />
+ <option name="REVERSE_PATCH" value="false" />
</component>
- <component name="CoverageDataManager" />
<component name="Cvs2Configuration">
<option name="PRUNE_EMPTY_DIRECTORIES" value="true" />
<option name="MERGING_MODE" value="0" />
@@ -104,42 +126,14 @@
<disable_hints />
</component>
<component name="DebuggerManager">
- <line_breakpoints>
- <breakpoint url="jar://C:/projects/microcontainer/classloader/target/jboss-classloader-sources.jar!/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java" line="742" class="org.jboss.classloader.spi.base.BaseClassLoaderDomain" package="org.jboss.classloader.spi.base">
- <option name="ENABLED" value="true" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- <breakpoint url="jar://C:/projects/microcontainer/classloader/target/jboss-classloader-sources.jar!/org/jboss/classloader/spi/base/BaseClassLoaderDomain.java" line="253" class="org.jboss.classloader.spi.base.BaseClassLoaderDomain" package="org.jboss.classloader.spi.base">
- <option name="ENABLED" value="true" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- </line_breakpoints>
<breakpoint_any>
<breakpoint>
<option name="NOTIFY_CAUGHT" value="true" />
<option name="NOTIFY_UNCAUGHT" value="true" />
<option name="ENABLED" value="false" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="COUNT_FILTER_ENABLED" value="false" />
<option name="COUNT_FILTER" value="0" />
<option name="CONDITION_ENABLED" value="false" />
@@ -152,9 +146,9 @@
<option name="NOTIFY_CAUGHT" value="true" />
<option name="NOTIFY_UNCAUGHT" value="true" />
<option name="ENABLED" value="false" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="COUNT_FILTER_ENABLED" value="false" />
<option name="COUNT_FILTER" value="0" />
<option name="CONDITION_ENABLED" value="false" />
@@ -186,78 +180,129 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="foo-clmd.properties" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/foo/src/META-INF/foo-clmd.properties">
+ <file leaf-file-name="ClassloadingDescribeDeployer.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/ClassloadingDescribeDeployer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1" column="25" selection-start="45" selection-end="45" vertical-scroll-proportion="0.020310633">
+ <state line="67" column="99" selection-start="3207" selection-end="3207" vertical-scroll-proportion="0.76152307">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="PropertyClassloaderMetaDataDeployer.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/PropertyClassloaderMetaDataDeployer.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">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </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="39" column="6" selection-start="1583" selection-end="1583" vertical-scroll-proportion="0.3236473">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="ClassLoaderUtils.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/plugins/ClassLoaderUtils.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">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="acme-clmd.properties" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/acme1/src/META-INF/acme-clmd.properties">
+ <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="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="34" column="17" selection-start="1472" selection-end="1472" vertical-scroll-proportion="0.18737476">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="acme-clmd.properties" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/acme2/src/META-INF/acme-clmd.properties">
+ <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="1" column="0" selection-start="20" selection-end="20" vertical-scroll-proportion="0.020310633">
+ <state line="33" column="0" selection-start="1273" selection-end="1273" vertical-scroll-proportion="0.18737476">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="AlesServiceImpl.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/acme1/src/org/jboss/acme/ales/impl/AlesServiceImpl.java">
+ <file leaf-file-name="PackageCapability.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/plugins/metadata/PackageCapability.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="30" column="13" selection-start="1235" selection-end="1235" vertical-scroll-proportion="0.16248506">
+ <state line="82" column="22" selection-start="2702" selection-end="2702" vertical-scroll-proportion="0.66032064">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ScottServiceImpl.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/acme1/src/org/jboss/acme/scott/impl/ScottServiceImpl.java">
+ <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="30" column="13" selection-start="1238" selection-end="1238" vertical-scroll-proportion="0.16248506">
+ <state line="138" column="0" selection-start="5017" selection-end="5017" vertical-scroll-proportion="0.2254509">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="AlesServiceImpl.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/acme2/src/org/jboss/acme/ales/impl/AlesServiceImpl.java">
+ <file leaf-file-name="FilteredDelegateLoader.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/FilteredDelegateLoader.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="30" column="13" selection-start="1235" selection-end="1235" vertical-scroll-proportion="0.16248506">
+ <state line="42" column="0" selection-start="1569" selection-end="1569" vertical-scroll-proportion="0.017034069">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ScottServiceImpl.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/acme2/src/org/jboss/acme/scott/impl/ScottServiceImpl.java">
+ <file leaf-file-name="ClassLoadingMetaDataModule.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/helpers/ClassLoadingMetaDataModule.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="30" column="13" selection-start="1238" selection-end="1238" vertical-scroll-proportion="0.16248506">
+ <state line="44" column="21" selection-start="1767" selection-end="1767" vertical-scroll-proportion="0.28957915">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="FooBarService.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/foo/src/org/jboss/foo/FooBarService.java">
+ <file leaf-file-name="VFSDeploymentClassLoaderPolicyModule.java" pinned="false" current="false" current-in-tab="false">
+ <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">
<provider selected="true" editor-type-id="text-editor">
- <state line="29" column="13" selection-start="1188" selection-end="1188" vertical-scroll-proportion="0.16248506">
+ <state line="136" column="40" selection-start="4677" selection-end="4677" vertical-scroll-proportion="0.49398798">
<folding />
</state>
</provider>
</entry>
</file>
+ <file leaf-file-name="ClassLoadingMetaData.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/ClassLoadingMetaData.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="42" column="13" selection-start="1880" selection-end="1880" vertical-scroll-proportion="0.20440882">
+ <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="206" column="22" selection-start="5539" selection-end="5539" vertical-scroll-proportion="0.33867735">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
</leaf>
</component>
<component name="FindManager">
@@ -270,28 +315,13 @@
<option name="SORT_ALPHABETICALLY" value="false" />
<option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" />
</component>
- <component name="InspectionManager">
- <option name="AUTOSCROLL_TO_SOURCE" value="false" />
- <option name="SPLITTER_PROPORTION" value="0.5" />
- <option name="GROUP_BY_SEVERITY" value="false" />
- <option name="FILTER_RESOLVED_ITEMS" value="true" />
- <option name="ANALYZE_TEST_SOURCES" value="true" />
- <option name="SHOW_DIFF_WITH_PREVIOUS_RUN" value="false" />
- <option name="SCOPE_TYPE" value="1" />
- <option name="CUSTOM_SCOPE_NAME" value="" />
- <option name="SHOW_ONLY_DIFF" value="false" />
- <option name="myCurrentProfileName" value="Default" />
- </component>
<component name="InspectionPassRegistrar">
<option name="LOAD_NEW_PROBLEMS" value="true" />
</component>
- <component name="J2EEProjectPane" />
- <component name="JspContextManager" />
<component name="ModuleEditorState">
<option name="LAST_EDITED_MODULE_NAME" />
<option name="LAST_EDITED_TAB_NAME" />
</component>
- <component name="NamedScopeManager" />
<component name="PackagesPane">
<subPane>
<PATH>
@@ -328,7 +358,6 @@
<option name="INTEGRATE_REVERT_UNCHANGED" value="true" />
<option name="SERVER_TIMEOUT" value="20000" />
</component>
- <component name="ProjectLevelMessagesProcessor" />
<component name="ProjectLevelVcsManager">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
@@ -347,33 +376,177 @@
<subPane>
<PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="osgi.ipr" />
+ <option name="myItemId" value="osgi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
+ </PATH>
+ <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="foo" />
+ <option name="myItemId" value="osgi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="bootstrap" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="osgi.ipr" />
+ <option name="myItemId" value="osgi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="bootstrap" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\bootstrap" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="osgi.ipr" />
+ <option name="myItemId" value="osgi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="bootstrap" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\bootstrap" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\bootstrap\src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osgi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="bootstrap" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\bootstrap" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\bootstrap\src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\bootstrap\src\org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\bootstrap\src\org\jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\bootstrap\src\org\jboss\system" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\bootstrap\src\org\jboss\system\deployers" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osgi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="bootstrap" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\bootstrap" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\bootstrap\src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\bootstrap\src\org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\bootstrap\src\org\jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\bootstrap\src\org\jboss\system" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\bootstrap\src\org\jboss\system\classloader" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osgi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="bootstrap" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\bootstrap" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\bootstrap\src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\bootstrap\src\org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\bootstrap\src\org\jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osgi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="bootstrap" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\bootstrap" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\bootstrap\resources" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osgi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="acme2" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="osgi.ipr" />
+ <option name="myItemId" value="osgi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
@@ -387,7 +560,7 @@
</PATH>
<PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="osgi.ipr" />
+ <option name="myItemId" value="osgi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
@@ -402,10 +575,22 @@
<option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme2\src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme2\src\org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme2\src\org\jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme2\src\org\jboss\acme" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="osgi.ipr" />
+ <option name="myItemId" value="osgi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
@@ -421,13 +606,85 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme2\src\org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme2\src\org\jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme2\src\org\jboss\acme" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme2\src\org\jboss\acme\ales" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osgi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="acme2" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme2" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme2\src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme2\src\org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme2\src\org\jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme2\src\org\jboss\acme" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme2\src\org\jboss\acme\ales" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme2\src\org\jboss\acme\ales\impl" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osgi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="acme2" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme2" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme2\src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme2\src\META-INF" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="osgi.ipr" />
+ <option name="myItemId" value="osgi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
@@ -437,7 +694,7 @@
</PATH>
<PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="osgi.ipr" />
+ <option name="myItemId" value="osgi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
@@ -451,7 +708,7 @@
</PATH>
<PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="osgi.ipr" />
+ <option name="myItemId" value="osgi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
@@ -466,10 +723,22 @@
<option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src\org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src\org\jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src\org\jboss\acme" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="osgi.ipr" />
+ <option name="myItemId" value="osgi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
@@ -485,10 +754,150 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src\META-INF" />
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src\org" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src\org\jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src\org\jboss\acme" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src\org\jboss\acme\scott" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osgi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="acme1" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src\org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src\org\jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src\org\jboss\acme" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src\org\jboss\acme\scott" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src\org\jboss\acme\scott\impl" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osgi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="acme1" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src\org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src\org\jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src\org\jboss\acme" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src\org\jboss\acme\ales" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osgi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="acme1" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src\org" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src\org\jboss" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src\org\jboss\acme" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src\org\jboss\acme\ales" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src\org\jboss\acme\ales\impl" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osgi" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="acme1" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:C:\projects\demos\osgi\acme1\src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
</subPane>
</component>
<component name="ProjectReloadState">
@@ -502,26 +911,23 @@
<showLibraryContents />
<hideEmptyPackages ProjectPane="false" />
<abbreviatePackageNames />
- <showStructure ProjectPane="false" PackagesPane="false" Favorites="false" />
+ <showStructure ProjectPane="false" Scope="false" PackagesPane="false" Favorites="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
</navigator>
</component>
<component name="PropertiesComponent">
- <property name="GoToClass.includeJavaFiles" value="false" />
- <property name="MemberChooser.copyJavadoc" value="false" />
- <property name="GoToClass.includeLibraries" value="false" />
- <property name="MemberChooser.showClasses" value="true" />
- <property name="MemberChooser.sorted" value="false" />
- <property name="RunManagerConfig.compileBeforeRunning" value="true" />
<property name="GoToFile.includeJavaFiles" value="false" />
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
+ <property name="RunManagerConfig.compileBeforeRunning" value="true" />
<property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" />
+ <property name="MemberChooser.sorted" value="false" />
+ <property name="MemberChooser.showClasses" value="true" />
+ <property name="GoToClass.includeLibraries" value="false" />
+ <property name="GoToClass.includeJavaFiles" value="false" />
+ <property name="MemberChooser.copyJavadoc" value="false" />
</component>
- <component name="ReadonlyStatusHandler">
- <option name="SHOW_DIALOG" value="true" />
- </component>
<component name="RecentsManager">
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="org.jboss.system.classloader" />
@@ -532,8 +938,20 @@
<recent name="org.jboss.system.classloader" />
</key>
</component>
- <component name="RestoreUpdateTree" />
<component name="RunManager" selected="Application.Main">
+ <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
+ <option name="MAIN_CLASS_NAME" />
+ <option name="VM_PARAMETERS" />
+ <option name="PROGRAM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="ENABLE_SWING_INSPECTOR" value="false" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <module name="" />
+ <envs />
+ </configuration>
<configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -545,25 +963,45 @@
<option name="VM_PARAMETERS" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
<option name="ADDITIONAL_CLASS_PATH" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
+ <envs />
<method>
<option name="Make" value="true" />
</method>
</configuration>
- <configuration default="true" type="Applet" factoryName="Applet">
+ <configuration default="true" type="TestNG" factoryName="TestNG" enabled="false" merge="false">
<module name="" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="SUITE_NAME" />
+ <option name="PACKAGE_NAME" />
<option name="MAIN_CLASS_NAME" />
- <option name="HTML_FILE_NAME" />
- <option name="HTML_USED" value="false" />
- <option name="WIDTH" value="400" />
- <option name="HEIGHT" value="300" />
- <option name="POLICY_FILE" value="C:/Program Files/JetBrains/IntelliJ IDEA 6.0/bin/appletviewer.policy" />
+ <option name="METHOD_NAME" />
+ <option name="GROUP_NAME" />
+ <option name="TEST_OBJECT" value="CLASS" />
<option name="VM_PARAMETERS" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" />
+ <option name="OUTPUT_DIRECTORY" />
+ <option name="ANNOTATION_TYPE" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="ADDITIONAL_CLASS_PATH" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="wholeProject" />
+ </option>
+ <option name="PROPERTIES_FILE" />
+ <envs />
+ <properties />
+ <listeners />
+ <method>
+ <option name="Make" value="true" />
+ </method>
</configuration>
<configuration default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
@@ -572,15 +1010,17 @@
<option name="HOST" value="localhost" />
<option name="PORT" value="5005" />
</configuration>
- <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
+ <configuration default="true" type="Applet" factoryName="Applet">
+ <module name="" />
<option name="MAIN_CLASS_NAME" />
+ <option name="HTML_FILE_NAME" />
+ <option name="HTML_USED" value="false" />
+ <option name="WIDTH" value="400" />
+ <option name="HEIGHT" value="300" />
+ <option name="POLICY_FILE" value="C:/Program Files/JetBrains/IntelliJ IDEA 6.0/bin/appletviewer.policy" />
<option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <module name="" />
</configuration>
<configuration default="false" name="Main" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" value="org.jboss.bootstrap.Main" />
@@ -590,7 +1030,10 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
<option name="ENABLE_SWING_INSPECTOR" value="false" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
<module name="bootstrap" />
+ <envs />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="4420" />
<option name="TRANSPORT" value="0" />
@@ -608,13 +1051,24 @@
<option name="Make" value="true" />
</method>
</configuration>
+ <list size="1">
+ <item index="0" class="java.lang.String" itemvalue="Application.Main" />
+ </list>
<configuration name="<template>" type="WebApp" default="true" selected="false">
<Host>localhost</Host>
<Port>5050</Port>
</configuration>
</component>
- <component name="ScopeViewComponent" />
- <component name="SelectInManager" />
+ <component name="ScopeViewComponent">
+ <subPane subId="Project">
+ <PATH>
+ <PATH_ELEMENT USER_OBJECT="Root">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ </PATH>
+ </subPane>
+ </component>
<component name="StarteamConfiguration">
<option name="SERVER" value="" />
<option name="PORT" value="49201" />
@@ -626,7 +1080,6 @@
<option name="LOCK_ON_CHECKOUT" value="false" />
<option name="UNLOCK_ON_CHECKIN" value="false" />
</component>
- <component name="StructuralSearchPlugin" />
<component name="StructureViewFactory">
<option name="AUTOSCROLL_MODE" value="true" />
<option name="AUTOSCROLL_FROM_SOURCE" value="false" />
@@ -657,25 +1110,11 @@
<component name="SvnConfiguration">
<option name="USER" value="" />
<option name="PASSWORD" value="" />
- <option name="PROCESS_UNRESOLVED" value="false" />
<option name="LAST_MERGED_REVISION" />
<option name="UPDATE_RUN_STATUS" value="false" />
<option name="UPDATE_RECURSIVELY" value="true" />
<option name="MERGE_DRY_RUN" value="false" />
<configuration useDefault="false">C:\Documents and Settings\Ales\Application Data\Subversion</configuration>
- <checkoutURL>https://svn.jboss.org/repos/log2log</checkoutURL>
- <checkoutURL>https://svn.jboss.org/repos/repository.jboss.org/maven2/</checkoutURL>
- <checkoutURL>http://anonsvn.labs.jboss.com/labs/jbossrules/trunk</checkoutURL>
- <checkoutURL>https://svn.jboss.org/repos/sandbox/david.lloyd/remoting3/api-proto</checkoutURL>
- <checkoutURL>http://google-guice.googlecode.com/svn/trunk/</checkoutURL>
- <checkoutURL>https://svn.jboss.org/repos/hibernate/</checkoutURL>
- <checkoutURL>https://svn.sourceforge.net/svnroot/springframework/spring-osgi</checkoutURL>
- <checkoutURL>https://svn.jboss.org/repos/common</checkoutURL>
- <checkoutURL>https://svn.jboss.org/repos/jbossas/projects/test</checkoutURL>
- <checkoutURL>https://newscomposer.googlecode.com/svn/trunk/</checkoutURL>
- <checkoutURL>https://svn.jboss.org/repos/jbossas/projects/osgi</checkoutURL>
- <checkoutURL>https://svn.jboss.org/repos/jbossas</checkoutURL>
- <checkoutURL>https://svn.jboss.org/repos/jbossas/projects/microcontainer/</checkoutURL>
<upgradeMode>auto</upgradeMode>
</component>
<component name="TodoView" selected-index="0">
@@ -691,39 +1130,47 @@
<flatten-packages value="false" />
<is-autoscroll-to-source value="true" />
</todo-panel>
+ <todo-panel id="default-changelist">
+ <are-packages-shown value="false" />
+ <are-modules-shown value="false" />
+ <flatten-packages value="false" />
+ <is-autoscroll-to-source value="false" />
+ </todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-4" y="-4" width="1288" height="1002" extended-state="6" />
+ <frame x="-4" y="-4" width="1928" height="1178" extended-state="6" />
<editor active="true" />
<layout>
- <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
- <window_info id="Maven-2 Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
- <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
- <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
+ <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
+ <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
+ <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.46036294" order="1" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.36580706" order="4" />
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3285578" order="8" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29845905" order="0" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4608295" order="1" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32949308" order="8" />
- <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" />
+ <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" />
+ <window_info id="Maven projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.15536572" order="0" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
- <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
- <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
- <window_info id="TeamCity" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
- <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.53456223" order="2" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
+ <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" />
+ <window_info id="Duplicates" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.5339064" order="2" />
+ <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
+ <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
+ <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
- <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.48847926" order="4" />
- <window_info id="JProfiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
- <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
+ <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" />
+ <window_info id="Maven-2 Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" />
+ <window_info id="TeamCity" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
<window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="3" />
- <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" />
+ <window_info id="JProfiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
+ <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
</layout>
</component>
<component name="VCS.FileViewConfiguration">
@@ -738,19 +1185,18 @@
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
<option name="PERFORM_UPDATE_IN_BACKGROUND" value="false" />
<option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" />
- <option name="PUT_FOCUS_INTO_COMMENT" value="false" />
+ <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
+ <option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
- <option name="LAST_COMMIT_MESSAGE" />
- <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
- <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
+ <option name="LAST_COMMIT_MESSAGE" value="" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
<option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
<option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
<option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
- <option name="ERROR_OCCURED" value="false" />
- <option name="ACTIVE_VCS_NAME" />
+ <option name="ACTIVE_VCS_NAME" value="svn" />
<option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
+ <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
</component>
@@ -801,117 +1247,130 @@
</component>
<component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.24942791" version="1">
<option name="myPlainMode" value="false" />
- <option name="myLastEditedConfigurable" value="bootstrap" />
+ <option name="myLastEditedConfigurable" value="jboss-dependency.jar" />
</component>
<component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1">
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/ClassloadingDeployer.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="32" column="13" selection-start="1418" selection-end="1418" vertical-scroll-proportion="0.16605617">
+ <state line="62" column="25" selection-start="2303" selection-end="2303" vertical-scroll-proportion="0.33266532">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/MockTopLevelClassLoaderSystemDeployer.java">
+ <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/MockClassLoaderPolicy.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="33" column="13" selection-start="1504" selection-end="1504" vertical-scroll-proportion="0.16605617">
+ <state line="141" column="0" selection-start="4466" selection-end="4466" vertical-scroll-proportion="0.6983968">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/PropertyClassloaderMetaDataDeployer.java">
+ <entry file="file://$PROJECT_DIR$/bootstrap/resources/bootstrap-beans.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="43" column="13" selection-start="1983" selection-end="1983" vertical-scroll-proportion="-0.5811966">
+ <state line="156" column="90" selection-start="7680" selection-end="7680" vertical-scroll-proportion="0.52200615">
<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/FilteredDelegateLoader.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="51" column="13" selection-start="2021" selection-end="2021" vertical-scroll-proportion="0.16605617">
+ <state line="42" column="0" selection-start="1569" selection-end="1569" vertical-scroll-proportion="0.017034069">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/NoAnnotationURLClassLoader.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="30" column="13" selection-start="1215" selection-end="1215" vertical-scroll-proportion="0.16605617">
+ <state line="138" column="0" selection-start="5017" selection-end="5017" vertical-scroll-proportion="0.2254509">
<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/dependency/Module.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-3.0512822">
+ <state line="206" column="22" selection-start="5539" selection-end="5539" vertical-scroll-proportion="0.33867735">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/PackageVisitor.java">
+ <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">
<provider selected="true" editor-type-id="text-editor">
- <state line="36" column="6" selection-start="1406" selection-end="1406" vertical-scroll-proportion="0.16605617">
+ <state line="136" column="40" selection-start="4677" selection-end="4677" vertical-scroll-proportion="0.49398798">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/acme1/src/org/jboss/acme/ales/impl/AlesServiceImpl.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/helpers/ClassLoadingMetaDataModule.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="30" column="13" selection-start="1235" selection-end="1235" vertical-scroll-proportion="0.16248506">
+ <state line="44" column="21" selection-start="1767" selection-end="1767" vertical-scroll-proportion="0.28957915">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/acme1/src/org/jboss/acme/scott/impl/ScottServiceImpl.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/ClassLoadingMetaData.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="30" column="13" selection-start="1238" selection-end="1238" vertical-scroll-proportion="0.16248506">
+ <state line="42" column="13" selection-start="1880" selection-end="1880" vertical-scroll-proportion="0.20440882">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/acme2/src/org/jboss/acme/ales/impl/AlesServiceImpl.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="30" column="13" selection-start="1235" selection-end="1235" vertical-scroll-proportion="0.16248506">
+ <state line="33" column="0" selection-start="1273" selection-end="1273" vertical-scroll-proportion="0.18737476">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/acme2/src/org/jboss/acme/scott/impl/ScottServiceImpl.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="30" column="13" selection-start="1238" selection-end="1238" vertical-scroll-proportion="0.16248506">
+ <state line="34" column="17" selection-start="1472" selection-end="1472" vertical-scroll-proportion="0.18737476">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/foo/src/org/jboss/foo/FooBarService.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="29" column="13" selection-start="1188" selection-end="1188" vertical-scroll-proportion="0.16248506">
+ <state line="82" column="22" selection-start="2702" selection-end="2702" vertical-scroll-proportion="0.66032064">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/acme1/src/META-INF/acme-clmd.properties">
+ <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">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="127" column="30" selection-start="3967" selection-end="3967" vertical-scroll-proportion="0.33266532">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/acme2/src/META-INF/acme-clmd.properties">
+ <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/classloader/CapabilityFilter.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1" column="0" selection-start="20" selection-end="20" vertical-scroll-proportion="0.020310633">
- <folding />
+ <state line="39" column="6" selection-start="1583" selection-end="1583" vertical-scroll-proportion="0.3236473">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/foo/src/META-INF/foo-clmd.properties">
+ <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/PropertyClassloaderMetaDataDeployer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="1" column="25" selection-start="45" selection-end="45" vertical-scroll-proportion="0.020310633">
- <folding />
+ <state line="66" column="58" selection-start="2718" selection-end="2718" vertical-scroll-proportion="0.4308617">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/bootstrap/src/org/jboss/system/deployers/ClassloadingDescribeDeployer.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="67" column="99" selection-start="3207" selection-end="3207" vertical-scroll-proportion="0.76152307">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
</component>
</project>
More information about the jboss-cvs-commits
mailing list