[jboss-osgi-commits] JBoss-OSGI SVN: r89405 - in projects/jboss-osgi/branches/tdiesler: blueprint/testsuite/scripts and 16 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-05-25 19:20:06 -0400 (Mon, 25 May 2009) New Revision: 89405 Added: projects/jboss-osgi/branches/tdiesler/bundles/.project projects/jboss-osgi/branches/tdiesler/bundles/.settings/ projects/jboss-osgi/branches/tdiesler/bundles/.settings/org.maven.ide.eclipse.prefs projects/jboss-osgi/branches/tdiesler/integration/.project projects/jboss-osgi/branches/tdiesler/integration/.settings/ projects/jboss-osgi/branches/tdiesler/integration/.settings/org.maven.ide.eclipse.prefs projects/jboss-osgi/branches/tdiesler/repository/.settings/ projects/jboss-osgi/branches/tdiesler/repository/.settings/org.maven.ide.eclipse.prefs projects/jboss-osgi/branches/tdiesler/testsuite/.settings/ projects/jboss-osgi/branches/tdiesler/testsuite/.settings/org.maven.ide.eclipse.prefs Modified: projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/pom.xml projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/scripts/assembly-bundles.xml projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/src/test/resources/jboss-osgi-framework.properties projects/jboss-osgi/branches/tdiesler/bundles/microcontainer/pom.xml projects/jboss-osgi/branches/tdiesler/husky/harness/pom.xml projects/jboss-osgi/branches/tdiesler/spi/src/main/java/org/jboss/osgi/spi/testing/JNDICapability.java projects/jboss-osgi/branches/tdiesler/spi/src/main/java/org/jboss/osgi/spi/testing/MicrocontainerCapability.java projects/jboss-osgi/branches/tdiesler/testsuite/example/scripts/assembly-bundles.xml projects/jboss-osgi/branches/tdiesler/testsuite/functional/scripts/assembly-bundles.xml projects/jboss-osgi/branches/tdiesler/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/BundleTestCase.java projects/jboss-osgi/branches/tdiesler/testsuite/pom.xml projects/jboss-osgi/branches/tdiesler/testsuite/trailblazer/scripts/assembly-bundles.xml Log: fix 3rd party bundle refs Modified: projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/pom.xml 2009-05-25 22:52:06 UTC (rev 89404) +++ projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/pom.xml 2009-05-25 23:20:06 UTC (rev 89405) @@ -43,7 +43,7 @@ <!-- Bundle Dependencies --> <dependency> - <groupId>org.jboss.osgi.bundles</groupId> + <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-blueprint-impl</artifactId> <version>${version}</version> <scope>provided</scope> @@ -139,7 +139,15 @@ <redirectTestOutputToFile>false</redirectTestOutputToFile> <failIfNoTests>false</failIfNoTests> <systemProperties> + <!-- + Implement URLStreamHandlerService + https://jira.jboss.org/jira/browse/JBOSGI-75 + --> <property> + <name>java.protocol.handler.pkgs</name> + <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value> + </property> + <property> <name>org.apache.xerces.xni.parser.XMLParserConfiguration</name> <value>org.apache.xerces.parsers.XIncludeAwareParserConfiguration</value> </property> @@ -147,22 +155,14 @@ <name>org.jboss.osgi.husky.Invoker</name> <value>org.jboss.osgi.husky.internal.OSGiInvoker</value> </property> - <!-- - Implement URLStreamHandlerService - https://jira.jboss.org/jira/browse/JBOSGI-75 - --> <property> - <name>java.protocol.handler.pkgs</name> - <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value> + <name>log4j.output.dir</name> + <value>${project.build.directory}</value> </property> <property> <name>test.archive.directory</name> <value>${project.build.directory}/test-libs</value> </property> - <property> - <name>log4j.output.dir</name> - <value>${project.build.directory}</value> - </property> </systemProperties> </configuration> </plugin> Modified: projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/scripts/assembly-bundles.xml 2009-05-25 22:52:06 UTC (rev 89404) +++ projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/scripts/assembly-bundles.xml 2009-05-25 23:20:06 UTC (rev 89405) @@ -15,14 +15,14 @@ <outputDirectory>bundles</outputDirectory> <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> <includes> - <include>*:apache-xerces-bundle:jar</include> + <include>*:jboss-osgi-apache-xerces:jar</include> <include>*:jboss-osgi-blueprint-impl: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-jmx:jar</include> <include>*:jboss-osgi-logging:jar</include> - <include>*:jboss-common-core-bundle:jar</include> - <include>*:jbossxb-bundle:jar</include> + <include>*:jboss-osgi-xml-binding:jar</include> <include>*:org.apache.felix.log:jar</include> <include>*:org.osgi.compendium:jar</include> </includes> Modified: projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/src/test/resources/jboss-osgi-framework.properties =================================================================== --- projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/src/test/resources/jboss-osgi-framework.properties 2009-05-25 22:52:06 UTC (rev 89404) +++ projects/jboss-osgi/branches/tdiesler/blueprint/testsuite/src/test/resources/jboss-osgi-framework.properties 2009-05-25 23:20:06 UTC (rev 89405) @@ -32,8 +32,8 @@ file://${test.archive.directory}/bundles/jboss-osgi-logging.jar \ file://${test.archive.directory}/bundles/jboss-osgi-jmx.jar \ file://${test.archive.directory}/bundles/jboss-osgi-husky-harness.jar \ - file://${test.archive.directory}/bundles/jboss-common-core-bundle.jar \ - file://${test.archive.directory}/bundles/apache-xerces-bundle.jar \ - file://${test.archive.directory}/bundles/jbossxb-bundle.jar \ + file://${test.archive.directory}/bundles/jboss-osgi-common-core.jar \ + file://${test.archive.directory}/bundles/jboss-osgi-apache-xerces.jar \ + file://${test.archive.directory}/bundles/jboss-osgi-xml-binding.jar \ file://${test.archive.directory}/bundles/jboss-osgi-blueprint-impl.jar \ No newline at end of file Added: projects/jboss-osgi/branches/tdiesler/bundles/.project =================================================================== --- projects/jboss-osgi/branches/tdiesler/bundles/.project (rev 0) +++ projects/jboss-osgi/branches/tdiesler/bundles/.project 2009-05-25 23:20:06 UTC (rev 89405) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jboss-osgi-bundles</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/bundles/.settings/org.maven.ide.eclipse.prefs =================================================================== --- projects/jboss-osgi/branches/tdiesler/bundles/.settings/org.maven.ide.eclipse.prefs (rev 0) +++ projects/jboss-osgi/branches/tdiesler/bundles/.settings/org.maven.ide.eclipse.prefs 2009-05-25 23:20:06 UTC (rev 89405) @@ -0,0 +1,9 @@ +#Tue May 26 00:51:34 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/bundles/microcontainer/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/bundles/microcontainer/pom.xml 2009-05-25 22:52:06 UTC (rev 89404) +++ projects/jboss-osgi/branches/tdiesler/bundles/microcontainer/pom.xml 2009-05-25 23:20:06 UTC (rev 89405) @@ -71,7 +71,7 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-xml-binding-binding</artifactId> + <artifactId>jboss-osgi-xml-binding</artifactId> <version>${version.jbossxb.bundle}</version> </dependency> Modified: projects/jboss-osgi/branches/tdiesler/husky/harness/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/husky/harness/pom.xml 2009-05-25 22:52:06 UTC (rev 89404) +++ projects/jboss-osgi/branches/tdiesler/husky/harness/pom.xml 2009-05-25 23:20:06 UTC (rev 89405) @@ -34,6 +34,13 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> + + <!-- Bundle Dependencies --> + <dependency> + <groupId>org.jboss.osgi.bundles</groupId> + <artifactId>jboss-osgi-common</artifactId> + <scope>provided</scope> + </dependency> <!-- Provided Dependencies --> <dependency> Added: projects/jboss-osgi/branches/tdiesler/integration/.project =================================================================== --- projects/jboss-osgi/branches/tdiesler/integration/.project (rev 0) +++ projects/jboss-osgi/branches/tdiesler/integration/.project 2009-05-25 23:20:06 UTC (rev 89405) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jboss-osgi-integration</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/integration/.settings/org.maven.ide.eclipse.prefs =================================================================== --- projects/jboss-osgi/branches/tdiesler/integration/.settings/org.maven.ide.eclipse.prefs (rev 0) +++ projects/jboss-osgi/branches/tdiesler/integration/.settings/org.maven.ide.eclipse.prefs 2009-05-25 23:20:06 UTC (rev 89405) @@ -0,0 +1,9 @@ +#Tue May 26 00:51:34 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/repository/.settings/org.maven.ide.eclipse.prefs =================================================================== --- projects/jboss-osgi/branches/tdiesler/repository/.settings/org.maven.ide.eclipse.prefs (rev 0) +++ projects/jboss-osgi/branches/tdiesler/repository/.settings/org.maven.ide.eclipse.prefs 2009-05-25 23:20:06 UTC (rev 89405) @@ -0,0 +1,9 @@ +#Tue May 26 00:51:34 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/spi/src/main/java/org/jboss/osgi/spi/testing/JNDICapability.java =================================================================== --- projects/jboss-osgi/branches/tdiesler/spi/src/main/java/org/jboss/osgi/spi/testing/JNDICapability.java 2009-05-25 22:52:06 UTC (rev 89404) +++ projects/jboss-osgi/branches/tdiesler/spi/src/main/java/org/jboss/osgi/spi/testing/JNDICapability.java 2009-05-25 23:20:06 UTC (rev 89405) @@ -41,7 +41,7 @@ props.setProperty("org.jboss.osgi.jndi.rmi.port", "1198"); props.setProperty("org.jboss.osgi.jndi.port", "1199"); - addBundle("bundles/jboss-common-core-bundle.jar"); + addBundle("bundles/jboss-osgi-common-core.jar"); addBundle("bundles/jboss-osgi-jndi.jar"); } } \ No newline at end of file Modified: projects/jboss-osgi/branches/tdiesler/spi/src/main/java/org/jboss/osgi/spi/testing/MicrocontainerCapability.java =================================================================== --- projects/jboss-osgi/branches/tdiesler/spi/src/main/java/org/jboss/osgi/spi/testing/MicrocontainerCapability.java 2009-05-25 22:52:06 UTC (rev 89404) +++ projects/jboss-osgi/branches/tdiesler/spi/src/main/java/org/jboss/osgi/spi/testing/MicrocontainerCapability.java 2009-05-25 23:20:06 UTC (rev 89405) @@ -34,9 +34,9 @@ { public MicrocontainerCapability() { - addBundle("bundles/apache-xerces-bundle.jar"); - addBundle("bundles/jaxb-bundle.jar"); - addBundle("bundles/jbossxb-bundle.jar"); + addBundle("bundles/jboss-osgi-apache-xerces.jar"); + addBundle("bundles/jboss-osgi-jaxb.jar"); + addBundle("bundles/jboss-osgi-xml-binding.jar"); addBundle("bundles/jboss-osgi-microcontainer.jar"); } } \ No newline at end of file Added: projects/jboss-osgi/branches/tdiesler/testsuite/.settings/org.maven.ide.eclipse.prefs =================================================================== --- projects/jboss-osgi/branches/tdiesler/testsuite/.settings/org.maven.ide.eclipse.prefs (rev 0) +++ projects/jboss-osgi/branches/tdiesler/testsuite/.settings/org.maven.ide.eclipse.prefs 2009-05-25 23:20:06 UTC (rev 89405) @@ -0,0 +1,9 @@ +#Tue May 26 00:51:34 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/example/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/testsuite/example/scripts/assembly-bundles.xml 2009-05-25 22:52:06 UTC (rev 89404) +++ projects/jboss-osgi/branches/tdiesler/testsuite/example/scripts/assembly-bundles.xml 2009-05-25 23:20:06 UTC (rev 89405) @@ -15,16 +15,16 @@ <outputDirectory>bundles</outputDirectory> <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> <includes> - <include>*:apache-xerces-bundle:jar</include> - <include>*:jaxb-bundle:jar</include> - <include>*:jboss-common-core-bundle:jar</include> + <include>*:jboss-osgi-apache-xerces:jar</include> <include>*:jboss-osgi-common:jar</include> + <include>*:jboss-osgi-common-core:jar</include> + <include>*:jboss-osgi-jaxb:jar</include> <include>*:jboss-osgi-jmx:jar</include> <include>*:jboss-osgi-jndi:jar</include> <include>*:jboss-osgi-logging:jar</include> <include>*:jboss-osgi-microcontainer:jar</include> <include>*:jboss-osgi-remotelog:jar</include> - <include>*:jbossxb-bundle:jar</include> + <include>*:jboss-osgi-xml-binding:jar</include> <include>*:org.apache.felix.configadmin:jar</include> <include>*:org.apache.felix.http.jetty:jar</include> <include>*:org.apache.felix.log:jar</include> Modified: projects/jboss-osgi/branches/tdiesler/testsuite/functional/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/testsuite/functional/scripts/assembly-bundles.xml 2009-05-25 22:52:06 UTC (rev 89404) +++ projects/jboss-osgi/branches/tdiesler/testsuite/functional/scripts/assembly-bundles.xml 2009-05-25 23:20:06 UTC (rev 89405) @@ -15,16 +15,16 @@ <outputDirectory>bundles</outputDirectory> <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> <includes> - <include>*:apache-xerces-bundle:jar</include> - <include>*:jaxb-bundle:jar</include> - <include>*:jboss-common-core-bundle:jar</include> + <include>*:jboss-osgi-apache-xerces:jar</include> <include>*:jboss-osgi-common:jar</include> + <include>*:jboss-osgi-common-core:jar</include> + <include>*:jboss-osgi-jaxb:jar</include> <include>*:jboss-osgi-jmx:jar</include> <include>*:jboss-osgi-jndi:jar</include> <include>*:jboss-osgi-logging:jar</include> <include>*:jboss-osgi-microcontainer:jar</include> <include>*:jboss-osgi-remotelog:jar</include> - <include>*:jbossxb-bundle:jar</include> + <include>*:jboss-osgi-xml-binding:jar</include> <include>*:org.apache.felix.configadmin:jar</include> <include>*:org.apache.felix.http.jetty:jar</include> <include>*:org.apache.felix.log:jar</include> Modified: projects/jboss-osgi/branches/tdiesler/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/BundleTestCase.java =================================================================== --- projects/jboss-osgi/branches/tdiesler/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/BundleTestCase.java 2009-05-25 22:52:06 UTC (rev 89404) +++ projects/jboss-osgi/branches/tdiesler/testsuite/functional/src/test/java/org/jboss/test/osgi/bootstrap/BundleTestCase.java 2009-05-25 23:20:06 UTC (rev 89405) @@ -47,7 +47,7 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - AbstractBundle bundle = runtime.installBundle("bundles/apache-xerces-bundle.jar"); + AbstractBundle bundle = runtime.installBundle("bundles/jboss-osgi-apache-xerces.jar"); bundle.start(); assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState()); @@ -64,7 +64,7 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - AbstractBundle bundle = runtime.installBundle("bundles/jaxb-bundle.jar"); + AbstractBundle bundle = runtime.installBundle("bundles/jboss-osgi-jaxb.jar"); bundle.start(); assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState()); @@ -81,8 +81,8 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - AbstractBundle bundle = runtime.installBundle("bundles/apache-xerces-bundle.jar"); - bundle = runtime.installBundle("bundles/jboss-common-core-bundle.jar"); + AbstractBundle bundle = runtime.installBundle("bundles/jboss-osgi-apache-xerces.jar"); + bundle = runtime.installBundle("bundles/jboss-osgi-common-core.jar"); bundle.start(); assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState()); @@ -99,10 +99,10 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - AbstractBundle bundle = runtime.installBundle("bundles/apache-xerces-bundle.jar"); - bundle = runtime.installBundle("bundles/jboss-common-core-bundle.jar"); - bundle = runtime.installBundle("bundles/jaxb-bundle.jar"); - bundle = runtime.installBundle("bundles/jbossxb-bundle.jar"); + AbstractBundle bundle = runtime.installBundle("bundles/jboss-osgi-apache-xerces.jar"); + bundle = runtime.installBundle("bundles/jboss-osgi-common-core.jar"); + bundle = runtime.installBundle("bundles/jboss-osgi-jaxb.jar"); + bundle = runtime.installBundle("bundles/jboss-osgi-xml-binding.jar"); bundle.start(); assertEquals("Test bundle ACTIVE", Bundle.ACTIVE, bundle.getState()); @@ -119,7 +119,7 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - AbstractBundle bundle = runtime.installBundle("bundles/jboss-common-core-bundle.jar"); + AbstractBundle bundle = runtime.installBundle("bundles/jboss-osgi-common-core.jar"); bundle = runtime.installBundle("bundles/jboss-osgi-jndi.jar"); bundle.start(); @@ -137,7 +137,7 @@ OSGiRuntime runtime = getEmbeddedRuntime(); try { - AbstractBundle bundle = runtime.installBundle("bundles/jboss-common-core-bundle.jar"); + AbstractBundle bundle = runtime.installBundle("bundles/jboss-osgi-common-core.jar"); bundle = runtime.installBundle("bundles/jboss-osgi-jndi.jar"); bundle = runtime.installBundle("bundles/jboss-osgi-jmx.jar"); bundle.start(); Modified: projects/jboss-osgi/branches/tdiesler/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/testsuite/pom.xml 2009-05-25 22:52:06 UTC (rev 89404) +++ projects/jboss-osgi/branches/tdiesler/testsuite/pom.xml 2009-05-25 23:20:06 UTC (rev 89405) @@ -147,10 +147,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <systemProperties> - <property> - <name>org.jboss.osgi.husky.Invoker</name> - <value>org.jboss.osgi.husky.internal.OSGiInvoker</value> - </property> <!-- Implement URLStreamHandlerService https://jira.jboss.org/jira/browse/JBOSGI-75 @@ -160,14 +156,22 @@ <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value> </property> <property> - <name>test.archive.directory</name> - <value>${project.build.directory}/test-libs</value> + <name>org.apache.xerces.xni.parser.XMLParserConfiguration</name> + <value>org.apache.xerces.parsers.XIncludeAwareParserConfiguration</value> </property> <property> + <name>org.jboss.osgi.husky.Invoker</name> + <value>org.jboss.osgi.husky.internal.OSGiInvoker</value> + </property> + <property> <name>log4j.output.dir</name> - <value>${basedir}/target</value> + <value>${project.build.directory}</value> </property> <property> + <name>test.archive.directory</name> + <value>${project.build.directory}/test-libs</value> + </property> + <property> <name>jboss.osgi.framework.config</name> <value>jboss-osgi-felix.properties</value> </property> @@ -202,10 +206,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <systemProperties> - <property> - <name>org.jboss.osgi.husky.Invoker</name> - <value>org.jboss.osgi.husky.internal.OSGiInvoker</value> - </property> <!-- Implement URLStreamHandlerService https://jira.jboss.org/jira/browse/JBOSGI-75 @@ -215,14 +215,22 @@ <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value> </property> <property> - <name>test.archive.directory</name> - <value>${project.build.directory}/test-libs</value> + <name>org.apache.xerces.xni.parser.XMLParserConfiguration</name> + <value>org.apache.xerces.parsers.XIncludeAwareParserConfiguration</value> </property> <property> + <name>org.jboss.osgi.husky.Invoker</name> + <value>org.jboss.osgi.husky.internal.OSGiInvoker</value> + </property> + <property> <name>log4j.output.dir</name> - <value>${basedir}/target</value> + <value>${project.build.directory}</value> </property> <property> + <name>test.archive.directory</name> + <value>${project.build.directory}/test-libs</value> + </property> + <property> <name>jboss.osgi.framework.config</name> <value>jboss-osgi-felix.properties</value> </property> @@ -258,26 +266,14 @@ <configuration> <systemProperties> <property> - <name>org.jboss.osgi.husky.Invoker</name> - <value>org.jboss.osgi.husky.internal.OSGiInvoker</value> + <name>log4j.output.dir</name> + <value>${basedir}/target</value> </property> - <!-- - Implement URLStreamHandlerService - https://jira.jboss.org/jira/browse/JBOSGI-75 - --> <property> - <name>java.protocol.handler.pkgs</name> - <value>org.jboss.net.protocol|org.jboss.virtual.protocol</value> - </property> - <property> <name>test.archive.directory</name> <value>${project.build.directory}/test-libs</value> </property> <property> - <name>log4j.output.dir</name> - <value>${basedir}/target</value> - </property> - <property> <name>jboss.osgi.framework.config</name> <value>jboss-osgi-equinox.properties</value> </property> @@ -317,14 +313,14 @@ <configuration> <systemProperties> <property> - <name>test.archive.directory</name> - <value>${project.build.directory}/test-libs</value> - </property> - <property> <name>log4j.output.dir</name> <value>${basedir}/target</value> </property> <property> + <name>test.archive.directory</name> + <value>${project.build.directory}/test-libs</value> + </property> + <property> <name>jboss.osgi.framework.config</name> <value>jboss-osgi-knopflerfish.properties</value> </property> Modified: projects/jboss-osgi/branches/tdiesler/testsuite/trailblazer/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/branches/tdiesler/testsuite/trailblazer/scripts/assembly-bundles.xml 2009-05-25 22:52:06 UTC (rev 89404) +++ projects/jboss-osgi/branches/tdiesler/testsuite/trailblazer/scripts/assembly-bundles.xml 2009-05-25 23:20:06 UTC (rev 89405) @@ -15,16 +15,16 @@ <outputDirectory>bundles</outputDirectory> <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> <includes> - <include>*:apache-xerces-bundle:jar</include> - <include>*:jaxb-bundle:jar</include> - <include>*:jboss-common-core-bundle:jar</include> + <include>*:jboss-osgi-apache-xerces:jar</include> <include>*:jboss-osgi-common:jar</include> + <include>*:jboss-osgi-common-core:jar</include> + <include>*:jboss-osgi-jaxb:jar</include> <include>*:jboss-osgi-jmx:jar</include> <include>*:jboss-osgi-jndi:jar</include> <include>*:jboss-osgi-logging:jar</include> <include>*:jboss-osgi-microcontainer:jar</include> <include>*:jboss-osgi-remotelog:jar</include> - <include>*:jbossxb-bundle:jar</include> + <include>*:jboss-osgi-xml-binding:jar</include> <include>*:org.apache.felix.configadmin:jar</include> <include>*:org.apache.felix.http.jetty:jar</include> <include>*:org.apache.felix.log:jar</include>