[jboss-osgi-commits] JBoss-OSGI SVN: r93609 - in projects/jboss-osgi/trunk: distribution/installer/src/main/resources/jbossas and 5 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-09-16 09:29:05 -0400 (Wed, 16 Sep 2009) New Revision: 93609 Added: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-felix.xml projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium.xml projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-felix.xml projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium.xml Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml projects/jboss-osgi/trunk/testsuite/example/pom.xml projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/testsuite/functional/pom.xml projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: Fix jbossas/felix integration Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-09-16 13:25:33 UTC (rev 93608) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-09-16 13:29:05 UTC (rev 93609) @@ -356,9 +356,10 @@ <include name="jboss-osgi-apache-xerces.jar" /> <include name="jboss-osgi-blueprint.jar" /> <include name="jboss-osgi-common.jar" /> + <include name="jboss-osgi-common-core.jar" /> <include name="jboss-osgi-jaxb.jar" /> + <include name="jboss-osgi-jmx.jar" /> <include name="jboss-osgi-webconsole.jar" /> - <include name="jboss-osgi-xml-binding.jar" /> <include name="org.apache.felix.http.jetty.jar" /> <include name="org.apache.felix.log.jar" /> </fileset> @@ -431,9 +432,8 @@ </fileset> <fileset condition="isJBossMC" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> - <include name="jboss-osgi-common-core.jar" /> - <include name="jboss-osgi-jmx.jar" /> <include name="jboss-osgi-jndi.jar" /> + <include name="jboss-osgi-xml-binding.jar" /> </fileset> </pack> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2009-09-16 13:25:33 UTC (rev 93608) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2009-09-16 13:29:05 UTC (rev 93609) @@ -28,9 +28,10 @@ <!-- system --> javax.xml.bind.annotation;version=2.1, org.apache.xerces.dom;version=2.9, + org.jnp.interfaces;version=5.0, <!-- jboss-osgi --> - org.jboss.osgi.jmx;version=1.0, + org.jboss.osgi.jbossxb;version=2.0, org.jboss.osgi.jndi;version=1.0, org.jboss.osgi.microcontainer;version=1.0, org.jboss.osgi.spi;version=1.0, Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-09-16 13:25:33 UTC (rev 93608) +++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-09-16 13:29:05 UTC (rev 93609) @@ -10,16 +10,13 @@ <!-- ====================================================================== --> <!-- $Id: pom.xml 91197 2009-07-14 09:48:24Z thomas.diesler(a)jboss.com $ --> - - <!-- - Set these VM properties in your IDE debugger - - -Dlog4j.output.dir=${workspace_loc:jboss-osgi-testsuite-example/target} - -Djboss.osgi.framework.properties=jboss-osgi-felix.properties - -Dorg.jboss.osgi.husky.Invoker=org.jboss.osgi.husky.internal.OSGiInvoker + + <!-- + Set these VM properties in your IDE debugger -Dlog4j.output.dir=${workspace_loc:jboss-osgi-testsuite-example/target} + -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 --> - + <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> @@ -140,10 +137,10 @@ <url>http://repository.jboss.org/maven2</url> </repository> </repositories> - + <!-- Profiles --> <profiles> - + <!-- Name: framework-equinox Descr: Setup for Equinox framework integration testing @@ -177,7 +174,7 @@ </plugins> </build> </profile> - + <!-- Name: framework-felix Descr: Setup for Felix framework integration testing @@ -193,18 +190,37 @@ <build> <plugins> <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>compendium</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-compendium-felix.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> <exclude>${target.container.excludes}</exclude> - <exclude>org/jboss/test/osgi/example/blueprint/**</exclude> </excludes> </configuration> </plugin> </plugins> </build> </profile> - + <!-- Name: framework-jbossmc Descr: Setup for JBossMC framework integration testing @@ -220,6 +236,26 @@ <build> <plugins> <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>compendium</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-compendium.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> @@ -230,7 +266,39 @@ </plugins> </build> </profile> - + <profile> + <id>framework-default</id> + <activation> + <property> + <name>!framework</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>compendium</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-compendium.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-09-16 13:25:33 UTC (rev 93608) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-09-16 13:29:05 UTC (rev 93609) @@ -1,7 +1,7 @@ <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - <id>deploy-artifacts</id> + <id>compendium</id> <formats> <format>dir</format> </formats> @@ -15,16 +15,6 @@ <outputDirectory>bundles</outputDirectory> <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> <includes> - <include>*:org.osgi.compendium:jar</include> - </includes> - <useStrictFiltering>false</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>bundles</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <includes> <include>*:jboss-osgi-apache-xerces:jar</include> <include>*:jboss-osgi-blueprint:jar</include> <include>*:jboss-osgi-common:jar</include> Added: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-felix.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-felix.xml (rev 0) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-felix.xml 2009-09-16 13:29:05 UTC (rev 93609) @@ -0,0 +1,26 @@ +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + + <id>compendium</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <!-- Dependency Sets --> + <dependencySets> + + <!-- bundles --> + <dependencySet> + <outputDirectory>bundles</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <includes> + <include>org.apache.felix:org.osgi.compendium:jar</include> + </includes> + <useStrictFiltering>false</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + </dependencySet> + + </dependencySets> +</assembly> Added: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium.xml (rev 0) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium.xml 2009-09-16 13:29:05 UTC (rev 93609) @@ -0,0 +1,26 @@ +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + + <id>compendium</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <!-- Dependency Sets --> + <dependencySets> + + <!-- bundles --> + <dependencySet> + <outputDirectory>bundles</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <includes> + <include>org.osgi:org.osgi.compendium:jar</include> + </includes> + <useStrictFiltering>false</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + </dependencySet> + + </dependencySets> +</assembly> Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-09-16 13:25:33 UTC (rev 93608) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-09-16 13:29:05 UTC (rev 93609) @@ -164,6 +164,26 @@ <build> <plugins> <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>compendium</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-compendium-felix.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> @@ -195,6 +215,26 @@ <build> <plugins> <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>compendium</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-compendium.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> @@ -220,6 +260,26 @@ <build> <plugins> <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>compendium</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-compendium.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-09-16 13:25:33 UTC (rev 93608) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-09-16 13:29:05 UTC (rev 93609) @@ -15,16 +15,6 @@ <outputDirectory>bundles</outputDirectory> <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> <includes> - <include>*:org.osgi.compendium:jar</include> - </includes> - <useStrictFiltering>false</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>bundles</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <includes> <include>*:jboss-osgi-apache-xerces:jar</include> <include>*:jboss-osgi-common:jar</include> <include>*:jboss-osgi-common-core:jar</include> Added: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-felix.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-felix.xml (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-felix.xml 2009-09-16 13:29:05 UTC (rev 93609) @@ -0,0 +1,26 @@ +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + + <id>compendium</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <!-- Dependency Sets --> + <dependencySets> + + <!-- bundles --> + <dependencySet> + <outputDirectory>bundles</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <includes> + <include>org.apache.felix:org.osgi.compendium:jar</include> + </includes> + <useStrictFiltering>false</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + </dependencySet> + + </dependencySets> +</assembly> Added: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium.xml (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium.xml 2009-09-16 13:29:05 UTC (rev 93609) @@ -0,0 +1,26 @@ +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + + <id>compendium</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <!-- Dependency Sets --> + <dependencySets> + + <!-- bundles --> + <dependencySet> + <outputDirectory>bundles</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <includes> + <include>org.osgi:org.osgi.compendium:jar</include> + </includes> + <useStrictFiltering>false</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + </dependencySet> + + </dependencySets> +</assembly> Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-09-16 13:25:33 UTC (rev 93608) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-09-16 13:29:05 UTC (rev 93609) @@ -35,6 +35,7 @@ <!-- Properties --> <properties> <version.jmx.invoker.adaptor.client>5.0.1.GA</version.jmx.invoker.adaptor.client> + <version.jnp.client>5.0.1.GA</version.jnp.client> </properties> <!-- Dependencies --> @@ -137,6 +138,18 @@ <!-- Test Dependencies --> <dependency> + <groupId>org.jboss.naming</groupId> + <artifactId>jnp-client</artifactId> + <version>${version.jnp.client}</version> + <exclusions> + <exclusion> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + </exclusions> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-log4j</artifactId> <scope>test</scope>