[jbossws-commits] JBossWS SVN: r10774 - in stack/native/branches/ropalka/modules/core/src/main: java/org/jboss/wsf/stack/jbws and 1 other directories.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2009-09-24 09:12:32 -0400 (Thu, 24 Sep 2009)
New Revision: 10774

Removed:
   stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointRegistryFactoryImpl.java
Modified:
   stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java
   stack/native/branches/ropalka/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory
Log:
[JBWS-2772] removing AS IL dependency

Modified: stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java	2009-09-24 13:09:08 UTC (rev 10773)
+++ stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java	2009-09-24 13:12:32 UTC (rev 10774)
@@ -21,9 +21,10 @@
  */
 package org.jboss.ws.extensions.eventing.mgmt;
 
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.kernel.spi.dependency.KernelController;
-import org.jboss.wsf.spi.util.KernelLocator;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.ioc.IoCContainerProxy;
+import org.jboss.wsf.spi.ioc.IoCContainerProxyFactory;
 
 /**
  * Subscription manager factory impl
@@ -43,11 +44,17 @@
       return instance;
    }
 
+   /**
+    * Returns subscription manager registered in MC kernel.
+    * 
+    * @return subscription manager
+    */
    public SubscriptionManagerMBean getSubscriptionManager()
    {
+      final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+      final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class);
+      final IoCContainerProxy iocContainer = iocContainerFactory.getContainer();
       
-      KernelController controller = KernelLocator.getKernel().getController();
-      ControllerContext ctx = controller.getInstalledContext(SubscriptionManagerMBean.BEAN_NAME);
-      return (SubscriptionManagerMBean)ctx.getTarget();
+      return iocContainer.getBean(SubscriptionManagerMBean.BEAN_NAME, SubscriptionManagerMBean.class);
    }
 }

Deleted: stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointRegistryFactoryImpl.java
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointRegistryFactoryImpl.java	2009-09-24 13:09:08 UTC (rev 10773)
+++ stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EndpointRegistryFactoryImpl.java	2009-09-24 13:12:32 UTC (rev 10774)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.wsf.stack.jbws;
-
-import org.jboss.wsf.spi.management.EndpointRegistryFactory;
-import org.jboss.wsf.spi.management.EndpointRegistry;
-import org.jboss.wsf.common.KernelAwareSPIFactory;
-
-/**
- * An EndpointRegistryFactory implementation that retrieves
- * the registry from MC kernel.
- *
- * @see EndpointRegistry.BEAN_NAME
- *
- * @author Heiko.Braun at jboss.com
- *         Created: Jul 23, 2007
- */
-public class EndpointRegistryFactoryImpl extends EndpointRegistryFactory
-{
-   public EndpointRegistry getEndpointRegistry()
-   {
-      return new KernelAwareSPIFactory().getKernelProvidedSPI(
-        EndpointRegistry.BEAN_NAME, EndpointRegistry.class
-      );
-   }
-}

Modified: stack/native/branches/ropalka/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory	2009-09-24 13:09:08 UTC (rev 10773)
+++ stack/native/branches/ropalka/modules/core/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory	2009-09-24 13:12:32 UTC (rev 10774)
@@ -1 +1 @@
-org.jboss.wsf.stack.jbws.EndpointRegistryFactoryImpl
\ No newline at end of file
+org.jboss.wsf.framework.management.DefaultEndpointRegistryFactory
\ No newline at end of file