Author: thomas.diesler(a)jboss.com Date: 2009-05-25 18:21:30 -0400 (Mon, 25 May 2009) New Revision: 89401 Added: projects/jboss-osgi/branches/tdiesler/bundles/ projects/jboss-osgi/branches/tdiesler/bundles/blueprint/ projects/jboss-osgi/branches/tdiesler/bundles/common/ projects/jboss-osgi/branches/tdiesler/bundles/jmx/ projects/jboss-osgi/branches/tdiesler/bundles/jndi/ projects/jboss-osgi/branches/tdiesler/bundles/logging/ projects/jboss-osgi/branches/tdiesler/bundles/microcontainer/ projects/jboss-osgi/branches/tdiesler/bundles/pom.xml projects/jboss-osgi/branches/tdiesler/bundles/remotelog/ projects/jboss-osgi/branches/tdiesler/bundles/webconsole/ projects/jboss-osgi/branches/tdiesler/integration/deployers/ Removed: projects/jboss-osgi/branches/tdiesler/deployers/ projects/jboss-osgi/branches/tdiesler/projects/ Modified: projects/jboss-osgi/branches/tdiesler/3rdparty/apache-xerces/pom.xml projects/jboss-osgi/branches/tdiesler/3rdparty/jaxb/pom.xml projects/jboss-osgi/branches/tdiesler/3rdparty/jboss-common-core/pom.xml projects/jboss-osgi/branches/tdiesler/3rdparty/jbossxb/pom.xml projects/jboss-osgi/branches/tdiesler/3rdparty/pom.xml projects/jboss-osgi/branches/tdiesler/bundles/blueprint/pom.xml projects/jboss-osgi/branches/tdiesler/bundles/common/pom.xml projects/jboss-osgi/branches/tdiesler/bundles/jmx/pom.xml projects/jboss-osgi/branches/tdiesler/bundles/jndi/pom.xml projects/jboss-osgi/branches/tdiesler/bundles/logging/pom.xml projects/jboss-osgi/branches/tdiesler/bundles/microcontainer/pom.xml projects/jboss-osgi/branches/tdiesler/bundles/remotelog/pom.xml projects/jboss-osgi/branches/tdiesler/bundles/webconsole/pom.xml projects/jboss-osgi/branches/tdiesler/husky/harness/pom.xml projects/jboss-osgi/branches/tdiesler/husky/pom.xml projects/jboss-osgi/branches/tdiesler/husky/testsuite/pom.xml projects/jboss-osgi/branches/tdiesler/integration/ projects/jboss-osgi/branches/tdiesler/integration/deployers/pom.xml projects/jboss-osgi/branches/tdiesler/integration/pom.xml projects/jboss-osgi/branches/tdiesler/pom.xml projects/jboss-osgi/branches/tdiesler/repository/api/pom.xml projects/jboss-osgi/branches/tdiesler/repository/pom.xml projects/jboss-osgi/branches/tdiesler/runtime/ projects/jboss-osgi/branches/tdiesler/spi/pom.xml Log: Migrate more to top-level Modified: projects/jboss-osgi/branches/tdiesler/3rdparty/apache-xerces/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/3rdparty/apache-xerces/pom.xml 2009-05-25 21:50:30 UTC (rev 89400) +++ projects/jboss-osgi/branches/tdiesler/3rdparty/apache-xerces/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) @@ -11,8 +11,8 @@ <parent> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-bundles</artifactId> - <version>1.0.0-SNAPSHOT</version> + <artifactId>jboss-osgi-3rdparty</artifactId> + <version>1.0.0.Beta2</version> </parent> <properties> Modified: projects/jboss-osgi/branches/tdiesler/3rdparty/jaxb/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/3rdparty/jaxb/pom.xml 2009-05-25 21:50:30 UTC (rev 89400) +++ projects/jboss-osgi/branches/tdiesler/3rdparty/jaxb/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) @@ -11,8 +11,8 @@ <parent> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-bundles</artifactId> - <version>1.0.0-SNAPSHOT</version> + <artifactId>jboss-osgi-3rdparty</artifactId> + <version>1.0.0.Beta2</version> </parent> <properties> Modified: projects/jboss-osgi/branches/tdiesler/3rdparty/jboss-common-core/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/3rdparty/jboss-common-core/pom.xml 2009-05-25 21:50:30 UTC (rev 89400) +++ projects/jboss-osgi/branches/tdiesler/3rdparty/jboss-common-core/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) @@ -11,8 +11,8 @@ <parent> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-bundles</artifactId> - <version>1.0.0-SNAPSHOT</version> + <artifactId>jboss-osgi-3rdparty</artifactId> + <version>1.0.0.Beta2</version> </parent> <properties> Modified: projects/jboss-osgi/branches/tdiesler/3rdparty/jbossxb/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/3rdparty/jbossxb/pom.xml 2009-05-25 21:50:30 UTC (rev 89400) +++ projects/jboss-osgi/branches/tdiesler/3rdparty/jbossxb/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) @@ -11,8 +11,8 @@ <parent> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-bundles</artifactId> - <version>1.0.0-SNAPSHOT</version> + <artifactId>jboss-osgi-3rdparty</artifactId> + <version>1.0.0.Beta2</version> </parent> <properties> Modified: projects/jboss-osgi/branches/tdiesler/3rdparty/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/3rdparty/pom.xml 2009-05-25 21:50:30 UTC (rev 89400) +++ projects/jboss-osgi/branches/tdiesler/3rdparty/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) @@ -2,7 +2,7 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi 3rd Party</name> - <groupId>org.jboss.osgi</groupId> + <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-3rdparty</artifactId> <packaging>pom</packaging> Copied: projects/jboss-osgi/branches/tdiesler/bundles/blueprint (from rev 89400, projects/jboss-osgi/branches/tdiesler/projects/bundles/blueprint/trunk) Modified: projects/jboss-osgi/branches/tdiesler/bundles/blueprint/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/projects/bundles/blueprint/trunk/pom.xml 2009-05-25 21:50:30 UTC (rev 89400) +++ projects/jboss-osgi/branches/tdiesler/bundles/blueprint/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) @@ -12,7 +12,7 @@ <parent> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-bundles</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Beta2</version> </parent> <!-- Modules --> Copied: projects/jboss-osgi/branches/tdiesler/bundles/common (from rev 89400, projects/jboss-osgi/branches/tdiesler/projects/bundles/common/trunk) Modified: projects/jboss-osgi/branches/tdiesler/bundles/common/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/projects/bundles/common/trunk/pom.xml 2009-05-25 21:50:30 UTC (rev 89400) +++ projects/jboss-osgi/branches/tdiesler/bundles/common/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) @@ -12,7 +12,7 @@ <parent> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-bundles</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Beta2</version> </parent> <!-- Properties --> Copied: projects/jboss-osgi/branches/tdiesler/bundles/jmx (from rev 89400, projects/jboss-osgi/branches/tdiesler/projects/bundles/jmx/trunk) Modified: projects/jboss-osgi/branches/tdiesler/bundles/jmx/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/projects/bundles/jmx/trunk/pom.xml 2009-05-25 21:50:30 UTC (rev 89400) +++ projects/jboss-osgi/branches/tdiesler/bundles/jmx/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) @@ -12,7 +12,7 @@ <parent> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-bundles</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Beta2</version> </parent> <!-- Properties --> Copied: projects/jboss-osgi/branches/tdiesler/bundles/jndi (from rev 89400, projects/jboss-osgi/branches/tdiesler/projects/bundles/jndi/trunk) Modified: projects/jboss-osgi/branches/tdiesler/bundles/jndi/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/projects/bundles/jndi/trunk/pom.xml 2009-05-25 21:50:30 UTC (rev 89400) +++ projects/jboss-osgi/branches/tdiesler/bundles/jndi/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) @@ -12,7 +12,7 @@ <parent> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-bundles</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Beta2</version> </parent> <!-- Properties --> Copied: projects/jboss-osgi/branches/tdiesler/bundles/logging (from rev 89400, projects/jboss-osgi/branches/tdiesler/projects/bundles/logging/trunk) Modified: projects/jboss-osgi/branches/tdiesler/bundles/logging/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/projects/bundles/logging/trunk/pom.xml 2009-05-25 21:50:30 UTC (rev 89400) +++ projects/jboss-osgi/branches/tdiesler/bundles/logging/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) @@ -8,11 +8,13 @@ <artifactId>jboss-osgi-logging</artifactId> <packaging>bundle</packaging> + <version>1.0.0-SNAPSHOT</version> + <!-- Parent --> <parent> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-bundles</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Beta2</version> </parent> <!-- Properties --> Copied: projects/jboss-osgi/branches/tdiesler/bundles/microcontainer (from rev 89400, projects/jboss-osgi/branches/tdiesler/projects/bundles/microcontainer/trunk) Modified: projects/jboss-osgi/branches/tdiesler/bundles/microcontainer/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/projects/bundles/microcontainer/trunk/pom.xml 2009-05-25 21:50:30 UTC (rev 89400) +++ projects/jboss-osgi/branches/tdiesler/bundles/microcontainer/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) @@ -14,7 +14,7 @@ <parent> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-bundles</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Beta2</version> </parent> <!-- Properties --> Copied: projects/jboss-osgi/branches/tdiesler/bundles/pom.xml (from rev 89400, projects/jboss-osgi/branches/tdiesler/projects/bundles/pom.xml) =================================================================== --- projects/jboss-osgi/branches/tdiesler/bundles/pom.xml (rev 0) +++ projects/jboss-osgi/branches/tdiesler/bundles/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) @@ -0,0 +1,33 @@ +<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 Bundles</name> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-bundles</artifactId> + <packaging>pom</packaging> + + <parent> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta2</version> + </parent> + + <!-- Properties --> + <properties> + </properties> + + <!-- Modules --> + <modules> + <!-- jboss-osgi --> + <module>common</module> + <module>blueprint</module> + <module>logging</module> + <module>jmx</module> + <module>jndi</module> + <module>microcontainer</module> + <module>remotelog</module> + <module>webconsole</module> + + </modules> + +</project> Copied: projects/jboss-osgi/branches/tdiesler/bundles/remotelog (from rev 89400, projects/jboss-osgi/branches/tdiesler/projects/bundles/remotelog/trunk) Modified: projects/jboss-osgi/branches/tdiesler/bundles/remotelog/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/projects/bundles/remotelog/trunk/pom.xml 2009-05-25 21:50:30 UTC (rev 89400) +++ projects/jboss-osgi/branches/tdiesler/bundles/remotelog/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) @@ -14,7 +14,7 @@ <parent> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-bundles</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Beta2</version> </parent> <!-- Properties --> Copied: projects/jboss-osgi/branches/tdiesler/bundles/webconsole (from rev 89400, projects/jboss-osgi/branches/tdiesler/projects/bundles/webconsole/trunk) Modified: projects/jboss-osgi/branches/tdiesler/bundles/webconsole/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/projects/bundles/webconsole/trunk/pom.xml 2009-05-25 21:50:30 UTC (rev 89400) +++ projects/jboss-osgi/branches/tdiesler/bundles/webconsole/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) @@ -12,7 +12,7 @@ <parent> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-bundles</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Beta2</version> </parent> <!-- Properties --> Modified: projects/jboss-osgi/branches/tdiesler/husky/harness/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/husky/harness/pom.xml 2009-05-25 21:50:30 UTC (rev 89400) +++ projects/jboss-osgi/branches/tdiesler/husky/harness/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) @@ -15,7 +15,7 @@ <modelVersion>4.0.0</modelVersion> - <name>JBossOSGi Project - Husky Harness</name> + <name>JBossOSGi Husky - Harness</name> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-husky-harness</artifactId> Modified: projects/jboss-osgi/branches/tdiesler/husky/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/husky/pom.xml 2009-05-25 21:50:30 UTC (rev 89400) +++ projects/jboss-osgi/branches/tdiesler/husky/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) @@ -15,7 +15,7 @@ <modelVersion>4.0.0</modelVersion> - <name>JBossOSGi Project - Husky</name> + <name>JBossOSGi Husky</name> <description>JBoss OSGi Bundle Testsuite</description> <groupId>org.jboss.osgi</groupId> Modified: projects/jboss-osgi/branches/tdiesler/husky/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/husky/testsuite/pom.xml 2009-05-25 21:50:30 UTC (rev 89400) +++ projects/jboss-osgi/branches/tdiesler/husky/testsuite/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) @@ -15,7 +15,7 @@ <modelVersion>4.0.0</modelVersion> - <name>JBossOSGi Project - Husky Testsuite</name> + <name>JBossOSGi Husky - Testsuite</name> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-husky-testsuite</artifactId> Property changes on: projects/jboss-osgi/branches/tdiesler/integration ___________________________________________________________________ Name: svn:ignore + target Copied: projects/jboss-osgi/branches/tdiesler/integration/deployers (from rev 89400, projects/jboss-osgi/branches/tdiesler/deployers) Modified: projects/jboss-osgi/branches/tdiesler/integration/deployers/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/deployers/pom.xml 2009-05-25 21:50:30 UTC (rev 89400) +++ projects/jboss-osgi/branches/tdiesler/integration/deployers/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) @@ -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 Project - Deployers</name> + <name>JBossOSGi Integration - Deployers</name> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-deployers</artifactId> @@ -12,7 +12,7 @@ <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi</artifactId> + <artifactId>jboss-osgi-integration</artifactId> <version>1.0.0.Beta2</version> </parent> Modified: projects/jboss-osgi/branches/tdiesler/integration/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/integration/pom.xml 2009-05-25 21:50:30 UTC (rev 89400) +++ projects/jboss-osgi/branches/tdiesler/integration/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) @@ -16,6 +16,7 @@ <!-- Modules --> <modules> + <module>deployers</module> <module>jbossas</module> </modules> Modified: projects/jboss-osgi/branches/tdiesler/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/pom.xml 2009-05-25 21:50:30 UTC (rev 89400) +++ projects/jboss-osgi/branches/tdiesler/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) @@ -13,12 +13,11 @@ <modules> <module>spi</module> <module>husky</module> - <module>projects</module> <module>3rdparty</module> <module>runtime</module> <module>integration</module> <module>repository</module> - <module>deployers</module> + <module>bundles</module> <module>testsuite</module> </modules> Modified: projects/jboss-osgi/branches/tdiesler/repository/api/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/repository/api/pom.xml 2009-05-25 21:50:30 UTC (rev 89400) +++ projects/jboss-osgi/branches/tdiesler/repository/api/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) @@ -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 Project - Repository API</name> + <name>JBossOSGi Repository - API</name> <artifactId>jboss-osgi-repository-api</artifactId> <packaging>jar</packaging> Modified: projects/jboss-osgi/branches/tdiesler/repository/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/repository/pom.xml 2009-05-25 21:50:30 UTC (rev 89400) +++ projects/jboss-osgi/branches/tdiesler/repository/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) @@ -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 Project - Repository</name> + <name>JBossOSGi Repository</name> <artifactId>jboss-osgi-repository</artifactId> <packaging>pom</packaging> Modified: projects/jboss-osgi/branches/tdiesler/spi/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/spi/pom.xml 2009-05-25 21:50:30 UTC (rev 89400) +++ projects/jboss-osgi/branches/tdiesler/spi/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) @@ -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 Project - SPI</name> + <name>JBossOSGi SPI</name> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-spi</artifactId>