JBossWS SVN: r17484 - shared-testsuite/trunk/testsuite/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-04-09 02:19:32 -0400 (Tue, 09 Apr 2013)
New Revision: 17484
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
Log:
Move to use servlet api 3.1 on AS8 in bin distro
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2013-04-09 04:58:55 UTC (rev 17483)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2013-04-09 06:19:32 UTC (rev 17484)
@@ -489,7 +489,7 @@
<include name="jboss-ejb3-ext-api-*.jar"/>
</fileset>
<fileset dir="${jboss.home}/modules/system/layers/base/javax/servlet/api/main/">
- <include name="jboss-servlet-api_3.0_spec-*.jar"/>
+ <include name="jboss-servlet-api_3.1_spec-*.jar"/>
</fileset>
<fileset dir="${jboss.home}/modules/system/layers/base/javax/annotation/api/main/">
<include name="jboss-annotations-api_1.2_spec-*.jar"/>
@@ -552,7 +552,7 @@
<include name="mail-*.jar"/>
</fileset>
<fileset dir="${jboss.home}/modules/system/layers/base/javax/servlet/api/main/">
- <include name="jboss-servlet-api_3.0_spec-*.jar"/>
+ <include name="jboss-servlet-api_3.1_spec-*.jar"/>
</fileset>
<fileset dir="${jboss.home}/modules/system/layers/base/javax/transaction/api/main/">
<include name="jboss-transaction-api_1.1_spec-*.jar"/>
11 years, 8 months
JBossWS SVN: r17483 - in stack/cxf/trunk: modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-04-09 00:58:55 -0400 (Tue, 09 Apr 2013)
New Revision: 17483
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java
stack/cxf/trunk/pom.xml
Log:
[JBWS-3138]:Pass the -clientjar option to cxf's wsdl2java tool
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java 2013-04-09 04:51:41 UTC (rev 17482)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java 2013-04-09 04:58:55 UTC (rev 17483)
@@ -24,6 +24,10 @@
import static org.jboss.wsf.stack.cxf.Messages.MESSAGES;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -48,6 +52,7 @@
import org.apache.cxf.common.util.Compiler;
import org.apache.cxf.helpers.FileUtils;
+import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.common.ToolContext;
import org.apache.cxf.tools.wsdlto.WSDLToJava;
@@ -65,6 +70,7 @@
{
private List<File> bindingFiles = null;
private File catalog = null;
+ private File clientJar = null;
private boolean extension;
private boolean generateSource = false;
private File outputDir = new File("output");
@@ -154,6 +160,14 @@
{
this.nocompile = nocompile;
}
+
+
+ @Override
+ public void setClientJar(File clientJar)
+ {
+ this.clientJar = clientJar;
+
+ }
@Override
public void consume(URL wsdl)
@@ -197,6 +211,12 @@
args.add("-catalog");
args.add(catalog.getAbsolutePath());
}
+
+ if (clientJar != null)
+ {
+ args.add("-clientjar");
+ args.add(clientJar.getName());
+ }
if (!nocompile)
{
@@ -294,14 +314,43 @@
}
finally
{
+ //hack to copy the clientjar file to outputdir
if (sourceTempDir != null)
{
+ for (File file : sourceTempDir.listFiles(new FilenameFilter() {
+ public boolean accept(File dir, String name)
+ {
+ if (!name.endsWith(".java"))
+ {
+ return true;
+ }
+ return false;
+ }
+ }))
+ {
+
+ InputStream input;
+ OutputStream output;
+ try
+ {
+ input = new FileInputStream(file);
+ output = new FileOutputStream(new File(outputDir, file.getName()));
+ IOUtils.copy(input, output);
+ }
+ catch (FileNotFoundException e)
+ {
+ //NOOP
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
+
+ }
FileUtils.removeDir(sourceTempDir);
}
}
}
-
-
/**
* A CXF Compiler that installs a custom JavaFileManager to load JAXWS and JAXB apis from
* the proper JBoss module (the one providing the JAXWS SPI Provider) instead of from the
@@ -443,5 +492,4 @@
throw new RuntimeException(e);
}
}
-
}
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2013-04-09 04:51:41 UTC (rev 17482)
+++ stack/cxf/trunk/pom.xml 2013-04-09 04:58:55 UTC (rev 17483)
@@ -62,7 +62,7 @@
<jbossws.api.version>1.0.2-SNAPSHOT</jbossws.api.version>
<jbossws.spi.version>2.2.0-SNAPSHOT</jbossws.spi.version>
<jbossws.common.version>2.2.0-SNAPSHOT</jbossws.common.version>
- <jbossws.common.tools.version>1.1.0.Final</jbossws.common.tools.version>
+ <jbossws.common.tools.version>1.2.0-SNAPSHOT</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.2.0-SNAPSHOT</jbossws.shared.testsuite.version>
<jbossws.jboss712.version>4.2.0-SNAPSHOT</jbossws.jboss712.version>
<jbossws.jboss713.version>4.2.0-SNAPSHOT</jbossws.jboss713.version>
11 years, 8 months
JBossWS SVN: r17482 - in common-tools/trunk: src/main/java/org/jboss/ws/tools/ant and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-04-09 00:51:41 -0400 (Tue, 09 Apr 2013)
New Revision: 17482
Modified:
common-tools/trunk/pom.xml
common-tools/trunk/src/main/java/org/jboss/ws/tools/ant/WSConsumeTask.java
common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java
common-tools/trunk/src/test/java/org/jboss/test/ws/tools/CmdConsumeTracker.java
Log:
[JBWS-3138]:add clientjar flag
Modified: common-tools/trunk/pom.xml
===================================================================
--- common-tools/trunk/pom.xml 2013-04-09 04:50:51 UTC (rev 17481)
+++ common-tools/trunk/pom.xml 2013-04-09 04:51:41 UTC (rev 17482)
@@ -24,8 +24,8 @@
</scm>
<properties>
- <jbossws.api.version>1.0.1.Final</jbossws.api.version>
- <jbossws.spi.version>2.1.0.Final</jbossws.spi.version>
+ <jbossws.api.version>1.0.2-SNAPSHOT</jbossws.api.version>
+ <jbossws.spi.version>2.2.0-SNAPSHOT</jbossws.spi.version>
<ant.version>1.7.1</ant.version>
<getopt.version>1.0.13</getopt.version>
<junit.version>3.8.2</junit.version>
Modified: common-tools/trunk/src/main/java/org/jboss/ws/tools/ant/WSConsumeTask.java
===================================================================
--- common-tools/trunk/src/main/java/org/jboss/ws/tools/ant/WSConsumeTask.java 2013-04-09 04:50:51 UTC (rev 17481)
+++ common-tools/trunk/src/main/java/org/jboss/ws/tools/ant/WSConsumeTask.java 2013-04-09 04:51:41 UTC (rev 17482)
@@ -48,6 +48,7 @@
* <tr><td>fork</td><td>Whether or not to run the generation task in a separate VM.</td><td>true</td></tr>
* <tr><td>keep</td><td>Keep/Enable Java source code generation.</td><td>false</td></tr>
* <tr><td>catalog</td><td> Oasis XML Catalog file for entity resolution</td><td>none</td></tr>
+ * <tr><td>clientjar</td><td>Gnerate the client jar of generated artifacts for calling a webservice</td><td>none</td></tr>
* <tr><td>package</td><td> The target Java package for generated code.</td><td>generated</td></tr>
* <tr><td>binding</td><td>A JAX-WS or JAXB binding file</td><td>none</td></tr>
* <tr><td>wsdlLocation</td><td>Value to use for @(a)WebService.wsdlLocation</td><td>generated</td></tr>
@@ -86,6 +87,7 @@
private File sourcedestdir;
private List<File> bindingFiles = new ArrayList<File>();
private File catalog;
+ private File clientjar;
private String wsdlLocation;
private String targetPackage;
private boolean keep;
@@ -117,6 +119,11 @@
{
this.catalog = catalog;
}
+
+ public void setClientJar(File clientJar)
+ {
+ this.clientjar = clientJar;
+ }
public void setDestdir(File destdir)
{
@@ -209,6 +216,8 @@
consumer.setTargetPackage(targetPackage);
if (wsdlLocation != null)
consumer.setWsdlLocation(wsdlLocation);
+ if (clientjar != null)
+ consumer.setClientJar(clientjar);
if (catalog != null)
{
if (catalog.exists() && catalog.isFile())
@@ -315,6 +324,12 @@
command.createArgument().setValue("-c");
command.createArgument().setFile(catalog);
}
+
+ if (clientjar != null)
+ {
+ command.createArgument().setValue("-j");
+ command.createArgument().setFile(clientjar);
+ }
if (targetPackage != null)
{
Modified: common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java
===================================================================
--- common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java 2013-04-09 04:50:51 UTC (rev 17481)
+++ common-tools/trunk/src/main/java/org/jboss/ws/tools/cmd/WSConsume.java 2013-04-09 04:51:41 UTC (rev 17482)
@@ -49,6 +49,7 @@
* <tr><td>-k, --keep </td><td>Keep/Generate Java source</td></tr>
* <tr><td>-c, --catalog=<file> </td><td>Oasis XML Catalog file for entity resolution</td></tr>
* <tr><td>-p, --package=<name> </td><td>The target package for generated source</td></tr>
+ * <tr><td>-j, --clientjar=<name> </td><td>Create a jar file of the generated artifacts for calling the webservice</td></tr>
* <tr><td>-w, --wsdlLocation=<loc> </td><td>Value to use for @(a)WebService.wsdlLocation</td></tr>
* <tr><td>-o, --output=<directory> </td><td>The directory to put generated artifacts</td></tr>
* <tr><td>-s, --source=<directory> </td><td>The directory to put Java source</td></tr>
@@ -79,6 +80,7 @@
private boolean additionalHeaders;
private boolean noCompile;
private File sourceDir;
+ private File clientJar;
private String target;
public static final String PROGRAM_NAME = SecurityActions.getSystemProperty("program.name", WSConsume.class.getName());
@@ -106,7 +108,7 @@
private URL parseArguments(String[] args)
{
- String shortOpts = "b:c:p:w:o:s:t:khqvlnea";
+ String shortOpts = "b:c:p:w:o:s:t:j:khqvlnea";
LongOpt[] longOpts =
{
new LongOpt("binding", LongOpt.REQUIRED_ARGUMENT, null, 'b'),
@@ -124,6 +126,7 @@
new LongOpt("extension", LongOpt.NO_ARGUMENT, null, 'e'),
new LongOpt("additionalHeaders", LongOpt.NO_ARGUMENT, null, 'a'),
new LongOpt("load-consumer", LongOpt.NO_ARGUMENT, null, 'l'),
+ new LongOpt("clientjar", LongOpt.REQUIRED_ARGUMENT, null, 'j'),
};
Getopt getopt = new Getopt(PROGRAM_NAME, args, shortOpts, longOpts);
@@ -153,6 +156,9 @@
case 's':
sourceDir = new File(getopt.getOptarg());
break;
+ case 'j':
+ clientJar = new File(getopt.getOptarg());
+ break;
case 't':
target = getopt.getOptarg();
break;
@@ -231,6 +237,9 @@
consumer.setAdditionalHeaders(additionalHeaders);
if (sourceDir != null)
consumer.setSourceDirectory(sourceDir);
+ if (clientJar != null) {
+ consumer.setClientJar(clientJar);
+ }
boolean cleanPS = false;
PrintStream ps = System.out;
@@ -313,6 +322,7 @@
out.println(" -b, --binding=<file> One or more JAX-WS or JAXB binding files ");
out.println(" -k, --keep Keep/Generate Java source");
out.println(" -c --catalog=<file> Oasis XML Catalog file for entity resolution");
+ out.println(" -j --clientjar=<name> Create a jar file of the generated artifacts for calling the webservice");
out.println(" -p --package=<name> The target package for generated source");
out.println(" -w --wsdlLocation=<loc> Value to use for @WebService.wsdlLocation");
out.println(" -o, --output=<directory> The directory to put generated artifacts");
Modified: common-tools/trunk/src/test/java/org/jboss/test/ws/tools/CmdConsumeTracker.java
===================================================================
--- common-tools/trunk/src/test/java/org/jboss/test/ws/tools/CmdConsumeTracker.java 2013-04-09 04:50:51 UTC (rev 17481)
+++ common-tools/trunk/src/test/java/org/jboss/test/ws/tools/CmdConsumeTracker.java 2013-04-09 04:51:41 UTC (rev 17482)
@@ -118,4 +118,12 @@
{
LAST_EVENT += "setNoCompile";
}
+
+ @Override
+ public void setClientJar(File clientJar)
+ {
+
+ LAST_EVENT += "setClientJar";
+
+ }
}
11 years, 8 months
JBossWS SVN: r17481 - api/trunk/src/main/java/org/jboss/ws/api/tools.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-04-09 00:50:51 -0400 (Tue, 09 Apr 2013)
New Revision: 17481
Modified:
api/trunk/src/main/java/org/jboss/ws/api/tools/WSContractConsumer.java
Log:
[JBWS-3138]:add clientjar flag
Modified: api/trunk/src/main/java/org/jboss/ws/api/tools/WSContractConsumer.java
===================================================================
--- api/trunk/src/main/java/org/jboss/ws/api/tools/WSContractConsumer.java 2013-04-08 17:04:08 UTC (rev 17480)
+++ api/trunk/src/main/java/org/jboss/ws/api/tools/WSContractConsumer.java 2013-04-09 04:50:51 UTC (rev 17481)
@@ -177,6 +177,13 @@
* @param target the JAX-WS specification version.
*/
public abstract void setTarget(String target);
+
+
+ /**
+ * Set the clientjar file name
+ * @param clientJar client Jar file name
+ */
+ public abstract void setClientJar(File clientJar);
/**
* Generate the required artifacts using the specified WSDL URL. This method
11 years, 8 months
JBossWS SVN: r17480 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-04-08 13:04:08 -0400 (Mon, 08 Apr 2013)
New Revision: 17480
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3620] Excluding tests
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-08 17:03:45 UTC (rev 17479)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-08 17:04:08 UTC (rev 17480)
@@ -834,6 +834,11 @@
<!-- # Tests migrated from JBossWS-Native specific testsuite which are meant to pass with JBossWS-CXF too, but are still to be fixed -->
<exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude>
+ <!-- # [JBWS-3620] Authentication failures w/ Undertow -->
+ <exclude>org/jboss/test/ws/jaxws/samples/securityDomain/PermitAllTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase*</exclude>
+
<!-- # [PLFED-390] PicketLink STS chokes on WS-Policy 1.5 tags -->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude>
11 years, 8 months
JBossWS SVN: r17479 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-04-08 13:03:45 -0400 (Mon, 08 Apr 2013)
New Revision: 17479
Removed:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/HttpServletResponseExt.java
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
Log:
[JBWS-3621] Replace HttpServletResponseExt.java with HttpServletResonseWrapper
Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/HttpServletResponseExt.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/HttpServletResponseExt.java 2013-04-08 16:32:32 UTC (rev 17478)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/HttpServletResponseExt.java 2013-04-08 17:03:45 UTC (rev 17479)
@@ -1,241 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.cxf;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Collection;
-import java.util.Locale;
-
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * A HttpServletResponse delegate that externalizes fields.
- *
- * @author alessio.soldano(a)jboss.com
- * @since 17-Jul-2009
- */
-public class HttpServletResponseExt implements HttpServletResponse
-{
- private HttpServletResponse delegate;
- private int sc;
-
- public HttpServletResponseExt(HttpServletResponse delegate)
- {
- this.delegate = delegate;
- }
-
- /**
- * Get the status currently set in the HttpServletResponse
- *
- * @return the http status
- */
- public int getStatus()
- {
- return this.sc;
- }
-
- /* HttpServletResponse API */
-
- public void addCookie(Cookie cookie)
- {
- delegate.addCookie(cookie);
- }
-
- public void addDateHeader(String name, long date)
- {
- delegate.addDateHeader(name, date);
- }
-
- public void addHeader(String name, String value)
- {
- delegate.addHeader(name, value);
- }
-
- public void addIntHeader(String name, int value)
- {
- delegate.addIntHeader(name, value);
- }
-
- public boolean containsHeader(String name)
- {
- return delegate.containsHeader(name);
- }
-
- public String encodeRedirectURL(String url)
- {
- return delegate.encodeRedirectURL(url);
- }
-
- @Deprecated
- public String encodeRedirectUrl(String url)
- {
- return delegate.encodeRedirectUrl(url);
- }
-
- public String encodeURL(String url)
- {
- return delegate.encodeURL(url);
- }
-
- @Deprecated
- public String encodeUrl(String url)
- {
- return delegate.encodeUrl(url);
- }
-
- public void sendError(int sc) throws IOException
- {
- delegate.sendError(sc);
- }
-
- public void sendError(int sc, String msg) throws IOException
- {
- delegate.sendError(sc, msg);
- }
-
- public void sendRedirect(String location) throws IOException
- {
- delegate.sendRedirect(location);
- }
-
- public void setDateHeader(String name, long date)
- {
- delegate.setDateHeader(name, date);
- }
-
- public void setHeader(String name, String value)
- {
- delegate.setHeader(name, value);
- }
-
- public void setIntHeader(String name, int value)
- {
- delegate.setIntHeader(name, value);
- }
-
- public void setStatus(int sc)
- {
- delegate.setStatus(sc);
- this.sc = sc;
- }
-
- @Deprecated
- public void setStatus(int sc, String sm)
- {
- delegate.setStatus(sc, sm);
- this.sc = sc;
- }
-
- public void flushBuffer() throws IOException
- {
- delegate.flushBuffer();
- }
-
- public int getBufferSize()
- {
- return delegate.getBufferSize();
- }
-
- public String getCharacterEncoding()
- {
- return delegate.getCharacterEncoding();
- }
-
- public String getContentType()
- {
- return delegate.getContentType();
- }
-
- public Locale getLocale()
- {
- return delegate.getLocale();
- }
-
- public ServletOutputStream getOutputStream() throws IOException
- {
- return delegate.getOutputStream();
- }
-
- public PrintWriter getWriter() throws IOException
- {
- return delegate.getWriter();
- }
-
- public boolean isCommitted()
- {
- return delegate.isCommitted();
- }
-
- public void reset()
- {
- delegate.reset();
- }
-
- public void resetBuffer()
- {
- delegate.resetBuffer();
- }
-
- public void setBufferSize(int size)
- {
- delegate.setBufferSize(size);
- }
-
- public void setCharacterEncoding(String charset)
- {
- delegate.setCharacterEncoding(charset);
- }
-
- public void setContentLength(int len)
- {
- delegate.setContentLength(len);
- }
-
- public void setContentType(String type)
- {
- delegate.setContentType(type);
- }
-
- public void setLocale(Locale loc)
- {
- delegate.setLocale(loc);
- }
-
- public String getHeader(String arg0)
- {
- return delegate.getHeader(arg0);
- }
-
- public Collection<String> getHeaderNames()
- {
- return delegate.getHeaderNames();
- }
-
- public Collection<String> getHeaders(String arg0)
- {
- return delegate.getHeaders(arg0);
- }
-
-}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2013-04-08 16:32:32 UTC (rev 17478)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/RequestHandlerImpl.java 2013-04-08 17:03:45 UTC (rev 17479)
@@ -33,6 +33,7 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
@@ -88,7 +89,7 @@
if (false == requestHandled)
{
Long beginTime = initRequestMetrics(ep);
- HttpServletResponseExt response = new HttpServletResponseExt(res);
+ HttpServletResponseWrapper response = new HttpServletResponseWrapper(res);
try
{
ServletConfig cfg = (ServletConfig)context.getAttribute(ServletConfig.class.getName());
11 years, 8 months
JBossWS SVN: r17478 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-04-08 12:32:32 -0400 (Mon, 08 Apr 2013)
New Revision: 17478
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Excluding some tests for known issues
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-08 15:20:49 UTC (rev 17477)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-04-08 16:32:32 UTC (rev 17478)
@@ -840,6 +840,12 @@
<!-- # [CXF-4875] NPE resolving policy reference -->
<exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCTestCase*</exclude>
+
+ <!-- # [AS7-6850] Undertow: Missing Start Boundary, or boundary does not start on a new line -->
+ <exclude>org/jboss/test/ws/saaj/jbws3084/JBWS3084TestCase*</exclude>
+
+ <!-- # [AS7-6765] fix in commit https://github.com/undertow-io/undertow/commit/d1747d12af796e9048308d3c63... -->
+ <exclude>org/jboss/test/ws/jaxws/jbws2000/JBWS2000TestCase*</exclude>
</excludes>
</configuration>
</plugin>
11 years, 8 months
JBossWS SVN: r17477 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-04-08 11:20:49 -0400 (Mon, 08 Apr 2013)
New Revision: 17477
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java
Log:
Fixing MemoryBufferRecorderTestCase to ask for proper client host records (related to Undertow integration in AS8)
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2013-04-08 14:16:04 UTC (rev 17476)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2013-04-08 15:20:49 UTC (rev 17477)
@@ -21,7 +21,9 @@
*/
package org.jboss.test.ws.management.recording;
+import java.net.InetAddress;
import java.net.URL;
+import java.net.UnknownHostException;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -132,8 +134,8 @@
port.echo1("Test getRecordsByClientHost");
//We have client and server on the same host here...
- String host = "localhost".equals(getServerHost()) ? "127.0.0.1" : getServerHost();
- if ("[::1]".equals(host)) host = "0:0:0:0:0:0:0:1"; // IPv6 hack
+ String host = getClientHostName(getServerHost());
+
Map<String, List<Record>> localhostRecords = (Map<String, List<Record>>)server.invoke(oname, "getRecordsByClientHost", new Object[] { host },
new String[] { "java.lang.String" });
Map<String, List<Record>> amazonRecords = (Map<String, List<Record>>)server.invoke(oname, "getRecordsByClientHost", new Object[] { "72.21.203.1" },
@@ -143,6 +145,14 @@
assertTrue("There are records for 72.21.203.1", amazonRecords.size() == 0);
}
+ private static String getClientHostName(String host) throws UnknownHostException {
+ //AS8 (using Undertow) actually does reverse lookup in ServletRequest::getRemoteHost(), AS720 doesn't...
+ final String ip = InetAddress.getByName(host).getHostAddress();
+ String clientHost = (ip.equals(host) || isTargetJBoss7()) ? ip : InetAddress.getByName(ip).getHostName();
+ if ("[::1]".equals(clientHost)) clientHost = "0:0:0:0:0:0:0:1"; // IPv6 hack
+ return clientHost;
+ }
+
@SuppressWarnings("unchecked")
public void testGetMatchingRecords() throws Exception
{
11 years, 8 months
JBossWS SVN: r17476 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1582.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-04-08 10:16:04 -0400 (Mon, 08 Apr 2013)
New Revision: 17476
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java
Log:
JBWS1582TestCase erroneusly assumes HTTP 1.1 responses for HTTP 1.0 requests
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java 2013-04-08 12:33:02 UTC (rev 17475)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java 2013-04-08 14:16:04 UTC (rev 17476)
@@ -69,14 +69,14 @@
public void testSOAPMessage() throws Exception
{
String response = getResponse("jaxws/jbws1582/message.xml");
- assertTrue(response.contains("HTTP/1.1 200 OK"));
+ assertTrue(response.contains("HTTP/1.1 200 OK") || response.contains("HTTP/1.0 200 OK"));
assertTrue(response.contains("<return>Hello</return>"));
}
public void testSOAPMessageAttack1() throws Exception
{
String response = getResponse("jaxws/jbws1582/attack-message-1.xml");
- assertTrue(response.contains("HTTP/1.1 500"));
+ assertTrue(response.contains("HTTP/1.1 500") || response.contains("HTTP/1.0 500"));
if (isIntegrationCXF())
{
assertTrue(response.contains("Error reading XMLStreamReader"));
@@ -95,7 +95,7 @@
public void testSOAPMessageAttack2() throws Exception
{
String response = getResponse("jaxws/jbws1582/attack-message-2.xml");
- assertTrue(response.contains("HTTP/1.1 500"));
+ assertTrue(response.contains("HTTP/1.1 500") || response.contains("HTTP/1.0 500"));
if (isIntegrationCXF())
{
assertTrue(response.contains("Error reading XMLStreamReader"));
11 years, 8 months
JBossWS SVN: r17475 - in container/jboss72/branches/jbossws-jboss720: tests-integration and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2013-04-08 08:33:02 -0400 (Mon, 08 Apr 2013)
New Revision: 17475
Modified:
container/jboss72/branches/jbossws-jboss720/server-integration/
container/jboss72/branches/jbossws-jboss720/tests-integration/
Log:
Setting svn:ignore
Property changes on: container/jboss72/branches/jbossws-jboss720/server-integration
___________________________________________________________________
Added: svn:ignore
+ target
Property changes on: container/jboss72/branches/jbossws-jboss720/tests-integration
___________________________________________________________________
Added: svn:ignore
+ target
11 years, 8 months