You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/05/01 11:36:09 UTC
svn commit: r1793311 [3/3] - in
/axis/axis2/java/core/branches/hermetic-tests: ./ apidocs/
modules/adb-codegen/ modules/adb-codegen/test/helper/
modules/adb-codegen/test/org/apache/axis2/schema/
modules/adb-codegen/test/org/apache/axis2/schema/all/ mod...
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/pom.xml?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/pom.xml (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/pom.xml Mon May 1 11:36:09 2017
@@ -153,81 +153,39 @@
</resources>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-repo-maven-plugin</artifactId>
<executions>
<execution>
- <id>copy</id>
<phase>generate-resources</phase>
<goals>
- <goal>copy</goal>
+ <goal>create-repository</goal>
</goals>
<configuration>
- <stripVersion>true</stripVersion>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.axis2</groupId>
- <artifactId>addressing</artifactId>
- <version>${axis2.version}</version>
- <type>mar</type>
- <outputDirectory>
- target/generated-resources/org/apache/axis2/transport/repo/modules
- </outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <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>${project.artifactId}</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>generate-javadoc</id>
- <phase>site</phase>
- <goals>
- <goal>javadoc</goal>
- </goals>
- <configuration>
- <docletArtifacts>
- <docletArtifact>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</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
- -link http://java.sun.com/j2se/1.5.0/docs/api/
- -link http://java.sun.com/j2ee/1.4/docs/api/
- -link http://ws.apache.org/axis2/1_4_1/api/
- -link http://ws.apache.org/commons/axiom/apidocs/
- -link http://junit.org/junit/javadoc/3.8.1/
- -link http://www.eclipse.org/aspectj/doc/released/runtime-api/
- </additionalparam>
+ <outputDirectory>${project.build.directory}/generated-resources/org/apache/axis2/transport/repo</outputDirectory>
+ <generateFileLists>true</generateFileLists>
+ <generatedAxis2xml>
+ <messageFormatters>
+ <messageFormatter>
+ <contentType>text/plain</contentType>
+ <className>org.apache.axis2.format.PlainTextFormatter</className>
+ </messageFormatter>
+ <messageFormatter>
+ <contentType>application/octet-stream</contentType>
+ <className>org.apache.axis2.format.BinaryFormatter</className>
+ </messageFormatter>
+ </messageFormatters>
+ <messageBuilders>
+ <messageBuilder>
+ <contentType>text/plain</contentType>
+ <className>org.apache.axis2.format.PlainTextBuilder</className>
+ </messageBuilder>
+ <messageBuilder>
+ <contentType>application/octet-stream</contentType>
+ <className>org.apache.axis2.format.BinaryBuilder</className>
+ </messageBuilder>
+ </messageBuilders>
+ </generatedAxis2xml>
</configuration>
</execution>
</executions>
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/src/main/java/org/apache/axis2/transport/CustomAxisConfigurator.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/src/main/java/org/apache/axis2/transport/CustomAxisConfigurator.java?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/src/main/java/org/apache/axis2/transport/CustomAxisConfigurator.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/src/main/java/org/apache/axis2/transport/CustomAxisConfigurator.java Mon May 1 11:36:09 2017
@@ -21,7 +21,6 @@ package org.apache.axis2.transport;
import java.io.IOException;
import java.io.InputStream;
-import java.net.MalformedURLException;
import java.net.URL;
import org.apache.axis2.AxisFault;
@@ -32,19 +31,16 @@ import org.apache.axis2.util.Loader;
public class CustomAxisConfigurator extends DeploymentEngine implements AxisConfigurator {
public AxisConfiguration getAxisConfiguration() throws AxisFault {
- InputStream configStream = Loader.getResourceAsStream("org/apache/axis2/transport/axis2.xml");
+ URL axis2Url = Loader.getResource("org/apache/axis2/transport/repo/axis2.xml");
try {
- axisConfig = populateAxisConfiguration(configStream);
- } finally {
+ InputStream configStream = axis2Url.openStream();
try {
+ axisConfig = populateAxisConfiguration(configStream);
+ } finally {
configStream.close();
- } catch (IOException ex) {
- throw AxisFault.makeFault(ex);
}
- }
- try {
- loadRepositoryFromURL(new URL(Loader.getResource("org/apache/axis2/transport/repo/__root__"), "."));
- } catch (MalformedURLException ex) {
+ loadRepositoryFromURL(new URL(axis2Url, "."));
+ } catch (IOException ex) {
throw AxisFault.makeFault(ex);
}
axisConfig.setConfigurator(this);
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContext.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContext.java?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContext.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContext.java Mon May 1 11:36:09 2017
@@ -35,15 +35,6 @@ import org.apache.axis2.transport.testki
/**
* Resource maintaining the {@link ConfigurationContext} for {@link AxisTestClient}
* instances.
- * <p>
- * Dependencies:
- * <dl>
- * <dt>{@link TransportDescriptionFactory} (1)</dt>
- * <dd>Used to create transport descriptions.</dd>
- * <dt>{@link AxisTestClientContextConfigurator} (0..*)</dt>
- * <dd>Used to determine whether a transport listener is required and to
- * configure the transport.</dd>
- * </dl>
*/
public class AxisTestClientContext {
public static final AxisTestClientContext INSTANCE = new AxisTestClientContext();
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContextConfigurator.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContextConfigurator.java?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContextConfigurator.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContextConfigurator.java Mon May 1 11:36:09 2017
@@ -22,6 +22,10 @@ package org.apache.axis2.transport.testk
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
+/**
+ * Resource used to determine whether a transport listener is required and to configure the
+ * transport.
+ */
public interface AxisTestClientContextConfigurator {
/**
* Determine whether a transport listener is required on client side.
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/doclet/TestkitJavadocDoclet.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/doclet/TestkitJavadocDoclet.java?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/doclet/TestkitJavadocDoclet.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/doclet/TestkitJavadocDoclet.java Mon May 1 11:36:09 2017
@@ -60,7 +60,9 @@ public class TestkitJavadocDoclet {
Resource resource = resourceInfo.getResource(qualifiedName);
List<Dependency> dependencies = resource == null ? null : resource.getDependencies();
if (dependencies != null || usedBy != null) {
- StringBuilder buffer = new StringBuilder(clazz.getRawCommentText());
+ String rawCommentText = clazz.getRawCommentText();
+ StringBuilder buffer = new StringBuilder(
+ rawCommentText.trim().isEmpty() ? "No documentation available." : rawCommentText);
buffer.append("<h2>Resource information</h2>");
if (usedBy != null) {
buffer.append("This resource is used by: ");
Modified: axis/axis2/java/core/branches/hermetic-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/pom.xml?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/pom.xml (original)
+++ axis/axis2/java/core/branches/hermetic-tests/pom.xml Mon May 1 11:36:09 2017
@@ -519,7 +519,8 @@
<geronimo.spec.metadata.version>1.1.2</geronimo.spec.metadata.version>
<geronimo.spec.jaxws.version>1.0</geronimo.spec.jaxws.version>
<google.gson.version>2.1</google.gson.version>
- <httpclient.version>4.5.2</httpclient.version>
+ <httpcore.version>4.4.6</httpcore.version>
+ <httpclient.version>4.5.3</httpclient.version>
<intellij.version>5.0</intellij.version>
<jalopy.version>1.5rc3</jalopy.version>
<jaxb.api.version>2.2.6</jaxb.api.version>
@@ -527,10 +528,8 @@
<jettison.version>1.3.8</jettison.version>
<jibx.version>1.2</jibx.version>
<log4j.version>1.2.15</log4j.version>
- <maven.archiver.version>2.2</maven.archiver.version>
- <maven.artifact.version>2.0.8</maven.artifact.version>
- <maven.plugin.testing.version>1.1</maven.plugin.testing.version>
- <maven.version>2.0.7</maven.version>
+ <maven.archiver.version>3.0.2</maven.archiver.version>
+ <maven.version>3.0.5</maven.version>
<maven.plugin.descriptor.version>2.0.7</maven.plugin.descriptor.version>
<maven.archetype.plugin.version>2.2</maven.archetype.plugin.version>
<plexus.classworlds.version>2.4</plexus.classworlds.version>
@@ -832,10 +831,25 @@
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcore.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi</artifactId>
+ <version>${httpcore.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ <version>${httpclient.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>${commons.fileupload.version}</version>
@@ -883,13 +897,18 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-core</artifactId>
<version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>${maven.artifact.version}</version>
+ <version>${maven.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -917,10 +936,10 @@
<version>${plexus.classworlds.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>
- <version>${maven.plugin.testing.version}</version>
+ <version>2.1</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
Modified: axis/axis2/java/core/branches/hermetic-tests/src/site/markdown/release-notes/1.8.0.md
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/src/site/markdown/release-notes/1.8.0.md?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/src/site/markdown/release-notes/1.8.0.md (original)
+++ axis/axis2/java/core/branches/hermetic-tests/src/site/markdown/release-notes/1.8.0.md Mon May 1 11:36:09 2017
@@ -6,3 +6,6 @@ Apache Axis2 1.8.0 Release Note
* The Apache Commons HttpClient 3.x based HTTP transport has been deprecated.
If you wish to continue using this transport, add `axis2-transport-http-hc3`
to your project.
+
+* The HTTPClient 4.x based transport has been upgraded to use the APIs supported
+ by the latest HTTPClient version.
Modified: axis/axis2/java/core/branches/hermetic-tests/src/site/xdoc/docs/soapmonitor-module.xml.vm
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/src/site/xdoc/docs/soapmonitor-module.xml.vm?rev=1793311&r1=1793310&r2=1793311&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/src/site/xdoc/docs/soapmonitor-module.xml.vm (original)
+++ axis/axis2/java/core/branches/hermetic-tests/src/site/xdoc/docs/soapmonitor-module.xml.vm Mon May 1 11:36:09 2017
@@ -28,6 +28,11 @@
<body>
<h1>Using the SOAP Monitor</h1>
+<p><b>Warning: the SOAP Monitor uses a protocol based on Java serialization
+and is therefore vulnerable to attacks. It should be used exclusively as a
+development and debugging tool, but never be permanently enabled on production
+systems.</b></p>
+
<p>Web service developers often want to see the SOAP messages that are being
used to invoke the Web services, along with the results of those messages.
The goal of the SOAP Monitor utility is to provide a way for the developers
Propchange: axis/axis2/java/core/branches/hermetic-tests/systests/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon May 1 11:36:09 2017
@@ -0,0 +1,2 @@
+.project
+target