July 2009 - jboss-osgi-commits - Jboss List Archives

JBoss-OSGI SVN: r91422 - projects/jboss-osgi/trunk.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-07-20 07:17:36 -0400 (Mon, 20 Jul 2009) New Revision: 91422 Modified: projects/jboss-osgi/trunk/pom.xml Log: Restore <version.osgi> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-07-20 10:20:47 UTC (rev 91421) +++ projects/jboss-osgi/trunk/pom.xml 2009-07-20 11:17:36 UTC (rev 91422) @@ -55,6 +55,7 @@ <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi> <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>

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r91421 - projects/jboss-osgi/trunk/reactor.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-07-20 06:20:47 -0400 (Mon, 20 Jul 2009) New Revision: 91421 Added: projects/jboss-osgi/trunk/reactor/runtime/ Modified: projects/jboss-osgi/trunk/reactor/ Log: update externals Property changes on: projects/jboss-osgi/trunk/reactor ___________________________________________________________________ Name: svn:externals + spi https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/spi/trunk bundles/apache-xerces https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... bundles/common https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... bundles/hotdeploy https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... bundles/husky https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... bundles/jaxb https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... bundles/jmx https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... bundles/jndi https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... bundles/jboss-common-core https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... bundles/jboss-xml-binding https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... bundles/microcontainer https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... bundles/remotelog https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... bundles/webconsole https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/bundles/... runtime/deployers https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/... runtime/equinox https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/... runtime/felix https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/... runtime/jbossas https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/... runtime/knopflerfish https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/runtime/...

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r91419 - projects/jboss-osgi/trunk/reactor.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-07-20 05:29:06 -0400 (Mon, 20 Jul 2009) New Revision: 91419 Removed: projects/jboss-osgi/trunk/reactor/runtime/ Log: reactor projects get individual svn locations - wip

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r91418 - in projects/jboss-osgi/trunk: distribution/installer and 3 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-07-20 05:26:32 -0400 (Mon, 20 Jul 2009) New Revision: 91418 Removed: projects/jboss-osgi/trunk/reactor/bundles/apache-xerces/ projects/jboss-osgi/trunk/reactor/bundles/common/ projects/jboss-osgi/trunk/reactor/bundles/hotdeploy/ projects/jboss-osgi/trunk/reactor/bundles/husky/ projects/jboss-osgi/trunk/reactor/bundles/jaxb/ projects/jboss-osgi/trunk/reactor/bundles/jboss-common-core/ projects/jboss-osgi/trunk/reactor/bundles/jboss-xml-binding/ projects/jboss-osgi/trunk/reactor/bundles/jmx/ projects/jboss-osgi/trunk/reactor/bundles/jndi/ projects/jboss-osgi/trunk/reactor/bundles/microcontainer/ projects/jboss-osgi/trunk/reactor/bundles/remotelog/ projects/jboss-osgi/trunk/reactor/bundles/webconsole/ projects/jboss-osgi/trunk/reactor/runtime/deployers/ projects/jboss-osgi/trunk/reactor/runtime/equinox/ projects/jboss-osgi/trunk/reactor/runtime/felix/ projects/jboss-osgi/trunk/reactor/runtime/jbossas/ projects/jboss-osgi/trunk/reactor/runtime/knopflerfish/ projects/jboss-osgi/trunk/reactor/spi/ Modified: projects/jboss-osgi/trunk/distribution/installer/pom.xml projects/jboss-osgi/trunk/pom.xml Log: reactor projects get individual svn locations - wip Modified: projects/jboss-osgi/trunk/distribution/installer/pom.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/pom.xml 2009-07-20 09:25:44 UTC (rev 91417) +++ projects/jboss-osgi/trunk/distribution/installer/pom.xml 2009-07-20 09:26:32 UTC (rev 91418) @@ -10,7 +10,7 @@   - + <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> @@ -30,10 +30,9 @@  <dependencies> <dependency> - <groupId>args4j</groupId> - <artifactId>args4j</artifactId> - <version>${version.args4j}</version> - </dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-log4j</artifactId> + </dependency> <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-deployers</artifactId> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-07-20 09:25:44 UTC (rev 91417) +++ projects/jboss-osgi/trunk/pom.xml 2009-07-20 09:26:32 UTC (rev 91418) @@ -30,7 +30,6 @@  <properties> - <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> @@ -56,7 +55,6 @@ <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi> <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>

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r91417 - in projects/jboss-osgi/projects: bundles and 19 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-07-20 05:25:44 -0400 (Mon, 20 Jul 2009) New Revision: 91417 Added: projects/jboss-osgi/projects/bundles/ projects/jboss-osgi/projects/bundles/apache-xerces/ projects/jboss-osgi/projects/bundles/apache-xerces/trunk/ projects/jboss-osgi/projects/bundles/common/ projects/jboss-osgi/projects/bundles/common/trunk/ projects/jboss-osgi/projects/bundles/hotdeploy/ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/ projects/jboss-osgi/projects/bundles/husky/ projects/jboss-osgi/projects/bundles/husky/trunk/ projects/jboss-osgi/projects/bundles/jaxb/ projects/jboss-osgi/projects/bundles/jaxb/trunk/ projects/jboss-osgi/projects/bundles/jboss-common-core/ projects/jboss-osgi/projects/bundles/jboss-common-core/trunk/ projects/jboss-osgi/projects/bundles/jboss-xml-binding/ projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk/ projects/jboss-osgi/projects/bundles/jmx/ projects/jboss-osgi/projects/bundles/jmx/trunk/ projects/jboss-osgi/projects/bundles/jndi/ projects/jboss-osgi/projects/bundles/jndi/trunk/ projects/jboss-osgi/projects/bundles/microcontainer/ projects/jboss-osgi/projects/bundles/microcontainer/trunk/ projects/jboss-osgi/projects/bundles/remotelog/ projects/jboss-osgi/projects/bundles/remotelog/trunk/ projects/jboss-osgi/projects/bundles/webconsole/ projects/jboss-osgi/projects/bundles/webconsole/trunk/ projects/jboss-osgi/projects/runtime/deployers/ projects/jboss-osgi/projects/runtime/deployers/trunk/ projects/jboss-osgi/projects/runtime/equinox/ projects/jboss-osgi/projects/runtime/equinox/trunk/ projects/jboss-osgi/projects/runtime/felix/ projects/jboss-osgi/projects/runtime/felix/trunk/ projects/jboss-osgi/projects/runtime/jbossas/ projects/jboss-osgi/projects/runtime/jbossas/trunk/ projects/jboss-osgi/projects/runtime/knopflerfish/ projects/jboss-osgi/projects/runtime/knopflerfish/trunk/ projects/jboss-osgi/projects/spi/ projects/jboss-osgi/projects/spi/trunk/ Log: reactor projects get individual svn locations - wip Copied: projects/jboss-osgi/projects/bundles/apache-xerces/trunk (from rev 91416, projects/jboss-osgi/trunk/reactor/bundles/apache-xerces) Copied: projects/jboss-osgi/projects/bundles/common/trunk (from rev 91416, projects/jboss-osgi/trunk/reactor/bundles/common) Copied: projects/jboss-osgi/projects/bundles/hotdeploy/trunk (from rev 91416, projects/jboss-osgi/trunk/reactor/bundles/hotdeploy) Copied: projects/jboss-osgi/projects/bundles/husky/trunk (from rev 91416, projects/jboss-osgi/trunk/reactor/bundles/husky) Copied: projects/jboss-osgi/projects/bundles/jaxb/trunk (from rev 91416, projects/jboss-osgi/trunk/reactor/bundles/jaxb) Copied: projects/jboss-osgi/projects/bundles/jboss-common-core/trunk (from rev 91416, projects/jboss-osgi/trunk/reactor/bundles/jboss-common-core) Copied: projects/jboss-osgi/projects/bundles/jboss-xml-binding/trunk (from rev 91416, projects/jboss-osgi/trunk/reactor/bundles/jboss-xml-binding) Copied: projects/jboss-osgi/projects/bundles/jmx/trunk (from rev 91416, projects/jboss-osgi/trunk/reactor/bundles/jmx) Copied: projects/jboss-osgi/projects/bundles/jndi/trunk (from rev 91416, projects/jboss-osgi/trunk/reactor/bundles/jndi) Copied: projects/jboss-osgi/projects/bundles/microcontainer/trunk (from rev 91416, projects/jboss-osgi/trunk/reactor/bundles/microcontainer) Copied: projects/jboss-osgi/projects/bundles/remotelog/trunk (from rev 91416, projects/jboss-osgi/trunk/reactor/bundles/remotelog) Copied: projects/jboss-osgi/projects/bundles/webconsole/trunk (from rev 91416, projects/jboss-osgi/trunk/reactor/bundles/webconsole) Copied: projects/jboss-osgi/projects/runtime/deployers/trunk (from rev 91416, projects/jboss-osgi/trunk/reactor/runtime/deployers) Copied: projects/jboss-osgi/projects/runtime/equinox/trunk (from rev 91416, projects/jboss-osgi/trunk/reactor/runtime/equinox) Copied: projects/jboss-osgi/projects/runtime/felix/trunk (from rev 91416, projects/jboss-osgi/trunk/reactor/runtime/felix) Copied: projects/jboss-osgi/projects/runtime/jbossas/trunk (from rev 91416, projects/jboss-osgi/trunk/reactor/runtime/jbossas) Copied: projects/jboss-osgi/projects/runtime/knopflerfish/trunk (from rev 91416, projects/jboss-osgi/trunk/reactor/runtime/knopflerfish) Copied: projects/jboss-osgi/projects/spi/trunk (from rev 91416, projects/jboss-osgi/trunk/reactor/spi)

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r91409 - in projects/jboss-osgi: trunk and 1 other directory.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-07-19 07:03:47 -0400 (Sun, 19 Jul 2009) New Revision: 91409 Modified: projects/jboss-osgi/projects/parent/trunk/pom.xml projects/jboss-osgi/trunk/pom.xml Log: Disable reactor tests on distro build Modified: projects/jboss-osgi/projects/parent/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-07-19 07:03:51 UTC (rev 91408) +++ projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-07-19 11:03:47 UTC (rev 91409) @@ -211,6 +211,24 @@ <profiles>  + <profile> + <id>distro</id> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>true</skipTests> + </configuration> + </plugin> + </plugins> + </build> + </profile> + +  Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-07-19 07:03:51 UTC (rev 91408) +++ projects/jboss-osgi/trunk/pom.xml 2009-07-19 11:03:47 UTC (rev 91409) @@ -138,16 +138,6 @@ <module>distribution/docbook</module> <module>distribution/installer</module> </modules> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> </profile> </profiles>

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r91408 - in projects/jboss-osgi/trunk: distribution/installer and 1 other directory.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-07-19 03:03:51 -0400 (Sun, 19 Jul 2009) New Revision: 91408 Modified: projects/jboss-osgi/trunk/distribution/installer/pom.xml projects/jboss-osgi/trunk/pom.xml Log: Define versions for installer Modified: projects/jboss-osgi/trunk/distribution/installer/pom.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/pom.xml 2009-07-19 02:53:02 UTC (rev 91407) +++ projects/jboss-osgi/trunk/distribution/installer/pom.xml 2009-07-19 07:03:51 UTC (rev 91408) @@ -32,10 +32,12 @@ <dependency> <groupId>args4j</groupId> <artifactId>args4j</artifactId> + <version>${version.args4j}</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.osgi</groupId> @@ -46,6 +48,7 @@ <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-jbossas</artifactId> + <version>${version.jboss.osgi.runtime.jbossas}</version> </dependency> <dependency> <groupId>org.jboss.osgi</groupId> @@ -93,22 +96,27 @@ <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-apache-xerces</artifactId> + <version>${version.jboss.osgi.apache.xerces}</version> </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-common</artifactId> + <version>${version.jboss.osgi.common}</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-hotdeploy</artifactId> + <version>${version.jboss.osgi.hotdeploy}</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> @@ -125,32 +133,39 @@ <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-jaxb</artifactId> + <version>${version.jboss.osgi.jaxb}</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.bundles</groupId> <artifactId>jboss-osgi-jndi</artifactId> + <version>${version.jboss.osgi.jndi}</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.bundles</groupId> <artifactId>jboss-osgi-webconsole</artifactId> + <version>${version.jboss.osgi.webconsole}</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-runtime-equinox</artifactId> + <version>${version.jboss.osgi.runtime.equinox}</version> </dependency> <dependency> <groupId>org.jboss.osgi</groupId> @@ -163,6 +178,7 @@ <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-felix</artifactId> + <version>${version.jboss.osgi.runtime.felix}</version> </dependency> <dependency> <groupId>org.jboss.osgi</groupId> @@ -173,21 +189,25 @@ <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> @@ -195,6 +215,7 @@ <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-knopflerfish</artifactId> + <version>${version.jboss.osgi.runtime.knopflerfish}</version> </dependency> <dependency> <groupId>org.jboss.osgi</groupId> @@ -207,6 +228,7 @@ <dependency> <groupId>org.codehaus.izpack</groupId> <artifactId>izpack-standalone-compiler</artifactId> + <version>${version.izpack}</version> </dependency> </dependencies> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-07-19 02:53:02 UTC (rev 91407) +++ projects/jboss-osgi/trunk/pom.xml 2009-07-19 07:03:51 UTC (rev 91408) @@ -59,153 +59,6 @@ <version.osgi>r4v41</version.osgi> </properties> -  -  <repositories> <repository>

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r91403 - in projects/jboss-osgi/trunk: testsuite and 7 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-07-18 10:01:46 -0400 (Sat, 18 Jul 2009) New Revision: 91403 Modified: projects/jboss-osgi/trunk/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/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: Remove dependency on felix servlet Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-07-18 13:49:19 UTC (rev 91402) +++ projects/jboss-osgi/trunk/pom.xml 2009-07-18 14:01:46 UTC (rev 91403) @@ -36,7 +36,6 @@ <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> 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:49:19 UTC (rev 91402) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-07-18 14:01:46 UTC (rev 91403) @@ -15,7 +15,6 @@ <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> @@ -30,7 +29,7 @@ <include>*:org.apache.felix.http.jetty:jar</include> <include>*:org.apache.felix.log:jar</include> <include>*:org.apache.felix.metatype:jar</include> - <include>*:org.osgi.compendium:jar</include> + <include>org.osgi:org.osgi.compendium:jar</include> </includes> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> 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:49:19 UTC (rev 91402) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties 2009-07-18 14:01:46 UTC (rev 91403) @@ -35,8 +35,7 @@ # 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/javax.servlet.jar + file://${test.archive.directory}/bundles/org.osgi.compendium.jar # Bundles that need to be started automatically 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:49:19 UTC (rev 91402) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-07-18 14:01:46 UTC (rev 91403) @@ -15,7 +15,6 @@ <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> @@ -30,7 +29,7 @@ <include>*:org.apache.felix.http.jetty:jar</include> <include>*:org.apache.felix.log:jar</include> <include>*:org.apache.felix.metatype:jar</include> - <include>*:org.osgi.compendium:jar</include> + <include>org.osgi:org.osgi.compendium:jar</include> </includes> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> 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:49:19 UTC (rev 91402) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties 2009-07-18 14:01:46 UTC (rev 91403) @@ -35,8 +35,7 @@ # 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/javax.servlet.jar + file://${test.archive.directory}/bundles/org.osgi.compendium.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:49:19 UTC (rev 91402) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-07-18 14:01:46 UTC (rev 91403) @@ -34,6 +34,7 @@  <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> @@ -45,6 +46,11 @@ <groupId>biz.aQute</groupId> <artifactId>bnd</artifactId> </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${version.javax.servlet}</version> + </dependency> <dependency> <groupId>org.jboss.naming</groupId> <artifactId>jnpserver</artifactId> @@ -77,12 +83,6 @@ <scope>provided</scope> </dependency> <dependency> - <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-blueprint</artifactId> <version>${version.jboss.osgi.blueprint}</version> @@ -100,6 +100,12 @@ <version>${version.jboss.osgi.remotelog}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <version>${version.osgi}</version> + <scope>provided</scope> + </dependency>  <dependency> 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:49:19 UTC (rev 91402) +++ projects/jboss-osgi/trunk/testsuite/trailblazer/scripts/assembly-bundles.xml 2009-07-18 14:01:46 UTC (rev 91403) @@ -15,7 +15,6 @@ <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> @@ -30,7 +29,7 @@ <include>*:org.apache.felix.http.jetty:jar</include> <include>*:org.apache.felix.log:jar</include> <include>*:org.apache.felix.metatype:jar</include> - <include>*:org.osgi.compendium:jar</include> + <include>org.osgi:org.osgi.compendium:jar</include> </includes> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> 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:49:19 UTC (rev 91402) +++ projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/java/org/jboss/test/osgi/trailblazer/frontend/ShoppingCart.java 2009-07-18 14:01:46 UTC (rev 91403) @@ -53,11 +53,11 @@ static ShoppingCart getShoppingCart(HttpServletRequest req) { HttpSession session = req.getSession(true); - ShoppingCart content = (ShoppingCart)session.getValue("cart"); + ShoppingCart content = (ShoppingCart)session.getAttribute("cart"); if (content == null) { content = new ShoppingCart(); - session.putValue("cart", content); + session.setAttribute("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:49:19 UTC (rev 91402) +++ projects/jboss-osgi/trunk/testsuite/trailblazer/src/test/resources/jboss-osgi-felix.properties 2009-07-18 14:01:46 UTC (rev 91403) @@ -37,8 +37,7 @@ # 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/javax.servlet.jar + file://${test.archive.directory}/bundles/org.osgi.compendium.jar # Bundles that need to be started automatically org.jboss.osgi.spi.framework.autoStart=\

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r91402 - projects/jboss-osgi/projects/parent/trunk.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-07-18 09:49:19 -0400 (Sat, 18 Jul 2009) New Revision: 91402 Modified: projects/jboss-osgi/projects/parent/trunk/pom.xml Log: Decouple reactor projects from jboss-osgi Modified: projects/jboss-osgi/projects/parent/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-07-18 13:49:01 UTC (rev 91401) +++ projects/jboss-osgi/projects/parent/trunk/pom.xml 2009-07-18 13:49:19 UTC (rev 91402) @@ -15,6 +15,8 @@  <properties> <version.aqute.bnd>0.0.323</version.aqute.bnd> + <version.jboss.logging>2.0.5.GA</version.jboss.logging> + <version.junit>4.6</version.junit> </properties>  @@ -25,11 +27,21 @@ <artifactId>bnd</artifactId> <version>${version.aqute.bnd}</version> </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-log4j</artifactId> + <version>${version.jboss.logging}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${version.junit}</version> + </dependency> </dependencies> </dependencyManagement> +  <build> -  <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> @@ -197,6 +209,226 @@  <profiles> + +  + <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> + +  + <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> + +  + <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> + +  + <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> + +  + <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> + +  + <profile> + <id>embedded-testing</id> + <activation> + <property> + <name>!target.container</name> + </property> + </activation> + <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>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> + +  + <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>

16 years, 5 months

1
0
0 / 0

JBoss-OSGI SVN: r91401 - in projects/jboss-osgi/trunk: reactor/bundles/apache-xerces and 27 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)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> -  <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> - -  - <version.jboss.logging>2.0.5.GA</version.jboss.logging> - <version.junit>4.6</version.junit> </properties> -  +  -  - <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> <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> -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <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> - -  - <profile> - <id>embedded-testing</id> - <activation> - <property> - <name>!target.container</name> - </property> - </activation> - <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>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> - -  - <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> <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> <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.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>  @@ -38,6 +45,47 @@ <module>testsuite</module> </modules> +  + <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> 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> <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>  @@ -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> <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.common>1.0.0-SNAPSHOT</version.jboss.osgi.common> + <version.osgi>r4v41</version.osgi> + </properties> +  <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> <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.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>  @@ -40,4 +45,35 @@ <module>testsuite</module> </modules> +  + <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> <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.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> <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> <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.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> <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.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>  @@ -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>  <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> <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.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>  @@ -39,6 +42,7 @@ <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-common</artifactId> + <version>${version.jboss.osgi.common}</version> </dependency>  @@ -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> <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.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>  @@ -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>  <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> <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.common>1.0.0-SNAPSHOT</version.jboss.osgi.common> + <version.osgi>r4v41</version.osgi> </properties>  @@ -38,17 +41,20 @@ <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-common</artifactId> + <version>${version.jboss.osgi.common}</version> </dependency>  <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> <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>  @@ -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> <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>  @@ -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> <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.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>  @@ -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 @@   - + <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> <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> <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> -  - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.log</artifactId> - <scope>provided</scope> - </dependency> -  <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> <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>  @@ -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> <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>  @@ -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>  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> <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.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>  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> - <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> - <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> <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>  <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> + +  + <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>  @@ -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=\

16 years, 5 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

jboss-osgi-commits July 2009