[jboss-osgi-commits] JBoss-OSGI SVN: r91147 - in projects/jboss-osgi/projects/bundles: blueprint and 3 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-07-13 07:02:40 -0400 (Mon, 13 Jul 2009) New Revision: 91147 Added: projects/jboss-osgi/projects/bundles/blueprint/ projects/jboss-osgi/projects/bundles/blueprint/trunk/ Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/pom.xml projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/scripts/assembly-bundles.xml Log: Extract blueprint Copied: projects/jboss-osgi/projects/bundles/blueprint/trunk (from rev 91144, projects/jboss-osgi/trunk/blueprint) Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/blueprint/pom.xml 2009-07-13 07:02:00 UTC (rev 91144) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2009-07-13 11:02:40 UTC (rev 91147) @@ -11,67 +11,79 @@ <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi</artifactId> - <version>1.0.0.Beta3</version> + <artifactId>jboss-osgi-parent</artifactId> + <version>1.0.1-SNAPSHOT</version> </parent> + <!-- Properties --> + <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 --> <modules> <module>impl</module> <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> - - <!-- - Name: framework-equinox - Descr: Setup for Equinox framework integration testing - --> - <profile> - <id>framework-equinox</id> - <activation> - <property> - <name>framework</name> - <value>equinox</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- - Name: framework-knopflerfish - Descr: Setup for Knopflerfish framework integration testing - --> - <profile> - <id>framework-knopflerfish</id> - <activation> - <property> - <name>framework</name> - <value>knopflerfish</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml 2009-07-13 07:02:00 UTC (rev 91144) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/pom.xml 2009-07-13 11:02:40 UTC (rev 91147) @@ -18,13 +18,9 @@ <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-blueprint</artifactId> + <version>${version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky-harness</artifactId> - <scope>provided</scope> - </dependency> <dependency> <groupId>biz.aQute</groupId> @@ -33,22 +29,12 @@ <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-log4j</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-felix</artifactId> - <scope>test</scope> </dependency> - - <!-- OSGi Dependencies --> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - </dependency> <!-- Bundle Dependencies --> <dependency> @@ -63,10 +49,19 @@ </dependency> <dependency> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky-harness</artifactId> + <artifactId>jboss-osgi-husky</artifactId> <scope>provided</scope> </dependency> - + + <!-- OSGi Dependencies --> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + </dependency> </dependencies> <!-- Build --> @@ -116,77 +111,6 @@ <!-- Profiles --> <profiles> - - <!-- - Name: framework-equinox - Descr: Setup for Equinox framework integration testing - --> - <profile> - <id>framework-equinox</id> - <activation> - <property> - <name>framework</name> - <value>equinox</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- - Name: framework-knopflerfish - Descr: Setup for Knopflerfish framework integration testing - --> - <profile> - <id>framework-knopflerfish</id> - <activation> - <property> - <name>framework</name> - <value>knopflerfish</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- - Name: remote-testing - Descr: Setup for remote integration testing - <profile> - <id>remote-testing</id> - <activation> - <property> - <name>target.container</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> - </profile> - --> </profiles> </project> Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/blueprint/testsuite/scripts/assembly-bundles.xml 2009-07-13 07:02:00 UTC (rev 91144) +++ projects/jboss-osgi/projects/bundles/blueprint/trunk/testsuite/scripts/assembly-bundles.xml 2009-07-13 11:02:40 UTC (rev 91147) @@ -19,7 +19,7 @@ <include>*:jboss-osgi-blueprint:jar</include> <include>*:jboss-osgi-common:jar</include> <include>*:jboss-osgi-common-core:jar</include> - <include>*:jboss-osgi-husky-harness:jar</include> + <include>*:jboss-osgi-husky:jar</include> <include>*:jboss-osgi-jaxb:jar</include> <include>*:jboss-osgi-jmx:jar</include> <include>*:jboss-osgi-microcontainer:jar</include>