Author: veithen
Date: Mon May 1 11:36:09 2017
New Revision: 1793311
URL: http://svn.apache.org/viewvc?rev=1793311&view=rev
Log:
Merge latest changes from trunk.
Added:
axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/src/test/java/helper/
- copied from r1793310,
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/helper/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/src/test/java/org/apache/axis2/schema/
- copied from r1793310,
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/schema/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/sub-build.xml
- copied unchanged from r1793310,
axis/axis2/java/core/trunk/modules/adb-tests/sub-build.xml
axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractAxis2Server.java
- copied unchanged from r1793310,
axis/axis2/java/core/trunk/modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractAxis2Server.java
axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/ClientHelper.java
- copied unchanged from r1793310,
axis/axis2/java/core/trunk/modules/testutils/src/main/java/org/apache/axis2/testutils/ClientHelper.java
axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/JettyServer.java
- copied unchanged from r1793310,
axis/axis2/java/core/trunk/modules/testutils/src/main/java/org/apache/axis2/testutils/JettyServer.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/GeneratedAxis2Xml.java
- copied unchanged from r1793310,
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/GeneratedAxis2Xml.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/MessageHandler.java
- copied unchanged from r1793310,
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/MessageHandler.java
Removed:
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/sub-build.xml
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/helper/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/ADBBeanUtil.java
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/AbstractTestCase.java
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/all/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/anytype/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/attribute/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/base64binary/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/booleantest/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/chameleon/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/choice/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/decimal/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/defaultnamespaces/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/defaultvalue/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/enumeration/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/extension/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/fix/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/group/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/innerchoice/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/innerparticleextension/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/innerparticles/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/list/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/nonamespace/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/particlemaxoccurs/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/populate/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/references/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/restriction/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/union/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/union2/
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/test/org/apache/axis2/schema/unqualified/
axis/axis2/java/core/branches/hermetic-tests/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/src/main/resources/org/
Modified:
axis/axis2/java/core/branches/hermetic-tests/ (props changed)
axis/axis2/java/core/branches/hermetic-tests/apidocs/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5809/ServiceTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/AsyncExecutorTests.java
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/parallelasync/server/DocLitWrappedPortImpl.java
axis/axis2/java/core/branches/hermetic-tests/modules/json/test-repository/json/axis2.xml
axis/axis2/java/core/branches/hermetic-tests/modules/json/test/org/apache/axis2/json/JSONIntegrationTest.java
axis/axis2/java/core/branches/hermetic-tests/modules/json/test/org/apache/axis2/json/JSONTestConstants.java
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java
axis/axis2/java/core/branches/hermetic-tests/modules/osgi-tests/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/osgi/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/testutils/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-aar-maven-plugin/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-idea-plugin/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-mar-maven-plugin/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPClient3TransportSender.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPProxyConfigurator.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPSenderImpl.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/RequestImpl.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPTransportSender.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/http/src/org/apache/axis2/transport/http/HTTPWorker.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/http/src/org/apache/axis2/transport/http/ListingAgent.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/http/src/org/apache/axis2/transport/http/Request.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPClient4TransportSender.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPProxyConfigurator.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/RequestImpl.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/package.html
axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/pom.xml
axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/src/main/java/org/apache/axis2/transport/CustomAxisConfigurator.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContext.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContextConfigurator.java
axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/doclet/TestkitJavadocDoclet.java
axis/axis2/java/core/branches/hermetic-tests/pom.xml
axis/axis2/java/core/branches/hermetic-tests/src/site/markdown/release-notes/1.8.0.md
axis/axis2/java/core/branches/hermetic-tests/src/site/xdoc/docs/soapmonitor-module.xml.vm
axis/axis2/java/core/branches/hermetic-tests/systests/ (props changed)
Propchange: axis/axis2/java/core/branches/hermetic-tests/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 1 11:36:09 2017
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1779063-1779816
+/axis/axis2/java/core/trunk:1779063-1793310
Modified: axis/axis2/java/core/branches/hermetic-tests/apidocs/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/apidocs/pom.xml?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/apidocs/pom.xml (original)
+++ axis/axis2/java/core/branches/hermetic-tests/apidocs/pom.xml Mon May 1
11:36:09 2017
@@ -273,12 +273,44 @@
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
+ <id>extract-resource-info</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ <configuration>
+ <docletArtifacts>
+ <docletArtifact>
+ <groupId>${project.groupId}</groupId>
+
<artifactId>axis2-transport-testkit</artifactId>
+ <version>${project.version}</version>
+ </docletArtifact>
+ </docletArtifacts>
+
<doclet>org.apache.axis2.transport.testkit.doclet.ResourceInfoDoclet</doclet>
+
<useStandardDocletOptions>false</useStandardDocletOptions>
+ <show>private</show>
+ <additionalparam>-out
${project.build.directory}/resource-info.dat</additionalparam>
+ </configuration>
+ </execution>
+ <execution>
<id>site-javadoc</id>
<phase>site</phase>
<goals>
<goal>javadoc-no-fork</goal>
</goals>
<configuration>
+ <docletArtifacts>
+ <docletArtifact>
+ <groupId>${project.groupId}</groupId>
+
<artifactId>axis2-transport-testkit</artifactId>
+ <version>${project.version}</version>
+ </docletArtifact>
+ </docletArtifacts>
+
<doclet>org.apache.axis2.transport.testkit.doclet.TestkitJavadocDoclet</doclet>
+
<useStandardDocletOptions>true</useStandardDocletOptions>
+ <additionalparam>
+ -resource-info
${project.build.directory}/resource-info.dat
+ </additionalparam>
<reportOutputDirectory>${project.reporting.outputDirectory}</reportOutputDirectory>
<destDir>.</destDir>
</configuration>
Modified:
axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/pom.xml?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/pom.xml
(original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/adb-codegen/pom.xml
Mon May 1 11:36:09 2017
@@ -115,29 +115,10 @@
<inherited>true</inherited>
<configuration>
<excludes>
- <exclude>**/*Abstract*.java</exclude>
- <exclude>**/*Util*.java</exclude>
- <exclude>**/*PhaseResolvingTest.java</exclude>
- <exclude>**/*UnionQNameTest.java</exclude>
- <exclude>**/*UnqualifiedTest.java</exclude>
+
<exclude>org/apache/axis2/schema/ExtensionUtilityTest.java</exclude>
</excludes>
- <includes>
- <include>**/*Test.java</include>
- </includes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <fork>true</fork>
- <meminitial>128m</meminitial>
- <maxmem>256m</maxmem>
- <testExcludes>
-
<exclude>helper/org/apache/axis2/schema/testsuite/TestAnyType*Helper.java</exclude>
- </testExcludes>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -163,47 +144,6 @@
<goal>run</goal>
</goals>
</execution>
- <execution>
- <id>generate-test-sources</id>
- <phase>generate-test-sources</phase>
- <configuration>
- <tasks unless="maven.test.skip">
- <property name="maven.junit.jvmargs" value=""
/>
- <path id="maven.dependency.classpath">
- <path refid="maven.compile.classpath" />
- </path>
- <property name="compiled.classes.dir"
value="target/classes" />
- <!-- Theres got to be a better way to do this
-->
- <property name="schema.source.dir"
value="test-resources/xsd" />
- <property name="testsuite.source.dir"
value="test-resources/testsuite" />
- <property name="schema.output.base.dir"
value="target/schema" />
- <property name="schema.generated.src.dir"
value="${schema.output.base.dir}/src" />
- <property name="schema.generated.classes.dir"
value="${schema.output.base.dir}/classes" />
- <ant antfile="sub-build.xml" inheritall="true"
inheritrefs="true" dir="." target="main" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-test-source</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/schema/src</source>
- </sources>
- </configuration>
- </execution>
</executions>
</plugin>
</plugins>
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/pom.xml?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/pom.xml
(original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/pom.xml Mon
May 1 11:36:09 2017
@@ -43,6 +43,13 @@
<scope>test</scope>
</dependency>
<dependency>
+ <!-- TODO: remove this when we switch to the axis2-xsd2java-maven
plugin -->
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-adb-codegen</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>axis2-transport-local</artifactId>
<version>${project.version}</version>
@@ -60,6 +67,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>testutils</artifactId>
<scope>test</scope>
@@ -79,6 +91,53 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-test-sources</id>
+ <phase>generate-test-sources</phase>
+ <configuration>
+ <tasks unless="maven.test.skip">
+ <property name="maven.junit.jvmargs" value=""
/>
+ <path id="maven.dependency.classpath">
+ <path refid="maven.test.classpath" />
+ </path>
+ <property name="compiled.classes.dir"
value="target/classes" />
+ <!-- Theres got to be a better way to do this
-->
+ <property name="schema.source.dir"
value="../adb-codegen/test-resources/xsd" />
+ <property name="testsuite.source.dir"
value="../adb-codegen/test-resources/testsuite" />
+ <property name="schema.output.base.dir"
value="target/schema" />
+ <property name="schema.generated.src.dir"
value="${schema.output.base.dir}/src" />
+ <property name="schema.generated.classes.dir"
value="${schema.output.base.dir}/classes" />
+ <ant antfile="sub-build.xml" inheritall="true"
inheritrefs="true" dir="." target="main" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-test-source</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${basedir}/target/schema/src</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>${project.groupId}</groupId>
<artifactId>axis2-wsdl2code-maven-plugin</artifactId>
<version>${project.version}</version>
@@ -352,6 +411,24 @@
</dependencies>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <testExcludes>
+
<exclude>helper/org/apache/axis2/schema/testsuite/TestAnyType*Helper.java</exclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <excludes>
+
<exclude>org/apache/axis2/schema/innerparticleextension/TestInnerParticleExtension.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
Modified:
axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5809/ServiceTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5809/ServiceTest.java?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5809/ServiceTest.java
(original)
+++
axis/axis2/java/core/branches/hermetic-tests/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5809/ServiceTest.java
Mon May 1 11:36:09 2017
@@ -23,6 +23,7 @@ import static org.junit.Assert.fail;
import org.apache.axis2.AxisFault;
import org.apache.axis2.testutils.Axis2Server;
+import org.apache.axis2.testutils.ClientHelper;
import org.junit.ClassRule;
import org.junit.Test;
@@ -30,9 +31,12 @@ public class ServiceTest {
@ClassRule
public static Axis2Server server = new
Axis2Server("target/repo/AXIS2-5809");
+ @ClassRule
+ public static ClientHelper clientHelper = new ClientHelper(server);
+
@Test
public void testWithNormalResponse() throws Exception {
- EchoServiceStub stub = new
EchoServiceStub(server.getConfigurationContext(),
server.getEndpoint("EchoService"));
+ EchoServiceStub stub = clientHelper.createStub(EchoServiceStub.class,
"EchoService");
for (int i=0; i<500; i++) {
Echo request = new Echo();
request.setContent("test");
@@ -42,7 +46,7 @@ public class ServiceTest {
@Test
public void testWithFault() throws Exception {
- EchoServiceStub stub = new
EchoServiceStub(server.getConfigurationContext(),
server.getEndpoint("EchoService"));
+ EchoServiceStub stub = clientHelper.createStub(EchoServiceStub.class,
"EchoService");
for (int i=0; i<500; i++) {
Echo request = new Echo();
request.setContent("");
Modified:
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/AsyncExecutorTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/AsyncExecutorTests.java?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/AsyncExecutorTests.java
(original)
+++
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/AsyncExecutorTests.java
Mon May 1 11:36:09 2017
@@ -347,6 +347,22 @@ public class AsyncExecutorTests extends
}
}
+ static void withRetry(Runnable runnable) throws InterruptedException {
+ int retries = 0;
+ while (true) {
+ try {
+ runnable.run();
+ return;
+ } catch (AssertionError ex) {
+ if (retries++ > 60) {
+ throw ex;
+ } else {
+ Thread.sleep(500);
+ }
+ }
+ }
+ }
+
/**
* Thread that verifies the request sent by a different thread was
recieved by the service and
* then verify the response. Another thread will have previously sent the
request. Note that
@@ -380,21 +396,22 @@ public class AsyncExecutorTests extends
}
private void receiveResponse() throws Exception {
- String title = myClassName + " : ReceiveClientResponse : ";
- String request1 = monitor.request;
+ final String title = myClassName + " : ReceiveClientResponse : ";
+ final String request1 = monitor.request;
AsyncService service = new AsyncService();
- AsyncPort port = getPort(service);
+ final AsyncPort port = getPort(service);
- // wait a bit to make sure that the server has the request;
- Thread.sleep(1000);
-
- // check the waiting request
- TestLogger.logger.debug(title + " port.isAsleep(" + request1 + ")
#1 being submitted....");
- String asleepWithCallback1 = port.isAsleep(request1);
- TestLogger.logger.debug(
- title + " port.isAsleep(" + request1 + ") #1 = [" +
asleepWithCallback1 + "]");
- assertEquals(request1, asleepWithCallback1);
+ withRetry(new Runnable() {
+ public void run() {
+ // check the waiting request
+ TestLogger.logger.debug(title + " port.isAsleep(" +
request1 + ") #1 being submitted....");
+ String asleepWithCallback1 = port.isAsleep(request1);
+ TestLogger.logger.debug(
+ title + " port.isAsleep(" + request1 + ") #1 = ["
+ asleepWithCallback1 + "]");
+ assertEquals(request1, asleepWithCallback1);
+ }
+ });
// wakeup the waiting request
TestLogger.logger.debug(title + " port.wakeUp(request1) #1 being
submitted....");
@@ -403,13 +420,15 @@ public class AsyncExecutorTests extends
assertEquals(request1, wake1);
TestLogger.logger.debug(title + " port.wakeUp(" + request1 + ") #1
= [" + wake1 + "]");
- // wait a bit..
- Thread.sleep(2000);
-
- // check the Future
- Future<?> sr1 = monitor.futureResponse;
+ final Future<?> sr1 = monitor.futureResponse;
CallbackHandler<SleepResponse> sleepCallbackHandler1 =
monitor.callbackHandler;
- assertTrue("Response is not done!", sr1.isDone());
+
+ withRetry(new Runnable() {
+ public void run() {
+ // check the Future
+ assertTrue("Response is not done!", sr1.isDone());
+ }
+ });
// try to get the response
try {
Modified:
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/parallelasync/server/DocLitWrappedPortImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/parallelasync/server/DocLitWrappedPortImpl.java?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/parallelasync/server/DocLitWrappedPortImpl.java
(original)
+++
axis/axis2/java/core/branches/hermetic-tests/modules/jaxws-integration/test/org/apache/axis2/jaxws/sample/parallelasync/server/DocLitWrappedPortImpl.java
Mon May 1 11:36:09 2017
@@ -58,14 +58,7 @@ public class DocLitWrappedPortImpl imple
// the key is the request string
// the value is the object used to block on
//
- private static Hashtable sleepers = new Hashtable();
-
- // intended to flag the need to cancel current requests being held (ie,
sleeping)
- // does not stop new requests
- // not settable yet
- // need to determine when to reset it when dealing with multiple operations
- // currently reset when the sleepers table doesn't have any more requests
- private static boolean doCancell = false;
+ private static Hashtable<String,Thread> sleepers = new
Hashtable<String,Thread>();
// strings used for logging
private String myClassName = "DocLitWrappedPortImpl.";
@@ -84,13 +77,9 @@ public class DocLitWrappedPortImpl imple
*/
public void sleep(Holder<String> request) {
- boolean cancelRequested = false;
-
- String key = new String(request.value);
- String msg = request.value;
+ String key = request.value;
- String title = myClassName+"sleep("+msg+"): ";
- String tid = " threadID ["+ Thread.currentThread().getId() + "] ";
+ String title = myClassName+"sleep("+key+"): ";
//if (DEBUG)
//{
// System.out.println(title + tid + "Enter");
@@ -123,7 +112,7 @@ public class DocLitWrappedPortImpl imple
// - the wait is interrupted
// - a cancel occurs
- while (sec > 0 && !doCancell) {
+ while (sec > 0) {
if (DEBUG)
TestLogger.logger.debug(title + "Sleeping on "
+ " threadID [" + threadID + "]"
@@ -131,7 +120,7 @@ public class DocLitWrappedPortImpl imple
sec--;
//msg.wait(500);
- myThread.sleep(500);
+ Thread.sleep(500);
}
}
@@ -150,13 +139,6 @@ public class DocLitWrappedPortImpl imple
// remove this request from the list
sleepers.remove(key);
-
- // for now, reset the cancellation flag when the list of
- // waiting requests go to zero
- if (sleepers.isEmpty())
- {
- doCancell = false;
- }
}
}
Modified:
axis/axis2/java/core/branches/hermetic-tests/modules/json/test-repository/json/axis2.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/json/test-repository/json/axis2.xml?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/hermetic-tests/modules/json/test-repository/json/axis2.xml
(original)
+++
axis/axis2/java/core/branches/hermetic-tests/modules/json/test-repository/json/axis2.xml
Mon May 1 11:36:09 2017
@@ -126,7 +126,7 @@
class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
<messageFormatter contentType="application/json"
class="org.apache.axis2.json.JSONMessageFormatter"/>
- <messageFormatter contentType="application/json/badgerfish"
+ <messageFormatter contentType="application/json+badgerfish"
class="org.apache.axis2.json.JSONBadgerfishMessageFormatter"/>
<messageFormatter contentType="text/javascript"
class="org.apache.axis2.json.JSONMessageFormatter"/>
@@ -140,7 +140,7 @@
<messageBuilders>
<messageBuilder contentType="application/json"
class="org.apache.axis2.json.JSONOMBuilder"/>
- <messageBuilder contentType="application/json/badgerfish"
+ <messageBuilder contentType="application/json+badgerfish"
class="org.apache.axis2.json.JSONBadgerfishOMBuilder"/>
<messageBuilder contentType="text/javascript"
class="org.apache.axis2.json.JSONOMBuilder"/>
Modified:
axis/axis2/java/core/branches/hermetic-tests/modules/json/test/org/apache/axis2/json/JSONIntegrationTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/json/test/org/apache/axis2/json/JSONIntegrationTest.java?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/hermetic-tests/modules/json/test/org/apache/axis2/json/JSONIntegrationTest.java
(original)
+++
axis/axis2/java/core/branches/hermetic-tests/modules/json/test/org/apache/axis2/json/JSONIntegrationTest.java
Mon May 1 11:36:09 2017
@@ -30,6 +30,7 @@ import org.apache.axis2.Constants;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.testutils.Axis2Server;
+import org.apache.axis2.testutils.ClientHelper;
import org.junit.ClassRule;
import org.junit.Test;
@@ -47,6 +48,9 @@ public class JSONIntegrationTest impleme
@ClassRule
public static Axis2Server server = new Axis2Server("target/repo/json");
+ @ClassRule
+ public static ClientHelper clientHelper = new ClientHelper(server);
+
protected OMElement createEnvelope() throws Exception {
OMFactory fac = OMAbstractFactory.getOMFactory();
OMNamespace omNs = fac.createOMNamespace("", "");
@@ -64,15 +68,12 @@ public class JSONIntegrationTest impleme
private void doEchoOM(String messageType, String httpMethod) throws
Exception{
OMElement payload = createEnvelope();
- Options options = new Options();
- options.setTo(server.getEndpointReference("EchoXMLService"));
+ ServiceClient sender =
clientHelper.createServiceClient("EchoXMLService");
+ Options options = sender.getOptions();
options.setProperty(Constants.Configuration.MESSAGE_TYPE, messageType);
options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
options.setProperty(Constants.Configuration.HTTP_METHOD, httpMethod);
-// ConfigurationContext clientConfigurationContext =
ConfigurationContextFactory.createDefaultConfigurationContext();
- ServiceClient sender = new
ServiceClient(server.getConfigurationContext(), null);
options.setAction(null);
- sender.setOptions(options);
OMElement result = sender.sendReceive(payload);
OMElement ele = (OMElement)result.getFirstOMChild();
compareWithCreatedOMText(ele.getText());
@@ -80,7 +81,7 @@ public class JSONIntegrationTest impleme
@Test
public void testEchoOMWithJSONBadgerfish() throws Exception{
- doEchoOM("application/json/badgerfish",
Constants.Configuration.HTTP_METHOD_POST);
+ doEchoOM("application/json+badgerfish",
Constants.Configuration.HTTP_METHOD_POST);
}
@Test
@@ -97,7 +98,7 @@ public class JSONIntegrationTest impleme
public void testPOJOServiceWithJSONBadgerfish() throws Exception {
HttpURLConnection conn = (HttpURLConnection)new
URL(server.getEndpoint("POJOService")).openConnection();
conn.setDoOutput(true);
- conn.addRequestProperty("Content-Type", "application/json/badgerfish");
+ conn.addRequestProperty("Content-Type", "application/json+badgerfish");
Writer out = new OutputStreamWriter(conn.getOutputStream(), "UTF-8");
// XML is: <sayHello
xmlns="http://example.org";><myName>Joe</myName></sayHello>
out.write("{ \"sayHello\" : { \"@xmlns\" : { \"$\" :
\"http://example.org\"; }, \"myName\" : { \"$\" : \"Joe\" } } }");
Modified:
axis/axis2/java/core/branches/hermetic-tests/modules/json/test/org/apache/axis2/json/JSONTestConstants.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/json/test/org/apache/axis2/json/JSONTestConstants.java?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/hermetic-tests/modules/json/test/org/apache/axis2/json/JSONTestConstants.java
(original)
+++
axis/axis2/java/core/branches/hermetic-tests/modules/json/test/org/apache/axis2/json/JSONTestConstants.java
Mon May 1 11:36:09 2017
@@ -21,7 +21,7 @@ package org.apache.axis2.json;
public interface JSONTestConstants {
- public static final String CONTENT_TYPE_BADGERFISH =
"application/json/badgerfish";
+ public static final String CONTENT_TYPE_BADGERFISH =
"application/json+badgerfish";
public static final String CONTENT_TYPE_MAPPED = "application/json";
Modified:
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java
(original)
+++
axis/axis2/java/core/branches/hermetic-tests/modules/kernel/src/org/apache/axis2/deployment/ModuleDeployer.java
Mon May 1 11:36:09 2017
@@ -204,7 +204,7 @@ public class ModuleDeployer extends Abst
AxisModule module = new AxisModule();
module.setModuleClassLoader(deploymentClassLoader);
module.setParent(axisConfig);
- module.setArchiveName(deploymentFileData.getName());
+
module.setArchiveName(DescriptionBuilder.getShortFileName(deploymentFileData.getName()));
populateModule(module, fileUrl);
module.setFileName(fileUrl);
DeploymentEngine.addNewModule(module, axisConfig);
Modified:
axis/axis2/java/core/branches/hermetic-tests/modules/osgi-tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/osgi-tests/pom.xml?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/osgi-tests/pom.xml
(original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/osgi-tests/pom.xml Mon
May 1 11:36:09 2017
@@ -155,12 +155,10 @@
<artifact>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-osgi</artifactId>
- <version>4.2.1</version>
</artifact>
<artifact>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-osgi</artifactId>
- <version>4.2.1</version>
</artifact>
</artifacts>
<paxExam>${exam.version}</paxExam>
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/osgi/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/osgi/pom.xml?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/osgi/pom.xml (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/osgi/pom.xml Mon May
1 11:36:09 2017
@@ -117,36 +117,15 @@
javax.xml.datatype.*,
org.apache.axiom.*,
org.apache.commons.fileupload.*,
- org.apache.commons.httpclient.*,
org.apache.commons.lang;resolution:=optional,
org.apache.commons.logging,
- org.apache.http;resolution:=optional,
- org.apache.http.entity;resolution:=optional,
- org.apache.http.impl;resolution:=optional,
- org.apache.http.impl.entity;resolution:=optional,
- org.apache.http.impl.io;resolution:=optional,
- org.apache.http.impl.auth;resolution:=optional,
- org.apache.http.impl.conn;resolution:=optional,
- org.apache.http.io;resolution:=optional,
- org.apache.http.message;resolution:=optional,
- org.apache.http.params;resolution:=optional,
- org.apache.http.protocol;resolution:=optional,
- org.apache.http.util;resolution:=optional,
org.apache.neethi,
org.apache.woden.*;version="0.0.0",
org.apache.ws.commons.schema.*,
org.w3c.dom;resolution:=optional,
org.w3c.dom.traversal;resolution:=optional,
org.xml.sax;resolution:=optional,
- org.apache.http.client.*,
- org.apache.http.auth;resolution:=optional,
- org.apache.http.auth.params;resolution:=optional,
- org.apache.http.conn;resolution:=optional,
- org.apache.http.conn.params;resolution:=optional,
- org.apache.http.conn.scheme;resolution:=optional,
- org.apache.http.conn.ssl;resolution:=optional,
- org.apache.http.impl.client;resolution:=optional,
-
org.apache.http.impl.conn.tsccm;resolution:=optional
+ *
</Import-Package>
<Private-Package>
org.apache.axis2.osgi.internal,
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/testutils/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/testutils/pom.xml?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/testutils/pom.xml
(original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/testutils/pom.xml Mon
May 1 11:36:09 2017
@@ -40,6 +40,16 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>7.6.15.v20140411</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ <version>1.49</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
Modified:
axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java
(original)
+++
axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/Axis2Server.java
Mon May 1 11:36:09 2017
@@ -18,23 +18,32 @@
*/
package org.apache.axis2.testutils;
+import javax.net.ssl.SSLContext;
+
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.transport.http.SimpleHTTPServer;
-import org.junit.rules.ExternalResource;
-public class Axis2Server extends ExternalResource {
- private final String repositoryPath;
+public class Axis2Server extends AbstractAxis2Server {
private int port = -1;
- private ConfigurationContext configurationContext;
private SimpleHTTPServer server;
public Axis2Server(String repositoryPath) {
- this.repositoryPath = repositoryPath;
+ super(repositoryPath);
+ }
+
+ @Override
+ public boolean isSecure() {
+ return false;
+ }
+
+ @Override
+ public SSLContext getClientSSLContext() {
+ return null;
}
+ @Override
public int getPort() {
if (port == -1) {
throw new IllegalStateException();
@@ -42,34 +51,26 @@ public class Axis2Server extends Externa
return port;
}
- public ConfigurationContext getConfigurationContext() {
- if (configurationContext == null) {
- throw new IllegalStateException();
- }
- return configurationContext;
- }
-
+ @Override
public String getEndpoint(String serviceName) throws AxisFault {
return getEndpointReference(serviceName).getAddress();
}
+ @Override
public EndpointReference getEndpointReference(String serviceName) throws
AxisFault {
return server.getEPRForService(serviceName, "localhost");
}
@Override
- protected void before() throws Throwable {
+ protected void startServer(ConfigurationContext configurationContext)
throws Throwable {
port = PortAllocator.allocatePort();
- configurationContext =
-
ConfigurationContextFactory.createConfigurationContextFromFileSystem(repositoryPath);
server = new SimpleHTTPServer(configurationContext, port);
server.start();
}
@Override
- protected void after() {
+ protected void stopServer() {
port = -1;
- configurationContext = null;
server.stop();
server = null;
}
Modified:
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-aar-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-aar-maven-plugin/pom.xml?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-aar-maven-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-aar-maven-plugin/pom.xml
Mon May 1 11:36:09 2017
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -56,11 +56,21 @@
</dependency>
<dependency>
- <groupId>org.apache.maven.shared</groupId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<exclusions>
Modified:
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java
(original)
+++
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AarMojo.java
Mon May 1 11:36:09 2017
@@ -23,6 +23,7 @@ import org.apache.maven.archiver.MavenAr
import org.apache.maven.archiver.MavenArchiver;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProjectHelper;
import org.codehaus.plexus.archiver.ArchiverException;
@@ -41,6 +42,15 @@ import java.io.IOException;
*/
public class AarMojo extends AbstractAarMojo {
/**
+ * The Maven Session
+ *
+ * @required
+ * @readonly
+ * @parameter expression="${session}"
+ */
+ private MavenSession session;
+
+ /**
* The directory for the generated aar.
*
* @parameter expression="${project.build.directory}"
@@ -132,7 +142,7 @@ public class AarMojo extends AbstractAar
jarArchiver.addDirectory(aarDirectory);
// create archive
- archiver.createArchive(project, archive);
+ archiver.createArchive(session, project, archive);
if (classifier != null) {
projectHelper.attachArtifact(project, "aar", classifier, aarFile);
Modified:
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java
(original)
+++
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/AbstractAarMojo.java
Mon May 1 11:36:09 2017
@@ -30,7 +30,6 @@ import org.codehaus.plexus.util.FileUtil
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -157,12 +156,11 @@ public abstract class AbstractAarMojo
copyMetaInfFile(wsdlFile, wsdlFileTarget,
wsdlExistsBeforeCopyingClasses, "WSDL file");
if (includeDependencies) {
- Set artifacts = project.getArtifacts();
+ Set<Artifact> artifacts = project.getArtifacts();
- List duplicates = findDuplicates(artifacts);
+ List<String> duplicates = findDuplicates(artifacts);
- for (Iterator iter = artifacts.iterator(); iter.hasNext();) {
- Artifact artifact = (Artifact)iter.next();
+ for (Artifact artifact : artifacts) {
String targetFileName = getDefaultFinalName(artifact);
getLog().debug("Processing: " + targetFileName);
@@ -198,11 +196,10 @@ public abstract class AbstractAarMojo
* @param artifacts set of artifacts
* @return List of duplicated artifacts
*/
- private List findDuplicates(Set artifacts) {
- List duplicates = new ArrayList();
- List identifiers = new ArrayList();
- for (Iterator iter = artifacts.iterator(); iter.hasNext();) {
- Artifact artifact = (Artifact)iter.next();
+ private List<String> findDuplicates(Set<Artifact> artifacts) {
+ List<String> duplicates = new ArrayList<String>();
+ List<String> identifiers = new ArrayList<String>();
+ for (Artifact artifact : artifacts) {
String candidate = getDefaultFinalName(artifact);
if (identifiers.contains(candidate)) {
duplicates.add(candidate);
Modified:
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-idea-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-idea-plugin/pom.xml?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-idea-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-idea-plugin/pom.xml
Mon May 1 11:36:09 2017
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Modified:
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml
Mon May 1 11:36:09 2017
@@ -111,7 +111,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-core</artifactId>
</dependency>
<dependency>
<!-- Maven supports SLF4J -->
@@ -120,8 +120,14 @@
</dependency>
<dependency>
- <groupId>org.apache.maven.shared</groupId>
+ <groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
<reporting>
Modified:
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
(original)
+++
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
Mon May 1 11:36:09 2017
@@ -229,15 +229,15 @@ public class Java2WSDLMojo extends Abstr
Java2WSDLConstants.OUTPUT_FILENAME_OPTION,
outputFile.getName() );
- Artifact artifact = project.getArtifact();
- Set artifacts = project.getArtifacts();
- String[] artifactFileNames = new String[artifacts.size() + (artifact
== null ? 0 : 1)];
+ Artifact projectArtifact = project.getArtifact();
+ Set<Artifact> artifacts = project.getArtifacts();
+ String[] artifactFileNames = new String[artifacts.size() +
(projectArtifact == null ? 0 : 1)];
int j = 0;
- for(Iterator i = artifacts.iterator(); i.hasNext(); j++) {
- artifactFileNames[j] = ((Artifact)
i.next()).getFile().getAbsolutePath();
+ for (Artifact artifact : artifacts) {
+ artifactFileNames[j++] = artifact.getFile().getAbsolutePath();
}
- if(artifact != null) {
- File file = artifact.getFile();
+ if(projectArtifact != null) {
+ File file = projectArtifact.getFile();
if(file != null){
artifactFileNames[j] = file.getAbsolutePath();
}
Modified:
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-mar-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-mar-maven-plugin/pom.xml?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-mar-maven-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-mar-maven-plugin/pom.xml
Mon May 1 11:36:09 2017
@@ -37,31 +37,26 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>${maven.version}</version>
+ <artifactId>maven-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>${maven.artifact.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <version>${maven.archiver.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>${plexus.utils.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.shared</groupId>
+ <groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<scope>test</scope>
</dependency>
Modified:
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java
(original)
+++
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/AbstractMarMojo.java
Mon May 1 11:36:09 2017
@@ -30,7 +30,6 @@ import org.codehaus.plexus.util.FileUtil
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -136,13 +135,12 @@ public abstract class AbstractMarMojo
copyMetaInfFile( moduleXmlFile, moduleFileTarget,
existsBeforeCopyingClasses, "module.xml file" );
if(includeDependencies){
- Set artifacts = project.getArtifacts();
+ Set<Artifact> artifacts = project.getArtifacts();
- List duplicates = findDuplicates( artifacts );
+ List<String> duplicates = findDuplicates( artifacts );
- for ( Iterator iter = artifacts.iterator(); iter.hasNext(); )
+ for (Artifact artifact : artifacts)
{
- Artifact artifact = (Artifact) iter.next();
String targetFileName = getDefaultFinalName( artifact );
getLog().debug( "Processing: " + targetFileName );
@@ -179,13 +177,12 @@ public abstract class AbstractMarMojo
* @param artifacts set of artifacts
* @return List of duplicated artifacts
*/
- private List findDuplicates( Set artifacts )
+ private List<String> findDuplicates( Set<Artifact> artifacts )
{
- List duplicates = new ArrayList();
- List identifiers = new ArrayList();
- for ( Iterator iter = artifacts.iterator(); iter.hasNext(); )
+ List<String> duplicates = new ArrayList<String>();
+ List<String> identifiers = new ArrayList<String>();
+ for (Artifact artifact : artifacts)
{
- Artifact artifact = (Artifact) iter.next();
String candidate = getDefaultFinalName( artifact );
if ( identifiers.contains( candidate ) )
{
Modified:
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java
(original)
+++
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-mar-maven-plugin/src/main/java/org/apache/axis2/maven2/mar/MarMojo.java
Mon May 1 11:36:09 2017
@@ -23,6 +23,7 @@ import org.apache.maven.archiver.MavenAr
import org.apache.maven.archiver.MavenArchiver;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProjectHelper;
import org.codehaus.plexus.archiver.ArchiverException;
@@ -42,6 +43,15 @@ import java.io.IOException;
public class MarMojo extends AbstractMarMojo
{
/**
+ * The Maven Session
+ *
+ * @required
+ * @readonly
+ * @parameter expression="${session}"
+ */
+ private MavenSession session;
+
+ /**
* The directory for the generated mar.
*
* @parameter expression="${project.build.directory}"
@@ -138,7 +148,7 @@ public class MarMojo extends AbstractMar
jarArchiver.addDirectory( marDirectory );
// create archive
- archiver.createArchive( project, archive );
+ archiver.createArchive(session, project, archive);
if ( classifier != null )
{
Modified:
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/pom.xml?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/pom.xml
Mon May 1 11:36:09 2017
@@ -39,7 +39,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -48,7 +48,16 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>
- <version>1.2</version>
+ <version>3.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Modified:
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
(original)
+++
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
Mon May 1 11:36:09 2017
@@ -20,7 +20,13 @@
package org.apache.axis2.maven2.repo;
import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
@@ -29,6 +35,13 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+
+import org.apache.axiom.om.OMDocument;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
@@ -91,8 +104,15 @@ public abstract class AbstractCreateRepo
private File axis2xml;
/**
+ * If present, an <tt>axis2.xml</tt> file will be generated (Experimental).
+ *
+ * @parameter
+ */
+ private GeneratedAxis2Xml generatedAxis2xml;
+
+ /**
* The directory (relative to the repository root) where the
<tt>axis2.xml</tt> file will be
- * copied. If this parameter is not set, then the file will be copied into
the repository
+ * written. If this parameter is not set, then the file will be written
into the repository
* root.
*
* @parameter
@@ -180,6 +200,15 @@ public abstract class AbstractCreateRepo
protected abstract File[] getClassDirectories();
+ private void addMessageHandlers(OMElement root, MessageHandler[] handlers,
String localName) {
+ OMElement parent = root.getFirstChildWithName(new QName(localName +
"s"));
+ for (MessageHandler handler : handlers) {
+ OMElement element =
parent.getOMFactory().createOMElement(localName, null, parent);
+ element.addAttribute("contentType", handler.getContentType(),
null);
+ element.addAttribute("class", handler.getClassName(), null);
+ }
+ }
+
public void execute() throws MojoExecutionException, MojoFailureException {
Log log = getLog();
File inputDirectory = getInputDirectory();
@@ -268,14 +297,68 @@ public abstract class AbstractCreateRepo
}
}
}
- if (axis2xml != null) {
- log.info("Copying axis2.xml");
+ if (generatedAxis2xml != null || axis2xml != null) {
File targetDirectory = configurationDirectory == null
? outputDirectory : new File(outputDirectory,
configurationDirectory);
- try {
- FileUtils.copyFile(axis2xml, new File(targetDirectory,
"axis2.xml"));
- } catch (IOException ex) {
- throw new MojoExecutionException("Error copying axis2.xml
file: " + ex.getMessage(), ex);
+ targetDirectory.mkdirs();
+ File axis2xmlFile = new File(targetDirectory, "axis2.xml");
+ if (axis2xml != null) {
+ log.info("Copying axis2.xml");
+ try {
+ FileUtils.copyFile(axis2xml, axis2xmlFile);
+ } catch (IOException ex) {
+ throw new MojoExecutionException("Error copying axis2.xml
file: " + ex.getMessage(), ex);
+ }
+ } else {
+ log.info("Generating axis2.xml");
+ try {
+ FilterArtifacts filter = new FilterArtifacts();
+ filter.addFilter(new ScopeFilter(getScope(), null));
+ filter.addFilter(new TypeFilter("jar", null));
+ List<URL> urls = new ArrayList<URL>();
+ for (Artifact artifact : filter.filter(projectArtifacts)) {
+ urls.add(artifact.getFile().toURI().toURL());
+ }
+ URLClassLoader classLoader =
URLClassLoader.newInstance(urls.toArray(new URL[urls.size()]));
+ InputStream in =
classLoader.getResourceAsStream("org/apache/axis2/deployment/axis2_default.xml");
+ if (in == null) {
+ throw new MojoFailureException("The default axis2.xml
file could not be found");
+ }
+ try {
+ OMDocument axis2xmlDoc =
OMXMLBuilderFactory.createOMBuilder(in).getDocument();
+ OMElement root = axis2xmlDoc.getOMDocumentElement();
+ for (Iterator<OMNode> it = root.getDescendants(false);
it.hasNext(); ) {
+ OMNode node = it.next();
+ if (node instanceof OMElement) {
+ OMElement element = (OMElement)node;
+ String classAttr =
element.getAttributeValue(new QName("class"));
+ if (classAttr != null) {
+ try {
+ classLoader.loadClass(classAttr);
+ } catch (ClassNotFoundException ex) {
+ it.remove();
+ }
+ }
+ }
+ }
+ addMessageHandlers(root,
generatedAxis2xml.getMessageBuilders(), "messageBuilder");
+ addMessageHandlers(root,
generatedAxis2xml.getMessageFormatters(), "messageFormatter");
+ OutputStream out = new FileOutputStream(axis2xmlFile);
+ try {
+ axis2xmlDoc.serialize(out);
+ } finally {
+ out.close();
+ }
+ } finally {
+ in.close();
+ }
+ } catch (ArtifactFilterException ex) {
+ throw new MojoExecutionException(ex.getMessage(), ex);
+ } catch (IOException ex) {
+ throw new MojoExecutionException(ex.getMessage(), ex);
+ } catch (XMLStreamException ex) {
+ throw new MojoExecutionException(ex.getMessage(), ex);
+ }
}
}
}
Modified:
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
(original)
+++
axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml
Mon May 1 11:36:09 2017
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
@@ -139,8 +139,14 @@
<artifactId>jalopy</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven.shared</groupId>
+ <groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified:
axis/axis2/java/core/branches/hermetic-tests/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPClient3TransportSender.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPClient3TransportSender.java?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/hermetic-tests/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPClient3TransportSender.java
(original)
+++
axis/axis2/java/core/branches/hermetic-tests/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPClient3TransportSender.java
Mon May 1 11:36:09 2017
@@ -22,9 +22,9 @@ package org.apache.axis2.transport.http.
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.http.AbstractHTTPSender;
import org.apache.axis2.transport.http.AbstractHTTPTransportSender;
import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.axis2.transport.http.HTTPSender;
import org.apache.axis2.transport.http.HTTPTransportConstants;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.logging.Log;
@@ -55,7 +55,7 @@ public class HTTPClient3TransportSender
}
@Override
- protected AbstractHTTPSender createHTTPSender() {
+ protected HTTPSender createHTTPSender() {
return new HTTPSenderImpl();
}
Modified:
axis/axis2/java/core/branches/hermetic-tests/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPProxyConfigurator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPProxyConfigurator.java?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
---
axis/axis2/java/core/branches/hermetic-tests/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPProxyConfigurator.java
(original)
+++
axis/axis2/java/core/branches/hermetic-tests/modules/transport/http-hc3/src/main/java/org/apache/axis2/transport/http/impl/httpclient3/HTTPProxyConfigurator.java
Mon May 1 11:36:09 2017
@@ -135,7 +135,7 @@ public class HTTPProxyConfigurator {
}
String port =
System.getProperty(HTTPTransportConstants.HTTP_PROXY_PORT);
- if (port != null) {
+ if (port != null && !port.isEmpty()) {
proxyPort = Integer.parseInt(port);
}
