[jboss-cvs] JBossAS SVN: r101790 - in projects/jboss-osgi/trunk: distribution and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 3 15:00:35 EST 2010
Author: thomas.diesler at jboss.com
Date: 2010-03-03 15:00:34 -0500 (Wed, 03 Mar 2010)
New Revision: 101790
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.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
projects/jboss-osgi/trunk/pom.xml
Log:
Use VFS abstration in remote runtimes
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-03 19:52:59 UTC (rev 101789)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2010-03-03 20:00:34 UTC (rev 101790)
@@ -140,6 +140,8 @@
<include name="jboss-osgi-deployment-sources.jar" />
<include name="jboss-osgi-deployers-sources.jar" />
<include name="jboss-osgi-framework-sources.jar" />
+ <include name="jboss-osgi-framework-core-sources.jar" />
+ <include name="jboss-osgi-framework-metadata-sources.jar" />
<include name="jboss-osgi-hotdeploy-sources.jar" />
<include name="jboss-osgi-husky-harness-sources.jar" />
<include name="jboss-osgi-jaxb-sources.jar" />
@@ -189,6 +191,8 @@
<include name="jboss-osgi-deployment.jar" />
<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-vfs.jar" />
<include name="log4j.jar" />
<include name="slf4j-api.jar" />
@@ -343,6 +347,9 @@
<include name="jboss-metatype.jar" />
<include name="jboss-osgi-deployers.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-reflect.jar" />
<include name="jbossxb.jar" />
<include name="mcann-core.jar" />
@@ -403,6 +410,8 @@
<include name="jboss-osgi-jbossas.jar" />
<include name="jboss-osgi-spi.jar" />
<include name="jboss-osgi-testing.jar" />
+ <include name="jboss-osgi-vfs.jar" />
+ <include name="jboss-osgi-vfs21.jar" />
</fileset>
<!-- deploy/osgi -->
@@ -469,6 +478,9 @@
<fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer"
override="true">
<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" />
</fileset>
<singlefile condition="isJBossMC" src="@{deploy.artifacts.dir}/resources/jbossas/jboss-beans-jbossmc.xml" target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml"
override="true" />
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-03-03 19:52:59 UTC (rev 101789)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-03-03 20:00:34 UTC (rev 101790)
@@ -54,6 +54,7 @@
org.jboss.osgi.spi.service;version=1.0,
org.jboss.osgi.spi.util;version=1.0,
org.jboss.osgi.testing;version=1.0,
+ org.jboss.osgi.vfs;version=1.0,
<!-- org.osgi -->
org.osgi.framework;version=1.5
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-03-03 19:52:59 UTC (rev 101789)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-03-03 20:00:34 UTC (rev 101790)
@@ -54,6 +54,7 @@
org.jboss.osgi.spi.service;version=1.0,
org.jboss.osgi.spi.util;version=1.0,
org.jboss.osgi.testing;version=1.0,
+ org.jboss.osgi.vfs;version=1.0,
<!-- org.osgi -->
org.osgi.framework;version=1.5
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-03-03 19:52:59 UTC (rev 101789)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-03-03 20:00:34 UTC (rev 101790)
@@ -42,7 +42,8 @@
org.jboss.osgi.spi.framework;version=1.0,
org.jboss.osgi.spi.service;version=1.0,
org.jboss.osgi.spi.util;version=1.0,
- org.jboss.osgi.testing;version=1.0
+ org.jboss.osgi.testing;version=1.0,
+ org.jboss.osgi.vfs;version=1.0
</value></entry>
<!-- Husky socket connector properties -->
<entry><key>org.jboss.osgi.husky.runtime.connector.host</key><value>${jboss.bind.address}</value></entry>
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-03 19:52:59 UTC (rev 101789)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties 2010-03-03 20:00:34 UTC (rev 101790)
@@ -30,6 +30,7 @@
org.jboss.osgi.spi.service;version=1.0, \
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, \
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-03 19:52:59 UTC (rev 101789)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties 2010-03-03 20:00:34 UTC (rev 101790)
@@ -30,6 +30,7 @@
org.jboss.osgi.spi.service;version=1.0, \
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, \
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-03 19:52:59 UTC (rev 101789)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2010-03-03 20:00:34 UTC (rev 101790)
@@ -40,7 +40,8 @@
org.jboss.osgi.spi.framework;version=1.0,
org.jboss.osgi.spi.service;version=1.0,
org.jboss.osgi.spi.util;version=1.0,
- org.jboss.osgi.testing;version=1.0
+ org.jboss.osgi.testing;version=1.0,
+ org.jboss.osgi.vfs;version=1.0
</value></entry>
<!-- Hot Deployment -->
<entry><key>org.jboss.osgi.hotdeploy.scandir</key><value>${osgi.server.home}/deploy</value></entry>
Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml 2010-03-03 19:52:59 UTC (rev 101789)
+++ projects/jboss-osgi/trunk/distribution/pom.xml 2010-03-03 20:00:34 UTC (rev 101790)
@@ -88,6 +88,42 @@
<classifier>javadoc</classifier>
</dependency>
<dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs</artifactId>
+ <version>${version.jboss.osgi.vfs}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs</artifactId>
+ <version>${version.jboss.osgi.vfs}</version>
+ <classifier>javadoc</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs21</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs21</artifactId>
+ <version>${version.jboss.osgi.vfs}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs30</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs30</artifactId>
+ <version>${version.jboss.osgi.vfs}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
<groupId>org.jboss.osgi.testsuite</groupId>
<artifactId>jboss-osgi-testsuite-example</artifactId>
<version>${version}</version>
@@ -452,15 +488,32 @@
<!-- JBossMC Dependencies -->
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.framework</groupId>
<artifactId>jboss-osgi-framework</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.runtime</groupId>
+ <groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework-vfs21</artifactId>
+ <version>${version.jboss.osgi.framework}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.framework</groupId>
<artifactId>jboss-osgi-framework</artifactId>
<version>${version.jboss.osgi.framework}</version>
<classifier>sources</classifier>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework-core</artifactId>
+ <version>${version.jboss.osgi.framework}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.framework</groupId>
+ <artifactId>jboss-osgi-framework-metadata</artifactId>
+ <version>${version.jboss.osgi.framework}</version>
+ <classifier>sources</classifier>
+ </dependency>
<!-- izpack -->
<dependency>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2010-03-03 19:52:59 UTC (rev 101789)
+++ projects/jboss-osgi/trunk/pom.xml 2010-03-03 20:00:34 UTC (rev 101790)
@@ -75,6 +75,7 @@
<version.jboss.osgi.serviceloader>1.0.1-SNAPSHOT</version.jboss.osgi.serviceloader>
<version.jboss.osgi.spi>1.0.5-SNAPSHOT</version.jboss.osgi.spi>
<version.jboss.osgi.testing>1.0.0-SNAPSHOT</version.jboss.osgi.testing>
+ <version.jboss.osgi.vfs>1.0.0-SNAPSHOT</version.jboss.osgi.vfs>
<version.jboss.osgi.webapp>0.7.2.SP2-SNAPSHOT</version.jboss.osgi.webapp>
<version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole>
<version.jboss.osgi.xml.binding>2.0.2.Beta4-SP1-SNAPSHOT</version.jboss.osgi.xml.binding>
@@ -130,6 +131,21 @@
<artifactId>jboss-osgi-testing</artifactId>
<version>${version.jboss.osgi.testing}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.vfs</groupId>
+ <artifactId>jboss-osgi-vfs</artifactId>
+ <version>${version.jboss.osgi.vfs}</version>
+ </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>
<!-- jboss.osgi.bundles -->
<dependency>
More information about the jboss-cvs-commits
mailing list