JBossWS SVN: r12422 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-05 04:57:27 -0400 (Sat, 05 Jun 2010)
New Revision: 12422
Added:
stack/native/branches/jbossws-native-3.3.1.GA/
Log:
Branching for 3.3.1 release
Copied: stack/native/branches/jbossws-native-3.3.1.GA (from rev 12421, stack/native/trunk)
13 years, 11 months
JBossWS SVN: r12421 - stack/cxf/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-05 04:55:35 -0400 (Sat, 05 Jun 2010)
New Revision: 12421
Added:
stack/cxf/branches/jbossws-cxf-3.3.1.GA/
Log:
Branching for 3.3.1 release
Copied: stack/cxf/branches/jbossws-cxf-3.3.1.GA (from rev 12420, stack/cxf/trunk)
13 years, 11 months
JBossWS SVN: r12420 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-05 04:37:54 -0400 (Sat, 05 Jun 2010)
New Revision: 12420
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
Log:
[JBWS-3028] Excluding (at least temporarly) failing tests due to PicketBox api not available on AS 5.x
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-06-04 13:49:34 UTC (rev 12419)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-06-05 08:37:54 UTC (rev 12420)
@@ -65,3 +65,6 @@
# [JBWS-3002] Verify POJO endpoints are shared
org/jboss/test/ws/jaxws/jbws2486/**
+# [JBWS-3028] Complete UsernameToken JAAS integration: PicketBox not available
+# on AS 5.x
+org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-06-04 13:49:34 UTC (rev 12419)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-06-05 08:37:54 UTC (rev 12420)
@@ -65,3 +65,7 @@
# [JBWS-3002] Verify POJO endpoints are shared
org/jboss/test/ws/jaxws/jbws2486/**
+# [JBWS-3028] Complete UsernameToken JAAS integration: PicketBox not available
+# on AS 5.x
+org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.*
+
13 years, 11 months
JBossWS SVN: r12419 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/addressing.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-04 09:49:34 -0400 (Fri, 04 Jun 2010)
New Revision: 12419
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/addressing/AddressingPort.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/addressing/ServerHandler.java
Log:
Fixing testcase, no need to set the addressing action
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/addressing/AddressingPort.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/addressing/AddressingPort.java 2010-06-04 12:53:10 UTC (rev 12418)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/addressing/AddressingPort.java 2010-06-04 13:49:34 UTC (rev 12419)
@@ -98,8 +98,6 @@
MAPBuilder builder = MAPBuilderFactory.getInstance().getBuilderInstance();
MAPConstants ADDR = builder.newConstants();
MAP outProps = builder.newMap();
- outProps.setTo("uri:jaxrpc-samples-wsaddressing/TestService");
- outProps.setAction("http://org.jboss.ws/addressing/stateful/action");
MAPEndpoint replyTo = builder.newEndpoint(ADDR.getAnonymousURI());
outProps.setReplyTo(replyTo);
outProps.setMessageID("urn:uuid:" + UUIDGenerator.generateRandomUUIDString());
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/addressing/ServerHandler.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/addressing/ServerHandler.java 2010-06-04 12:53:10 UTC (rev 12418)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/addressing/ServerHandler.java 2010-06-04 13:49:34 UTC (rev 12419)
@@ -95,7 +95,6 @@
MAP inProps = builder.inboundMap(msgContext);
MAP outProps = builder.newMap();
outProps.initializeAsDestination(inProps.getReplyTo());
- outProps.setAction("http://org.jboss.ws/addressing/stateful/actionReply");
outProps.installOutboundMapOnServerSide(msgContext, outProps);
msgContext.setScope(builder.newConstants().getServerAddressingPropertiesOutbound(), Scope.APPLICATION);
13 years, 11 months
JBossWS SVN: r12418 - in stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core: jaxws/client and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-06-04 08:53:10 -0400 (Fri, 04 Jun 2010)
New Revision: 12418
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java
Log:
[JBWS-3056] dispatch objects must handle empty payloads accordingly
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2010-06-04 12:47:26 UTC (rev 12417)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/PayloadBinding.java 2010-06-04 12:53:10 UTC (rev 12418)
@@ -27,6 +27,7 @@
import javax.xml.namespace.QName;
import javax.xml.soap.SOAPMessage;
import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
import javax.xml.ws.handler.Handler;
import org.jboss.logging.Logger;
@@ -51,6 +52,7 @@
import org.jboss.ws.core.soap.XMLFragment;
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ParameterMetaData;
+import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
/** A BindingProvider for a JAXWS payload
@@ -93,9 +95,15 @@
SOAPBodyImpl body = (SOAPBodyImpl)reqMessage.getSOAPBody();
SOAPContentElement bodyElement = (SOAPContentElement)body.getBodyElement();
- Source source = bodyElement.getXMLFragment().getSource();
- if (source == null)
- throw new IllegalStateException("Payload cannot be null");
+ Source source = null;
+ if (bodyElement != null)
+ {
+ source = bodyElement.getXMLFragment().getSource();
+ }
+ else
+ {
+ source = new DOMSource();
+ }
epInv.setRequestParamValue(xmlName, source);
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2010-06-04 12:47:26 UTC (rev 12417)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2010-06-04 12:53:10 UTC (rev 12418)
@@ -21,7 +21,9 @@
*/
package org.jboss.ws.core.jaxws.client;
+import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.io.UnsupportedEncodingException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -37,6 +39,9 @@
import javax.xml.soap.SOAPFault;
import javax.xml.soap.SOAPMessage;
import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stream.StreamSource;
import javax.xml.ws.AsyncHandler;
import javax.xml.ws.Binding;
import javax.xml.ws.BindingProvider;
@@ -82,8 +87,12 @@
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory;
import org.jboss.ws.metadata.wsse.WSSecurityConfiguration;
+import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
/**
@@ -276,8 +285,7 @@
if (handlerPass)
{
- boolean unwrap = !(obj instanceof JAXBElement);
- retObj = getReturnObject(resMsg, unwrap);
+ retObj = getReturnObject(resMsg, obj);
}
}
catch (Exception ex)
@@ -315,8 +323,7 @@
targetAddress = (String) callProps.get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY);
}
MessageAbstraction resMsg = getRemotingConnection().invoke(reqMsg, targetAddress, false);
- boolean unwrap = !(obj instanceof JAXBElement);
- Object retObj = getReturnObject(resMsg, unwrap);
+ Object retObj = getReturnObject(resMsg, obj);
return retObj;
}
@@ -469,25 +476,40 @@
return message;
}
- private Object getReturnObject(MessageAbstraction resMsg, boolean unwrap)
+ private Object getReturnObject(MessageAbstraction resMsg, Object reqObj)
{
String bindingID = bindingProvider.getBinding().getBindingID();
if (EndpointMetaData.SUPPORTED_BINDINGS.contains(bindingID) == false)
throw new IllegalStateException("Unsupported binding: " + bindingID);
- Object retObj = null;
+ boolean unwrap = !(reqObj instanceof JAXBElement);
+ Object resObj = null;
if (HTTPBinding.HTTP_BINDING.equals(bindingID))
{
DispatchHTTPBinding helper = new DispatchHTTPBinding(mode, type, jaxbContext);
- retObj = helper.getReturnObject(resMsg);
+ resObj = helper.getReturnObject(resMsg);
}
else
{
DispatchSOAPBinding helper = new DispatchSOAPBinding(mode, type, jaxbContext);
- retObj = helper.getReturnObject(resMsg, unwrap);
+ resObj = helper.getReturnObject(resMsg, unwrap);
}
- return retObj;
+
+ // HACK - handle null because of TCK requirement
+ if ((reqObj instanceof Source) && (resObj instanceof DOMSource))
+ {
+ resObj = this.handleNull((DOMSource)resObj);
+ }
+
+ return resObj;
}
+
+ private Source handleNull(final DOMSource from)
+ {
+ final Node node = from.getNode();
+
+ return node != null ? from : null;
+ }
class AsyncRunnable implements Runnable
{
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java 2010-06-04 12:47:26 UTC (rev 12417)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchSOAPBinding.java 2010-06-04 12:53:10 UTC (rev 12418)
@@ -186,10 +186,13 @@
if (log.isDebugEnabled())
log.debug("JAXB unmarshal: " + DOMWriter.printNode(soapElement, false));
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
- retObj = unmarshaller.unmarshal(soapElement);
- if ((retObj instanceof JAXBElement<?>) && unwrap)
+ if (soapElement != null)
{
- retObj = ((JAXBElement<?>)retObj).getValue();
+ retObj = unmarshaller.unmarshal(soapElement);
+ if ((retObj instanceof JAXBElement<?>) && unwrap)
+ {
+ retObj = ((JAXBElement<?>)retObj).getValue();
+ }
}
}
}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2010-06-04 12:47:26 UTC (rev 12417)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2010-06-04 12:53:10 UTC (rev 12418)
@@ -23,6 +23,7 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.PrintWriter;
@@ -174,11 +175,16 @@
boolean newReader = false;
Reader reader = streamSource.getReader();
+ InputStream is = streamSource.getInputStream();
{
if (reader == null)
{
- reader = new InputStreamReader(streamSource.getInputStream(), "UTF-8");
- newReader = true;
+ if (is != null)
+ {
+ reader = new InputStreamReader(is, "UTF-8");
+ newReader = true;
+ }
+ else return;
}
}
@@ -243,7 +249,7 @@
try
{
Element element = DOMUtils.sourceToElement(source);
- source = new DOMSource(element);
+ source = element != null ? new DOMSource(element) : new DOMSource();
}
catch (IOException ex)
{
13 years, 11 months
JBossWS SVN: r12417 - common/trunk/src/main/java/org/jboss/wsf/common.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-06-04 08:47:26 -0400 (Fri, 04 Jun 2010)
New Revision: 12417
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java
Log:
refactoring public static Element DOMUtils.sourceToElement(Source source) throws IOException method
Modified: common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java 2010-06-04 11:50:36 UTC (rev 12416)
+++ common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java 2010-06-04 12:47:26 UTC (rev 12417)
@@ -760,65 +760,64 @@
{
Element retElement = null;
- try
+ if (source instanceof StreamSource)
{
- if (source instanceof StreamSource)
- {
- StreamSource streamSource = (StreamSource)source;
+ StreamSource streamSource = (StreamSource)source;
- InputStream ins = streamSource.getInputStream();
- if (ins != null)
- {
- retElement = DOMUtils.parse(ins);
- }
- else
- {
- Reader reader = streamSource.getReader();
- retElement = DOMUtils.parse(new InputSource(reader));
- }
+ InputStream ins = streamSource.getInputStream();
+ if (ins != null)
+ {
+ retElement = DOMUtils.parse(ins);
}
- else if (source instanceof DOMSource)
+ Reader reader = streamSource.getReader();
+ if (reader != null)
{
- DOMSource domSource = (DOMSource)source;
- Node node = domSource.getNode();
- if (node instanceof Element)
- {
- retElement = (Element)node;
- }
- else if (node instanceof Document)
- {
- retElement = ((Document)node).getDocumentElement();
- }
- else
- {
- throw new RuntimeException("Unsupported Node type: " + node.getClass().getName());
- }
+ retElement = DOMUtils.parse(new InputSource(reader));
}
- else if (source instanceof SAXSource)
+ }
+ else if (source instanceof DOMSource)
+ {
+ DOMSource domSource = (DOMSource)source;
+ Node node = domSource.getNode();
+ if (node instanceof Element)
{
- // The fact that JAXBSource derives from SAXSource is an implementation detail.
- // Thus in general applications are strongly discouraged from accessing methods defined on SAXSource.
- // The XMLReader object obtained by the getXMLReader method shall be used only for parsing the InputSource object returned by the getInputSource method.
-
- TransformerFactory tf = TransformerFactory.newInstance();
- ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
- Transformer transformer = tf.newTransformer();
- transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
- transformer.setOutputProperty(OutputKeys.METHOD, "xml");
- transformer.transform(source, new StreamResult(baos));
- retElement = DOMUtils.parse(new ByteArrayInputStream(baos.toByteArray()));
+ retElement = (Element)node;
}
- else
+ else if (node instanceof Document)
{
- throw new RuntimeException("Source type not implemented: " + source.getClass().getName());
+ retElement = ((Document)node).getDocumentElement();
}
+ }
+ else if (source instanceof SAXSource)
+ {
+ // The fact that JAXBSource derives from SAXSource is an implementation detail.
+ // Thus in general applications are strongly discouraged from accessing methods defined on SAXSource.
+ // The XMLReader object obtained by the getXMLReader method shall be used only for parsing the InputSource object returned by the getInputSource method.
+ final boolean hasInputSource = ((SAXSource) source).getInputSource() != null;
+ final boolean hasXMLReader = ((SAXSource) source).getXMLReader() != null;
+
+ if (hasInputSource || hasXMLReader)
+ {
+ try
+ {
+ TransformerFactory tf = TransformerFactory.newInstance();
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
+ Transformer transformer = tf.newTransformer();
+ transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+ transformer.setOutputProperty(OutputKeys.METHOD, "xml");
+ transformer.transform(source, new StreamResult(baos));
+ retElement = DOMUtils.parse(new ByteArrayInputStream(baos.toByteArray()));
+ }
+ catch (TransformerException ex)
+ {
+ throw new IOException(ex);
+ }
+ }
}
- catch (TransformerException ex)
+ else
{
- IOException ioex = new IOException();
- ioex.initCause(ex);
- throw ioex;
+ throw new RuntimeException("Source type not implemented: " + source.getClass().getName());
}
return retElement;
13 years, 11 months
JBossWS SVN: r12416 - maven/parent/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-04 07:50:36 -0400 (Fri, 04 Jun 2010)
New Revision: 12416
Modified:
maven/parent/trunk/pom.xml
Log:
Forcing maven-surefire-plugin 2.4.3
Modified: maven/parent/trunk/pom.xml
===================================================================
--- maven/parent/trunk/pom.xml 2010-06-04 09:42:01 UTC (rev 12415)
+++ maven/parent/trunk/pom.xml 2010-06-04 11:50:36 UTC (rev 12416)
@@ -113,6 +113,11 @@
<artifactId>maven-dependency-plugin</artifactId>
<version>2.0</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
13 years, 11 months
JBossWS SVN: r12415 - in stack/cxf/trunk/modules/testsuite: framework-tests/src/test/etc and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-04 05:42:01 -0400 (Fri, 04 Jun 2010)
New Revision: 12415
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml
stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml
Log:
[JBWS-2952] Restore testsuite log4j logging to test.log and tune categories a bit
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml 2010-06-02 18:10:30 UTC (rev 12414)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml 2010-06-04 09:42:01 UTC (rev 12415)
@@ -20,6 +20,7 @@
<!-- A time/date based rolling appender -->
<appender name="FILE" class="org.apache.log4j.RollingFileAppender">
<param name="File" value="${log4j.output.dir}/test.log"/>
+ <param name="MaxFileSize" value="10MB"/>
<param name="Append" value="true"/>
<layout class="org.apache.log4j.PatternLayout">
@@ -55,15 +56,31 @@
</category>
<category name="org.apache.cxf">
- <priority value="WARN"/>
+ <priority value="DEBUG"/>
</category>
<category name="org.springframework">
- <priority value="WARN"/>
+ <priority value="INFO"/>
</category>
+ <category name="sun.rmi">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="com.sun.xml.bind">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="javax.activation">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.apache.commons">
+ <priority value="INFO"/>
+ </category>
+
<!-- Apache security is verbose -->
- <category name="org.apache.xml.security">
+ <category name="org.apache.ws.security">
<priority value="INFO"/>
</category>
@@ -73,7 +90,7 @@
<root>
<!--appender-ref ref="CONSOLE"/-->
- <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
</root>
</log4j:configuration>
Modified: stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml 2010-06-02 18:10:30 UTC (rev 12414)
+++ stack/cxf/trunk/modules/testsuite/framework-tests/src/test/etc/log4j.xml 2010-06-04 09:42:01 UTC (rev 12415)
@@ -20,12 +20,14 @@
<!-- A time/date based rolling appender -->
<appender name="FILE" class="org.apache.log4j.RollingFileAppender">
<param name="File" value="${log4j.output.dir}/test.log"/>
+ <param name="MaxFileSize" value="10MB"/>
<param name="Append" value="true"/>
<layout class="org.apache.log4j.PatternLayout">
<!-- The default pattern: Date Priority [Category] Message\n -->
<param name="ConversionPattern" value="%d %-5p [%c:%L] %m%n"/>
</layout>
+
</appender>
<!-- ============================== -->
@@ -55,15 +57,31 @@
</category>
<category name="org.apache.cxf">
- <priority value="WARN"/>
+ <priority value="DEBUG"/>
</category>
<category name="org.springframework">
<priority value="WARN"/>
</category>
+ <category name="sun.rmi">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="com.sun.xml.bind">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="javax.activation">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.apache.commons">
+ <priority value="INFO"/>
+ </category>
+
<!-- Apache security is verbose -->
- <category name="org.apache.xml.security">
+ <category name="org.apache.ws.security">
<priority value="INFO"/>
</category>
@@ -73,7 +91,7 @@
<root>
<!--appender-ref ref="CONSOLE"/-->
- <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
</root>
</log4j:configuration>
13 years, 11 months
JBossWS SVN: r12414 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413: src/main/java/org/jboss/ws/metadata/wsdl/xsd and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-06-02 14:10:30 -0400 (Wed, 02 Jun 2010)
New Revision: 12414
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845/
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845/WEB-INF/
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml
Removed:
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845/WEB-INF/
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/ant-import-tests/build-jars-jaxws.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java
Log:
[JBPAPP-4413] NullPointerException deploying JAX-WS endpoint with types in target namespace ending with '#'.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/ant-import-tests/build-jars-jaxws.xml 2010-06-02 17:54:30 UTC (rev 12413)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/ant-import-tests/build-jars-jaxws.xml 2010-06-02 18:10:30 UTC (rev 12414)
@@ -679,6 +679,17 @@
</webinf>
</war>
+ <!-- jaxws-jbws2845 -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jbws2845.war" webxml="${tests.output.dir}/resources/jaxws/jbws2845/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2845/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/jbws2845/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+
<!-- jaxws namespace -->
<war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java 2010-06-02 17:54:30 UTC (rev 12413)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/main/java/org/jboss/ws/metadata/wsdl/xsd/SchemaUtils.java 2010-06-02 18:10:30 UTC (rev 12414)
@@ -534,6 +534,9 @@
fname = fname.replace('/', '_');
fname = fname.replace(':', '_');
+ fname = fname.replace('?', '_');
+ fname = fname.replace('#', '_');
+
File file = File.createTempFile("JBossWS_" + fname, ".xsd", tmpdir);
return file;
}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845 (from rev 12410, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java 2010-06-02 17:03:24 UTC (rev 12410)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java 2010-06-02 18:10:30 UTC (rev 12414)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws2845;
-
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-
-/**
- * Test Endpoint.
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 13th January 2010
- */
-@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2845")
-public interface Endpoint
-{
-
- @WebResult(targetNamespace = "http://ws.jboss.org/jbws2845/types#")
- public TheType echo(@WebParam(targetNamespace = "http://ws.jboss.org/jbws2845/types#") final TheType message);
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java (from rev 12410, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/Endpoint.java 2010-06-02 18:10:30 UTC (rev 12414)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws2845;
+
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+
+/**
+ * Test Endpoint.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 13th January 2010
+ */
+@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2845")
+public interface Endpoint
+{
+
+ @WebResult(targetNamespace = "http://ws.jboss.org/jbws2845/types#")
+ public TheType echo(@WebParam(targetNamespace = "http://ws.jboss.org/jbws2845/types#") final TheType message);
+
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java 2010-06-02 17:03:24 UTC (rev 12410)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java 2010-06-02 18:10:30 UTC (rev 12414)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws2845;
-
-import javax.jws.WebService;
-
-/**
- * Test Endpoint implementation.
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 13th January 2010
- */
-@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2845", endpointInterface = "org.jboss.test.ws.jaxws.jbws2845.Endpoint")
-public class EndpointImpl implements Endpoint
-{
-
- public TheType echo(final TheType message)
- {
- return message;
- }
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java (from rev 12410, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/EndpointImpl.java 2010-06-02 18:10:30 UTC (rev 12414)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws2845;
+
+import javax.jws.WebService;
+
+/**
+ * Test Endpoint implementation.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 13th January 2010
+ */
+@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2845", endpointInterface = "org.jboss.test.ws.jaxws.jbws2845.Endpoint")
+public class EndpointImpl implements Endpoint
+{
+
+ public TheType echo(final TheType message)
+ {
+ return message;
+ }
+
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java 2010-06-02 17:03:24 UTC (rev 12410)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java 2010-06-02 18:10:30 UTC (rev 12414)
@@ -1,72 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws2845;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
-import junit.framework.Test;
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-/**
- * [JBWS-2845] NullPointerException deploying JAX-WS endpoint with types in
- * target namespace ending with '#'
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 13th January 2010
- * @see https://jira.jboss.org/jira/browse/JBWS-2845
- */
-public class JBWS2845TestCase extends JBossWSTest
-{
-
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2845/";
-
- private static Endpoint port;
-
- public static Test suite() throws Exception
- {
- return new JBossWSTestSetup(JBWS2845TestCase.class, "jaxws-jbws2845.war");
- }
-
- public void setUp() throws Exception
- {
- super.setUp();
- URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
- QName serviceName = new QName("http://ws.jboss.org/jbws2845", "EndpointImplService");
-
- Service service = Service.create(wsdlURL, serviceName);
- port = service.getPort(Endpoint.class);
- }
-
- public void testCall() throws Exception
- {
- TheType in = new TheType();
- in.setMessage("Happy New Year");
-
- TheType response = port.echo(in);
- assertEquals("Happy New Year", in.getMessage(), response.getMessage());
- }
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java (from rev 12410, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/JBWS2845TestCase.java 2010-06-02 18:10:30 UTC (rev 12414)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws2845;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-2845] NullPointerException deploying JAX-WS endpoint with types in
+ * target namespace ending with '#'
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 13th January 2010
+ * @see https://jira.jboss.org/jira/browse/JBWS-2845
+ */
+public class JBWS2845TestCase extends JBossWSTest
+{
+
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2845/";
+
+ private static Endpoint port;
+
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(JBWS2845TestCase.class, "jaxws-jbws2845.war");
+ }
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName serviceName = new QName("http://ws.jboss.org/jbws2845", "EndpointImplService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ port = service.getPort(Endpoint.class);
+ }
+
+ public void testCall() throws Exception
+ {
+ TheType in = new TheType();
+ in.setMessage("Happy New Year");
+
+ TheType response = port.echo(in);
+ assertEquals("Happy New Year", in.getMessage(), response.getMessage());
+ }
+
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java 2010-06-02 17:03:24 UTC (rev 12410)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java 2010-06-02 18:10:30 UTC (rev 12414)
@@ -1,18 +0,0 @@
-package org.jboss.test.ws.jaxws.jbws2845;
-
-public class TheType
-{
-
- private String message;
-
- public String getMessage()
- {
- return message;
- }
-
- public void setMessage(String message)
- {
- this.message = message;
- }
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java (from rev 12410, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/java/org/jboss/test/ws/jaxws/jbws2845/TheType.java 2010-06-02 18:10:30 UTC (rev 12414)
@@ -0,0 +1,18 @@
+package org.jboss.test.ws.jaxws.jbws2845;
+
+public class TheType
+{
+
+ private String message;
+
+ public String getMessage()
+ {
+ return message;
+ }
+
+ public void setMessage(String message)
+ {
+ this.message = message;
+ }
+
+}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845 (from rev 12410, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845)
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845/WEB-INF (from rev 12410, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845/WEB-INF)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml 2010-06-02 17:03:24 UTC (rev 12410)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml 2010-06-02 18:10:30 UTC (rev 12414)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
-
-<jboss-web>
- <context-root>/jaxws-jbws2845</context-root>
-</jboss-web>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml (from rev 12410, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845/WEB-INF/jboss-web.xml 2010-06-02 18:10:30 UTC (rev 12414)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
+<jboss-web>
+ <context-root>/jaxws-jbws2845</context-root>
+</jboss-web>
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml 2010-06-02 17:03:24 UTC (rev 12410)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml 2010-06-02 18:10:30 UTC (rev 12414)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
- <servlet>
- <servlet-name>Endpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.jbws2845.EndpointImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>Endpoint</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-
-</web-app>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml (from rev 12410, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP07_JBPAPP-4413/src/test/resources/jaxws/jbws2845/WEB-INF/web.xml 2010-06-02 18:10:30 UTC (rev 12414)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <servlet>
+ <servlet-name>Endpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws2845.EndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Endpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
13 years, 11 months
JBossWS SVN: r12413 - stack/metro/trunk/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-02 13:54:30 -0400 (Wed, 02 Jun 2010)
New Revision: 12413
Modified:
stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml
Log:
[JBWS_3048] include .conf files in bin-dist
Modified: stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2010-06-02 17:50:43 UTC (rev 12412)
+++ stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2010-06-02 17:54:30 UTC (rev 12413)
@@ -39,9 +39,8 @@
<directory>modules/resources/src/main/resources/resources</directory>
<outputDirectory>build</outputDirectory>
<includes>
- <include>all-deploy.conf</include>
- <include>default-deploy.conf</include>
- <include>standard-deploy.conf</include>
+ <include>deploy.conf</include>
+ <include>server-deploy.conf</include>
<include>jbossws-deploy-macros.xml</include>
</includes>
</fileSet>
13 years, 11 months