JBossWS SVN: r9720 - common/trunk/src/main/java/org/jboss/wsf/common/javax.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-03 09:51:03 -0400 (Fri, 03 Apr 2009)
New Revision: 9720
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/javax/JavaxAnnotationHelper.java
Log:
[JBWS-2074] final cleanup
Modified: common/trunk/src/main/java/org/jboss/wsf/common/javax/JavaxAnnotationHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/javax/JavaxAnnotationHelper.java 2009-04-03 13:41:28 UTC (rev 9719)
+++ common/trunk/src/main/java/org/jboss/wsf/common/javax/JavaxAnnotationHelper.java 2009-04-03 13:51:03 UTC (rev 9720)
@@ -76,51 +76,50 @@
* @param injections injections metadata
* @throws Exception if some error occurs
*/
- public static void injectResources(Object instance, InjectionsMetaData injections) throws Exception
+ public static void injectResources(final Object instance, final InjectionsMetaData injections) throws Exception
{
if (instance == null)
throw new IllegalArgumentException("Object instance cannot be null");
+ if (injections == null)
+ throw new IllegalArgumentException("Injections metadata cannot be null");
Class<?> instanceClass = instance.getClass();
InitialContext ctx = new InitialContext();
// inject descriptor driven annotations
- if (injections != null)
+ Collection<InjectionMetaData> injectionMDs = injections.getInjectionsMetaData(instanceClass);
+ for (InjectionMetaData injectionMD : injectionMDs)
{
- Collection<InjectionMetaData> injectionMDs = injections.getInjectionsMetaData(instanceClass);
- for (InjectionMetaData injectionMD : injectionMDs)
+ Method method = getMethod(injectionMD, instanceClass);
+ if (method != null)
{
- Method method = getMethod(injectionMD, instanceClass);
- if (method != null)
+ try
{
+ inject(instance, method, injectionMD.getEnvEntryName(), ctx);
+ }
+ catch (Exception e)
+ {
+ LOG.warn("Cannot inject method (descriptor driven injection): " + injectionMD, e);
+ }
+ }
+ else
+ {
+ Field field = getField(injectionMD, instanceClass);
+ if (field != null)
+ {
try
{
- inject(instance, method, injectionMD.getEnvEntryName(), ctx);
+ inject(instance, field, injectionMD.getEnvEntryName(), ctx);
}
catch (Exception e)
{
- LOG.warn("Cannot inject method (descriptor driven injection): " + injectionMD, e);
+ LOG.warn("Cannot inject field (descriptor driven injection): " + injectionMD, e);
}
}
else
{
- Field field = getField(injectionMD, instanceClass);
- if (field != null)
- {
- try
- {
- inject(instance, field, injectionMD.getEnvEntryName(), ctx);
- }
- catch (Exception e)
- {
- LOG.warn("Cannot inject field (descriptor driven injection): " + injectionMD, e);
- }
- }
- else
- {
- LOG.warn("Cannot find injection target for: " + injectionMD);
- }
+ LOG.warn("Cannot find injection target for: " + injectionMD);
}
}
}
@@ -154,7 +153,7 @@
}
}
- public static void injectWebServiceContext(Object instance, WebServiceContext ctx)
+ public static void injectWebServiceContext(final Object instance, final WebServiceContext ctx)
{
final Class<?> instanceClass = instance.getClass();
@@ -195,7 +194,7 @@
* @see org.jboss.wsf.common.javax.finders.PostConstructMethodFinder
* @see javax.annotation.PostConstruct
*/
- public static void callPostConstructMethod(Object instance) throws Exception
+ public static void callPostConstructMethod(final Object instance) throws Exception
{
if (instance == null)
throw new IllegalArgumentException("Object instance cannot be null");
@@ -225,7 +224,7 @@
* @see org.jboss.wsf.common.javax.finders.PreDestroyMethodFinder
* @see javax.annotation.PreDestroy
*/
- public static void callPreDestroyMethod(Object instance) throws Exception
+ public static void callPreDestroyMethod(final Object instance) throws Exception
{
if (instance == null)
throw new IllegalArgumentException("Object instance cannot be null");
@@ -257,7 +256,8 @@
* @throws Exception if any error occurs
* @see org.jboss.wsf.common.javax.finders.ResourceMethodFinder
*/
- private static void inject(final Object instance, final Method method, String resourceName, InitialContext ctx) throws Exception
+ private static void inject(final Object instance, final Method method, final String resourceName, final InitialContext ctx)
+ throws Exception
{
final String beanName = convertToBeanName(method.getName());
final Object value = ctx.lookup(getName(resourceName, beanName));
@@ -276,7 +276,8 @@
* @throws Exception if any error occurs
* @see org.jboss.wsf.common.javax.finders.ResourceFieldFinder
*/
- private static void inject(final Object instance, final Field field, String resourceName, InitialContext ctx) throws Exception
+ private static void inject(final Object instance, final Field field, final String resourceName, final InitialContext ctx)
+ throws Exception
{
final String beanName = field.getName();
final Object value = ctx.lookup(getName(resourceName, beanName));
@@ -316,7 +317,8 @@
* @param args arguments to pass
* @throws Exception if any error occurs
*/
- private static void invokeMethod(final Object instance, final Method method, final Object[] args) throws Exception
+ private static void invokeMethod(final Object instance, final Method method, final Object[] args)
+ throws Exception
{
boolean accessability = method.isAccessible();
@@ -339,7 +341,8 @@
* @param value to be set
* @throws Exception if any error occurs
*/
- private static void setField(final Object instance, final Field field, final Object value) throws Exception
+ private static void setField(final Object instance, final Field field, final Object value)
+ throws Exception
{
boolean accessability = field.isAccessible();
@@ -362,9 +365,9 @@
* @return method that matches the criteria or null if not found
* @see org.jboss.wsf.common.javax.finders.InjectionMethodFinder
*/
- private static Method getMethod(InjectionMetaData injectionMD, Class<?> clazz)
+ private static Method getMethod(final InjectionMetaData injectionMD, final Class<?> clazz)
{
- Collection<Method> result = new InjectionMethodFinder(injectionMD).process(clazz);
+ final Collection<Method> result = new InjectionMethodFinder(injectionMD).process(clazz);
return result.isEmpty() ? null : result.iterator().next();
}
@@ -377,9 +380,9 @@
* @return field that matches the criteria or null if not found
* @see org.jboss.wsf.common.javax.finders.InjectionFieldFinder
*/
- private static Field getField(InjectionMetaData injectionMD, Class<?> clazz)
+ private static Field getField(final InjectionMetaData injectionMD, final Class<?> clazz)
{
- Collection<Field> result = new InjectionFieldFinder(injectionMD).process(clazz);
+ final Collection<Field> result = new InjectionFieldFinder(injectionMD).process(clazz);
return result.isEmpty() ? null : result.iterator().next();
}
15 years, 11 months
JBossWS SVN: r9719 - in container/jboss50/branches: jboss501/src/main/resources/jbossws-jboss50.deployer/META-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-03 09:41:28 -0400 (Fri, 03 Apr 2009)
New Revision: 9719
Modified:
container/jboss50/branches/jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
container/jboss50/branches/jboss501/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
Log:
[JBWS-2074] adding resource injection support for dynamically deployed POJO endpoints
Modified: container/jboss50/branches/jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
===================================================================
--- container/jboss50/branches/jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-04-03 13:35:51 UTC (rev 9718)
+++ container/jboss50/branches/jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-04-03 13:41:28 UTC (rev 9719)
@@ -345,6 +345,7 @@
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSDynamicEndpointDeploymentAspect"/>
+ <inject bean="WSInjectionMetaDataDeploymentAspect"/>
<inject bean="WSEndpointAPIDeploymentAspect"/>
<inject bean="WSVirtualHostDeploymentAspect"/>
<inject bean="WSEndpointAddressDeploymentAspect"/>
Modified: container/jboss50/branches/jboss501/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
===================================================================
--- container/jboss50/branches/jboss501/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-04-03 13:35:51 UTC (rev 9718)
+++ container/jboss50/branches/jboss501/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-04-03 13:41:28 UTC (rev 9719)
@@ -345,6 +345,7 @@
<property name="aspects">
<set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect">
<inject bean="WSDynamicEndpointDeploymentAspect"/>
+ <inject bean="WSInjectionMetaDataDeploymentAspect"/>
<inject bean="WSEndpointAPIDeploymentAspect"/>
<inject bean="WSVirtualHostDeploymentAspect"/>
<inject bean="WSEndpointAddressDeploymentAspect"/>
15 years, 11 months
JBossWS SVN: r9718 - framework/trunk/src/main/java/org/jboss/wsf/framework/invocation.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-03 09:35:51 -0400 (Fri, 03 Apr 2009)
New Revision: 9718
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/invocation/WebServiceContextInjector.java
Log:
[JBWS-2074] adding support for WebServiceContext injection
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/invocation/WebServiceContextInjector.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/invocation/WebServiceContextInjector.java 2009-04-03 13:34:04 UTC (rev 9717)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/invocation/WebServiceContextInjector.java 2009-04-03 13:35:51 UTC (rev 9718)
@@ -21,65 +21,21 @@
*/
package org.jboss.wsf.framework.invocation;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import javax.annotation.Resource;
import javax.xml.ws.WebServiceContext;
-import org.jboss.logging.Logger;
+import org.jboss.wsf.common.javax.JavaxAnnotationHelper;
import org.jboss.wsf.spi.invocation.ResourceInjector;
/**
* Inject the JAXWS WebServiceContext
*
* @author Thomas.Diesler(a)jboss.org
- * @since 04-Jan-2007
+ * @author ropalka(a)redhat.com
*/
public class WebServiceContextInjector extends ResourceInjector
{
- // provide logging
- private static Logger log = Logger.getLogger(WebServiceContextInjector.class);
-
- WebServiceContextInjector()
- {
- }
-
public void inject(Object instance, WebServiceContext context)
{
- try
- {
- // scan fields that are marked with @Resource
- Field[] fields = instance.getClass().getDeclaredFields();
- for (Field field : fields)
- {
- Class type = field.getType();
- if (type == WebServiceContext.class && field.isAnnotationPresent(Resource.class))
- {
- field.setAccessible(true);
- field.set(instance, context);
- }
- }
-
- // scan methods that are marked with @Resource
- Method[] methods = instance.getClass().getDeclaredMethods();
- for (Method method : methods)
- {
- Class[] paramTypes = method.getParameterTypes();
- if (paramTypes.length == 1 && paramTypes[0] == WebServiceContext.class && method.isAnnotationPresent(Resource.class))
- {
- method.setAccessible(true);
- method.invoke(instance, new Object[] { context });
- }
- }
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- catch (Exception ex)
- {
- log.warn("Cannot inject WebServiceContext", ex);
- }
+ JavaxAnnotationHelper.injectWebServiceContext(instance, context);
}
}
15 years, 11 months
JBossWS SVN: r9717 - in common/trunk/src/main/java/org/jboss/wsf/common/javax: finders and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-03 09:34:04 -0400 (Fri, 03 Apr 2009)
New Revision: 9717
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/javax/JavaxAnnotationHelper.java
common/trunk/src/main/java/org/jboss/wsf/common/javax/finders/ResourceFieldFinder.java
common/trunk/src/main/java/org/jboss/wsf/common/javax/finders/ResourceMethodFinder.java
Log:
[JBWS-2074] adding support for WebServiceContext injection
Modified: common/trunk/src/main/java/org/jboss/wsf/common/javax/JavaxAnnotationHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/javax/JavaxAnnotationHelper.java 2009-04-03 12:15:35 UTC (rev 9716)
+++ common/trunk/src/main/java/org/jboss/wsf/common/javax/JavaxAnnotationHelper.java 2009-04-03 13:34:04 UTC (rev 9717)
@@ -27,6 +27,7 @@
import javax.annotation.Resource;
import javax.naming.InitialContext;
+import javax.xml.ws.WebServiceContext;
import org.jboss.logging.Logger;
import org.jboss.wsf.common.javax.finders.InjectionFieldFinder;
@@ -51,8 +52,10 @@
private static final String JNDI_PREFIX = "java:comp/env/";
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();
- private static final ClassProcessor<Field> RESOURCE_FIELD_FINDER = new ResourceFieldFinder();
+ 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> 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);
/**
* Forbidden constructor.
@@ -91,20 +94,32 @@
Method method = getMethod(injectionMD, instanceClass);
if (method != null)
{
- // inject descriptor driven annotated method
- inject(instance, method, injectionMD.getEnvEntryName(), ctx);
+ try
+ {
+ inject(instance, method, injectionMD.getEnvEntryName(), ctx);
+ }
+ catch (Exception e)
+ {
+ LOG.warn("Cannot inject method (descriptor driven injection): " + injectionMD, e);
+ }
}
else
{
Field field = getField(injectionMD, instanceClass);
if (field != null)
{
- // inject descriptor driven annotated field
- inject(instance, field, injectionMD.getEnvEntryName(), ctx);
+ try
+ {
+ inject(instance, field, injectionMD.getEnvEntryName(), ctx);
+ }
+ catch (Exception e)
+ {
+ LOG.warn("Cannot inject field (descriptor driven injection): " + injectionMD, e);
+ }
}
else
{
- throw new RuntimeException("Cannot find injection target for: " + injectionMD);
+ LOG.warn("Cannot find injection target for: " + injectionMD);
}
}
}
@@ -114,17 +129,64 @@
Collection<Method> resourceAnnotatedMethods = RESOURCE_METHOD_FINDER.process(instanceClass);
for(Method method : resourceAnnotatedMethods)
{
- inject(instance, method, method.getAnnotation(Resource.class).name(), ctx);
+ try
+ {
+ inject(instance, method, method.getAnnotation(Resource.class).name(), ctx);
+ }
+ catch (Exception e)
+ {
+ LOG.warn("Cannot inject @Resource annotated method: " + method, e);
+ }
}
// inject @Resource annotated fields
Collection<Field> resourceAnnotatedFields = RESOURCE_FIELD_FINDER.process(instanceClass);
for (Field field : resourceAnnotatedFields)
{
- inject(instance, field, field.getAnnotation(Resource.class).name(), ctx);
+ try
+ {
+ inject(instance, field, field.getAnnotation(Resource.class).name(), ctx);
+ }
+ catch (Exception e)
+ {
+ LOG.warn("Cannot inject @Resource annotated field: " + field, e);
+ }
}
}
+ public static void injectWebServiceContext(Object instance, WebServiceContext ctx)
+ {
+ final Class<?> instanceClass = instance.getClass();
+
+ // inject @Resource annotated methods accepting WebServiceContext parameter
+ Collection<Method> resourceAnnotatedMethods = WEB_SERVICE_CONTEXT_METHOD_FINDER.process(instanceClass);
+ for(Method method : resourceAnnotatedMethods)
+ {
+ try
+ {
+ invokeMethod(instance, method, new Object[] {ctx});
+ }
+ catch (Exception e)
+ {
+ LOG.warn("Cannot inject @Resource annotated method: " + method, e);
+ }
+ }
+
+ // inject @Resource annotated fields of WebServiceContext type
+ Collection<Field> resourceAnnotatedFields = WEB_SERVICE_CONTEXT_FIELD_FINDER.process(instanceClass);
+ for (Field field : resourceAnnotatedFields)
+ {
+ try
+ {
+ setField(instance, field, ctx);
+ }
+ catch (Exception e)
+ {
+ LOG.warn("Cannot inject @Resource annotated field: " + field, e);
+ }
+ }
+ }
+
/**
* Calls @PostConstruct annotated method if exists.
*
@@ -144,7 +206,14 @@
{
Method method = methods.iterator().next();
LOG.debug("Calling @PostConstruct annotated method: " + method);
- invokeMethod(instance, method, null);
+ try
+ {
+ invokeMethod(instance, method, null);
+ }
+ catch (Exception e)
+ {
+ LOG.warn("Calling of @PostConstruct annotated method failed: " + method, e);
+ }
}
}
@@ -167,7 +236,14 @@
{
Method method = methods.iterator().next();
LOG.debug("Calling @PreDestroy annotated method: " + method);
- invokeMethod(instance, method, null);
+ try
+ {
+ invokeMethod(instance, method, null);
+ }
+ catch (Exception e)
+ {
+ LOG.warn("Calling of @PreDestroy annotated method failed: " + method, e);
+ }
}
}
@@ -249,11 +325,6 @@
method.setAccessible(true);
method.invoke(instance, args);
}
- catch (Exception e)
- {
- LOG.error(e.getMessage(), e);
- throw e; // propagate
- }
finally
{
method.setAccessible(accessability);
@@ -277,11 +348,6 @@
field.setAccessible(true);
field.set(instance, value);
}
- catch (Exception e)
- {
- LOG.error(e.getMessage(), e);
- throw e; // propagate
- }
finally
{
field.setAccessible(accessability);
Modified: common/trunk/src/main/java/org/jboss/wsf/common/javax/finders/ResourceFieldFinder.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/javax/finders/ResourceFieldFinder.java 2009-04-03 12:15:35 UTC (rev 9716)
+++ common/trunk/src/main/java/org/jboss/wsf/common/javax/finders/ResourceFieldFinder.java 2009-04-03 13:34:04 UTC (rev 9717)
@@ -48,11 +48,30 @@
{
/**
+ * Parameter type to accept/ignore.
+ */
+ private final Class<?> accept;
+ /**
+ * If <b>accept</b> field is not null then:
+ * <ul>
+ * <li><b>true</b> means include only methods with <b>accept</b> parameter,
+ * <li><b>false</b> means exclude all methods with <b>accept</b> parameter
+ * </ul>
+ */
+ private final boolean include;
+
+ /**
* Constructor.
+ *
+ * @param accept filtering class
+ * @param include whether include/exclude filtering class
*/
- public ResourceFieldFinder()
+ public ResourceFieldFinder(final Class<?> accept, boolean include)
{
super(Resource.class);
+
+ this.accept = accept;
+ this.include = include;
}
@Override
@@ -70,13 +89,22 @@
@Override
public boolean matches(Field field)
{
- if (super.matches(field))
+ final boolean matches = super.matches(field);
+
+ if (matches)
{
- // don't match @Resource annotated fields of type WebServiceContext
- return !field.getType().equals(WebServiceContext.class);
+ // processing @Resource annotated method
+ if (this.accept != null)
+ {
+ // filtering
+ final Class<?> fieldType = field.getType();
+ final boolean parameterMatch = this.accept.equals(fieldType);
+ // include/exclude filtering
+ return this.include ? parameterMatch : !parameterMatch;
+ }
}
-
- return false;
+
+ return matches;
}
}
Modified: common/trunk/src/main/java/org/jboss/wsf/common/javax/finders/ResourceMethodFinder.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/javax/finders/ResourceMethodFinder.java 2009-04-03 12:15:35 UTC (rev 9716)
+++ common/trunk/src/main/java/org/jboss/wsf/common/javax/finders/ResourceMethodFinder.java 2009-04-03 13:34:04 UTC (rev 9717)
@@ -47,11 +47,30 @@
{
/**
+ * Parameter type to accept/ignore.
+ */
+ private final Class<?> accept;
+ /**
+ * If <b>accept</b> field is not null then:
+ * <ul>
+ * <li><b>true</b> means include only methods with <b>accept</b> parameter,
+ * <li><b>false</b> means exclude all methods with <b>accept</b> parameter
+ * </ul>
+ */
+ private final boolean include;
+
+ /**
* Constructor.
+ *
+ * @param accept filtering class
+ * @param include whether include/exclude filtering class
*/
- public ResourceMethodFinder()
+ public ResourceMethodFinder(final Class<?> accept, boolean include)
{
super(Resource.class);
+
+ this.accept = accept;
+ this.include = include;
}
@Override
@@ -72,13 +91,25 @@
@Override
public boolean matches(Method method)
{
- if (super.matches(method))
+ final boolean matches = super.matches(method);
+
+ if (matches)
{
- // don't match @Resource annotated methods accepting WebServiceContext parameter
- return !method.getParameterTypes()[0].equals(WebServiceContext.class);
+ // processing @Resource annotated method
+ if (this.accept != null)
+ {
+ // filtering
+ if (method.getParameterTypes().length == 1)
+ {
+ final Class<?> param = method.getParameterTypes()[0];
+ final boolean parameterMatch = this.accept.equals(param);
+ // include/exclude filtering
+ return this.include ? parameterMatch : !parameterMatch;
+ }
+ }
}
-
- return false;
+
+ return matches;
}
}
15 years, 11 months
JBossWS SVN: r9716 - in projects/interop: cxf and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-04-03 08:15:35 -0400 (Fri, 03 Apr 2009)
New Revision: 9716
Added:
projects/interop/cxf/
projects/interop/cxf/noemax/
projects/interop/cxf/noemax/FastInfosetTest/
Log:
[JBWS-2196] Preparing for building test client
15 years, 11 months
JBossWS SVN: r9715 - common/trunk/src/main/java/org/jboss/wsf/common/javax.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-03 07:33:48 -0400 (Fri, 03 Apr 2009)
New Revision: 9715
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/javax/JavaxAnnotationHelper.java
Log:
[JBWS-2074] injections metadata can be null
Modified: common/trunk/src/main/java/org/jboss/wsf/common/javax/JavaxAnnotationHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/javax/JavaxAnnotationHelper.java 2009-04-03 11:24:18 UTC (rev 9714)
+++ common/trunk/src/main/java/org/jboss/wsf/common/javax/JavaxAnnotationHelper.java 2009-04-03 11:33:48 UTC (rev 9715)
@@ -77,34 +77,35 @@
{
if (instance == null)
throw new IllegalArgumentException("Object instance cannot be null");
- if (injections == null)
- throw new IllegalArgumentException("Injections metadata cannot be null");
Class<?> instanceClass = instance.getClass();
InitialContext ctx = new InitialContext();
// inject descriptor driven annotations
- Collection<InjectionMetaData> injectionMDs = injections.getInjectionsMetaData(instanceClass);
- for (InjectionMetaData injectionMD : injectionMDs)
+ if (injections != null)
{
- Method method = getMethod(injectionMD, instanceClass);
- if (method != null)
+ Collection<InjectionMetaData> injectionMDs = injections.getInjectionsMetaData(instanceClass);
+ for (InjectionMetaData injectionMD : injectionMDs)
{
- // inject descriptor driven annotated method
- inject(instance, method, injectionMD.getEnvEntryName(), ctx);
- }
- else
- {
- Field field = getField(injectionMD, instanceClass);
- if (field != null)
+ Method method = getMethod(injectionMD, instanceClass);
+ if (method != null)
{
- // inject descriptor driven annotated field
- inject(instance, field, injectionMD.getEnvEntryName(), ctx);
+ // inject descriptor driven annotated method
+ inject(instance, method, injectionMD.getEnvEntryName(), ctx);
}
else
{
- throw new RuntimeException("Cannot find injection target for: " + injectionMD);
+ Field field = getField(injectionMD, instanceClass);
+ if (field != null)
+ {
+ // inject descriptor driven annotated field
+ inject(instance, field, injectionMD.getEnvEntryName(), ctx);
+ }
+ else
+ {
+ throw new RuntimeException("Cannot find injection target for: " + injectionMD);
+ }
}
}
}
15 years, 11 months
JBossWS SVN: r9714 - common/trunk/src/main/java/org/jboss/wsf/common/javax/finders.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-03 07:24:18 -0400 (Fri, 03 Apr 2009)
New Revision: 9714
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/javax/finders/ResourceFieldFinder.java
common/trunk/src/main/java/org/jboss/wsf/common/javax/finders/ResourceMethodFinder.java
Log:
[JBWS-2074] exclude WebServiceContext from @Resource injection
Modified: common/trunk/src/main/java/org/jboss/wsf/common/javax/finders/ResourceFieldFinder.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/javax/finders/ResourceFieldFinder.java 2009-04-03 11:22:21 UTC (rev 9713)
+++ common/trunk/src/main/java/org/jboss/wsf/common/javax/finders/ResourceFieldFinder.java 2009-04-03 11:24:18 UTC (rev 9714)
@@ -22,8 +22,10 @@
package org.jboss.wsf.common.javax.finders;
import java.lang.reflect.Field;
+import java.lang.reflect.Method;
import javax.annotation.Resource;
+import javax.xml.ws.WebServiceContext;
import org.jboss.wsf.common.reflection.AnnotatedFieldFinder;
@@ -65,4 +67,16 @@
ReflectionUtils.assertNotPrimitiveType(field, annotation);
}
+ @Override
+ public boolean matches(Field field)
+ {
+ if (super.matches(field))
+ {
+ // don't match @Resource annotated fields of type WebServiceContext
+ return !field.getType().equals(WebServiceContext.class);
+ }
+
+ return false;
+ }
+
}
Modified: common/trunk/src/main/java/org/jboss/wsf/common/javax/finders/ResourceMethodFinder.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/javax/finders/ResourceMethodFinder.java 2009-04-03 11:22:21 UTC (rev 9713)
+++ common/trunk/src/main/java/org/jboss/wsf/common/javax/finders/ResourceMethodFinder.java 2009-04-03 11:24:18 UTC (rev 9714)
@@ -24,6 +24,7 @@
import java.lang.reflect.Method;
import javax.annotation.Resource;
+import javax.xml.ws.WebServiceContext;
import org.jboss.wsf.common.reflection.AnnotatedMethodFinder;
@@ -68,4 +69,16 @@
ReflectionUtils.assertNotStatic(method, annotation);
}
+ @Override
+ public boolean matches(Method method)
+ {
+ if (super.matches(method))
+ {
+ // don't match @Resource annotated methods accepting WebServiceContext parameter
+ return !method.getParameterTypes()[0].equals(WebServiceContext.class);
+ }
+
+ return false;
+ }
+
}
15 years, 11 months
JBossWS SVN: r9713 - in framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074: usecase2/service and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-04-03 07:22:21 -0400 (Fri, 03 Apr 2009)
New Revision: 9713
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/service/EJB3Impl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOImpl.java
Log:
[JBWS-2074] documenting java code
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.java 2009-04-03 09:33:02 UTC (rev 9712)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.java 2009-04-03 11:22:21 UTC (rev 9713)
@@ -49,10 +49,12 @@
* java.lang.Boolean
*/
+ // XML driven injection
private Boolean boolean0;
private Boolean boolean1;
+ // XML driven injection
private void setBoolean1(Boolean b)
{
this.boolean1 = b;
@@ -62,10 +64,12 @@
* java.lang.Byte
*/
+ // XML driven injection
private Byte byte0;
private Byte byte1;
+ // XML driven injection
private void setByte1(Byte b)
{
this.byte1 = b;
@@ -75,10 +79,12 @@
* java.lang.Character
*/
+ // XML driven injection
private Character character0;
private Character character1;
+ // XML driven injection
private void setCharacter1(Character c)
{
this.character1 = c;
@@ -88,10 +94,12 @@
* java.lang.Short
*/
+ // XML driven injection
private Short short0;
private Short short1;
+ // XML driven injection
private void setShort1(Short i)
{
this.short1 = i;
@@ -101,10 +109,12 @@
* java.lang.Integer
*/
+ // XML driven injection
private Integer integer0;
private Integer integer1;
+ // XML driven injection
private void setInteger1(Integer i)
{
this.integer1 = i;
@@ -114,10 +124,12 @@
* java.lang.Long
*/
+ // XML driven injection
private Long long0;
private Long long1;
+ // XML driven injection
private void setLong1(Long l)
{
this.long1 = l;
@@ -127,10 +139,12 @@
* java.lang.Float
*/
+ // XML driven injection
private Float float0;
private Float float1;
+ // XML driven injection
private void setFloat1(Float f)
{
this.float1 = f;
@@ -140,10 +154,12 @@
* java.lang.Double
*/
+ // XML driven injection
private Double double0;
private Double double1;
+ // XML driven injection
private void setDouble1(Double d)
{
this.double1 = d;
@@ -153,10 +169,12 @@
* java.lang.String
*/
+ // XML driven injection
private String string0;
private String string1;
+ // XML driven injection
private void setString1(String s)
{
this.string1 = s;
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/service/EJB3Impl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/service/EJB3Impl.java 2009-04-03 09:33:02 UTC (rev 9712)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/service/EJB3Impl.java 2009-04-03 11:22:21 UTC (rev 9713)
@@ -51,10 +51,12 @@
* java.lang.Boolean
*/
+ // XML driven injection
private Boolean boolean0;
private Boolean boolean1;
+ // XML driven injection
private void setBoolean1(Boolean b)
{
this.boolean1 = b;
@@ -64,10 +66,12 @@
* java.lang.Byte
*/
+ // XML driven injection
private Byte byte0;
private Byte byte1;
+ // XML driven injection
private void setByte1(Byte b)
{
this.byte1 = b;
@@ -77,10 +81,12 @@
* java.lang.Character
*/
+ // XML driven injection
private Character character0;
private Character character1;
+ // XML driven injection
private void setCharacter1(Character c)
{
this.character1 = c;
@@ -90,10 +96,12 @@
* java.lang.Short
*/
+ // XML driven injection
private Short short0;
private Short short1;
+ // XML driven injection
private void setShort1(Short i)
{
this.short1 = i;
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOImpl.java 2009-04-03 09:33:02 UTC (rev 9712)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/service/POJOImpl.java 2009-04-03 11:22:21 UTC (rev 9713)
@@ -44,10 +44,12 @@
* java.lang.Boolean
*/
+ // XML driven injection
private Boolean boolean0;
private Boolean boolean1;
+ // XML driven injection
private void setBoolean1(Boolean b)
{
this.boolean1 = b;
@@ -57,10 +59,12 @@
* java.lang.Byte
*/
+ // XML driven injection
private Byte byte0;
private Byte byte1;
+ // XML driven injection
private void setByte1(Byte b)
{
this.byte1 = b;
@@ -70,10 +74,12 @@
* java.lang.Character
*/
+ // XML driven injection
private Character character0;
private Character character1;
+ // XML driven injection
private void setCharacter1(Character c)
{
this.character1 = c;
@@ -83,10 +89,12 @@
* java.lang.Short
*/
+ // XML driven injection
private Short short0;
private Short short1;
+ // XML driven injection
private void setShort1(Short i)
{
this.short1 = i;
15 years, 11 months
JBossWS SVN: r9712 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-04-03 05:33:02 -0400 (Fri, 03 Apr 2009)
New Revision: 9712
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2593] Excluding tests
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-04-03 09:29:52 UTC (rev 9711)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2009-04-03 09:33:02 UTC (rev 9712)
@@ -89,3 +89,6 @@
# [JBWS-2591] WSConsume does not generate @XmlList with doc/lit wsdl
org/jboss/test/ws/jaxws/jbws2591/**
+
+# [JBWS-2593] WSConsume does not generate @XmlJavaTypeAdapter in SEI
+org/jboss/test/ws/jaxws/jbws2593/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-04-03 09:29:52 UTC (rev 9711)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-04-03 09:33:02 UTC (rev 9712)
@@ -65,3 +65,6 @@
# [JBWS-2591] WSConsume does not generate @XmlList with doc/lit wsdl
org/jboss/test/ws/jaxws/jbws2591/**
+
+# [JBWS-2593] WSConsume does not generate @XmlJavaTypeAdapter in SEI
+org/jboss/test/ws/jaxws/jbws2593/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-04-03 09:29:52 UTC (rev 9711)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2009-04-03 09:33:02 UTC (rev 9712)
@@ -65,3 +65,6 @@
# [JBWS-2591] WSConsume does not generate @XmlList with doc/lit wsdl
org/jboss/test/ws/jaxws/jbws2591/**
+
+# [JBWS-2593] WSConsume does not generate @XmlJavaTypeAdapter in SEI
+org/jboss/test/ws/jaxws/jbws2593/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-04-03 09:29:52 UTC (rev 9711)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2009-04-03 09:33:02 UTC (rev 9712)
@@ -65,3 +65,6 @@
# [JBWS-2591] WSConsume does not generate @XmlList with doc/lit wsdl
org/jboss/test/ws/jaxws/jbws2591/**
+
+# [JBWS-2593] WSConsume does not generate @XmlJavaTypeAdapter in SEI
+org/jboss/test/ws/jaxws/jbws2593/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-04-03 09:29:52 UTC (rev 9711)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2009-04-03 09:33:02 UTC (rev 9712)
@@ -65,3 +65,6 @@
# [JBWS-2591] WSConsume does not generate @XmlList with doc/lit wsdl
org/jboss/test/ws/jaxws/jbws2591/**
+
+# [JBWS-2593] WSConsume does not generate @XmlJavaTypeAdapter in SEI
+org/jboss/test/ws/jaxws/jbws2593/**
15 years, 11 months
JBossWS SVN: r9711 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws/jbws2593 and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-04-03 05:29:52 -0400 (Fri, 03 Apr 2009)
New Revision: 9711
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2593/
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2593/JBWS2593TestCase.java
framework/trunk/testsuite/test/resources/jaxws/jbws2593/
framework/trunk/testsuite/test/resources/jaxws/jbws2593/wsdl/
framework/trunk/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestDOCService.wsdl
framework/trunk/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestRPCService.wsdl
Log:
[JBWS-2593] Adding testcases
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2593/JBWS2593TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2593/JBWS2593TestCase.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2593/JBWS2593TestCase.java 2009-04-03 09:29:52 UTC (rev 9711)
@@ -0,0 +1,131 @@
+/*
+ * 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.test.ws.jaxws.jbws2593;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * [JBWS-2593] WSConsume does not generate @XmlJavaTypeAdapter in SEI
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-2593
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 02-Apr-2009
+ */
+public class JBWS2593TestCase extends JBossWSTest
+{
+ private static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows
+ private static final String PS = System.getProperty("path.separator"); // ':' on unix, ';' on windows
+ private static final String EXT = ":".equals(PS) ? ".sh" : ".bat";
+
+ private String WSDL_LOCATION_RPC = "jaxws" + FS + "jbws2593" + FS + "wsdl" + FS + "JBWS2593TestRPCService.wsdl";
+
+ private String WSDL_LOCATION_DOC = "jaxws" + FS + "jbws2593" + FS + "wsdl" + FS + "JBWS2593TestDOCService.wsdl";
+
+ private String JBOSS_HOME;
+ private String TEST_DIR;
+
+ private String origJavaHome;
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ JBOSS_HOME = System.getProperty("jboss.home");
+ TEST_DIR = createResourceFile("..").getAbsolutePath();
+ origJavaHome = System.getProperty("java.home");
+
+ // the script requires the system JAVA_HOME, which points to the JDK not the JRE
+ if (origJavaHome.indexOf(FS + "jre") != -1)
+ {
+ String JDK_HOME = origJavaHome.substring(0, origJavaHome.indexOf(FS + "jre"));
+ System.setProperty("java.home", JDK_HOME);
+ }
+ }
+
+ protected void tearDown() throws Exception
+ {
+ // reset surefire's JAVA_HOME
+ System.setProperty("java.home", origJavaHome);
+ }
+
+ public void testRPC() throws Exception
+ {
+ this.internalTest(true);
+ }
+
+ public void testDOC() throws Exception
+ {
+ this.internalTest(false);
+ }
+
+ private void internalTest(boolean rpc) throws Exception
+ {
+ // use absolute path for the output to be re-usable
+ String absWsdlLoc = getResourceFile(rpc ? WSDL_LOCATION_RPC : WSDL_LOCATION_DOC).getAbsolutePath();
+ String absOutput = new File(TEST_DIR, "wsconsume" + FS + "java").getAbsolutePath();
+ String command = JBOSS_HOME + FS + "bin" + FS + "wsconsume" + EXT + " -v -k -o " + absOutput + " " + absWsdlLoc;
+ executeCommand(command, "wsconsume");
+ File javaSource = new File(TEST_DIR, "wsconsume" + FS + "java" + FS + "org" + FS + "jbws2593_" + (rpc ? "rpc" : "doc") + FS + "ParameterModeTest.java");
+ assertTrue("Service endpoint interface not generated", javaSource.exists());
+ String contents = readFile(javaSource);
+ assertEquals(2, countOccurrences(contents, "@XmlJavaTypeAdapter"));
+ assertEquals(2, countOccurrences(contents, "HexBinaryAdapter.class"));
+ }
+
+ public static int countOccurrences(String string, String textToSearchFor)
+ {
+ int count = 0;
+ int index = 0;
+ while ((index = string.indexOf(textToSearchFor, index)) != -1)
+ {
+ ++index;
+ ++count;
+ }
+ return count;
+ }
+
+ private static String readFile(File file) throws Exception
+ {
+ BufferedReader input = new BufferedReader(new FileReader(file));
+ StringBuilder sb = new StringBuilder();
+ try
+ {
+ String line = null;
+ while ((line = input.readLine()) != null)
+ {
+ sb.append(line);
+ sb.append(System.getProperty("line.separator"));
+ }
+ }
+ finally
+ {
+ input.close();
+ }
+ return sb.toString();
+ }
+
+}
Property changes on: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2593/JBWS2593TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestDOCService.wsdl
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestDOCService.wsdl (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestDOCService.wsdl 2009-04-03 09:29:52 UTC (rev 9711)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://jbws2593-doc.org/" xmlns:s="http://jbws2593-doc.org/xsd" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" name="ParameterModeTest" targetNamespace="http://jbws2593-doc.org/">
+ <types>
+ <xsd:schema targetNamespace="http://jbws2593-doc.org/xsd" elementFormDefault="qualified">
+ <xsd:element name="HexBinaryElement" type="xsd:hexBinary"/>
+ </xsd:schema>
+ </types>
+ <message name="inSimpleTypesRequest">
+ <part name="varHexBinary" element="s:HexBinaryElement" />
+ </message>
+ <message name="inSimpleTypesResponse">
+ <part name="return" element="s:HexBinaryElement" />
+ </message>
+ <portType name="ParameterModeTest">
+ <operation name="echoInSimpleTypes">
+ <input message="tns:inSimpleTypesRequest" />
+ <output message="tns:inSimpleTypesResponse" />
+ </operation>
+ </portType>
+ <binding name="ParameterModeTestBinding" type="tns:ParameterModeTest">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+ <operation name="echoInSimpleTypes">
+ <soap:operation soapAction="" />
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="ParameterModeTestService">
+ <port name="ParameterModeTestPort" binding="tns:ParameterModeTestBinding">
+ <soap:address location="http://localhost:8000/W2JRLParameterModeTest/jaxws/ParameterModeTest" />
+ </port>
+ </service>
+</definitions>
+
Property changes on: framework/trunk/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestDOCService.wsdl
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestRPCService.wsdl
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestRPCService.wsdl (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestRPCService.wsdl 2009-04-03 09:29:52 UTC (rev 9711)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://jbws2593-rpc.org/" xmlns:s="http://jbws2593-rpc.org/xsd" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" name="ParameterModeTest" targetNamespace="http://jbws2593-rpc.org/">
+ <types/>
+ <message name="inSimpleTypesRequest">
+ <part name="varBase64Binary" type="xsd:base64Binary" />
+ <part name="varHexBinary" type="xsd:hexBinary" />
+ </message>
+ <message name="inSimpleTypesResponse">
+ <part name="return" type="xsd:hexBinary" />
+ </message>
+ <portType name="ParameterModeTest">
+ <operation name="echoInSimpleTypes" parameterOrder="varBase64Binary varHexBinary">
+ <input message="tns:inSimpleTypesRequest" />
+ <output message="tns:inSimpleTypesResponse" />
+ </operation>
+ </portType>
+ <binding name="ParameterModeTestBinding" type="tns:ParameterModeTest">
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" />
+ <operation name="echoInSimpleTypes">
+ <soap:operation soapAction="" />
+ <input>
+ <soap:body use="literal" namespace="http://ParameterModeTest.org/" />
+ </input>
+ <output>
+ <soap:body use="literal" namespace="http://ParameterModeTest.org/" />
+ </output>
+ </operation>
+ </binding>
+ <service name="ParameterModeTestService">
+ <port name="ParameterModeTestPort" binding="tns:ParameterModeTestBinding">
+ <soap:address location="http://localhost:8000/W2JRLParameterModeTest/jaxws/ParameterModeTest" />
+ </port>
+ </service>
+</definitions>
+
Property changes on: framework/trunk/testsuite/test/resources/jaxws/jbws2593/wsdl/JBWS2593TestRPCService.wsdl
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 11 months