JBossWS SVN: r10774 - in stack/native/branches/ropalka/modules/core/src/main: java/org/jboss/wsf/stack/jbws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)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(a)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
16 years, 3 months
JBossWS SVN: r10773 - in stack/metro/branches/ropalka/modules/server/src/main: resources/jbossws-metro-server.jar/META-INF/services and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-09-24 09:09:08 -0400 (Thu, 24 Sep 2009)
New Revision: 10773
Removed:
stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointRegistryFactoryImpl.java
Modified:
stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory
Log:
[JBWS-2772] removing AS IL dependency
Deleted: stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointRegistryFactoryImpl.java
===================================================================
--- stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointRegistryFactoryImpl.java 2009-09-24 13:08:35 UTC (rev 10772)
+++ stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/EndpointRegistryFactoryImpl.java 2009-09-24 13:09:08 UTC (rev 10773)
@@ -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.metro;
-
-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(a)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/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory
===================================================================
--- stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2009-09-24 13:08:35 UTC (rev 10772)
+++ stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2009-09-24 13:09:08 UTC (rev 10773)
@@ -1 +1 @@
-org.jboss.wsf.stack.metro.EndpointRegistryFactoryImpl
\ No newline at end of file
+org.jboss.wsf.framework.management.DefaultEndpointRegistryFactory
\ No newline at end of file
16 years, 3 months
JBossWS SVN: r10772 - in stack/cxf/branches/ropalka/modules/server/src/main: resources/jbossws-cxf-server.jar/META-INF/services and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-09-24 09:08:35 -0400 (Thu, 24 Sep 2009)
New Revision: 10772
Removed:
stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointRegistryFactoryImpl.java
Modified:
stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory
Log:
[JBWS-2772] removing AS IL dependency
Deleted: stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointRegistryFactoryImpl.java
===================================================================
--- stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointRegistryFactoryImpl.java 2009-09-24 13:07:03 UTC (rev 10771)
+++ stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/EndpointRegistryFactoryImpl.java 2009-09-24 13:08:35 UTC (rev 10772)
@@ -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.cxf;
-
-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(a)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/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory
===================================================================
--- stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2009-09-24 13:07:03 UTC (rev 10771)
+++ stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-server.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2009-09-24 13:08:35 UTC (rev 10772)
@@ -1 +1 @@
-org.jboss.wsf.stack.cxf.EndpointRegistryFactoryImpl
\ No newline at end of file
+org.jboss.wsf.framework.management.DefaultEndpointRegistryFactory
\ No newline at end of file
16 years, 3 months
JBossWS SVN: r10771 - in container/jboss50/branches/ropalka: src/main/java/org/jboss/webservices/integration and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-09-24 09:07:03 -0400 (Thu, 24 Sep 2009)
New Revision: 10771
Added:
container/jboss50/branches/ropalka/src/main/java/org/jboss/webservices/integration/config/ServerConfigFactoryImpl.java
container/jboss50/branches/ropalka/src/main/java/org/jboss/webservices/integration/endpoint/HttpServerFactoryImpl.java
container/jboss50/branches/ropalka/src/main/java/org/jboss/webservices/integration/ioc/
container/jboss50/branches/ropalka/src/main/java/org/jboss/webservices/integration/ioc/IoCContainerProxyFactoryImpl.java
container/jboss50/branches/ropalka/src/main/java/org/jboss/webservices/integration/ioc/IoCContainerProxyImpl.java
container/jboss50/branches/ropalka/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.http.HttpServerFactory
container/jboss50/branches/ropalka/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.ioc.IoCContainerProxyFactory
Modified:
container/jboss50/branches/ropalka/pom.xml
container/jboss50/branches/ropalka/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java
container/jboss50/branches/ropalka/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
container/jboss50/branches/ropalka/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory
Log:
[JBWS-2772] removing AS IL dependency
Modified: container/jboss50/branches/ropalka/pom.xml
===================================================================
--- container/jboss50/branches/ropalka/pom.xml 2009-09-24 13:05:14 UTC (rev 10770)
+++ container/jboss50/branches/ropalka/pom.xml 2009-09-24 13:07:03 UTC (rev 10771)
@@ -24,8 +24,8 @@
<!-- Properties -->
<properties>
- <jbossws.common.version>1.2.0.GA</jbossws.common.version>
- <jbossws.spi.version>1.2.0.GA</jbossws.spi.version>
+ <jbossws.common.version>1.2.1-SNAPSHOT</jbossws.common.version>
+ <jbossws.spi.version>1.2.1-SNAPSHOT</jbossws.spi.version>
<!--
JBoss component versions taken from
Added: container/jboss50/branches/ropalka/src/main/java/org/jboss/webservices/integration/config/ServerConfigFactoryImpl.java
===================================================================
--- container/jboss50/branches/ropalka/src/main/java/org/jboss/webservices/integration/config/ServerConfigFactoryImpl.java (rev 0)
+++ container/jboss50/branches/ropalka/src/main/java/org/jboss/webservices/integration/config/ServerConfigFactoryImpl.java 2009-09-24 13:07:03 UTC (rev 10771)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.config;
+
+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;
+import org.jboss.wsf.spi.management.ServerConfig;
+import org.jboss.wsf.spi.management.ServerConfigFactory;
+
+/**
+ * Retrieves webservices stack specific config from MC kernel.
+ *
+ * @author <a href="mailto:hbraun@redhat.com">Heiko Braun</a>
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class ServerConfigFactoryImpl extends ServerConfigFactory
+{
+
+ /** The bean name in the kernel registry. */
+ private static final String BEAN_NAME = "WSServerConfig";
+
+ /**
+ * Constructor.
+ */
+ public ServerConfigFactoryImpl()
+ {
+ super();
+ }
+
+ /**
+ * Returns config registered in MC kernel.
+ *
+ * @return config
+ */
+ public ServerConfig getServerConfig()
+ {
+ final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class);
+ final IoCContainerProxy iocContainer = iocContainerFactory.getContainer();
+
+ return iocContainer.getBean(ServerConfigFactoryImpl.BEAN_NAME, ServerConfig.class);
+ }
+
+}
Added: container/jboss50/branches/ropalka/src/main/java/org/jboss/webservices/integration/endpoint/HttpServerFactoryImpl.java
===================================================================
--- container/jboss50/branches/ropalka/src/main/java/org/jboss/webservices/integration/endpoint/HttpServerFactoryImpl.java (rev 0)
+++ container/jboss50/branches/ropalka/src/main/java/org/jboss/webservices/integration/endpoint/HttpServerFactoryImpl.java 2009-09-24 13:07:03 UTC (rev 10771)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.endpoint;
+
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.http.HttpServer;
+import org.jboss.wsf.spi.http.HttpServerFactory;
+import org.jboss.wsf.spi.ioc.IoCContainerProxy;
+import org.jboss.wsf.spi.ioc.IoCContainerProxyFactory;
+
+/**
+ * Lookups http server inside MC container.
+ *
+ * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class HttpServerFactoryImpl extends HttpServerFactory
+{
+
+ /** The default bean name. */
+ private static final String BEAN_NAME = "WSHTTPServer";
+
+ /**
+ * Constructor.
+ */
+ public HttpServerFactoryImpl()
+ {
+ super();
+ }
+
+ /**
+ * Returns http server registered in MC kernel.
+ *
+ * @return http server
+ */
+ @Override
+ public HttpServer getHttpServer()
+ {
+ final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class);
+ final IoCContainerProxy iocContainer = iocContainerFactory.getContainer();
+
+ return iocContainer.getBean(HttpServerFactoryImpl.BEAN_NAME, HttpServer.class);
+ }
+
+}
Modified: container/jboss50/branches/ropalka/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java
===================================================================
--- container/jboss50/branches/ropalka/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java 2009-09-24 13:05:14 UTC (rev 10770)
+++ container/jboss50/branches/ropalka/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java 2009-09-24 13:07:03 UTC (rev 10771)
@@ -25,14 +25,15 @@
import javax.xml.ws.WebServiceException;
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.webservices.integration.util.ASHelper;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.invocation.Invocation;
import org.jboss.wsf.spi.invocation.integration.InvocationContextCallback;
import org.jboss.wsf.spi.invocation.integration.ServiceEndpointContainer;
-import org.jboss.wsf.spi.util.KernelLocator;
+import org.jboss.wsf.spi.ioc.IoCContainerProxy;
+import org.jboss.wsf.spi.ioc.IoCContainerProxyFactory;
/**
* Handles invocations on EJB3 endpoints.
@@ -44,7 +45,7 @@
{
/** MC kernel controller. */
- private final KernelController controller;
+ private final IoCContainerProxy iocContainer;
/** EJB3 container name. */
private String containerName;
@@ -59,7 +60,9 @@
{
super();
- this.controller = KernelLocator.getKernel().getController();
+ final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class);
+ this.iocContainer = iocContainerFactory.getContainer();
}
/**
@@ -88,13 +91,11 @@
if (ejb3ContainerNotInitialized)
{
- final ControllerContext context = this.controller.getInstalledContext(this.containerName);
- if (context == null)
+ this.serviceEndpointContainer = this.iocContainer.getBean(this.containerName, ServiceEndpointContainer.class);
+ if (this.serviceEndpointContainer == null)
{
throw new WebServiceException("Cannot find service endpoint target: " + this.containerName);
}
-
- this.serviceEndpointContainer = (ServiceEndpointContainer) context.getTarget();
}
return this.serviceEndpointContainer;
Added: container/jboss50/branches/ropalka/src/main/java/org/jboss/webservices/integration/ioc/IoCContainerProxyFactoryImpl.java
===================================================================
--- container/jboss50/branches/ropalka/src/main/java/org/jboss/webservices/integration/ioc/IoCContainerProxyFactoryImpl.java (rev 0)
+++ container/jboss50/branches/ropalka/src/main/java/org/jboss/webservices/integration/ioc/IoCContainerProxyFactoryImpl.java 2009-09-24 13:07:03 UTC (rev 10771)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.ioc;
+
+import org.jboss.wsf.spi.ioc.IoCContainerProxy;
+import org.jboss.wsf.spi.ioc.IoCContainerProxyFactory;
+
+/**
+ * @see org.jboss.wsf.spi.ioc.IoCContainerProxyFactory
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class IoCContainerProxyFactoryImpl implements IoCContainerProxyFactory
+{
+
+ /** Container proxy singleton. */
+ private static final IoCContainerProxy CONTAINER = IoCContainerProxyImpl.getInstance();
+
+ /**
+ * Constructor.
+ */
+ public IoCContainerProxyFactoryImpl()
+ {
+ super();
+ }
+
+ /**
+ * @see org.jboss.wsf.spi.ioc.IoCContainerProxyFactory#getContainer()
+ *
+ * @return IoC container proxy
+ */
+ public IoCContainerProxy getContainer()
+ {
+ return IoCContainerProxyFactoryImpl.CONTAINER;
+ }
+
+}
Added: container/jboss50/branches/ropalka/src/main/java/org/jboss/webservices/integration/ioc/IoCContainerProxyImpl.java
===================================================================
--- container/jboss50/branches/ropalka/src/main/java/org/jboss/webservices/integration/ioc/IoCContainerProxyImpl.java (rev 0)
+++ container/jboss50/branches/ropalka/src/main/java/org/jboss/webservices/integration/ioc/IoCContainerProxyImpl.java 2009-09-24 13:07:03 UTC (rev 10771)
@@ -0,0 +1,88 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.webservices.integration.ioc;
+
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.wsf.spi.ioc.IoCContainerProxy;
+
+/**
+ * @see org.jboss.wsf.spi.ioc.IoCContainerProxy
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class IoCContainerProxyImpl implements IoCContainerProxy
+{
+
+ /** Singleton. */
+ private static final IoCContainerProxy SINGLETON = new IoCContainerProxyImpl();
+ /** JBoss MC kernel. */
+ private static Kernel kernel;
+
+ /**
+ * Constructor.
+ */
+ public IoCContainerProxyImpl()
+ {
+ super();
+ }
+
+ /**
+ * Returns container proxy instance.
+ *
+ * @return container proxy instance
+ */
+ static IoCContainerProxy getInstance()
+ {
+ return IoCContainerProxyImpl.SINGLETON;
+ }
+
+ /**
+ * Sets JBoss kernel - invoked via MC injection.
+ *
+ * @param kernel JBoss kernel
+ */
+ public void setKernel(final Kernel kernel)
+ {
+ IoCContainerProxyImpl.kernel = kernel;
+ }
+
+ /**
+ * @see org.jboss.wsf.spi.ioc.IoCContainerProxy#getBean(java.lang.String, java.lang.Class)
+ *
+ * @param <T> bean type
+ * @param beanName bean name inside IoC registry
+ * @param clazz bean type class
+ * @return bean instance
+ * @throws IllegalArgumentException if bean is not found
+ */
+ @SuppressWarnings("unchecked")
+ public <T> T getBean(final String beanName, final Class<T> clazz)
+ {
+ final KernelController controller = IoCContainerProxyImpl.kernel.getController();
+ final ControllerContext ctx = controller.getInstalledContext(beanName);
+
+ return (T)ctx.getTarget();
+ }
+
+}
Modified: container/jboss50/branches/ropalka/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
===================================================================
--- container/jboss50/branches/ropalka/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2009-09-24 13:05:14 UTC (rev 10770)
+++ container/jboss50/branches/ropalka/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2009-09-24 13:07:03 UTC (rev 10771)
@@ -2,14 +2,18 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <!-- Locate the single instance of the kernel -->
- <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator">
+ <!-- Wraps single instance of the kernel -->
+ <bean name="WSIoCContainerProxy" class="org.jboss.webservices.integration.ioc.IoCContainerProxyImpl">
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
</bean>
<!-- Locate the single instance of the MBeanServer -->
<bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator">
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ <constructor>
+ <parameter>
+ <inject bean="JMXKernel" property="mbeanServer"/>
+ </parameter>
+ </constructor>
</bean>
<!-- Endpoint API http server -->
Added: container/jboss50/branches/ropalka/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.http.HttpServerFactory
===================================================================
--- container/jboss50/branches/ropalka/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.http.HttpServerFactory (rev 0)
+++ container/jboss50/branches/ropalka/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.http.HttpServerFactory 2009-09-24 13:07:03 UTC (rev 10771)
@@ -0,0 +1 @@
+org.jboss.webservices.integration.endpoint.HttpServerFactoryImpl
\ No newline at end of file
Added: container/jboss50/branches/ropalka/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.ioc.IoCContainerProxyFactory
===================================================================
--- container/jboss50/branches/ropalka/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.ioc.IoCContainerProxyFactory (rev 0)
+++ container/jboss50/branches/ropalka/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.ioc.IoCContainerProxyFactory 2009-09-24 13:07:03 UTC (rev 10771)
@@ -0,0 +1 @@
+org.jboss.webservices.integration.ioc.IoCContainerProxyFactoryImpl
\ No newline at end of file
Modified: container/jboss50/branches/ropalka/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory
===================================================================
--- container/jboss50/branches/ropalka/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory 2009-09-24 13:05:14 UTC (rev 10770)
+++ container/jboss50/branches/ropalka/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.management.ServerConfigFactory 2009-09-24 13:07:03 UTC (rev 10771)
@@ -1 +1 @@
-org.jboss.wsf.framework.management.ServerConfigFactoryImpl
\ No newline at end of file
+org.jboss.webservices.integration.config.ServerConfigFactoryImpl
\ No newline at end of file
16 years, 3 months
JBossWS SVN: r10770 - in framework/branches/ropalka/src/main/java/org/jboss/wsf/framework: deployment and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-09-24 09:05:14 -0400 (Thu, 24 Sep 2009)
New Revision: 10770
Added:
framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java
Removed:
framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/management/ServerConfigFactoryImpl.java
Modified:
framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java
framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeploymentAspectManagerFactory.java
framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/http/DefaultHttpServerFactory.java
framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/management/MBeanServerLocator.java
Log:
[JBWS-2772] removing AS IL dependency
Modified: framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java
===================================================================
--- framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java 2009-09-24 13:03:38 UTC (rev 10769)
+++ framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java 2009-09-24 13:05:14 UTC (rev 10770)
@@ -21,14 +21,12 @@
*/
package org.jboss.wsf.framework;
-import org.jboss.logging.Logger;
import org.jboss.wsf.framework.deployment.DefaultDeploymentAspectManagerFactory;
import org.jboss.wsf.framework.deployment.DefaultDeploymentModelFactory;
import org.jboss.wsf.framework.deployment.DefaultLifecycleHandlerFactory;
import org.jboss.wsf.framework.http.DefaultHttpContextFactory;
import org.jboss.wsf.framework.http.DefaultHttpServerFactory;
import org.jboss.wsf.framework.invocation.DefaultResourceInjectorFactory;
-import org.jboss.wsf.framework.management.ServerConfigFactoryImpl;
import org.jboss.wsf.framework.management.DefaultEndpointMetricsFactory;
import org.jboss.wsf.framework.serviceref.DefaultServiceRefHandlerFactory;
import org.jboss.wsf.framework.serviceref.DefaultServiceRefMetaDataParserFactory;
@@ -44,6 +42,7 @@
import org.jboss.wsf.spi.invocation.ResourceInjectorFactory;
import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
import org.jboss.wsf.spi.invocation.WebServiceContextFactory;
+import org.jboss.wsf.spi.ioc.IoCContainerProxyFactory;
import org.jboss.wsf.spi.management.EndpointMetricsFactory;
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
import org.jboss.wsf.spi.management.ServerConfigFactory;
@@ -59,18 +58,12 @@
*/
class DefaultSPIProvider extends SPIProvider
{
- // provide logging
- private static final Logger log = Logger.getLogger(DefaultSPIProvider.class);
/**
* Gets the specified SPI.
*/
public <T> T getSPI(Class<T> spiType)
{
- boolean debugEnabled = log.isDebugEnabled();
- if (debugEnabled)
- log.debug("provide SPI '" + spiType + "'");
-
T returnType = null;
// SPI provided by framework, default that can be overridden
@@ -120,7 +113,7 @@
}
else if (ServerConfigFactory.class.equals(spiType))
{
- returnType = (T)loadService(spiType, ServerConfigFactoryImpl.class.getName());
+ returnType = (T)loadService(spiType, null);
}
else if (EndpointRegistryFactory.class.equals(spiType))
{
@@ -146,14 +139,14 @@
{
returnType = (T)loadService(spiType, null);
}
+ else if (IoCContainerProxyFactory.class.equals(spiType))
+ {
+ returnType = (T)loadService(spiType, null);
+ }
if (returnType == null)
throw new WSFException("Failed to provide SPI '" + spiType + "'");
- // help debugging
- if (debugEnabled)
- log.debug(spiType + " Implementation: " + returnType);
-
return returnType;
}
Modified: framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeploymentAspectManagerFactory.java
===================================================================
--- framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeploymentAspectManagerFactory.java 2009-09-24 13:03:38 UTC (rev 10769)
+++ framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeploymentAspectManagerFactory.java 2009-09-24 13:05:14 UTC (rev 10770)
@@ -21,8 +21,6 @@
*/
package org.jboss.wsf.framework.deployment;
-import org.jboss.logging.Logger;
-import org.jboss.wsf.common.KernelAwareSPIFactory;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspectManager;
import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory;
@@ -34,31 +32,19 @@
* @see org.jboss.wsf.framework.deployment.DeploymentAspectInstaller
*
* @author Heiko.Braun(a)jboss.com
- * Created: Jul 20, 2007
*/
public class DefaultDeploymentAspectManagerFactory extends DeploymentAspectManagerFactory
{
- private static final Logger log = Logger.getLogger(DefaultDeploymentAspectManagerFactory.class);
+ // TODO: review this class methods, maybe only one method getDeploymentAspectManager() will be sufficient
public DeploymentAspectManager getDeploymentAspectManager(Deployment.DeploymentType deploymentType)
{
- String beanName;
-
- if (deploymentType.toString().indexOf("EJB") != -1)
- {
- beanName = "WSDeploymentAspectManagerEJB";
- }
- else
- {
- beanName = "WSDeploymentAspectManagerJSE";
- }
- return getDeploymentAspectManager(beanName);
+ throw new UnsupportedOperationException();
}
public DeploymentAspectManager getDeploymentAspectManager(String beanName)
{
- if (log.isDebugEnabled())
- log.debug("DeploymentAspectManager for: " + beanName);
- return new KernelAwareSPIFactory().getKernelProvidedSPI(beanName, DeploymentAspectManager.class);
+ throw new UnsupportedOperationException();
}
+
}
Modified: framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/http/DefaultHttpServerFactory.java
===================================================================
--- framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/http/DefaultHttpServerFactory.java 2009-09-24 13:03:38 UTC (rev 10769)
+++ framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/http/DefaultHttpServerFactory.java 2009-09-24 13:05:14 UTC (rev 10770)
@@ -21,7 +21,6 @@
*/
package org.jboss.wsf.framework.http;
-import org.jboss.wsf.common.KernelAwareSPIFactory;
import org.jboss.wsf.spi.http.HttpServer;
import org.jboss.wsf.spi.http.HttpServerFactory;
@@ -36,6 +35,6 @@
@Override
public HttpServer getHttpServer()
{
- return new KernelAwareSPIFactory().getKernelProvidedSPI(HttpServer.BEAN_NAME, HttpServer.class);
+ throw new UnsupportedOperationException();
}
}
Added: framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java
===================================================================
--- framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java (rev 0)
+++ framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java 2009-09-24 13:05:14 UTC (rev 10770)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.framework.management;
+
+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;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+
+/**
+ * Retrieves registry from MC kernel.
+ *
+ * @author <a href="mailto:hbraun@redhat.com">Heiko Braun</a>
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class DefaultEndpointRegistryFactory extends EndpointRegistryFactory
+{
+
+ /** The bean name in the kernel registry. */
+ private static final String BEAN_NAME = "WSEndpointRegistry";
+
+ /**
+ * Constructor.
+ */
+ public DefaultEndpointRegistryFactory()
+ {
+ super();
+ }
+
+ /**
+ * Returns endpoint registry registered in MC kernel.
+ *
+ * @return endpoint registry
+ */
+ public EndpointRegistry getEndpointRegistry()
+ {
+ final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class);
+ final IoCContainerProxy iocContainer = iocContainerFactory.getContainer();
+
+ return iocContainer.getBean(DefaultEndpointRegistryFactory.BEAN_NAME, EndpointRegistry.class);
+ }
+
+}
Modified: framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/management/MBeanServerLocator.java
===================================================================
--- framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/management/MBeanServerLocator.java 2009-09-24 13:03:38 UTC (rev 10769)
+++ framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/management/MBeanServerLocator.java 2009-09-24 13:05:14 UTC (rev 10770)
@@ -21,40 +21,28 @@
*/
package org.jboss.wsf.framework.management;
-import java.util.Iterator;
-
import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
/**
* Locate the single instance of the MBeanServer
*
* @author Thomas.Diesler(a)jboss.org
- * @since 30-Jul-2007
*/
-public class MBeanServerLocator
+public final class MBeanServerLocator
{
- private MBeanServer mbeanServer;
+
+ private final MBeanServer mbeanServer;
- public MBeanServer getMbeanServer()
+ public MBeanServerLocator(final MBeanServer mbeanServer)
{
- // In jboss-4.2 the MBeanServer cannot be injected
- if (mbeanServer == null)
- {
- for (Iterator i = MBeanServerFactory.findMBeanServer(null).iterator(); i.hasNext();)
- {
- mbeanServer = (MBeanServer)i.next();
- if (mbeanServer.getClass().getName().startsWith("org.jboss")) // JBWS-2580
- {
- break;
- }
- }
- }
- return mbeanServer;
+ super();
+
+ this.mbeanServer = mbeanServer;
}
- public void setMbeanServer(MBeanServer mbeanServer)
+ public MBeanServer getMbeanServer()
{
- this.mbeanServer = mbeanServer;
+ return mbeanServer;
}
+
}
Deleted: framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/management/ServerConfigFactoryImpl.java
===================================================================
--- framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/management/ServerConfigFactoryImpl.java 2009-09-24 13:03:38 UTC (rev 10769)
+++ framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/management/ServerConfigFactoryImpl.java 2009-09-24 13:05:14 UTC (rev 10770)
@@ -1,42 +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.framework.management;
-
-import org.jboss.wsf.common.KernelAwareSPIFactory;
-import org.jboss.wsf.spi.management.ServerConfig;
-import org.jboss.wsf.spi.management.ServerConfigFactory;
-
-/**
- * @author Heiko.Braun(a)jboss.com
- * Created: Jul 23, 2007
- */
-public class ServerConfigFactoryImpl extends ServerConfigFactory
-{
- public ServerConfig getServerConfig()
- {
- ServerConfig serverConfig = new KernelAwareSPIFactory().getKernelProvidedSPI(ServerConfig.BEAN_NAME, ServerConfig.class);
- if (serverConfig == null)
- throw new IllegalStateException("Cannot obtain ServerConfig for bean name: " + ServerConfig.BEAN_NAME);
-
- return serverConfig;
- }
-}
16 years, 3 months
JBossWS SVN: r10769 - common/branches/ropalka/src/main/java/org/jboss/wsf/common.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-09-24 09:03:38 -0400 (Thu, 24 Sep 2009)
New Revision: 10769
Removed:
common/branches/ropalka/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java
Log:
[JBWS-2772] removing AS IL dependency
Deleted: common/branches/ropalka/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java
===================================================================
--- common/branches/ropalka/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java 2009-09-24 13:02:25 UTC (rev 10768)
+++ common/branches/ropalka/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java 2009-09-24 13:03:38 UTC (rev 10769)
@@ -1,42 +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.common;
-
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.kernel.spi.dependency.KernelController;
-import org.jboss.wsf.spi.util.KernelLocator;
-
-/**
- * SPI factory delegating to kernel for bean lookups
- * @author richard.opalka(a)jboss.com
- * @author Heiko.Braun(a)jboss.com
- */
-public class KernelAwareSPIFactory
-{
- @SuppressWarnings("unchecked")
- public <T> T getKernelProvidedSPI(String beanName, Class<T> spiArtifact)
- {
- KernelController controller = KernelLocator.getKernel().getController();
- ControllerContext ctx = controller.getInstalledContext(beanName);
- return (T)ctx.getTarget();
- }
-}
16 years, 3 months
JBossWS SVN: r10768 - in spi/branches/ropalka/src/main/java/org/jboss/wsf/spi: http and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-09-24 09:02:25 -0400 (Thu, 24 Sep 2009)
New Revision: 10768
Added:
spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/ioc/
spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/ioc/IoCContainerProxy.java
spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/ioc/IoCContainerProxyFactory.java
Removed:
spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/util/KernelLocator.java
Modified:
spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/http/HttpServer.java
spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java
spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java
Log:
[JBWS-2772] removing AS IL dependency
Modified: spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/http/HttpServer.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/http/HttpServer.java 2009-09-24 08:54:39 UTC (rev 10767)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/http/HttpServer.java 2009-09-24 13:02:25 UTC (rev 10768)
@@ -33,9 +33,6 @@
*/
public interface HttpServer extends Extensible
{
- /** The default bean name */
- String BEAN_NAME = "WSHTTPServer";
-
/** Start an instance of this HTTP server */
void start();
Added: spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/ioc/IoCContainerProxy.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/ioc/IoCContainerProxy.java (rev 0)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/ioc/IoCContainerProxy.java 2009-09-24 13:02:25 UTC (rev 10768)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.spi.ioc;
+
+/**
+ * IoC container proxy.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public interface IoCContainerProxy
+{
+
+ /**
+ * Returns bean found in IoC registry.
+ *
+ * @param <T> bean type
+ * @param beanName bean name inside IoC registry
+ * @param clazz bean type class
+ * @return bean instance
+ * @throws IllegalArgumentException if bean is not found
+ */
+ <T> T getBean(String beanName, Class<T> clazz);
+
+}
Added: spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/ioc/IoCContainerProxyFactory.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/ioc/IoCContainerProxyFactory.java (rev 0)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/ioc/IoCContainerProxyFactory.java 2009-09-24 13:02:25 UTC (rev 10768)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.spi.ioc;
+
+import org.jboss.wsf.spi.SPIView;
+
+/**
+ * IoC container proxy factory.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public interface IoCContainerProxyFactory extends SPIView
+{
+
+ /**
+ * Returns IoC container proxy.
+ *
+ * @return IoC container proxy
+ */
+ IoCContainerProxy getContainer();
+
+}
Modified: spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java 2009-09-24 08:54:39 UTC (rev 10767)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/management/EndpointRegistry.java 2009-09-24 13:02:25 UTC (rev 10768)
@@ -37,9 +37,6 @@
*/
public interface EndpointRegistry
{
- /** The bean name in the kernel registry */
- String BEAN_NAME = "WSEndpointRegistry";
-
/** Get the list of registered endpoints */
Set<ObjectName> getEndpoints();
Modified: spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java 2009-09-24 08:54:39 UTC (rev 10767)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/management/ServerConfig.java 2009-09-24 13:02:25 UTC (rev 10768)
@@ -32,9 +32,6 @@
*/
public interface ServerConfig
{
- /** The default bean name */
- String BEAN_NAME = "WSServerConfig";
-
/** The host name that is returned if there is no other defined */
String UNDEFINED_HOSTNAME = "jbossws.undefined.host";
Deleted: spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/util/KernelLocator.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/util/KernelLocator.java 2009-09-24 08:54:39 UTC (rev 10767)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/util/KernelLocator.java 2009-09-24 13:02:25 UTC (rev 10768)
@@ -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.spi.util;
-
-import org.jboss.kernel.Kernel;
-
-/**
- * Locate the single instance of the kernel
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-May-2006
- */
-public class KernelLocator
-{
- private static Kernel kernel;
-
- public static Kernel getKernel()
- {
- return KernelLocator.kernel;
- }
-
- public void setKernel(Kernel kernel)
- {
- KernelLocator.kernel = kernel;
- }
-}
16 years, 3 months
JBossWS SVN: r10767 - container/jboss50/branches.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-09-24 04:54:39 -0400 (Thu, 24 Sep 2009)
New Revision: 10767
Added:
container/jboss50/branches/ropalka/
Log:
creating user branch
Copied: container/jboss50/branches/ropalka (from rev 10766, container/jboss50/branches/jbossws-jboss510)
16 years, 3 months