[jboss-osgi-commits] JBoss-OSGI SVN: r91148 - in projects/jboss-osgi/trunk: blueprint and 7 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-07-13 07:04:27 -0400 (Mon, 13 Jul 2009) New Revision: 91148 Removed: projects/jboss-osgi/trunk/blueprint/.classpath projects/jboss-osgi/trunk/blueprint/.project projects/jboss-osgi/trunk/blueprint/.settings/ projects/jboss-osgi/trunk/blueprint/impl/ projects/jboss-osgi/trunk/blueprint/pom.xml projects/jboss-osgi/trunk/blueprint/src/ projects/jboss-osgi/trunk/blueprint/testsuite/ projects/jboss-osgi/trunk/husky/.classpath projects/jboss-osgi/trunk/husky/.project projects/jboss-osgi/trunk/husky/.settings/ projects/jboss-osgi/trunk/husky/harness/.classpath projects/jboss-osgi/trunk/husky/harness/.project projects/jboss-osgi/trunk/husky/harness/.settings/ projects/jboss-osgi/trunk/husky/harness/pom.xml projects/jboss-osgi/trunk/husky/harness/src/ projects/jboss-osgi/trunk/husky/pom.xml projects/jboss-osgi/trunk/husky/src/ projects/jboss-osgi/trunk/husky/testsuite/.classpath projects/jboss-osgi/trunk/husky/testsuite/.project projects/jboss-osgi/trunk/husky/testsuite/.settings/ projects/jboss-osgi/trunk/husky/testsuite/pom.xml projects/jboss-osgi/trunk/husky/testsuite/scripts/ projects/jboss-osgi/trunk/husky/testsuite/src/ Modified: projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/testsuite/pom.xml projects/jboss-osgi/trunk/testsuite/trailblazer/scripts/assembly-bundles.xml Log: Extract blueprint and husky Deleted: projects/jboss-osgi/trunk/blueprint/.classpath =================================================================== --- projects/jboss-osgi/trunk/blueprint/.classpath 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/blueprint/.classpath 2009-07-13 11:04:27 UTC (rev 91148) @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> Deleted: projects/jboss-osgi/trunk/blueprint/.project =================================================================== --- projects/jboss-osgi/trunk/blueprint/.project 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/blueprint/.project 2009-07-13 11:04:27 UTC (rev 91148) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>jboss-osgi-blueprint</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>full,incremental,</triggers> - <arguments> - <dictionary> - <key>LaunchConfigHandle</key> - <value>&lt;project&gt;/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch</value> - </dictionary> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> Deleted: projects/jboss-osgi/trunk/blueprint/pom.xml =================================================================== --- projects/jboss-osgi/trunk/blueprint/pom.xml 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/blueprint/pom.xml 2009-07-13 11:04:27 UTC (rev 91148) @@ -1,77 +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 Blueprint</name> - - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-blueprint-parent</artifactId> - <packaging>pom</packaging> - - <version>1.0.0-SNAPSHOT</version> - - <parent> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi</artifactId> - <version>1.0.0.Beta3</version> - </parent> - - <!-- Modules --> - <modules> - <module>impl</module> - <module>testsuite</module> - </modules> - - <!-- 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> Deleted: projects/jboss-osgi/trunk/husky/.classpath =================================================================== --- projects/jboss-osgi/trunk/husky/.classpath 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/husky/.classpath 2009-07-13 11:04:27 UTC (rev 91148) @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> Deleted: projects/jboss-osgi/trunk/husky/.project =================================================================== --- projects/jboss-osgi/trunk/husky/.project 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/husky/.project 2009-07-13 11:04:27 UTC (rev 91148) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>jboss-osgi-husky</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>full,incremental,</triggers> - <arguments> - <dictionary> - <key>LaunchConfigHandle</key> - <value>&lt;project&gt;/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch</value> - </dictionary> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - </natures> -</projectDescription> Deleted: projects/jboss-osgi/trunk/husky/harness/.classpath =================================================================== --- projects/jboss-osgi/trunk/husky/harness/.classpath 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/husky/harness/.classpath 2009-07-13 11:04:27 UTC (rev 91148) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> Deleted: projects/jboss-osgi/trunk/husky/harness/.project =================================================================== --- projects/jboss-osgi/trunk/husky/harness/.project 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/husky/harness/.project 2009-07-13 11:04:27 UTC (rev 91148) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>jboss-osgi-husky-harness</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> Deleted: projects/jboss-osgi/trunk/husky/harness/pom.xml =================================================================== --- projects/jboss-osgi/trunk/husky/harness/pom.xml 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/husky/harness/pom.xml 2009-07-13 11:04:27 UTC (rev 91148) @@ -1,97 +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 Husky - Harness</name> - - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky-harness</artifactId> - <packaging>bundle</packaging> - - <!-- Parent --> - <parent> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> - - <!-- Dependencies --> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-jmx</artifactId> - </dependency> - - <!-- Provided Dependencies --> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> - <Bundle-Activator>org.jboss.osgi.husky.runtime.osgi.HuskyActivator</Bundle-Activator> - <Private-Package> - org.jboss.osgi.husky.internal, - org.jboss.osgi.husky.runtime*, - </Private-Package> - <Export-Package> - org.jboss.osgi.husky;version=${version}, - org.jboss.osgi.husky.annotation;version=${version} - </Export-Package> - <Embed-Transitive>true</Embed-Transitive> - <Embed-Dependency> - junit;inline=false, - </Embed-Dependency> - <_exportcontents>org.junit;version=${version.junit}</_exportcontents> - </instructions> - </configuration> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <quiet>true</quiet> - <excludePackageNames>*.internal</excludePackageNames> - </configuration> - <executions> - <execution> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> Deleted: projects/jboss-osgi/trunk/husky/pom.xml =================================================================== --- projects/jboss-osgi/trunk/husky/pom.xml 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/husky/pom.xml 2009-07-13 11:04:27 UTC (rev 91148) @@ -1,87 +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 Husky</name> - <description>JBoss OSGi Test Support</description> - - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky</artifactId> - <packaging>pom</packaging> - - <version>1.0.0-SNAPSHOT</version> - - <parent> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi</artifactId> - <version>1.0.0.Beta3</version> - </parent> - - <!-- Properties --> - <properties> - </properties> - - <!-- Modules --> - <modules> - <module>harness</module> - <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-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> - - <!-- 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> Deleted: projects/jboss-osgi/trunk/husky/testsuite/.classpath =================================================================== --- projects/jboss-osgi/trunk/husky/testsuite/.classpath 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/husky/testsuite/.classpath 2009-07-13 11:04:27 UTC (rev 91148) @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> - <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> Deleted: projects/jboss-osgi/trunk/husky/testsuite/.project =================================================================== --- projects/jboss-osgi/trunk/husky/testsuite/.project 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/husky/testsuite/.project 2009-07-13 11:04:27 UTC (rev 91148) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>jboss-osgi-husky-testsuite</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> Deleted: projects/jboss-osgi/trunk/husky/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/husky/testsuite/pom.xml 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/husky/testsuite/pom.xml 2009-07-13 11:04:27 UTC (rev 91148) @@ -1,175 +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 Husky - Testsuite</name> - - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky-testsuite</artifactId> - <packaging>jar</packaging> - - <!-- Parent --> - <parent> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky</artifactId> - <version>1.0.0-SNAPSHOT</version> - </parent> - - <!-- Dependencies --> - <dependencies> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-spi</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky-harness</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>biz.aQute</groupId> - <artifactId>bnd</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - </dependency> - <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> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.log</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-common</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-jmx</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>bundles</id> - <phase>test-compile</phase> - <goals> - <goal>directory-single</goal> - </goals> - <configuration> - <finalName>test-libs</finalName> - <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>scripts/assembly-bundles.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>build-test-jars</id> - <phase>test-compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="maven.runtime.classpath" refid="maven.runtime.classpath" /> - <property name="tests.output.dir" value="${project.build.directory}" /> - <ant antfile="scripts/antrun-test-jars.xml" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <!-- 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/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/pom.xml 2009-07-13 11:04:27 UTC (rev 91148) @@ -18,8 +18,6 @@ <!-- Modules --> <modules> - <module>husky</module> - <module>blueprint</module> <module>testsuite</module> </modules> @@ -153,7 +151,7 @@ </dependency> <dependency> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky-harness</artifactId> + <artifactId>jboss-osgi-husky</artifactId> <version>${version.jboss.osgi.husky}</version> </dependency> <dependency> @@ -325,224 +323,6 @@ </profile> <!-- - Name: no-jboss-bind-address - Desc: Set the default jboss.bind.address - --> - <profile> - <id>no-jboss-bind-address</id> - <activation> - <property> - <name>!jboss.bind.address</name> - </property> - </activation> - <properties> - <jboss.bind.address>localhost</jboss.bind.address> - </properties> - </profile> - - <!-- - Name: framework-default - Descr: Setup for default framework integration testing - --> - <profile> - <id>framework-default</id> - <activation> - <property> - <name>!framework</name> - </property> - </activation> - <properties> - <jboss.osgi.framework.properties>jboss-osgi-felix.properties</jboss.osgi.framework.properties> - </properties> - </profile> - - <!-- - Name: framework-felix - Descr: Setup for Felix framework integration testing - --> - <profile> - <id>framework-felix</id> - <activation> - <property> - <name>framework</name> - <value>felix</value> - </property> - </activation> - <properties> - <jboss.osgi.framework.properties>jboss-osgi-felix.properties</jboss.osgi.framework.properties> - </properties> - </profile> - - <!-- - 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> - <properties> - <jboss.osgi.framework.properties>jboss-osgi-equinox.properties</jboss.osgi.framework.properties> - </properties> - </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> - <properties> - <jboss.osgi.framework.properties>jboss-osgi-knopflerfish.properties</jboss.osgi.framework.properties> - </properties> - </profile> - - <!-- - Name: embedded-testing - Descr: Setup for embedded integration testing - --> - <profile> - <id>embedded-testing</id> - <activation> - <property> - <name>!target.container</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <!-- - You can copy these properties in Eclipse to debug example tests - - -Djava.protocol.handler.pkgs=org.jboss.net.protocol|org.jboss.virtual.protocol - -Djndi.server.port=1199 - -Dlog4j.output.dir=${workspace_loc:jboss-osgi-testsuite-example/target} - -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XIncludeAwareParserConfiguration - -Djboss.osgi.framework.properties=jboss-osgi-felix.properties - -Dorg.jboss.osgi.husky.Invoker=org.jboss.osgi.husky.internal.OSGiInvoker - -Dtest.archive.directory=${workspace_loc:jboss-osgi-testsuite-example/target}/test-libs - --> - <property> - <name>java.protocol.handler.pkgs</name> - <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value> - </property> - <property> - <name>jndi.server.port</name> - <value>1199</value> - </property> - <property> - <name>log4j.output.dir</name> - <value>${project.build.directory}</value> - </property> - <property> - <name>jboss.osgi.framework.properties</name> - <value>${jboss.osgi.framework.properties}</value> - </property> - <property> - <name>org.jboss.osgi.husky.Invoker</name> - <value>org.jboss.osgi.husky.internal.OSGiInvoker</value> - </property> - <property> - <name>test.archive.directory</name> - <value>${project.build.directory}/test-libs</value> - </property> - </systemProperties> - </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> - <dependencies> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-client</artifactId> - <scope>test</scope> - <type>pom</type> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name>java.protocol.handler.pkgs</name> - <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value> - </property> - <property> - <name>jboss.bind.address</name> - <value>${jboss.bind.address}</value> - </property> - <property> - <name>jndi.server.port</name> - <value>1099</value> - </property> - <property> - <name>log4j.output.dir</name> - <value>${project.build.directory}</value> - </property> - <property> - <name>org.apache.xerces.xni.parser.XMLParserConfiguration</name> - <value>org.apache.xerces.parsers.XIncludeAwareParserConfiguration</value> - </property> - <property> - <name>jboss.osgi.framework.properties</name> - <value>${jboss.osgi.framework.properties}</value> - </property> - <property> - <name>org.jboss.osgi.husky.Invoker</name> - <value>org.jboss.osgi.husky.internal.OSGiInvoker</value> - </property> - <property> - <name>org.jboss.osgi.husky.runtime.connector.host</name> - <value>${jboss.bind.address}</value> - </property> - <property> - <name>org.jboss.osgi.husky.runtime.connector.port</name> - <value>5401</value> - </property> - <property> - <name>target.container</name> - <value>${target.container}</value> - </property> - <property> - <name>test.archive.directory</name> - <value>${project.build.directory}/test-libs</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <!-- Name: jboss501 Descr: Setup for jboss501 integration testing --> Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-07-13 11:04:27 UTC (rev 91148) @@ -18,7 +18,7 @@ <include>*:jboss-osgi-apache-xerces: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-jndi:jar</include> Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-07-13 11:04:27 UTC (rev 91148) @@ -18,7 +18,7 @@ <include>*:jboss-osgi-apache-xerces: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-jndi:jar</include> Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-07-13 11:04:27 UTC (rev 91148) @@ -78,7 +78,7 @@ </dependency> <dependency> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky-harness</artifactId> + <artifactId>jboss-osgi-husky</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/trailblazer/scripts/assembly-bundles.xml 2009-07-13 11:02:40 UTC (rev 91147) +++ projects/jboss-osgi/trunk/testsuite/trailblazer/scripts/assembly-bundles.xml 2009-07-13 11:04:27 UTC (rev 91148) @@ -18,7 +18,7 @@ <include>*:jboss-osgi-apache-xerces: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-jndi:jar</include>