JBossWS SVN: r4958 - stack/native/branches/rest/src/test/java/org/jboss/test/rs/model.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-10-31 10:41:44 -0400 (Wed, 31 Oct 2007)
New Revision: 4958
Modified:
stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/ResolverTestCase.java
stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/WidgetList.java
Log:
Extend resolver tests case to check mime matching
Modified: stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/ResolverTestCase.java
===================================================================
--- stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/ResolverTestCase.java 2007-10-31 14:41:21 UTC (rev 4957)
+++ stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/ResolverTestCase.java 2007-10-31 14:41:44 UTC (rev 4958)
@@ -105,8 +105,9 @@
{
URI uri = new URI("http://jboss.com/widgets");
RuntimeContext context = defaultRuntimeContext(MethodHTTP.GET, uri);
+ context.parseAcceptHeader("text/plain");
+
ResourceResolver resolver = ResourceResolver.newInstance(context);
-
ResourceMethod method = resolver.resolve();
assertNotNull(method);
Modified: stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/WidgetList.java
===================================================================
--- stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/WidgetList.java 2007-10-31 14:41:21 UTC (rev 4957)
+++ stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/WidgetList.java 2007-10-31 14:41:44 UTC (rev 4958)
@@ -26,11 +26,13 @@
import javax.ws.rs.UriTemplate;
import javax.ws.rs.POST;
import javax.ws.rs.ConsumeMime;
+import javax.ws.rs.ProduceMime;
@UriTemplate("widgets")
public class WidgetList
{
@GET
+ @ProduceMime({"text/plain"})
String getDescription() {
return "A widgetlist";
}
17 years, 1 month
- 1
- 0
JBossWS SVN: r4957 - in stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/core: soap and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2007-10-31 10:41:21 -0400 (Wed, 31 Oct 2007)
New Revision: 4957
Modified:
stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java
Log:
[JBWS-1876] Improvement and fix for oneway dispatch
Modified: stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java
===================================================================
--- stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2007-10-31 14:39:59 UTC (rev 4956)
+++ stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2007-10-31 14:41:21 UTC (rev 4957)
@@ -318,6 +318,9 @@
public void invokeOneWay(T msg)
{
+ CommonMessageContext msgContext = new SOAPMessageContextJAXWS();
+ MessageContextAssociation.pushMessageContext(msgContext);
+ msgContext.setEndpointMetaData(epMetaData);
try
{
MessageAbstraction reqMsg = getRequestMessage(msg);
@@ -328,6 +331,10 @@
{
handleInvokeException(ex);
}
+ finally
+ {
+ MessageContextAssociation.popMessageContext();
+ }
}
// 4.17. Conformance (Failed Dispatch.invoke): When an operation is invoked using an invoke method, an
Modified: stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java
===================================================================
--- stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2007-10-31 14:39:59 UTC (rev 4956)
+++ stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2007-10-31 14:41:21 UTC (rev 4957)
@@ -42,6 +42,7 @@
import javax.xml.soap.SOAPMessage;
import javax.xml.soap.SOAPPart;
+import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.SOAPMessageAbstraction;
@@ -225,10 +226,20 @@
private String getSOAPContentType() throws SOAPException
{
- if (SOAPConstants.URI_NS_SOAP_1_2_ENVELOPE.equals(soapPart.getEnvelope().getNamespaceURI()))
+ //Check binding type in the endpoint metadata
+ CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
+ if (msgContext != null && Constants.SOAP12HTTP_BINDING.equalsIgnoreCase(msgContext.getEndpointMetaData().getBindingId()))
+ {
return SOAPConstants.SOAP_1_2_CONTENT_TYPE;
- else
- return SOAPConstants.SOAP_1_1_CONTENT_TYPE;
+ }
+ //Check the message envelope
+ SOAPEnvelope env = soapPart != null ? soapPart.getEnvelope() : null;
+ if (env != null && SOAPConstants.URI_NS_SOAP_1_2_ENVELOPE.equals(env.getNamespaceURI()))
+ {
+ return SOAPConstants.SOAP_1_2_CONTENT_TYPE;
+ }
+ //Default to soap 1.1
+ return SOAPConstants.SOAP_1_1_CONTENT_TYPE;
}
public void saveChanges() throws SOAPException
17 years, 1 month
- 1
- 0
JBossWS SVN: r4956 - stack/native/branches/jbossws-native-2.0.2/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-31 10:39:59 -0400 (Wed, 31 Oct 2007)
New Revision: 4956
Modified:
stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
Log:
Update AS50 excludes
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-31 14:35:27 UTC (rev 4955)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-31 14:39:59 UTC (rev 4956)
@@ -12,6 +12,8 @@
org/jboss/test/ws/jaxrpc/jbws358/**
org/jboss/test/ws/jaxrpc/jbws772/**
org/jboss/test/ws/jaxws/jbws1813/**
+org/jboss/test/ws/jaxws/jbws1762/exploded_ear_ejb3/**
+org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/**
org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/**
org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/**
@@ -25,11 +27,11 @@
org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.*
# [JBAS-4930] Cannot lookup ejb3 remote proxy
-org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.*
+org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
+org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.*
# [JBAS-4931] Fix ejb3 ClientLaucher
-org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.*
+org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.*
org/jboss/test/ws/jaxws/webserviceref/**
# [JBAS-4932] Invalid principal: anonymous
17 years, 1 month
- 1
- 0
JBossWS SVN: r4955 - in stack/native/branches/rest/src: main/java/org/jboss/rs/media and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-10-31 10:35:27 -0400 (Wed, 31 Oct 2007)
New Revision: 4955
Added:
stack/native/branches/rest/src/main/java/org/jboss/rs/ResourceError.java
stack/native/branches/rest/src/main/java/org/jboss/rs/media/
stack/native/branches/rest/src/main/java/org/jboss/rs/media/ContentNegotiation.java
stack/native/branches/rest/src/main/java/org/jboss/rs/media/DefaultContentNegotiation.java
stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceMatch.java
Modified:
stack/native/branches/rest/src/main/java/org/jboss/rs/model/NoMethodException.java
stack/native/branches/rest/src/main/java/org/jboss/rs/model/NoResourceException.java
stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceMethod.java
stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceModel.java
stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceResolver.java
stack/native/branches/rest/src/main/java/org/jboss/rs/runtime/RuntimeContext.java
stack/native/branches/rest/src/main/java/org/jboss/rs/util/Convert.java
stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/ResolverTestCase.java
stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/RunRegex.java
stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/WidgetList.java
Log:
Content negotiation, first cut
Added: stack/native/branches/rest/src/main/java/org/jboss/rs/ResourceError.java
===================================================================
--- stack/native/branches/rest/src/main/java/org/jboss/rs/ResourceError.java (rev 0)
+++ stack/native/branches/rest/src/main/java/org/jboss/rs/ResourceError.java 2007-10-31 14:35:27 UTC (rev 4955)
@@ -0,0 +1,53 @@
+/*
+ * 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.rs;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class ResourceError extends Exception
+{
+ public int status;
+
+ public ResourceError(String message)
+ {
+ super(message);
+ }
+
+ public ResourceError(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+
+ public ResourceError(int status, String message)
+ {
+ super(message);
+ this.status = status;
+ }
+
+ public ResourceError(int status, String message, Throwable cause)
+ {
+ super(message, cause);
+ this.status = status;
+ }
+}
Property changes on: stack/native/branches/rest/src/main/java/org/jboss/rs/ResourceError.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/rest/src/main/java/org/jboss/rs/media/ContentNegotiation.java
===================================================================
--- stack/native/branches/rest/src/main/java/org/jboss/rs/media/ContentNegotiation.java (rev 0)
+++ stack/native/branches/rest/src/main/java/org/jboss/rs/media/ContentNegotiation.java 2007-10-31 14:35:27 UTC (rev 4955)
@@ -0,0 +1,42 @@
+/*
+ * 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.rs.media;
+
+import org.jboss.rs.model.ResourceMethod;
+import org.jboss.rs.model.ResourceMatch;
+import org.jboss.rs.model.NoMethodException;
+import org.jboss.rs.runtime.RuntimeContext;
+
+import java.util.List;
+
+/**
+ * Matches available resource methods against the runtime context.<br>
+ * Since this is likely to change it can be plugged into the {@link org.jboss.rs.model.ResourceResolver}.
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public interface ContentNegotiation
+{
+ ResourceMethod match(RuntimeContext context, List<ResourceMatch<ResourceMethod>> candidates)
+ throws NoMethodException;
+}
Property changes on: stack/native/branches/rest/src/main/java/org/jboss/rs/media/ContentNegotiation.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/rest/src/main/java/org/jboss/rs/media/DefaultContentNegotiation.java
===================================================================
--- stack/native/branches/rest/src/main/java/org/jboss/rs/media/DefaultContentNegotiation.java (rev 0)
+++ stack/native/branches/rest/src/main/java/org/jboss/rs/media/DefaultContentNegotiation.java 2007-10-31 14:35:27 UTC (rev 4955)
@@ -0,0 +1,176 @@
+/*
+ * 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.rs.media;
+
+import org.jboss.rs.model.ResourceMethod;
+import org.jboss.rs.model.ResourceMatch;
+import org.jboss.rs.model.NoMethodException;
+import org.jboss.rs.runtime.RuntimeContext;
+import org.jboss.rs.MethodHTTP;
+
+import javax.activation.MimeType;
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * Matches resource methods in the following order:
+ * <ol>
+ * <li>Request Method
+ * <li>Input mime-type
+ * <li>Output mime-type
+ * </ol>
+ *
+ * Failure in any of the above steps can result in a {@link org.jboss.rs.model.NoMethodException}:
+ * <ol>
+ * <li>HTTP 405
+ * <li>HTTP 415
+ * <li>HTTP 406
+ * </ol>
+ *
+ * @see org.jboss.rs.model.ResourceResolver
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class DefaultContentNegotiation implements ContentNegotiation
+{
+
+ public ResourceMethod match(RuntimeContext context, List<ResourceMatch<ResourceMethod>> candidates)
+ throws NoMethodException
+ {
+ ResourceMethod match = null;
+
+ for(ResourceMatch<ResourceMethod> candiate : candidates)
+ {
+
+ List<ResourceMethod> matches = matchByHTTPMethod(context, candidates);
+ matches = matchByInputMime(context, matches);
+ matches = matchByOutputMime(context, matches);
+
+ // TODO: sort results, requires abstracting of RegexQualifier to a more general Qualifier
+ match = matches.get(0);
+ }
+
+ return match;
+ }
+
+ /**
+ * Match by request method -> HTTP 405
+ * @param context
+ * @param candidates
+ * @return
+ * @throws NoMethodException
+ */
+ private List<ResourceMethod> matchByHTTPMethod(RuntimeContext context, List<ResourceMatch<ResourceMethod>> candidates)
+ throws NoMethodException
+ {
+ List<ResourceMethod> matches = new ArrayList<ResourceMethod>();
+
+ for(ResourceMatch<ResourceMethod> candiate : candidates)
+ {
+ if(context.getRequestMethod() == candiate.model.getMethodHTTP())
+ {
+ matches.add(candiate.model);
+ }
+ }
+
+ if(matches.isEmpty())
+ throw new NoMethodException(405, "The request method is not supported");
+
+ return matches;
+ }
+
+ /**
+ * Match by supported input data format -> HTTP 415
+ * @param context
+ * @param candidates
+ * @return
+ * @throws NoMethodException
+ */
+ private List<ResourceMethod> matchByInputMime(RuntimeContext context, List<ResourceMethod> candidates)
+ throws NoMethodException
+ {
+ List<ResourceMethod> matches = new ArrayList<ResourceMethod>();
+ MethodHTTP requestMethod = context.getRequestMethod();
+
+ // matching by input mime only works on POST and PUT
+ if(MethodHTTP.POST == requestMethod || MethodHTTP.PUT == requestMethod)
+ {
+ MimeType produceMime = context.getProvideMimeType();
+
+ for(ResourceMethod candiate : candidates)
+ {
+ for(MimeType consumeMime : candiate.getConsumeMimeTypes())
+ {
+ if(consumeMime.match(produceMime))
+ matches.add(candiate);
+ }
+ }
+
+ if(matches.isEmpty())
+ throw new NoMethodException(415, "No consumer for " + produceMime);
+ }
+ else
+ {
+ // Not matching by input mime
+ matches = candidates;
+ }
+
+ return matches;
+ }
+
+
+ /**
+ * Match by supported output data format -> HTTP 406
+ *
+ * @param context
+ * @param candidates
+ * @return
+ * @throws NoMethodException
+ */
+ private List<ResourceMethod> matchByOutputMime(RuntimeContext context, List<ResourceMethod> candidates)
+ throws NoMethodException
+ {
+ List<ResourceMethod> matches = new ArrayList<ResourceMethod>();
+ List<MimeType> requestConsumeMimes = context.getConsumeMimeTypes();
+
+ for(ResourceMethod candiate : candidates)
+ {
+ for(MimeType methodProduceMime : candiate.getProduceMimeTypes())
+ {
+ for(MimeType requestConsumeMime : requestConsumeMimes)
+ {
+ if(methodProduceMime.match(requestConsumeMime))
+ matches.add(candiate);
+ }
+ }
+ }
+
+ if(matches.isEmpty())
+ throw new NoMethodException(415, "No producer for " + requestConsumeMimes);
+
+ return matches;
+ }
+
+
+
+}
Property changes on: stack/native/branches/rest/src/main/java/org/jboss/rs/media/DefaultContentNegotiation.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/branches/rest/src/main/java/org/jboss/rs/model/NoMethodException.java
===================================================================
--- stack/native/branches/rest/src/main/java/org/jboss/rs/model/NoMethodException.java 2007-10-31 13:37:22 UTC (rev 4954)
+++ stack/native/branches/rest/src/main/java/org/jboss/rs/model/NoMethodException.java 2007-10-31 14:35:27 UTC (rev 4955)
@@ -21,13 +21,14 @@
*/
package org.jboss.rs.model;
+import org.jboss.rs.ResourceError;
+
/**
* @author Heiko.Braun(a)jboss.com
* @version $Revision$
*/
-public class NoMethodException extends Exception
+public class NoMethodException extends ResourceError
{
-
public NoMethodException(String message)
{
super(message);
@@ -35,6 +36,16 @@
public NoMethodException(String message, Throwable cause)
{
- super(message, cause);
+ super(message, cause);
}
+
+ public NoMethodException(int status, String message)
+ {
+ super(status, message);
+ }
+
+ public NoMethodException(int status, String message, Throwable cause)
+ {
+ super(status, message, cause);
+ }
}
Modified: stack/native/branches/rest/src/main/java/org/jboss/rs/model/NoResourceException.java
===================================================================
--- stack/native/branches/rest/src/main/java/org/jboss/rs/model/NoResourceException.java 2007-10-31 13:37:22 UTC (rev 4954)
+++ stack/native/branches/rest/src/main/java/org/jboss/rs/model/NoResourceException.java 2007-10-31 14:35:27 UTC (rev 4955)
@@ -21,13 +21,24 @@
*/
package org.jboss.rs.model;
+import org.jboss.rs.ResourceError;
+
/**
* @author Heiko.Braun(a)jboss.com
* @version $Revision$
*/
-public class NoResourceException extends Exception
+public class NoResourceException extends ResourceError
{
+ public NoResourceException(int status, String message)
+ {
+ super(status, message);
+ }
+ public NoResourceException(int status, String message, Throwable cause)
+ {
+ super(status, message, cause);
+ }
+
public NoResourceException(String message)
{
super(message);
Added: stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceMatch.java
===================================================================
--- stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceMatch.java (rev 0)
+++ stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceMatch.java 2007-10-31 14:35:27 UTC (rev 4955)
@@ -0,0 +1,48 @@
+/*
+ * 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.rs.model;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class ResourceMatch<T> implements Comparable
+{
+ public final T model;
+ public final RegexQualifier qualifier;
+
+ public ResourceMatch(T model, RegexQualifier weight)
+ {
+ this.model = model;
+ this.qualifier = weight;
+ }
+
+ public int compareTo(Object o)
+ {
+ return qualifier.compareTo(((ResourceMatch<T>)o).qualifier);
+ }
+
+ public String toString()
+ {
+ return "ResourceMatch {model="+model+", weight="+ qualifier +"}";
+ }
+}
Property changes on: stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceMatch.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceMethod.java
===================================================================
--- stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceMethod.java 2007-10-31 13:37:22 UTC (rev 4954)
+++ stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceMethod.java 2007-10-31 14:35:27 UTC (rev 4955)
@@ -22,8 +22,14 @@
package org.jboss.rs.model;
import org.jboss.rs.MethodHTTP;
+import org.jboss.rs.util.Convert;
+import javax.ws.rs.ConsumeMime;
+import javax.ws.rs.ProduceMime;
+import javax.activation.MimeType;
import java.lang.reflect.Method;
+import java.util.List;
+import java.util.ArrayList;
/**
* @author Heiko.Braun(a)jboss.com
@@ -35,6 +41,9 @@
private String uriTemplate;
private Method invocationTarget;
+ private List<MimeType> consumeMimeTypes = new ArrayList<MimeType>();
+ private List<MimeType> produceMimeTypes = new ArrayList<MimeType>();
+
ResourceMethod(MethodHTTP method, String uriTemplate, Method invocationTarget)
{
this.uriTemplate = uriTemplate;
@@ -63,12 +72,51 @@
return invocationTarget;
}
+
+ public List<MimeType> getConsumeMimeTypes()
+ {
+ return consumeMimeTypes;
+ }
+
+ public List<MimeType> getProduceMimeTypes()
+ {
+ return produceMimeTypes;
+ }
+
void freeze()
{
- initFromUriTemplate(this.uriTemplate);
+ initFromUriTemplate(this.uriTemplate);
+ initMimeTypes();
}
+ private void initMimeTypes()
+ {
+ // In the absence of either of these annotations,
+ // support for any media type (“*/*”) is assumed.
+
+ if(invocationTarget.isAnnotationPresent(ConsumeMime.class))
+ {
+ ConsumeMime cm = invocationTarget.getAnnotation(ConsumeMime.class);
+ consumeMimeTypes.addAll(Convert.annotationToMimeType(cm));
+ }
+ else
+ {
+ consumeMimeTypes.add( Convert.ANY_MIME );
+ }
+
+ if(invocationTarget.isAnnotationPresent(ProduceMime.class))
+ {
+ ProduceMime pm = invocationTarget.getAnnotation(ProduceMime.class);
+ produceMimeTypes.addAll(Convert.annotationToMimeType(pm));
+ }
+ else
+ {
+ produceMimeTypes.add( Convert.ANY_MIME );
+ }
+ }
+
+
public String toString()
{
return "ResourceMethod {"+methodHTTP+" uri="+uriTemplate+", regex="+regexPattern+"}";
Modified: stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceModel.java
===================================================================
--- stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceModel.java 2007-10-31 13:37:22 UTC (rev 4954)
+++ stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceModel.java 2007-10-31 14:35:27 UTC (rev 4955)
@@ -34,8 +34,7 @@
private String uriTemplate;
private Class invocationTarget;
-
- /*TODO : parse resource methods => no UriTemplate but HttpMethod annotation */
+
private List<ResourceMethod> resourceMethods = new ArrayList<ResourceMethod>();
private List<ResourceMethod> subResourceMethods = new ArrayList<ResourceMethod>();
private List<ResourceLocator> resourceLocators = new ArrayList<ResourceLocator>();
Modified: stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceResolver.java
===================================================================
--- stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceResolver.java 2007-10-31 13:37:22 UTC (rev 4954)
+++ stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceResolver.java 2007-10-31 14:35:27 UTC (rev 4955)
@@ -21,6 +21,8 @@
*/
package org.jboss.rs.model;
+import org.jboss.rs.media.ContentNegotiation;
+import org.jboss.rs.media.DefaultContentNegotiation;
import org.jboss.rs.runtime.RuntimeContext;
import java.util.ArrayList;
@@ -29,19 +31,34 @@
import java.util.List;
/**
- * Resolves resource methods from runtime context.
+ * Resolves resource methods from {@link org.jboss.rs.runtime.RuntimeContext#getPath()}.<br>
+ * Once a set a of resource methods is identified, the resolver
+ * delegates to a {@link org.jboss.rs.media.ContentNegotiation} plugin
+ * to do the fine grained media type matching.
*
* @author Heiko.Braun(a)jboss.com
* @version $Revision$
*/
public class ResourceResolver
{
+ // the runtime context
private RuntimeContext context;
+ // pluggable content negotitation
+ private ContentNegotiation connegPlugin;
+
+ /**
+ * Provides a resolver with the default content negotitation.
+ *
+ * @param context the runtime context
+ * @return a configured resource resolver instance
+ */
public static ResourceResolver newInstance(RuntimeContext context)
{
- assert context!=null;
- return new ResourceResolver(context);
+ assert context!=null;
+ ResourceResolver resourceResolver = new ResourceResolver(context);
+ resourceResolver.connegPlugin = new DefaultContentNegotiation();
+ return resourceResolver;
}
private ResourceResolver(RuntimeContext context)
@@ -61,13 +78,13 @@
while(it1.hasNext())
{
ResourceModel model = it1.next();
- RegexQualifier qualifier = model.resolve(context.getUri());
+ RegexQualifier qualifier = model.resolve(context.getPath());
if(qualifier!=null)
includedResources.add( new ResourceMatch(model, qualifier) );
}
if(includedResources.isEmpty())
- throw new NoResourceException("No resource matches URI '"+context.getUri()+"'");
+ throw new NoResourceException("No resource matches URI '"+context.getPath()+"'");
Collections.sort(includedResources);
@@ -80,7 +97,7 @@
}
if(null == resourceMethod)
- throw new NoMethodException("No method for URI '"+context.getUri());
+ throw new NoMethodException("No method for URI '"+context.getPath());
// gotcha
return resourceMethod;
@@ -94,6 +111,7 @@
* @return
*/
private ResourceMethod dfsResourceMatch(ResourceMatch dfsEntry)
+ throws NoMethodException, NoResourceException
{
ResourceMethod resourceMethod = null;
String nextUriToken = dfsEntry.qualifier.nextUriToken;
@@ -113,6 +131,7 @@
}
private ResourceMatch resolveByLocator(ResourceMatch<ResourceModel> resourceMatch)
+ throws NoResourceException
{
ResourceMatch match = null;
@@ -136,6 +155,7 @@
}
private ResourceMethod resolveResourceMethod(ResourceMatch<ResourceModel> methodTarget, String uriToken)
+ throws NoMethodException
{
ResourceMethod match = null;
List<ResourceMatch<ResourceMethod>> matches = new ArrayList<ResourceMatch<ResourceMethod>>();
@@ -175,48 +195,14 @@
return match;
}
-
- // TODO: error handling and media-type matching
+
private ResourceMethod contentNegotiation(List<ResourceMatch<ResourceMethod>> matches)
+ throws NoMethodException
{
- ResourceMethod match = null;
- for(ResourceMatch<ResourceMethod> candiate : matches)
- {
- // Match by request method -> HTTP 405
- if(context.getRequestMethod() == candiate.model.getMethodHTTP())
- {
- match = candiate.model;
- break;
- }
-
- // Match by supported input data format -> HTTP 415
-
- // Match by supported output data format -> HTTP 406
-
- }
- return match;
+ assert connegPlugin !=null;
+
+ // delegate to conneg plugin
+ return connegPlugin.match(context, matches);
}
- class ResourceMatch<T> implements Comparable
- {
- final T model;
- final RegexQualifier qualifier;
-
- public ResourceMatch(T model, RegexQualifier weight)
- {
- this.model = model;
- this.qualifier = weight;
- }
-
- public int compareTo(Object o)
- {
- return qualifier.compareTo(((ResourceMatch<T>)o).qualifier);
- }
-
- public String toString()
- {
- return "ResourceMatch {model="+model+", weight="+ qualifier +"}";
- }
- }
-
}
Modified: stack/native/branches/rest/src/main/java/org/jboss/rs/runtime/RuntimeContext.java
===================================================================
--- stack/native/branches/rest/src/main/java/org/jboss/rs/runtime/RuntimeContext.java 2007-10-31 13:37:22 UTC (rev 4954)
+++ stack/native/branches/rest/src/main/java/org/jboss/rs/runtime/RuntimeContext.java 2007-10-31 14:35:27 UTC (rev 4955)
@@ -23,7 +23,12 @@
import org.jboss.rs.MethodHTTP;
import org.jboss.rs.model.ResourceModel;
+import org.jboss.rs.util.Convert;
+import javax.activation.MimeType;
+import javax.activation.MimeTypeParseException;
+import java.net.URI;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -32,14 +37,22 @@
*/
public class RuntimeContext
{
+ // Request method
private MethodHTTP requestMethod;
+
+ // Request URI
+ private URI uri;
+
+ // Accepted response body mime types
+ private List<MimeType> consumeMimeTypes = new ArrayList<MimeType>();
+
+ // Request body content-type, available with POST or PUT requests
+ private MimeType provideMimeType;
+
+ // The associated runtime model for a web context
private List<ResourceModel> rootResources;
- private String uri;
- private Object requestMediaType;
- private Object responseMediaType;
-
- public RuntimeContext(MethodHTTP requestMethod, String uri, List<ResourceModel> rootResources)
+ public RuntimeContext(MethodHTTP requestMethod, URI uri, List<ResourceModel> rootResources)
{
this.requestMethod = requestMethod;
this.rootResources = rootResources;
@@ -57,8 +70,47 @@
return rootResources;
}
- public String getUri()
+ public void parseAcceptHeader(String headerValue)
{
- return uri;
+ consumeMimeTypes.addAll( Convert.mimeStringToMimeTypes(headerValue) );
}
+
+ public void parseContentTypeHeader(String headerValue)
+ {
+ try
+ {
+ this.provideMimeType = new MimeType(headerValue);
+ }
+ catch (MimeTypeParseException e)
+ {
+ throw new IllegalArgumentException("Failed to parse 'Content-Type' header", e);
+ }
+ }
+
+ public List<MimeType> getConsumeMimeTypes()
+ {
+ return consumeMimeTypes;
+ }
+
+
+ public MimeType getProvideMimeType()
+ {
+ if(! (requestMethod == MethodHTTP.POST) )
+ throw new IllegalArgumentException(requestMethod + " does not provide a 'Content-Type header'");
+
+ assert provideMimeType !=null;
+
+ return provideMimeType;
+ }
+
+ /**
+ * @return the path info of the associated URI.
+ */
+ public String getPath()
+ {
+ String path = uri.getPath();
+ if(path.startsWith("/"))
+ path = path.substring(1);
+ return path;
+ }
}
Modified: stack/native/branches/rest/src/main/java/org/jboss/rs/util/Convert.java
===================================================================
--- stack/native/branches/rest/src/main/java/org/jboss/rs/util/Convert.java 2007-10-31 13:37:22 UTC (rev 4954)
+++ stack/native/branches/rest/src/main/java/org/jboss/rs/util/Convert.java 2007-10-31 14:35:27 UTC (rev 4955)
@@ -27,7 +27,14 @@
import javax.ws.rs.POST;
import javax.ws.rs.PUT;
import javax.ws.rs.DELETE;
+import javax.ws.rs.ConsumeMime;
+import javax.ws.rs.ProduceMime;
+import javax.activation.MimeType;
+import javax.activation.MimeTypeParseException;
import java.lang.annotation.Annotation;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.StringTokenizer;
/**
* @author Heiko.Braun(a)jboss.com
@@ -37,6 +44,20 @@
{
public static Class[] REQUEST_TYPES = new Class[] { GET.class, POST.class, PUT.class, DELETE.class };
+ public static MimeType ANY_MIME;
+
+ static
+ {
+ try
+ {
+ ANY_MIME = new MimeType("*/*");
+ }
+ catch (MimeTypeParseException e)
+ {
+ //
+ }
+ }
+
public static MethodHTTP annotationToMethodHTTP(Annotation a)
{
MethodHTTP m = null;
@@ -53,4 +74,54 @@
return m;
}
+
+ public static List<MimeType> annotationToMimeType(ConsumeMime consumeMime)
+ {
+ return mimeStringsToMimeTypes(consumeMime.value());
+ }
+
+ public static List<MimeType> annotationToMimeType(ProduceMime produceMime)
+ {
+ return mimeStringsToMimeTypes(produceMime.value());
+ }
+
+ public static List<MimeType> mimeStringToMimeTypes(String mime)
+ {
+ List<MimeType> mimes = new ArrayList<MimeType>();
+
+ try
+ {
+ StringTokenizer tokenizer = new StringTokenizer(mime, ",");
+ while(tokenizer.hasMoreTokens())
+ {
+ String tok = tokenizer.nextToken().trim();
+ mimes.add( new MimeType(tok) );
+ }
+ }
+ catch (MimeTypeParseException e)
+ {
+ throw new IllegalArgumentException("Failed to parse mime string '"+mime+"'", e);
+ }
+
+ return mimes;
+ }
+
+ public static List<MimeType> mimeStringsToMimeTypes(String[] mimeStrings)
+ {
+ List<MimeType> mimes = new ArrayList<MimeType>();
+
+ try
+ {
+ for(String s : mimeStrings)
+ {
+ mimes.add( new MimeType(s) );
+ }
+ }
+ catch (MimeTypeParseException e)
+ {
+ throw new IllegalArgumentException("Failed to parse mime string '"+mimeStrings+"'", e);
+ }
+
+ return mimes;
+ }
}
Modified: stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/ResolverTestCase.java
===================================================================
--- stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/ResolverTestCase.java 2007-10-31 13:37:22 UTC (rev 4954)
+++ stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/ResolverTestCase.java 2007-10-31 14:35:27 UTC (rev 4955)
@@ -32,6 +32,7 @@
import java.util.List;
import java.lang.reflect.Method;
+import java.net.URI;
/**
* @author Heiko.Braun(a)jboss.com
@@ -53,7 +54,8 @@
public void testRegexResolver1() throws Exception
{
- RuntimeContext context = new RuntimeContext(MethodHTTP.GET, "widgets/Id/spec", rootModels );
+ URI uri = new URI("http://jboss.com/widgets/Id/spec");
+ RuntimeContext context = defaultRuntimeContext(MethodHTTP.GET, uri);
ResourceResolver resolver = ResourceResolver.newInstance(context);
ResourceMethod method = resolver.resolve();
@@ -63,7 +65,10 @@
public void testRegexResolver2() throws Exception
{
- RuntimeContext context = new RuntimeContext(MethodHTTP.POST, "widgets/special", rootModels );
+ URI uri = new URI("http://jboss.com/widgets/special");
+ RuntimeContext context = defaultRuntimeContext(MethodHTTP.POST, uri);
+ context.parseContentTypeHeader("text/xml");
+
ResourceResolver resolver = ResourceResolver.newInstance(context);
ResourceMethod method = resolver.resolve();
@@ -74,37 +79,47 @@
public void testRegexResolver3() throws Exception
{
- RuntimeContext context = new RuntimeContext(MethodHTTP.GET, "widgets/offers", rootModels );
+ URI uri = new URI("http://jboss.com/widgets/offers");
+ RuntimeContext context = defaultRuntimeContext(MethodHTTP.GET, uri);
ResourceResolver resolver = ResourceResolver.newInstance(context);
ResourceMethod method = resolver.resolve();
assertNotNull(method);
- assertEquals("offers", method.getUriTemplate());
+ assertEquals("offers", method.getUriTemplate());
}
public void testRegexResolver4() throws Exception
{
- RuntimeContext context = new RuntimeContext(MethodHTTP.GET, "widgets/Id/spec/SpecName", rootModels );
+ URI uri = new URI("http://jboss.com/widgets/Id/spec/SpecName");
+ RuntimeContext context = defaultRuntimeContext(MethodHTTP.GET, uri);
ResourceResolver resolver = ResourceResolver.newInstance(context);
ResourceMethod method = resolver.resolve();
- assertNotNull(method);
- assertEquals("spec/{name}", method.getUriTemplate());
+ assertNotNull(method);
+ assertEquals("spec/{name}", method.getUriTemplate());
}
- public void testRegexResolver5() throws Exception
+ public void testRegexResolver5() throws Exception
{
- RuntimeContext context = new RuntimeContext(MethodHTTP.GET, "widgets", rootModels );
+ URI uri = new URI("http://jboss.com/widgets");
+ RuntimeContext context = defaultRuntimeContext(MethodHTTP.GET, uri);
ResourceResolver resolver = ResourceResolver.newInstance(context);
ResourceMethod method = resolver.resolve();
- assertNotNull(method);
+ assertNotNull(method);
Method target = method.getInvocationTarget();
String result = (String)target.invoke( target.getDeclaringClass().newInstance());
assertEquals("A widgetlist", result);
}
+ private RuntimeContext defaultRuntimeContext(MethodHTTP method, URI uri)
+ {
+ RuntimeContext context = new RuntimeContext(method, uri, rootModels );
+ context.parseAcceptHeader("*/*");
+ return context;
+ }
+
}
Modified: stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/RunRegex.java
===================================================================
--- stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/RunRegex.java 2007-10-31 13:37:22 UTC (rev 4954)
+++ stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/RunRegex.java 2007-10-31 14:35:27 UTC (rev 4955)
@@ -23,6 +23,7 @@
import java.util.regex.Pattern;
import java.util.regex.Matcher;
+import java.net.URI;
/**
* @author Heiko.Braun(a)jboss.com
@@ -30,8 +31,12 @@
*/
public class RunRegex
{
- public static void main(String[] args)
+ public static void main(String[] args) throws Exception
{
+
+ URI uri = new URI("http://jboss.com/widgets/special");
+ System.out.println(uri.getPath());
+
String s = "spec";
System.out.println("> " +s);
Pattern p = Pattern.compile("(\\bspec\\b)(.*?)(/)?");
Modified: stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/WidgetList.java
===================================================================
--- stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/WidgetList.java 2007-10-31 13:37:22 UTC (rev 4954)
+++ stack/native/branches/rest/src/test/java/org/jboss/test/rs/model/WidgetList.java 2007-10-31 14:35:27 UTC (rev 4955)
@@ -25,6 +25,7 @@
import javax.ws.rs.UriParam;
import javax.ws.rs.UriTemplate;
import javax.ws.rs.POST;
+import javax.ws.rs.ConsumeMime;
@UriTemplate("widgets")
public class WidgetList
@@ -42,8 +43,9 @@
@POST
@UriTemplate("special")
- void getDiscounted(Widget special) {
-
+ @ConsumeMime({"text/xml", "application/xml"})
+ void setDiscounted(Widget special) {
+ // TODO: Should return a new location
}
@UriTemplate("{id}")
17 years, 1 month
- 1
- 0
JBossWS SVN: r4954 - in stack/native/branches/jbossws-native-2.0.2: src/test/resources and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-31 09:37:22 -0400 (Wed, 31 Oct 2007)
New Revision: 4954
Removed:
stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/exploded/jboss-app.xml
stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/packaged/jboss-app.xml
Modified:
stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxws.xml
stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/exploded/application.xml
stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/packaged/application.xml
stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
Log:
Fix context-root
Modified: stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxws.xml 2007-10-31 13:10:32 UTC (rev 4953)
+++ stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxws.xml 2007-10-31 13:37:22 UTC (rev 4954)
@@ -406,13 +406,11 @@
</fileset>
<metainf dir="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/packaged">
<include name="application.xml"/>
- <include name="jboss-app.xml"/>
</metainf>
</jar>
<mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear"/>
<mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/>
<copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/exploded/application.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/>
- <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/exploded/jboss-app.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/>
<unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.war"/>
<unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.jar"/>
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/exploded/application.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/exploded/application.xml 2007-10-31 13:10:32 UTC (rev 4953)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/exploded/application.xml 2007-10-31 13:37:22 UTC (rev 4954)
@@ -12,7 +12,7 @@
<module>
<web>
<web-uri>jaxws-jbws1762-exploded.war</web-uri>
- <context-root>jaxws-jbws1762-exploded</context-root>
+ <context-root>jaxws-jbws1762</context-root>
</web>
</module>
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/exploded/jboss-app.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/exploded/jboss-app.xml 2007-10-31 13:10:32 UTC (rev 4953)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/exploded/jboss-app.xml 2007-10-31 13:37:22 UTC (rev 4954)
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!DOCTYPE jboss-app
- PUBLIC "-//JBoss//DTD J2EE Application 1.4//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd">
-
-<jboss-app>
- <loader-repository>jbossws.jbws1762:domain=jaxws-jbws1762-exploded.ear</loader-repository>
-</jboss-app>
\ No newline at end of file
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/packaged/application.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/packaged/application.xml 2007-10-31 13:10:32 UTC (rev 4953)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/packaged/application.xml 2007-10-31 13:37:22 UTC (rev 4954)
@@ -12,7 +12,7 @@
<module>
<web>
<web-uri>jaxws-jbws1762-packaged.war</web-uri>
- <context-root>jaxws-jbws1762-packaged</context-root>
+ <context-root>jaxws-jbws1762</context-root>
</web>
</module>
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/packaged/jboss-app.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/packaged/jboss-app.xml 2007-10-31 13:10:32 UTC (rev 4953)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxws/jbws1762/META-INF/packaged/jboss-app.xml 2007-10-31 13:37:22 UTC (rev 4954)
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!DOCTYPE jboss-app
- PUBLIC "-//JBoss//DTD J2EE Application 1.4//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd">
-
-<jboss-app>
- <loader-repository>jbossws.jbws1762:domain=jaxws-jbws1762-packaged.ear</loader-repository>
-</jboss-app>
\ No newline at end of file
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-31 13:10:32 UTC (rev 4953)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-31 13:37:22 UTC (rev 4954)
@@ -12,6 +12,8 @@
org/jboss/test/ws/jaxrpc/jbws358/**
org/jboss/test/ws/jaxrpc/jbws772/**
org/jboss/test/ws/jaxws/jbws1813/**
+org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/**
+org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/**
# [JBAS-4890] EJBAccessException: Caller unauthorized
org/jboss/test/ws/jaxws/samples/context/**
17 years, 1 month
- 1
- 0
JBossWS SVN: r4953 - in stack/native/branches/jbossws-native-2.0.2: src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo and 14 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-31 09:10:32 -0400 (Wed, 31 Oct 2007)
New Revision: 4953
Removed:
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration2TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration3TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration2TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration3TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration2TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration3TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration2TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration3TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_ejb3/Iteration2TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_ejb3/Iteration3TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration2TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration3TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_jar_ejb3/Iteration2TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_jar_ejb3/Iteration3TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration2TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration3TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration2TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration3TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/Iteration2TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/Iteration3TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration2TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration3TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_jar_ejb3/Iteration2TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_jar_ejb3/Iteration3TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration2TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration3TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration2TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration3TestCase.java
Modified:
stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-testsuite.xml
stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
Log:
Delete Iteration2,3
Modified: stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-testsuite.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-testsuite.xml 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-testsuite.xml 2007-10-31 13:10:32 UTC (rev 4953)
@@ -179,10 +179,8 @@
<classpath location="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy"/>
</taskdef>
- <!-- JBWS-1852 Failed to create a new SAX parser
<wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean" verbose="true"/>
<wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurityAnnotatedpolicy" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean"/>
- -->
</target>
<target name="tests-compile-generated-resources" depends="servicegen,wstools,wsprovide">
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration2TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration2TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration2TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxrpc.jbws1762.exploded_sar_pojo;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 19, 2007
- */
-public class Iteration2TestCase extends Iteration1TestCase {}
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration3TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration3TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_sar_pojo/Iteration3TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxrpc.jbws1762.exploded_sar_pojo;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 19, 2007
- */
-public class Iteration3TestCase extends Iteration2TestCase {}
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration2TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration2TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration2TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxrpc.jbws1762.exploded_war_pojo;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 19, 2007
- */
-public class Iteration2TestCase extends Iteration1TestCase {}
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration3TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration3TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_war_pojo/Iteration3TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxrpc.jbws1762.exploded_war_pojo;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 19, 2007
- */
-public class Iteration3TestCase extends Iteration2TestCase {}
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration2TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration2TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration2TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxrpc.jbws1762.packaged_sar_pojo;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 19, 2007
- */
-public class Iteration2TestCase extends Iteration1TestCase {}
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration3TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration3TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_sar_pojo/Iteration3TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxrpc.jbws1762.packaged_sar_pojo;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 19, 2007
- */
-public class Iteration3TestCase extends Iteration2TestCase {}
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration2TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration2TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration2TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxrpc.jbws1762.packaged_war_pojo;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 19, 2007
- */
-public class Iteration2TestCase extends Iteration1TestCase {}
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration3TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration3TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_war_pojo/Iteration3TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxrpc.jbws1762.packaged_war_pojo;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 19, 2007
- */
-public class Iteration3TestCase extends Iteration2TestCase {}
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_ejb3/Iteration2TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_ejb3/Iteration2TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_ejb3/Iteration2TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxws.jbws1762.exploded_ear_ejb3;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 17, 2007
- */
-public class Iteration2TestCase extends Iteration1TestCase {}
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_ejb3/Iteration3TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_ejb3/Iteration3TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_ejb3/Iteration3TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxws.jbws1762.exploded_ear_ejb3;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 17, 2007
- */
-public class Iteration3TestCase extends Iteration2TestCase {}
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration2TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration2TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration2TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxws.jbws1762.exploded_ear_pojo;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 17, 2007
- */
-public class Iteration2TestCase extends Iteration1TestCase {}
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration3TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration3TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_ear_pojo/Iteration3TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxws.jbws1762.exploded_ear_pojo;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 17, 2007
- */
-public class Iteration3TestCase extends Iteration2TestCase {}
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_jar_ejb3/Iteration2TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_jar_ejb3/Iteration2TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_jar_ejb3/Iteration2TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxws.jbws1762.exploded_jar_ejb3;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 17, 2007
- */
-public class Iteration2TestCase extends Iteration1TestCase {}
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_jar_ejb3/Iteration3TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_jar_ejb3/Iteration3TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_jar_ejb3/Iteration3TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxws.jbws1762.exploded_jar_ejb3;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 17, 2007
- */
-public class Iteration3TestCase extends Iteration2TestCase {}
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration2TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration2TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration2TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxws.jbws1762.exploded_sar_pojo;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 17, 2007
- */
-public class Iteration2TestCase extends Iteration1TestCase {}
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration3TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration3TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_sar_pojo/Iteration3TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxws.jbws1762.exploded_sar_pojo;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 17, 2007
- */
-public class Iteration3TestCase extends Iteration2TestCase {}
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration2TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration2TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration2TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxws.jbws1762.exploded_war_pojo;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 17, 2007
- */
-public class Iteration2TestCase extends Iteration1TestCase {}
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration3TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration3TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/exploded_war_pojo/Iteration3TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxws.jbws1762.exploded_war_pojo;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 17, 2007
- */
-public class Iteration3TestCase extends Iteration2TestCase {}
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/Iteration2TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/Iteration2TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/Iteration2TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxws.jbws1762.packaged_ear_ejb3;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 17, 2007
- */
-public class Iteration2TestCase extends Iteration1TestCase {}
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/Iteration3TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/Iteration3TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/Iteration3TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxws.jbws1762.packaged_ear_ejb3;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 17, 2007
- */
-public class Iteration3TestCase extends Iteration2TestCase {}
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration2TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration2TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration2TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxws.jbws1762.packaged_ear_pojo;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 17, 2007
- */
-public class Iteration2TestCase extends Iteration1TestCase {}
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration3TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration3TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/Iteration3TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxws.jbws1762.packaged_ear_pojo;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 17, 2007
- */
-public class Iteration3TestCase extends Iteration2TestCase {}
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_jar_ejb3/Iteration2TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_jar_ejb3/Iteration2TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_jar_ejb3/Iteration2TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxws.jbws1762.packaged_jar_ejb3;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 17, 2007
- */
-public class Iteration2TestCase extends Iteration1TestCase {}
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_jar_ejb3/Iteration3TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_jar_ejb3/Iteration3TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_jar_ejb3/Iteration3TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxws.jbws1762.packaged_jar_ejb3;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 17, 2007
- */
-public class Iteration3TestCase extends Iteration2TestCase {}
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration2TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration2TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration2TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxws.jbws1762.packaged_sar_pojo;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 17, 2007
- */
-public class Iteration2TestCase extends Iteration1TestCase {}
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration3TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration3TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_sar_pojo/Iteration3TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxws.jbws1762.packaged_sar_pojo;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 17, 2007
- */
-public class Iteration3TestCase extends Iteration2TestCase {}
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration2TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration2TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration2TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxws.jbws1762.packaged_war_pojo;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 17, 2007
- */
-public class Iteration2TestCase extends Iteration1TestCase {}
Deleted: stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration3TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration3TestCase.java 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxws/jbws1762/packaged_war_pojo/Iteration3TestCase.java 2007-10-31 13:10:32 UTC (rev 4953)
@@ -1,31 +0,0 @@
-/*
- * 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.test.ws.jaxws.jbws1762.packaged_war_pojo;
-
-/**
- * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
- *
- * @author richard.opalka(a)jboss.com
- *
- * @since Oct 17, 2007
- */
-public class Iteration3TestCase extends Iteration2TestCase {}
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-31 10:39:08 UTC (rev 4952)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-31 13:10:32 UTC (rev 4953)
@@ -33,6 +33,6 @@
# [JBAS-4932] Invalid principal: anonymous
org/jboss/test/ws/jaxrpc/jbws723/**
org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.*
+org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.*
-
17 years, 1 month
- 1
- 0
JBossWS SVN: r4952 - stack/native/branches/jbossws-native-2.0.2/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-31 06:39:08 -0400 (Wed, 31 Oct 2007)
New Revision: 4952
Modified:
stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
Log:
Update AS50 excludes
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-31 09:50:42 UTC (rev 4951)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-31 10:39:08 UTC (rev 4952)
@@ -28,4 +28,11 @@
# [JBAS-4931] Fix ejb3 ClientLaucher
org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.*
+org/jboss/test/ws/jaxws/webserviceref/**
+# [JBAS-4932] Invalid principal: anonymous
+org/jboss/test/ws/jaxrpc/jbws723/**
+org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.*
+
+
+
17 years, 1 month
- 1
- 0
JBossWS SVN: r4951 - stack/native/branches/jbossws-native-2.0.2/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-31 05:50:42 -0400 (Wed, 31 Oct 2007)
New Revision: 4951
Modified:
stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
Log:
Update AS50 excludes
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-31 09:40:07 UTC (rev 4950)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-31 09:50:42 UTC (rev 4951)
@@ -24,4 +24,8 @@
# [JBAS-4930] Cannot lookup ejb3 remote proxy
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
+org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.*
+# [JBAS-4931] Fix ejb3 ClientLaucher
+org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase.*
+
17 years, 1 month
- 1
- 0
JBossWS SVN: r4950 - in stack/native/branches/asoldano/trunk/src: test/java/org/jboss/test/ws/jaxws/binding and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2007-10-31 05:40:07 -0400 (Wed, 31 Oct 2007)
New Revision: 4950
Modified:
stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java
stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java
Log:
[JBWS-1876] Fix issue
Modified: stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java
===================================================================
--- stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2007-10-31 09:23:03 UTC (rev 4949)
+++ stack/native/branches/asoldano/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2007-10-31 09:40:07 UTC (rev 4950)
@@ -23,16 +23,6 @@
// $Id$
-import org.jboss.ws.WSException;
-import org.jboss.ws.core.SOAPMessageAbstraction;
-import org.jboss.ws.core.CommonMessageContext;
-import org.jboss.ws.core.soap.attachment.*;
-import org.jboss.ws.extensions.xop.XOPContext;
-import org.jboss.ws.metadata.umdm.EndpointMetaData;
-import org.jboss.ws.metadata.umdm.OperationMetaData;
-
-import javax.mail.MessagingException;
-import javax.xml.soap.*;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Collection;
@@ -40,6 +30,31 @@
import java.util.LinkedList;
import java.util.List;
+import javax.mail.MessagingException;
+import javax.xml.soap.AttachmentPart;
+import javax.xml.soap.MimeHeader;
+import javax.xml.soap.MimeHeaders;
+import javax.xml.soap.SOAPConstants;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPFault;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.soap.SOAPPart;
+
+import org.jboss.ws.WSException;
+import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.SOAPMessageAbstraction;
+import org.jboss.ws.core.soap.attachment.AttachmentPartImpl;
+import org.jboss.ws.core.soap.attachment.CIDGenerator;
+import org.jboss.ws.core.soap.attachment.MimeConstants;
+import org.jboss.ws.core.soap.attachment.MultipartRelatedEncoder;
+import org.jboss.ws.core.soap.attachment.MultipartRelatedSwAEncoder;
+import org.jboss.ws.core.soap.attachment.MultipartRelatedXOPEncoder;
+import org.jboss.ws.extensions.xop.XOPContext;
+import org.jboss.ws.metadata.umdm.EndpointMetaData;
+import org.jboss.ws.metadata.umdm.OperationMetaData;
+
/**
* The root class for all SOAP messages. As transmitted on the "wire", a SOAP message is an XML document or a
* MIME message whose first body part is an XML/SOAP document.
@@ -207,7 +222,15 @@
return new MimeMatchingAttachmentsIterator(headers, attachments);
}
-
+
+ private String getSOAPContentType() throws SOAPException
+ {
+ if (SOAPConstants.URI_NS_SOAP_1_2_ENVELOPE.equals(soapPart.getEnvelope().getNamespaceURI()))
+ return SOAPConstants.SOAP_1_2_CONTENT_TYPE;
+ else
+ return SOAPConstants.SOAP_1_1_CONTENT_TYPE;
+ }
+
public void saveChanges() throws SOAPException
{
if (saveRequired == true)
@@ -220,7 +243,7 @@
throw new IllegalStateException("XOP parameter not properly inlined");
// default content-type
- String contentType = MimeConstants.TYPE_SOAP11 + "; charset=" + getCharSetEncoding();
+ String contentType = getSOAPContentType() + "; charset=" + getCharSetEncoding();
if (hasAttachments)
{
Modified: stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java
===================================================================
--- stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java 2007-10-31 09:23:03 UTC (rev 4949)
+++ stack/native/branches/asoldano/trunk/src/test/java/org/jboss/test/ws/jaxws/binding/ClientHandler2.java 2007-10-31 09:40:07 UTC (rev 4950)
@@ -50,7 +50,6 @@
MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
String[] ct = mimeHeaders.getHeader("Content-Type");
- System.out.println(mimeHeaders);
if (ct != null)
{
for (int i = 0; i < ct.length; i++)
@@ -72,7 +71,6 @@
soapMessage.saveChanges();
MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
- System.out.println(mimeHeaders);
String[] ct = mimeHeaders.getHeader("Content-Type");
if (ct != null)
{
17 years, 1 month
- 1
- 0
JBossWS SVN: r4949 - stack/native/branches/jbossws-native-2.0.2/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-31 05:23:03 -0400 (Wed, 31 Oct 2007)
New Revision: 4949
Modified:
stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
Log:
Update AS50 excludes
Modified: stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-31 09:21:20 UTC (rev 4948)
+++ stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-10-31 09:23:03 UTC (rev 4949)
@@ -19,11 +19,9 @@
# [JBAS-4903] EJB 2.1 view cannot be realized
org/jboss/test/ws/jaxws/jbws944/**
-# [JBAS-4922] NPE in AssemblyDescriptorMetaData
-org/jboss/test/ws/jaxrpc/jbws723/**
-#org/jboss/test/ws/jaxrpc/samples/secureejb/**
-org/jboss/test/ws/jaxrpc/wsse/**
-
# [JBAS-4923] No valid security context for the caller identity
-#org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**
+org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.*
+# [JBAS-4930] Cannot lookup ejb3 remote proxy
+org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
+
17 years, 1 month
- 1
- 0