svn commit: r982938 - in /axis/axis2/java/core/trunk/modules: jaxws-integration/test/org/apache/axis2/jaxws/sample/ jaxws-integration/test/org/apache/axis2/jaxws/sample/resourceinjection/ jaxws/src/or
Author: scheu
Date: Fri Aug 6 12:31:05 2010
New Revision: 982938
URL: http://svn.apache.org/viewvc?rev=982938&view=rev
Log:
AXIS2-4791
Contributor:Rich Scheuerle
Axis2 changes to enable the illegal character filtering during JAX-WS
processing.
Also added a verification test
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/ResourceInjectionTests.java
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/resourceinjection/ResourceInjectionPortTypeImpl.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDSContext.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/Constants.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/context/utils/ContextUtils.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/ResourceInjectionTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/ResourceInjectionTests.java?rev=982938&r1=982937&r2=982938&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/ResourceInjectionTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/ResourceInjectionTests.java
Fri Aug 6 12:31:05 2010
@@ -59,6 +59,10 @@ public class ResourceInjectionTests exte
assertTrue("The response was null", response != null);
assertTrue("The response was not succesful: " + response,
response.indexOf("SUCCESS") >= 0);
+char[] chars = new char[] {0x15}; // 0x15 is not a valid xml
character..and should be filtered
+String insert = new String(chars);
+assertTrue("Illegal characters were not filtered: " + response,
+response.indexOf(insert) < 0);
}
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/resourceinjection/ResourceInjectionPortTypeImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/resourceinjection/ResourceInjectionPortTypeImpl.java?rev=982938&r1=982937&r2=982938&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/resourceinjection/ResourceInjectionPortTypeImpl.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/resourceinjection/ResourceInjectionPortTypeImpl.java
Fri Aug 6 12:31:05 2010
@@ -19,6 +19,7 @@
package org.apache.axis2.jaxws.sample.resourceinjection;
+import org.apache.axis2.jaxws.Constants;
import org.apache.axis2.jaxws.TestLogger;
import
org.apache.axis2.jaxws.sample.resourceinjection.sei.ResourceInjectionPortType;
@@ -69,7 +70,18 @@ import javax.xml.ws.handler.MessageConte
return "FAILURE: The WebServiceContext's MessageContext " +
"does not have the correct wsdlOperation";
}
-return "SUCCESS: " + wsdlOperation.getLocalPart();
+
+String response = "SUCCESS: " + wsdlOperation.getLocalPart();
+
+// Set a flag to force filtering of JAXB data.
+// Also set a illegal characters in the response string
+// to verify that the illegal character is removed.
+msgContext.put(Constants.JAXWS_JAXB_WRITE_REMOVE_ILLEGAL_CHARS,
Boolean.TRUE);
+char[] chars = new char[] {0x15}; // 0x15 is not a valid xml character
+String insert = new String(chars);
+response = insert + response + insert;
+
+return response;
}
@PostConstruct
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDSContext.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDSContext.java?rev=982938&r1=982937&r2=982938&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDSContext.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDSContext.java
Fri Aug 6 12:31:05 2010
@@ -21,12 +21,14 @@ package org.apache.axis2.datasource.jaxb
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
+import org.apache.axiom.om.util.XMLStreamWriterRemoveIllegalChars;
import org.apache.axiom.util.stax.XMLStreamReaderUtils;
import org.apache.axiom.util.stax.xop.MimePartProvider;
import org.apache.axiom.util.stax.xop.XOPEncodedStream;
impo
svn commit: r983101 - in /axis/axis2/java/core/trunk/modules/jaxws-integration: ./ test/org/apache/axis2/jaxws/sample/ test/org/apache/axis2/jaxws/sample/addnumbershandler/ test/org/apache/axis2/jaxws
Author: veithen
Date: Fri Aug 6 19:29:22 2010
New Revision: 983101
URL: http://svn.apache.org/viewvc?rev=983101&view=rev
Log:
Avoid creating log files in the project folder and create them in the target
folder instead, so that they are not included in the source distribution.
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/ (props changed)
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/HeadersHandlerTests.java
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/addnumbershandler/HandlerTracker.java
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/headershandler/HandlerTracker.java
Propchange: axis/axis2/java/core/trunk/modules/jaxws-integration/
--
--- svn:ignore (original)
+++ svn:ignore Fri Aug 6 19:29:22 2010
@@ -1,6 +1,5 @@
*.iml
*.ipr
-*.log
target
build
.settings
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java?rev=983101&r1=983100&r2=983101&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java
Fri Aug 6 19:29:22 2010
@@ -75,7 +75,7 @@ public class AddNumbersHandlerTests exte
requestFile = new
File(resourceDir+File.separator+"addnumberstest.xml");
}
-private static final String filelogname = "AddNumbersHandlerTests.log";
+private static final String filelogname =
"target/AddNumbersHandlerTests.log";
public static Test suite() {
return getTestSetup(new TestSuite(AddNumbersHandlerTests.class));
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/HeadersHandlerTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/HeadersHandlerTests.java?rev=983101&r1=983100&r2=983101&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/HeadersHandlerTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/HeadersHandlerTests.java
Fri Aug 6 19:29:22 2010
@@ -57,7 +57,7 @@ public class HeadersHandlerTests extends
String axisEndpoint =
"http://localhost:6060/axis2/services/HeadersHandlerService.HeadersHandlerPortTypeImplPort";;
-private static final String filelogname = "HeadersHandlerTests.log";
+private static final String filelogname = "target/HeadersHandlerTests.log";
public static Test suite() {
return getTestSetup(new TestSuite(HeadersHandlerTests.class));
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/addnumbershandler/HandlerTracker.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/addnumbershandler/HandlerTracker.java?rev=983101&r1=983100&r2=983101&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/addnumbershandler/HandlerTracker.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/addnumbershandler/HandlerTracker.java
Fri Aug 6 19:29:22 2010
@@ -23,7 +23,7 @@ import java.io.FileWriter;
public class HandlerTracker {
-private static final String filelogname = "AddNumbersHandlerTests.log";
+private static final String filelogname =
"target/AddNumbersHandlerTests.log";
private String classname;
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/headershandler/HandlerTracker.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/headershandler/HandlerTracker.java?rev=983101&r1=983100&r2=983101&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/headershandler/HandlerTracker.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/ax
svn commit: r983114 - in /axis/axis2/java/core/trunk/modules/tool: axis2-java2wsdl-maven-plugin/pom.xml axis2-wsdl2code-maven-plugin/pom.xml
Author: veithen Date: Fri Aug 6 20:02:34 2010 New Revision: 983114 URL: http://svn.apache.org/viewvc?rev=983114&view=rev Log: Make sure that the output directories of the test projects used by axis2-java2wsdl-maven-plugin and axis2-wsdl2code-maven-plugin are deleted during the clean phase. Modified: axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml Modified: axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml?rev=983114&r1=983113&r2=983114&view=diff == --- axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml Fri Aug 6 20:02:34 2010 @@ -57,6 +57,16 @@ + +maven-clean-plugin + + + +src/test/test1/target + + + + Modified: axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml?rev=983114&r1=983113&r2=983114&view=diff == --- axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml Fri Aug 6 20:02:34 2010 @@ -106,6 +106,16 @@ + +maven-clean-plugin + + + +src/test/test1/target + + + +
svn commit: r983119 - in /axis/axis2/java/core/trunk/modules: samples/version/ tool/axis2-java2wsdl-maven-plugin/src/test/test1/ tool/axis2-repo-maven-plugin/ tool/axis2-wsdl2code-maven-plugin/src/tes
Author: veithen Date: Fri Aug 6 20:18:54 2010 New Revision: 983119 URL: http://svn.apache.org/viewvc?rev=983119&view=rev Log: Setting svn:ignore. Modified: axis/axis2/java/core/trunk/modules/samples/version/ (props changed) axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/src/test/test1/ (props changed) axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/ (props changed) axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/test/test1/ (props changed) Propchange: axis/axis2/java/core/trunk/modules/samples/version/ -- --- svn:ignore (original) +++ svn:ignore Fri Aug 6 20:18:54 2010 @@ -1,3 +1,5 @@ version.iml target - +.settings +.classpath +.project Propchange: axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/src/test/test1/ -- --- svn:ignore (added) +++ svn:ignore Fri Aug 6 20:18:54 2010 @@ -0,0 +1 @@ +target Propchange: axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/ -- --- svn:ignore (added) +++ svn:ignore Fri Aug 6 20:18:54 2010 @@ -0,0 +1,4 @@ +.settings +target +.classpath +.project Propchange: axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/src/test/test1/ -- --- svn:ignore (added) +++ svn:ignore Fri Aug 6 20:18:54 2010 @@ -0,0 +1 @@ +target
svn commit: r983120 - /axis/axis2/java/core/trunk/modules/
Author: veithen
Date: Fri Aug 6 20:23:53 2010
New Revision: 983120
URL: http://svn.apache.org/viewvc?rev=983120&view=rev
Log:
Removed an svn:ignore property that was introduced for unknown reasons
(probably by mistake) in r708309.
Modified:
axis/axis2/java/core/trunk/modules/ (props changed)
Propchange: axis/axis2/java/core/trunk/modules/
('svn:ignore' removed)
svn commit: r983128 - /axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml
Author: veithen
Date: Fri Aug 6 21:06:53 2010
New Revision: 983128
URL: http://svn.apache.org/viewvc?rev=983128&view=rev
Log:
Refined the exclusions in the source distribution. They are now consistent with
the svn:ignore properties in SVN.
Modified:
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml
Modified:
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml?rev=983128&r1=983127&r2=983128&view=diff
==
---
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml
(original)
+++
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml
Fri Aug 6 21:06:53 2010
@@ -77,13 +77,21 @@
modules/tool/axis2-eclipse-codegen-plugin/META-INF/**
modules/tool/axis2-eclipse-codegen-plugin/lib/**
+
+
modules/tool/axis2-wsdl2code-maven-plugin/src/test/test1/target/**
+
modules/tool/axis2-java2wsdl-maven-plugin/src/test/test1/target/**
+
../../SameServiceAddingTest.java
../../modules/samples/eventing/**
../../modules/samples/security/**
xdocs/**
-
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]
