[jboss-osgi-commits] JBoss-OSGI SVN: r95892 - in projects/jboss-osgi: projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer and 5 other directories.

Sunday, 1 November 2009

Author: thomas.diesler(a)jboss.com
Date: 2009-11-01 07:22:13 -0500 (Sun, 01 Nov 2009)
New Revision: 95892

Added:
  
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/AbstractMicrocontainerService.java
  
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapabilityMarker.java
  
projects/jboss-osgi/trunk/reactor/jta/src/main/java/org/jboss/osgi/jta/TransactionCapabilityMarker.java
Removed:
  
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/
  
projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/microcontainer/
  
projects/jboss-osgi/trunk/reactor/jta/src/main/java/org/jboss/osgi/jta/TransactionService.java
Modified:
   projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml
  
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceActivator.java
  
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java
  
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerServiceBean.java
  
projects/jboss-osgi/trunk/reactor/jta/src/main/java/org/jboss/osgi/jta/TransactionCapability.java
  
projects/jboss-osgi/trunk/reactor/jta/src/main/java/org/jboss/osgi/jta/internal/TransactionServiceActivator.java
Log:
Use marker services for jta and mc

Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml
===================================================================

--- projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml	2009-11-01 11:50:12
UTC (rev 95891)
+++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml	2009-11-01 12:22:13
UTC (rev 95892)
@@ -112,7 +112,6 @@
               org.jboss.osgi.microcontainer;version=${version}
             </Export-Package>
             <Private-Package>
-              org.jboss.osgi.microcontainer.integration,
               org.jboss.osgi.microcontainer.internal
             </Private-Package>
             <Import-Package>

Copied:
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/AbstractMicrocontainerService.java
(from rev 95850,
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/AbstractMicrocontainerService.java)
===================================================================
---
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/AbstractMicrocontainerService.java	
                       (rev 0)
+++
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/AbstractMicrocontainerService.java	2009-11-01
12:22:13 UTC (rev 95892)
@@ -0,0 +1,274 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.microcontainer;
+
+//$Id$
+
+import static
org.jboss.osgi.spi.management.MicrocontainerServiceMBean.MBEAN_MICROCONTAINER_SERVICE;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import javax.management.MBeanServer;
+import javax.management.StandardMBean;
+
+import org.jboss.dependency.plugins.AbstractController;
+import org.jboss.dependency.plugins.AbstractControllerContext;
+import org.jboss.dependency.plugins.AbstractControllerContextActions;
+import org.jboss.dependency.plugins.action.ControllerContextAction;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.ControllerContextActions;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.deployers.client.spi.main.MainDeployer;
+import org.jboss.deployers.spi.attachments.MutableAttachments;
+import org.jboss.deployers.vfs.spi.client.VFSDeployment;
+import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.osgi.deployment.deployer.AbstractDeployerService;
+import org.jboss.osgi.deployment.deployer.Deployment;
+import org.jboss.osgi.deployment.deployer.DeploymentRegistryService;
+import org.jboss.osgi.spi.OSGiConstants;
+import org.jboss.osgi.spi.management.MicrocontainerServiceMBean;
+import org.jboss.osgi.spi.service.MicrocontainerService;
+import org.jboss.virtual.VirtualFile;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.util.tracker.ServiceTracker;
+
+/**
+ * An OSGi Service the gives access to the Kernel.
+ * 
+ * @author thomas.diesler(a)jboss.com
+ * @since 23-Jan-2009
+ */
+public abstract class AbstractMicrocontainerService extends AbstractDeployerService
implements MicrocontainerService
+{
+   private VFSDeploymentFactory deploymentFactory = VFSDeploymentFactory.getInstance();
+   private ServiceTracker registryTracker;
+
+   public abstract Kernel getKernel();
+
+   public abstract void logDebug(String message);
+
+   public abstract void logWarning(String message, Exception ex);
+
+   public void logWarning(String message)
+   {
+      logWarning(message, null);
+   }
+
+   public List<String> getRegisteredBeans()
+   {
+      List<String> names = new ArrayList<String>();
+
+      AbstractController controller = (AbstractController)getKernel().getController();
+      for (ControllerContext ctx : controller.getAllContexts())
+      {
+         if (ctx instanceof KernelControllerContext || ctx instanceof
PreInstalledControllerContext)
+            names.add(ctx.getName().toString());
+      }
+
+      return names;
+   }
+
+   public Object getRegisteredBean(String beanName)
+   {
+      ControllerContext context =
getKernel().getController().getInstalledContext(beanName);
+      return context != null ? context.getTarget() : null;
+   }
+
+   @SuppressWarnings("unchecked")
+   public <T> T getRegisteredBean(Class<T> clazz, String beanName)
+   {
+      return (T)getRegisteredBean(beanName);
+   }
+
+   public void deploy(URL url) throws BundleException
+   {
+      Deployment dep = createDeployment(url);
+      deploy(new Deployment[] { dep });
+   }
+
+   public void undeploy(URL url) throws BundleException
+   {
+      DeploymentRegistryService registry = getDeploymentRegistry();
+      Deployment dep = registry.getDeployment(url);
+      if (dep != null)
+      {
+         try
+         {
+            MainDeployer mainDeployer =
(MainDeployer)getRegisteredBean("MainDeployer");
+            VFSDeployment vfsdep = dep.getAttachment(VFSDeployment.class);
+            mainDeployer.removeDeployment(vfsdep.getName());
+            mainDeployer.process();
+         }
+         catch (Exception ex)
+         {
+            logWarning("Cannot undeploy bundle", ex);
+         }
+      }
+   }
+
+   public void deploy(Deployment[] depArr) throws BundleException
+   {
+      ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
+      try
+      {
+         Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
+
+         List<VFSDeployment> depList = new ArrayList<VFSDeployment>();
+         MainDeployer mainDeployer =
(MainDeployer)getRegisteredBean("MainDeployer");
+         DeploymentRegistryService registry = getDeploymentRegistry();
+         
+         for (Deployment dep : depArr)
+         {
+            VirtualFile root = dep.getRoot();
+            VFSDeployment vfsdep = deploymentFactory.createVFSDeployment(root);
+            dep.addAttachment(VFSDeployment.class, vfsdep);
+            registry.registerDeployment(dep);
+            depList.add(vfsdep);
+            
+            MutableAttachments att =
(MutableAttachments)vfsdep.getPredeterminedManagedObjects();
+            att.addAttachment(OSGiConstants.PROPERTY_START_LEVEL, new
Integer(dep.getStartLevel()));
+            att.addAttachment(OSGiConstants.PROPERTY_AUTO_START, new
Boolean(dep.isAutoStart()));
+            
+            mainDeployer.addDeployment(vfsdep);
+         }
+
+         // Process the deployments
+         mainDeployer.process();
+
+         // Check for completeness
+         VFSDeployment[] deploymentArr = depList.toArray(new
VFSDeployment[depList.size()]);
+         mainDeployer.checkComplete(deploymentArr);
+      }
+      catch (RuntimeException rte)
+      {
+         throw rte;
+      }
+      catch (Exception ex)
+      {
+         throw new BundleException("Cannot deploy bundles", ex);
+      }
+      finally
+      {
+         Thread.currentThread().setContextClassLoader(ctxLoader);
+      }
+   }
+
+   public void undeploy(Deployment[] depArr) throws BundleException
+   {
+      try
+      {
+         MainDeployer mainDeployer =
(MainDeployer)getRegisteredBean("MainDeployer");
+         DeploymentRegistryService registry = getDeploymentRegistry();
+         
+         for (Deployment dep : depArr)
+         {
+            registry.unregisterDeployment(dep);
+            VFSDeployment vfsdep = dep.getAttachment(VFSDeployment.class);
+            mainDeployer.removeDeployment(vfsdep.getName());
+         }
+         mainDeployer.process();
+      }
+      catch (RuntimeException rte)
+      {
+         throw rte;
+      }
+      catch (Exception ex)
+      {
+         logWarning("Cannot undeploy bundles", ex);
+      }
+   }
+
+   protected void installBean(KernelController controller, String beanName, Object
beanImpl)
+   {
+      try
+      {
+         ControllerContextActions actions = new AbstractControllerContextActions(new
HashMap<ControllerState, ControllerContextAction>());
+         controller.install(new PreInstalledControllerContext(beanName, actions,
beanImpl));
+      }
+      catch (RuntimeException rte)
+      {
+         throw rte;
+      }
+      catch (Throwable ex)
+      {
+         throw new IllegalStateException("Cannot register bean: " + beanName,
ex);
+      }
+   }
+
+   protected void registerMicrocontainerServiceMBean(MBeanServer mbeanServer)
+   {
+      try
+      {
+         StandardMBean mbean = new StandardMBean((MicrocontainerServiceMBean)this,
MicrocontainerServiceMBean.class);
+         mbeanServer.registerMBean(mbean, MBEAN_MICROCONTAINER_SERVICE);
+      }
+      catch (Exception ex)
+      {
+         throw new IllegalStateException("Cannot register
MicrocontainerServiceMBean", ex);
+      }
+   }
+
+   protected void unregisterMicrocontainerServiceMBean(MBeanServer mbeanServer)
+   {
+      if (mbeanServer.isRegistered(MBEAN_MICROCONTAINER_SERVICE))
+      {
+         try
+         {
+            logDebug("Unregister MicrocontainerServiceMBean");
+            mbeanServer.unregisterMBean(MBEAN_MICROCONTAINER_SERVICE);
+         }
+         catch (Exception ex)
+         {
+            logWarning("Cannot unregister MicrocontainerServiceMBean", ex);
+         }
+      }
+   }
+
+   private DeploymentRegistryService getDeploymentRegistry()
+   {
+      if (registryTracker == null)
+      {
+         BundleContext context = getRegisteredBean(BundleContext.class,
BEAN_SYSTEM_BUNDLE_CONTEXT);
+         registryTracker = new ServiceTracker(context,
DeploymentRegistryService.class.getName(), null);
+         registryTracker.open();
+      }
+      DeploymentRegistryService service =
(DeploymentRegistryService)registryTracker.getService();
+      if (service == null)
+         throw new IllegalStateException("Cannot obtain
DeploymentRegistryService");
+      return service;
+   }
+   
+   static class PreInstalledControllerContext extends AbstractControllerContext
+   {
+      public PreInstalledControllerContext(Object name, ControllerContextActions actions,
Object target)
+      {
+         super(name, actions, null, target);
+      }
+   }
+}
\ No newline at end of file

Added:
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapabilityMarker.java
===================================================================
---
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapabilityMarker.java	
                       (rev 0)
+++
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapabilityMarker.java	2009-11-01
12:22:13 UTC (rev 95892)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.microcontainer;
+
+//$Id$
+
+
+/**
+ * A marker service for the jboss-osgi-microcontainer.jar
+ * 
+ * @author thomas.diesler(a)jboss.com
+ * @since 01-Nov-2009
+ */
+public interface MicrocontainerCapabilityMarker
+{
+}
\ No newline at end of file


Property changes on:
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapabilityMarker.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified:
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceActivator.java
===================================================================
---
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceActivator.java	2009-11-01
11:50:12 UTC (rev 95891)
+++
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceActivator.java	2009-11-01
12:22:13 UTC (rev 95892)
@@ -23,6 +23,7 @@
 
 //$Id$
 
+import org.jboss.osgi.microcontainer.MicrocontainerCapabilityMarker;
 import org.jboss.osgi.spi.service.MicrocontainerService;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
@@ -39,6 +40,15 @@
 
    public void start(BundleContext context)
    {
+      // Always register the marker service
+      MicrocontainerCapabilityMarker markerService = new
MicrocontainerCapabilityMarker(){};
+      context.registerService(MicrocontainerCapabilityMarker.class.getName(),
markerService, null);
+      
+      // Do nothing if this bundle gets installed on the jbossmc framework
+      String systemBundleName = context.getBundle(0).getSymbolicName();
+      if ("org.jboss.osgi.framework".equals(systemBundleName))
+         return;
+      
       ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
       try
       {

Modified:
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java
===================================================================
---
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java	2009-11-01
11:50:12 UTC (rev 95891)
+++
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java	2009-11-01
12:22:13 UTC (rev 95892)
@@ -37,7 +37,7 @@
 import org.jboss.osgi.common.log.LogServiceTracker;
 import org.jboss.osgi.deployment.deployer.DeployerService;
 import org.jboss.osgi.jbossxb.XMLBindingService;
-import org.jboss.osgi.microcontainer.integration.AbstractMicrocontainerService;
+import org.jboss.osgi.microcontainer.AbstractMicrocontainerService;
 import org.jboss.osgi.spi.management.MicrocontainerServiceMBean;
 import org.jboss.osgi.spi.service.MicrocontainerService;
 import org.jboss.virtual.VFS;

Modified:
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerServiceBean.java
===================================================================
---
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerServiceBean.java	2009-11-01
11:50:12 UTC (rev 95891)
+++
projects/jboss-osgi/projects/runtime/jbossas/trunk/src/main/java/org/jboss/osgi/integration/jbossas/MicrocontainerServiceBean.java	2009-11-01
12:22:13 UTC (rev 95892)
@@ -32,7 +32,7 @@
 import org.jboss.kernel.spi.dependency.KernelController;
 import org.jboss.logging.Logger;
 import org.jboss.osgi.deployment.deployer.DeployerService;
-import org.jboss.osgi.microcontainer.integration.AbstractMicrocontainerService;
+import org.jboss.osgi.microcontainer.AbstractMicrocontainerService;
 import org.jboss.osgi.spi.management.MicrocontainerServiceMBean;
 import org.jboss.osgi.spi.service.MicrocontainerService;
 import org.osgi.framework.BundleContext;

Modified:
projects/jboss-osgi/trunk/reactor/jta/src/main/java/org/jboss/osgi/jta/TransactionCapability.java
===================================================================
---
projects/jboss-osgi/trunk/reactor/jta/src/main/java/org/jboss/osgi/jta/TransactionCapability.java	2009-11-01
11:50:12 UTC (rev 95891)
+++
projects/jboss-osgi/trunk/reactor/jta/src/main/java/org/jboss/osgi/jta/TransactionCapability.java	2009-11-01
12:22:13 UTC (rev 95892)
@@ -46,7 +46,7 @@
 {
    public TransactionCapability()
    {
-      super(TransactionService.class.getName());
+      super(TransactionCapabilityMarker.class.getName());
       
       if (new File("target").exists())
          addSystemProperty(Environment.OBJECTSTORE_DIR, "target/ObjectStore");

Copied:
projects/jboss-osgi/trunk/reactor/jta/src/main/java/org/jboss/osgi/jta/TransactionCapabilityMarker.java
(from rev 95882,
projects/jboss-osgi/trunk/reactor/jta/src/main/java/org/jboss/osgi/jta/TransactionService.java)
===================================================================
---
projects/jboss-osgi/trunk/reactor/jta/src/main/java/org/jboss/osgi/jta/TransactionCapabilityMarker.java	
                       (rev 0)
+++
projects/jboss-osgi/trunk/reactor/jta/src/main/java/org/jboss/osgi/jta/TransactionCapabilityMarker.java	2009-11-01
12:22:13 UTC (rev 95892)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.jta;
+
+//$Id$
+
+
+/**
+ * A marker service for the jboss-osgi-jta bundle.
+ * 
+ * @author thomas.diesler(a)jboss.com
+ * @since 27-Oct-2009
+ */
+public interface TransactionCapabilityMarker
+{
+}
\ No newline at end of file

Deleted:
projects/jboss-osgi/trunk/reactor/jta/src/main/java/org/jboss/osgi/jta/TransactionService.java
===================================================================
---
projects/jboss-osgi/trunk/reactor/jta/src/main/java/org/jboss/osgi/jta/TransactionService.java	2009-11-01
11:50:12 UTC (rev 95891)
+++
projects/jboss-osgi/trunk/reactor/jta/src/main/java/org/jboss/osgi/jta/TransactionService.java	2009-11-01
12:22:13 UTC (rev 95892)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.osgi.jta;
-
-//$Id$
-
-
-/**
- * A marker service for the jboss-osgi-jta bundle.
- * 
- * @author thomas.diesler(a)jboss.com
- * @since 27-Oct-2009
- */
-public interface TransactionService
-{
-}
\ No newline at end of file

Modified:
projects/jboss-osgi/trunk/reactor/jta/src/main/java/org/jboss/osgi/jta/internal/TransactionServiceActivator.java
===================================================================
---
projects/jboss-osgi/trunk/reactor/jta/src/main/java/org/jboss/osgi/jta/internal/TransactionServiceActivator.java	2009-11-01
11:50:12 UTC (rev 95891)
+++
projects/jboss-osgi/trunk/reactor/jta/src/main/java/org/jboss/osgi/jta/internal/TransactionServiceActivator.java	2009-11-01
12:22:13 UTC (rev 95892)
@@ -26,7 +26,7 @@
 import javax.transaction.TransactionManager;
 import javax.transaction.UserTransaction;
 
-import org.jboss.osgi.jta.TransactionService;
+import org.jboss.osgi.jta.TransactionCapabilityMarker;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceFactory;
@@ -46,8 +46,8 @@
    public void start(BundleContext context)
    {
       // Always register the marker service
-      TransactionService markerService = new TransactionService(){};
-      context.registerService(TransactionService.class.getName(), markerService, null);
+      TransactionCapabilityMarker markerService = new TransactionCapabilityMarker(){};
+      context.registerService(TransactionCapabilityMarker.class.getName(), markerService,
null);
       
       ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
       try


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

[jboss-osgi-commits] JBoss-OSGI SVN: r95892 - in projects/jboss-osgi: projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer and 5 other directories.