Author: thomas.diesler(a)jboss.com Date: 2009-08-18 14:40:16 -0400 (Tue, 18 Aug 2009) New Revision: 92537 Modified: projects/jboss-osgi/trunk/reactor/runtime/jbossmc/.classpath 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/trailblazer/scripts/assembly-bundles.xml Log: Copy org.osgi.compendium.jar optionally Modified: projects/jboss-osgi/trunk/reactor/runtime/jbossmc/.classpath =================================================================== --- projects/jboss-osgi/trunk/reactor/runtime/jbossmc/.classpath 2009-08-18 18:28:18 UTC (rev 92536) +++ projects/jboss-osgi/trunk/reactor/runtime/jbossmc/.classpath 2009-08-18 18:40:16 UTC (rev 92537) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> + <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> <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="src" path="src/main/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"/> Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-08-18 18:28:18 UTC (rev 92536) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-08-18 18:40:16 UTC (rev 92537) @@ -10,11 +10,21 @@ <!-- Dependency Sets --> <dependencySets> - <!-- bundle --> + <!-- bundles --> <dependencySet> <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> @@ -29,7 +39,6 @@ <include>*:org.apache.felix.http.jetty:jar</include> <include>*:org.apache.felix.log:jar</include> <include>*:org.apache.felix.metatype:jar</include> - <include>*:org.osgi.compendium:jar</include> </includes> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-08-18 18:28:18 UTC (rev 92536) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-08-18 18:40:16 UTC (rev 92537) @@ -10,11 +10,21 @@ <!-- Dependency Sets --> <dependencySets> - <!-- bundle --> + <!-- bundles --> <dependencySet> <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> @@ -28,7 +38,6 @@ <include>*:org.apache.felix.http.jetty:jar</include> <include>*:org.apache.felix.log:jar</include> <include>*:org.apache.felix.metatype:jar</include> - <include>*:org.osgi.compendium:jar</include> </includes> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/trailblazer/scripts/assembly-bundles.xml 2009-08-18 18:28:18 UTC (rev 92536) +++ projects/jboss-osgi/trunk/testsuite/trailblazer/scripts/assembly-bundles.xml 2009-08-18 18:40:16 UTC (rev 92537) @@ -10,11 +10,21 @@ <!-- Dependency Sets --> <dependencySets> - <!-- bundle --> + <!-- bundles --> <dependencySet> <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> @@ -28,7 +38,6 @@ <include>*:org.apache.felix.http.jetty:jar</include> <include>*:org.apache.felix.log:jar</include> <include>*:org.apache.felix.metatype:jar</include> - <include>*:org.osgi.compendium:jar</include> </includes> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope>