[jboss-cvs] JBossAS SVN: r102237 - in projects/jboss-osgi: projects/runtime/framework/trunk/bundle and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 10 12:16:49 EST 2010
Author: thomas.diesler at jboss.com
Date: 2010-03-10 12:16:48 -0500 (Wed, 10 Mar 2010)
New Revision: 102237
Modified:
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/assembly-all.xml
projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java
projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml
projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/pom.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Update to jboss-osgi-vfs30
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-10 17:05:36 UTC (rev 102236)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/pom.xml 2010-03-10 17:16:48 UTC (rev 102237)
@@ -167,11 +167,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.deployers</groupId>
- <artifactId>jboss-osgi-deployers-vfs30</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.osgi.framework</groupId>
<artifactId>jboss-osgi-framework-vfs30</artifactId>
<version>${version}</version>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/assembly-all.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/assembly-all.xml 2010-03-10 17:05:36 UTC (rev 102236)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/bundle/scripts/assembly-all.xml 2010-03-10 17:16:48 UTC (rev 102237)
@@ -36,10 +36,8 @@
<include>*:jboss-mdr:jar</include>
<include>*:jboss-metatype:jar</include>
<include>*:jboss-osgi-deployment:jar</include>
- <include>*:jboss-osgi-deployers-vfs21:jar</include>
<include>*:jboss-osgi-spi:jar</include>
<include>*:jboss-reflect:jar</include>
- <!-- include>*:jboss-vfs:jar</include -->
<include>*:jbossxb:jar</include>
<include>*:mcann-core:jar</include>
<include>*:org.osgi.core:jar</include>
@@ -53,6 +51,8 @@
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>*:jboss-logging-log4j:jar</include>
+ <include>*:jboss-osgi-deployers-vfs30:jar</include>
+ <include>*:jboss-vfs:jar</include>
</includes>
<useStrictFiltering>true</useStrictFiltering>
<scope>test</scope>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java 2010-03-10 17:05:36 UTC (rev 102236)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/core/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java 2010-03-10 17:16:48 UTC (rev 102237)
@@ -90,7 +90,6 @@
allPackages.add("org.jboss.osgi.deployment.deployer");
allPackages.add("org.jboss.osgi.deployment.interceptor");
- allPackages.add("org.jboss.osgi.microcontainer");
String[] corePackages = OSGiCoreClassFilter.getCorePackages();
allPackageNames.addAll(Arrays.asList(corePackages));
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-10 17:05:36 UTC (rev 102236)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/pom.xml 2010-03-10 17:16:48 UTC (rev 102237)
@@ -287,6 +287,11 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs21</artifactId>
+ <version>${version.jboss.osgi.vfs}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
<artifactId>jboss-osgi-vfs30</artifactId>
<version>${version.jboss.osgi.vfs}</version>
</dependency>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml 2010-03-10 17:05:36 UTC (rev 102236)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs21/pom.xml 2010-03-10 17:16:48 UTC (rev 102237)
@@ -41,9 +41,12 @@
<version>${version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.osgi.deployers</groupId>
+ <artifactId>jboss-osgi-deployers-vfs21</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.osgi.vfs</groupId>
<artifactId>jboss-osgi-vfs21</artifactId>
- <version>${version.jboss.osgi.vfs}</version>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/pom.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/pom.xml 2010-03-10 17:05:36 UTC (rev 102236)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/vfs30/pom.xml 2010-03-10 17:16:48 UTC (rev 102237)
@@ -35,9 +35,12 @@
<version>${version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.osgi.deployers</groupId>
+ <artifactId>jboss-osgi-deployers-vfs30</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.osgi.vfs</groupId>
<artifactId>jboss-osgi-vfs30</artifactId>
- <version>${version.jboss.osgi.vfs}</version>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-03-10 17:05:36 UTC (rev 102236)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-03-10 17:16:48 UTC (rev 102237)
@@ -30,6 +30,7 @@
org.jboss.beans.metadata.spi.builder;version=2.2,
org.jboss.dependency.spi;version=2.2,
org.jboss.kernel.spi.dependency;version=2.2,
+ org.jboss.vfs;version=3.0,
<!-- jboss-osgi -->
org.jboss.osgi.spi;version=1.0,
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties 2010-03-10 17:05:36 UTC (rev 102236)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties 2010-03-10 17:16:48 UTC (rev 102237)
@@ -30,11 +30,7 @@
org.jboss.osgi.spi.util;version=1.0, \
org.jboss.osgi.testing;version=1.0, \
org.jboss.osgi.vfs;version=1.0, \
- org.jboss.virtual;version=2.1, \
- org.jboss.virtual.plugins.registry;version=2.1, \
- org.jboss.virtual.plugins.context.jar;version=2.1, \
- org.jboss.virtual.plugins.vfs.helpers;version=2.1, \
- org.jboss.virtual.protocol;version=2.1, \
+ org.jboss.vfs;version=3.0, \
org.osgi.framework;version=1.5
# Bundles that need to be installed with the Framework automatically
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties 2010-03-10 17:05:36 UTC (rev 102236)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties 2010-03-10 17:16:48 UTC (rev 102237)
@@ -33,11 +33,7 @@
org.jboss.osgi.spi.util;version=1.0, \
org.jboss.osgi.testing;version=1.0, \
org.jboss.osgi.vfs;version=1.0, \
- org.jboss.virtual;version=2.1, \
- org.jboss.virtual.plugins.registry;version=2.1, \
- org.jboss.virtual.plugins.context.jar;version=2.1, \
- org.jboss.virtual.plugins.vfs.helpers;version=2.1, \
- org.jboss.virtual.protocol;version=2.1, \
+ org.jboss.vfs;version=3.0, \
org.osgi.framework;version=1.5
# Bundles that need to be installed with the Framework automatically
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-03-10 17:05:36 UTC (rev 102236)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-03-10 17:16:48 UTC (rev 102237)
@@ -30,6 +30,7 @@
org.jboss.beans.metadata.spi.builder;version=2.2,
org.jboss.dependency.spi;version=2.2,
org.jboss.kernel.spi.dependency;version=2.2,
+ org.jboss.vfs;version=3.0,
<!-- jboss-osgi -->
org.jboss.osgi.spi;version=1.0,
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties 2010-03-10 17:05:36 UTC (rev 102236)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties 2010-03-10 17:16:48 UTC (rev 102237)
@@ -27,10 +27,6 @@
org.jboss.osgi.spi.util;version=1.0, \
org.jboss.osgi.testing;version=1.0, \
org.jboss.osgi.vfs;version=1.0, \
- org.jboss.virtual;version=2.1, \
- org.jboss.virtual.plugins.registry;version=2.1, \
- org.jboss.virtual.plugins.context.jar;version=2.1, \
- org.jboss.virtual.plugins.vfs.helpers;version=2.1, \
- org.jboss.virtual.protocol;version=2.1, \
+ org.jboss.vfs;version=3.0, \
org.osgi.framework;version=1.5
Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties 2010-03-10 17:05:36 UTC (rev 102236)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties 2010-03-10 17:16:48 UTC (rev 102237)
@@ -30,10 +30,6 @@
org.jboss.osgi.spi.util;version=1.0, \
org.jboss.osgi.testing;version=1.0, \
org.jboss.osgi.vfs;version=1.0, \
- org.jboss.virtual;version=2.1, \
- org.jboss.virtual.plugins.registry;version=2.1, \
- org.jboss.virtual.plugins.context.jar;version=2.1, \
- org.jboss.virtual.plugins.vfs.helpers;version=2.1, \
- org.jboss.virtual.protocol;version=2.1, \
+ org.jboss.vfs;version=3.0, \
org.osgi.framework;version=1.5
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-10 17:05:36 UTC (rev 102236)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2010-03-10 17:16:48 UTC (rev 102237)
@@ -403,7 +403,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.osgi.vfs</groupId>
- <artifactId>jboss-osgi-vfs21</artifactId>
+ <artifactId>jboss-osgi-vfs30</artifactId>
</dependency>
</dependencies>
</profile>
@@ -432,7 +432,7 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi.vfs</groupId>
- <artifactId>jboss-osgi-vfs21</artifactId>
+ <artifactId>jboss-osgi-vfs30</artifactId>
</dependency>
</dependencies>
</profile>
More information about the jboss-cvs-commits
mailing list