Author: thomas.diesler(a)jboss.com Date: 2010-03-10 17:15:17 -0500 (Wed, 10 Mar 2010) New Revision: 102247 Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/distribution/pom.xml Log: Update runtime to vfs30 Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-03-10 21:38:44 UTC (rev 102246) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-03-10 22:15:17 UTC (rev 102247) @@ -191,7 +191,7 @@ <include name="jboss-osgi-spi.jar" /> <include name="jboss-osgi-testing.jar" /> <include name="jboss-osgi-vfs.jar" /> - <include name="jboss-osgi-vfs21.jar" /> + <include name="jboss-osgi-vfs30.jar" /> <include name="jboss-vfs.jar" /> <include name="log4j.jar" /> <include name="slf4j-api.jar" /> @@ -344,11 +344,11 @@ <include name="jboss-managed.jar" /> <include name="jboss-mdr.jar" /> <include name="jboss-metatype.jar" /> - <include name="jboss-osgi-deployers-vfs21.jar" /> + <include name="jboss-osgi-deployers-vfs30.jar" /> <include name="jboss-osgi-framework.jar" /> <include name="jboss-osgi-framework-core.jar" /> <include name="jboss-osgi-framework-metadata.jar" /> - <include name="jboss-osgi-framework-vfs21.jar" /> + <include name="jboss-osgi-framework-vfs30.jar" /> <include name="jboss-reflect.jar" /> <include name="jbossxb.jar" /> <include name="mcann-core.jar" /> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties 2010-03-10 21:38:44 UTC (rev 102246) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties 2010-03-10 22:15:17 UTC (rev 102247) @@ -31,17 +31,13 @@ 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 org.jboss.osgi.spi.framework.autoInstall=\ file://${osgi.home}/server/minimal/deploy/org.eclipse.osgi.services.jar \ - file://${osgi.home}/server/minimal/deploy/org.eclipse.osgi.util.jar + file://${osgi.home}/server/minimal/deploy/org.eclipse.osgi.util.jar # Bundles that need to be started automatically org.jboss.osgi.spi.framework.autoStart=\ Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties 2010-03-10 21:38:44 UTC (rev 102246) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties 2010-03-10 22:15:17 UTC (rev 102247) @@ -31,11 +31,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/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2010-03-10 21:38:44 UTC (rev 102246) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2010-03-10 22:15:17 UTC (rev 102247) @@ -33,6 +33,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/distribution/pom.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/pom.xml 2010-03-10 21:38:44 UTC (rev 102246) +++ projects/jboss-osgi/trunk/distribution/pom.xml 2010-03-10 22:15:17 UTC (rev 102247) @@ -89,11 +89,11 @@ </dependency> <dependency> <groupId>org.jboss.osgi.deployers</groupId> - <artifactId>jboss-osgi-deployers-vfs21</artifactId> + <artifactId>jboss-osgi-deployers-vfs30</artifactId> </dependency> <dependency> <groupId>org.jboss.osgi.deployers</groupId> - <artifactId>jboss-osgi-deployers-vfs30</artifactId> + <artifactId>jboss-osgi-deployers-vfs21</artifactId> </dependency> <dependency> <groupId>org.jboss.osgi.jmx</groupId> @@ -167,21 +167,21 @@ </dependency> <dependency> <groupId>org.jboss.osgi.vfs</groupId> - <artifactId>jboss-osgi-vfs21</artifactId> + <artifactId>jboss-osgi-vfs30</artifactId> </dependency> <dependency> <groupId>org.jboss.osgi.vfs</groupId> - <artifactId>jboss-osgi-vfs21</artifactId> + <artifactId>jboss-osgi-vfs30</artifactId> <version>${version.jboss.osgi.vfs}</version> <classifier>sources</classifier> </dependency> <dependency> <groupId>org.jboss.osgi.vfs</groupId> - <artifactId>jboss-osgi-vfs30</artifactId> + <artifactId>jboss-osgi-vfs21</artifactId> </dependency> <dependency> <groupId>org.jboss.osgi.vfs</groupId> - <artifactId>jboss-osgi-vfs30</artifactId> + <artifactId>jboss-osgi-vfs21</artifactId> <version>${version.jboss.osgi.vfs}</version> <classifier>sources</classifier> </dependency> @@ -491,12 +491,12 @@ </dependency> <dependency> <groupId>org.jboss.osgi.framework</groupId> - <artifactId>jboss-osgi-framework-vfs21</artifactId> + <artifactId>jboss-osgi-framework-vfs30</artifactId> <version>${version.jboss.osgi.framework}</version> </dependency> <dependency> <groupId>org.jboss.osgi.framework</groupId> - <artifactId>jboss-osgi-framework-vfs30</artifactId> + <artifactId>jboss-osgi-framework-vfs21</artifactId> <version>${version.jboss.osgi.framework}</version> </dependency> <dependency>