[jboss-osgi-commits] JBoss-OSGI SVN: r91401 - in projects/jboss-osgi/trunk: reactor/bundles/apache-xerces and 27 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Sat Jul 18 09:49:02 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-07-18 09:49:01 -0400 (Sat, 18 Jul 2009)
New Revision: 91401
Removed:
projects/jboss-osgi/trunk/reactor/runtime/felix/scripts/
Modified:
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/reactor/bundles/apache-xerces/pom.xml
projects/jboss-osgi/trunk/reactor/bundles/blueprint/pom.xml
projects/jboss-osgi/trunk/reactor/bundles/common/pom.xml
projects/jboss-osgi/trunk/reactor/bundles/hotdeploy/pom.xml
projects/jboss-osgi/trunk/reactor/bundles/husky/pom.xml
projects/jboss-osgi/trunk/reactor/bundles/jaxb/pom.xml
projects/jboss-osgi/trunk/reactor/bundles/jboss-common-core/pom.xml
projects/jboss-osgi/trunk/reactor/bundles/jboss-xml-binding/pom.xml
projects/jboss-osgi/trunk/reactor/bundles/jmx/pom.xml
projects/jboss-osgi/trunk/reactor/bundles/jndi/pom.xml
projects/jboss-osgi/trunk/reactor/bundles/microcontainer/pom.xml
projects/jboss-osgi/trunk/reactor/bundles/remotelog/pom.xml
projects/jboss-osgi/trunk/reactor/bundles/webconsole/pom.xml
projects/jboss-osgi/trunk/reactor/runtime/deployers/pom.xml
projects/jboss-osgi/trunk/reactor/runtime/equinox/pom.xml
projects/jboss-osgi/trunk/reactor/runtime/felix/pom.xml
projects/jboss-osgi/trunk/reactor/runtime/jbossas/pom.xml
projects/jboss-osgi/trunk/reactor/runtime/knopflerfish/pom.xml
projects/jboss-osgi/trunk/reactor/spi/pom.xml
projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties
projects/jboss-osgi/trunk/testsuite/functional/pom.xml
projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties
projects/jboss-osgi/trunk/testsuite/pom.xml
projects/jboss-osgi/trunk/testsuite/trailblazer/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/ShoppingCart.java
projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/jboss-osgi-felix.properties
Log:
Decouple reactor projects from jboss-osgi
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/pom.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -30,16 +30,13 @@
<!-- Properties -->
<properties>
- <!--
- Here we define the version's of artefacts that we distribute.
- Dependencies, of the individual projects are defined with the projects.
- -->
<version.args4j>2.0.12</version.args4j>
<version.apache.felix.configadmin>1.0.10</version.apache.felix.configadmin>
<version.apache.felix.core>1.2.0</version.apache.felix.core>
<version.apache.felix.http.jetty>1.0.1</version.apache.felix.http.jetty>
<version.apache.felix.log>1.0.0</version.apache.felix.log>
<version.apache.felix.metatype>1.0.2</version.apache.felix.metatype>
+ <version.apache.felix.servlet>1.0.0</version.apache.felix.servlet>
<version.izpack>4.3.1</version.izpack>
<version.jboss.osgi.apache.xerces>2.9.1-SNAPSHOT</version.jboss.osgi.apache.xerces>
<version.jboss.osgi.blueprint>1.0.0-SNAPSHOT</version.jboss.osgi.blueprint>
@@ -61,13 +58,9 @@
<version.jboss.osgi.webconsole>1.0.0-SNAPSHOT</version.jboss.osgi.webconsole>
<version.jboss.osgi.xml.binding>2.0.1-SNAPSHOT</version.jboss.osgi.xml.binding>
<version.osgi>r4v41</version.osgi>
-
- <!-- Properties for test dependencies -->
- <version.jboss.logging>2.0.5.GA</version.jboss.logging>
- <version.junit>4.6</version.junit>
</properties>
- <!-- DependencyManagement -->
+ <!-- DependencyManagement
<dependencyManagement>
<dependencies>
<dependency>
@@ -82,21 +75,6 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>${version.apache.felix.configadmin}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>${version.apache.felix.http.jetty}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.log</artifactId>
- <version>${version.apache.felix.log}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.metatype</artifactId>
<version>${version.apache.felix.metatype}</version>
</dependency>
@@ -227,21 +205,8 @@
</dependency>
</dependencies>
</dependencyManagement>
+ -->
- <!--Dependencies -->
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<!-- Repositories -->
<repositories>
<repository>
@@ -298,8 +263,8 @@
<module>reactor/bundles/apache-xerces</module>
<module>reactor/bundles/jaxb</module>
<module>reactor/bundles/jboss-xml-binding</module>
- <module>reactor/bundles/jmx</module>
<module>reactor/bundles/jndi</module>
+ <module>reactor/bundles/jmx</module>
<module>reactor/bundles/remotelog</module>
<module>reactor/bundles/webconsole</module>
<module>reactor/bundles/hotdeploy</module>
@@ -333,224 +298,6 @@
</build>
</profile>
- <!--
- Name: no-jboss-bind-address
- Desc: Set the default jboss.bind.address
- -->
- <profile>
- <id>no-jboss-bind-address</id>
- <activation>
- <property>
- <name>!jboss.bind.address</name>
- </property>
- </activation>
- <properties>
- <jboss.bind.address>localhost</jboss.bind.address>
- </properties>
- </profile>
-
- <!--
- Name: framework-default
- Descr: Setup for default framework integration testing
- -->
- <profile>
- <id>framework-default</id>
- <activation>
- <property>
- <name>!framework</name>
- </property>
- </activation>
- <properties>
- <jboss.osgi.framework.properties>jboss-osgi-felix.properties</jboss.osgi.framework.properties>
- </properties>
- </profile>
-
- <!--
- Name: framework-felix
- Descr: Setup for Felix framework integration testing
- -->
- <profile>
- <id>framework-felix</id>
- <activation>
- <property>
- <name>framework</name>
- <value>felix</value>
- </property>
- </activation>
- <properties>
- <jboss.osgi.framework.properties>jboss-osgi-felix.properties</jboss.osgi.framework.properties>
- </properties>
- </profile>
-
- <!--
- Name: framework-equinox
- Descr: Setup for Equinox framework integration testing
- -->
- <profile>
- <id>framework-equinox</id>
- <activation>
- <property>
- <name>framework</name>
- <value>equinox</value>
- </property>
- </activation>
- <properties>
- <jboss.osgi.framework.properties>jboss-osgi-equinox.properties</jboss.osgi.framework.properties>
- </properties>
- </profile>
-
- <!--
- Name: framework-knopflerfish
- Descr: Setup for Knopflerfish framework integration testing
- -->
- <profile>
- <id>framework-knopflerfish</id>
- <activation>
- <property>
- <name>framework</name>
- <value>knopflerfish</value>
- </property>
- </activation>
- <properties>
- <jboss.osgi.framework.properties>jboss-osgi-knopflerfish.properties</jboss.osgi.framework.properties>
- </properties>
- </profile>
-
- <!--
- Name: embedded-testing
- Descr: Setup for embedded integration testing
- -->
- <profile>
- <id>embedded-testing</id>
- <activation>
- <property>
- <name>!target.container</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <!--
- You can copy these properties in Eclipse to debug example tests
-
- -Djava.protocol.handler.pkgs=org.jboss.net.protocol|org.jboss.virtual.protocol
- -Djndi.server.port=1199
- -Dlog4j.output.dir=${workspace_loc:jboss-osgi-testsuite-example/target}
- -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XIncludeAwareParserConfiguration
- -Djboss.osgi.framework.properties=jboss-osgi-felix.properties
- -Dorg.jboss.osgi.husky.Invoker=org.jboss.osgi.husky.internal.OSGiInvoker
- -Dtest.archive.directory=${workspace_loc:jboss-osgi-testsuite-example/target}/test-libs
- -->
- <property>
- <name>java.protocol.handler.pkgs</name>
- <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value>
- </property>
- <property>
- <name>jndi.server.port</name>
- <value>1199</value>
- </property>
- <property>
- <name>log4j.output.dir</name>
- <value>${project.build.directory}</value>
- </property>
- <property>
- <name>jboss.osgi.framework.properties</name>
- <value>${jboss.osgi.framework.properties}</value>
- </property>
- <property>
- <name>org.jboss.osgi.husky.Invoker</name>
- <value>org.jboss.osgi.husky.internal.OSGiInvoker</value>
- </property>
- <property>
- <name>test.archive.directory</name>
- <value>${project.build.directory}/test-libs</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: remote-testing
- Descr: Setup for remote integration testing
- -->
- <profile>
- <id>remote-testing</id>
- <activation>
- <property>
- <name>target.container</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-client</artifactId>
- <version>5.0.1.GA</version>
- <scope>test</scope>
- <type>pom</type>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>java.protocol.handler.pkgs</name>
- <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value>
- </property>
- <property>
- <name>jboss.bind.address</name>
- <value>${jboss.bind.address}</value>
- </property>
- <property>
- <name>jndi.server.port</name>
- <value>1099</value>
- </property>
- <property>
- <name>log4j.output.dir</name>
- <value>${project.build.directory}</value>
- </property>
- <property>
- <name>org.apache.xerces.xni.parser.XMLParserConfiguration</name>
- <value>org.apache.xerces.parsers.XIncludeAwareParserConfiguration</value>
- </property>
- <property>
- <name>jboss.osgi.framework.properties</name>
- <value>${jboss.osgi.framework.properties}</value>
- </property>
- <property>
- <name>org.jboss.osgi.husky.Invoker</name>
- <value>org.jboss.osgi.husky.internal.OSGiInvoker</value>
- </property>
- <property>
- <name>org.jboss.osgi.husky.runtime.connector.host</name>
- <value>${jboss.bind.address}</value>
- </property>
- <property>
- <name>org.jboss.osgi.husky.runtime.connector.port</name>
- <value>5401</value>
- </property>
- <property>
- <name>target.container</name>
- <value>${target.container}</value>
- </property>
- <property>
- <name>test.archive.directory</name>
- <value>${project.build.directory}/test-libs</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
Modified: projects/jboss-osgi/trunk/reactor/bundles/apache-xerces/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/bundles/apache-xerces/pom.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/reactor/bundles/apache-xerces/pom.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -23,22 +23,26 @@
<version>2.9.1-SNAPSHOT</version>
+ <!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta3</version>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<properties>
<version.apache.xerces>2.9.1</version.apache.xerces>
+ <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common>
<version.wutka.dtdparser>1.2.1</version.wutka.dtdparser>
<version.xml.resolver>1.2</version.xml.resolver>
+ <version.osgi>r4v41</version.osgi>
</properties>
<dependencies>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common</artifactId>
+ <version>${version.jboss.osgi.common}</version>
</dependency>
<dependency>
@@ -66,11 +70,13 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/reactor/bundles/blueprint/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/bundles/blueprint/pom.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/reactor/bundles/blueprint/pom.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -22,14 +22,21 @@
<version>1.0.0-SNAPSHOT</version>
+ <!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta3</version>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<!-- Properties -->
<properties>
+ <version.apache.felix.log>1.0.0</version.apache.felix.log>
+ <version.jboss.osgi.common.core>2.2.11-SNAPSHOT</version.jboss.osgi.common.core>
+ <version.jboss.osgi.husky>1.0.0-SNAPSHOT</version.jboss.osgi.husky>
+ <version.jboss.osgi.microcontainer>1.0.0-SNAPSHOT</version.jboss.osgi.microcontainer>
+ <version.jboss.osgi.runtime.felix>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.felix>
+ <version.osgi>r4v41</version.osgi>
</properties>
<!-- Modules -->
@@ -38,6 +45,47 @@
<module>testsuite</module>
</modules>
+ <!-- DependencyManagement -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.log</artifactId>
+ <version>${version.apache.felix.log}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-common-core</artifactId>
+ <version>${version.jboss.osgi.common.core}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-husky</artifactId>
+ <version>${version.jboss.osgi.husky}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-microcontainer</artifactId>
+ <version>${version.jboss.osgi.microcontainer}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <version>${version.jboss.osgi.runtime.felix}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<!-- Profiles -->
<profiles>
</profiles>
Modified: projects/jboss-osgi/trunk/reactor/bundles/common/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/bundles/common/pom.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/reactor/bundles/common/pom.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -23,14 +23,17 @@
<version>1.0.0-SNAPSHOT</version>
+ <!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta3</version>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<properties>
<version.jboss.logging>2.0.5.GA</version.jboss.logging>
+ <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi>
+ <version.osgi>r4v41</version.osgi>
</properties>
<!-- Dependencies -->
@@ -38,6 +41,7 @@
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
+ <version>${version.jboss.osgi.spi}</version>
</dependency>
<dependency>
@@ -51,11 +55,13 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/reactor/bundles/hotdeploy/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/bundles/hotdeploy/pom.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/reactor/bundles/hotdeploy/pom.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -23,12 +23,19 @@
<version>1.0.0-SNAPSHOT</version>
+ <!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta3</version>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
+ <!-- Properties -->
+ <properties>
+ <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common>
+ <version.osgi>r4v41</version.osgi>
+ </properties>
+
<!-- Dependencies -->
<dependencies>
@@ -36,6 +43,7 @@
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common</artifactId>
+ <version>${version.jboss.osgi.common}</version>
<scope>provided</scope>
</dependency>
@@ -43,11 +51,13 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/reactor/bundles/husky/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/bundles/husky/pom.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/reactor/bundles/husky/pom.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -24,14 +24,19 @@
<version>1.0.0-SNAPSHOT</version>
+ <!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta3</version>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<!-- Properties -->
<properties>
+ <version.apache.felix.log>1.0.0</version.apache.felix.log>
+ <version.jboss.osgi.jmx>1.0.0-SNAPSHOT</version.jboss.osgi.jmx>
+ <version.jboss.osgi.runtime.felix>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.felix>
+ <version.osgi>r4v41</version.osgi>
</properties>
<!-- Modules -->
@@ -40,4 +45,35 @@
<module>testsuite</module>
</modules>
+ <!-- DependencyManagement -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.log</artifactId>
+ <version>${version.apache.felix.log}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi.bundles</groupId>
+ <artifactId>jboss-osgi-jmx</artifactId>
+ <version>${version.jboss.osgi.jmx}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <version>${version.jboss.osgi.runtime.felix}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
</project>
Modified: projects/jboss-osgi/trunk/reactor/bundles/jaxb/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/bundles/jaxb/pom.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/reactor/bundles/jaxb/pom.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -23,20 +23,25 @@
<version>2.1.10-SNAPSHOT</version>
+ <!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta3</version>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
+ <!-- Properties -->
<properties>
+ <version.jboss.osgi.apache.xerces>2.9.1-SNAPSHOT</version.jboss.osgi.apache.xerces>
<version.xml.bind>2.1.10</version.xml.bind>
+ <version.osgi>r4v41</version.osgi>
</properties>
<dependencies>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-apache-xerces</artifactId>
+ <version>${version.jboss.osgi.apache.xerces}</version>
</dependency>
<dependency>
@@ -49,11 +54,13 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/reactor/bundles/jboss-common-core/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/bundles/jboss-common-core/pom.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/reactor/bundles/jboss-common-core/pom.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -23,10 +23,11 @@
<version>2.2.11-SNAPSHOT</version>
+ <!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta3</version>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<properties>
Modified: projects/jboss-osgi/trunk/reactor/bundles/jboss-xml-binding/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/bundles/jboss-xml-binding/pom.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/reactor/bundles/jboss-xml-binding/pom.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -23,16 +23,20 @@
<version>2.0.1-SNAPSHOT</version>
+ <!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta3</version>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
+ <!-- Properties -->
<properties>
<version.jboss.xb>2.0.1.GA</version.jboss.xb>
<version.javassist>3.9.0.GA</version.javassist>
+ <version.jboss.osgi.jaxb>2.1.10-SNAPSHOT</version.jboss.osgi.jaxb>
<version.jboss.reflect>2.0.0.GA</version.jboss.reflect>
+ <version.osgi>r4v41</version.osgi>
</properties>
<dependencies>
@@ -57,11 +61,13 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/reactor/bundles/jmx/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/bundles/jmx/pom.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/reactor/bundles/jmx/pom.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -23,14 +23,18 @@
<version>1.0.0-SNAPSHOT</version>
+ <!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta3</version>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<!-- Properties -->
<properties>
+ <version.jboss.osgi.common.core>2.2.11-SNAPSHOT</version.jboss.osgi.common.core>
+ <version.jboss.osgi.jndi>1.0.0-SNAPSHOT</version.jboss.osgi.jndi>
+ <version.osgi>r4v41</version.osgi>
</properties>
<!-- Dependencies -->
@@ -38,21 +42,25 @@
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-jndi</artifactId>
+ <version>${version.jboss.osgi.jndi}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common-core</artifactId>
+ <version>${version.jboss.osgi.common.core}</version>
</dependency>
<!-- OSGi Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/reactor/bundles/jndi/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/bundles/jndi/pom.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/reactor/bundles/jndi/pom.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -23,15 +23,18 @@
<version>1.0.0-SNAPSHOT</version>
+ <!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta3</version>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<!-- Properties -->
<properties>
<version.jboss.naming>5.0.1.GA</version.jboss.naming>
+ <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common>
+ <version.osgi>r4v41</version.osgi>
</properties>
<!-- Dependencies -->
@@ -39,6 +42,7 @@
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common</artifactId>
+ <version>${version.jboss.osgi.common}</version>
</dependency>
<!-- Provided Dependencies -->
@@ -53,11 +57,13 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/reactor/bundles/microcontainer/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/bundles/microcontainer/pom.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/reactor/bundles/microcontainer/pom.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -23,16 +23,21 @@
<version>1.0.0-SNAPSHOT</version>
+ <!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta3</version>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<!-- Properties -->
<properties>
<version.jboss.deployers>2.0.5.SP1</version.jboss.deployers>
<version.jboss.microcontainer>2.0.5.GA</version.jboss.microcontainer>
+ <version.jboss.osgi.jmx>1.0.0-SNAPSHOT</version.jboss.osgi.jmx>
+ <version.jboss.osgi.runtime.deployers>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.deployers>
+ <version.jboss.osgi.xml.binding>2.0.1-SNAPSHOT</version.jboss.osgi.xml.binding>
+ <version.osgi>r4v41</version.osgi>
</properties>
<!-- Dependencies -->
@@ -40,11 +45,18 @@
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-jmx</artifactId>
+ <version>${version.jboss.osgi.jmx}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-xml-binding</artifactId>
+ <version>${version.jboss.osgi.xml.binding}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-deployers</artifactId>
+ <version>${version.jboss.osgi.runtime.deployers}</version>
+ </dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
@@ -56,20 +68,18 @@
<artifactId>jboss-kernel</artifactId>
<version>${version.jboss.microcontainer}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-deployers</artifactId>
- </dependency>
<!-- Provided Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/reactor/bundles/remotelog/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/bundles/remotelog/pom.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/reactor/bundles/remotelog/pom.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -23,14 +23,17 @@
<version>1.0.0-SNAPSHOT</version>
+ <!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta3</version>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<!-- Properties -->
<properties>
+ <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common>
+ <version.osgi>r4v41</version.osgi>
</properties>
<!-- Dependencies -->
@@ -38,17 +41,20 @@
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common</artifactId>
+ <version>${version.jboss.osgi.common}</version>
</dependency>
<!-- OSGi Dependencies -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/reactor/bundles/webconsole/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/bundles/webconsole/pom.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/reactor/bundles/webconsole/pom.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -23,10 +23,11 @@
<version>1.0.0-SNAPSHOT</version>
+ <!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta3</version>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<!-- Properties -->
@@ -38,6 +39,7 @@
<version.felix.scr>1.0.0</version.felix.scr>
<version.felix.webconsole>1.2.10</version.felix.webconsole>
<version.javax.servlet>2.4</version.javax.servlet>
+ <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi>
<version.json>20070829</version.json>
</properties>
@@ -46,6 +48,7 @@
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
+ <version>${version.jboss.osgi.spi}</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: projects/jboss-osgi/trunk/reactor/runtime/deployers/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/runtime/deployers/pom.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/reactor/runtime/deployers/pom.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -22,14 +22,17 @@
<version>1.0.0-SNAPSHOT</version>
+ <!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta3</version>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<properties>
<version.jboss.deployers>2.0.5.SP1</version.jboss.deployers>
+ <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi>
+ <version.osgi>r4v41</version.osgi>
</properties>
<!-- Dependencies -->
@@ -37,6 +40,7 @@
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
+ <version>${version.jboss.osgi.spi}</version>
</dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
@@ -48,11 +52,13 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/reactor/runtime/equinox/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/runtime/equinox/pom.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/reactor/runtime/equinox/pom.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -22,15 +22,18 @@
<version>1.0.0-SNAPSHOT</version>
+ <!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta3</version>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
+ <!-- Properties -->
<properties>
<version.eclipse.equinox>3.4.2</version.eclipse.equinox>
<version.jboss.microcontainer>2.0.5.GA</version.jboss.microcontainer>
+ <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi>
</properties>
<!-- Dependencies -->
@@ -38,6 +41,7 @@
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
+ <version>${version.jboss.osgi.spi}</version>
</dependency>
<dependency>
<groupId>org.eclipse.equinox</groupId>
Modified: projects/jboss-osgi/trunk/reactor/runtime/felix/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/runtime/felix/pom.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/reactor/runtime/felix/pom.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -10,7 +10,7 @@
<!-- ====================================================================== -->
<!-- $Id$ -->
-
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -21,23 +21,27 @@
<packaging>jar</packaging>
<version>1.0.0-SNAPSHOT</version>
-
+
+ <!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta3</version>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<properties>
+ <version.apache.felix.core>1.2.0</version.apache.felix.core>
<version.felix.framework>1.8.1</version.felix.framework>
<version.jboss.microcontainer>2.0.5.GA</version.jboss.microcontainer>
+ <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi>
</properties>
-
+
<!-- Dependencies -->
<dependencies>
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
+ <version>${version.jboss.osgi.spi}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -47,15 +51,9 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>${version.apache.felix.core}</version>
</dependency>
- <!-- Provided Dependencies -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.log</artifactId>
- <scope>provided</scope>
- </dependency>
-
<!-- Test Dependencies -->
<dependency>
<groupId>org.jboss.microcontainer</groupId>
@@ -74,26 +72,6 @@
</testResource>
</testResources>
<plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>bundles</id>
- <phase>test-compile</phase>
- <goals>
- <goal>directory-single</goal>
- </goals>
- <configuration>
- <finalName>test-libs</finalName>
- <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>scripts/assembly-bundles.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
Modified: projects/jboss-osgi/trunk/reactor/runtime/jbossas/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/runtime/jbossas/pom.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/reactor/runtime/jbossas/pom.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -22,13 +22,15 @@
<version>1.0.0-SNAPSHOT</version>
+ <!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta3</version>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<properties>
+ <version.jboss.osgi.microcontainer>1.0.0-SNAPSHOT</version.jboss.osgi.microcontainer>
</properties>
<!-- Dependencies -->
@@ -36,6 +38,7 @@
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-microcontainer</artifactId>
+ <version>${version.jboss.osgi.microcontainer}</version>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/reactor/runtime/knopflerfish/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/runtime/knopflerfish/pom.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/reactor/runtime/knopflerfish/pom.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -22,15 +22,18 @@
<version>1.0.0-SNAPSHOT</version>
+ <!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta3</version>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<properties>
<version.knopflerfish>2.2.0</version.knopflerfish>
<version.jboss.microcontainer>2.0.5.GA</version.jboss.microcontainer>
+ <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi>
+ <version.osgi>r4v41</version.osgi>
</properties>
<!-- Dependencies -->
@@ -38,6 +41,7 @@
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
+ <version>${version.jboss.osgi.spi}</version>
</dependency>
<dependency>
<groupId>org.knopflerfish</groupId>
@@ -47,6 +51,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
</dependency>
<!-- Test Dependencies -->
Modified: projects/jboss-osgi/trunk/reactor/spi/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/spi/pom.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/reactor/spi/pom.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -25,16 +25,18 @@
<!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta3</version>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<!-- Properties -->
<properties>
+ <version.args4j>2.0.12</version.args4j>
<version.jboss.deployers>2.0.5.SP1</version.jboss.deployers>
<version.jboss.logging>2.0.5.GA</version.jboss.logging>
<version.jboss.microcontainer>2.0.5.GA</version.jboss.microcontainer>
<version.jboss.vfs>2.1.0.GA</version.jboss.vfs>
+ <version.osgi>r4v41</version.osgi>
</properties>
<!-- Dependencies -->
Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -15,6 +15,7 @@
<outputDirectory>bundles</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
+ <include>*:javax.servlet:jar</include>
<include>*:jboss-osgi-apache-xerces:jar</include>
<include>*:jboss-osgi-common:jar</include>
<include>*:jboss-osgi-common-core:jar</include>
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 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties 2009-07-18 13:49:01 UTC (rev 91401)
@@ -35,7 +35,9 @@
# Bundles that need to be installed with the Framework automatically
org.jboss.osgi.spi.framework.autoInstall=\
- file://${test.archive.directory}/bundles/org.osgi.compendium.jar
+ file://${test.archive.directory}/bundles/org.osgi.compendium.jar, \
+ file://${test.archive.directory}/bundles/javax.servlet.jar
+
# Bundles that need to be started automatically
org.jboss.osgi.spi.framework.autoStart=\
Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -35,6 +35,7 @@
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
+ <version>${version.jboss.microcontainer}</version>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -15,6 +15,7 @@
<outputDirectory>bundles</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
+ <include>*:javax.servlet:jar</include>
<include>*:jboss-osgi-apache-xerces:jar</include>
<include>*:jboss-osgi-common:jar</include>
<include>*:jboss-osgi-common-core:jar</include>
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 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties 2009-07-18 13:49:01 UTC (rev 91401)
@@ -35,7 +35,8 @@
# Bundles that need to be installed with the Framework automatically
org.jboss.osgi.spi.framework.autoInstall=\
- file://${test.archive.directory}/bundles/org.osgi.compendium.jar
+ file://${test.archive.directory}/bundles/org.osgi.compendium.jar, \
+ file://${test.archive.directory}/bundles/javax.servlet.jar
# Bundles that need to be started automatically
org.jboss.osgi.spi.framework.autoStart=\
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -34,33 +34,11 @@
<!-- Properties -->
<properties>
- <version.javax.servlet>2.4</version.javax.servlet>
+ <version.jbossas.client>5.0.1.GA</version.jbossas.client>
<version.jboss.naming>5.0.1.GA</version.jboss.naming>
<version.jboss.microcontainer>2.0.5.GA</version.jboss.microcontainer>
- <version.jbossas.client>5.0.1.GA</version.jbossas.client>
</properties>
- <!-- DependencyManagement -->
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${version.javax.servlet}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-aop-mc-int</artifactId>
- <version>${version.jboss.microcontainer}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnpserver</artifactId>
- <version>${version.jboss.naming}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<!-- Dependencies -->
<dependencies>
<dependency>
@@ -68,55 +46,72 @@
<artifactId>bnd</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.naming</groupId>
<artifactId>jnpserver</artifactId>
+ <version>${version.jboss.naming}</version>
</dependency>
<!-- Bundle Dependencies -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
+ <version>${version.apache.felix.configadmin}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>${version.apache.felix.http.jetty}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.log</artifactId>
+ <version>${version.apache.felix.log}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.metatype</artifactId>
+ <version>${version.apache.felix.metatype}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-blueprint</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>javax.servlet</artifactId>
+ <version>${version.apache.felix.servlet}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-husky</artifactId>
+ <artifactId>jboss-osgi-blueprint</artifactId>
+ <version>${version.jboss.osgi.blueprint}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
- <artifactId>jboss-osgi-microcontainer</artifactId>
+ <artifactId>jboss-osgi-husky</artifactId>
+ <version>${version.jboss.osgi.husky}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-remotelog</artifactId>
+ <version>${version.jboss.osgi.remotelog}</version>
<scope>provided</scope>
</dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!-- Build -->
@@ -147,7 +142,13 @@
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-runtime-felix</artifactId>
+ <version>${version.jboss.osgi.runtime.felix}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${version.apache.felix.core}</version>
+ </dependency>
</dependencies>
</profile>
@@ -167,7 +168,13 @@
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-runtime-felix</artifactId>
+ <version>${version.jboss.osgi.runtime.felix}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${version.apache.felix.core}</version>
+ </dependency>
</dependencies>
</profile>
@@ -187,6 +194,7 @@
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-runtime-equinox</artifactId>
+ <version>${version.jboss.osgi.runtime.equinox}</version>
</dependency>
</dependencies>
<build>
@@ -220,6 +228,7 @@
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-runtime-knopflerfish</artifactId>
+ <version>${version.jboss.osgi.runtime.knopflerfish}</version>
</dependency>
</dependencies>
<build>
Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/trailblazer/scripts/assembly-bundles.xml 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/testsuite/trailblazer/scripts/assembly-bundles.xml 2009-07-18 13:49:01 UTC (rev 91401)
@@ -15,6 +15,7 @@
<outputDirectory>bundles</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<includes>
+ <include>*:javax.servlet:jar</include>
<include>*:jboss-osgi-apache-xerces:jar</include>
<include>*:jboss-osgi-common:jar</include>
<include>*:jboss-osgi-common-core:jar</include>
Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/ShoppingCart.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/ShoppingCart.java 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/ShoppingCart.java 2009-07-18 13:49:01 UTC (rev 91401)
@@ -53,11 +53,11 @@
static ShoppingCart getShoppingCart(HttpServletRequest req)
{
HttpSession session = req.getSession(true);
- ShoppingCart content = (ShoppingCart)session.getAttribute("cart");
+ ShoppingCart content = (ShoppingCart)session.getValue("cart");
if (content == null)
{
content = new ShoppingCart();
- session.setAttribute("cart", content);
+ session.putValue("cart", content);
}
return content;
}
Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/jboss-osgi-felix.properties 2009-07-18 13:37:19 UTC (rev 91400)
+++ projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/jboss-osgi-felix.properties 2009-07-18 13:49:01 UTC (rev 91401)
@@ -37,7 +37,8 @@
# Bundles that need to be installed with the Framework automatically
org.jboss.osgi.spi.framework.autoInstall=\
- file://${test.archive.directory}/bundles/org.osgi.compendium.jar
+ file://${test.archive.directory}/bundles/org.osgi.compendium.jar, \
+ file://${test.archive.directory}/bundles/javax.servlet.jar
# Bundles that need to be started automatically
org.jboss.osgi.spi.framework.autoStart=\
More information about the jboss-osgi-commits
mailing list