JBossWS SVN: r2086 - branches/jbossws-1.2.0/build/hudson/hudson-home/jobs.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-24 15:41:06 -0500 (Wed, 24 Jan 2007)
New Revision: 2086
Added:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0-jdk14/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/
Removed:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0-jdk14/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0-jdk14/
Log:
Rename jobs
Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0-jdk14 (from rev 2084, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0-jdk14)
Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14 (from rev 2084, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0-jdk14)
17 years, 9 months
JBossWS SVN: r2085 - branches/jbossws-1.2.0/build/hudson/hudson-home/jobs.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-24 15:39:46 -0500 (Wed, 24 Jan 2007)
New Revision: 2085
Added:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.2/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-5.0/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5/
Removed:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.2/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-5.0/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.2/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-5.0/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-4.0-jdk14/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-4.0/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-4.2/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-5.0/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Tomcat-5.5/
Log:
Rename jobs
Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.0 (from rev 2084, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.0)
Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-4.2 (from rev 2084, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-4.2)
Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/AS-5.0 (from rev 2084, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossAS-5.0)
Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0 (from rev 2084, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.0)
Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2 (from rev 2084, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-4.2)
Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0 (from rev 2084, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBossWS-AS-5.0)
Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/TC-5.5 (from rev 2084, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Tomcat-5.5)
17 years, 9 months
JBossWS SVN: r2084 - branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-24 13:08:36 -0500 (Wed, 24 Jan 2007)
New Revision: 2084
Modified:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java
Log:
Enable for jboss4x
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2007-01-24 18:05:52 UTC (rev 2083)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2007-01-24 18:08:36 UTC (rev 2084)
@@ -44,7 +44,7 @@
*/
public void testSOAPMessageToEndpointQueue() throws Exception
{
- if (isTargetJBoss())
+ if (isTargetJBoss50())
{
System.out.println("FIXME: [JBWS-1312] Fix JMS transport in trunk");
return;
17 years, 9 months
JBossWS SVN: r2083 - in branches/jbossws-1.2.0: jbossws-tests and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-24 13:05:52 -0500 (Wed, 24 Jan 2007)
New Revision: 2083
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java
branches/jbossws-1.2.0/jbossws-tests/build.xml
Log:
Fix jdk1.4 related issues
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2007-01-24 17:24:03 UTC (rev 2082)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2007-01-24 18:05:52 UTC (rev 2083)
@@ -63,8 +63,8 @@
private QName xmlType;
private String javaTypeName;
private String faultBeanName;
- private Class<? extends Exception> javaType;
- private Class<?> faultBean;
+ private Class javaType;
+ private Class faultBean;
private Method faultInfoMethod;
private Constructor<? extends Exception> serviceExceptionConstructor;
@@ -208,10 +208,13 @@
}
// Initialize the cache
- javaType = getJavaType().asSubclass(Exception.class);
+ javaType = getJavaType();
if (javaType == null)
throw new WSException("Cannot load java type: " + javaTypeName);
+ if (JavaUtils.isAssignableFrom(Exception.class, javaType) == false)
+ throw new WSException("Fault java type is not a java.lang.Exception: " + javaTypeName);
+
if (epType == EndpointMetaData.Type.JAXWS)
{
faultBean = getFaultBean();
@@ -244,7 +247,7 @@
{
/* For each getter in the exception and its superclasses, a property of
* the same type and name is added to the bean. */
- XmlType xmlType = faultBean.getAnnotation(XmlType.class);
+ XmlType xmlType = (XmlType)faultBean.getAnnotation(XmlType.class);
if (xmlType == null)
throw new WebServiceException("@XmlType missing from fault bean: " + faultBeanName);
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-01-24 17:24:03 UTC (rev 2082)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-01-24 18:05:52 UTC (rev 2083)
@@ -109,21 +109,25 @@
private static boolean matchParameter(Method method, int index, Class expectedType, Set<Integer> matches, boolean exact, boolean holder)
{
Class returnType = method.getReturnType();
- java.lang.reflect.Type[] genericParameters = method.getGenericParameterTypes();
- Class[] classParameters = method.getParameterTypes();
if (index == -1 && matchTypes(returnType, expectedType, exact, false))
return true;
+ Class[] classParameters = method.getParameterTypes();
if (index < 0 || index >= classParameters.length)
return false;
boolean matchTypes;
if (JavaUtils.isRetro14())
+ {
matchTypes = matchTypes(classParameters[index], expectedType, exact, holder);
- else
+ }
+ else
+ {
+ java.lang.reflect.Type[] genericParameters = method.getGenericParameterTypes();
matchTypes = matchTypes(genericParameters[index], expectedType, exact, holder);
+ }
if (matchTypes)
{
@@ -160,9 +164,7 @@
private static boolean matchTypesInternal(Class valueClass, Class expectedType, boolean exact)
{
- // FIXME - Why do we need this hack? It shouldn't be needed. The method
- // signature should _ALWAYS_ match, else we will get ambiguous or
- // incorrect results
+ // FIXME - Why do we need this hack? The method signature should _ALWAYS_ match, else we will get ambiguous or incorrect results
List<Class> anyTypes = new ArrayList<Class>();
anyTypes.add(javax.xml.soap.SOAPElement.class);
anyTypes.add(org.w3c.dom.Element.class);
Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-01-24 17:24:03 UTC (rev 2082)
+++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-01-24 18:05:52 UTC (rev 2083)
@@ -211,10 +211,6 @@
<javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}">
<src path="${tests.java.dir}"/>
- <exclude name="org/jboss/test/ws/interop/**"/>
- <exclude name="org/jboss/test/ws/jaxrpc/jbws718/**"/>
- <exclude name="org/jboss/test/ws/jaxrpc/wseventing/**"/>
- <exclude name="org/jboss/test/ws/jaxrpc/samples/wseventing/**"/>
<exclude name="org/jboss/test/ws/jaxws/**"/>
<exclude name="org/jboss/test/ws/tools/jsr181/**"/>
<classpath refid="javac.classpath"/>
17 years, 9 months
JBossWS SVN: r2082 - in branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws: core/utils and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-24 12:24:03 -0500 (Wed, 24 Jan 2007)
New Revision: 2082
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/JavaUtils.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveXOPScanner.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java
Log:
Refactor wrapper generation to be more explicit
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2007-01-24 15:12:07 UTC (rev 2081)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2007-01-24 17:24:03 UTC (rev 2082)
@@ -75,10 +75,7 @@
*/
public void generate(ParameterMetaData pmd)
{
- // If a wrapper already present, no need to generate one
String wrapperName = pmd.getJavaTypeName();
- if (JavaUtils.isLoaded(wrapperName, loader))
- return;
List<WrappedParameter> wrappedParameters = pmd.getWrappedParameters();
OperationMetaData opMetaData = pmd.getOperationMetaData();
@@ -119,11 +116,7 @@
public void generate(FaultMetaData fmd)
{
- // If a wrapper already present, no need to generate one
String faultBeanName = fmd.getFaultBeanName();
- if (faultBeanName == null || JavaUtils.isLoaded(faultBeanName, loader))
- return;
-
log.debug("Generating fault bean: " + faultBeanName);
QName xmlType = fmd.getXmlType();
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/JavaUtils.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/JavaUtils.java 2007-01-24 15:12:07 UTC (rev 2081)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/utils/JavaUtils.java 2007-01-24 17:24:03 UTC (rev 2082)
@@ -520,20 +520,6 @@
return c + source.substring(1);
}
- public static boolean isLoaded(String className, ClassLoader loader)
- {
- try
- {
- loadJavaType(className, loader);
- }
- catch (ClassNotFoundException e)
- {
- return false;
- }
-
- return true;
- }
-
public static String getPackageName(Class<?> clazz)
{
String fullName = clazz.getName();
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveXOPScanner.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveXOPScanner.java 2007-01-24 15:12:07 UTC (rev 2081)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveXOPScanner.java 2007-01-24 17:24:03 UTC (rev 2082)
@@ -21,17 +21,18 @@
*/
package org.jboss.ws.extensions.xop.jaxws;
-import org.jboss.ws.core.utils.JavaUtils;
-
-import javax.activation.DataHandler;
-import javax.xml.bind.annotation.XmlMimeType;
-import javax.xml.transform.Source;
-import java.awt.*;
+import java.awt.Image;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
+import javax.activation.DataHandler;
+import javax.xml.bind.annotation.XmlMimeType;
+import javax.xml.transform.Source;
+
+import org.jboss.ws.core.utils.JavaUtils;
+
/**
* Scans data types for MTOM declarations.
* In order to re-use an instance of this class you need to invoke <code>reset()</code>
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-01-24 15:12:07 UTC (rev 2081)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-01-24 17:24:03 UTC (rev 2082)
@@ -52,8 +52,8 @@
import javax.xml.ws.RequestWrapper;
import javax.xml.ws.ResponseWrapper;
import javax.xml.ws.WebFault;
+import javax.xml.ws.addressing.Action;
import javax.xml.ws.addressing.AddressingProperties;
-import javax.xml.ws.addressing.Action;
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
@@ -292,7 +292,7 @@
FaultMetaData fmd = new FaultMetaData(omd, xmlName, xmlType, exception.getName());
fmd.setFaultBeanName(faultBeanName);
- if (generate)
+ if (fmd.loadFaultBean() == null)
wrapperGenerator.generate(fmd);
javaTypes.add(fmd.getFaultBean());
@@ -718,16 +718,22 @@
// Generate wrapper beans
if (opMetaData.isDocumentWrapped())
{
- wrapperGenerator.generate(wrapperParameter);
+ if (wrapperParameter.loadWrapperBean() == null)
+ wrapperGenerator.generate(wrapperParameter);
+
Class wrapperClass = wrapperParameter.getJavaType();
javaTypes.add(wrapperClass);
+
// In case there is no @XmlRootElement
typeRefs.add(new TypeReference(wrapperParameter.getXmlName(), wrapperClass));
if (!opMetaData.isOneWay())
{
- wrapperGenerator.generate(wrapperOutputParameter);
+ if (wrapperOutputParameter.loadWrapperBean() == null)
+ wrapperGenerator.generate(wrapperOutputParameter);
+
wrapperClass = wrapperOutputParameter.getJavaType();
javaTypes.add(wrapperClass);
+
// In case there is no @XmlRootElement
typeRefs.add(new TypeReference(wrapperOutputParameter.getXmlName(), wrapperClass));
}
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2007-01-24 15:12:07 UTC (rev 2081)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2007-01-24 17:24:03 UTC (rev 2082)
@@ -42,6 +42,7 @@
import org.jboss.ws.core.utils.JavaUtils;
import org.jboss.ws.metadata.acessor.ReflectiveFieldAccessor;
import org.jboss.ws.metadata.acessor.ReflectiveMethodAccessor;
+import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
/**
* A Fault component describes a fault that a given operation supports.
@@ -65,7 +66,7 @@
private Class<? extends Exception> javaType;
private Class<?> faultBean;
- private Method getFaultInfoMethod;
+ private Method faultInfoMethod;
private Constructor<? extends Exception> serviceExceptionConstructor;
private Method[] serviceExceptionGetters;
@@ -156,6 +157,21 @@
this.faultBeanName = faultBeanName;
}
+ public Class loadFaultBean()
+ {
+ Class faultBean = null;
+ try
+ {
+ ClassLoader loader = getOperationMetaData().getEndpointMetaData().getClassLoader();
+ faultBean = JavaUtils.loadJavaType(faultBeanName, loader);
+ }
+ catch (ClassNotFoundException ex)
+ {
+ // ignore
+ }
+ return faultBean;
+ }
+
public Class getFaultBean()
{
Class tmpFaultBean = faultBean;
@@ -181,17 +197,27 @@
public void eagerInitialize()
{
- ClassLoader loader = opMetaData.getEndpointMetaData().getClassLoader();
- new DynamicWrapperGenerator(loader).generate(this);
+ Type epType = getOperationMetaData().getEndpointMetaData().getType();
+ if (epType == EndpointMetaData.Type.JAXWS && faultBeanName != null)
+ {
+ if (loadFaultBean() == null)
+ {
+ ClassLoader loader = opMetaData.getEndpointMetaData().getClassLoader();
+ new DynamicWrapperGenerator(loader).generate(this);
+ }
+ }
// Initialize the cache
javaType = getJavaType().asSubclass(Exception.class);
if (javaType == null)
throw new WSException("Cannot load java type: " + javaTypeName);
- faultBean = getFaultBean();
- if (faultBean != null)
- initializeFaultBean();
+ if (epType == EndpointMetaData.Type.JAXWS)
+ {
+ faultBean = getFaultBean();
+ if (faultBean != null)
+ initializeFaultBean();
+ }
}
private void initializeFaultBean()
@@ -209,7 +235,7 @@
* . WrapperException(String message, FaultBean faultInfo, Throwable cause)
* . FaultBean getFaultInfo() */
serviceExceptionConstructor = javaType.getConstructor(String.class, faultBean);
- getFaultInfoMethod = javaType.getMethod("getFaultInfo");
+ faultInfoMethod = javaType.getMethod("getFaultInfo");
}
/* JAX-WS 3.7: For exceptions that do not match the pattern described in
* section 2.5, JAX-WS maps those exceptions to Java beans and then uses
@@ -296,10 +322,10 @@
{
/* is the service exception a wrapper
* (i.e. does it match the pattern in JAX-WS 2.5)? */
- if (getFaultInfoMethod != null)
+ if (faultInfoMethod != null)
{
// extract the fault bean from the wrapper exception
- faultBeanInstance = getFaultInfoMethod.invoke(serviceException);
+ faultBeanInstance = faultInfoMethod.invoke(serviceException);
}
else
{
@@ -346,7 +372,7 @@
{
/* is the service exception a wrapper
* (i.e. does it match the pattern in JAX-WS 2.5)? */
- if (getFaultInfoMethod != null)
+ if (faultInfoMethod != null)
{
serviceException = serviceExceptionConstructor.newInstance(message, faultBean);
}
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-01-24 15:12:07 UTC (rev 2081)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-01-24 17:24:03 UTC (rev 2082)
@@ -24,7 +24,6 @@
// $Id$
import java.lang.reflect.Method;
-import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -43,6 +42,7 @@
import org.jboss.ws.core.utils.JavaUtils;
import org.jboss.ws.extensions.xop.jaxws.ReflectiveXOPScanner;
import org.jboss.ws.metadata.acessor.ReflectiveMethodAccessor;
+import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
/**
* A request/response parameter that a given operation supports.
@@ -109,7 +109,7 @@
private static boolean matchParameter(Method method, int index, Class expectedType, Set<Integer> matches, boolean exact, boolean holder)
{
Class returnType = method.getReturnType();
- Type[] genericParameters = method.getGenericParameterTypes();
+ java.lang.reflect.Type[] genericParameters = method.getGenericParameterTypes();
Class[] classParameters = method.getParameterTypes();
if (index == -1 && matchTypes(returnType, expectedType, exact, false))
@@ -134,12 +134,12 @@
return false;
}
- private static boolean matchTypes(Type actualType, Class expectedType, boolean exact, boolean holder)
+ private static boolean matchTypes(java.lang.reflect.Type actualType, Class expectedType, boolean exact, boolean holder)
{
if (holder && HolderUtils.isHolderType(actualType) == false)
return false;
- Type valueType = (holder ? HolderUtils.getValueType(actualType) : actualType);
+ java.lang.reflect.Type valueType = (holder ? HolderUtils.getValueType(actualType) : actualType);
Class valueClass = JavaUtils.erasure(valueType);
return matchTypesInternal(valueClass, expectedType, exact);
@@ -230,6 +230,21 @@
javaTypeName = typeName;
javaType = null;
}
+
+ public Class loadWrapperBean()
+ {
+ Class wrapperBean = null;
+ try
+ {
+ ClassLoader loader = getOperationMetaData().getEndpointMetaData().getClassLoader();
+ wrapperBean = JavaUtils.loadJavaType(javaTypeName, loader);
+ }
+ catch (ClassNotFoundException ex)
+ {
+ // ignore
+ }
+ return wrapperBean;
+ }
/** Load the java type.
* It should only be cached during eager initialization.
@@ -420,9 +435,16 @@
javaType = null;
// FIXME - Remove messageType hack
+ Type epType = getOperationMetaData().getEndpointMetaData().getType();
if (getOperationMetaData().isDocumentWrapped() && !isInHeader() && !isSwA() && !isMessageType())
{
- new DynamicWrapperGenerator(getClassLoader()).generate(this);
+ if (loadWrapperBean() == null)
+ {
+ if (epType == EndpointMetaData.Type.JAXRPC)
+ throw new WSException("Autogeneration of wrapper beans not supported with JAXRPC");
+
+ new DynamicWrapperGenerator(getClassLoader()).generate(this);
+ }
// Initialize accessors
AccessorFactory factory = accessorFactoryCreator.create(this);
@@ -435,19 +457,21 @@
throw new WSException("Cannot load java type: " + javaTypeName);
// check if the JavaType is an mtom parameter
- // TODO: this should only apply to JAX-WS and needs to happen outside UMD
- ReflectiveXOPScanner scanner = new ReflectiveXOPScanner();
- String mimeType = scanner.scan(javaType);
- if (mimeType != null)
+ if (epType == EndpointMetaData.Type.JAXWS)
{
- log.debug("MTOM parameter found: " + xmlName);
- setXOP(true);
+ ReflectiveXOPScanner scanner = new ReflectiveXOPScanner();
+ String mimeType = scanner.scan(javaType);
+ if (mimeType != null)
+ {
+ log.debug("MTOM parameter found: " + xmlName);
+ setXOP(true);
+ }
}
}
private ClassLoader getClassLoader()
{
- ClassLoader loader = opMetaData.getEndpointMetaData().getServiceMetaData().getUnifiedMetaData().getClassLoader();
+ ClassLoader loader = opMetaData.getEndpointMetaData().getClassLoader();
if (loader == null)
throw new WSException("ClassLoader not available");
return loader;
17 years, 9 months
JBossWS SVN: r2081 - in branches/jbossws-1.2.0/build/hudson/hudson-home/jobs: QA-ASTS-4.0 and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-24 10:12:07 -0500 (Wed, 24 Jan 2007)
New Revision: 2081
Added:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASTS-4.0-jdk14/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASTS-4.0/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASTS-4.2/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASTS-5.0/
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-4.0-jdk14/
Modified:
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASTS-4.0-jdk14/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASTS-4.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASTS-4.2/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASTS-5.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-4.0-jdk14/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-4.0/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-4.2/config.xml
branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-5.0/config.xml
Log:
Add jobs
Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASTS-4.0 (from rev 2075, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-4.0)
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASTS-4.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-4.0/config.xml 2007-01-24 13:43:05 UTC (rev 2075)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASTS-4.0/config.xml 2007-01-24 15:12:07 UTC (rev 2081)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=QA-AS-4.0
+MODULE=QA-ASTS-4.0
SVNBASENAME=(a)svn.basename@
HUDSON_HOME=(a)hudson.home@
SVNBASEDIR=$HUDSON_HOME/jobs/JBossWS-Build-All/workspace/$SVNBASENAME
@@ -35,8 +35,8 @@
#
# execute tests
#
-cd $SVNBASEDIR/jbossws-tests
-ant $ENVIRONMENT tests
+cd $JBOSS_INSTANCE/../../../testsuite
+./build.sh $ENVIRONMENT tests-webservice tests-report
#
# stop jbossas
@@ -47,7 +47,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults>
+ <testResults>../../JBossAS-4.0/workspace/trunk/teestsuite/output/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail@</recipients>
@@ -61,7 +61,7 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Test jbossws-(a)version.id@ against JBossAS-4.0</description>
+ <description>Run the JBossAS-4.0 webservice testsuite agains jbossws-(a)version.id@</description>
<keepDependencies>false</keepDependencies>
<properties/>
<actions class="vector"/>
Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASTS-4.0-jdk14 (from rev 2075, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-4.0)
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASTS-4.0-jdk14/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-4.0/config.xml 2007-01-24 13:43:05 UTC (rev 2075)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASTS-4.0-jdk14/config.xml 2007-01-24 15:12:07 UTC (rev 2081)
@@ -6,11 +6,11 @@
#
# Module settings
#
-MODULE=QA-AS-4.0
+MODULE=QA-ASTS-4.0-jdk14
SVNBASENAME=(a)svn.basename@
HUDSON_HOME=(a)hudson.home@
SVNBASEDIR=$HUDSON_HOME/jobs/JBossWS-Build-All/workspace/$SVNBASENAME
-JBOSS_INSTANCE=$HUDSON_HOME/jobs/JBossAS-4.0/workspace/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3
+JBOSS_INSTANCE=$HUDSON_HOME/jobs/JBossAS-4.0/workspace/Branch_4_0/build/output/jboss-4.0.5.SP1
ENVIRONMENT="-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE"
#
@@ -24,19 +24,20 @@
# deploy to jboss
#
cd $SVNBASEDIR/build
-ant $ENVIRONMENT deploy-jboss40
+ant $ENVIRONMENT deploy-jboss40-jdk14
#
# start jbossas
#
+export JAVA_HOME=(a)hudson.jdk14@
$JBOSS_INSTANCE/bin/jboss.sh start
sleep 30
#
# execute tests
#
-cd $SVNBASEDIR/jbossws-tests
-ant $ENVIRONMENT tests
+cd $JBOSS_INSTANCE/../../../testsuite
+./build.sh $ENVIRONMENT tests-webservice tests-report
#
# stop jbossas
@@ -47,7 +48,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults>
+ <testResults>../../JBossAS-4.0/workspace/trunk/teestsuite/output/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail@</recipients>
@@ -61,7 +62,7 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Test jbossws-(a)version.id@ against JBossAS-4.0</description>
+ <description>Run the JBossAS-4.0 webservice testsuite agains jbossws-(a)version.id@</description>
<keepDependencies>false</keepDependencies>
<properties/>
<actions class="vector"/>
Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASTS-4.2 (from rev 2075, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-4.2)
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASTS-4.2/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-4.2/config.xml 2007-01-24 13:43:05 UTC (rev 2075)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASTS-4.2/config.xml 2007-01-24 15:12:07 UTC (rev 2081)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=QA-AS-4.2
+MODULE=QA-ASTS-4.2
SVNBASENAME=(a)svn.basename@
HUDSON_HOME=(a)hudson.home@
SVNBASEDIR=$HUDSON_HOME/jobs/JBossWS-Build-All/workspace/$SVNBASENAME
@@ -35,8 +35,8 @@
#
# execute tests
#
-cd $SVNBASEDIR/jbossws-tests
-ant $ENVIRONMENT tests
+cd $JBOSS_INSTANCE/../../../testsuite
+./build.sh $ENVIRONMENT tests-webservice tests-report
#
# stop jbossas
@@ -47,7 +47,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults>
+ <testResults>../../JBossAS-4.2/workspace/trunk/teestsuite/output/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail@</recipients>
@@ -61,7 +61,7 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Test jbossws-(a)version.id@ against JBossAS-4.2</description>
+ <description>Run the JBossAS-4.2 webservice testsuite agains jbossws-(a)version.id@</description>
<keepDependencies>false</keepDependencies>
<properties/>
<actions class="vector"/>
Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASTS-5.0 (from rev 2075, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-5.0)
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASTS-5.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-5.0/config.xml 2007-01-24 13:43:05 UTC (rev 2075)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASTS-5.0/config.xml 2007-01-24 15:12:07 UTC (rev 2081)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=QA-AS-5.0
+MODULE=QA-ASTS-5.0
SVNBASENAME=(a)svn.basename@
HUDSON_HOME=(a)hudson.home@
SVNBASEDIR=$HUDSON_HOME/jobs/JBossWS-Build-All/workspace/$SVNBASENAME
@@ -35,8 +35,8 @@
#
# execute tests
#
-cd $SVNBASEDIR/jbossws-tests
-ant $ENVIRONMENT tests
+cd $JBOSS_INSTANCE/../../../testsuite
+./build.sh $ENVIRONMENT tests-webservice tests-report
#
# stop jbossas
@@ -47,7 +47,7 @@
</builders>
<publishers class="vector">
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>@svn.basename(a)/jbossws-tests/output/reports/*.xml</testResults>
+ <testResults>../../JBossAS-5.0/workspace/trunk/teestsuite/output/reports/*.xml</testResults>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
<recipients>@hudson.mail@</recipients>
@@ -61,7 +61,7 @@
<disabled>false</disabled>
<enableRemoteTrigger>false</enableRemoteTrigger>
<triggers class="vector"/>
- <description>Test jbossws-(a)version.id@ against JBossAS-5.0</description>
+ <description>Run the JBossAS-5.0 webservice testsuite agains jbossws-(a)version.id@</description>
<keepDependencies>false</keepDependencies>
<properties/>
<actions class="vector"/>
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-4.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-4.0/config.xml 2007-01-24 15:11:30 UTC (rev 2080)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-4.0/config.xml 2007-01-24 15:12:07 UTC (rev 2081)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=QA-AS-4.0
+MODULE=QA-ASWS-4.0
SVNBASENAME=(a)svn.basename@
HUDSON_HOME=(a)hudson.home@
SVNBASEDIR=$HUDSON_HOME/jobs/JBossWS-Build-All/workspace/$SVNBASENAME
Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-4.0-jdk14 (from rev 2075, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-4.0)
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-4.0-jdk14/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-4.0/config.xml 2007-01-24 13:43:05 UTC (rev 2075)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-4.0-jdk14/config.xml 2007-01-24 15:12:07 UTC (rev 2081)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=QA-AS-4.0
+MODULE=QA-ASWS-4.0
SVNBASENAME=(a)svn.basename@
HUDSON_HOME=(a)hudson.home@
SVNBASEDIR=$HUDSON_HOME/jobs/JBossWS-Build-All/workspace/$SVNBASENAME
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-4.2/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-4.2/config.xml 2007-01-24 15:11:30 UTC (rev 2080)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-4.2/config.xml 2007-01-24 15:12:07 UTC (rev 2081)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=QA-AS-4.2
+MODULE=QA-ASWS-4.2
SVNBASENAME=(a)svn.basename@
HUDSON_HOME=(a)hudson.home@
SVNBASEDIR=$HUDSON_HOME/jobs/JBossWS-Build-All/workspace/$SVNBASENAME
Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-5.0/config.xml
===================================================================
--- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-5.0/config.xml 2007-01-24 15:11:30 UTC (rev 2080)
+++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/QA-ASWS-5.0/config.xml 2007-01-24 15:12:07 UTC (rev 2081)
@@ -6,7 +6,7 @@
#
# Module settings
#
-MODULE=QA-AS-5.0
+MODULE=QA-ASWS-5.0
SVNBASENAME=(a)svn.basename@
HUDSON_HOME=(a)hudson.home@
SVNBASEDIR=$HUDSON_HOME/jobs/JBossWS-Build-All/workspace/$SVNBASENAME
17 years, 9 months
JBossWS SVN: r2080 - branches/jbossws-1.2.0/jbossws-tests.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-24 10:11:30 -0500 (Wed, 24 Jan 2007)
New Revision: 2080
Modified:
branches/jbossws-1.2.0/jbossws-tests/build.xml
Log:
Add jbossretro to classpath
Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-01-24 14:24:09 UTC (rev 2079)
+++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-01-24 15:11:30 UTC (rev 2080)
@@ -184,9 +184,11 @@
<path id="test.client.classpath">
<path refid="jbossws.jars.classpath"/>
<pathelement location="${jboss.client}/commons-logging.jar"/>
+ <pathelement location="${jboss.client}/jboss-backport-concurrent.jar"/>
<pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>
<pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/>
<pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/>
+ <pathelement location="${jboss.client}/jbossretro-rt.jar"/>
<pathelement location="${jboss.client}/log4j.jar"/>
<pathelement location="${jboss.client}/jbossall-client.jar"/>
<pathelement location="${jboss.lib}/jboss-vfs.jar"/>
17 years, 9 months
JBossWS SVN: r2079 - branches/jbossws-1.2.0/jbossws-tests/src/main/resources.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-24 09:24:09 -0500 (Wed, 24 Jan 2007)
New Revision: 2079
Added:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss40-noejb3-excludes.txt
Log:
Add jboss40 noejb excludes
Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss40-noejb3-excludes.txt
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss40-noejb3-excludes.txt (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss40-noejb3-excludes.txt 2007-01-24 14:24:09 UTC (rev 2079)
@@ -0,0 +1,16 @@
+org/jboss/test/ws/interop/**
+org/jboss/test/ws/jaxrpc/benchmark/**
+org/jboss/test/ws/jaxws/benchmark/**
+org/jboss/test/ws/jaxws/endpoint/**
+org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.*
+org/jboss/test/ws/jaxws/webserviceref/**
+
+# EJB3 excludes
+org/jboss/test/ws/jaxws/context/WebServiceContextEJBTestCase*
+org/jboss/test/ws/jaxws/eardeployment/**
+org/jboss/test/ws/jaxws/jbws944/**
+org/jboss/test/ws/jaxws/jbws981/**
+org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB3TestCase.*
+org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.*
+org/jboss/test/ws/jaxws/samples/retail/**
+org/jboss/test/ws/jaxws/xop/**
Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/tests-jboss40-noejb3-excludes.txt
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 9 months
JBossWS SVN: r2078 - branches/jbossws-1.2.0/integration-jboss40.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-24 09:20:45 -0500 (Wed, 24 Jan 2007)
New Revision: 2078
Modified:
branches/jbossws-1.2.0/integration-jboss40/build.xml
Log:
Fix jboss40-retro
Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml
===================================================================
--- branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-01-24 14:16:52 UTC (rev 2077)
+++ branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-01-24 14:20:45 UTC (rev 2078)
@@ -111,12 +111,12 @@
<pathelement location="${thirdparty.dir}/jbossretro.jar"/>
<pathelement location="${thirdparty.dir}/jboss-backport-concurrent.jar"/>
<pathelement location="${thirdparty.dir}/xercesImpl.jar"/>
- <pathelement path="${jboss42.output.classes.dir}"/>
+ <pathelement path="${jboss40.output.classes.dir}"/>
<pathelement path="${core.dir}/output/classes"/>
</classpath>
<classpath refid="core.classpath"/>
- <classpath refid="jboss42.integration.classpath"/>
- <src path="${jboss42.output.classes.dir}"/>
+ <classpath refid="jboss40.integration.classpath"/>
+ <src path="${jboss40.output.classes.dir}"/>
<src path="${core.dir}/output/classes"/>
</retro>
</target>
17 years, 9 months
JBossWS SVN: r2077 - branches/jbossws-1.2.0/integration-jboss40.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-24 09:16:52 -0500 (Wed, 24 Jan 2007)
New Revision: 2077
Modified:
branches/jbossws-1.2.0/integration-jboss40/build.xml
Log:
Exclude ejb3 classes if not available
Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml
===================================================================
--- branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-01-24 14:12:36 UTC (rev 2076)
+++ branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-01-24 14:16:52 UTC (rev 2077)
@@ -36,6 +36,7 @@
<target name="jboss40-init" depends="prepare, thirdparty">
<fail message="Not available: ${jboss40.client}/jboss-client.jar" unless="jboss40.available"/>
+ <available file="${jboss40.client}/jboss-ejb3-client.jar" property="jboss40.ejb3.available"/>
</target>
<!-- ================================================================== -->
@@ -50,19 +51,37 @@
| documentation compiles.
-->
- <target name="jboss40-compile" depends="jboss40-compile-classes,jboss40-compile-etc" description="Compile all source files."/>
+ <target name="jboss40-compile" depends="jboss40-compile-classes,jboss40-compile-ejb3-classes,jboss40-compile-etc"
+ description="Compile all source files."/>
<!-- Compile integration java sources -->
<target name="jboss40-compile-classes" depends="jboss40-init,core-compile">
<mkdir dir="${jboss40.output.classes.dir}"/>
- <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss40.output.classes.dir}"
+ encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<include name="org/jboss/ws/integration/jboss42/**"/>
+ <exclude name="org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java"/>
+ <exclude name="org/jboss/ws/integration/jboss42/ServiceEndpointGeneratorEJB3.java"/>
+ <exclude name="org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java"/>
<classpath refid="jboss40.integration.classpath"/>
<classpath path="${core.output.classes14.dir}"/>
<classpath path="${core.output.classes.dir}"/>
</javac>
</target>
+ <target name="jboss40-compile-ejb3-classes" depends="jboss40-init,core-compile" if="jboss40.ejb3.available">
+ <mkdir dir="${jboss40.output.classes.dir}"/>
+ <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss40.output.classes.dir}"
+ encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <include name="org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java"/>
+ <include name="org/jboss/ws/integration/jboss42/ServiceEndpointGeneratorEJB3.java"/>
+ <include name="org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java"/>
+ <classpath refid="jboss40.integration.classpath"/>
+ <classpath path="${core.output.classes14.dir}"/>
+ <classpath path="${core.output.classes.dir}"/>
+ </javac>
+ </target>
<!-- Compile etc files (manifests and such) -->
<target name="jboss40-compile-etc" depends="jboss40-init">
17 years, 9 months