[jboss-cvs] JBossAS SVN: r106095 - in projects/demos/microcontainer/trunk: bundle_user/src/main/java/org/jboss/demos/buser and 3 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2010-06-16 16:51:50 -0400 (Wed, 16 Jun 2010)
New Revision: 106095

Added:
   projects/demos/microcontainer/trunk/bundle_user/src/main/resources/META-INF/jboss-deployment.xml
   projects/demos/microcontainer/trunk/opojo/src/main/resources/META-INF/jboss-classloading.xml
Removed:
   projects/demos/microcontainer/trunk/opojo/src/main/resources/META-INF/MANIFEST.MF
Modified:
   projects/demos/microcontainer/trunk/bootstrap/src/main/resources/META-INF/bootstrap-beans.xml
   projects/demos/microcontainer/trunk/bundle_user/src/main/java/org/jboss/demos/buser/EventActivator.java
   projects/demos/microcontainer/trunk/igloo/src/main/resources/META-INF/igloo-beans.xml
Log:
Add missing dpeloyers, use jb-cl.xml.


Modified: projects/demos/microcontainer/trunk/bootstrap/src/main/resources/META-INF/bootstrap-beans.xml
===================================================================
--- projects/demos/microcontainer/trunk/bootstrap/src/main/resources/META-INF/bootstrap-beans.xml	2010-06-16 20:51:00 UTC (rev 106094)
+++ projects/demos/microcontainer/trunk/bootstrap/src/main/resources/META-INF/bootstrap-beans.xml	2010-06-16 20:51:50 UTC (rev 106095)
@@ -104,6 +104,22 @@
    </bean>
    <bean name="ClassLoaderClassPathDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer"/>
 
+   <!-- jboss-deployment.xml / DeploymentMetaData --> 
+
+   <bean name="DeploymentMetaDataParser" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
+      <constructor>
+         <parameter>org.jboss.deployers.spi.classloading.DeploymentMetaData</parameter>
+      </constructor>
+      <property name="name">jboss-deployment.xml</property>
+      <property name="registerWithJBossXB">true</property>
+   </bean>
+   <bean name="DeploymentValidationDeployer" class="org.jboss.deployers.plugins.classloading.DeploymentValidationDeployer">
+      <constructor><parameter><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor>
+      <install method="addInput" whenRequired="Create">
+        <parameter>org.jboss.osgi.framework.bundle.AbstractBundleState</parameter>
+      </install>
+   </bean>       
+
    <!-- CL describe deployer is defined separately, so it can be overridden -->
 
    <bean name="ClassLoaderDeployer" class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer">

Modified: projects/demos/microcontainer/trunk/bundle_user/src/main/java/org/jboss/demos/buser/EventActivator.java
===================================================================
--- projects/demos/microcontainer/trunk/bundle_user/src/main/java/org/jboss/demos/buser/EventActivator.java	2010-06-16 20:51:00 UTC (rev 106094)
+++ projects/demos/microcontainer/trunk/bundle_user/src/main/java/org/jboss/demos/buser/EventActivator.java	2010-06-16 20:51:50 UTC (rev 106095)
@@ -39,7 +39,7 @@
 
    public void start(BundleContext bundleContext) throws Exception
    {
-      log.info("Starting even listener ...");
+      log.info("Starting event listener ...");
       ServiceReference reference = bundleContext.getServiceReference(WC_key);
       if (reference != null)
       {
@@ -56,7 +56,7 @@
 
    public void stop(BundleContext bundleContext) throws Exception
    {
-      log.info("Stopping even listener ...");
+      log.info("Stopping event listener ...");
       if (this.bundleContext != null)
       {
          this.bundleContext.removeServiceListener(listener);

Added: projects/demos/microcontainer/trunk/bundle_user/src/main/resources/META-INF/jboss-deployment.xml
===================================================================
--- projects/demos/microcontainer/trunk/bundle_user/src/main/resources/META-INF/jboss-deployment.xml	                        (rev 0)
+++ projects/demos/microcontainer/trunk/bundle_user/src/main/resources/META-INF/jboss-deployment.xml	2010-06-16 20:51:50 UTC (rev 106095)
@@ -0,0 +1 @@
+<deployment xmlns="urn:jboss:deployment:1.0" required-stage="Installed"/>

Modified: projects/demos/microcontainer/trunk/igloo/src/main/resources/META-INF/igloo-beans.xml
===================================================================
--- projects/demos/microcontainer/trunk/igloo/src/main/resources/META-INF/igloo-beans.xml	2010-06-16 20:51:00 UTC (rev 106094)
+++ projects/demos/microcontainer/trunk/igloo/src/main/resources/META-INF/igloo-beans.xml	2010-06-16 20:51:50 UTC (rev 106095)
@@ -108,6 +108,9 @@
   <bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.framework.deployers.OSGiManifestParsingDeployer" />
   <bean name="OSGiManifestMetaDataDeployer" class="org.jboss.osgi.framework.deployers.OSGiManifestMetaDataDeployer" />
   <bean name="OSGiNativeCodeMetaDataDeployer" class="org.jboss.osgi.framework.deployers.OSGiNativeCodeMetaDataDeployer" />
+  <bean name="OSGiClassLoadingDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleClassLoadingDeployer">
+    <property name="domain"><inject bean="ClassLoaderSystem" property="defaultDomain"/></property>
+  </bean>
 
   <!--
   ********************************

Deleted: projects/demos/microcontainer/trunk/opojo/src/main/resources/META-INF/MANIFEST.MF
===================================================================
--- projects/demos/microcontainer/trunk/opojo/src/main/resources/META-INF/MANIFEST.MF	2010-06-16 20:51:00 UTC (rev 106094)
+++ projects/demos/microcontainer/trunk/opojo/src/main/resources/META-INF/MANIFEST.MF	2010-06-16 20:51:50 UTC (rev 106095)
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.6.5
-Created-By: Ales Justin
-Implementation-Title: JBoss OSGi tests
-Implementation-Version: 2.0.0.beta2
-Implementation-Vendor: jboss.org
-Bundle-SymbolicName: org.jboss.demos.bundle
-Export-Package: org.jboss.demos.opojo.api;version=1.0
-Import-Package: org.osgi.framework;version="[0,1000]"

Added: projects/demos/microcontainer/trunk/opojo/src/main/resources/META-INF/jboss-classloading.xml
===================================================================
--- projects/demos/microcontainer/trunk/opojo/src/main/resources/META-INF/jboss-classloading.xml	                        (rev 0)
+++ projects/demos/microcontainer/trunk/opojo/src/main/resources/META-INF/jboss-classloading.xml	2010-06-16 20:51:50 UTC (rev 106095)
@@ -0,0 +1,5 @@
+<classloading xmlns="urn:jboss:classloading:1.0">
+   <capabilities>
+      <package name="org.jboss.demos.opojo.api" version="1.0"/>
+   </capabilities>
+</classloading>
\ No newline at end of file