Author: thomas.diesler(a)jboss.com Date: 2009-07-13 11:04:46 -0400 (Mon, 13 Jul 2009) New Revision: 91165 Added: projects/jboss-osgi/trunk/modules/bundles/ projects/jboss-osgi/trunk/modules/bundles/apache-xerces/ projects/jboss-osgi/trunk/modules/bundles/blueprint/ projects/jboss-osgi/trunk/modules/bundles/common/ projects/jboss-osgi/trunk/modules/bundles/hotdeploy/ projects/jboss-osgi/trunk/modules/bundles/husky/ projects/jboss-osgi/trunk/modules/bundles/jaxb/ projects/jboss-osgi/trunk/modules/bundles/jboss-common-core/ projects/jboss-osgi/trunk/modules/bundles/jboss-xml-binding/ projects/jboss-osgi/trunk/modules/bundles/jmx/ projects/jboss-osgi/trunk/modules/bundles/jndi/ projects/jboss-osgi/trunk/modules/bundles/microcontainer/ projects/jboss-osgi/trunk/modules/bundles/remotelog/ projects/jboss-osgi/trunk/modules/bundles/webconsole/ projects/jboss-osgi/trunk/modules/runtime/ projects/jboss-osgi/trunk/modules/runtime/deployers/ projects/jboss-osgi/trunk/modules/runtime/equinox/ projects/jboss-osgi/trunk/modules/runtime/felix/ projects/jboss-osgi/trunk/modules/runtime/jbossas/ projects/jboss-osgi/trunk/modules/runtime/knopflerfish/ Modified: projects/jboss-osgi/trunk/modules/bundles/apache-xerces/pom.xml projects/jboss-osgi/trunk/modules/bundles/blueprint/impl/pom.xml projects/jboss-osgi/trunk/modules/bundles/blueprint/pom.xml projects/jboss-osgi/trunk/modules/bundles/blueprint/testsuite/pom.xml projects/jboss-osgi/trunk/modules/bundles/common/pom.xml projects/jboss-osgi/trunk/modules/bundles/hotdeploy/pom.xml projects/jboss-osgi/trunk/modules/bundles/husky/harness/pom.xml projects/jboss-osgi/trunk/modules/bundles/husky/pom.xml projects/jboss-osgi/trunk/modules/bundles/husky/testsuite/pom.xml projects/jboss-osgi/trunk/modules/bundles/jaxb/pom.xml projects/jboss-osgi/trunk/modules/bundles/jboss-common-core/pom.xml projects/jboss-osgi/trunk/modules/bundles/jboss-xml-binding/pom.xml projects/jboss-osgi/trunk/modules/bundles/jmx/pom.xml projects/jboss-osgi/trunk/modules/bundles/jndi/pom.xml projects/jboss-osgi/trunk/modules/bundles/microcontainer/pom.xml projects/jboss-osgi/trunk/modules/bundles/remotelog/pom.xml projects/jboss-osgi/trunk/modules/bundles/webconsole/pom.xml projects/jboss-osgi/trunk/modules/runtime/deployers/pom.xml projects/jboss-osgi/trunk/modules/runtime/equinox/pom.xml projects/jboss-osgi/trunk/modules/runtime/felix/pom.xml projects/jboss-osgi/trunk/modules/runtime/jbossas/pom.xml projects/jboss-osgi/trunk/modules/runtime/knopflerfish/pom.xml projects/jboss-osgi/trunk/pom.xml Log: Move projects to reactor build Copied: projects/jboss-osgi/trunk/modules/bundles/apache-xerces (from rev 91154, projects/jboss-osgi/projects/3rdparty/apache-xerces/trunk) Modified: projects/jboss-osgi/trunk/modules/bundles/apache-xerces/pom.xml =================================================================== --- projects/jboss-osgi/projects/3rdparty/apache-xerces/trunk/pom.xml 2009-07-13 11:46:11 UTC (rev 91154) +++ projects/jboss-osgi/trunk/modules/bundles/apache-xerces/pom.xml 2009-07-13 15:04:46 UTC (rev 91165) @@ -2,7 +2,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> - <name>JBossOSGi 3rd Party - Apache Xerces</name> + <name>JBossOSGi Bundles - Apache Xerces</name> <description>A JBossOSGi provided Apache Xerces bundle</description> <groupId>org.jboss.osgi.bundles</groupId> @@ -13,8 +13,8 @@ <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.0</version> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta3</version> </parent> <properties> @@ -22,14 +22,12 @@ <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> @@ -57,13 +55,11 @@ <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> Copied: projects/jboss-osgi/trunk/modules/bundles/blueprint (from rev 91154, projects/jboss-osgi/projects/bundles/blueprint/trunk) Modified: projects/jboss-osgi/trunk/modules/bundles/blueprint/impl/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/impl/pom.xml 2009-07-13 11:46:11 UTC (rev 91154) +++ projects/jboss-osgi/trunk/modules/bundles/blueprint/impl/pom.xml 2009-07-13 15:04:46 UTC (rev 91165) @@ -1,7 +1,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> - <name>JBossOSGi Blueprint - Implementation</name> + <name>JBossOSGi Bundles - Blueprint Implementation</name> <description>A JBossOSGi provided Blueprint implementation</description> <groupId>org.jboss.osgi</groupId> Modified: projects/jboss-osgi/trunk/modules/bundles/blueprint/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2009-07-13 11:46:11 UTC (rev 91154) +++ projects/jboss-osgi/trunk/modules/bundles/blueprint/pom.xml 2009-07-13 15:04:46 UTC (rev 91165) @@ -1,7 +1,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> - <name>JBossOSGi Blueprint</name> + <name>JBossOSGi Bundles - Blueprint</name> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-blueprint-parent</artifactId> @@ -11,19 +11,12 @@ <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta3</version> </parent> <!-- Properties --> <properties> - <version.apache.felix.log>1.0.0</version.apache.felix.log> - <version.jboss.logging>2.0.5.GA</version.jboss.logging> - <version.jboss.osgi.common.core>2.2.11</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 --> @@ -32,56 +25,6 @@ <module>testsuite</module> </modules> - <!-- DependencyManagement --> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-log4j</artifactId> - <version>${version.jboss.logging}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky</artifactId> - <version>${version.jboss.osgi.husky}</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.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-microcontainer</artifactId> - <version>${version.jboss.osgi.microcontainer}</version> - </dependency> - - <!-- Bundle 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> - - <!-- OSGi Dependencies --> - <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/modules/bundles/blueprint/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/pom.xml 2009-07-13 11:46:11 UTC (rev 91154) +++ projects/jboss-osgi/trunk/modules/bundles/blueprint/testsuite/pom.xml 2009-07-13 15:04:46 UTC (rev 91165) @@ -1,7 +1,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> - <name>JBossOSGi Blueprint - Testsuite</name> + <name>JBossOSGi Bundles - Blueprint Testsuite</name> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-blueprint-testsuite</artifactId> Copied: projects/jboss-osgi/trunk/modules/bundles/common (from rev 91154, projects/jboss-osgi/projects/bundles/common/trunk) Modified: projects/jboss-osgi/trunk/modules/bundles/common/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/common/trunk/pom.xml 2009-07-13 11:46:11 UTC (rev 91154) +++ projects/jboss-osgi/trunk/modules/bundles/common/pom.xml 2009-07-13 15:04:46 UTC (rev 91165) @@ -12,14 +12,12 @@ <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.0</version> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta3</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 --> @@ -27,7 +25,6 @@ <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-spi</artifactId> - <version>${version.jboss.osgi.spi}</version> </dependency> <dependency> @@ -41,13 +38,11 @@ <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> Copied: projects/jboss-osgi/trunk/modules/bundles/hotdeploy (from rev 91154, projects/jboss-osgi/projects/bundles/hotdeploy/trunk) Modified: projects/jboss-osgi/trunk/modules/bundles/hotdeploy/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml 2009-07-13 11:46:11 UTC (rev 91154) +++ projects/jboss-osgi/trunk/modules/bundles/hotdeploy/pom.xml 2009-07-13 15:04:46 UTC (rev 91165) @@ -13,29 +13,17 @@ <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.0</version> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta3</version> </parent> - - <properties> - <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common> - <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi> - <version.osgi>r4v41</version.osgi> - </properties> <!-- Dependencies --> <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-spi</artifactId> - <version>${version.jboss.osgi.spi}</version> - </dependency> - + <!-- Bundle dependencies --> <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-common</artifactId> - <version>${version.jboss.osgi.common}</version> <scope>provided</scope> </dependency> @@ -43,13 +31,11 @@ <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> Copied: projects/jboss-osgi/trunk/modules/bundles/husky (from rev 91154, projects/jboss-osgi/projects/husky/trunk) Modified: projects/jboss-osgi/trunk/modules/bundles/husky/harness/pom.xml =================================================================== --- projects/jboss-osgi/projects/husky/trunk/harness/pom.xml 2009-07-13 11:46:11 UTC (rev 91154) +++ projects/jboss-osgi/trunk/modules/bundles/husky/harness/pom.xml 2009-07-13 15:04:46 UTC (rev 91165) @@ -15,7 +15,7 @@ <modelVersion>4.0.0</modelVersion> - <name>JBossOSGi Husky - Harness</name> + <name>JBossOSGi Bundles - Husky Implementation</name> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-husky</artifactId> Modified: projects/jboss-osgi/trunk/modules/bundles/husky/pom.xml =================================================================== --- projects/jboss-osgi/projects/husky/trunk/pom.xml 2009-07-13 11:46:11 UTC (rev 91154) +++ projects/jboss-osgi/trunk/modules/bundles/husky/pom.xml 2009-07-13 15:04:46 UTC (rev 91165) @@ -15,7 +15,7 @@ <modelVersion>4.0.0</modelVersion> - <name>JBossOSGi Husky</name> + <name>JBossOSGi Bundles - Husky</name> <description>JBoss OSGi Test Support</description> <groupId>org.jboss.osgi</groupId> @@ -26,17 +26,12 @@ <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.1-SNAPSHOT</version> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta3</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.junit>4.6</version.junit> - <version.osgi>r4v41</version.osgi> </properties> <!-- Modules --> @@ -45,43 +40,4 @@ <module>testsuite</module> </modules> - <!-- DependencyManagement --> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <version>${version.jboss.osgi.runtime.felix}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${version.junit}</version> - </dependency> - - <!-- Bundle 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> - - <!-- OSGi Dependencies --> - <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/modules/bundles/husky/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/projects/husky/trunk/testsuite/pom.xml 2009-07-13 11:46:11 UTC (rev 91154) +++ projects/jboss-osgi/trunk/modules/bundles/husky/testsuite/pom.xml 2009-07-13 15:04:46 UTC (rev 91165) @@ -15,7 +15,7 @@ <modelVersion>4.0.0</modelVersion> - <name>JBossOSGi Husky - Testsuite</name> + <name>JBossOSGi Bundles - Husky Testsuite</name> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-husky-testsuite</artifactId> Copied: projects/jboss-osgi/trunk/modules/bundles/jaxb (from rev 91154, projects/jboss-osgi/projects/3rdparty/jaxb/trunk) Modified: projects/jboss-osgi/trunk/modules/bundles/jaxb/pom.xml =================================================================== --- projects/jboss-osgi/projects/3rdparty/jaxb/trunk/pom.xml 2009-07-13 11:46:11 UTC (rev 91154) +++ projects/jboss-osgi/trunk/modules/bundles/jaxb/pom.xml 2009-07-13 15:04:46 UTC (rev 91165) @@ -2,7 +2,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> - <name>JBossOSGi 3rd Party - JAXB</name> + <name>JBossOSGi Bundles - JAXB</name> <description>A JBossOSGi provided JAXB bundle</description> <groupId>org.jboss.osgi.bundles</groupId> @@ -13,21 +13,18 @@ <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.0</version> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta3</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> @@ -40,13 +37,11 @@ <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> Copied: projects/jboss-osgi/trunk/modules/bundles/jboss-common-core (from rev 91154, projects/jboss-osgi/projects/3rdparty/jboss-common-core/trunk) Modified: projects/jboss-osgi/trunk/modules/bundles/jboss-common-core/pom.xml =================================================================== --- projects/jboss-osgi/projects/3rdparty/jboss-common-core/trunk/pom.xml 2009-07-13 11:46:11 UTC (rev 91154) +++ projects/jboss-osgi/trunk/modules/bundles/jboss-common-core/pom.xml 2009-07-13 15:04:46 UTC (rev 91165) @@ -2,7 +2,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> - <name>JBossOSGi 3rd Party - JBoss Common Core</name> + <name>JBossOSGi Bundles - JBoss Common Core</name> <description>A JBossOSGi provided JBoss Common Core bundle</description> <groupId>org.jboss.osgi.bundles</groupId> @@ -13,8 +13,8 @@ <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.0</version> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta3</version> </parent> <properties> Copied: projects/jboss-osgi/trunk/modules/bundles/jboss-xml-binding (from rev 91154, projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk) Modified: projects/jboss-osgi/trunk/modules/bundles/jboss-xml-binding/pom.xml =================================================================== --- projects/jboss-osgi/projects/3rdparty/jboss-xml-binding/trunk/pom.xml 2009-07-13 11:46:11 UTC (rev 91154) +++ projects/jboss-osgi/trunk/modules/bundles/jboss-xml-binding/pom.xml 2009-07-13 15:04:46 UTC (rev 91165) @@ -2,7 +2,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> - <name>JBossOSGi 3rd Party - JBoss XML Binding</name> + <name>JBossOSGi Bundles - JBossXB</name> <description>A JBossOSGi provided JBossXB bundle</description> <groupId>org.jboss.osgi.bundles</groupId> @@ -13,16 +13,14 @@ <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.0</version> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta3</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> @@ -47,13 +45,11 @@ <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> Copied: projects/jboss-osgi/trunk/modules/bundles/jmx (from rev 91154, projects/jboss-osgi/projects/bundles/jmx/trunk) Modified: projects/jboss-osgi/trunk/modules/bundles/jmx/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jmx/trunk/pom.xml 2009-07-13 11:46:11 UTC (rev 91154) +++ projects/jboss-osgi/trunk/modules/bundles/jmx/pom.xml 2009-07-13 15:04:46 UTC (rev 91165) @@ -12,15 +12,12 @@ <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.0</version> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta3</version> </parent> <!-- Properties --> <properties> - <version.jboss.osgi.common.core>2.2.11</version.jboss.osgi.common.core> - <version.jboss.osgi.jndi>1.0.0-SNAPSHOT</version.jboss.osgi.jndi> - <version.osgi>r4v41</version.osgi> </properties> <!-- Dependencies --> @@ -28,25 +25,21 @@ <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> Copied: projects/jboss-osgi/trunk/modules/bundles/jndi (from rev 91154, projects/jboss-osgi/projects/bundles/jndi/trunk) Modified: projects/jboss-osgi/trunk/modules/bundles/jndi/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/jndi/trunk/pom.xml 2009-07-13 11:46:11 UTC (rev 91154) +++ projects/jboss-osgi/trunk/modules/bundles/jndi/pom.xml 2009-07-13 15:04:46 UTC (rev 91165) @@ -12,15 +12,13 @@ <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.0</version> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta3</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 --> @@ -28,7 +26,6 @@ <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-common</artifactId> - <version>${version.jboss.osgi.common}</version> </dependency> <!-- Provided Dependencies --> @@ -43,13 +40,11 @@ <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> Copied: projects/jboss-osgi/trunk/modules/bundles/microcontainer (from rev 91154, projects/jboss-osgi/projects/bundles/microcontainer/trunk) Modified: projects/jboss-osgi/trunk/modules/bundles/microcontainer/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-07-13 11:46:11 UTC (rev 91154) +++ projects/jboss-osgi/trunk/modules/bundles/microcontainer/pom.xml 2009-07-13 15:04:46 UTC (rev 91165) @@ -13,18 +13,14 @@ <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.0</version> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta3</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.deployers>1.0.0-SNAPSHOT</version.jboss.osgi.deployers> - <version.jboss.osgi.jmx>1.0.0-SNAPSHOT</version.jboss.osgi.jmx> - <version.jboss.osgi.xml.binding>2.0.1-SNAPSHOT</version.jboss.osgi.xml.binding> - <version.osgi>r4v41</version.osgi> </properties> <!-- Dependencies --> @@ -32,12 +28,10 @@ <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> @@ -53,20 +47,17 @@ <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-deployers</artifactId> - <version>${version.jboss.osgi.deployers}</version> </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> Copied: projects/jboss-osgi/trunk/modules/bundles/remotelog (from rev 91154, projects/jboss-osgi/projects/bundles/remotelog/trunk) Modified: projects/jboss-osgi/trunk/modules/bundles/remotelog/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/remotelog/trunk/pom.xml 2009-07-13 11:46:11 UTC (rev 91154) +++ projects/jboss-osgi/trunk/modules/bundles/remotelog/pom.xml 2009-07-13 15:04:46 UTC (rev 91165) @@ -13,14 +13,12 @@ <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.0</version> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta3</version> </parent> <!-- Properties --> <properties> - <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common> - <version.osgi>r4v41</version.osgi> </properties> <!-- Dependencies --> @@ -28,20 +26,17 @@ <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> Copied: projects/jboss-osgi/trunk/modules/bundles/webconsole (from rev 91154, projects/jboss-osgi/projects/bundles/webconsole/trunk) Modified: projects/jboss-osgi/trunk/modules/bundles/webconsole/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml 2009-07-13 11:46:11 UTC (rev 91154) +++ projects/jboss-osgi/trunk/modules/bundles/webconsole/pom.xml 2009-07-13 15:04:46 UTC (rev 91165) @@ -1,7 +1,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> - <name>JBossOSGi - WebConsole</name> + <name>JBossOSGi Bundles - WebConsole</name> <description>The JBossOSGi Web Console</description> <groupId>org.jboss.osgi.bundles</groupId> @@ -12,13 +12,12 @@ <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.0</version> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta3</version> </parent> <!-- Properties --> <properties> - <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi> <version.commons.fileupload>1.1.1</version.commons.fileupload> <version.commons.io>1.4</version.commons.io> <version.felix.bundlerepository>1.0.3</version.felix.bundlerepository> @@ -34,7 +33,6 @@ <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-spi</artifactId> - <version>${version.jboss.osgi.spi}</version> <scope>provided</scope> </dependency> <dependency> Copied: projects/jboss-osgi/trunk/modules/runtime/deployers (from rev 91154, projects/jboss-osgi/projects/integration/deployers/trunk) Modified: projects/jboss-osgi/trunk/modules/runtime/deployers/pom.xml =================================================================== --- projects/jboss-osgi/projects/integration/deployers/trunk/pom.xml 2009-07-13 11:46:11 UTC (rev 91154) +++ projects/jboss-osgi/trunk/modules/runtime/deployers/pom.xml 2009-07-13 15:04:46 UTC (rev 91165) @@ -2,7 +2,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> - <name>JBossOSGi Integration - Deployers</name> + <name>JBossOSGi Runtime - Deployers</name> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-deployers</artifactId> @@ -12,40 +12,35 @@ <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.0</version> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta3</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 --> <dependencies> <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-spi</artifactId> + </dependency> + <dependency> <groupId>org.jboss.deployers</groupId> <artifactId>jboss-deployers-vfs</artifactId> <version>${version.jboss.deployers}</version> </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-spi</artifactId> - <version>${version.jboss.osgi.spi}</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> Copied: projects/jboss-osgi/trunk/modules/runtime/equinox (from rev 91154, projects/jboss-osgi/projects/runtime/equinox/trunk) Modified: projects/jboss-osgi/trunk/modules/runtime/equinox/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/equinox/trunk/pom.xml 2009-07-13 11:46:11 UTC (rev 91154) +++ projects/jboss-osgi/trunk/modules/runtime/equinox/pom.xml 2009-07-13 15:04:46 UTC (rev 91165) @@ -12,13 +12,12 @@ <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.0</version> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta3</version> </parent> <properties> <version.eclipse.equinox>3.4.2</version.eclipse.equinox> - <version.jboss.osgi.spi>1.0.0.Beta2</version.jboss.osgi.spi> </properties> <!-- Dependencies --> @@ -26,7 +25,6 @@ <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-spi</artifactId> - <version>${version.jboss.osgi.spi}</version> </dependency> <dependency> <groupId>org.eclipse.equinox</groupId> Copied: projects/jboss-osgi/trunk/modules/runtime/felix (from rev 91154, projects/jboss-osgi/projects/runtime/felix/trunk) Modified: projects/jboss-osgi/trunk/modules/runtime/felix/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2009-07-13 11:46:11 UTC (rev 91154) +++ projects/jboss-osgi/trunk/modules/runtime/felix/pom.xml 2009-07-13 15:04:46 UTC (rev 91165) @@ -12,15 +12,12 @@ <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.0</version> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta3</version> </parent> <properties> <version.felix.framework>1.8.1</version.felix.framework> - <version.felix.log>1.0.0</version.felix.log> - <version.felix.osgi.compendium>1.2.0</version.felix.osgi.compendium> - <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi> </properties> <!-- Dependencies --> @@ -28,7 +25,6 @@ <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-spi</artifactId> - <version>${version.jboss.osgi.spi}</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> @@ -38,13 +34,11 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.osgi.compendium</artifactId> - <version>${version.felix.osgi.compendium}</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.log</artifactId> - <version>${version.felix.log}</version> <scope>provided</scope> </dependency> </dependencies> Copied: projects/jboss-osgi/trunk/modules/runtime/jbossas (from rev 91154, projects/jboss-osgi/projects/integration/jbossas/trunk) Modified: projects/jboss-osgi/trunk/modules/runtime/jbossas/pom.xml =================================================================== --- projects/jboss-osgi/projects/integration/jbossas/trunk/pom.xml 2009-07-13 11:46:11 UTC (rev 91154) +++ projects/jboss-osgi/trunk/modules/runtime/jbossas/pom.xml 2009-07-13 15:04:46 UTC (rev 91165) @@ -2,7 +2,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> - <name>JBossOSGi Integration - JBossAS</name> + <name>JBossOSGi Runtime - JBossAS</name> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-integration-jbossas</artifactId> @@ -12,12 +12,11 @@ <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.0</version> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta3</version> </parent> <properties> - <version.jboss.osgi.microcontainer>1.0.0-SNAPSHOT</version.jboss.osgi.microcontainer> </properties> <!-- Dependencies --> @@ -25,7 +24,6 @@ <dependency> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-microcontainer</artifactId> - <version>${version.jboss.osgi.microcontainer}</version> </dependency> </dependencies> Copied: projects/jboss-osgi/trunk/modules/runtime/knopflerfish (from rev 91154, projects/jboss-osgi/projects/runtime/knopflerfish/trunk) Modified: projects/jboss-osgi/trunk/modules/runtime/knopflerfish/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/knopflerfish/trunk/pom.xml 2009-07-13 11:46:11 UTC (rev 91154) +++ projects/jboss-osgi/trunk/modules/runtime/knopflerfish/pom.xml 2009-07-13 15:04:46 UTC (rev 91165) @@ -12,14 +12,12 @@ <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-parent</artifactId> - <version>1.0.0</version> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta3</version> </parent> <properties> - <version.jboss.osgi.spi>1.0.0.Beta2</version.jboss.osgi.spi> <version.knopflerfish>2.2.0</version.knopflerfish> - <version.osgi>r4v41</version.osgi> </properties> <!-- Dependencies --> @@ -27,7 +25,6 @@ <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-spi</artifactId> - <version>${version.jboss.osgi.spi}</version> </dependency> <dependency> <groupId>org.knopflerfish</groupId> @@ -37,7 +34,6 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.compendium</artifactId> - <version>${version.osgi}</version> </dependency> </dependencies> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-07-13 14:56:24 UTC (rev 91164) +++ projects/jboss-osgi/trunk/pom.xml 2009-07-13 15:04:46 UTC (rev 91165) @@ -299,6 +299,24 @@ <id>reactor</id> <modules> <module>modules/spi</module> + <module>modules/bundles/apache-xerces</module> + <module>modules/bundles/blueprint</module> + <module>modules/bundles/common</module> + <module>modules/bundles/hotdeploy</module> + <module>modules/bundles/husky</module> + <module>modules/bundles/jaxb</module> + <module>modules/bundles/jboss-common-core</module> + <module>modules/bundles/jboss-xml-binding</module> + <module>modules/bundles/jmx</module> + <module>modules/bundles/jndi</module> + <module>modules/bundles/microcontainer</module> + <module>modules/bundles/remotelog</module> + <module>modules/bundles/webconsole</module> + <module>modules/runtime/equinox</module> + <module>modules/runtime/deployers</module> + <module>modules/runtime/felix</module> + <module>modules/runtime/jbossas</module> + <module>modules/runtime/knopflerfish</module> <module>testsuite</module> </modules> </profile>