[jboss-osgi-commits] JBoss-OSGI SVN: r89404 - in projects/jboss-osgi/branches/tdiesler: 3rdparty/apache-xerces and 17 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-05-25 18:52:06 -0400 (Mon, 25 May 2009) New Revision: 89404 Added: projects/jboss-osgi/branches/tdiesler/blueprint/ projects/jboss-osgi/branches/tdiesler/docbook/.project projects/jboss-osgi/branches/tdiesler/docbook/.settings/ projects/jboss-osgi/branches/tdiesler/docbook/.settings/org.maven.ide.eclipse.prefs projects/jboss-osgi/branches/tdiesler/runtime/.project projects/jboss-osgi/branches/tdiesler/runtime/.settings/ projects/jboss-osgi/branches/tdiesler/runtime/.settings/org.maven.ide.eclipse.prefs projects/jboss-osgi/branches/tdiesler/runtime/microcontainer/.settings/ projects/jboss-osgi/branches/tdiesler/runtime/microcontainer/.settings/org.maven.ide.eclipse.prefs Removed: projects/jboss-osgi/branches/tdiesler/bundles/blueprint/ 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/blueprint/impl/pom.xml projects/jboss-osgi/branches/tdiesler/blueprint/pom.xml projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/pom.xml projects/jboss-osgi/branches/tdiesler/bundles/microcontainer/pom.xml projects/jboss-osgi/branches/tdiesler/bundles/pom.xml projects/jboss-osgi/branches/tdiesler/distribution/pom.xml projects/jboss-osgi/branches/tdiesler/husky/harness/pom.xml projects/jboss-osgi/branches/tdiesler/pom.xml projects/jboss-osgi/branches/tdiesler/testsuite/pom.xml Log: Promote blueprint Modified: projects/jboss-osgi/branches/tdiesler/3rdparty/apache-xerces/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/3rdparty/apache-xerces/pom.xml 2009-05-25 22:23:32 UTC (rev 89403) +++ projects/jboss-osgi/branches/tdiesler/3rdparty/apache-xerces/pom.xml 2009-05-25 22:52:06 UTC (rev 89404) @@ -4,7 +4,7 @@ <name>JBossOSGi 3rd Party - Apache Xerces</name> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>apache-xerces-bundle</artifactId> + <artifactId>jboss-osgi-apache-xerces</artifactId> <packaging>bundle</packaging> <version>2.9.1-SNAPSHOT</version> Modified: projects/jboss-osgi/branches/tdiesler/3rdparty/jaxb/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/3rdparty/jaxb/pom.xml 2009-05-25 22:23:32 UTC (rev 89403) +++ projects/jboss-osgi/branches/tdiesler/3rdparty/jaxb/pom.xml 2009-05-25 22:52:06 UTC (rev 89404) @@ -4,7 +4,7 @@ <name>JBossOSGi 3rd Party - JAXB</name> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jaxb-bundle</artifactId> + <artifactId>jboss-osgi-jaxb</artifactId> <packaging>bundle</packaging> <version>2.1.10-SNAPSHOT</version> 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 22:23:32 UTC (rev 89403) +++ projects/jboss-osgi/branches/tdiesler/3rdparty/jboss-common-core/pom.xml 2009-05-25 22:52:06 UTC (rev 89404) @@ -4,7 +4,7 @@ <name>JBossOSGi 3rd Party - JBoss Common Core</name> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-common-core-bundle</artifactId> + <artifactId>jboss-osgi-common-core</artifactId> <packaging>bundle</packaging> <version>2.2.11-SNAPSHOT</version> Modified: projects/jboss-osgi/branches/tdiesler/3rdparty/jbossxb/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/3rdparty/jbossxb/pom.xml 2009-05-25 22:23:32 UTC (rev 89403) +++ projects/jboss-osgi/branches/tdiesler/3rdparty/jbossxb/pom.xml 2009-05-25 22:52:06 UTC (rev 89404) @@ -4,7 +4,7 @@ <name>JBossOSGi 3rd Party - JBoss XML Binding</name> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jbossxb-bundle</artifactId> + <artifactId>jboss-osgi-xml-binding</artifactId> <packaging>bundle</packaging> <version>2.0.0-SNAPSHOT</version> Copied: projects/jboss-osgi/branches/tdiesler/blueprint (from rev 89401, projects/jboss-osgi/branches/tdiesler/bundles/blueprint) Modified: projects/jboss-osgi/branches/tdiesler/blueprint/impl/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/bundles/blueprint/impl/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) +++ projects/jboss-osgi/branches/tdiesler/blueprint/impl/pom.xml 2009-05-25 22:52:06 UTC (rev 89404) @@ -1,14 +1,14 @@ <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 - Blueprint Impl</name> + <name>JBossOSGi Blueprint - Implementation</name> - <groupId>org.jboss.osgi.bundles</groupId> + <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-blueprint-impl</artifactId> <packaging>bundle</packaging> <parent> - <groupId>org.jboss.osgi.bundles</groupId> + <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-blueprint</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> @@ -40,7 +40,7 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jbossxb-bundle</artifactId> + <artifactId>jboss-osgi-xml-binding</artifactId> <scope>provided</scope> </dependency> Modified: projects/jboss-osgi/branches/tdiesler/blueprint/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/bundles/blueprint/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) +++ projects/jboss-osgi/branches/tdiesler/blueprint/pom.xml 2009-05-25 22:52:06 UTC (rev 89404) @@ -1,17 +1,17 @@ <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 - Blueprint</name> + <name>JBossOSGi Blueprint</name> - <groupId>org.jboss.osgi.bundles</groupId> + <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-blueprint</artifactId> <packaging>pom</packaging> <version>1.0.0-SNAPSHOT</version> <parent> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-bundles</artifactId> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi</artifactId> <version>1.0.0.Beta2</version> </parent> @@ -65,7 +65,7 @@ <!-- Bundle Dependencies --> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>apache-xerces-bundle</artifactId> + <artifactId>jboss-osgi-apache-xerces</artifactId> <version>${version.apache.xerces.bundle}</version> </dependency> <dependency> @@ -90,12 +90,12 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jbossxb-bundle</artifactId> + <artifactId>jboss-osgi-xml-binding</artifactId> <version>${version.jbossxb.bundle}</version> </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-common-core-bundle</artifactId> + <artifactId>jboss-osgi-common-core</artifactId> <version>${version.jboss.common.core.bundle}</version> </dependency> Modified: projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/bundles/blueprint/testsuite/pom.xml 2009-05-25 22:21:30 UTC (rev 89401) +++ projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/pom.xml 2009-05-25 22:52:06 UTC (rev 89404) @@ -1,14 +1,14 @@ <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 - Blueprint Testsuite</name> + <name>JBossOSGi Blueprint - Testsuite</name> - <groupId>org.jboss.osgi.bundles</groupId> + <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-blueprint-testsuite</artifactId> <packaging>jar</packaging> <parent> - <groupId>org.jboss.osgi.bundles</groupId> + <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-blueprint</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> @@ -55,7 +55,7 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>apache-xerces-bundle</artifactId> + <artifactId>jboss-osgi-apache-xerces</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -80,12 +80,12 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jbossxb-bundle</artifactId> + <artifactId>jboss-osgi-xml-binding</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-common-core-bundle</artifactId> + <artifactId>jboss-osgi-common-core</artifactId> <scope>provided</scope> </dependency> Modified: projects/jboss-osgi/branches/tdiesler/bundles/microcontainer/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/bundles/microcontainer/pom.xml 2009-05-25 22:23:32 UTC (rev 89403) +++ projects/jboss-osgi/branches/tdiesler/bundles/microcontainer/pom.xml 2009-05-25 22:52:06 UTC (rev 89404) @@ -66,12 +66,12 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>apache-xerces-bundle</artifactId> + <artifactId>jboss-osgi-apache-xerces</artifactId> <version>${version.apache.xerces.bundle}</version> </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jbossxb-bundle</artifactId> + <artifactId>jboss-osgi-xml-binding-binding</artifactId> <version>${version.jbossxb.bundle}</version> </dependency> Modified: projects/jboss-osgi/branches/tdiesler/bundles/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/bundles/pom.xml 2009-05-25 22:23:32 UTC (rev 89403) +++ projects/jboss-osgi/branches/tdiesler/bundles/pom.xml 2009-05-25 22:52:06 UTC (rev 89404) @@ -20,7 +20,6 @@ <modules> <!-- jboss-osgi --> <module>common</module> - <module>blueprint</module> <module>logging</module> <module>jmx</module> <module>jndi</module> Modified: projects/jboss-osgi/branches/tdiesler/distribution/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/distribution/pom.xml 2009-05-25 22:23:32 UTC (rev 89403) +++ projects/jboss-osgi/branches/tdiesler/distribution/pom.xml 2009-05-25 22:52:06 UTC (rev 89404) @@ -87,19 +87,19 @@ <!-- Bundles --> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>apache-xerces-bundle</artifactId> + <artifactId>jboss-osgi-apache-xerces</artifactId> </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-common-core-bundle</artifactId> + <artifactId>jboss-osgi-common-core</artifactId> </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jaxb-bundle</artifactId> + <artifactId>jboss-osgi-jaxb</artifactId> </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jbossxb-bundle</artifactId> + <artifactId>jboss-osgi-xml-binding</artifactId> </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> Added: projects/jboss-osgi/branches/tdiesler/docbook/.project =================================================================== --- projects/jboss-osgi/branches/tdiesler/docbook/.project (rev 0) +++ projects/jboss-osgi/branches/tdiesler/docbook/.project 2009-05-25 22:52:06 UTC (rev 89404) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jboss-osgi-userguide</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.maven.ide.eclipse.maven2Nature</nature> + </natures> +</projectDescription> Added: projects/jboss-osgi/branches/tdiesler/docbook/.settings/org.maven.ide.eclipse.prefs =================================================================== --- projects/jboss-osgi/branches/tdiesler/docbook/.settings/org.maven.ide.eclipse.prefs (rev 0) +++ projects/jboss-osgi/branches/tdiesler/docbook/.settings/org.maven.ide.eclipse.prefs 2009-05-25 22:52:06 UTC (rev 89404) @@ -0,0 +1,9 @@ +#Tue May 26 00:30:31 CEST 2009 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 Modified: projects/jboss-osgi/branches/tdiesler/husky/harness/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/husky/harness/pom.xml 2009-05-25 22:23:32 UTC (rev 89403) +++ projects/jboss-osgi/branches/tdiesler/husky/harness/pom.xml 2009-05-25 22:52:06 UTC (rev 89404) @@ -35,13 +35,6 @@ <artifactId>junit</artifactId> </dependency> - <!-- Bundles --> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-common</artifactId> - <scope>provided</scope> - </dependency> - <!-- Provided Dependencies --> <dependency> <groupId>org.osgi</groupId> Modified: projects/jboss-osgi/branches/tdiesler/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/pom.xml 2009-05-25 22:23:32 UTC (rev 89403) +++ projects/jboss-osgi/branches/tdiesler/pom.xml 2009-05-25 22:52:06 UTC (rev 89404) @@ -12,12 +12,13 @@ <!-- Modules --> <modules> <module>spi</module> - <module>husky</module> <module>3rdparty</module> <module>runtime</module> <module>integration</module> <module>repository</module> <module>bundles</module> + <module>husky</module> + <module>blueprint</module> <module>testsuite</module> </modules> @@ -137,17 +138,17 @@ <!-- Bundle Dependencies --> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>apache-xerces-bundle</artifactId> + <artifactId>jboss-osgi-apache-xerces</artifactId> <version>${version.jboss.osgi.apache.xerces}</version> </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jaxb-bundle</artifactId> + <artifactId>jboss-osgi-jaxb</artifactId> <version>${version.jaxb.bundle}</version> </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-common-core-bundle</artifactId> + <artifactId>jboss-osgi-common-core</artifactId> <version>${version.jboss.common.core.bundle}</version> </dependency> <dependency> @@ -157,7 +158,7 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jbossxb-bundle</artifactId> + <artifactId>jboss-osgi-xml-binding</artifactId> <version>${version.jboss.osgi.jbossxb}</version> </dependency> <dependency> Added: projects/jboss-osgi/branches/tdiesler/runtime/.project =================================================================== --- projects/jboss-osgi/branches/tdiesler/runtime/.project (rev 0) +++ projects/jboss-osgi/branches/tdiesler/runtime/.project 2009-05-25 22:52:06 UTC (rev 89404) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jboss-osgi-runtime</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.maven.ide.eclipse.maven2Nature</nature> + </natures> +</projectDescription> Added: projects/jboss-osgi/branches/tdiesler/runtime/.settings/org.maven.ide.eclipse.prefs =================================================================== --- projects/jboss-osgi/branches/tdiesler/runtime/.settings/org.maven.ide.eclipse.prefs (rev 0) +++ projects/jboss-osgi/branches/tdiesler/runtime/.settings/org.maven.ide.eclipse.prefs 2009-05-25 22:52:06 UTC (rev 89404) @@ -0,0 +1,9 @@ +#Tue May 26 00:30:31 CEST 2009 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 Added: projects/jboss-osgi/branches/tdiesler/runtime/microcontainer/.settings/org.maven.ide.eclipse.prefs =================================================================== --- projects/jboss-osgi/branches/tdiesler/runtime/microcontainer/.settings/org.maven.ide.eclipse.prefs (rev 0) +++ projects/jboss-osgi/branches/tdiesler/runtime/microcontainer/.settings/org.maven.ide.eclipse.prefs 2009-05-25 22:52:06 UTC (rev 89404) @@ -0,0 +1,9 @@ +#Tue May 26 00:30:31 CEST 2009 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 Modified: projects/jboss-osgi/branches/tdiesler/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/testsuite/pom.xml 2009-05-25 22:23:32 UTC (rev 89403) +++ projects/jboss-osgi/branches/tdiesler/testsuite/pom.xml 2009-05-25 22:52:06 UTC (rev 89404) @@ -59,12 +59,12 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jaxb-bundle</artifactId> + <artifactId>jboss-osgi-jaxb</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-common-core-bundle</artifactId> + <artifactId>jboss-osgi-common-core</artifactId> <scope>provided</scope> </dependency> <dependency>