Author: thomas.diesler(a)jboss.com Date: 2009-07-10 06:38:27 -0400 (Fri, 10 Jul 2009) New Revision: 91064 Modified: projects/jboss-osgi/trunk/distribution/scripts/assembly-deploy-artifacts.xml projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/testsuite/example/src/test/resources/mcservice/example-mcservice-bundleA.bnd projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/mcservice/mcservice-bundleA.bnd Log: Move MicrocontainerService to mc bundle Modified: projects/jboss-osgi/trunk/distribution/scripts/assembly-deploy-artifacts.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/scripts/assembly-deploy-artifacts.xml 2009-07-10 10:31:47 UTC (rev 91063) +++ projects/jboss-osgi/trunk/distribution/scripts/assembly-deploy-artifacts.xml 2009-07-10 10:38:27 UTC (rev 91064) @@ -41,29 +41,13 @@ <!-- resources --> <dependencySet> - <outputDirectory>resources/jboss-osgi-runtime-felix</outputDirectory> + <outputDirectory>resources/jbossas-config</outputDirectory> <useStrictFiltering>true</useStrictFiltering> <includes> - <include>*:jboss-osgi-runtime-felix:jar:config</include> + <include>*:jboss-osgi-integration-jbossas:jar:config</include> </includes> <unpack>true</unpack> </dependencySet> - <dependencySet> - <outputDirectory>resources/jboss-osgi-runtime-equinox</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jboss-osgi-runtime-equinox:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>resources/jboss-osgi-runtime-knopflerfish</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jboss-osgi-runtime-knopflerfish:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> <!-- source --> <dependencySet> Modified: projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml 2009-07-10 10:31:47 UTC (rev 91063) +++ projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml 2009-07-10 10:38:27 UTC (rev 91064) @@ -304,9 +304,8 @@ <include name="jboss-osgi-runtime-felix.jar" /> <include name="org.apache.felix.framework.jar" /> </fileset> - <fileset condition="isFelix" dir=&quot;(a){deploy.artifacts.dir}/resources/jboss-osgi-runtime-felix&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true"> - <include name="osgi-deployers-jboss-beans.xml" /> - </fileset> + <singefile condition="isFelix" src=&quot;(a){deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-felix.xml&quot; + target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/osgi-jboss-beans.xml" override="true"/> <fileset condition="isFelix" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> <include name="org.osgi.compendium.jar" /> </fileset> @@ -318,9 +317,8 @@ <include name="org.apache.equinox.framework.jar" /> <include name="org.eclipse.osgi.jar"/> </fileset> - <fileset condition="isEquinox" dir=&quot;(a){deploy.artifacts.dir}/resources/jboss-osgi-runtime-equinox&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true"> - <include name="osgi-deployers-jboss-beans.xml" /> - </fileset> + <singefile condition="isEquinox" src=&quot;(a){deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-equinox.xml&quot; + target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/osgi-jboss-beans.xml" override="true"/> <fileset condition="isEquinox" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> <include name="org.eclipse.osgi.services.jar" /> </fileset> @@ -331,9 +329,8 @@ <include name="jboss-osgi-runtime-knopflerfish.jar" /> <include name="org.knopflerfish.framework.jar" /> </fileset> - <fileset condition="isKnopflerfish" dir=&quot;(a){deploy.artifacts.dir}/resources/jboss-osgi-runtime-knopflerfish&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true"> - <include name="osgi-deployers-jboss-beans.xml" /> - </fileset> + <singefile condition="isKnopflerfish" src=&quot;(a){deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-knopflerfish.xml&quot; + target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/osgi-jboss-beans.xml" override="true"/> <fileset condition="isKnopflerfish" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> <include name="org.osgi.compendium.jar" /> </fileset> Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/mcservice/example-mcservice-bundleA.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/mcservice/example-mcservice-bundleA.bnd 2009-07-10 10:31:47 UTC (rev 91063) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/mcservice/example-mcservice-bundleA.bnd 2009-07-10 10:38:27 UTC (rev 91064) @@ -6,4 +6,4 @@ Export-Package: org.jboss.test.osgi.example.microcontainer.bundleA -Import-Package: org.jboss.test.osgi.example.microcontainer.bundleB, org.jboss.osgi.spi.service, org.osgi.framework +Import-Package: org.jboss.test.osgi.example.microcontainer.bundleB, org.jboss.osgi.microcontainer, org.osgi.framework Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/mcservice/mcservice-bundleA.bnd =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/mcservice/mcservice-bundleA.bnd 2009-07-10 10:31:47 UTC (rev 91063) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/mcservice/mcservice-bundleA.bnd 2009-07-10 10:38:27 UTC (rev 91064) @@ -6,4 +6,4 @@ Export-Package: org.jboss.test.osgi.service.microcontainer.bundleA -Import-Package: org.jboss.osgi.spi.service, org.osgi.framework +Import-Package: org.jboss.osgi.microcontainer, org.osgi.framework