Author: veithen
Date: Sun Oct 16 19:52:49 2016
New Revision: 1765187

URL: http://svn.apache.org/viewvc?rev=1765187&view=rev
Log:
AXIS2-5809: Merge r1765183 to the 1.7 branch.

Added:
    
axis/axis2/java/core/branches/1_7/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5809/
      - copied from r1765183, 
axis/axis2/java/core/trunk/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5809/
    axis/axis2/java/core/branches/1_7/modules/adb-tests/src/test/repo/
      - copied from r1765183, 
axis/axis2/java/core/trunk/modules/adb-tests/src/test/repo/
    
axis/axis2/java/core/branches/1_7/modules/adb-tests/src/test/wsdl/AXIS2-5809.wsdl
      - copied unchanged from r1765183, 
axis/axis2/java/core/trunk/modules/adb-tests/src/test/wsdl/AXIS2-5809.wsdl
    
axis/axis2/java/core/branches/1_7/modules/adb-tests/src/test/xslt/AXIS2-5809.xsl
      - copied unchanged from r1765183, 
axis/axis2/java/core/trunk/modules/adb-tests/src/test/xslt/AXIS2-5809.xsl
Modified:
    axis/axis2/java/core/branches/1_7/   (props changed)
    axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml

Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 16 19:52:49 2016
@@ -1,4 +1,4 @@
 /axis/axis2/java/core/branches/1_6:1295540
 /axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
 
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594-1739595,1739815,1739826,1740693-1740694,1741976,1742201,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601,1747773,1747920,1751057,1752039,1765132
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594-1739595,1739815,1739826,1740693-1740694,1741976,1742201,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601,1747773,1747920,1751057,1752039,1765132,1765183

Modified: axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml?rev=1765187&r1=1765186&r2=1765187&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/adb-tests/pom.xml Sun Oct 16 
19:52:49 2016
@@ -184,12 +184,55 @@
                             
<outputDirectory>${project.build.directory}/wsdl2code/AXIS2-5799</outputDirectory>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>wsdl2code-axis2-5809</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>wsdl2code</goal>
+                        </goals>
+                        <configuration>
+                            <wsdlFile>src/test/wsdl/AXIS2-5809.wsdl</wsdlFile>
+                            <syncMode>sync</syncMode>
+                            <unpackClasses>true</unpackClasses>
+                            <namespaceURIs>
+                                <namespaceURI>
+                                    <uri>http://apache.org/axis2/echo</uri>
+                                    
<packageName>org.apache.axis2.databinding.axis2_5809</packageName>
+                                </namespaceURI>
+                            </namespaceURIs>
+                            
<packageName>org.apache.axis2.databinding.axis2_5809</packageName>
+                            <generateServerSide>true</generateServerSide>
+                            <generateAllClasses>true</generateAllClasses>
+                            <generateServicesXml>true</generateServicesXml>
+                            
<outputDirectory>${project.build.directory}/wsdl2code/AXIS2-5809</outputDirectory>
+                        </configuration>
+                    </execution>
                 </executions>
                 <configuration>
                     <databindingName>adb</databindingName>
                 </configuration>
             </plugin>
             <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-test-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            
<outputDirectory>${project.build.directory}/repo</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/test/repo</directory>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xml-maven-plugin</artifactId>
                 <version>1.0.1</version>
@@ -217,6 +260,14 @@
                                     
<stylesheet>src/test/xslt/AXIS2-5749.xsl</stylesheet>
                                     
<outputDir>${project.build.directory}/repo/AXIS2-5749/services/ColorService/META-INF</outputDir>
                                 </transformationSet>
+                                <transformationSet>
+                                    
<dir>${project.build.directory}/wsdl2code/AXIS2-5809/resources</dir>
+                                    <includes>
+                                        <include>services.xml</include>
+                                    </includes>
+                                    
<stylesheet>src/test/xslt/AXIS2-5809.xsl</stylesheet>
+                                    
<outputDir>${project.build.directory}/repo/AXIS2-5809/services/EchoService/META-INF</outputDir>
+                                </transformationSet>
                             </transformationSets>
                         </configuration>
                     </execution>
@@ -325,6 +376,7 @@
                                 
<source>${project.build.directory}/wsdl2code/AXIS2-5750/src</source>
                                 
<source>${project.build.directory}/wsdl2code/AXIS2-5758/src</source>
                                 
<source>${project.build.directory}/wsdl2code/AXIS2-5799/src</source>
+                                
<source>${project.build.directory}/wsdl2code/AXIS2-5809/src</source>
                             </sources>
                         </configuration>
                     </execution>


Reply via email to