svn commit: r1818748 - in /axis/axis2/java/core/trunk/modules: jibx/ jibx/src/test/repo/ tool/axis2-repo-maven-plugin/src/main/java/org/apache/axis2/maven2/repo/

[veithen]

Author: veithen
Date: Wed Dec 20 08:33:42 2017
New Revision: 1818748

URL: http://svn.apache.org/viewvc?rev=1818748&view=rev
Log:
Let axis2-repo-maven-plugin generate the axis2.xml file for the JiBX tests.

Removed:
    axis/axis2/java/core/trunk/modules/jibx/src/test/repo/
Modified:
    axis/axis2/java/core/trunk/modules/jibx/pom.xml
    
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/modules/jibx/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jibx/pom.xml?rev=1818748&r1=1818747&r2=1818748&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jibx/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jibx/pom.xml Wed Dec 20 08:33:42 2017
@@ -186,7 +186,6 @@
                         </goals>
                         <configuration>
                             
<outputDirectory>${project.build.directory}/repo/echo</outputDirectory>
-                            <inputDirectory>src/test/repo</inputDirectory>
                             <services>echo</services>
                         </configuration>
                     </execution>
@@ -197,7 +196,6 @@
                         </goals>
                         <configuration>
                             
<outputDirectory>${project.build.directory}/repo/library-unwrapped</outputDirectory>
-                            <inputDirectory>src/test/repo</inputDirectory>
                             <includeServices>false</includeServices>
                             <serviceDescriptions>
                                 <serviceDescription>
@@ -219,7 +217,6 @@
                         </goals>
                         <configuration>
                             
<outputDirectory>${project.build.directory}/repo/library-wrapped</outputDirectory>
-                            <inputDirectory>src/test/repo</inputDirectory>
                             <includeServices>false</includeServices>
                             <serviceDescriptions>
                                 <serviceDescription>
@@ -235,6 +232,14 @@
                         </configuration>
                     </execution>
                 </executions>
+                <configuration>
+                    <configurationDirectory>conf</configurationDirectory>
+                    <generatedAxis2xml>
+                        <modules>
+                            <module>checker</module>
+                        </modules>
+                    </generatedAxis2xml>
+                </configuration>
             </plugin>
         </plugins>
     </build>

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=1818748&r1=1818747&r2=1818748&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
 Wed Dec 20 08:33:42 2017
@@ -448,6 +448,11 @@ public abstract class AbstractCreateRepo
                                 }
                             }
                         }
+                        if (generatedAxis2xml.getModules() != null) {
+                            for (String module : 
generatedAxis2xml.getModules()) {
+                                
axis2xmlDoc.getOMFactory().createOMElement("module", null, 
root).addAttribute("ref", module, null);
+                            }
+                        }
                         OutputStream out = new FileOutputStream(axis2xmlFile);
                         try {
                             axis2xmlDoc.serialize(out);

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=1818748&r1=1818747&r2=1818748&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
 Wed Dec 20 08:33:42 2017
@@ -22,6 +22,7 @@ public class GeneratedAxis2Xml {
     private MessageHandler[] messageBuilders;
     private MessageHandler[] messageFormatters;
     private Handler[] handlers;
+    private String[] modules;
     
     public MessageHandler[] getMessageBuilders() {
         return messageBuilders;
@@ -46,4 +47,12 @@ public class GeneratedAxis2Xml {
     public void setHandlers(Handler[] handlers) {
         this.handlers = handlers;
     }
+    
+    public String[] getModules() {
+        return modules;
+    }
+
+    public void setModules(String[] modules) {
+        this.modules = modules;
+    }
 }