JBossWS SVN: r3227 - trunk/build.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-24 07:42:45 -0400 (Thu, 24 May 2007)
New Revision: 3227
Modified:
trunk/build/version.properties
Log:
Set version to 'snapshot'
Modified: trunk/build/version.properties
===================================================================
--- trunk/build/version.properties 2007-05-24 11:22:14 UTC (rev 3226)
+++ trunk/build/version.properties 2007-05-24 11:42:45 UTC (rev 3227)
@@ -6,7 +6,7 @@
specification.version=jbossws-2.1
version.id=2.1.0.DEV
-repository.id=SNAPSHOT
+repository.id=snapshot
implementation.title=JBoss Web Services - JBossWS
implementation.url=http://www.jboss.org/products/jbossws
18 years, 11 months
- 1
- 0
JBossWS SVN: r3226 - in branches/jbossws-2.0: jbossws-core/src/java/org/jboss/ws/metadata/umdm and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-05-24 07:22:14 -0400 (Thu, 24 May 2007)
New Revision: 3226
Modified:
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/WrappedParameter.java
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java
Log:
Regard attachment annotation on any parameter type
Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-05-24 11:21:05 UTC (rev 3225)
+++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-05-24 11:22:14 UTC (rev 3226)
@@ -23,38 +23,8 @@
// $Id$
-import java.io.File;
-import java.io.InputStream;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.rmi.RemoteException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import javax.jws.HandlerChain;
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPMessageHandlers;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.xml.bind.JAXBException;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.ParameterMode;
-import javax.xml.ws.BindingType;
-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 com.sun.xml.bind.api.JAXBRIContext;
+import com.sun.xml.bind.api.TypeReference;
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
@@ -75,25 +45,39 @@
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData;
import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-import org.jboss.ws.metadata.umdm.FaultMetaData;
-import org.jboss.ws.metadata.umdm.OperationMetaData;
-import org.jboss.ws.metadata.umdm.ParameterMetaData;
-import org.jboss.ws.metadata.umdm.TypeMappingMetaData;
-import org.jboss.ws.metadata.umdm.TypesMetaData;
-import org.jboss.ws.metadata.umdm.WrappedParameter;
+import org.jboss.ws.metadata.umdm.*;
import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
-import org.jboss.ws.metadata.wsdl.WSDLBinding;
-import org.jboss.ws.metadata.wsdl.WSDLBindingMessageReference;
-import org.jboss.ws.metadata.wsdl.WSDLBindingOperation;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.ws.metadata.wsdl.WSDLMIMEPart;
+import org.jboss.ws.metadata.wsdl.*;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.Unmarshaller;
import org.jboss.xb.binding.UnmarshallerFactory;
-import com.sun.xml.bind.api.JAXBRIContext;
-import com.sun.xml.bind.api.TypeReference;
+import javax.jws.*;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
+import javax.jws.soap.SOAPMessageHandlers;
+import javax.xml.bind.JAXBException;
+import javax.xml.namespace.QName;
+import javax.xml.rpc.ParameterMode;
+import javax.xml.ws.BindingType;
+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 java.io.File;
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.rmi.RemoteException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
/**
* Abstract class that represents a JAX-WS metadata builder.
@@ -657,14 +641,7 @@
wrappedOutputParameters.add(wrappedParameter);
}
- AttachmentScanResult asr = ReflectiveAttachmentRefScanner.getResultByIndex(scanResult, i);
- if(asr!=null)
- {
- if(AttachmentScanResult.Type.SWA_REF == asr.getType())
- wrappedParameter.setSwaRef(true);
- else
- wrappedParameter.setXop(true);
- }
+ processAttachmentAnnotationsWrapped(scanResult, i, wrappedParameter);
}
else
{
@@ -694,6 +671,7 @@
javaTypes.add(javaType);
typeRefs.add(new TypeReference(xmlName, genericType, parameterAnnotations[i]));
+ processAttachmentAnnotations(scanResult, i, paramMetaData);
processMIMEBinding(epMetaData, opMetaData, paramMetaData);
}
}
@@ -720,14 +698,7 @@
// insert at the beginning just for prettiness
wrappedOutputParameters.add(0, wrapped);
- AttachmentScanResult asr = ReflectiveAttachmentRefScanner.getResultByIndex(scanResult, -1);
- if(asr!=null)
- {
- if(AttachmentScanResult.Type.SWA_REF == asr.getType())
- wrapped.setSwaRef(true);
- else
- wrapped.setXop(true);
- }
+ processAttachmentAnnotationsWrapped(scanResult, -1, wrapped);
}
else
{
@@ -760,6 +731,7 @@
javaTypes.add(returnType);
typeRefs.add(new TypeReference(xmlName, genericReturnType, method.getAnnotations()));
+ processAttachmentAnnotations(scanResult, -1, retMetaData);
processMIMEBinding(epMetaData, opMetaData, retMetaData);
}
}
@@ -797,6 +769,42 @@
processMetaExtensions(method, epMetaData, opMetaData);
}
+ /**
+ * @see org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilder#processAttachmentAnnotations(java.util.List, int, org.jboss.ws.metadata.umdm.ParameterMetaData)
+ * @param scanResult
+ * @param i
+ * @param wrappedParameter
+ */
+ private void processAttachmentAnnotationsWrapped(List<AttachmentScanResult> scanResult, int i, WrappedParameter wrappedParameter)
+ {
+ AttachmentScanResult asr = ReflectiveAttachmentRefScanner.getResultByIndex(scanResult, i);
+ if(asr!=null)
+ {
+ if(AttachmentScanResult.Type.SWA_REF == asr.getType())
+ wrappedParameter.setSwaRef(true);
+ else
+ wrappedParameter.setXOP(true);
+ }
+ }
+
+ /**
+ * Update PMD according to attachment annotations that might be in place
+ * @param scanResult
+ * @param i
+ * @param parameter
+ */
+ private void processAttachmentAnnotations(List<AttachmentScanResult> scanResult, int i, ParameterMetaData parameter)
+ {
+ AttachmentScanResult asr = ReflectiveAttachmentRefScanner.getResultByIndex(scanResult, i);
+ if(asr!=null)
+ {
+ if(AttachmentScanResult.Type.SWA_REF == asr.getType())
+ parameter.setSwaRef(true);
+ else
+ parameter.setXOP(true);
+ }
+ }
+
private void processMIMEBinding(EndpointMetaData epMetaData, OperationMetaData opMetaData, ParameterMetaData paramMetaData)
{
// process SWA metadata
Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/WrappedParameter.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2007-05-24 11:21:05 UTC (rev 3225)
+++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2007-05-24 11:22:14 UTC (rev 3226)
@@ -149,7 +149,7 @@
return xop;
}
- public void setXop(boolean xop)
+ public void setXOP(boolean xop)
{
this.xop = xop;
}
Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java 2007-05-24 11:21:05 UTC (rev 3225)
+++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java 2007-05-24 11:22:14 UTC (rev 3226)
@@ -38,7 +38,7 @@
DocumentPayload response = port.beanAnnotation(new DocumentPayload(data));
assertTrue(response.getData().getContent().equals("Server data"));
}
-
+
/*public void testParameterAnnotationWithBare() throws Exception
{
Service service = Service.create(new URL(bareEndpointURL +"?wsdl"), bareServiceQName);
@@ -81,7 +81,6 @@
/*public void testParameterAnnotationWithRPC() throws Exception
{
- //System.out.println("FIXME [JBWS-1460]: @XmlMimeType and @XmlAttachmentRef on SEI parameter declarations");
Service service = Service.create(new URL(rpclitEndpointURL+"?wsdl"), rpcLitServiceQName);
RpcLitEndpoint port = service.getPort(RpcLitEndpoint.class);
18 years, 11 months
- 1
- 0
JBossWS SVN: r3225 - branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-05-24 07:21:05 -0400 (Thu, 24 May 2007)
New Revision: 3225
Modified:
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java
Log:
Revision tag
Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java 2007-05-24 11:20:41 UTC (rev 3224)
+++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java 2007-05-24 11:21:05 UTC (rev 3225)
@@ -45,8 +45,7 @@
* In order to re-use an instance of this class you need to invoke <code>reset()</code>
* in between scans.
*
- * @author Heiko Braun <heiko.braun(a)jboss.com>
- * @version $Id: OperationMetaData.java 3220 2007-05-24 10:21:49Z heiko.braun(a)jboss.com $
+ * @author Heiko Braun <heiko.braun(a)jboss.com>
* @since 04.12.2006
*
*/
18 years, 11 months
- 1
- 0
JBossWS SVN: r3224 - branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-05-24 07:20:41 -0400 (Thu, 24 May 2007)
New Revision: 3224
Modified:
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java
Log:
Revision tag
Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java 2007-05-24 11:19:11 UTC (rev 3223)
+++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java 2007-05-24 11:20:41 UTC (rev 3224)
@@ -46,7 +46,7 @@
* in between scans.
*
* @author Heiko Braun <heiko.braun(a)jboss.com>
- * @version $Id: $
+ * @version $Id: OperationMetaData.java 3220 2007-05-24 10:21:49Z heiko.braun(a)jboss.com $
* @since 04.12.2006
*
*/
18 years, 11 months
- 1
- 0
JBossWS SVN: r3223 - branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-05-24 07:19:11 -0400 (Thu, 24 May 2007)
New Revision: 3223
Modified:
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java
Log:
Revision tag
Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java 2007-05-24 11:06:17 UTC (rev 3222)
+++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java 2007-05-24 11:19:11 UTC (rev 3223)
@@ -46,7 +46,7 @@
* in between scans.
*
* @author Heiko Braun <heiko.braun(a)jboss.com>
- * @version $Id$
+ * @version $Id: $
* @since 04.12.2006
*
*/
18 years, 11 months
- 1
- 0
JBossWS SVN: r3222 - branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-05-24 07:06:17 -0400 (Thu, 24 May 2007)
New Revision: 3222
Modified:
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/AttachmentMarshallerImpl.java
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/AttachmentUnmarshallerImpl.java
Log:
Update documentation
Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/AttachmentMarshallerImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/AttachmentMarshallerImpl.java 2007-05-24 10:26:46 UTC (rev 3221)
+++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/AttachmentMarshallerImpl.java 2007-05-24 11:06:17 UTC (rev 3222)
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.extensions.xop.jaxws;
import javax.activation.DataHandler;
@@ -13,6 +34,21 @@
import org.jboss.ws.core.soap.attachment.MimeConstants;
import org.jboss.ws.extensions.xop.XOPContext;
+/**
+ * Enable JAXB marshalling to optimize storage of binary data.<br>
+ * This API enables an efficient cooperative creation of optimized binary data formats between a JAXB marshalling process
+ * and a MIME-based package processor. A JAXB implementation marshals the root body of a MIME-based package,
+ * delegating the creation of referenceable MIME parts to the MIME-based package processor
+ * that implements this abstraction.<p>
+ * XOP processing is enabled when <code>isXOPPackage()</code> is true.
+ * See <code>addMtomAttachment(DataHandler, String, String)</code> for details.
+ * <p>
+ * WS-I Attachment Profile 1.0 is supported by <code>addSwaRefAttachment(DataHandler)</code>
+ * being called by the marshaller for each JAXB property related to {http://ws-i.org/profiles/basic/1.1/xsd}swaRef.
+ *
+ * @author <a href="heiko.braun(a)jboss.com">Heiko Braun</a>
+ * @version $Revision: 3220 $
+ */
public class AttachmentMarshallerImpl extends AttachmentMarshaller
{
// provide logging
Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/AttachmentUnmarshallerImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/AttachmentUnmarshallerImpl.java 2007-05-24 10:26:46 UTC (rev 3221)
+++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/AttachmentUnmarshallerImpl.java 2007-05-24 11:06:17 UTC (rev 3222)
@@ -1,20 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.extensions.xop.jaxws;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
+import org.jboss.ws.WSException;
+import org.jboss.ws.core.soap.attachment.ContentHandlerRegistry;
+import org.jboss.ws.extensions.xop.XOPContext;
import javax.activation.DataHandler;
import javax.xml.bind.attachment.AttachmentUnmarshaller;
import javax.xml.soap.AttachmentPart;
import javax.xml.soap.SOAPException;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
-import org.jboss.ws.WSException;
-import org.jboss.ws.core.soap.attachment.ContentHandlerRegistry;
-import org.jboss.ws.core.soap.MessageContextAssociation;
-import org.jboss.ws.core.soap.SOAPMessageImpl;
-import org.jboss.ws.core.CommonMessageContext;
-import org.jboss.ws.extensions.xop.XOPContext;
-
+/**
+ * <p>Enables JAXB unmarshalling of a root document containing optimized binary data formats.</p>
+ *
+ * <p>This API enables an efficient cooperative processing of optimized
+ * binary data formats between a JAXB 2.0 implementation and MIME-based package
+ * processor (MTOM/XOP and WS-I AP 1.0). JAXB unmarshals the body of a package, delegating the
+ * understanding of the packaging format being used to a MIME-based
+ * package processor that implements this abstract class.</p>
+ *
+ * <p>This abstract class identifies if a package requires XOP processing, <a href="../../../../javax/xml/bind/attachment/AttachmentUnmarshaller.html#isXOPPackage%28%29"><code>isXOPPackage()</code></a> and provides retrieval of binary content stored as attachments by content-id.</p>
+ *
+ * <h2>Identifying the content-id, cid, to pass to <code>getAttachment*(String cid)</code></h2>
+ * <ul>
+ * <li>
+ * For XOP processing, the infoset representation of the cid is described in step 2a in
+ * <a href="http://www.w3.org/TR/2005/REC-xop10-20050125/#interpreting_xop_packages">Section 3.2 Interpreting XOP Packages</a>
+ * </li>
+ *
+ * <li>
+ * For WS-I AP 1.0, the cid is identified as an element or attribute of type <code>ref:swaRef </code> specified in
+ * <a href="http://www.ws-i.org/Profiles/AttachmentsProfile-1.0-2004-08-24.html#Refer...">Section 4.4 Referencing Attachments from the SOAP Envelope</a>
+ * </li>
+ * </ul>
+ * <p>
+ */
public class AttachmentUnmarshallerImpl extends AttachmentUnmarshaller
{
18 years, 11 months
- 1
- 0
JBossWS SVN: r3221 - branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/xop.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-05-24 06:26:46 -0400 (Thu, 24 May 2007)
New Revision: 3221
Modified:
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java
Log:
Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java 2007-05-24 10:21:49 UTC (rev 3220)
+++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java 2007-05-24 10:26:46 UTC (rev 3221)
@@ -51,20 +51,20 @@
public void testFieldAnnotation() throws Exception
{
- AttachmentScanResult mimeType = SCANNER.scan(FieldAnnotation.class);
+ AttachmentScanResult mimeType = SCANNER.scanBean(FieldAnnotation.class);
assertNotNull("Unable to find xop declaration", mimeType);
assertEquals("text/xml", mimeType.getMimeType());
}
public void testMethodAnnotation() throws Exception
{
- AttachmentScanResult mimeType = SCANNER.scan(MethodAnnotation.class);
+ AttachmentScanResult mimeType = SCANNER.scanBean(MethodAnnotation.class);
assertNotNull("Unable to find xop declaration", mimeType);
}
public void testAnnotationMissing() throws Exception
{
- AttachmentScanResult mimeType = SCANNER.scan(NoAnnotation.class);
+ AttachmentScanResult mimeType = SCANNER.scanBean(NoAnnotation.class);
assertNull("There should be no mimeType available", mimeType);
}
@@ -82,20 +82,20 @@
System.out.println(m.getParameterAnnotations().length);
- AttachmentScanResult mimeType = SCANNER.scan( m.getParameterTypes()[0]);
+ AttachmentScanResult mimeType = SCANNER.scanBean( m.getParameterTypes()[0]);
assertNotNull("Unable to find xop declaration", mimeType);
assertEquals("text/xml", mimeType.getMimeType());
}
public void testSimpleRecursion() throws Exception
{
- AttachmentScanResult mimeType = SCANNER.scan(SimpleRecursion.class);
+ AttachmentScanResult mimeType = SCANNER.scanBean(SimpleRecursion.class);
assertNull(mimeType);
}
public void testComplexRecursion() throws Exception
{
- AttachmentScanResult mimeType = SCANNER.scan(ComplexRecursion.class);
+ AttachmentScanResult mimeType = SCANNER.scanBean(ComplexRecursion.class);
assertNotNull("Unable to find xop declaration", mimeType);
assertEquals("text/plain", mimeType.getMimeType());
}
18 years, 11 months
- 1
- 0
JBossWS SVN: r3220 - in branches/jbossws-2.0: jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-05-24 06:21:49 -0400 (Thu, 24 May 2007)
New Revision: 3220
Added:
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/DocumentPayloadWithoutRef.java
Modified:
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/AttachmentScanResult.java
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java
branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/WrappedParameter.java
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpoint.java
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.java
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpoint.java
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpointImpl.java
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpoint.java
branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java
Log:
Copy attachment annotations to wrapper beans
Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2007-05-23 15:14:01 UTC (rev 3219)
+++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2007-05-24 10:21:49 UTC (rev 3220)
@@ -35,11 +35,7 @@
import javassist.NotFoundException;
import javassist.bytecode.ConstPool;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.*;
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
@@ -112,7 +108,12 @@
for (WrappedParameter parameter : wrappedParameters)
{
- addProperty(clazz, parameter.getType(), parameter.getName(), parameter.getVariable(), parameter.getTypeArguments());
+ addProperty(
+ clazz, parameter.getType(),
+ parameter.getName(), parameter.getVariable(),
+ parameter.getTypeArguments(),
+ new boolean[] {parameter.isSwaRef(), parameter.isXop()}
+ );
}
clazz.stopPruning(!prune);
pool.toClass(clazz, loader);
@@ -146,7 +147,11 @@
addClassAnnotations(clazz, fmd.getXmlName(), fmd.getXmlType(), propertyOrder);
for (String property : propertyOrder)
- addProperty(clazz, properties.get(property).getName(), new QName(property), property, null);
+ addProperty(
+ clazz, properties.get(property).getName(),
+ new QName(property), property, null,
+ new boolean[] {false, false}
+ );
clazz.stopPruning(!prune);
pool.toClass(clazz, loader);
@@ -188,7 +193,9 @@
return "(" + type + ")V";
}
- private void addProperty(CtClass clazz, String typeName, QName name, String variable, String[] typeArguments)
+ private void addProperty(CtClass clazz, String typeName,
+ QName name, String variable, String[] typeArguments,
+ boolean[] attachments)
throws CannotCompileException, NotFoundException
{
ConstPool constPool = clazz.getClassFile().getConstPool();
@@ -210,6 +217,19 @@
annotation.addParameter("namespace", name.getNamespaceURI());
annotation.addParameter("name", name.getLocalPart());
annotation.markField(field);
+
+ // @XmlAttachmentRef
+ if(attachments[0])
+ {
+ annotation = JavassistUtils.createAnnotation(XmlAttachmentRef.class, constPool);
+ annotation.markField(field);
+ }
+ // @XmlMimeType
+ if(attachments[1])
+ {
+ annotation = JavassistUtils.createAnnotation(XmlMimeType.class, constPool);
+ annotation.markField(field);
+ }
clazz.addField(field);
// Add accessor methods
@@ -248,5 +268,6 @@
annotation = JavassistUtils.createAnnotation(XmlAccessorType.class, constPool);
annotation.addParameter("value", XmlAccessType.FIELD);
annotation.markClass(clazz);
+
}
}
Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/AttachmentScanResult.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/AttachmentScanResult.java 2007-05-23 15:14:01 UTC (rev 3219)
+++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/AttachmentScanResult.java 2007-05-24 10:21:49 UTC (rev 3220)
@@ -33,6 +33,9 @@
private String mimeType;
private Type type;
+ // distinguish return value and method parameters
+ private int index = -1;
+
public AttachmentScanResult(String mimeType, Type type)
{
this.mimeType = mimeType;
@@ -48,4 +51,25 @@
{
return type;
}
+
+ /**
+ * <code>
+ * <pre>
+ * -1 - return value
+ * 0 - 1st method parameter
+ * n - n'th method parameter
+ * </pre>
+ * </code>
+ *
+ * @return
+ */
+ public int getIndex()
+ {
+ return index;
+ }
+
+ public void setIndex(int index)
+ {
+ this.index = index;
+ }
}
Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java 2007-05-23 15:14:01 UTC (rev 3219)
+++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/extensions/xop/jaxws/ReflectiveAttachmentRefScanner.java 2007-05-24 10:21:49 UTC (rev 3220)
@@ -30,6 +30,7 @@
import java.awt.*;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.List;
@@ -71,7 +72,7 @@
* @param xmlRoot
* @return the first matching XmlMimeType#value() or <code>null</code> if none found
*/
- public AttachmentScanResult scan(Class xmlRoot)
+ public AttachmentScanResult scanBean(Class xmlRoot)
{
if( isJDKType(xmlRoot) ) return null;
@@ -103,7 +104,7 @@
if(null == result) // try getter methods
{
- result = scanGetterAnnotation(xmlRoot, field);
+ result = scanGetterAnnotation(xmlRoot, field);
}
// avoid recursive loops
@@ -112,7 +113,7 @@
// drill down if none found so far
if(null == result)
- result = scan(type);
+ result = scanBean(type);
}
@@ -121,6 +122,85 @@
return result;
}
+ public static List<AttachmentScanResult> scanMethod(Method method)
+ {
+ List<AttachmentScanResult> results = new ArrayList<AttachmentScanResult>();
+
+ // return type
+ if(method.getReturnType() != void.class)
+ {
+
+ AttachmentScanResult result = null;
+
+ if(method.isAnnotationPresent(XmlAttachmentRef.class))
+ {
+ result = new AttachmentScanResult("application/octet-stream", AttachmentScanResult.Type.SWA_REF);
+ }
+ else if (method.isAnnotationPresent(XmlMimeType.class))
+ {
+ XmlMimeType mimeTypeDecl = method.getAnnotation(XmlMimeType.class);
+ new AttachmentScanResult(mimeTypeDecl.value(), AttachmentScanResult.Type.XOP);
+ }
+
+ if(result!=null)
+ {
+ result.setIndex(-1); // default for return values
+ results.add(result);
+ }
+
+ }
+
+ // method parameter
+ int ordinate = 0;
+ for (Annotation[] parameterAnnotations : method.getParameterAnnotations())
+ {
+ if (parameterAnnotations!=null)
+ {
+ for (Annotation annotation : parameterAnnotations)
+ {
+ AttachmentScanResult paramResult = null;
+
+ if(XmlAttachmentRef.class == annotation.annotationType())
+ {
+ paramResult = new AttachmentScanResult("application/octet-stream", AttachmentScanResult.Type.SWA_REF);
+ }
+ else if(XmlMimeType.class == annotation.annotationType())
+ {
+ XmlMimeType mimeTypeDecl = method.getAnnotation(XmlMimeType.class);
+ paramResult = new AttachmentScanResult(mimeTypeDecl.value(), AttachmentScanResult.Type.XOP);
+ }
+
+ if(paramResult!=null)
+ {
+ paramResult.setIndex(ordinate);
+ ordinate++;
+ results.add(paramResult);
+
+ }
+ }
+ }
+ }
+
+
+ return results;
+ }
+
+ public static AttachmentScanResult getResultByIndex(List<AttachmentScanResult> results, int index)
+ {
+ AttachmentScanResult result = null;
+
+ for(AttachmentScanResult asr : results)
+ {
+ if(asr.getIndex() == index)
+ {
+ result = asr;
+ break;
+ }
+ }
+
+ return result;
+ }
+
private boolean alreadyScanned(Field field)
{
@@ -167,7 +247,7 @@
}
else if(method.isAnnotationPresent(XmlAttachmentRef.class))
{
- return new AttachmentScanResult("application/octet-stream", AttachmentScanResult.Type.SWA_REF);
+ return new AttachmentScanResult("application/octet-stream", AttachmentScanResult.Type.SWA_REF);
}
}
Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-05-23 15:14:01 UTC (rev 3219)
+++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-05-24 10:21:49 UTC (rev 3220)
@@ -67,6 +67,8 @@
import org.jboss.ws.core.utils.JavaUtils;
import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl;
import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt;
+import org.jboss.ws.extensions.xop.jaxws.AttachmentScanResult;
+import org.jboss.ws.extensions.xop.jaxws.ReflectiveAttachmentRefScanner;
import org.jboss.ws.metadata.acessor.JAXBAccessor;
import org.jboss.ws.metadata.builder.MetaDataBuilder;
import org.jboss.ws.metadata.j2ee.serviceref.HandlerChainsObjectFactory;
@@ -583,6 +585,10 @@
epMetaData.addOperation(opMetaData);
// Build parameter meta data
+
+ // Attachment annotations on SEI parameters
+ List<AttachmentScanResult> scanResult = ReflectiveAttachmentRefScanner.scanMethod(method);
+
Class[] parameterTypes = method.getParameterTypes();
Type[] genericTypes = method.getGenericParameterTypes();
Annotation[][] parameterAnnotations = method.getParameterAnnotations();
@@ -650,6 +656,15 @@
wrappedParameter = new WrappedParameter(wrappedParameter);
wrappedOutputParameters.add(wrappedParameter);
}
+
+ AttachmentScanResult asr = ReflectiveAttachmentRefScanner.getResultByIndex(scanResult, i);
+ if(asr!=null)
+ {
+ if(AttachmentScanResult.Type.SWA_REF == asr.getType())
+ wrappedParameter.setSwaRef(true);
+ else
+ wrappedParameter.setXop(true);
+ }
}
else
{
@@ -704,6 +719,15 @@
// insert at the beginning just for prettiness
wrappedOutputParameters.add(0, wrapped);
+
+ AttachmentScanResult asr = ReflectiveAttachmentRefScanner.getResultByIndex(scanResult, -1);
+ if(asr!=null)
+ {
+ if(AttachmentScanResult.Type.SWA_REF == asr.getType())
+ wrapped.setSwaRef(true);
+ else
+ wrapped.setXop(true);
+ }
}
else
{
Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/OperationMetaData.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-05-23 15:14:01 UTC (rev 3219)
+++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-05-24 10:21:49 UTC (rev 3220)
@@ -23,16 +23,6 @@
// $Id$
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.ParameterMode;
-
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxrpc.Style;
@@ -42,6 +32,15 @@
import org.jboss.ws.metadata.umdm.EndpointMetaData.Type;
import org.w3c.dom.Element;
+import javax.jws.soap.SOAPBinding.ParameterStyle;
+import javax.xml.namespace.QName;
+import javax.xml.rpc.ParameterMode;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
/**
* An Operation component describes an operation that a given interface supports.
*
@@ -244,7 +243,7 @@
ParameterMetaData returnMetaData = getReturnParameter();
if (returnMetaData != null && !returnMetaData.matchParameter(method, matches, exact))
-return false;
+ return false;
// We should have an entry for every parameter index if we match
return matches.size() == paramTypes.length;
@@ -462,12 +461,15 @@
// reset java method
javaMethod = null;
+ // parameter
for (ParameterMetaData parameter : parameters)
parameter.eagerInitialize();
+ // return value
if (returnParam != null)
returnParam.eagerInitialize();
+ // faults
for (FaultMetaData fault : faults)
fault.eagerInitialize();
Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-05-23 15:14:01 UTC (rev 3219)
+++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2007-05-24 10:21:49 UTC (rev 3220)
@@ -489,7 +489,7 @@
if (epType == Type.JAXWS)
{
ReflectiveAttachmentRefScanner scanner = new ReflectiveAttachmentRefScanner();
- AttachmentScanResult scanResult = scanner.scan(javaType);
+ AttachmentScanResult scanResult = scanner.scanBean(javaType);
if (scanResult != null)
{
if(log.isDebugEnabled()) log.debug("Identified attachment reference: " + xmlName + ", type="+scanResult.getType());
Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/WrappedParameter.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2007-05-23 15:14:01 UTC (rev 3219)
+++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2007-05-24 10:21:49 UTC (rev 3220)
@@ -41,6 +41,8 @@
private boolean holder = false;
private int index = -2;
private Accessor accessor;
+ private boolean swaRef;
+ private boolean xop;
public WrappedParameter(WrappedParameter wrapped)
{
@@ -131,6 +133,27 @@
this.accessor = accessor;
}
+
+ public boolean isSwaRef()
+ {
+ return swaRef;
+ }
+
+ public void setSwaRef(boolean swaRef)
+ {
+ this.swaRef = swaRef;
+ }
+
+ public boolean isXop()
+ {
+ return xop;
+ }
+
+ public void setXop(boolean xop)
+ {
+ this.xop = xop;
+ }
+
public String toString()
{
return "[name = " + getName() + ", type = " + getType() + ", typeArgs = " + JavaUtils.printArray(getTypeArguments()) + ", variable = " + getVariable()
Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpoint.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpoint.java 2007-05-23 15:14:01 UTC (rev 3219)
+++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpoint.java 2007-05-24 10:21:49 UTC (rev 3220)
@@ -4,6 +4,8 @@
import javax.jws.WebMethod;
import javax.jws.soap.SOAPBinding;
import javax.ejb.Remote;
+import javax.xml.bind.annotation.XmlAttachmentRef;
+import java.rmi.RemoteException;
@WebService(name="BareEndpoint")
@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, parameterStyle = SOAPBinding.ParameterStyle.BARE)
@@ -11,8 +13,9 @@
public interface BareEndpoint
{
@WebMethod
- void submitAttachment(DocumentPayload payload);
+ DocumentPayload beanAnnotation(DocumentPayload payload) throws RemoteException;
@WebMethod
- DocumentPayload retrieveAttachment();
+ @XmlAttachmentRef
+ DocumentPayloadWithoutRef parameterAnnotation(@XmlAttachmentRef DocumentPayloadWithoutRef payload) throws RemoteException;
}
Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.java 2007-05-23 15:14:01 UTC (rev 3219)
+++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/BareEndpointImpl.java 2007-05-24 10:21:49 UTC (rev 3220)
@@ -1,11 +1,15 @@
package org.jboss.test.ws.jaxws.samples.swaref;
import org.jboss.ws.annotation.WebContext;
+import org.jboss.ws.WSException;
import javax.jws.WebService;
+import javax.jws.WebMethod;
import javax.ejb.Stateless;
import javax.activation.DataHandler;
+import javax.xml.bind.annotation.XmlAttachmentRef;
import java.io.IOException;
+import java.rmi.RemoteException;
@Stateless
@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.swaref.BareEndpoint")
@@ -13,21 +17,33 @@
public class BareEndpointImpl implements BareEndpoint
{
- public void submitAttachment(DocumentPayload payload)
+ public DocumentPayload beanAnnotation(DocumentPayload payload) throws RemoteException
{
try
{
System.out.println("Got '" + payload.getData().getContent() +"'");
+ return new DocumentPayload( new DataHandler("Server data", "text/plain"));
}
catch (IOException e)
{
- e.printStackTrace();
+ throw new WSException(e);
}
}
- public DocumentPayload retrieveAttachment()
+ @WebMethod
+ @XmlAttachmentRef
+ public DocumentPayloadWithoutRef parameterAnnotation(@XmlAttachmentRef DocumentPayloadWithoutRef payload) throws RemoteException
{
- DataHandler data = new DataHandler("Server data", "text/plain");
- return new DocumentPayload(data);
+ try
+ {
+ if(null == payload) throw new WSException("Payload was null");
+ System.out.println("Got " + payload.getData().getContent());
+ DataHandler dataHandler = new DataHandler("Server data", "text/plain");
+ return new DocumentPayloadWithoutRef(dataHandler);
+ }
+ catch (IOException e)
+ {
+ throw new WSException(e);
+ }
}
}
Added: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/DocumentPayloadWithoutRef.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/DocumentPayloadWithoutRef.java (rev 0)
+++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/DocumentPayloadWithoutRef.java 2007-05-24 10:21:49 UTC (rev 3220)
@@ -0,0 +1,35 @@
+package org.jboss.test.ws.jaxws.samples.swaref;
+
+import javax.activation.DataHandler;
+import javax.xml.bind.annotation.XmlAttachmentRef;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * Document that's not annotated with @XmlAttachmentRef
+ */
+@XmlRootElement
+public class DocumentPayloadWithoutRef
+{
+ private DataHandler data;
+
+ public DocumentPayloadWithoutRef()
+ {
+ }
+
+ public DocumentPayloadWithoutRef(DataHandler data)
+ {
+ this.data = data;
+ }
+
+ @XmlElement
+ public DataHandler getData()
+ {
+ return data;
+ }
+
+ public void setData(DataHandler data)
+ {
+ this.data = data;
+ }
+}
Property changes on: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/DocumentPayloadWithoutRef.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpoint.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpoint.java 2007-05-23 15:14:01 UTC (rev 3219)
+++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpoint.java 2007-05-24 10:21:49 UTC (rev 3220)
@@ -15,5 +15,8 @@
{
@WebMethod
@XmlAttachmentRef
- DataHandler echo(@XmlAttachmentRef DataHandler data) throws RemoteException;
+ DataHandler parameterAnnotation(@XmlAttachmentRef DataHandler data) throws RemoteException;
+
+ @WebMethod
+ DocumentPayload beanAnnotation(DocumentPayload payload) throws RemoteException;
}
Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpointImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpointImpl.java 2007-05-23 15:14:01 UTC (rev 3219)
+++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/RpcLitEndpointImpl.java 2007-05-24 10:21:49 UTC (rev 3220)
@@ -17,7 +17,7 @@
{
@WebMethod
- public DataHandler echo(DataHandler data) throws RemoteException
+ public DataHandler parameterAnnotation(DataHandler data) throws RemoteException
{
try
{
@@ -30,4 +30,19 @@
}
}
+
+ @WebMethod
+ public DocumentPayload beanAnnotation(DocumentPayload payload) throws RemoteException
+ {
+ try
+ {
+ System.out.println("Got " + payload.getData().getContent() );
+ DataHandler data = new DataHandler("Server data", "text/plain");
+ return new DocumentPayload(data);
+ }
+ catch (IOException e)
+ {
+ throw new WSException(e);
+ }
+ }
}
Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java 2007-05-23 15:14:01 UTC (rev 3219)
+++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java 2007-05-24 10:21:49 UTC (rev 3220)
@@ -5,13 +5,14 @@
import org.jboss.test.ws.JBossWSTestSetup;
import javax.xml.ws.Service;
-import javax.xml.ws.BindingProvider;
import javax.xml.namespace.QName;
import javax.activation.DataHandler;
import java.net.URL;
/**
- * TODO: same test with doclit wrapped, currently the scanner fails on generated wrapper
+ * Test SwARef with different binding styles and @XmlAttachmentRef locations.
+ *
+ * @author Heiko.Braun(a)jboss.com
*/
public class SWARefTestCase extends JBossWSTest
{
@@ -30,41 +31,64 @@
return JBossWSTestSetup.newTestSetup(SWARefTestCase.class, "jaxws-samples-swaref.jar");
}
- public void testSubmitAttachment() throws Exception
+ public void testBeanAnnotationWithBare() throws Exception
{
Service service = Service.create(new URL(bareEndpointURL +"?wsdl"), bareServiceQName);
BareEndpoint port = service.getPort(BareEndpoint.class);
- port.submitAttachment(new DocumentPayload(data));
+ DocumentPayload response = port.beanAnnotation(new DocumentPayload(data));
+ assertTrue(response.getData().getContent().equals("Server data"));
}
- public void testRetrieveAttachment() throws Exception {
+ /*public void testParameterAnnotationWithBare() throws Exception
+ {
Service service = Service.create(new URL(bareEndpointURL +"?wsdl"), bareServiceQName);
BareEndpoint port = service.getPort(BareEndpoint.class);
- DocumentPayload response = port.retrieveAttachment();
+
+ DocumentPayloadWithoutRef response = port.parameterAnnotation(new DocumentPayloadWithoutRef(data));
assertTrue(response.getData().getContent().equals("Server data"));
+ }*/
+
+ public void testBeanAnnotationWithWrapped() throws Exception
+ {
+ Service service = Service.create(new URL(wrappedEndpointURL+"?wsdl"), wrappedServiceQName);
+ WrappedEndpoint port = service.getPort(WrappedEndpoint.class);
+
+ DocumentPayload response = port.beanAnnotation(new DocumentPayload(data), "Wrapped test");
+ assertTrue(response.getData().getContent().equals("Server data"));
+
}
- public void testWrappedEndpoint() throws Exception
+ public void testParameterAnnotationWithWrapped() throws Exception
{
Service service = Service.create(new URL(wrappedEndpointURL+"?wsdl"), wrappedServiceQName);
WrappedEndpoint port = service.getPort(WrappedEndpoint.class);
- DocumentPayload response = port.echo(new DocumentPayload(data), "Wrapped test");
+ DataHandler response = port.parameterAnnotation(data, "Wrapped test");
+ assertNotNull("Response as null", response);
+ assertTrue("Contents are not equal", response.getContent().equals("Server data"));
+ }
+
+ public void testBeanAnnotationWithRPC() throws Exception
+ {
+ Service service = Service.create(new URL(rpclitEndpointURL+"?wsdl"), rpcLitServiceQName);
+ RpcLitEndpoint port = service.getPort(RpcLitEndpoint.class);
+
+ DocumentPayload response = port.beanAnnotation( new DocumentPayload(data));
+ assertNotNull("Response was null", response);
assertTrue(response.getData().getContent().equals("Server data"));
}
- public void testRpcLitEndpoint() throws Exception
+ /*public void testParameterAnnotationWithRPC() throws Exception
{
- System.out.println("FIXME [JBWS-1460]: @XmlMimeType and @XmlAttachmentRef on SEI parameter declarations");
- /*Service service = Service.create(new URL(rpclitEndpointURL+"?wsdl"), rpcLitServiceQName);
+ //System.out.println("FIXME [JBWS-1460]: @XmlMimeType and @XmlAttachmentRef on SEI parameter declarations");
+ Service service = Service.create(new URL(rpclitEndpointURL+"?wsdl"), rpcLitServiceQName);
RpcLitEndpoint port = service.getPort(RpcLitEndpoint.class);
- DataHandler response = port.echo(data);
+ DataHandler response = port.parameterAnnotation(data);
assertNotNull("Response was null", response);
assertTrue(response.getContent().equals("Server data"));
- */
- }
+ }*/
}
Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpoint.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpoint.java 2007-05-23 15:14:01 UTC (rev 3219)
+++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpoint.java 2007-05-24 10:21:49 UTC (rev 3220)
@@ -3,15 +3,19 @@
import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.ejb.Remote;
+import javax.activation.DataHandler;
+import javax.xml.bind.annotation.XmlAttachmentRef;
import java.rmi.RemoteException;
@Remote
@WebService
public interface WrappedEndpoint
{
- /* (non-Javadoc)
- * @see org.jboss.ws.test.TestService#echo(javax.activation.DataHandler)
- */
@WebMethod
- DocumentPayload echo(DocumentPayload dhw, String test) throws RemoteException;
+ DocumentPayload beanAnnotation(DocumentPayload dhw, String test) throws RemoteException;
+
+ @WebMethod
+ @XmlAttachmentRef
+ DataHandler parameterAnnotation(@XmlAttachmentRef DataHandler data, String test) throws RemoteException;
+
}
Modified: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java 2007-05-23 15:14:01 UTC (rev 3219)
+++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/swaref/WrappedEndpointImpl.java 2007-05-24 10:21:49 UTC (rev 3220)
@@ -1,14 +1,17 @@
package org.jboss.test.ws.jaxws.samples.swaref;
import org.jboss.ws.annotation.WebContext;
+import org.jboss.ws.WSException;
import javax.activation.DataHandler;
import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.ejb.Stateless;
+import javax.xml.bind.annotation.XmlAttachmentRef;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.io.IOException;
import java.rmi.RemoteException;
@Stateless
@@ -17,10 +20,10 @@
public class WrappedEndpointImpl implements WrappedEndpoint
{
/* (non-Javadoc)
- * @see org.jboss.ws.test.TestService#echo(javax.activation.DataHandler)
+ * @see org.jboss.ws.test.TestService#parameterAnnotation(javax.activation.DataHandler)
*/
@WebMethod
- public DocumentPayload echo(DocumentPayload dhw, String test) throws RemoteException
+ public DocumentPayload beanAnnotation(DocumentPayload dhw, String test) throws RemoteException
{
DataHandler dh;
@@ -55,8 +58,21 @@
}
+ @WebMethod
+ @XmlAttachmentRef
+ public DataHandler parameterAnnotation(@XmlAttachmentRef DataHandler data, String test) throws RemoteException
+ {
+ try
+ {
+ System.out.println("Got " + data.getContent());
+ return new DataHandler("Server data", "text/plain");
+ }
+ catch (IOException e)
+ {
+ throw new WSException(e);
+ }
+ }
-
private static void dumpDH(DataHandler in_dh) throws Exception
{
InputStream is = in_dh.getInputStream();
18 years, 11 months
- 1
- 0
JBossWS SVN: r3219 - in trunk: integration/jbws/ant-import and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-05-23 11:14:01 -0400 (Wed, 23 May 2007)
New Revision: 3219
Added:
trunk/build/etc/bindist.properties
trunk/integration/jbws/ant-import/macros-deploy-jbws.xml
trunk/integration/sunri/ant-import/build-distribution.xml
trunk/integration/sunri/ant-import/macros-deploy-sunri.xml
trunk/integration/sunri/src/main/etc/bindist-build.xml
Modified:
trunk/integration/jbws/ant-import/build-deploy.xml
trunk/integration/sunri/ant-import/build-deploy.xml
trunk/integration/sunri/build.xml
Log:
Start bin-dist
Added: trunk/build/etc/bindist.properties
===================================================================
--- trunk/build/etc/bindist.properties (rev 0)
+++ trunk/build/etc/bindist.properties 2007-05-23 15:14:01 UTC (rev 3219)
@@ -0,0 +1,24 @@
+#
+# A sample ant properties file
+#
+# $Id: ant.properties.example 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $
+
+# Optional JBoss Home
+jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3
+jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA
+
+# The JBoss server under test. This can be [jboss50|jboss42]
+jbossws.integration.target=jboss50
+
+# The JBoss server instance
+jboss.server.instance=default
+
+# JBoss Repository
+#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
+jboss.repository=http://repository.jboss.org
+
+# Java Compiler options
+javac.debug=yes
+javac.deprecation=yes
+javac.fail.onerror=yes
+javac.verbose=no
Modified: trunk/integration/jbws/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-23 14:52:07 UTC (rev 3218)
+++ trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-23 15:14:01 UTC (rev 3219)
@@ -13,159 +13,42 @@
<project>
+ <import file="${int.jbws.dir}/ant-import/macros-deploy-jbws.xml"/>
+
<!-- ================================================================== -->
<!-- Deployment JBoss50 -->
<!-- ================================================================== -->
<!-- Deploy jbossws to jboss50 -->
- <target name="deploy-jboss50" depends="jars-jbws50,undeploy-jboss50" description="Deploy jbossws to jboss50">
-
- <copy todir="${jboss50.home}/client" overwrite="true">
- <fileset dir="${core.dir}/output/lib">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- </fileset>
- <fileset dir="${core.dir}/thirdparty">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="wsdl4j.jar"/>
- <include name="jbossws-wsconsume-impl.jar"/>
- </fileset>
- <fileset dir="${int.jboss50.dir}/output/lib">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss50.home}/lib" overwrite="true">
- <fileset dir="${core.dir}/thirdparty">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="${spi.dir}/output/lib">
- <include name="jbossws-spi.jar"/>
- </fileset>
- <fileset dir="${int.jboss50.dir}/output/lib">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- <fileset dir="${core.dir}/output/lib">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${jbws.output.lib.dir}/jbossws-jbws50-deployer.zip"/>
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jbws.output.lib.dir}/jbossws-jbws50.sar"/>
- <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${jbws.output.lib.dir}/jbossws-context.war" overwrite="true"/>
- <!-- Deploy juddi-service.sar -->
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="${core.dir}/thirdparty/juddi-service.sar"/>
+ <target name="deploy-jboss50" depends="jars-jbws50" description="Deploy jbossws to jboss50">
+ <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
+ <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
+ <macro-deploy-jbws50
+ spilibs="${spi.dir}/output/lib"
+ jbosslibs="${int.jboss50.dir}/output/lib"
+ corelibs="${core.dir}/output/lib"
+ jbwslibs="${int.jbws.dir}/output/lib"
+ thirdpartylibs="${core.dir}/thirdparty"/>
</target>
<!-- Remove jbossws from jboss50 -->
<target name="undeploy-jboss50" depends="prepare" description="Remove jbossws from jboss50">
-
- <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
-
- <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
- <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
-
- <delete>
- <fileset dir="${jboss50.home}/client">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="jbossws-wsconsume-impl.jar"/>
- </fileset>
- <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </delete>
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/>
- <!-- Undeploy juddi-service.sar -->
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <macro-undeploy-jbws50/>
</target>
<!-- Deploy jbossws to jboss42 -->
- <target name="deploy-jboss42" depends="jars-jbws42,undeploy-jboss42" description="Deploy jbossws to jboss42">
-
- <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
-
- <copy todir="${jboss42.home}/client" overwrite="true">
- <fileset dir="${core.dir}/output/lib">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- </fileset>
- <fileset dir="${core.dir}/thirdparty">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="wsdl4j.jar"/>
- <include name="jbossws-wsconsume-impl.jar"/>
- </fileset>
- <fileset dir="${int.jboss42.dir}/output/lib">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss42.home}/lib" overwrite="true">
- <fileset dir="${spi.dir}/output/lib">
- <include name="jbossws-spi.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="${int.jboss42.dir}/output/lib">
- <include name="jbossws-jboss42.jar"/>
- </fileset>
- <fileset dir="${core.dir}/output/lib">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
- <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="${jbws.output.lib.dir}/jbossws-jbws42.sar"/>
- <!-- Deploy juddi-service.sar -->
- <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="${core.dir}/thirdparty/juddi-service.sar"/>
+ <target name="deploy-jboss42" depends="jars-jbws42" description="Deploy jbossws to jboss42">
+ <macro-deploy-jbws42
+ spilibs="${spi.dir}/output/lib"
+ jbosslibs="${int.jboss42.dir}/output/lib"
+ corelibs="${core.dir}/output/lib"
+ jbwslibs="${int.jbws.dir}/output/lib"
+ thirdpartylibs="${core.dir}/thirdparty"/>
</target>
<!-- Remove jbossws from jboss42 -->
<target name="undeploy-jboss42" depends="prepare" description="Remove jbossws from jboss42">
-
- <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
-
- <delete>
- <fileset dir="${jboss42.home}/client">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- <include name="jbossws-client.jar"/>
- <include name="jbossws-wsconsume-impl.jar"/>
- </fileset>
- <fileset dir="${jboss42.home}/lib">
- <include name="jbossws-integration.jar"/> <!-- The old integration jar-->
- </fileset>
- <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </delete>
- <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <!-- Undeploy juddi-service.sar -->
- <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <macro-undeploy-jbws42/>
</target>
</project>
Added: trunk/integration/jbws/ant-import/macros-deploy-jbws.xml
===================================================================
--- trunk/integration/jbws/ant-import/macros-deploy-jbws.xml (rev 0)
+++ trunk/integration/jbws/ant-import/macros-deploy-jbws.xml 2007-05-23 15:14:01 UTC (rev 3219)
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBossWS/Native -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbws50">
+ <attribute name="spilibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="corelibs"/>
+ <attribute name="jbwslibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
+ <copy todir="${jboss50.home}/client" overwrite="true">
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="jbossws-wsconsume-impl.jar"/>
+ </fileset>
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss50.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{spilibs}">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{jbwslibs}/jbossws-jbws50-deployer.zip"/>
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{jbwslibs}/jbossws-jbws50.sar"/>
+ <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${jbws.output.lib.dir}/jbossws-context.war" overwrite="true"/>
+ <!-- Deploy juddi-service.sar -->
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-jbws42">
+ <attribute name="spilibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="corelibs"/>
+ <attribute name="jbwslibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
+ <copy todir="${jboss42.home}/client" overwrite="true">
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ <include name="wsdl4j.jar"/>
+ <include name="jbossws-wsconsume-impl.jar"/>
+ </fileset>
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss42.home}/lib" overwrite="true">
+ <fileset dir="@{spilibs}">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{jbwslibs}/jbossws-jbws42.sar"/>
+ <!-- Deploy juddi-service.sar -->
+ <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-jbws50">
+ <sequential>
+ <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
+ <delete>
+ <fileset dir="${jboss50.home}/client">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="jbossws-wsconsume-impl.jar"/>
+ </fileset>
+ <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/>
+ <!-- Undeploy juddi-service.sar -->
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-jbws42">
+ <sequential>
+ <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
+ <delete>
+ <fileset dir="${jboss42.home}/client">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ <include name="jbossws-client.jar"/>
+ <include name="jbossws-wsconsume-impl.jar"/>
+ </fileset>
+ <fileset dir="${jboss42.home}/lib">
+ <include name="jbossws-integration.jar"/> <!-- The old integration jar-->
+ </fileset>
+ <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </delete>
+ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <!-- Undeploy juddi-service.sar -->
+ <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ </sequential>
+ </macrodef>
+
+</project>
Property changes on: trunk/integration/jbws/ant-import/macros-deploy-jbws.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/sunri/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-23 14:52:07 UTC (rev 3218)
+++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-23 15:14:01 UTC (rev 3219)
@@ -13,50 +13,26 @@
<project>
+ <import file="${int.sunri.dir}/ant-import/macros-deploy-sunri.xml"/>
+
<!-- ================================================================== -->
<!-- Deployment JBoss50 -->
<!-- ================================================================== -->
<!-- Deploy jbossws/sunri to jboss50 -->
<target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/sunri to jboss50">
-
<ant antfile="${int.jbws.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
-
- <copy todir="${jboss50.home}/client" overwrite="true">
- <fileset dir="${thirdparty.dir}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- </fileset>
- <fileset dir="${int.jboss50.dir}/output/lib">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss50.home}/lib" overwrite="true">
- <fileset dir="${thirdparty.dir}">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </fileset>
- </copy>
- <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="${spi.dir}/output/lib">
- <include name="jbossws-spi.jar"/>
- </fileset>
- <fileset dir="${int.jboss50.dir}/output/lib">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
- </copy>
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
- <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="${sunri.output.lib.dir}/jbossws-sunri50-deployer.zip"/>
- <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
- <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="${sunri.output.lib.dir}/jbossws-sunri50.sar"/>
- <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${sunri.output.lib.dir}/jbossws-context.war" overwrite="true"/>
+ <macro-deploy-sunri50
+ spilibs="${spi.dir}/output/lib"
+ jbosslibs="${int.jboss50.dir}/output/lib"
+ sunrilibs="${int.sunri.dir}/output/lib"
+ thirdpartylibs="${int.sunri.dir}/thirdparty"/>
</target>
<!-- Remove jbossws/sunri from jboss50 -->
<target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50">
- <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <macro-undeploy-sunri50/>
</target>
</project>
Added: trunk/integration/sunri/ant-import/build-distribution.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-distribution.xml (rev 0)
+++ trunk/integration/sunri/ant-import/build-distribution.xml 2007-05-23 15:14:01 UTC (rev 3219)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Binary distribution JBossWS/SunRI -->
+ <!-- ================================================================== -->
+
+ <target name="binary-dist" depends="jars" description="Build the binary distribution">
+
+ <property name="bindist.dir" value="${sunri.output.dir}/jbossws-sunri-${version.id}"/>
+ <property name="bindist.build.dir" value="${bindist.dir}/build"/>
+ <property name="bindist.lib.dir" value="${bindist.dir}/lib"/>
+ <property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
+ <property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
+
+ <delete dir="${bindist.dir}"/>
+ <mkdir dir="${bindist.build.dir}"/>
+ <mkdir dir="${bindist.lib.dir}"/>
+ <mkdir dir="${bindist.docs.dir}"/>
+ <mkdir dir="${bindist.tests.dir}"/>
+
+ <!-- root -->
+ <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/etc/bindist.properties"/>
+ <copy tofile="${bindist.dir}/build.xml" file="${sunri.etc.dir}/bindist-build.xml"/>
+ <copy todir="${bindist.dir}" file="${sunri.dir}/version.properties"/>
+
+ <!-- build -->
+ <copy todir="${bindist.build.dir}">
+ <fileset dir="${build.dir}">
+ <include name="version.properties"/>
+ </fileset>
+ <fileset dir="${build.dir}/ant-import">
+ <include name="build-testsuite.xml"/>
+ </fileset>
+ <fileset dir="${int.jbws.dir}/ant-import">
+ <include name="macros-deploy-jbws.xml"/>
+ </fileset>
+ <fileset dir="${int.sunri.dir}/ant-import">
+ <include name="build-thirdparty.xml"/>
+ <include name="macros-deploy-sunri.xml"/>
+ </fileset>
+ <fileset dir="${testsuite.dir}/ant-import">
+ <include name="build-jars-jaxws.xml"/>
+ </fileset>
+ </copy>
+
+ <!-- docs -->
+ <copy todir="${bindist.docs.dir}">
+ <fileset dir="${build.dir}/etc">
+ <include name="JBossORG-EULA.txt"/>
+ </fileset>
+ </copy>
+
+ <!-- lib -->
+ <copy todir="${bindist.lib.dir}" overwrite="true">
+ <fileset dir="${spi.dir}/output/lib">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ <fileset dir="${int.jboss42.dir}/output/lib">
+ <include name="jbossws-jboss42.jar"/>
+ </fileset>
+ <fileset dir="${int.jboss50.dir}/output/lib">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="${int.sunri.dir}/output/lib">
+ <include name="jbossws-context.war"/>
+ <include name="jbossws-sunri42.sar"/>
+ <include name="jbossws-sunri50.sar"/>
+ <include name="jbossws-sunri50-deployer.zip"/>
+ </fileset>
+ </copy>
+
+ <!-- tests -->
+ <copy todir="${bindist.tests.dir}" overwrite="true">
+ <fileset dir="${testsuite.dir}">
+ <include name="src/**"/>
+ </fileset>
+ </copy>
+
+ <zip destfile="${sunri.output.dir}/jbossws-sunri-${version.id}.zip">
+ <fileset dir="${sunri.output.dir}" includes="jbossws-sunri-${version.id}/**"/>
+ </zip>
+ </target>
+
+</project>
Property changes on: trunk/integration/sunri/ant-import/build-distribution.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml
===================================================================
--- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml (rev 0)
+++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-05-23 15:14:01 UTC (rev 3219)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss50 -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-sunri50">
+ <attribute name="spilibs"/>
+ <attribute name="jbosslibs"/>
+ <attribute name="sunrilibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
+ <copy todir="${jboss50.home}/client" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
+ </fileset>
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss50.home}/lib" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ <include name="jaxb-impl.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true">
+ <fileset dir="@{spilibs}">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ <fileset dir="@{jbosslibs}">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>
+ <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{sunrilibs}/jbossws-sunri50-deployer.zip"/>
+ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src="@{sunrilibs}/jbossws-sunri50.sar"/>
+ <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="@{sunrilibs}/jbossws-context.war" overwrite="true"/>
+ </sequential>
+ </macrodef>
+
+ <!-- Remove jbossws/sunri from jboss50 -->
+ <macrodef name="macro-undeploy-sunri50">
+ <sequential>
+ <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/>
+ </sequential>
+ </macrodef>
+
+</project>
Property changes on: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/integration/sunri/build.xml
===================================================================
--- trunk/integration/sunri/build.xml 2007-05-23 14:52:07 UTC (rev 3218)
+++ trunk/integration/sunri/build.xml 2007-05-23 15:14:01 UTC (rev 3219)
@@ -16,6 +16,7 @@
<import file="${basedir}/build/ant-import/build-setup.xml"/>
<import file="${int.sunri.dir}/ant-import/build-deploy.xml"/>
+ <import file="${int.sunri.dir}/ant-import/build-distribution.xml"/>
<import file="${int.sunri.dir}/ant-import/build-release.xml"/>
<import file="${int.sunri.dir}/ant-import/build-testsuite.xml"/>
<import file="${int.sunri.dir}/ant-import/build-thirdparty.xml"/>
Added: trunk/integration/sunri/src/main/etc/bindist-build.xml
===================================================================
--- trunk/integration/sunri/src/main/etc/bindist-build.xml (rev 0)
+++ trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-05-23 15:14:01 UTC (rev 3219)
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project default="main" basedir="." name="JBossWS/SunRI">
+
+ <import file="${basedir}/build/build-deploy.xml"/>
+ <import file="${basedir}/build/build-testsuite.xml"/>
+ <import file="${basedir}/build/build-thirdparty.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="docs.dir" value="${basedir}/docs"/>
+ <property name="lib.dir" value="${basedir}/lib"/>
+ <property name="tests.dir" value="${basedir}/tests"/>
+
+ <property file="${basedir}/ant.properties"/>
+ <property file="${basedir}/version.properties"/>
+ <property file="${build.dir}/version.properties"/>
+
+ <property name="jboss50.lib" value="${jboss50.home}/lib"/>
+ <property name="jboss50.client" value="${jboss50.home}/client"/>
+ <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/>
+ <property name="jboss50.server.lib" value="${jboss50.server}/lib"/>
+ <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/>
+ <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/>
+
+ <property name="jboss42.lib" value="${jboss42.home}/lib"/>
+ <property name="jboss42.client" value="${jboss42.home}/client"/>
+ <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
+ <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
+ <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
+
+ <property name="jbossws.integration.${jbossws.integration.target}" value="true"/>
+
+ <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/>
+ <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/>
+
+ <available property="jboss50.available" file="${jboss50.available.file}"/>
+ <available property="jboss42.available" file="${jboss42.available.file}"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="tests-init" depends="tests-classpath">
+
+ <path id="ws.stack.classpath">
+ <pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/http.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jaxws-api.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jaxws-rt.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jaxws-tools.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jsr173_api.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jsr181-api.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jsr250-api.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/resolver.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/saaj-api.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/saaj-impl.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/sjsxp.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/stax-ex.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/streambuffer.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/wstx.jar"/>
+ </path>
+
+ <path id="tests.extra.classpath">
+ </path>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <!-- Copy resources -->
+ <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources.">
+ <macro-copy-resources srcdir="${tests.dir}"/>
+ </target>
+
+ <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments.">
+ <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/>
+ </target>
+
+ <target name="tests-main" depends="tests-jars" description="Build the deployments."/>
+
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ </target>
+
+ <target name="clobber" depends="clean" description="Cleans up all generated files.">
+ </target>
+
+ <target name="main" description="Executes the default target (most)." depends="most"/>
+
+ <target name="most" description="Builds almost everything." depends="tests-main"/>
+
+ <target name="all" description="Create a distribution zip file" depends="most">
+ </target>
+
+</project>
Property changes on: trunk/integration/sunri/src/main/etc/bindist-build.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 11 months
- 1
- 0
JBossWS SVN: r3218 - in trunk/integration: spi/src/main/java/org/jboss/wsf/spi/deployment and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: palin
Date: 2007-05-23 10:52:07 -0400 (Wed, 23 May 2007)
New Revision: 3218
Modified:
trunk/integration/jbws/build.xml
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java
Log:
Merging ws-policy impl from JBWS-856 branch (forgotten files)
Modified: trunk/integration/jbws/build.xml
===================================================================
--- trunk/integration/jbws/build.xml 2007-05-23 14:51:22 UTC (rev 3217)
+++ trunk/integration/jbws/build.xml 2007-05-23 14:52:07 UTC (rev 3218)
@@ -124,6 +124,7 @@
<include name="policy.jar"/>
<include name="wsdl4j.jar"/>
<include name="xmlsec.jar"/>
+ <include name="wstx.jar"/>
</fileset>
<metainf dir="${core.dir}/src/main/resources/standard-config">
<include name="standard-*-config.xml"/>
@@ -170,6 +171,7 @@
<include name="stax-api.jar"/>
<include name="wsdl4j.jar"/>
<include name="xmlsec.jar"/>
+ <include name="wstx.jar"/>
</fileset>
<fileset dir="${jbws.resources.dir}/jbossws-jbws42.sar">
<include name="jbossws.beans/**"/>
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java 2007-05-23 14:51:22 UTC (rev 3217)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java 2007-05-23 14:52:07 UTC (rev 3218)
@@ -105,7 +105,10 @@
if (deploymentPath.startsWith("jar:") && deploymentPath.endsWith("!/") == false)
deploymentPath += "!/";
-
+
+ if (deploymentPath.startsWith("war:") && deploymentPath.endsWith("!/") == false)
+ deploymentPath += "!/";
+
if (deploymentPath.endsWith("/") == false)
deploymentPath += "/";
18 years, 11 months
- 1
- 0