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 2018/12/27 18:42:36 UTC
svn commit: r1849802 [9/11] - in
/axis/axis2/java/core/branches/hermetic-tests: ./ apidocs/
databinding-tests/jaxbri-tests/
databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/
databinding-tests/jaxbri-tests/src/test/java/org/apache/ax...
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPBodyImpl.java Thu Dec 27 18:42:33 2018
@@ -64,9 +64,7 @@ public class SOAPBodyImpl extends SOAPEl
}
SOAPBodyElementImpl<OMElement> childEle =
new SOAPBodyElementImpl<OMElement>((OMElement)target.getOwnerDocument().createElementNS(null, localName));
- childEle.target.setUserData(SAAJ_NODE, childEle, null);
target.appendChild(childEle.target);
- childEle.target.getParentNode().setUserData(SAAJ_NODE, this, null);
isBodyElementAdded = true;
return childEle;
}
@@ -81,10 +79,8 @@ public class SOAPBodyImpl extends SOAPEl
new SOAPBodyElementImpl<OMElement>(
(OMElement)target.getOwnerDocument().createElementNS(namespaceURI,
localName));
- childEle.target.setUserData(SAAJ_NODE, childEle, null);
childEle.omTarget.setNamespace(childEle.omTarget.declareNamespace(namespaceURI, prefix));
target.appendChild(childEle.target);
- childEle.target.getParentNode().setUserData(SAAJ_NODE, this, null);
childEle.setParentElement(this);
return childEle;
}
@@ -96,12 +92,10 @@ public class SOAPBodyImpl extends SOAPEl
SOAPBodyElementImpl<?> childEle = toSOAPBodyElement(child);
- childEle.target.setUserData(SAAJ_NODE, childEle, null);
if (namespaceURI != null && namespaceURI.trim().length() > 0) {
childEle.omTarget.setNamespace(childEle.omTarget.declareNamespace(namespaceURI, prefix));
}
target.appendChild(childEle.target);
- childEle.target.getParentNode().setUserData(SAAJ_NODE, this, null);
childEle.setParentElement(this);
return childEle;
}
@@ -146,12 +140,10 @@ public class SOAPBodyImpl extends SOAPEl
}
}
- childEle.target.setUserData(SAAJ_NODE, childEle, null);
if (namespaceURI != null && namespaceURI.trim().length() > 0) {
childEle.omTarget.setNamespace(childEle.omTarget.declareNamespace(namespaceURI, prefix));
}
target.appendChild(childEle.target);
- childEle.target.getParentNode().setUserData(SAAJ_NODE, this, null);
childEle.setParentElement(this);
return childEle;
}
@@ -180,10 +172,8 @@ public class SOAPBodyImpl extends SOAPEl
(OMElement)target.getOwnerDocument().createElementNS(uri,
prefix + ":" + localName));
}
- childEle.target.setUserData(SAAJ_NODE, childEle, null);
childEle.omTarget.setNamespace(omTarget.getOMFactory().createOMNamespace(uri, prefix));
target.appendChild(childEle.target);
- childEle.target.getParentNode().setUserData(SAAJ_NODE, this, null);
isBodyElementAdded = true;
childEle.setParentElement(this);
return childEle;
@@ -205,7 +195,6 @@ public class SOAPBodyImpl extends SOAPEl
// set default fault code and string
saajSOAPFault.setDefaults();
- ((Element)omTarget.getFault()).setUserData(SAAJ_NODE, saajSOAPFault, null);
return saajSOAPFault;
}
@@ -505,11 +494,9 @@ public class SOAPBodyImpl extends SOAPEl
qname.getPrefix() + ":" +
qname.getLocalPart()));
}
- childEle.target.setUserData(SAAJ_NODE, childEle, null);
childEle.omTarget.setNamespace(omTarget.getOMFactory().createOMNamespace(qname.getNamespaceURI(), qname.getPrefix()));
target.appendChild(childEle.target);
- childEle.target.getParentNode().setUserData(SAAJ_NODE, this, null);
isBodyElementAdded = true;
childEle.setParentElement(this);
return childEle;
@@ -576,14 +563,9 @@ public class SOAPBodyImpl extends SOAPEl
SOAPFactory omFactory = (SOAPFactory)this.omTarget.getOMFactory();
org.apache.axiom.soap.SOAPFault fault = omFactory.createSOAPFault(omTarget);
- SOAPFaultImpl saajSOAPFault = new SOAPFaultImpl(fault);
- ((Element)omTarget.getFault())
- .setUserData(SAAJ_NODE, saajSOAPFault, null);
- childElements.add(saajSOAPFault);
+ childElements.add(new SOAPFaultImpl(fault));
} else {
- SOAPBodyElement saajBodyEle = new SOAPBodyElementImpl<OMElement>((OMElement)domNode);
- domNode.setUserData(SAAJ_NODE, saajBodyEle, null);
- childElements.add(saajBodyEle);
+ childElements.add(new SOAPBodyElementImpl<OMElement>((OMElement)domNode));
}
}
} else {
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java Thu Dec 27 18:42:33 2018
@@ -117,12 +117,10 @@ public class SOAPElementImpl<T extends O
}
}
- childEle.target.setUserData(SAAJ_NODE, childEle, null);
if (namespaceURI != null && namespaceURI.trim().length() > 0) {
childEle.omTarget.setNamespace(childEle.omTarget.declareNamespace(namespaceURI, prefix));
}
target.appendChild(childEle.target);
- childEle.target.getParentNode().setUserData(SAAJ_NODE, this, null);
childEle.setParentElement(this);
return childEle;
}
@@ -138,12 +136,10 @@ public class SOAPElementImpl<T extends O
SOAPElementImpl<OMElement> childEle = (SOAPElementImpl<OMElement>)getOwnerDocument().
createElementNS(namespaceURI, prefix.length() == 0 ? localName : prefix + ":" + localName);
- childEle.target.setUserData(SAAJ_NODE, childEle, null);
childEle.omTarget.setNamespace(prefix.length() == 0
? childEle.omTarget.declareDefaultNamespace(namespaceURI)
: childEle.omTarget.declareNamespace(namespaceURI, prefix));
target.appendChild(childEle.target);
- childEle.target.getParentNode().setUserData(SAAJ_NODE, this, null);
childEle.setParentElement(this);
return childEle;
}
@@ -166,10 +162,8 @@ public class SOAPElementImpl<T extends O
*/
public SOAPElement addChildElement(String localName) throws SOAPException {
SOAPElementImpl<OMElement> childEle =
- new SOAPElementImpl<OMElement>((OMElement)getOwnerDocument().createElementNS(null, localName));
- childEle.target.setUserData(SAAJ_NODE, childEle, null);
+ (SOAPElementImpl<OMElement>)getOwnerDocument().createElementNS(null, localName);
target.appendChild(childEle.target);
- childEle.target.getParentNode().setUserData(SAAJ_NODE, this, null);
childEle.setParentElement(this);
return childEle;
}
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java Thu Dec 27 18:42:33 2018
@@ -129,11 +129,8 @@ public class SOAPEnvelopeImpl extends SO
public SOAPHeader addHeader() throws SOAPException {
org.apache.axiom.soap.SOAPHeader header = omTarget.getHeader();
if (header == null) {
- SOAPHeaderImpl saajSOAPHeader;
header = ((SOAPFactory)this.omTarget.getOMFactory()).createSOAPHeader(omTarget);
- saajSOAPHeader = new SOAPHeaderImpl(header);
- ((Element)omTarget.getHeader()).setUserData(SAAJ_NODE, saajSOAPHeader, null);
- return saajSOAPHeader;
+ return new SOAPHeaderImpl(header);
} else {
throw new SOAPException("Header already present, can't set header again without " +
"deleting the existing header. " +
@@ -158,7 +155,6 @@ public class SOAPEnvelopeImpl extends SO
body = ((SOAPFactory)this.omTarget.getOMFactory()).createSOAPBody(omTarget);
SOAPBodyImpl saajSOAPBody = new SOAPBodyImpl(body);
saajSOAPBody.setParentElement(this);
- ((Element)omTarget.getBody()).setUserData(SAAJ_NODE, saajSOAPBody, null);
return saajSOAPBody;
} else {
throw new SOAPException("Body already present, can't set body again without " +
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPFaultImpl.java Thu Dec 27 18:42:33 2018
@@ -260,7 +260,6 @@ public class SOAPFaultImpl extends SOAPB
SOAPFactory factory = (SOAPFactory)this.omTarget.getOMFactory();
omDetail = factory.createSOAPFaultDetail(this.omTarget);
Detail saajDetail = new DetailImpl(omDetail);
- ((Element)omTarget.getDetail()).setUserData(SAAJ_NODE, saajDetail, null);
isDetailAdded = true;
return saajDetail;
}
@@ -749,9 +748,7 @@ public class SOAPFaultImpl extends SOAPB
org.w3c.dom.Node saajNode = toSAAJNode(domNode);
if (!(saajNode instanceof SOAPFaultElement)) {
// silently replace node, as per saaj 1.2 spec
- SOAPFaultElement bodyEle = new SOAPFaultElementImpl<OMElement>((OMElement)domNode);
- domNode.setUserData(SAAJ_NODE, bodyEle, null);
- childElements.add(bodyEle);
+ childElements.add(new SOAPFaultElementImpl<OMElement>((OMElement)domNode));
} else {
childElements.add(saajNode);
}
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/saaj/src/org/apache/axis2/saaj/SOAPHeaderImpl.java Thu Dec 27 18:42:33 2018
@@ -75,8 +75,6 @@ public class SOAPHeaderImpl extends SOAP
OMNamespace ns = omTarget.getOMFactory().createOMNamespace(uri, prefix);
SOAPHeaderBlock headerBlock = ((SOAPFactory)this.omTarget.getOMFactory()).createSOAPHeaderBlock(localName, ns, omTarget);
SOAPHeaderElementImpl soapHeaderElement = new SOAPHeaderElementImpl(headerBlock);
- target.setUserData(SAAJ_NODE, this, null);
- soapHeaderElement.target.setUserData(SAAJ_NODE, soapHeaderElement, null);
soapHeaderElement.setParentElement(this);
return soapHeaderElement;
}
@@ -97,8 +95,6 @@ public class SOAPHeaderImpl extends SOAP
SOAPHeaderBlock headerBlock = ((SOAPFactory)this.omTarget.getOMFactory()).createSOAPHeaderBlock(
soapElement.getLocalName(), ns, omTarget);
SOAPHeaderElementImpl soapHeaderElement = new SOAPHeaderElementImpl(headerBlock);
- target.setUserData(SAAJ_NODE, this, null);
- soapHeaderElement.target.setUserData(SAAJ_NODE, soapHeaderElement, null);
soapHeaderElement.setParentElement(this);
return soapHeaderElement;
}
@@ -110,11 +106,8 @@ public class SOAPHeaderImpl extends SOAP
SOAPHeaderBlock headerBlock = ((SOAPFactory)this.omTarget.getOMFactory()).createSOAPHeaderBlock(
child.getLocalName(), ns, omTarget);
- target.setUserData(SAAJ_NODE, this, null);
-
SOAPHeaderElementImpl soapHeaderElement = new SOAPHeaderElementImpl(headerBlock);
copyContents(soapHeaderElement, child);
- soapHeaderElement.target.setUserData(SAAJ_NODE, soapHeaderElement, null);
soapHeaderElement.setParentElement(this);
return soapHeaderElement;
}
@@ -143,8 +136,6 @@ public class SOAPHeaderImpl extends SOAP
name.getLocalName(), ns, omTarget);
SOAPHeaderElementImpl soapHeaderElement = new SOAPHeaderElementImpl(headerBlock);
- target.setUserData(SAAJ_NODE, this, null);
- soapHeaderElement.target.setUserData(SAAJ_NODE, soapHeaderElement, null);
soapHeaderElement.setParentElement(this);
return soapHeaderElement;
}
@@ -351,9 +342,7 @@ public class SOAPHeaderImpl extends SOAP
childElements.add(saajNode);
} else if (!(saajNode instanceof SOAPHeaderElement)) {
// silently replace node, as per saaj 1.2 spec
- SOAPHeaderElement headerEle = new SOAPHeaderElementImpl((SOAPHeaderBlock)domNode);
- domNode.setUserData(SAAJ_NODE, headerEle, null);
- childElements.add(headerEle);
+ childElements.add(new SOAPHeaderElementImpl((SOAPHeaderBlock)domNode));
} else {
childElements.add(saajNode);
}
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/saaj/test/org/apache/axis2/saaj/SAAJTestRunner.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/saaj/test/org/apache/axis2/saaj/SAAJTestRunner.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/saaj/test/org/apache/axis2/saaj/SAAJTestRunner.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/saaj/test/org/apache/axis2/saaj/SAAJTestRunner.java Thu Dec 27 18:42:33 2018
@@ -19,11 +19,8 @@
package org.apache.axis2.saaj;
-import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import javax.xml.soap.SAAJMetaFactory;
-
import org.junit.internal.runners.InitializationError;
import org.junit.internal.runners.JUnit4ClassRunner;
import org.junit.runner.Description;
@@ -116,8 +113,6 @@ public class SAAJTestRunner extends JUni
System.setProperty("javax.xml.soap.MetaFactory",
"com.sun.xml.messaging.saaj.soap.SAAJMetaFactoryImpl");
- resetSAAJFactories();
-
super.invokeTestMethod(method, multiRunNotifier);
}
if (multiRunListener.isShouldContinue()) {
@@ -130,20 +125,7 @@ public class SAAJTestRunner extends JUni
"org.apache.axis2.saaj.SOAPConnectionFactoryImpl");
System.setProperty("javax.xml.soap.MetaFactory",
"org.apache.axis2.saaj.SAAJMetaFactoryImpl");
- resetSAAJFactories();
super.invokeTestMethod(method, multiRunNotifier);
}
}
-
- private void resetSAAJFactories() {
- // SAAJMetaFactory caches the instance; use reflection to reset it between test runs.
- // Note that the other factories are OK.
- try {
- Field field = SAAJMetaFactory.class.getDeclaredField("instance");
- field.setAccessible(true);
- field.set(null, null);
- } catch (Throwable ex) {
- throw new Error(ex);
- }
- }
}
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/saaj/test/org/apache/axis2/saaj/SOAPElementTest.java Thu Dec 27 18:42:33 2018
@@ -440,12 +440,6 @@ public class SOAPElementTest extends Ass
SOAPEnvelope envelope = msg.getSOAPPart().getEnvelope();
SOAPBody body = envelope.getBody();
body.setEncodingStyle(SOAPConstants.URI_NS_SOAP_ENCODING);
- try {
- body.setEncodingStyle("BOGUS");
- fail("Expected Exception did not occur");
- } catch (IllegalArgumentException e) {
- assertTrue("Expected Exception occurred", true);
- }
}
private int getIteratorCount(Iterator iter) {
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java Thu Dec 27 18:42:33 2018
@@ -19,8 +19,9 @@
package org.apache.axis2.saaj.integration;
-import junit.framework.Assert;
import org.apache.axiom.attachments.Attachments;
+import org.apache.axiom.testutils.activation.RandomDataSource;
+import org.apache.axiom.testutils.io.IOTestUtils;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.Parameter;
@@ -35,11 +36,9 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import javax.activation.DataHandler;
import javax.xml.namespace.QName;
@@ -58,16 +57,21 @@ import javax.xml.soap.SOAPHeader;
import javax.xml.soap.SOAPHeaderElement;
import javax.xml.soap.SOAPMessage;
import javax.xml.soap.SOAPPart;
-import java.io.ByteArrayInputStream;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Iterator;
@RunWith(SAAJTestRunner.class)
-public class IntegrationTest extends Assert {
+public class IntegrationTest {
static int port;
public static final QName SERVICE_NAME = new QName("Echo");
@@ -205,13 +209,12 @@ public class IntegrationTest extends Ass
textAttach.setContentId("submitSampleText@apache.org");
request.addAttachmentPart(textAttach);
- //Attach a java.awt.Image object to the SOAP request
- DataHandler imageDH = new DataHandler(TestUtils.getTestFileAsDataSource("axis2.jpg"));
- AttachmentPart jpegAttach = request.createAttachmentPart(imageDH);
- jpegAttach.addMimeHeader("Content-Transfer-Encoding", "binary");
- jpegAttach.setContentId("submitSampleImage@apache.org");
- jpegAttach.setContentType("image/jpg");
- request.addAttachmentPart(jpegAttach);
+ // Add an application/octet-stream attachment to the SOAP request
+ DataHandler binaryDH = new DataHandler(new RandomDataSource(54321, 15000));
+ AttachmentPart binaryAttach = request.createAttachmentPart(binaryDH);
+ binaryAttach.addMimeHeader("Content-Transfer-Encoding", "binary");
+ binaryAttach.setContentId("submitSample@apache.org");
+ request.addAttachmentPart(binaryAttach);
SOAPConnection sCon = SOAPConnectionFactory.newInstance().createConnection();
SOAPMessage response = sCon.call(request, getAddress());
@@ -220,27 +223,13 @@ public class IntegrationTest extends Ass
Iterator attachIter = response.getAttachments();
- int i = 0;
- while (attachIter.hasNext()) {
- AttachmentPart attachment = (AttachmentPart)attachIter.next();
- final Object content = attachment.getDataHandler().getContent();
- if (content instanceof String) {
- assertEquals(sampleMessage, (String)content);
- } else if (content instanceof ByteArrayInputStream) {
- ByteArrayInputStream bais = (ByteArrayInputStream)content;
- byte[] b = new byte[15000];
- final int lengthRead = bais.read(b);
- FileOutputStream fos =
- new FileOutputStream(new File(System.getProperty("basedir", ".") + "/" +
- "target/test-resources/result" + (i++) + ".jpg"));
- fos.write(b, 0, lengthRead);
- fos.flush();
- fos.close();
-
- assertTrue(attachment.getContentType().equals("image/jpeg")
- || attachment.getContentType().equals("text/plain"));
- }
- }
+ assertThat(attachIter.hasNext()).isTrue();
+ assertThat(((AttachmentPart)attachIter.next()).getContent()).isEqualTo(sampleMessage);
+ assertThat(attachIter.hasNext()).isTrue();
+ AttachmentPart attachment = (AttachmentPart)attachIter.next();
+ assertThat(attachment.getContentType()).isEqualTo("application/octet-stream");
+ IOTestUtils.compareStreams(binaryDH.getInputStream(), "expected", attachment.getDataHandler().getInputStream(), "actual");
+ assertThat(attachIter.hasNext()).isFalse();
sCon.close();
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/samples/jaxws-addressbook/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/samples/jaxws-addressbook/pom.xml?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/samples/jaxws-addressbook/pom.xml (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/samples/jaxws-addressbook/pom.xml Thu Dec 27 18:42:33 2018
@@ -56,18 +56,17 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
+ <groupId>com.github.veithen.maven</groupId>
+ <artifactId>xjc-maven-plugin</artifactId>
<executions>
<execution>
<goals>
- <goal>xjc</goal>
+ <goal>generate-sources</goal>
</goals>
<configuration>
- <sourceType>XmlSchema</sourceType>
- <sources>
- <source>src/AddressBookEntry.xsd</source>
- </sources>
+ <files>
+ <file>src/AddressBookEntry.xsd</file>
+ </files>
</configuration>
</execution>
</executions>
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/samples/jaxws-interop/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/samples/jaxws-interop/pom.xml?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/samples/jaxws-interop/pom.xml (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/samples/jaxws-interop/pom.xml Thu Dec 27 18:42:33 2018
@@ -27,14 +27,6 @@
<artifactId>jaxws-interop</artifactId>
<packaging>jar</packaging>
<name>JAXWS Interop Sample</name>
- <build>
- <sourceDirectory>src</sourceDirectory>
- <resources>
- <resource>
- <directory>resources</directory>
- </resource>
- </resources>
- </build>
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
@@ -52,5 +44,86 @@
<artifactId>axis2-jaxws</artifactId>
<version>1.8.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.truth</groupId>
+ <artifactId>truth</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-testutils</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-http</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.github.veithen.maven</groupId>
+ <artifactId>wsimport-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-sources</goal>
+ </goals>
+ <configuration>
+ <wsdlFiles>
+ <wsdlFile>src/main/resources/META-INF/BaseDataTypesDocLitB.wsdl</wsdlFile>
+ </wsdlFiles>
+ <generateService>true</generateService>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-repo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>create-test-repository</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/repo</outputDirectory>
+ <generatedAxis2xml>
+ <deployers>
+ <deployer>
+ <extension>jar</extension>
+ <directory>servicejars</directory>
+ <className>org.apache.axis2.jaxws.framework.JAXWSDeployer</className>
+ </deployer>
+ </deployers>
+ </generatedAxis2xml>
+ <jaxwsServices>
+ <jaxwsService>
+ <name>InteropSample</name>
+ <packages>
+ <package>org.apache.axis2.jaxws.interop</package>
+ </packages>
+ </jaxwsService>
+ </jaxwsServices>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <!-- Exclude generated code to work around JDK-8200432 -->
+ <excludePackageNames>com.microsoft.*,org.datacontract.*,org.tempuri</excludePackageNames>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/samples/jaxws-samples/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/samples/jaxws-samples/pom.xml?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/samples/jaxws-samples/pom.xml (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/samples/jaxws-samples/pom.xml Thu Dec 27 18:42:33 2018
@@ -105,7 +105,6 @@
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.2</version>
<executions>
<execution>
<id>copy-modules</id>
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/samples/json/build.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/samples/json/build.xml?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/samples/json/build.xml (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/samples/json/build.xml Thu Dec 27 18:42:33 2018
@@ -52,7 +52,7 @@
<target name="generate.service" depends="clean,prepare">
<copy file="src/META-INF/services.xml" tofile="${dest.dir.classes}/META-INF/services.xml" overwrite="true" />
- <javac srcdir="src" destdir="${dest.dir.classes}">
+ <javac srcdir="src" destdir="${dest.dir.classes}" fork="true">
<classpath refid="axis.classpath" />
</javac>
@@ -63,7 +63,7 @@
</target>
<target name="client.compile">
- <javac srcdir="src" destdir="${dest.dir.classes}" includes="sample.json.client/**">
+ <javac srcdir="src" destdir="${dest.dir.classes}" includes="sample.json.client/**" fork="true">
<classpath refid="axis.classpath"/>
</javac>
</target>
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/samples/json/src/META-INF/services.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/samples/json/src/META-INF/services.xml?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/samples/json/src/META-INF/services.xml (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/samples/json/src/META-INF/services.xml Thu Dec 27 18:42:33 2018
@@ -1,7 +1,7 @@
<service name="JsonService">
- <Description>
+ <description>
This is a sample service to test json implementation
- </Description>
+ </description>
<messageReceivers>
<messageReceiver mep="http://www.w3.org/ns/wsdl/in-out"
class="org.apache.axis2.json.gson.rpc.JsonRpcMessageReceiver" />
@@ -9,4 +9,4 @@
class="org.apache.axis2.json.gson.rpc.JsonInOnlyRPCMessageReceiver"/>
</messageReceivers>
<parameter name="ServiceClass" locked="false">sample.json.service.JsonService</parameter>
-</service>
\ No newline at end of file
+</service>
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/samples/transport/jms-sample/jmsService/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/samples/transport/jms-sample/jmsService/pom.xml?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/samples/transport/jms-sample/jmsService/pom.xml (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/samples/transport/jms-sample/jmsService/pom.xml Thu Dec 27 18:42:33 2018
@@ -39,17 +39,6 @@
</exclusion>
</exclusions>
</dependency>
- <!-- <dependency> -->
- <!-- <groupId>org.apache.geronimo.specs</groupId> -->
- <!-- <artifactId>geronimo-jms_1.1_spec</artifactId> -->
- <!-- <version>1.1</version> -->
- <!-- </dependency> -->
-
- <!-- <dependency> -->
- <!-- <groupId>org.apache.geronimo.specs</groupId> -->
- <!-- <artifactId>geronimo-jta_1.0.1B_spec</artifactId> -->
- <!-- <version>1.0</version> -->
- <!-- </dependency> -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/scripting/src/org/apache/axis2/scripting/ScriptDeploymentEngine.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/scripting/src/org/apache/axis2/scripting/ScriptDeploymentEngine.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/scripting/src/org/apache/axis2/scripting/ScriptDeploymentEngine.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/scripting/src/org/apache/axis2/scripting/ScriptDeploymentEngine.java Thu Dec 27 18:42:33 2018
@@ -195,7 +195,7 @@ public class ScriptDeploymentEngine exte
InputStream definition;
try {
- definition = wsdlFile.toURL().openStream();
+ definition = wsdlFile.toURI().toURL().openStream();
} catch (Exception e) {
throw new AxisFault("exception opening wsdl", e);
}
@@ -239,7 +239,7 @@ public class ScriptDeploymentEngine exte
protected String readScriptSource(File scriptFile) throws AxisFault {
InputStream is;
try {
- is = scriptFile.toURL().openStream();
+ is = scriptFile.toURI().toURL().openStream();
} catch (IOException e) {
throw new AxisFault("IOException opening script: " + scriptFile, e);
}
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/scripting/test/org/apache/axis2/scripting/ScriptModuleTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/scripting/test/org/apache/axis2/scripting/ScriptModuleTest.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/scripting/test/org/apache/axis2/scripting/ScriptModuleTest.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/scripting/test/org/apache/axis2/scripting/ScriptModuleTest.java Thu Dec 27 18:42:33 2018
@@ -62,9 +62,9 @@ public class ScriptModuleTest extends Te
AxisConfiguration axisConfig = new AxisConfiguration();
URL url = getClass().getClassLoader().getResource("org/apache/axis2/scripting/testrepo/test.js");
File dir = Utils.toFile(url).getParentFile();
- axisConfig.setRepository(dir.getParentFile().toURL());
+ axisConfig.setRepository(dir.getParentFile().toURI().toURL());
axisConfig.addParameter(new Parameter("scriptServicesDir", dir.getName()));
- assertEquals(dir.toURL(), module.getScriptServicesDirectory(axisConfig).toURL());
+ assertEquals(dir.toURI().toURL(), module.getScriptServicesDirectory(axisConfig).toURI().toURL());
}
// public void testCreateService() throws AxisFault {
@@ -80,7 +80,7 @@ public class ScriptModuleTest extends Te
AxisConfiguration axisConfig = new AxisConfiguration();
URL url = getClass().getClassLoader().getResource("org/apache/axis2/scripting/testrepo/test.js");
File dir = Utils.toFile(url).getParentFile();
- axisConfig.setRepository(dir.getParentFile().toURL());
+ axisConfig.setRepository(dir.getParentFile().toURI().toURL());
axisConfig.addParameter(new Parameter("scriptServicesDir", dir.getName()));
ConfigurationContext configContext = new ConfigurationContext(axisConfig);
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=1849802&r1=1849801&r2=1849802&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 Thu Dec 27 18:42:33 2018
@@ -40,6 +40,10 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>7.6.15.v20140411</version>
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractAxis2Server.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractAxis2Server.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractAxis2Server.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/AbstractAxis2Server.java Thu Dec 27 18:42:33 2018
@@ -23,42 +23,31 @@ 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.junit.rules.ExternalResource;
+import org.apache.axis2.engine.AxisConfiguration;
-public abstract class AbstractAxis2Server extends ExternalResource {
- private final String repositoryPath;
- private ConfigurationContext configurationContext;
+public abstract class AbstractAxis2Server extends AbstractConfigurationContextRule {
+ private final AxisServiceFactory[] serviceFactories;
- public AbstractAxis2Server(String repositoryPath) {
- if (repositoryPath == null || repositoryPath.trim().length() == 0) {
- throw new IllegalArgumentException("Axis2 repository must not be null or empty");
- }
- this.repositoryPath = repositoryPath;
- }
-
- final String getRepositoryPath() {
- return repositoryPath;
- }
-
- public final ConfigurationContext getConfigurationContext() {
- if (configurationContext == null) {
- throw new IllegalStateException();
- }
- return configurationContext;
+ public AbstractAxis2Server(String repositoryPath, AxisServiceFactory... serviceFactories) {
+ super(repositoryPath);
+ this.serviceFactories = serviceFactories;
}
@Override
protected void before() throws Throwable {
- configurationContext =
- ConfigurationContextFactory.createConfigurationContextFromFileSystem(repositoryPath);
+ super.before();
+ ConfigurationContext configurationContext = getConfigurationContext();
+ AxisConfiguration axisConfiguration = configurationContext.getAxisConfiguration();
+ for (AxisServiceFactory serviceFactory : serviceFactories) {
+ axisConfiguration.addService(serviceFactory.createService(axisConfiguration));
+ }
startServer(configurationContext);
}
@Override
protected void after() {
stopServer();
- configurationContext = null;
+ super.after();
}
protected abstract void startServer(ConfigurationContext configurationContext) throws Throwable;
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=1849802&r1=1849801&r2=1849802&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 Thu Dec 27 18:42:33 2018
@@ -29,8 +29,8 @@ public class Axis2Server extends Abstrac
private int port = -1;
private SimpleHTTPServer server;
- public Axis2Server(String repositoryPath) {
- super(repositoryPath);
+ public Axis2Server(String repositoryPath, AxisServiceFactory... axisServiceFactories) {
+ super(repositoryPath, axisServiceFactories);
}
@Override
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/ClientHelper.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/ClientHelper.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/ClientHelper.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/ClientHelper.java Thu Dec 27 18:42:33 2018
@@ -30,40 +30,44 @@ import javax.xml.namespace.QName;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.client.Stub;
import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.ConfigurationContextFactory;
-import org.junit.rules.ExternalResource;
-public class ClientHelper extends ExternalResource {
+public class ClientHelper extends AbstractConfigurationContextRule {
private final AbstractAxis2Server server;
- private final String repositoryPath;
- private ConfigurationContext configurationContext;
public ClientHelper(AbstractAxis2Server server, String repositoryPath) {
+ super(repositoryPath);
this.server = server;
- this.repositoryPath = repositoryPath;
}
public ClientHelper(AbstractAxis2Server server) {
this(server, server.getRepositoryPath());
}
+ public ClientHelper(String repositoryPath) {
+ this(null, repositoryPath);
+ }
+
@Override
protected final void before() throws Throwable {
- configurationContext =
- ConfigurationContextFactory.createConfigurationContextFromFileSystem(repositoryPath);
- SSLContext sslContext = server.getClientSSLContext();
- if (sslContext != null) {
- configurationContext.setProperty(SSLContext.class.getName(), sslContext);
+ super.before();
+ if (server != null) {
+ SSLContext sslContext = server.getClientSSLContext();
+ if (sslContext != null) {
+ getConfigurationContext().setProperty(SSLContext.class.getName(), sslContext);
+ }
}
}
- @Override
- protected final void after() {
- configurationContext = null;
+ private String getEndpoint(String endpoint) throws Exception {
+ if (server != null && !endpoint.startsWith("http://")) {
+ return server.getEndpoint(endpoint);
+ } else {
+ return endpoint;
+ }
}
public final ServiceClient createServiceClient(String serviceName) throws Exception {
- ServiceClient serviceClient = new ServiceClient(configurationContext, null);
+ ServiceClient serviceClient = new ServiceClient(getConfigurationContext(), null);
serviceClient.getOptions().setTo(server.getEndpointReference(serviceName));
configureServiceClient(serviceClient);
return serviceClient;
@@ -84,16 +88,16 @@ public class ClientHelper extends Extern
} else {
handler = null;
}
- ServiceClient serviceClient = new ServiceClient(configurationContext,
+ ServiceClient serviceClient = new ServiceClient(getConfigurationContext(),
new URL(null, server.getEndpoint(serviceName) + "?wsdl", handler), wsdlServiceName, portName);
configureServiceClient(serviceClient);
return serviceClient;
}
- public final <T extends Stub> T createStub(Class<T> type, String serviceName) throws Exception {
+ public final <T extends Stub> T createStub(Class<T> type, String endpoint) throws Exception {
T stub = type
.getConstructor(ConfigurationContext.class, String.class)
- .newInstance(configurationContext, server.getEndpoint(serviceName));
+ .newInstance(getConfigurationContext(), getEndpoint(endpoint));
configureServiceClient(stub._getServiceClient());
return stub;
}
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/JettyServer.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/JettyServer.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/JettyServer.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/JettyServer.java Thu Dec 27 18:42:33 2018
@@ -85,8 +85,8 @@ public class JettyServer extends Abstrac
* @param secure
* Whether to enable HTTPS.
*/
- public JettyServer(String repositoryPath, boolean secure) {
- super(repositoryPath);
+ public JettyServer(String repositoryPath, boolean secure, AxisServiceFactory... axisServiceFactories) {
+ super(repositoryPath, axisServiceFactories);
this.secure = secure;
}
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/RuntimeIgnoreException.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/RuntimeIgnoreException.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/RuntimeIgnoreException.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/testutils/src/main/java/org/apache/axis2/testutils/RuntimeIgnoreException.java Thu Dec 27 18:42:33 2018
@@ -35,6 +35,7 @@ package org.apache.axis2.testutils;
*
* @see AllTestsWithRuntimeIgnore
* @see JUnit38ClassRunnerWithRuntimeIgnore
+ * @see Junit4ClassRunnerWithRuntimeIgnore
*/
public class RuntimeIgnoreException extends Error {
private static final long serialVersionUID = -2378820905593825587L;
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=1849802&r1=1849801&r2=1849802&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 Thu Dec 27 18:42:33 2018
@@ -107,11 +107,22 @@
</configuration>
</plugin>
<plugin>
+ <groupId>com.github.veithen.invoker</groupId>
+ <artifactId>resolver-proxy-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>start</goal>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-invoker-plugin</artifactId>
<executions>
<execution>
<goals>
- <goal>install</goal>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
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=1849802&r1=1849801&r2=1849802&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 Thu Dec 27 18:42:33 2018
@@ -39,6 +39,7 @@ import java.io.IOException;
* @goal aar
* @phase package
* @requiresDependencyResolution runtime
+ * @threadSafe
*/
public class AarMojo extends AbstractAarMojo {
/**
@@ -46,14 +47,14 @@ public class AarMojo extends AbstractAar
*
* @required
* @readonly
- * @parameter expression="${session}"
+ * @parameter property="session"
*/
private MavenSession session;
/**
* The directory for the generated aar.
*
- * @parameter expression="${project.build.directory}"
+ * @parameter default-value="${project.build.directory}"
* @required
*/
private String outputDirectory;
@@ -61,7 +62,7 @@ public class AarMojo extends AbstractAar
/**
* The name of the generated aar.
*
- * @parameter expression="${project.build.finalName}"
+ * @parameter default-value="${project.build.finalName}"
* @required
*/
private String aarName;
@@ -93,11 +94,13 @@ public class AarMojo extends AbstractAar
* Whether this is the main artifact being built. Set to <code>false</code> if you don't want to
* install or deploy it to the local repository instead of the default one in an execution.
*
- * @parameter expression="${primaryArtifact}" default-value="true"
+ * @parameter default-value="true"
*/
private boolean primaryArtifact;
- /** @component */
+ /**
+ * @component
+ */
private MavenProjectHelper projectHelper;
/**
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=1849802&r1=1849801&r2=1849802&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 Thu Dec 27 18:42:33 2018
@@ -41,7 +41,7 @@ public abstract class AbstractAarMojo
/**
* The projects base directory.
*
- * @parameter expression="${project.basedir}"
+ * @parameter property="project.basedir"
* @required
* @readonly
*/
@@ -50,7 +50,7 @@ public abstract class AbstractAarMojo
/**
* The maven project.
*
- * @parameter expression="${project}"
+ * @parameter property="project"
* @required
* @readonly
*/
@@ -59,7 +59,7 @@ public abstract class AbstractAarMojo
/**
* The directory containing generated classes.
*
- * @parameter expression="${project.build.outputDirectory}"
+ * @parameter default-value="${project.build.outputDirectory}"
* @required
*/
private File classesDirectory;
@@ -67,7 +67,7 @@ public abstract class AbstractAarMojo
/**
* The directory where the aar is built.
*
- * @parameter expression="${project.build.directory}/aar"
+ * @parameter default-value="${project.build.directory}/aar"
* @required
*/
protected File aarDirectory;
@@ -107,7 +107,7 @@ public abstract class AbstractAarMojo
/**
* Whether the dependency jars should be included in the aar
*
- * @parameter expression="${includeDependencies}" default-value="true"
+ * @parameter default-value="true"
*/
private boolean includeDependencies;
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/DeployAarMojo.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/DeployAarMojo.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/DeployAarMojo.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-aar-maven-plugin/src/main/java/org/apache/axis2/maven2/aar/DeployAarMojo.java Thu Dec 27 18:42:33 2018
@@ -40,6 +40,7 @@ import java.net.URL;
*
* @goal deployaar
* @phase install
+ * @threadSafe
*/
public class DeployAarMojo extends AbstractAarMojo {
@@ -48,21 +49,21 @@ public class DeployAarMojo extends Abstr
/**
* The URL of the Axis2 administration console.
*
- * @parameter default-value="http://localhost:8080/axis2/axis2-admin" expression="${axis2.aar.axis2AdminConsoleURL}"
+ * @parameter default-value="http://localhost:8080/axis2/axis2-admin" property="axis2.aar.axis2AdminConsoleURL"
*/
private URL axis2AdminConsoleURL;
/**
* The administrator user name for the Axis2 administration console.
*
- * @parameter expression="${axis2.aar.axis2AdminUser}"
+ * @parameter property="axis2.aar.axis2AdminUser"
*/
private String axis2AdminUser;
/**
* The administrator password for the Axis2 administration console.
*
- * @parameter expression="${axis2.aar.axis2AdminPassword}"
+ * @parameter property="axis2.aar.axis2AdminPassword"
*/
private String axis2AdminPassword;
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-ant-plugin/src/main/java/org/apache/axis2/tool/ant/Java2WSDLTask.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-ant-plugin/src/main/java/org/apache/axis2/tool/ant/Java2WSDLTask.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-ant-plugin/src/main/java/org/apache/axis2/tool/ant/Java2WSDLTask.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-ant-plugin/src/main/java/org/apache/axis2/tool/ant/Java2WSDLTask.java Thu Dec 27 18:42:33 2018
@@ -278,8 +278,6 @@ public class Java2WSDLTask extends Task
Thread.currentThread().setContextClassLoader(cl);
- if (outputLocation != null) cl.addPathElement(outputLocation);
-
new Java2WSDLCodegenEngine(commandLineOptions).generate();
Thread.currentThread().setContextClassLoader(conextClassLoader);
} catch (Throwable e) {
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/pom.xml (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/pom.xml Thu Dec 27 18:42:33 2018
@@ -86,7 +86,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>axis2-xmlbeans</artifactId>
+ <artifactId>axis2-xmlbeans-codegen</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -94,6 +94,10 @@
<artifactId>axis2-jibx-codegen</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </dependency>
</dependencies>
<build>
<resources>
@@ -145,7 +149,6 @@
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.1</version>
<executions>
<execution>
<!-- This copies the dependencies so that they can be located by Eclipse -->
@@ -165,7 +168,6 @@
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.3</version>
<configuration>
<filesets>
<fileset>
@@ -190,7 +192,19 @@
<Embed-Directory>lib</Embed-Directory>
<Embed-Transitive>true</Embed-Transitive>
<!-- Exclude imports that are actually not used -->
- <Import-Package>!org.dom4j*,!nu.xom,!org.jdom*,!javax.portlet,!com.sun.*,!org.jvnet.ws.databinding,!org.apache.xmlbeans.*,!org.xmlpull.*,!org.apache.commons.io*,!org.relaxng.datatype,*</Import-Package>
+ <Import-Package>
+ !org.dom4j*,
+ !nu.xom,
+ !org.jdom*,
+ !javax.portlet,
+ !com.sun.*,
+ !org.jvnet.ws.databinding,
+ !org.apache.xmlbeans.*,
+ !org.xmlpull.*,
+ !org.apache.commons.io*,
+ !org.relaxng.datatype,
+ *
+ </Import-Package>
<Export-Package />
<Bundle-Name>Axis2 Codegen Wizard Plug-in</Bundle-Name>
<Bundle-Activator>org.apache.axis2.tool.codegen.eclipse.plugin.CodegenWizardPlugin</Bundle-Activator>
@@ -256,7 +270,7 @@
<build>
<plugins>
<plugin>
- <groupId>net.ju-n.maven.plugins</groupId>
+ <groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
<executions>
<execution>
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java Thu Dec 27 18:42:33 2018
@@ -175,7 +175,7 @@ public class WSDL2JavaGenerator {
String baseUri;
if ("file".equals(url.getProtocol())){
- baseUri = new File(url.getFile()).getParentFile().toURL().toExternalForm();
+ baseUri = new File(url.getFile()).getParentFile().toURI().toURL().toExternalForm();
}else{
baseUri = url.toExternalForm().substring(0,
url.toExternalForm().lastIndexOf("/")
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java Thu Dec 27 18:42:33 2018
@@ -35,8 +35,6 @@ import org.apache.axis2.tool.codegen.ecl
import org.apache.axis2.tool.codegen.eclipse.util.SettingsConstants;
import org.apache.axis2.tool.codegen.eclipse.util.UIConstants;
import org.apache.axis2.tool.codegen.eclipse.util.WSDLPropertyReader;
-import org.apache.axis2.tool.core.JarFileWriter;
-import org.apache.axis2.tool.core.SrcCompiler;
import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
import org.apache.axis2.wsdl.codegen.CodeGenerationEngine;
import org.apache.axis2.wsdl.codegen.CodegenConfigLoader;
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/ClassFileReader.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/ClassFileReader.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/ClassFileReader.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/util/ClassFileReader.java Thu Dec 27 18:42:33 2018
@@ -56,7 +56,7 @@ public class ClassFileReader {
if (classPathEntry.startsWith("http://")) {
urls[i] = new URL(classPathEntry);
} else {
- urls[i] = new File(classPathEntry).toURL();
+ urls[i] = new File(classPathEntry).toURI().toURL();
}
}
} catch (MalformedURLException e) {
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/pom.xml?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/pom.xml (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/pom.xml Thu Dec 27 18:42:33 2018
@@ -122,7 +122,6 @@
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.1</version>
<executions>
<execution>
<!-- This copies the dependencies so that they can be located by Eclipse -->
@@ -142,7 +141,6 @@
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.3</version>
<configuration>
<filesets>
<fileset>
@@ -167,7 +165,17 @@
<Embed-Directory>lib</Embed-Directory>
<Embed-Transitive>true</Embed-Transitive>
<!-- Exclude imports that are actually not used -->
- <Import-Package>!org.dom4j*,!nu.xom,!org.jdom*,!javax.portlet,!com.sun.*,!org.jvnet.ws.databinding,!org.apache.commons.io*,!org.relaxng.datatype,*</Import-Package>
+ <Import-Package>
+ !org.dom4j*,
+ !nu.xom,
+ !org.jdom*,
+ !javax.portlet,
+ !com.sun.*,
+ !org.jvnet.ws.databinding,
+ !org.apache.commons.io*,
+ !org.relaxng.datatype,
+ *
+ </Import-Package>
<Export-Package />
<Bundle-Name>Axis2 Service Maker</Bundle-Name>
<Bundle-Activator>org.apache.axis2.tool.service.eclipse.plugin.ServiceArchiver</Bundle-Activator>
@@ -209,7 +217,7 @@
<id>distribution-package</id>
<phase>package</phase>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
<configuration>
<descriptors>
@@ -233,7 +241,7 @@
<build>
<plugins>
<plugin>
- <groupId>net.ju-n.maven.plugins</groupId>
+ <groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
<executions>
<execution>
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ClassFileHandler.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ClassFileHandler.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ClassFileHandler.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ClassFileHandler.java Thu Dec 27 18:42:33 2018
@@ -46,7 +46,7 @@ public class ClassFileHandler {
if (!fileEndpoint.exists()){
throw new IOException("the location is invalid");
}
- final URL[] urlList = {fileEndpoint.toURL()};
+ final URL[] urlList = {fileEndpoint.toURI().toURL()};
URLClassLoader clazzLoader = AccessController.doPrivileged(new PrivilegedAction<URLClassLoader>() {
public URLClassLoader run() {
return new URLClassLoader(urlList);
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/control/Controller.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/control/Controller.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/control/Controller.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/control/Controller.java Thu Dec 27 18:42:33 2018
@@ -113,11 +113,6 @@ public class Controller {
writer.write(serviceFileString) ;
writer.close() ;
-// new ServiceFileCreator().createServiceFile(
-// page2Bean.getServiceName(),
-// page2Bean.getAutomaticClassName(),
-// page2Bean.getSelectedMethodNames());//create the file here
-
isServiceCreated = true;
}
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLGenerationPage.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLGenerationPage.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLGenerationPage.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLGenerationPage.java Thu Dec 27 18:42:33 2018
@@ -222,7 +222,7 @@ public class ServiceXMLGenerationPage ex
//get a URL from the class file location
try {
String classFileLocation = getClassFileLocation();
- URL classFileURL = new File(classFileLocation).toURL();
+ URL classFileURL = new File(classFileLocation).toURI().toURL();
ArrayList listofURLs = new ArrayList();
listofURLs.add(classFileURL);
@@ -232,7 +232,7 @@ public class ServiceXMLGenerationPage ex
if (libFileList!=null){
int count = libFileList.length;
for (int i=0;i<count;i++){
- listofURLs.add(new File(libFileList[i]).toURL());
+ listofURLs.add(new File(libFileList[i]).toURI().toURL());
}
}
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/WSDLOptionsPage.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/WSDLOptionsPage.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/WSDLOptionsPage.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/WSDLOptionsPage.java Thu Dec 27 18:42:33 2018
@@ -197,7 +197,7 @@ public class WSDLOptionsPage extends Abs
//get a URL from the class file location
try {
String classFileLocation = getClassFileLocation();
- URL classFileURL = new File(classFileLocation).toURL();
+ URL classFileURL = new File(classFileLocation).toURI().toURL();
ClassLoader loader = new URLClassLoader(new URL[] { classFileURL });
Class clazz = loader.loadClass(classNameTextBox.getText());
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=1849802&r1=1849801&r2=1849802&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 Thu Dec 27 18:42:33 2018
@@ -163,7 +163,7 @@
<id>distribution-package</id>
<phase>package</phase>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
<configuration>
<descriptors>
@@ -188,7 +188,7 @@
<build>
<plugins>
<plugin>
- <groupId>net.ju-n.maven.plugins</groupId>
+ <groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
<executions>
<execution>
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/ClassLoadingTestBean.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/ClassLoadingTestBean.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/ClassLoadingTestBean.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/ClassLoadingTestBean.java Thu Dec 27 18:42:33 2018
@@ -43,7 +43,7 @@ public class ClassLoadingTestBean {
if (classPathEntry.startsWith("http://")) {
urls[i] = new URL(classPathEntry);
} else {
- urls[i] = new File(classPathEntry).toURL();
+ urls[i] = new File(classPathEntry).toURI().toURL();
}
}
} catch (MalformedURLException e) {
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/CodegenBean.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/CodegenBean.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/CodegenBean.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/bean/CodegenBean.java Thu Dec 27 18:42:33 2018
@@ -260,7 +260,7 @@ public class CodegenBean {
String baseUri;
if ("file".equals(url.getProtocol())) {
- baseUri = new File(url.getFile()).getParentFile().toURL().toExternalForm();
+ baseUri = new File(url.getFile()).getParentFile().toURI().toURL().toExternalForm();
} else {
baseUri = url.toExternalForm().substring(0,
url.toExternalForm().lastIndexOf("/")
Modified: axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ServiceXMLGenerationPage.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ServiceXMLGenerationPage.java?rev=1849802&r1=1849801&r2=1849802&view=diff
==============================================================================
--- axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ServiceXMLGenerationPage.java (original)
+++ axis/axis2/java/core/branches/hermetic-tests/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/ServiceXMLGenerationPage.java Thu Dec 27 18:42:33 2018
@@ -191,7 +191,7 @@ public class ServiceXMLGenerationPage ex
//get a URL from the class file location
try {
String classFileLocation = archiveBean.getClassLoc().getPath();
- URL classFileURL = new File(classFileLocation).toURL();
+ URL classFileURL = new File(classFileLocation).toURI().toURL();
ArrayList listofURLs = new ArrayList();
listofURLs.add(classFileURL);
@@ -206,7 +206,7 @@ public class ServiceXMLGenerationPage ex
if (libFileList!=null){
int count = libFileList.length;
for (int i=0;i<count;i++){
- listofURLs.add(new File(libFileList[i]).toURL());
+ listofURLs.add(new File(libFileList[i]).toURI().toURL());
}
}
txtServiceName.setText("MyService" + count);
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=1849802&r1=1849801&r2=1849802&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 Thu Dec 27 18:42:33 2018
@@ -81,11 +81,22 @@
</configuration>
</plugin>
<plugin>
+ <groupId>com.github.veithen.invoker</groupId>
+ <artifactId>resolver-proxy-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>start</goal>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-invoker-plugin</artifactId>
<executions>
<execution>
<goals>
- <goal>install</goal>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
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=1849802&r1=1849801&r2=1849802&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 Thu Dec 27 18:42:33 2018
@@ -44,6 +44,7 @@ import java.util.Set;
* @goal java2wsdl
* @phase process-classes
* @requiresDependencyResolution compile
+ * @threadSafe
*/
public class Java2WSDLMojo extends AbstractMojo {
public static final String OPEN_BRACKET = "[";
@@ -52,7 +53,7 @@ public class Java2WSDLMojo extends Abstr
/**
* The maven project.
- * @parameter expression="${project}"
+ * @parameter property="project"
* @read-only
* @required
*/
@@ -60,111 +61,111 @@ public class Java2WSDLMojo extends Abstr
/**
* Fully qualified name of the class, which is being inspected.
- * @parameter expression="${axis2.java2wsdl.className}"
+ * @parameter property="axis2.java2wsdl.className"
* @required
*/
private String className;
/**
* Target namespace of the generated WSDL.
- * @parameter expression="${axis2.java2wsdl.targetNamespace}"
+ * @parameter property="axis2.java2wsdl.targetNamespace"
*/
private String targetNamespace;
/**
* The namespace prefix, which is being used for the WSDL's
* target namespace.
- * @parameter expression="${axis2.java2wsdl.targetNamespacePrefix}"
+ * @parameter property="axis2.java2wsdl.targetNamespacePrefix"
*/
private String targetNamespacePrefix;
/**
* The generated schemas target namespace.
- * @parameter expression="${axis2.java2wsdl.schemaTargetNamespace}"
+ * @parameter property="axis2.java2wsdl.schemaTargetNamespace"
*/
private String schemaTargetNamespace;
/**
* The generated schemas target namespace prefix.
- * @parameter expression="${axis2.java2wsdl.schemaTargetNamespacePrefix}"
+ * @parameter property="axis2.java2wsdl.schemaTargetNamespacePrefix"
*/
private String schemaTargetNamespacePrefix;
/**
* Name of the generated service.
- * @parameter expression="${axis2.java2wsdl.serviceName}"
+ * @parameter property="axis2.java2wsdl.serviceName"
*/
private String serviceName;
/**
* Name of the service file, which is being generated.
- * @parameter expression="${axis2.java2wsdl.outputFileName}" default-value="${project.build.directory}/generated-resources/service.wsdl"
+ * @parameter property="axis2.java2wsdl.outputFileName" default-value="${project.build.directory}/generated-resources/service.wsdl"
*/
private String outputFileName;
/**
* Style for the wsdl
- * @parameter expression="${axis2.java2wsdl.style}"
+ * @parameter property="axis2.java2wsdl.style"
*/
private String style;
/**
* Use for the wsdl
- * @parameter expression="${axis2.java2wsdl.use}"
+ * @parameter property="axis2.java2wsdl.use"
*/
private String use;
/**
* Version for the wsdl
- * @parameter expression="${axis2.java2wsdl.wsdlVersion}"
+ * @parameter property="axis2.java2wsdl.wsdlVersion"
*/
private String wsdlVersion;
/**
* Namespace Generator
- * @parameter expression="${axis2.java2wsdl.nsGenClassName}"
+ * @parameter property="axis2.java2wsdl.nsGenClassName"
*/
private String nsGenClassName;
/**
* Schema Generator
- * @parameter expression="${axis2.java2wsdl.schemaGenClassName}"
+ * @parameter property="axis2.java2wsdl.schemaGenClassName"
*/
private String schemaGenClassName;
/**
* Location URI in the wsdl
- * @parameter expression="${axis2.java2wsdl.locationUri}"
+ * @parameter property="axis2.java2wsdl.locationUri"
*/
private String locationUri;
/**
* attrFormDefault setting for the schema
- * @parameter expression="${axis2.java2wsdl.attrFormDefault}"
+ * @parameter property="axis2.java2wsdl.attrFormDefault"
*/
private String attrFormDefault;
/**
* elementFormDefault setting for the schema
- * @parameter expression="${axis2.java2wsdl.elementFormDefault}"
+ * @parameter property="axis2.java2wsdl.elementFormDefault"
*/
private String elementFormDefault;
/**
* Switch on the Doc/Lit/Bare style schema
- * @parameter expression="${axis2.java2wsdl.docLitBare}"
+ * @parameter property="axis2.java2wsdl.docLitBare"
*/
private String docLitBare;
/**
* Additional classes for which we need to generate schema
- * @parameter expression="${axis2.java2wsdl.extraClasses}"
+ * @parameter property="axis2.java2wsdl.extraClasses"
*/
private String[] extraClasses;
/**
* Specify namespaces explicitly for packages
- * @parameter expression="${axis2.java2wsdl.package2Namespace}"
+ * @parameter property="axis2.java2wsdl.package2Namespace"
*/
private Properties package2Namespace;
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=1849802&r1=1849801&r2=1849802&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 Thu Dec 27 18:42:33 2018
@@ -45,7 +45,7 @@ public abstract class AbstractMarMojo
/**
* The projects base directory.
*
- * @parameter expression="${project.basedir}"
+ * @parameter property="project.basedir"
* @required
* @readonly
*/
@@ -54,7 +54,7 @@ public abstract class AbstractMarMojo
/**
* The maven project.
*
- * @parameter expression="${project}"
+ * @parameter property="project"
* @required
* @readonly
*/
@@ -63,7 +63,7 @@ public abstract class AbstractMarMojo
/**
* The directory containing generated classes.
*
- * @parameter expression="${project.build.outputDirectory}"
+ * @parameter property="project.build.outputDirectory"
* @required
*/
private File classesDirectory;
@@ -71,7 +71,7 @@ public abstract class AbstractMarMojo
/**
* The directory where the mar is built.
*
- * @parameter expression="${project.build.directory}/mar"
+ * @parameter default-value="${project.build.directory}/mar"
* @required
*/
protected File marDirectory;
@@ -95,7 +95,7 @@ public abstract class AbstractMarMojo
/**
* Whether the dependency jars should be included in the mar
*
- * @parameter expression="${includeDependencies}" default-value="true"
+ * @parameter default-value="true"
*/
private boolean includeDependencies;