JBossWS SVN: r15411 - in container/jboss70/branches/jbossws-jboss701/src/main: java/org/jboss/as/webservices/config and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2011-12-16 09:46:01 -0500 (Fri, 16 Dec 2011)
New Revision: 15411
Removed:
container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/ioc/
container/jboss70/branches/jbossws-jboss701/src/main/resources/META-INF/services/org.jboss.wsf.spi.ioc.IoCContainerProxyFactory
Modified:
container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/config/ServerConfigFactoryImpl.java
container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/invocation/InvocationHandlerEJB3.java
container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/util/ASHelper.java
Log:
[JBWS-3393] removing all deprecated stuff
Modified: container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/config/ServerConfigFactoryImpl.java
===================================================================
--- container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/config/ServerConfigFactoryImpl.java 2011-12-16 14:45:50 UTC (rev 15410)
+++ container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/config/ServerConfigFactoryImpl.java 2011-12-16 14:46:01 UTC (rev 15411)
@@ -21,12 +21,9 @@
*/
package org.jboss.as.webservices.config;
+import static org.jboss.as.webservices.util.ASHelper.getMSCService;
+
import org.jboss.as.webservices.util.WSServices;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
-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;
@@ -37,25 +34,9 @@
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
public final class ServerConfigFactoryImpl extends ServerConfigFactory {
- /**
- * Constructor.
- */
- public ServerConfigFactoryImpl() {
- super();
- }
- /**
- * Returns config registered in MC kernel.
- *
- * @return config
- */
public ServerConfig getServerConfig() {
- final ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
- final SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider();
- final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class, cl);
- final IoCContainerProxy iocContainer = iocContainerFactory.getContainer();
-
- // TODO review IoCContainer spi to avoid conversion to/from String/Service
- return iocContainer.getBean(WSServices.CONFIG_SERVICE.getCanonicalName(), ServerConfig.class);
+ return getMSCService(WSServices.CONFIG_SERVICE, ServerConfig.class);
}
+
}
Modified: container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/invocation/InvocationHandlerEJB3.java
===================================================================
--- container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/invocation/InvocationHandlerEJB3.java 2011-12-16 14:45:50 UTC (rev 15410)
+++ container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/invocation/InvocationHandlerEJB3.java 2011-12-16 14:46:01 UTC (rev 15411)
@@ -36,13 +36,12 @@
import org.jboss.invocation.InterceptorContext;
import org.jboss.ws.common.injection.ThreadLocalAwareWebServiceContext;
import org.jboss.ws.common.invocation.AbstractInvocationHandler;
+import org.jboss.msc.service.ServiceName;
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.InvocationContext;
-import org.jboss.wsf.spi.ioc.IoCContainerProxy;
-import org.jboss.wsf.spi.ioc.IoCContainerProxyFactory;
/**
* Handles invocations on EJB3 endpoints.
@@ -53,9 +52,6 @@
/** EJB3 JNDI context. */
private static final String EJB3_JNDI_PREFIX = "java:env/";
- /** MC kernel controller. */
- private final IoCContainerProxy iocContainer;
-
/** EJB3 container name. */
private String ejbName;
@@ -63,15 +59,6 @@
private volatile ComponentViewInstance ejbComponentViewInstance;
/**
- * Constructor.
- */
- InvocationHandlerEJB3() {
- final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class);
- iocContainer = iocContainerFactory.getContainer();
- }
-
- /**
* Initializes EJB3 container name.
*
* @param endpoint web service endpoint
@@ -93,7 +80,7 @@
if (ejbComponentViewInstance == null) {
synchronized(this) {
if (ejbComponentViewInstance == null) {
- final ComponentView ejbView = iocContainer.getBean(ejbName, ComponentView.class);
+ final ComponentView ejbView = ASHelper.getMSCService(ServiceName.parse(ejbName), ComponentView.class);
if (ejbView == null) {
throw new WebServiceException("Cannot find ejb: " + ejbName);
}
@@ -150,12 +137,6 @@
throw new IllegalStateException();
}
- public Context getJNDIContext(final Endpoint ep) throws NamingException {
- return null; // TODO: implement
-// final EJBContainer ejb3Container = (EJBContainer) getComponentViewInstance();
-// return (Context) ejb3Container.getEnc().lookup(EJB3_JNDI_PREFIX);
- }
-
/**
* Injects webservice context on target bean.
*
Modified: container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/util/ASHelper.java
===================================================================
--- container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/util/ASHelper.java 2011-12-16 14:45:50 UTC (rev 15410)
+++ container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/util/ASHelper.java 2011-12-16 14:46:01 UTC (rev 15411)
@@ -43,6 +43,8 @@
import org.jboss.metadata.web.jboss.JBossServletMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.ServletMetaData;
+import org.jboss.msc.service.ServiceController;
+import org.jboss.msc.service.ServiceName;
import org.jboss.as.webservices.metadata.WebServiceDeclaration;
import org.jboss.as.webservices.metadata.WebServiceDeployment;
@@ -351,4 +353,10 @@
}
}
+ @SuppressWarnings("unchecked")
+ public static <T> T getMSCService(final ServiceName serviceName, final Class<T> clazz) {
+ ServiceController<T> service = (ServiceController<T>)WSServices.getContainerRegistry().getService(serviceName);
+ return service != null ? service.getValue() : null;
+ }
+
}
Deleted: container/jboss70/branches/jbossws-jboss701/src/main/resources/META-INF/services/org.jboss.wsf.spi.ioc.IoCContainerProxyFactory
===================================================================
--- container/jboss70/branches/jbossws-jboss701/src/main/resources/META-INF/services/org.jboss.wsf.spi.ioc.IoCContainerProxyFactory 2011-12-16 14:45:50 UTC (rev 15410)
+++ container/jboss70/branches/jbossws-jboss701/src/main/resources/META-INF/services/org.jboss.wsf.spi.ioc.IoCContainerProxyFactory 2011-12-16 14:46:01 UTC (rev 15411)
@@ -1 +0,0 @@
-org.jboss.as.webservices.ioc.IoCContainerProxyFactoryImpl
\ No newline at end of file
13 years
- 1
- 0
JBossWS SVN: r15410 - in container/jboss70/branches/jbossws-jboss702/src/main: java/org/jboss/as/webservices/config and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2011-12-16 09:45:50 -0500 (Fri, 16 Dec 2011)
New Revision: 15410
Removed:
container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/ioc/
container/jboss70/branches/jbossws-jboss702/src/main/resources/META-INF/services/org.jboss.wsf.spi.ioc.IoCContainerProxyFactory
Modified:
container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/config/ServerConfigFactoryImpl.java
container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/invocation/InvocationHandlerEJB3.java
container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/util/ASHelper.java
Log:
[JBWS-3393] removing all deprecated stuff
Modified: container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/config/ServerConfigFactoryImpl.java
===================================================================
--- container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/config/ServerConfigFactoryImpl.java 2011-12-16 14:37:44 UTC (rev 15409)
+++ container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/config/ServerConfigFactoryImpl.java 2011-12-16 14:45:50 UTC (rev 15410)
@@ -21,12 +21,9 @@
*/
package org.jboss.as.webservices.config;
+import static org.jboss.as.webservices.util.ASHelper.getMSCService;
+
import org.jboss.as.webservices.util.WSServices;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
-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;
@@ -37,25 +34,9 @@
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
public final class ServerConfigFactoryImpl extends ServerConfigFactory {
- /**
- * Constructor.
- */
- public ServerConfigFactoryImpl() {
- super();
- }
- /**
- * Returns config registered in MC kernel.
- *
- * @return config
- */
public ServerConfig getServerConfig() {
- final ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
- final SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider();
- final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class, cl);
- final IoCContainerProxy iocContainer = iocContainerFactory.getContainer();
-
- // TODO review IoCContainer spi to avoid conversion to/from String/Service
- return iocContainer.getBean(WSServices.CONFIG_SERVICE.getCanonicalName(), ServerConfig.class);
+ return getMSCService(WSServices.CONFIG_SERVICE, ServerConfig.class);
}
+
}
Modified: container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/invocation/InvocationHandlerEJB3.java
===================================================================
--- container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/invocation/InvocationHandlerEJB3.java 2011-12-16 14:37:44 UTC (rev 15409)
+++ container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/invocation/InvocationHandlerEJB3.java 2011-12-16 14:45:50 UTC (rev 15410)
@@ -36,13 +36,12 @@
import org.jboss.invocation.InterceptorContext;
import org.jboss.ws.common.injection.ThreadLocalAwareWebServiceContext;
import org.jboss.ws.common.invocation.AbstractInvocationHandler;
+import org.jboss.msc.service.ServiceName;
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.InvocationContext;
-import org.jboss.wsf.spi.ioc.IoCContainerProxy;
-import org.jboss.wsf.spi.ioc.IoCContainerProxyFactory;
/**
* Handles invocations on EJB3 endpoints.
@@ -53,9 +52,6 @@
/** EJB3 JNDI context. */
private static final String EJB3_JNDI_PREFIX = "java:env/";
- /** MC kernel controller. */
- private final IoCContainerProxy iocContainer;
-
/** EJB3 container name. */
private String ejbName;
@@ -63,15 +59,6 @@
private volatile ComponentViewInstance ejbComponentViewInstance;
/**
- * Constructor.
- */
- InvocationHandlerEJB3() {
- final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class);
- iocContainer = iocContainerFactory.getContainer();
- }
-
- /**
* Initializes EJB3 container name.
*
* @param endpoint web service endpoint
@@ -93,7 +80,7 @@
if (ejbComponentViewInstance == null) {
synchronized(this) {
if (ejbComponentViewInstance == null) {
- final ComponentView ejbView = iocContainer.getBean(ejbName, ComponentView.class);
+ final ComponentView ejbView = ASHelper.getMSCService(ServiceName.parse(ejbName), ComponentView.class);
if (ejbView == null) {
throw new WebServiceException("Cannot find ejb: " + ejbName);
}
@@ -150,12 +137,6 @@
throw new IllegalStateException();
}
- public Context getJNDIContext(final Endpoint ep) throws NamingException {
- return null; // TODO: implement
-// final EJBContainer ejb3Container = (EJBContainer) getComponentViewInstance();
-// return (Context) ejb3Container.getEnc().lookup(EJB3_JNDI_PREFIX);
- }
-
/**
* Injects webservice context on target bean.
*
Modified: container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/util/ASHelper.java
===================================================================
--- container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/util/ASHelper.java 2011-12-16 14:37:44 UTC (rev 15409)
+++ container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/util/ASHelper.java 2011-12-16 14:45:50 UTC (rev 15410)
@@ -43,6 +43,8 @@
import org.jboss.metadata.web.jboss.JBossServletMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.ServletMetaData;
+import org.jboss.msc.service.ServiceController;
+import org.jboss.msc.service.ServiceName;
import org.jboss.as.webservices.metadata.WebServiceDeclaration;
import org.jboss.as.webservices.metadata.WebServiceDeployment;
@@ -351,4 +353,10 @@
}
}
+ @SuppressWarnings("unchecked")
+ public static <T> T getMSCService(final ServiceName serviceName, final Class<T> clazz) {
+ ServiceController<T> service = (ServiceController<T>)WSServices.getContainerRegistry().getService(serviceName);
+ return service != null ? service.getValue() : null;
+ }
+
}
Deleted: container/jboss70/branches/jbossws-jboss702/src/main/resources/META-INF/services/org.jboss.wsf.spi.ioc.IoCContainerProxyFactory
===================================================================
--- container/jboss70/branches/jbossws-jboss702/src/main/resources/META-INF/services/org.jboss.wsf.spi.ioc.IoCContainerProxyFactory 2011-12-16 14:37:44 UTC (rev 15409)
+++ container/jboss70/branches/jbossws-jboss702/src/main/resources/META-INF/services/org.jboss.wsf.spi.ioc.IoCContainerProxyFactory 2011-12-16 14:45:50 UTC (rev 15410)
@@ -1 +0,0 @@
-org.jboss.as.webservices.ioc.IoCContainerProxyFactoryImpl
\ No newline at end of file
13 years
- 1
- 0
JBossWS SVN: r15409 - in container/jboss70/branches/jbossws-jboss700/src/main: java/org/jboss/as/webservices/config and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2011-12-16 09:37:44 -0500 (Fri, 16 Dec 2011)
New Revision: 15409
Removed:
container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/ioc/
container/jboss70/branches/jbossws-jboss700/src/main/resources/META-INF/services/org.jboss.wsf.spi.ioc.IoCContainerProxyFactory
Modified:
container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/config/ServerConfigFactoryImpl.java
container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/invocation/InvocationHandlerEJB3.java
container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/util/ASHelper.java
Log:
[JBWS-3393] removing all deprecated stuff
Modified: container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/config/ServerConfigFactoryImpl.java
===================================================================
--- container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/config/ServerConfigFactoryImpl.java 2011-12-16 14:33:27 UTC (rev 15408)
+++ container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/config/ServerConfigFactoryImpl.java 2011-12-16 14:37:44 UTC (rev 15409)
@@ -21,12 +21,9 @@
*/
package org.jboss.as.webservices.config;
+import static org.jboss.as.webservices.util.ASHelper.getMSCService;
+
import org.jboss.as.webservices.util.WSServices;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
-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;
@@ -37,25 +34,9 @@
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
public final class ServerConfigFactoryImpl extends ServerConfigFactory {
- /**
- * Constructor.
- */
- public ServerConfigFactoryImpl() {
- super();
- }
- /**
- * Returns config registered in MC kernel.
- *
- * @return config
- */
public ServerConfig getServerConfig() {
- final ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
- final SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider();
- final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class, cl);
- final IoCContainerProxy iocContainer = iocContainerFactory.getContainer();
-
- // TODO review IoCContainer spi to avoid conversion to/from String/Service
- return iocContainer.getBean(WSServices.CONFIG_SERVICE.getCanonicalName(), ServerConfig.class);
+ return getMSCService(WSServices.CONFIG_SERVICE, ServerConfig.class);
}
+
}
Modified: container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/invocation/InvocationHandlerEJB3.java
===================================================================
--- container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/invocation/InvocationHandlerEJB3.java 2011-12-16 14:33:27 UTC (rev 15408)
+++ container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/invocation/InvocationHandlerEJB3.java 2011-12-16 14:37:44 UTC (rev 15409)
@@ -36,13 +36,12 @@
import org.jboss.invocation.InterceptorContext;
import org.jboss.ws.common.injection.ThreadLocalAwareWebServiceContext;
import org.jboss.ws.common.invocation.AbstractInvocationHandler;
+import org.jboss.msc.service.ServiceName;
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.InvocationContext;
-import org.jboss.wsf.spi.ioc.IoCContainerProxy;
-import org.jboss.wsf.spi.ioc.IoCContainerProxyFactory;
/**
* Handles invocations on EJB3 endpoints.
@@ -53,9 +52,6 @@
/** EJB3 JNDI context. */
private static final String EJB3_JNDI_PREFIX = "java:env/";
- /** MC kernel controller. */
- private final IoCContainerProxy iocContainer;
-
/** EJB3 container name. */
private String ejbName;
@@ -63,15 +59,6 @@
private volatile ComponentViewInstance ejbComponentViewInstance;
/**
- * Constructor.
- */
- InvocationHandlerEJB3() {
- final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class);
- iocContainer = iocContainerFactory.getContainer();
- }
-
- /**
* Initializes EJB3 container name.
*
* @param endpoint web service endpoint
@@ -93,7 +80,7 @@
if (ejbComponentViewInstance == null) {
synchronized(this) {
if (ejbComponentViewInstance == null) {
- final ComponentView ejbView = iocContainer.getBean(ejbName, ComponentView.class);
+ final ComponentView ejbView = ASHelper.getMSCService(ServiceName.parse(ejbName), ComponentView.class);
if (ejbView == null) {
throw new WebServiceException("Cannot find ejb: " + ejbName);
}
@@ -150,12 +137,6 @@
throw new IllegalStateException();
}
- public Context getJNDIContext(final Endpoint ep) throws NamingException {
- return null; // TODO: implement
-// final EJBContainer ejb3Container = (EJBContainer) getComponentViewInstance();
-// return (Context) ejb3Container.getEnc().lookup(EJB3_JNDI_PREFIX);
- }
-
/**
* Injects webservice context on target bean.
*
Modified: container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/util/ASHelper.java
===================================================================
--- container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/util/ASHelper.java 2011-12-16 14:33:27 UTC (rev 15408)
+++ container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/util/ASHelper.java 2011-12-16 14:37:44 UTC (rev 15409)
@@ -43,6 +43,8 @@
import org.jboss.metadata.web.jboss.JBossServletMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.ServletMetaData;
+import org.jboss.msc.service.ServiceController;
+import org.jboss.msc.service.ServiceName;
import org.jboss.as.webservices.metadata.WebServiceDeclaration;
import org.jboss.as.webservices.metadata.WebServiceDeployment;
@@ -351,4 +353,10 @@
}
}
+ @SuppressWarnings("unchecked")
+ public static <T> T getMSCService(final ServiceName serviceName, final Class<T> clazz) {
+ ServiceController<T> service = (ServiceController<T>)WSServices.getContainerRegistry().getService(serviceName);
+ return service != null ? service.getValue() : null;
+ }
+
}
Deleted: container/jboss70/branches/jbossws-jboss700/src/main/resources/META-INF/services/org.jboss.wsf.spi.ioc.IoCContainerProxyFactory
===================================================================
--- container/jboss70/branches/jbossws-jboss700/src/main/resources/META-INF/services/org.jboss.wsf.spi.ioc.IoCContainerProxyFactory 2011-12-16 14:33:27 UTC (rev 15408)
+++ container/jboss70/branches/jbossws-jboss700/src/main/resources/META-INF/services/org.jboss.wsf.spi.ioc.IoCContainerProxyFactory 2011-12-16 14:37:44 UTC (rev 15409)
@@ -1 +0,0 @@
-org.jboss.as.webservices.ioc.IoCContainerProxyFactoryImpl
\ No newline at end of file
13 years
- 1
- 0
JBossWS SVN: r15408 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2011-12-16 09:33:27 -0500 (Fri, 16 Dec 2011)
New Revision: 15408
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java
Log:
[JBWS-3393] removing all deprecated stuff
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2011-12-16 14:30:35 UTC (rev 15407)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/ServletHelper.java 2011-12-16 14:33:27 UTC (rev 15408)
@@ -28,7 +28,6 @@
import java.util.ResourceBundle;
import javax.management.ObjectName;
-import javax.naming.Context;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
@@ -58,7 +57,6 @@
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.management.EndpointRegistry;
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
-import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData;
import org.jboss.wsf.stack.cxf.management.InstrumentationManagerExtImpl;
/**
@@ -124,8 +122,6 @@
endpoint.getInstanceProvider().getInstance(endpoint.getTargetBeanName());
if (factory != null)
{
- InjectionsMetaData metadata = endpoint.getAttachment(InjectionsMetaData.class);
- Context jndiContext = endpoint.getJNDIContext();
List<Handler> chain = ((JaxWsEndpointImpl) factory.getServer().getEndpoint()).getJaxwsBinding()
.getHandlerChain();
if (chain != null)
@@ -135,7 +131,6 @@
final Reference handlerReference = endpoint.getInstanceProvider().getInstance(handler.getClass().getName());
if (!handlerReference.isInitialized()) {
final Object handlerInstance = handlerReference.getValue();
- InjectionHelper.injectResources(handlerInstance, metadata, jndiContext);
InjectionHelper.callPostConstructMethod(handlerInstance);
handlerReference.setInitialized();
}
13 years
- 1
- 0
JBossWS SVN: r15407 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2011-12-16 09:30:35 -0500 (Fri, 16 Dec 2011)
New Revision: 15407
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
Log:
[JBWS-3393] removing all deprecated stuff
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2011-12-16 14:26:13 UTC (rev 15406)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2011-12-16 14:30:35 UTC (rev 15407)
@@ -29,7 +29,6 @@
import java.util.ResourceBundle;
import java.util.Set;
-import javax.naming.Context;
import javax.xml.namespace.QName;
import javax.xml.ws.handler.Handler;
import javax.xml.ws.handler.HandlerResolver;
@@ -47,12 +46,10 @@
import org.jboss.ws.metadata.umdm.EndpointConfigMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS;
-import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Reference;
import org.jboss.wsf.spi.invocation.EndpointAssociation;
-import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
/**
@@ -140,7 +137,7 @@
ClassLoader classLoader = serviceMetaData.getUnifiedMetaData().getClassLoader();
for (HandlerMetaData handlerMetaData : serviceMetaData.getHandlerMetaData())
- addHandler(classLoader, HandlerType.ENDPOINT, handlerMetaData, null);
+ addHandler(classLoader, HandlerType.ENDPOINT, handlerMetaData);
}
public void initHandlerChain(EndpointConfigMetaData epConfigMetaData, HandlerType type, boolean clearExistingHandlers)
@@ -154,12 +151,11 @@
handlerMap.clear();
ClassLoader classLoader = epConfigMetaData.getEndpointMetaData().getClassLoader();
- InjectionsMetaData injectionsMD = getInjectionsMetaData(epConfigMetaData);
for (HandlerMetaData handlerMetaData : epConfigMetaData.getHandlerMetaData(type))
- addHandler(classLoader, type, handlerMetaData, injectionsMD);
+ addHandler(classLoader, type, handlerMetaData);
}
- private void addHandler(ClassLoader classLoader, HandlerType type, HandlerMetaData handlerMetaData, InjectionsMetaData injections)
+ private void addHandler(ClassLoader classLoader, HandlerType type, HandlerMetaData handlerMetaData)
{
HandlerMetaDataJAXWS jaxwsMetaData = (HandlerMetaDataJAXWS)handlerMetaData;
String handlerName = jaxwsMetaData.getHandlerName();
@@ -169,7 +165,7 @@
try
{
// Load the handler class using the deployments top level CL
- Handler<?> handler = getInstance(classLoader, className, injections);
+ Handler<?> handler = getInstance(classLoader, className);
if (handler instanceof GenericHandler)
((GenericHandler)handler).setHandlerName(handlerName);
@@ -189,7 +185,7 @@
}
}
- private Handler<?> getInstance(final ClassLoader fallbackLoader, final String className, InjectionsMetaData injections) throws Exception
+ private Handler<?> getInstance(final ClassLoader fallbackLoader, final String className) throws Exception
{
final Endpoint ep = EndpointAssociation.getEndpoint();
final Handler<?> handler;
@@ -199,8 +195,6 @@
handler = (Handler<?>)handlerReference.getValue();
if (!handlerReference.isInitialized())
{
- Context ctx = ep.getJNDIContext();
- InjectionHelper.injectResources(handler, injections, ctx);
InjectionHelper.callPostConstructMethod(handler);
handlerReference.setInitialized();
}
@@ -315,17 +309,4 @@
}
}
- private InjectionsMetaData getInjectionsMetaData(EndpointConfigMetaData endpointConfigMD)
- {
- if (endpointConfigMD.getEndpointMetaData() instanceof ServerEndpointMetaData)
- {
- ServerEndpointMetaData endpointMD = ((ServerEndpointMetaData)endpointConfigMD.getEndpointMetaData());
- return endpointMD.getEndpoint().getAttachment(InjectionsMetaData.class);
- }
- else
- {
- return null;
- }
- }
-
}
13 years
- 1
- 0
JBossWS SVN: r15406 - in common/trunk/src/main/java/org/jboss/ws/common: injection and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2011-12-16 09:26:13 -0500 (Fri, 16 Dec 2011)
New Revision: 15406
Added:
common/trunk/src/main/java/org/jboss/ws/common/injection/ReferenceResolver.java
Removed:
common/trunk/src/main/java/org/jboss/ws/common/injection/finders/EJBFieldFinder.java
common/trunk/src/main/java/org/jboss/ws/common/injection/finders/EJBMethodFinder.java
common/trunk/src/main/java/org/jboss/ws/common/injection/finders/InjectionFieldFinder.java
common/trunk/src/main/java/org/jboss/ws/common/injection/finders/InjectionMethodFinder.java
Modified:
common/trunk/src/main/java/org/jboss/ws/common/deployment/ArchiveDeploymentImpl.java
common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultHttpEndpoint.java
common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultJMSEndpoint.java
common/trunk/src/main/java/org/jboss/ws/common/injection/InjectionHelper.java
common/trunk/src/main/java/org/jboss/ws/common/injection/resolvers/AbstractReferenceResolver.java
common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHandlerJAXWS.java
common/trunk/src/main/java/org/jboss/ws/common/management/DefaultEndpointRegistryFactory.java
common/trunk/src/main/java/org/jboss/ws/common/management/Message.properties
Log:
[JBWS-3393] removing all deprecated stuff
Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/ArchiveDeploymentImpl.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/ArchiveDeploymentImpl.java 2011-12-16 14:22:47 UTC (rev 15405)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/ArchiveDeploymentImpl.java 2011-12-16 14:26:13 UTC (rev 15406)
@@ -21,8 +21,6 @@
*/
package org.jboss.ws.common.deployment;
-import java.io.IOException;
-import java.net.URL;
import java.util.List;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
@@ -77,12 +75,6 @@
return name;
}
- @Deprecated
- public URL getMetaDataFileURL(String resourcePath) throws IOException
- {
- return getResourceResolver().resolve(resourcePath);
- }
-
public List<UnifiedVirtualFile> getMetadataFiles()
{
return metadataFiles;
Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultHttpEndpoint.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultHttpEndpoint.java 2011-12-16 14:22:47 UTC (rev 15405)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultHttpEndpoint.java 2011-12-16 14:26:13 UTC (rev 15406)
@@ -21,9 +21,6 @@
*/
package org.jboss.ws.common.deployment;
-import javax.naming.Context;
-import javax.naming.NamingException;
-
import org.jboss.wsf.spi.deployment.HttpEndpoint;
import org.jboss.wsf.spi.management.EndpointMetrics;
@@ -64,20 +61,4 @@
this.urlPattern = urlPattern;
}
- public Context getJNDIContext()
- {
- Context retVal = null;
-
- try
- {
- retVal = getInvocationHandler().getJNDIContext(this);
- }
- catch (NamingException e)
- {
- // JNDI not available neither in JSE environment nor in SAR archives
- }
-
- return retVal;
- }
-
}
Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultJMSEndpoint.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultJMSEndpoint.java 2011-12-16 14:22:47 UTC (rev 15405)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultJMSEndpoint.java 2011-12-16 14:26:13 UTC (rev 15406)
@@ -96,11 +96,6 @@
{
return null;
}
- @Override
- public Context getJNDIContext()
- {
- return null;
- }
@Override
public void setEndpointMetrics(EndpointMetrics metrics)
Modified: common/trunk/src/main/java/org/jboss/ws/common/injection/InjectionHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/injection/InjectionHelper.java 2011-12-16 14:22:47 UTC (rev 15405)
+++ common/trunk/src/main/java/org/jboss/ws/common/injection/InjectionHelper.java 2011-12-16 14:26:13 UTC (rev 15406)
@@ -26,26 +26,15 @@
import java.util.Collection;
import java.util.ResourceBundle;
-import javax.annotation.Resource;
-import javax.ejb.EJB;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
import javax.xml.ws.WebServiceContext;
import org.jboss.logging.Logger;
import org.jboss.ws.api.util.BundleUtils;
-import org.jboss.ws.common.injection.finders.EJBFieldFinder;
-import org.jboss.ws.common.injection.finders.EJBMethodFinder;
-import org.jboss.ws.common.injection.finders.InjectionFieldFinder;
-import org.jboss.ws.common.injection.finders.InjectionMethodFinder;
import org.jboss.ws.common.injection.finders.PostConstructMethodFinder;
import org.jboss.ws.common.injection.finders.PreDestroyMethodFinder;
import org.jboss.ws.common.injection.finders.ResourceFieldFinder;
import org.jboss.ws.common.injection.finders.ResourceMethodFinder;
import org.jboss.ws.common.reflection.ClassProcessor;
-import org.jboss.wsf.spi.metadata.injection.InjectionMetaData;
-import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData;
/**
* An injection helper class for <b>javax.*</b> annotations.
@@ -60,10 +49,6 @@
private static final ClassProcessor<Method> POST_CONSTRUCT_METHOD_FINDER = new PostConstructMethodFinder();
private static final ClassProcessor<Method> PRE_DESTROY_METHOD_FINDER = new PreDestroyMethodFinder();
- private static final ClassProcessor<Method> RESOURCE_METHOD_FINDER = new ResourceMethodFinder(WebServiceContext.class, false);
- private static final ClassProcessor<Field> RESOURCE_FIELD_FINDER = new ResourceFieldFinder(WebServiceContext.class, false);
- private static final ClassProcessor<Method> EJB_METHOD_FINDER = new EJBMethodFinder();
- private static final ClassProcessor<Field> EJB_FIELD_FINDER = new EJBFieldFinder();
private static final ClassProcessor<Method> WEB_SERVICE_CONTEXT_METHOD_FINDER = new ResourceMethodFinder(WebServiceContext.class, true);
private static final ClassProcessor<Field> WEB_SERVICE_CONTEXT_FIELD_FINDER = new ResourceFieldFinder(WebServiceContext.class, true);
@@ -76,47 +61,6 @@
}
/**
- * The resource annotations mark resources that are needed by the application. These annotations may be applied
- * to an application component class, or to fields or methods of the component class. When the annotation is
- * applied to a field or method, the container will inject an instance of the requested resource into the
- * application component when the component is initialized. If the annotation is applied to the component class,
- * the annotation declares a resource that the application will look up at runtime.
- *
- * This method handles the following injection types:
- * <ul>
- * <li>Descriptor specified injections</li>
- * <li>@Resource annotated methods and fields</li>
- * <li>@EJB annotated methods and fields</li>
- * </ul>
- *
- * @param instance to inject resources on
- * @param injections injection metadata
- * @see org.jboss.wsf.spi.metadata.injection.InjectionsMetaData
- * @see javax.annotation.Resource
- * @see javax.ejb.EJB
- */
- public static void injectResources(final Object instance, final InjectionsMetaData injections, final Context ctx)
- {
- if (instance == null)
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "OBJECT_INSTANCE_CANNOT_BE_NULL"));
-
- if (injections == null)
- return;
-
- if (ctx == null)
- return;
-
- // inject descriptor driven annotations
- injectDescriptorAnnotatedAccessibleObjects(instance, injections, ctx);
-
- // inject @Resource annotated methods and fields
- injectResourceAnnotatedAccessibleObjects(instance, injections, ctx);
-
- // inject @EJB annotated methods and fields
- injectEJBAnnotatedAccessibleObjects(instance, injections);
- }
-
- /**
* Injects @Resource annotated accessible objects referencing WebServiceContext.
*
* @param instance to operate on
@@ -220,205 +164,6 @@
}
/**
- * Performs descriptor driven injections.
- *
- * @param instance to operate on
- * @param injections injections metadata
- * @param ctx JNDI context
- */
- private static void injectDescriptorAnnotatedAccessibleObjects(final Object instance, final InjectionsMetaData injections, final Context ctx)
- {
- final Collection<InjectionMetaData> injectionMDs = injections.getInjectionsMetaData(instance.getClass());
-
- for (InjectionMetaData injectionMD : injectionMDs)
- {
-
- final Method method = getMethod(injectionMD, instance.getClass());
- if (method != null)
- {
- try
- {
- inject(instance, method, injectionMD.getEnvEntryName(), ctx);
- }
- catch (Exception e)
- {
- final String message = "Cannot inject method (descriptor driven injection): " + injectionMD;
- InjectionException.rethrow(message, e);
- }
- }
- else
- {
- final Field field = getField(injectionMD, instance.getClass());
- if (field != null)
- {
- try
- {
- inject(instance, field, injectionMD.getEnvEntryName(), ctx);
- }
- catch (Exception e)
- {
- final String message = "Cannot inject field (descriptor driven injection): " + injectionMD;
- InjectionException.rethrow(message, e);
- }
- }
- else
- {
- final String message = "Cannot find injection target for: " + injectionMD;
- throw new InjectionException(message);
- }
- }
- }
- }
-
- /**
- * Injects @Resource annotated accessible objects.
- *
- * @param instance to operate on
- * @param injections injections meta data
- * @param ctx JNDI context
- * @see org.jboss.ws.common.injection.finders.ResourceFieldFinder
- * @see org.jboss.ws.common.injection.finders.ResourceMethodFinder
- * @see javax.annotation.Resource
- */
- private static void injectResourceAnnotatedAccessibleObjects(final Object instance, final InjectionsMetaData injections, final Context ctx)
- {
- final Collection<Field> resourceAnnotatedFields = RESOURCE_FIELD_FINDER.process(instance.getClass());
- final Collection<Method> resourceAnnotatedMethods = RESOURCE_METHOD_FINDER.process(instance.getClass());
-
- // Inject @Resource annotated fields
- for (Field field : resourceAnnotatedFields)
- {
- try
- {
- final String jndiName = injections.getResolver(Resource.class).resolve(field);
- inject(instance, field, jndiName, ctx);
- }
- catch (Exception e)
- {
- final String message = "Cannot inject field annotated with @Resource annotation: " + field;
- InjectionException.rethrow(message, e);
- }
- }
-
- // Inject @Resource annotated methods
- for(Method method : resourceAnnotatedMethods)
- {
- try
- {
- final String jndiName = injections.getResolver(Resource.class).resolve(method);
- inject(instance, method, jndiName, ctx);
- }
- catch (Exception e)
- {
- final String message = "Cannot inject method annotated with @Resource annotation: " + method;
- InjectionException.rethrow(message, e);
- }
- }
- }
-
- /**
- * Injects @EJB annotated accessible objects.
- *
- * @param instance to operate on
- * @param injections injections meta data
- * @param ctx JNDI context
- * @see org.jboss.ws.common.injection.finders.EJBFieldFinder
- * @see org.jboss.ws.common.injection.finders.EJBMethodFinder
- * @see javax.ejb.EJB
- */
- private static void injectEJBAnnotatedAccessibleObjects(final Object instance, final InjectionsMetaData injections)
- {
- final Collection<Field> ejbAnnotatedFields = EJB_FIELD_FINDER.process(instance.getClass());
- final Collection<Method> ejbAnnotatedMethods = EJB_METHOD_FINDER.process(instance.getClass());
- final Context ctx = InjectionHelper.getDefaultContext();
-
- // Inject @EJB annotated fields
- for (Field field : ejbAnnotatedFields)
- {
- try
- {
- final String jndiName = injections.getResolver(EJB.class).resolve(field);
- inject(instance, field, jndiName, ctx);
- }
- catch (Exception e)
- {
- final String message = "Cannot inject field annotated with @EJB annotation: " + field;
- InjectionException.rethrow(message, e);
- }
- }
-
- // Inject @EJB annotated methods
- for(Method method : ejbAnnotatedMethods)
- {
- try
- {
- final String jndiName = injections.getResolver(EJB.class).resolve(method);
- inject(instance, method, jndiName, ctx);
- }
- catch (Exception e)
- {
- final String message = "Cannot inject method annotated with @EJB annotation: " + method;
- InjectionException.rethrow(message, e);
- }
- }
- }
-
- /**
- * Injects method.
- *
- * @param instance to invoke method on
- * @param method to invoke
- * @param resourceName resource name
- * @param cxt JNDI context
- */
- private static void inject(final Object instance, final Method method, final String jndiName, final Context ctx)
- {
- final Object value = lookup(jndiName, ctx);
- if (LOG.isTraceEnabled())
- LOG.trace("Injecting method: " + method);
- invokeMethod(instance, method, new Object[] {value});
- }
-
- /**
- * Injects field.
- *
- * @param field to set
- * @param instance to modify field on
- * @param resourceName resource name
- * @param cxt JNDI context
- */
- private static void inject(final Object instance, final Field field, final String jndiName, final Context ctx)
- {
- final Object value = lookup(jndiName, ctx);
- if (LOG.isTraceEnabled())
- LOG.trace("Injecting field: " + field);
- setField(instance, field, value);
- }
-
- /**
- * Lookups object in JNDI namespace.
- *
- * @param jndiName jndi name
- * @param ctx context to use
- * @return Object if found
- */
- private static Object lookup(final String jndiName, final Context ctx)
- {
- Object value = null;
- try
- {
- value = ctx.lookup(jndiName);
- }
- catch (NamingException ne)
- {
- final String message = "Resource '" + jndiName + "' not found";
- InjectionException.rethrow(message, ne);
- }
-
- return value;
- }
-
- /**
* Invokes method on object with specified arguments.
*
* @param instance to invoke method on
@@ -470,56 +215,4 @@
}
}
- /**
- * Returns method that matches the descriptor injection metadata or null if not found.
- *
- * @param injectionMD descriptor injection metadata
- * @param clazz to process
- * @return method that matches the criteria or null if not found
- * @see org.jboss.ws.common.injection.finders.InjectionMethodFinder
- */
- private static Method getMethod(final InjectionMetaData injectionMD, final Class<?> clazz)
- {
- final Collection<Method> result = new InjectionMethodFinder(injectionMD).process(clazz);
-
- return result.isEmpty() ? null : result.iterator().next();
- }
-
- /**
- * Returns field that matches the descriptor injection metadata or null if not found.
- *
- * @param injectionMD descriptor injection metadata
- * @param clazz to process
- * @return field that matches the criteria or null if not found
- * @see org.jboss.ws.common.injection.finders.InjectionFieldFinder
- */
- private static Field getField(final InjectionMetaData injectionMD, final Class<?> clazz)
- {
- final Collection<Field> result = new InjectionFieldFinder(injectionMD).process(clazz);
-
- return result.isEmpty() ? null : result.iterator().next();
- }
-
- /**
- * Returns default JNDI context.
- *
- * @return default JNDI context
- */
- private static Context getDefaultContext()
- {
- Context ctx = null;
-
- try
- {
- ctx = new InitialContext();
- }
- catch (NamingException ne)
- {
- final String message = "Cannot create default JNDI context";
- InjectionException.rethrow(message, ne);
- }
-
- return ctx;
- }
-
}
Added: common/trunk/src/main/java/org/jboss/ws/common/injection/ReferenceResolver.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/injection/ReferenceResolver.java (rev 0)
+++ common/trunk/src/main/java/org/jboss/ws/common/injection/ReferenceResolver.java 2011-12-16 14:26:13 UTC (rev 15406)
@@ -0,0 +1,50 @@
+/*
+ * 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.ws.common.injection;
+
+import java.lang.reflect.AccessibleObject;
+
+/**
+ * JNDI reference resolver.
+ *
+ * @author <a href="mailto:richard.opalka@jboss.org">Richard Opalka</a>
+ */
+public interface ReferenceResolver
+{
+
+ /**
+ * Resolves JNDI name.
+ *
+ * @param accessibleObject object
+ * @return JNDI name.
+ */
+ String resolve(AccessibleObject accessibleObject);
+
+ /**
+ * Returns <b>true</b> if can resolve, <b>false</b> otherwise.
+ *
+ * @param accessibleObject object
+ * @return true if can resolve, false otherwise
+ */
+ boolean canResolve(AccessibleObject accessibleObject);
+
+}
Deleted: common/trunk/src/main/java/org/jboss/ws/common/injection/finders/EJBFieldFinder.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/injection/finders/EJBFieldFinder.java 2011-12-16 14:22:47 UTC (rev 15405)
+++ common/trunk/src/main/java/org/jboss/ws/common/injection/finders/EJBFieldFinder.java 2011-12-16 14:26:13 UTC (rev 15406)
@@ -1,60 +0,0 @@
-/*
- * 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.ws.common.injection.finders;
-
-import java.lang.reflect.Field;
-
-import javax.ejb.EJB;
-
-import org.jboss.ws.common.reflection.AnnotatedFieldFinder;
-
-/**
- * Field based EJB injection.
- *
- * @author <a href="mailto:richard.opalka@jboss.org">Richard Opalka</a>
- */
-public final class EJBFieldFinder
-extends AnnotatedFieldFinder<EJB>
-{
-
- /**
- * Constructor.
- */
- public EJBFieldFinder()
- {
- super(EJB.class);
- }
-
- @Override
- public void validate(Field field)
- {
- super.validate(field);
-
- // Ensure all method preconditions
- Class<EJB> annotation = getAnnotation();
- ReflectionUtils.assertNotVoidType(field, annotation);
- ReflectionUtils.assertNotStatic(field, annotation);
- ReflectionUtils.assertNotFinal(field, annotation);
- ReflectionUtils.assertNotPrimitiveType(field, annotation);
- }
-
-}
Deleted: common/trunk/src/main/java/org/jboss/ws/common/injection/finders/EJBMethodFinder.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/injection/finders/EJBMethodFinder.java 2011-12-16 14:22:47 UTC (rev 15405)
+++ common/trunk/src/main/java/org/jboss/ws/common/injection/finders/EJBMethodFinder.java 2011-12-16 14:26:13 UTC (rev 15406)
@@ -1,62 +0,0 @@
-/*
- * 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.ws.common.injection.finders;
-
-import java.lang.reflect.Method;
-
-import javax.ejb.EJB;
-
-import org.jboss.ws.common.reflection.AnnotatedMethodFinder;
-
-/**
- * Setter based EJB injection.
- *
- * @author <a href="mailto:richard.opalka@jboss.org">Richard Opalka</a>
- */
-public final class EJBMethodFinder
-extends AnnotatedMethodFinder<EJB>
-{
-
- /**
- * Constructor.
- */
- public EJBMethodFinder()
- {
- super(EJB.class);
- }
-
- @Override
- public void validate(Method method)
- {
- super.validate(method);
-
- // Ensure all method preconditions
- Class<EJB> annotation = getAnnotation();
- ReflectionUtils.assertVoidReturnType(method, annotation);
- ReflectionUtils.assertOneParameter(method, annotation);
- ReflectionUtils.assertNoPrimitiveParameters(method, annotation);
- ReflectionUtils.assertValidSetterName(method, annotation);
- ReflectionUtils.assertNoCheckedExceptionsAreThrown(method, annotation);
- ReflectionUtils.assertNotStatic(method, annotation);
- }
-
-}
Deleted: common/trunk/src/main/java/org/jboss/ws/common/injection/finders/InjectionFieldFinder.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/injection/finders/InjectionFieldFinder.java 2011-12-16 14:22:47 UTC (rev 15405)
+++ common/trunk/src/main/java/org/jboss/ws/common/injection/finders/InjectionFieldFinder.java 2011-12-16 14:26:13 UTC (rev 15406)
@@ -1,104 +0,0 @@
-/*
- * 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.ws.common.injection.finders;
-
-import java.lang.reflect.Field;
-import java.util.Collection;
-import java.util.ResourceBundle;
-
-import org.jboss.ws.api.util.BundleUtils;
-import org.jboss.ws.common.injection.InjectionException;
-import org.jboss.ws.common.reflection.FieldFinder;
-import org.jboss.wsf.spi.metadata.injection.InjectionMetaData;
-
-/**
- * Lookups field that matches descriptor specified injection metadata.
- *
- * @author <a href="mailto:richard.opalka@jboss.org">Richard Opalka</a>
- */
-public final class InjectionFieldFinder
-extends FieldFinder
-{
- private static final ResourceBundle bundle = BundleUtils.getBundle(InjectionFieldFinder.class);
-
- /**
- * Descriptor injection metadata.
- */
- private final InjectionMetaData injectionMD;
-
- /**
- * Constructor.
- *
- * @param injectionMD descriptor injection metadata
- */
- public InjectionFieldFinder(final InjectionMetaData injectionMD)
- {
- if (injectionMD == null)
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "INJECTION_METADATA_CANNOT_BE_NULL"));
-
- this.injectionMD = injectionMD;
- }
-
- @Override
- public boolean matches(final Field field)
- {
- if (field.getName().equals(injectionMD.getTargetName()))
- {
- if (injectionMD.getValueClass() != null)
- {
- final Class<?> expectedClass = injectionMD.getValueClass();
- final Class<?> fieldClass = field.getType();
-
- return expectedClass.equals(fieldClass);
- }
- else
- {
- return true;
- }
- }
-
- return false;
- }
-
- @Override
- public void validate(final Collection<Field> fields)
- {
- super.validate(fields);
-
- if (fields.size() > 2)
- {
- throw new InjectionException(BundleUtils.getMessage(bundle, "MORE_THAN_ONE_FIELD_FOUND_MATCHING_THE_CRITERIA", injectionMD));
- }
- }
-
- @Override
- public void validate(final Field field)
- {
- super.validate(field);
-
- ReflectionUtils.assertNotVoidType(field);
- ReflectionUtils.assertNotStatic(field);
- ReflectionUtils.assertNotFinal(field);
- ReflectionUtils.assertNotPrimitiveType(field);
- }
-
-}
Deleted: common/trunk/src/main/java/org/jboss/ws/common/injection/finders/InjectionMethodFinder.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/injection/finders/InjectionMethodFinder.java 2011-12-16 14:22:47 UTC (rev 15405)
+++ common/trunk/src/main/java/org/jboss/ws/common/injection/finders/InjectionMethodFinder.java 2011-12-16 14:26:13 UTC (rev 15406)
@@ -1,114 +0,0 @@
-/*
- * 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.ws.common.injection.finders;
-
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.ResourceBundle;
-
-import org.jboss.ws.api.util.BundleUtils;
-import org.jboss.ws.common.injection.InjectionException;
-import org.jboss.ws.common.reflection.MethodFinder;
-import org.jboss.wsf.spi.metadata.injection.InjectionMetaData;
-
-/**
- * Lookups method that matches descriptor specified injection metadata.
- *
- * @author <a href="mailto:richard.opalka@jboss.org">Richard Opalka</a>
- */
-public final class InjectionMethodFinder
-extends MethodFinder
-{
- private static final ResourceBundle bundle = BundleUtils.getBundle(InjectionMethodFinder.class);
-
- /**
- * Descriptor injection metadata.
- */
- private final InjectionMetaData injectionMD;
-
- /**
- * Constructor.
- *
- * @param injectionMD descriptor injection metadata
- */
- public InjectionMethodFinder(final InjectionMetaData injectionMD)
- {
- if (injectionMD == null)
- throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "INJECTION_METADATA_CANNOT_BE_NULL"));
-
- this.injectionMD = injectionMD;
- }
-
- @Override
- public boolean matches(final Method method)
- {
- final String targetName = injectionMD.getTargetName();
- final String methodName = "set" + targetName.substring(0, 1).toUpperCase() + targetName.substring(1);
- if (method.getName().equals(methodName))
- {
- if (injectionMD.getValueClass() != null)
- {
- if (method.getParameterTypes().length == 1)
- {
- final Class<?> expectedClass = injectionMD.getValueClass();
- final Class<?> parameterClass = method.getParameterTypes()[0];
-
- return expectedClass.equals(parameterClass);
- }
- }
- else
- {
- if (method.getParameterTypes().length == 1)
- {
- return true;
- }
- }
- }
-
- return false;
- }
-
- @Override
- public void validate(final Collection<Method> methods)
- {
- super.validate(methods);
-
- if (methods.size() > 2)
- {
- throw new InjectionException(BundleUtils.getMessage(bundle, "MORE_THAN_ONE_METHOD_FOUND_MATCHING_THE_CRITERIA", injectionMD));
- }
- }
-
- @Override
- public void validate(final Method method)
- {
- super.validate(method);
-
- ReflectionUtils.assertVoidReturnType(method);
- ReflectionUtils.assertOneParameter(method);
- ReflectionUtils.assertNoPrimitiveParameters(method);
- ReflectionUtils.assertValidSetterName(method);
- ReflectionUtils.assertNoCheckedExceptionsAreThrown(method);
- ReflectionUtils.assertNotStatic(method);
- }
-
-}
Modified: common/trunk/src/main/java/org/jboss/ws/common/injection/resolvers/AbstractReferenceResolver.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/injection/resolvers/AbstractReferenceResolver.java 2011-12-16 14:22:47 UTC (rev 15405)
+++ common/trunk/src/main/java/org/jboss/ws/common/injection/resolvers/AbstractReferenceResolver.java 2011-12-16 14:26:13 UTC (rev 15406)
@@ -28,7 +28,7 @@
import java.util.ResourceBundle;
import org.jboss.ws.api.util.BundleUtils;
-import org.jboss.wsf.spi.metadata.injection.ReferenceResolver;
+import org.jboss.ws.common.injection.ReferenceResolver;
/**
* This class adds support for notion of annotated fields and methods.
Modified: common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHandlerJAXWS.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHandlerJAXWS.java 2011-12-16 14:22:47 UTC (rev 15405)
+++ common/trunk/src/main/java/org/jboss/ws/common/invocation/InvocationHandlerJAXWS.java 2011-12-16 14:26:13 UTC (rev 15406)
@@ -30,7 +30,6 @@
import org.jboss.wsf.spi.deployment.Reference;
import org.jboss.wsf.spi.invocation.Invocation;
import org.jboss.wsf.spi.invocation.InvocationContext;
-import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData;
/**
* Handles invocations on JAXWS endpoints.
@@ -42,14 +41,6 @@
{
/**
- * Constructor.
- */
- public InvocationHandlerJAXWS()
- {
- super();
- }
-
- /**
* Injects resources on target bean and calls post construct method.
* Finally it registers target bean for predestroy phase.
*
@@ -59,7 +50,6 @@
@Override
public void onEndpointInstantiated(final Endpoint endpoint, final Invocation invocation)
{
- final InjectionsMetaData injectionsMD = endpoint.getAttachment(InjectionsMetaData.class);
final Object _targetBean = this.getTargetBean(invocation);
// TODO: refactor injection to AS IL
final Reference reference = endpoint.getInstanceProvider().getInstance(_targetBean.getClass().getName());
@@ -69,9 +59,6 @@
if (!reference.isInitialized())
{
- this.log.debug("Injecting resources on JAXWS JSE endpoint: " + targetBean);
- InjectionHelper.injectResources(targetBean, injectionsMD, endpoint.getJNDIContext());
-
this.log.debug("Calling postConstruct method on JAXWS JSE endpoint: " + targetBean);
InjectionHelper.callPostConstructMethod(targetBean);
reference.setInitialized();
Modified: common/trunk/src/main/java/org/jboss/ws/common/management/DefaultEndpointRegistryFactory.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/management/DefaultEndpointRegistryFactory.java 2011-12-16 14:22:47 UTC (rev 15405)
+++ common/trunk/src/main/java/org/jboss/ws/common/management/DefaultEndpointRegistryFactory.java 2011-12-16 14:26:13 UTC (rev 15406)
@@ -21,15 +21,6 @@
*/
package org.jboss.ws.common.management;
-import org.jboss.logging.Logger;
-import java.util.ResourceBundle;
-import org.jboss.ws.api.util.BundleUtils;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.WSFException;
-import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
-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;
@@ -41,59 +32,12 @@
*/
public final class DefaultEndpointRegistryFactory extends EndpointRegistryFactory
{
- private static final ResourceBundle bundle = BundleUtils.getBundle(DefaultEndpointRegistryFactory.class);
- private Logger log = Logger.getLogger(DefaultEndpointRegistryFactory.class);
- /** The bean name in the kernel registry. */
- private static final String BEAN_NAME = "WSEndpointRegistry";
- private static final String SERVICE_NAME = "jboss.ws.registry";
- private static final EndpointRegistry fallbackRegistry = new DefaultEndpointRegistry();;
+ private static final EndpointRegistry ENDPOINT_REGISTRY = new DefaultEndpointRegistry();;
- /**
- * Constructor.
- */
- public DefaultEndpointRegistryFactory()
- {
- super();
- }
-
- /**
- * Returns endpoint registry registered in MC kernel.
- *
- * @return endpoint registry
- */
public EndpointRegistry getEndpointRegistry()
{
- try
- {
- final ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader();
- final SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider();
- final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class, cl);
- final IoCContainerProxy iocContainer = iocContainerFactory.getContainer();
-
- EndpointRegistry registry = null;
- try
- {
- //try MSC service name
- registry = iocContainer.getBean(DefaultEndpointRegistryFactory.SERVICE_NAME, EndpointRegistry.class);
- }
- catch (Exception e)
- {
- log.debug("Can't get endpoint registry: ", e);
- //ignore
- }
- if (registry == null)
- {
- //try MC bean name
- registry = iocContainer.getBean(DefaultEndpointRegistryFactory.BEAN_NAME, EndpointRegistry.class);
- }
- return registry;
- }
- catch (Exception e)
- {
- log.warn(BundleUtils.getMessage(bundle, "UNABLE_TO_GET_WSENDPOINTREGISTRY"));
- return fallbackRegistry; // JSE environment
- }
+ return ENDPOINT_REGISTRY;
}
}
Modified: common/trunk/src/main/java/org/jboss/ws/common/management/Message.properties
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/management/Message.properties 2011-12-16 14:22:47 UTC (rev 15405)
+++ common/trunk/src/main/java/org/jboss/ws/common/management/Message.properties 2011-12-16 14:26:13 UTC (rev 15406)
@@ -1,6 +1,5 @@
CANNOT_REGISTER_ENDPOINT_WITH_JMX_SERVER=Cannot register endpoint with JMX server
CANNOT_UNREGISTER_RECORD_PROCESSOR_WITH_JMX_SERVER=Cannot unregister record processor with JMX server
-UNABLE_TO_GET_WSENDPOINTREGISTRY=Unable to get WSEndpointRegistry from IoC, using default one
COULD_NOT_GET_ADDRESS_FOR_HOST=Could not get address for host: {0}
FOUND_MULTIPLE_CONNECTORS=Found multiple connectors for protocol={0} and secure={1}, using first port found {2}
CANNOT_REGISTER_ENDPOINT_WITH_JMX_SERVER=Cannot register endpoint with JMX server
13 years
- 1
- 0
JBossWS SVN: r15405 - in spi/trunk/src/main/java/org/jboss/wsf/spi: deployment and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2011-12-16 09:22:47 -0500 (Fri, 16 Dec 2011)
New Revision: 15405
Removed:
spi/trunk/src/main/java/org/jboss/wsf/spi/ioc/
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/injection/
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentMD.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentSpec.java
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java
Log:
[JBWS-3393] removing all deprecated stuff
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java 2011-12-16 10:27:17 UTC (rev 15404)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java 2011-12-16 14:22:47 UTC (rev 15405)
@@ -50,12 +50,6 @@
/** The concatenated names including all parents. */
String getCanonicalName();
- /** Get the URL for a given resource path
- * Deprecated, use getResourceResolver().resolve(String resourcePath).
- */
- @Deprecated
- URL getMetaDataFileURL(String resourcePath) throws IOException;
-
/** Get additional metadata files attached to the deployment **/
List<UnifiedVirtualFile> getMetadataFiles();
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2011-12-16 10:27:17 UTC (rev 15404)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2011-12-16 14:22:47 UTC (rev 15405)
@@ -24,7 +24,6 @@
import java.util.List;
import javax.management.ObjectName;
-import javax.naming.Context;
import org.jboss.ws.api.monitoring.Record;
import org.jboss.ws.api.monitoring.RecordProcessor;
@@ -120,9 +119,6 @@
/** Ask configured processors for processing of the given record **/
void processRecord(Record record);
- /** Returns associated JNDI context with this endpoint. */
- Context getJNDIContext();
-
/** Get endpoint address */
String getAddress();
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java 2011-12-16 10:27:17 UTC (rev 15404)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java 2011-12-16 14:22:47 UTC (rev 15405)
@@ -24,8 +24,6 @@
import java.lang.reflect.UndeclaredThrowableException;
import javax.management.MBeanException;
-import javax.naming.Context;
-import javax.naming.NamingException;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -47,9 +45,6 @@
/** Initilize the invocation handler */
public abstract void init(Endpoint ep);
- /** Returns JNDI context associated with endpoint */
- public abstract Context getJNDIContext(Endpoint ep) throws NamingException;
-
protected void handleInvocationException(Throwable th) throws Exception
{
if (th instanceof MBeanException)
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.java 2011-12-16 10:27:17 UTC (rev 15404)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.java 2011-12-16 14:22:47 UTC (rev 15405)
@@ -31,14 +31,5 @@
*/
public abstract class WebServiceContextFactory implements SPIView
{
- /**
- * Use {@link #newWebServiceContext(MessageContext) instead}
- */
- @Deprecated
- public ExtensibleWebServiceContext newWebServiceContext(InvocationType type, MessageContext messageContext)
- {
- return newWebServiceContext(messageContext);
- }
-
public abstract ExtensibleWebServiceContext newWebServiceContext(MessageContext messageContext);
}
Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentMD.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentMD.java 2011-12-16 10:27:17 UTC (rev 15404)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentMD.java 2011-12-16 14:22:47 UTC (rev 15405)
@@ -1,107 +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.metadata.j2ee;
-
-import java.lang.annotation.Annotation;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-@Deprecated
-public class PortComponentMD implements PortComponentSpec
-{
- private static final long serialVersionUID = 1;
-
- private String portComponentName;
- private String portComponentURI;
- private String authMethod;
- private String transportGuarantee;
- private boolean secureWSDLAccess;
-
- public PortComponentMD()
- {
- }
-
- public String portComponentName()
- {
- return portComponentName;
- }
-
- public void setPortComponentName(String portComponentName)
- {
- this.portComponentName = portComponentName;
- }
-
- public String portComponentURI()
- {
- return portComponentURI;
- }
-
- public void setPortComponentURI(String portComponentURI)
- {
- this.portComponentURI = portComponentURI;
- }
-
- public String urlPattern()
- {
- String pattern = "/*";
- if (portComponentURI != null)
- pattern = portComponentURI;
-
- return pattern;
- }
-
- public String authMethod()
- {
- return authMethod;
- }
-
- public void setAuthMethod(String authMethod)
- {
- this.authMethod = authMethod;
- }
-
- public String transportGuarantee()
- {
- return transportGuarantee;
- }
-
- public void setTransportGuarantee(String transportGuarantee)
- {
- this.transportGuarantee = transportGuarantee;
- }
-
- public boolean secureWSDLAccess()
- {
- return secureWSDLAccess;
- }
-
- public void setSecureWSDLAccess(boolean secureWSDLAccess)
- {
- this.secureWSDLAccess = secureWSDLAccess;
- }
-
- public Class<? extends Annotation> annotationType()
- {
- return PortComponentSpec.class;
- }
-}
Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentSpec.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentSpec.java 2011-12-16 10:27:17 UTC (rev 15404)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentSpec.java 2011-12-16 14:22:47 UTC (rev 15405)
@@ -1,41 +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.metadata.j2ee;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-@Deprecated
-public @interface PortComponentSpec
-{
- String portComponentName();
-
- String portComponentURI();
-
- String urlPattern();
-
- String authMethod();
-
- String transportGuarantee();
-
- boolean secureWSDLAccess();
-}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java 2011-12-16 10:27:17 UTC (rev 15404)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java 2011-12-16 14:22:47 UTC (rev 15405)
@@ -21,44 +21,24 @@
*/
package org.jboss.wsf.spi.metadata.jms;
-import java.net.URL;
-import java.util.ArrayList;
+import java.util.LinkedList;
import java.util.List;
/**
- * <p>Meta data class from jbossws-cxf.xml</p>
* @author <a href="ema(a)redhat.com">Jim Ma</a>
*/
-
-public class JMSEndpointsMetaData
+public final class JMSEndpointsMetaData
{
- //The endpoints list
- private List<JMSEndpointMetaData> endpointsMetaData = new ArrayList<JMSEndpointMetaData>();
- private URL descriptorURL;
+ private List<JMSEndpointMetaData> jmsEndpointsMD = new LinkedList<JMSEndpointMetaData>();
- public JMSEndpointsMetaData()
- {
- }
-
- @Deprecated
- public JMSEndpointsMetaData(URL descriptorURL)
- {
- this.descriptorURL = descriptorURL;
- }
-
- @Deprecated
- public URL getDescriptorURL()
- {
- return descriptorURL;
- }
-
public void addEndpointMetaData(JMSEndpointMetaData endpointMetaData)
{
- endpointsMetaData.add(endpointMetaData);
+ jmsEndpointsMD.add(endpointMetaData);
}
public List<JMSEndpointMetaData> getEndpointsMetaData() {
- return this.endpointsMetaData;
+ return jmsEndpointsMD;
}
+
}
13 years
- 1
- 0
JBossWS SVN: r15404 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2011-12-16 05:27:17 -0500 (Fri, 16 Dec 2011)
New Revision: 15404
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
Log:
[JBWS-3401] if EJBs referencing WSDL are bundled in .war archives, always use WEB-INF/wsdl
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2011-12-16 10:24:57 UTC (rev 15403)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/DescriptorDeploymentAspect.java 2011-12-16 10:27:17 UTC (rev 15404)
@@ -25,6 +25,8 @@
import static org.jboss.ws.common.integration.WSHelper.isJaxwsEjbDeployment;
import static org.jboss.ws.common.integration.WSHelper.isJaxwsJseDeployment;
import static org.jboss.ws.common.integration.WSHelper.isJaxrpcDeployment;
+import static org.jboss.ws.common.integration.WSHelper.isJseDeployment;
+import static org.jboss.ws.common.integration.WSHelper.isWarArchive;
import java.io.IOException;
import java.net.URL;
@@ -112,17 +114,17 @@
throw new IllegalStateException(BundleUtils.getMessage(bundle, "UNSUPPORTED_DEPLOYMENT_TYPE", JAXRPC));
}
String metadir = null;
- if (isJaxwsEjbDeployment(dep))
+ if (isJseDeployment(dep) || isWarArchive(dep))
{
- // expected resource location for EJB3 deployments
- metadir = "META-INF";
- }
- if (isJaxwsJseDeployment(dep))
- {
// expected resource location for POJO deployments
// if EJBs are bundled in WARs, we default to WEB-INF
metadir = "WEB-INF";
}
+ else
+ {
+ // expected resource location for EJB3 deployments
+ metadir = "META-INF";
+ }
URL cxfURL = null;
try
13 years
- 1
- 0
JBossWS SVN: r15403 - in common/trunk/src/main/java/org/jboss/ws/common: utils and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2011-12-16 05:24:57 -0500 (Fri, 16 Dec 2011)
New Revision: 15403
Modified:
common/trunk/src/main/java/org/jboss/ws/common/integration/WSHelper.java
common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java
Log:
[JBWS-3401] if EJBs referencing WSDL are bundled in .war archives, always use WEB-INF/wsdl
Modified: common/trunk/src/main/java/org/jboss/ws/common/integration/WSHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/integration/WSHelper.java 2011-12-16 10:21:17 UTC (rev 15402)
+++ common/trunk/src/main/java/org/jboss/ws/common/integration/WSHelper.java 2011-12-16 10:24:57 UTC (rev 15403)
@@ -51,6 +51,9 @@
private static final EndpointTypeFilter JAXRPC_JSE_ENDPOINT_FILTER = new EndpointTypeFilterImpl( JAXRPC_JSE );
private static final EndpointTypeFilter JAXWS_EJB_ENDPOINT_FILTER = new EndpointTypeFilterImpl( JAXWS_EJB3 );
private static final EndpointTypeFilter JAXWS_JSE_ENDPOINT_FILTER = new EndpointTypeFilterImpl( JAXWS_JSE );
+ private static final String WAR_EXTENSION = ".war";
+ private static final String JAR_EXTENSION = ".jar";
+ private static final String EAR_EXTENSION = ".ear";
/**
* Forbidden constructor.
@@ -194,6 +197,39 @@
}
/**
+ * Returns true if archive name ends with '.jar' suffix.
+ *
+ * @param dep webservice deployment
+ * @return true if archive name ends with '.jar' suffix, false otherwise
+ */
+ public static boolean isJarArchive( final Deployment dep )
+ {
+ return dep.getSimpleName().endsWith(JAR_EXTENSION);
+ }
+
+ /**
+ * Returns true if archive name ends with '.war' suffix.
+ *
+ * @param dep webservice deployment
+ * @return true if archive name ends with '.war' suffix, false otherwise
+ */
+ public static boolean isWarArchive( final Deployment dep )
+ {
+ return dep.getSimpleName().endsWith(WAR_EXTENSION);
+ }
+
+ /**
+ * Returns true if archive name ends with '.ear' suffix.
+ *
+ * @param dep webservice deployment
+ * @return true if archive name ends with '.ear' suffix, false otherwise
+ */
+ public static boolean isEarArchive( final Deployment dep )
+ {
+ return dep.getSimpleName().endsWith(EAR_EXTENSION);
+ }
+
+ /**
* Returns true if endpoint represents JAXWS JSE endpoint.
*
* @param ep webservice endpoint
Modified: common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java 2011-12-16 10:21:17 UTC (rev 15402)
+++ common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java 2011-12-16 10:24:57 UTC (rev 15403)
@@ -22,6 +22,7 @@
package org.jboss.ws.common.utils;
import static org.jboss.ws.common.integration.WSHelper.isJseDeployment;
+import static org.jboss.ws.common.integration.WSHelper.isWarArchive;
import java.io.File;
import java.io.FileOutputStream;
@@ -84,7 +85,7 @@
serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
}
- if (isJseDeployment(dep))
+ if (isJseDeployment(dep) || isWarArchive(dep))
{
expLocation = "WEB-INF/wsdl/";
}
13 years
- 1
- 0
JBossWS SVN: r15402 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2011-12-16 05:21:17 -0500 (Fri, 16 Dec 2011)
New Revision: 15402
Added:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3401/
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3401/JBWS3401TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3401/TestEndpoint.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3401/TestEndpointImpl.java
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/TestService.wsdl
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/schema1.xsd
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/schema2.xsd
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/schema3.xsd
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/schema4.xsd
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/schema5.xsd
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
Log:
[JBWS-3401] providing test case
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-12-15 23:54:03 UTC (rev 15401)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-12-16 10:21:17 UTC (rev 15402)
@@ -1133,6 +1133,17 @@
</classes>
</war>
+ <!-- jaxws-jbws3401 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3401.war" needxmlfile="false">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws3401/*.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws3401/*TestCase.class" />
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3401/WEB-INF">
+ <include name="wsdl/*" />
+ </webinf>
+ </war>
+
<!-- jaxws-as2961 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-as2961.war" webxml="${tests.output.dir}/test-resources/jaxws/as2961/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3401/JBWS3401TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3401/JBWS3401TestCase.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3401/JBWS3401TestCase.java 2011-12-16 10:21:17 UTC (rev 15402)
@@ -0,0 +1,65 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2011, 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.test.ws.jaxws.jbws3401;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-3401] Support for EJBs bundled in .war archives referencing schemas.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public class JBWS3401TestCase extends JBossWSTest
+{
+
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(JBWS3401TestCase.class, "jaxws-jbws3401.war");
+ }
+
+ private TestEndpoint getPort() throws Exception
+ {
+
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3401/TestEndpointService/TestEndpoint?wsdl");
+ QName serviceName = new QName("http://org.jboss.test.ws/jbws3401", "TestEndpointService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+
+ return service.getPort(TestEndpoint.class);
+ }
+
+ public void testCall() throws Exception
+ {
+ String message = "Hi";
+ String response = getPort().echo(message);
+ assertEquals(message, response);
+ }
+
+}
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3401/TestEndpoint.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3401/TestEndpoint.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3401/TestEndpoint.java 2011-12-16 10:21:17 UTC (rev 15402)
@@ -0,0 +1,35 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2011, 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.test.ws.jaxws.jbws3401;
+
+import javax.jws.WebService;
+
+/**
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.test.ws/jbws3401")
+public interface TestEndpoint
+{
+
+ public String echo(final String message);
+
+}
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3401/TestEndpointImpl.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3401/TestEndpointImpl.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3401/TestEndpointImpl.java 2011-12-16 10:21:17 UTC (rev 15402)
@@ -0,0 +1,40 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2011, 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.test.ws.jaxws.jbws3401;
+
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+
+/**
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+@WebService(name = "TestEndpoint", serviceName="TestEndpointService", targetNamespace = "http://org.jboss.test.ws/jbws3401", wsdlLocation="WEB-INF/wsdl/TestService.wsdl")
+@Stateless
+public class TestEndpointImpl implements TestEndpoint
+{
+
+ public String echo(String message)
+ {
+ return message;
+ }
+
+}
Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/TestService.wsdl (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/TestService.wsdl 2011-12-16 10:21:17 UTC (rev 15402)
@@ -0,0 +1,51 @@
+<definitions name='TestEndpointService' targetNamespace='http://org.jboss.test.ws/jbws3401' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws3401' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <xs:schema targetNamespace='http://org.jboss.test.ws/jbws3401' version='1.0' xmlns:tns='http://org.jboss.test.ws/jbws3401' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+
+ <xs:import namespace="http://org.jboss.test.ws/jbws3401/schema1" schemaLocation="./schema1.xsd"/>
+ <xs:import namespace="http://org.jboss.test.ws/jbws3401/schema4" schemaLocation="./schema4.xsd"/>
+
+ <xs:element name='echo' type='tns:echo'/>
+ <xs:element name='echoResponse' type='tns:echoResponse'/>
+ <xs:complexType name='echo'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='arg0' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name='echoResponse'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='return' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ </types>
+ <message name='TestEndpoint_echoResponse'>
+ <part element='tns:echoResponse' name='echoResponse'></part>
+ </message>
+ <message name='TestEndpoint_echo'>
+ <part element='tns:echo' name='echo'></part>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='echo' parameterOrder='echo'>
+ <input message='tns:TestEndpoint_echo'></input>
+ <output message='tns:TestEndpoint_echoResponse'></output>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echo'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestEndpointService'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='http://127.0.0.1:8080/jaxws-jbws3401'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/schema1.xsd
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/schema1.xsd (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/schema1.xsd 2011-12-16 10:21:17 UTC (rev 15402)
@@ -0,0 +1,5 @@
+<schema targetNamespace='http://org.jboss.test.ws/jbws3401/schema1'
+ xmlns='http://www.w3.org/2001/XMLSchema'>
+ <import namespace="http://org.jboss.test.ws/jbws3401/schema2" schemaLocation="./schema2.xsd"/>
+ <import namespace="http://org.jboss.test.ws/jbws3401/schema5" schemaLocation="./schema5.xsd"/>
+</schema>
\ No newline at end of file
Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/schema2.xsd
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/schema2.xsd (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/schema2.xsd 2011-12-16 10:21:17 UTC (rev 15402)
@@ -0,0 +1,4 @@
+<schema targetNamespace='http://org.jboss.test.ws/jbws3401/schema2'
+ xmlns='http://www.w3.org/2001/XMLSchema'>
+
+</schema>
\ No newline at end of file
Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/schema3.xsd
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/schema3.xsd (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/schema3.xsd 2011-12-16 10:21:17 UTC (rev 15402)
@@ -0,0 +1,4 @@
+<schema targetNamespace='http://org.jboss.test.ws/jbws3401/schema3'
+ xmlns='http://www.w3.org/2001/XMLSchema'>
+
+</schema>
\ No newline at end of file
Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/schema4.xsd
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/schema4.xsd (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/schema4.xsd 2011-12-16 10:21:17 UTC (rev 15402)
@@ -0,0 +1,5 @@
+<schema targetNamespace='http://org.jboss.test.ws/jbws3401/schema4'
+ xmlns='http://www.w3.org/2001/XMLSchema'>
+ <import namespace="http://org.jboss.test.ws/jbws3401/schema2" schemaLocation="./schema2.xsd"/>
+ <import namespace="http://org.jboss.test.ws/jbws3401/schema3" schemaLocation="./schema3.xsd"/>
+</schema>
\ No newline at end of file
Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/schema5.xsd
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/schema5.xsd (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/schema5.xsd 2011-12-16 10:21:17 UTC (rev 15402)
@@ -0,0 +1,4 @@
+<schema targetNamespace='http://org.jboss.test.ws/jbws3401/schema5'
+ xmlns='http://www.w3.org/2001/XMLSchema'>
+
+</schema>
\ No newline at end of file
13 years
- 1
- 0