[jboss-osgi-commits] JBoss-OSGI SVN: r89398 - in projects/jboss-osgi/branches/tdiesler: 3rdparty and 18 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-05-25 17:43:06 -0400 (Mon, 25 May 2009) New Revision: 89398 Added: projects/jboss-osgi/branches/tdiesler/deployers/ projects/jboss-osgi/branches/tdiesler/deployers/pom.xml projects/jboss-osgi/branches/tdiesler/husky/ projects/jboss-osgi/branches/tdiesler/husky/pom.xml projects/jboss-osgi/branches/tdiesler/integration/ projects/jboss-osgi/branches/tdiesler/integration/jbossas/ projects/jboss-osgi/branches/tdiesler/integration/pom.xml projects/jboss-osgi/branches/tdiesler/integration/target/ projects/jboss-osgi/branches/tdiesler/integration/target/pom-transformed.xml projects/jboss-osgi/branches/tdiesler/repository/ projects/jboss-osgi/branches/tdiesler/repository/pom.xml projects/jboss-osgi/branches/tdiesler/runtime/ projects/jboss-osgi/branches/tdiesler/runtime/equinox/ projects/jboss-osgi/branches/tdiesler/runtime/felix/ projects/jboss-osgi/branches/tdiesler/runtime/knopflerfish/ projects/jboss-osgi/branches/tdiesler/runtime/microcontainer/ projects/jboss-osgi/branches/tdiesler/runtime/pom.xml projects/jboss-osgi/branches/tdiesler/spi/ projects/jboss-osgi/branches/tdiesler/spi/pom.xml Removed: projects/jboss-osgi/branches/tdiesler/deployers/pom.xml projects/jboss-osgi/branches/tdiesler/husky/pom.xml projects/jboss-osgi/branches/tdiesler/projects/bundles/apache-xerces/ projects/jboss-osgi/branches/tdiesler/projects/bundles/jaxb/ projects/jboss-osgi/branches/tdiesler/projects/bundles/jboss-common-core/ projects/jboss-osgi/branches/tdiesler/projects/bundles/jbossxb/ projects/jboss-osgi/branches/tdiesler/projects/deployers/ projects/jboss-osgi/branches/tdiesler/projects/husky/ projects/jboss-osgi/branches/tdiesler/projects/integration/ projects/jboss-osgi/branches/tdiesler/projects/repository/ projects/jboss-osgi/branches/tdiesler/projects/runtime/ projects/jboss-osgi/branches/tdiesler/projects/spi/ projects/jboss-osgi/branches/tdiesler/repository/pom.xml projects/jboss-osgi/branches/tdiesler/spi/pom.xml 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/integration/jbossas/pom.xml projects/jboss-osgi/branches/tdiesler/pom.xml projects/jboss-osgi/branches/tdiesler/projects/bundles/pom.xml projects/jboss-osgi/branches/tdiesler/projects/pom.xml projects/jboss-osgi/branches/tdiesler/runtime/equinox/pom.xml projects/jboss-osgi/branches/tdiesler/runtime/felix/pom.xml projects/jboss-osgi/branches/tdiesler/runtime/knopflerfish/pom.xml projects/jboss-osgi/branches/tdiesler/runtime/microcontainer/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:18:28 UTC (rev 89397) +++ projects/jboss-osgi/branches/tdiesler/3rdparty/apache-xerces/pom.xml 2009-05-25 21:43:06 UTC (rev 89398) @@ -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 Bundles - Apache Xerces</name> + <name>JBossOSGi 3rd Party - Apache Xerces</name> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>apache-xerces-bundle</artifactId> <packaging>bundle</packaging> Modified: projects/jboss-osgi/branches/tdiesler/3rdparty/jaxb/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/3rdparty/jaxb/pom.xml 2009-05-25 21:18:28 UTC (rev 89397) +++ projects/jboss-osgi/branches/tdiesler/3rdparty/jaxb/pom.xml 2009-05-25 21:43:06 UTC (rev 89398) @@ -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 Bundles - JAXB</name> + <name>JBossOSGi 3rd Party - JAXB</name> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jaxb-bundle</artifactId> <packaging>bundle</packaging> 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:18:28 UTC (rev 89397) +++ projects/jboss-osgi/branches/tdiesler/3rdparty/jboss-common-core/pom.xml 2009-05-25 21:43:06 UTC (rev 89398) @@ -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 Bundles - JBoss Common Core</name> + <name>JBossOSGi 3rd Party - JBoss Common Core</name> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-common-core-bundle</artifactId> <packaging>bundle</packaging> Modified: projects/jboss-osgi/branches/tdiesler/3rdparty/jbossxb/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/3rdparty/jbossxb/pom.xml 2009-05-25 21:18:28 UTC (rev 89397) +++ projects/jboss-osgi/branches/tdiesler/3rdparty/jbossxb/pom.xml 2009-05-25 21:43:06 UTC (rev 89398) @@ -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 Bundles - JBoss XML Binding</name> + <name>JBossOSGi 3rd Party - JBoss XML Binding</name> <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jbossxb-bundle</artifactId> <packaging>bundle</packaging> Modified: projects/jboss-osgi/branches/tdiesler/3rdparty/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/3rdparty/pom.xml 2009-05-25 21:18:28 UTC (rev 89397) +++ projects/jboss-osgi/branches/tdiesler/3rdparty/pom.xml 2009-05-25 21:43:06 UTC (rev 89398) @@ -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 3rd Party Bundles</name> + <name>JBossOSGi 3rd Party</name> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-3rdparty</artifactId> <packaging>pom</packaging> Copied: projects/jboss-osgi/branches/tdiesler/deployers (from rev 89395, projects/jboss-osgi/branches/tdiesler/projects/deployers/trunk) Deleted: projects/jboss-osgi/branches/tdiesler/deployers/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/projects/deployers/trunk/pom.xml 2009-05-25 20:35:41 UTC (rev 89395) +++ projects/jboss-osgi/branches/tdiesler/deployers/pom.xml 2009-05-25 21:43:06 UTC (rev 89398) @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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> - - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-deployers</artifactId> - <packaging>jar</packaging> - - <version>1.0.0-SNAPSHOT</version> - - <parent> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-projects</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> - - <!-- Properties --> - <properties> - <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi> - <version.jboss.system.jmx>5.0.1.GA</version.jboss.system.jmx> - <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> - - <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> - - <!-- Build --> - <build> - <plugins> - </plugins> - </build> - -</project> Copied: projects/jboss-osgi/branches/tdiesler/deployers/pom.xml (from rev 89396, projects/jboss-osgi/branches/tdiesler/projects/deployers/trunk/pom.xml) =================================================================== --- projects/jboss-osgi/branches/tdiesler/deployers/pom.xml (rev 0) +++ projects/jboss-osgi/branches/tdiesler/deployers/pom.xml 2009-05-25 21:43:06 UTC (rev 89398) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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> + + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-deployers</artifactId> + <packaging>jar</packaging> + + <version>1.0.0-SNAPSHOT</version> + + <parent> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta2</version> + </parent> + + <!-- Properties --> + <properties> + <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi> + <version.jboss.system.jmx>5.0.1.GA</version.jboss.system.jmx> + <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> + + <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> + + <!-- Build --> + <build> + <plugins> + </plugins> + </build> + +</project> Copied: projects/jboss-osgi/branches/tdiesler/husky (from rev 89395, projects/jboss-osgi/branches/tdiesler/projects/husky/trunk) Deleted: projects/jboss-osgi/branches/tdiesler/husky/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/projects/husky/trunk/pom.xml 2009-05-25 20:35:41 UTC (rev 89395) +++ projects/jboss-osgi/branches/tdiesler/husky/pom.xml 2009-05-25 21:43:06 UTC (rev 89398) @@ -1,91 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - <!-- ====================================================================== --> - <!-- --> - <!-- JBoss, JUnit testing for OSGi bundles --> - <!-- --> - <!-- Distributable under LGPL license. --> - <!-- See terms of license at http://www.gnu.org. --> - <!-- --> - <!-- ====================================================================== --> - - <!-- $Id$ --> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <name>JBossOSGi Project - Husky</name> - <description>JBoss OSGi Bundle Testsuite</description> - - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky</artifactId> - <packaging>pom</packaging> - - <version>1.0.0-SNAPSHOT</version> - - <!-- Parent --> - <parent> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-projects</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> - - <!-- Modules --> - <modules> - <module>harness</module> - <module>testsuite</module> - </modules> - - <!-- Properties --> - <properties> - <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common> - <version.jboss.osgi.jmx>1.0.0-SNAPSHOT</version.jboss.osgi.jmx> - <version.jboss.osgi.logging>1.0.0-SNAPSHOT</version.jboss.osgi.logging> - <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> - - <!-- Dependencies --> - <dependencyManagement> - <dependencies> - <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-jmx</artifactId> - <version>${version.jboss.osgi.jmx}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-logging</artifactId> - <version>${version.jboss.osgi.logging}</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> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${version.junit}</version> - </dependency> - </dependencies> - </dependencyManagement> - -</project> Copied: projects/jboss-osgi/branches/tdiesler/husky/pom.xml (from rev 89396, projects/jboss-osgi/branches/tdiesler/projects/husky/trunk/pom.xml) =================================================================== --- projects/jboss-osgi/branches/tdiesler/husky/pom.xml (rev 0) +++ projects/jboss-osgi/branches/tdiesler/husky/pom.xml 2009-05-25 21:43:06 UTC (rev 89398) @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="UTF-8"?> + + <!-- ====================================================================== --> + <!-- --> + <!-- JBoss, JUnit testing for OSGi bundles --> + <!-- --> + <!-- Distributable under LGPL license. --> + <!-- See terms of license at http://www.gnu.org. --> + <!-- --> + <!-- ====================================================================== --> + + <!-- $Id$ --> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <name>JBossOSGi Project - Husky</name> + <description>JBoss OSGi Bundle Testsuite</description> + + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-husky</artifactId> + <packaging>pom</packaging> + + <version>1.0.0-SNAPSHOT</version> + + <!-- Parent --> + <parent> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta2</version> + </parent> + + <!-- Modules --> + <modules> + <module>harness</module> + <module>testsuite</module> + </modules> + + <!-- Properties --> + <properties> + <version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common> + <version.jboss.osgi.jmx>1.0.0-SNAPSHOT</version.jboss.osgi.jmx> + <version.jboss.osgi.logging>1.0.0-SNAPSHOT</version.jboss.osgi.logging> + <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> + + <!-- Dependencies --> + <dependencyManagement> + <dependencies> + <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-jmx</artifactId> + <version>${version.jboss.osgi.jmx}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-logging</artifactId> + <version>${version.jboss.osgi.logging}</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> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${version.junit}</version> + </dependency> + </dependencies> + </dependencyManagement> + +</project> Copied: projects/jboss-osgi/branches/tdiesler/integration/jbossas (from rev 89395, projects/jboss-osgi/branches/tdiesler/projects/integration/jbossas/trunk) Modified: projects/jboss-osgi/branches/tdiesler/integration/jbossas/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/projects/integration/jbossas/trunk/pom.xml 2009-05-25 20:35:41 UTC (rev 89395) +++ projects/jboss-osgi/branches/tdiesler/integration/jbossas/pom.xml 2009-05-25 21:43:06 UTC (rev 89398) @@ -13,7 +13,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-integration</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Beta2</version> </parent> <!-- Properties --> Copied: projects/jboss-osgi/branches/tdiesler/integration/pom.xml (from rev 89396, projects/jboss-osgi/branches/tdiesler/projects/integration/pom.xml) =================================================================== --- projects/jboss-osgi/branches/tdiesler/integration/pom.xml (rev 0) +++ projects/jboss-osgi/branches/tdiesler/integration/pom.xml 2009-05-25 21:43:06 UTC (rev 89398) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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</name> + + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-integration</artifactId> + <packaging>pom</packaging> + + <parent> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta2</version> + </parent> + + <!-- Modules --> + <modules> + <module>jbossas</module> + </modules> + +</project> Added: projects/jboss-osgi/branches/tdiesler/integration/target/pom-transformed.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/integration/target/pom-transformed.xml (rev 0) +++ projects/jboss-osgi/branches/tdiesler/integration/target/pom-transformed.xml 2009-05-25 21:43:06 UTC (rev 89398) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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</name> + + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-integration</artifactId> + <packaging>pom</packaging> + + <parent> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta2</version> + </parent> + + <!-- Modules --> + <modules> + <module>jbossas</module> + </modules> + +</project> Property changes on: projects/jboss-osgi/branches/tdiesler/integration/target/pom-transformed.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jboss-osgi/branches/tdiesler/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/pom.xml 2009-05-25 21:18:28 UTC (rev 89397) +++ projects/jboss-osgi/branches/tdiesler/pom.xml 2009-05-25 21:43:06 UTC (rev 89398) @@ -11,7 +11,14 @@ <!-- Modules --> <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>testsuite</module> </modules> Modified: projects/jboss-osgi/branches/tdiesler/projects/bundles/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/projects/bundles/pom.xml 2009-05-25 21:18:28 UTC (rev 89397) +++ projects/jboss-osgi/branches/tdiesler/projects/bundles/pom.xml 2009-05-25 21:43:06 UTC (rev 89398) @@ -20,12 +20,6 @@ <!-- Modules --> <modules> - <!-- 3rd party wrapper bundles --> - <module>apache-xerces/trunk</module> - <module>jaxb/trunk</module> - <module>jboss-common-core/trunk</module> - <module>jbossxb/trunk</module> - <!-- jboss-osgi --> <module>common/trunk</module> <module>blueprint/trunk</module> Modified: projects/jboss-osgi/branches/tdiesler/projects/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/projects/pom.xml 2009-05-25 21:18:28 UTC (rev 89397) +++ projects/jboss-osgi/branches/tdiesler/projects/pom.xml 2009-05-25 21:43:06 UTC (rev 89398) @@ -18,33 +18,7 @@ <!-- Modules --> <modules> - <module>spi/trunk</module> - <module>husky/trunk</module> - <module>deployers/trunk</module> - <module>repository/trunk</module> <module>bundles</module> - <module>runtime</module> - <module>integration</module> </modules> - <!-- Repositories --> - <repositories> - <repository> - <id>repository.jboss.org</id> - <name>JBoss Repository</name> - <url>http://repository.jboss.org/maven2/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshots Repository</name> - <url>http://snapshots.jboss.org/maven2/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> - </project> Copied: projects/jboss-osgi/branches/tdiesler/repository (from rev 89395, projects/jboss-osgi/branches/tdiesler/projects/repository/trunk) Deleted: projects/jboss-osgi/branches/tdiesler/repository/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/projects/repository/trunk/pom.xml 2009-05-25 20:35:41 UTC (rev 89395) +++ projects/jboss-osgi/branches/tdiesler/repository/pom.xml 2009-05-25 21:43:06 UTC (rev 89398) @@ -1,20 +0,0 @@ -<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> - <artifactId>jboss-osgi-repository</artifactId> - <packaging>pom</packaging> - - <version>1.0.0-SNAPSHOT</version> - - <parent> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-projects</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> - - <modules> - <module>api</module> - </modules> - -</project> Copied: projects/jboss-osgi/branches/tdiesler/repository/pom.xml (from rev 89396, projects/jboss-osgi/branches/tdiesler/projects/repository/trunk/pom.xml) =================================================================== --- projects/jboss-osgi/branches/tdiesler/repository/pom.xml (rev 0) +++ projects/jboss-osgi/branches/tdiesler/repository/pom.xml 2009-05-25 21:43:06 UTC (rev 89398) @@ -0,0 +1,20 @@ +<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> + <artifactId>jboss-osgi-repository</artifactId> + <packaging>pom</packaging> + + <version>1.0.0-SNAPSHOT</version> + + <parent> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta2</version> + </parent> + + <modules> + <module>api</module> + </modules> + +</project> Property changes on: projects/jboss-osgi/branches/tdiesler/runtime ___________________________________________________________________ Name: svn:ignore + target Copied: projects/jboss-osgi/branches/tdiesler/runtime/equinox (from rev 89395, projects/jboss-osgi/branches/tdiesler/projects/runtime/equinox/trunk) Modified: projects/jboss-osgi/branches/tdiesler/runtime/equinox/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/projects/runtime/equinox/trunk/pom.xml 2009-05-25 20:35:41 UTC (rev 89395) +++ projects/jboss-osgi/branches/tdiesler/runtime/equinox/pom.xml 2009-05-25 21:43:06 UTC (rev 89398) @@ -13,7 +13,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Beta2</version> </parent> <!-- Properties --> Copied: projects/jboss-osgi/branches/tdiesler/runtime/felix (from rev 89395, projects/jboss-osgi/branches/tdiesler/projects/runtime/felix/trunk) Modified: projects/jboss-osgi/branches/tdiesler/runtime/felix/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/projects/runtime/felix/trunk/pom.xml 2009-05-25 20:35:41 UTC (rev 89395) +++ projects/jboss-osgi/branches/tdiesler/runtime/felix/pom.xml 2009-05-25 21:43:06 UTC (rev 89398) @@ -8,10 +8,12 @@ <artifactId>jboss-osgi-runtime-felix</artifactId> <packaging>jar</packaging> + <version>1.0.0-SNAPSHOT</version> + <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Beta2</version> </parent> <!-- Properties --> Copied: projects/jboss-osgi/branches/tdiesler/runtime/knopflerfish (from rev 89395, projects/jboss-osgi/branches/tdiesler/projects/runtime/knopflerfish/trunk) Modified: projects/jboss-osgi/branches/tdiesler/runtime/knopflerfish/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/projects/runtime/knopflerfish/trunk/pom.xml 2009-05-25 20:35:41 UTC (rev 89395) +++ projects/jboss-osgi/branches/tdiesler/runtime/knopflerfish/pom.xml 2009-05-25 21:43:06 UTC (rev 89398) @@ -13,7 +13,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Beta2</version> </parent> <!-- Properties --> Copied: projects/jboss-osgi/branches/tdiesler/runtime/microcontainer (from rev 89395, projects/jboss-osgi/branches/tdiesler/projects/runtime/microcontainer/trunk) Modified: projects/jboss-osgi/branches/tdiesler/runtime/microcontainer/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/projects/runtime/microcontainer/trunk/pom.xml 2009-05-25 20:35:41 UTC (rev 89395) +++ projects/jboss-osgi/branches/tdiesler/runtime/microcontainer/pom.xml 2009-05-25 21:43:06 UTC (rev 89398) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0.Beta2</version> </parent> <modules> Copied: projects/jboss-osgi/branches/tdiesler/runtime/pom.xml (from rev 89396, projects/jboss-osgi/branches/tdiesler/projects/runtime/pom.xml) =================================================================== --- projects/jboss-osgi/branches/tdiesler/runtime/pom.xml (rev 0) +++ projects/jboss-osgi/branches/tdiesler/runtime/pom.xml 2009-05-25 21:43:06 UTC (rev 89398) @@ -0,0 +1,27 @@ +<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 Runtime</name> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-runtime</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> + <module>equinox</module> + <module>felix</module> + <module>knopflerfish</module> + <module>microcontainer</module> + </modules> + +</project> Copied: projects/jboss-osgi/branches/tdiesler/spi (from rev 89395, projects/jboss-osgi/branches/tdiesler/projects/spi/trunk) Deleted: projects/jboss-osgi/branches/tdiesler/spi/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/projects/spi/trunk/pom.xml 2009-05-25 20:35:41 UTC (rev 89395) +++ projects/jboss-osgi/branches/tdiesler/spi/pom.xml 2009-05-25 21:43:06 UTC (rev 89398) @@ -1,95 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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> - - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-spi</artifactId> - <packaging>jar</packaging> - - <version>1.0.0-SNAPSHOT</version> - - <!-- Parent --> - <parent> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-projects</artifactId> - <version>1.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <!-- Properties --> - <properties> - <version.jboss.deployers>2.0.5.GA</version.jboss.deployers> - <version.jboss.microcontainer>2.0.4.GA</version.jboss.microcontainer> - <version.osgi>r4v41</version.osgi> - </properties> - - <!-- Dependencies --> - <dependencies> - - <!-- Compile Dependencies --> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-spi</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs</artifactId> - <version>${version.jboss.deployers}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - <!-- Provided Dependencies --> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <version>${version.osgi}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - <version>${version.osgi}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-client-spi</artifactId> - <version>${version.jboss.deployers}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - <version>${version.jboss.microcontainer}</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <quiet>true</quiet> - <excludePackageNames>*.internal</excludePackageNames> - </configuration> - <executions> - <execution> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <aggregate>true</aggregate> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> Copied: projects/jboss-osgi/branches/tdiesler/spi/pom.xml (from rev 89396, projects/jboss-osgi/branches/tdiesler/projects/spi/trunk/pom.xml) =================================================================== --- projects/jboss-osgi/branches/tdiesler/spi/pom.xml (rev 0) +++ projects/jboss-osgi/branches/tdiesler/spi/pom.xml 2009-05-25 21:43:06 UTC (rev 89398) @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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> + + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-spi</artifactId> + <packaging>jar</packaging> + + <version>1.0.0-SNAPSHOT</version> + + <!-- Parent --> + <parent> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi</artifactId> + <version>1.0.0.Beta2</version> + </parent> + + <!-- Properties --> + <properties> + <version.jboss.deployers>2.0.5.GA</version.jboss.deployers> + <version.jboss.microcontainer>2.0.4.GA</version.jboss.microcontainer> + <version.osgi>r4v41</version.osgi> + </properties> + + <!-- Dependencies --> + <dependencies> + + <!-- Compile Dependencies --> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-spi</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs</artifactId> + <version>${version.jboss.deployers}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + <!-- Provided Dependencies --> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <version>${version.osgi}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <version>${version.osgi}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-client-spi</artifactId> + <version>${version.jboss.deployers}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + <version>${version.jboss.microcontainer}</version> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <quiet>true</quiet> + <excludePackageNames>*.internal</excludePackageNames> + </configuration> + <executions> + <execution> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <aggregate>true</aggregate> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project>