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/12/22 13:49:44 UTC
svn commit: r1819040 - in /axis/axis2/java/core/trunk:
databinding-tests/jaxbri-tests/
databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/
modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/
Author: veithen
Date: Fri Dec 22 13:49:44 2017
New Revision: 1819040
URL: http://svn.apache.org/viewvc?rev=1819040&view=rev
Log:
Add feature to axis2-repo-maven-plugin to override parameters in the generated axis2.xml.
Modified:
axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml
axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/MtomTest.java
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/GeneratedAxis2Xml.java
Modified: axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml?rev=1819040&r1=1819039&r2=1819040&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml (original)
+++ axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml Fri Dec 22 13:49:44 2017
@@ -281,6 +281,14 @@
</parameters>
</serviceDescription>
</serviceDescriptions>
+ <generatedAxis2xml>
+ <parameters>
+ <parameter>
+ <name>enableMTOM</name>
+ <value>true</value>
+ </parameter>
+ </parameters>
+ </generatedAxis2xml>
</configuration>
</execution>
</executions>
Modified: axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/MtomTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/MtomTest.java?rev=1819040&r1=1819039&r2=1819040&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/MtomTest.java (original)
+++ axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/MtomTest.java Fri Dec 22 13:49:44 2017
@@ -23,8 +23,6 @@ import javax.activation.DataSource;
import org.apache.axiom.testutils.activation.RandomDataSource;
import org.apache.axiom.testutils.io.IOTestUtils;
-import org.apache.axis2.Constants;
-import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.testutils.UtilServer;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -36,8 +34,6 @@ public class MtomTest {
@BeforeClass
public static void startServer() throws Exception {
UtilServer.start(System.getProperty("basedir", ".") + "/target/repo/mtom");
- AxisConfiguration axisConfiguration = UtilServer.getConfigurationContext().getAxisConfiguration();
- axisConfiguration.getParameter(Constants.Configuration.ENABLE_MTOM).setValue(true);
}
@AfterClass
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java?rev=1819040&r1=1819039&r2=1819040&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/AbstractCreateRepositoryMojo.java Fri Dec 22 13:49:44 2017
@@ -208,6 +208,27 @@ public abstract class AbstractCreateRepo
protected abstract File[] getClassDirectories();
+ private static void applyParameters(OMElement parentElement, Parameter[] parameters) {
+ if (parameters == null) {
+ return;
+ }
+ for (Parameter parameter : parameters) {
+ OMElement parameterElement = null;
+ for (Iterator<OMElement> it = parentElement.getChildrenWithLocalName("parameter"); it.hasNext(); ) {
+ OMElement candidate = it.next();
+ if (candidate.getAttributeValue(new QName("name")).equals(parameter.getName())) {
+ parameterElement = candidate;
+ break;
+ }
+ }
+ if (parameterElement == null) {
+ parameterElement = parentElement.getOMFactory().createOMElement("parameter", null, parentElement);
+ parameterElement.addAttribute("name", parameter.getName(), null);
+ }
+ parameterElement.setText(parameter.getValue());
+ }
+ }
+
private void addMessageHandlers(OMElement root, MessageHandler[] handlers, String localName) {
if (handlers == null) {
return;
@@ -335,23 +356,7 @@ public abstract class AbstractCreateRepo
if (serviceDescription.getScope() != null) {
serviceElement.addAttribute("scope", serviceDescription.getScope(), null);
}
- if (serviceDescription.getParameters() != null) {
- for (Parameter parameter : serviceDescription.getParameters()) {
- OMElement parameterElement = null;
- for (Iterator<OMElement> it = serviceElement.getChildrenWithLocalName("parameter"); it.hasNext(); ) {
- OMElement candidate = it.next();
- if (candidate.getAttributeValue(new QName("name")).equals(parameter.getName())) {
- parameterElement = candidate;
- break;
- }
- }
- if (parameterElement == null) {
- parameterElement = doc.getOMFactory().createOMElement("parameter", null, serviceElement);
- parameterElement.addAttribute("name", parameter.getName(), null);
- }
- parameterElement.setText(parameter.getValue());
- }
- }
+ applyParameters(serviceElement, serviceDescription.getParameters());
FileOutputStream out = new FileOutputStream(new File(metaInfDirectory, "services.xml"));
try {
doc.serialize(out);
@@ -425,6 +430,7 @@ public abstract class AbstractCreateRepo
}
}
}
+ applyParameters(root, generatedAxis2xml.getParameters());
addMessageHandlers(root, generatedAxis2xml.getMessageBuilders(), "messageBuilder");
addMessageHandlers(root, generatedAxis2xml.getMessageFormatters(), "messageFormatter");
if (generatedAxis2xml.getHandlers() != null) {
Modified: axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/GeneratedAxis2Xml.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/GeneratedAxis2Xml.java?rev=1819040&r1=1819039&r2=1819040&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/GeneratedAxis2Xml.java (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/GeneratedAxis2Xml.java Fri Dec 22 13:49:44 2017
@@ -19,11 +19,20 @@
package org.apache.axis2.maven2.repo;
public class GeneratedAxis2Xml {
+ private Parameter[] parameters;
private MessageHandler[] messageBuilders;
private MessageHandler[] messageFormatters;
private Handler[] handlers;
private String[] modules;
+ public Parameter[] getParameters() {
+ return parameters;
+ }
+
+ public void setParameters(Parameter[] parameters) {
+ this.parameters = parameters;
+ }
+
public MessageHandler[] getMessageBuilders() {
return messageBuilders;
}