svn commit: r1340537 - in /axis/axis2/java/core/trunk/modules/jibx: ./ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/axis2/jibx/template/ src/main/resources/ src/main/resources/org/ src/main/resources/org/apache/ src/main/resourc...

Sat, 19 May 2012 11:49:58 -0700 

Author: veithen
Date: Sat May 19 18:49:34 2012
New Revision: 1340537

URL: http://svn.apache.org/viewvc?rev=1340537&view=rev
Log:
Converted the jibx module to standard Maven 2 layout.

Added:
    axis/axis2/java/core/trunk/modules/jibx/src/main/
    axis/axis2/java/core/trunk/modules/jibx/src/main/java/
    axis/axis2/java/core/trunk/modules/jibx/src/main/java/org/
      - copied from r1340533, axis/axis2/java/core/trunk/modules/jibx/src/org/
    axis/axis2/java/core/trunk/modules/jibx/src/main/resources/
    axis/axis2/java/core/trunk/modules/jibx/src/main/resources/org/
    axis/axis2/java/core/trunk/modules/jibx/src/main/resources/org/apache/
    axis/axis2/java/core/trunk/modules/jibx/src/main/resources/org/apache/axis2/
    
axis/axis2/java/core/trunk/modules/jibx/src/main/resources/org/apache/axis2/jibx/
    
axis/axis2/java/core/trunk/modules/jibx/src/main/resources/org/apache/axis2/jibx/template/
      - copied from r1340533, 
axis/axis2/java/core/trunk/modules/jibx/src/org/apache/axis2/jibx/template/
    axis/axis2/java/core/trunk/modules/jibx/src/test/
    axis/axis2/java/core/trunk/modules/jibx/src/test/binding/
      - copied from r1340533, 
axis/axis2/java/core/trunk/modules/jibx/test-resources/binding/
    axis/axis2/java/core/trunk/modules/jibx/src/test/java/
    axis/axis2/java/core/trunk/modules/jibx/src/test/java/org/
      - copied from r1340533, axis/axis2/java/core/trunk/modules/jibx/test/org/
    axis/axis2/java/core/trunk/modules/jibx/src/test/repo/
      - copied from r1340533, 
axis/axis2/java/core/trunk/modules/jibx/test-resources/repo/
    axis/axis2/java/core/trunk/modules/jibx/src/test/wsdl/
      - copied from r1340533, 
axis/axis2/java/core/trunk/modules/jibx/test-resources/wsdl/
Removed:
    
axis/axis2/java/core/trunk/modules/jibx/src/main/java/org/apache/axis2/jibx/template/
    axis/axis2/java/core/trunk/modules/jibx/src/org/
    axis/axis2/java/core/trunk/modules/jibx/test/
    axis/axis2/java/core/trunk/modules/jibx/test-resources/
Modified:
    axis/axis2/java/core/trunk/modules/jibx/pom.xml
    
axis/axis2/java/core/trunk/modules/jibx/src/test/java/org/apache/axis2/jibx/Test.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=1340537&r1=1340536&r2=1340537&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jibx/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jibx/pom.xml Sat May 19 18:49:34 2012
@@ -74,25 +74,6 @@
         
<url>http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jibx</url>
     </scm>
     <build>
-        <resources>
-            <resource>
-                <directory>src</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-        <sourceDirectory>src</sourceDirectory>
-        <testSourceDirectory>test</testSourceDirectory>
-        <testResources>
-            <testResource>
-                <targetPath>../test-resources</targetPath>
-                <directory>test-resources</directory>
-                <includes>
-                    <include>**/**</include>
-                </includes>
-            </testResource>
-        </testResources>
         <plugins>
             <plugin>
                 <artifactId>maven-remote-resources-plugin</artifactId>
@@ -123,23 +104,23 @@
                             <tasks unless="maven.test.skip">
                                 <java 
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
                                     <classpath refid="maven.test.classpath" />
-                                    <arg line="-uri 
test-resources/wsdl/library.wsdl -o 
${project.build.directory}/gen/library-unwrapped -d jibx -uw -Ebindingfile 
test-resources/binding/library-binding.xml --noBuildXML -ns2p 
http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.unwrapped.client";
 />
+                                    <arg line="-uri src/test/wsdl/library.wsdl 
-o ${project.build.directory}/gen/library-unwrapped -d jibx -uw -Ebindingfile 
src/test/binding/library-binding.xml --noBuildXML -ns2p 
http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.unwrapped.client";
 />
                                 </java>
                                 <java 
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
                                     <classpath refid="maven.test.classpath" />
-                                    <arg line="-uri 
test-resources/wsdl/library.wsdl -o 
${project.build.directory}/gen/library-unwrapped -d jibx -ss -ssi -sd -uw 
-Ebindingfile test-resources/binding/library-binding.xml --noBuildXML -ns2p 
http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.unwrapped.service";
 />
+                                    <arg line="-uri src/test/wsdl/library.wsdl 
-o ${project.build.directory}/gen/library-unwrapped -d jibx -ss -ssi -sd -uw 
-Ebindingfile src/test/binding/library-binding.xml --noBuildXML -ns2p 
http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.unwrapped.service";
 />
                                 </java>
                                 <java 
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
                                     <classpath refid="maven.test.classpath" />
-                                    <arg line="-uri 
test-resources/wsdl/library.wsdl -o 
${project.build.directory}/gen/library-wrapped -d jibx -Ebindingfile 
test-resources/binding/library-binding.xml --noBuildXML -ns2p 
http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.wrapped.client";
 />
+                                    <arg line="-uri src/test/wsdl/library.wsdl 
-o ${project.build.directory}/gen/library-wrapped -d jibx -Ebindingfile 
src/test/binding/library-binding.xml --noBuildXML -ns2p 
http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.wrapped.client";
 />
                                 </java>
                                 <java 
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
                                     <classpath refid="maven.test.classpath" />
-                                    <arg line="-uri 
test-resources/wsdl/library.wsdl -o 
${project.build.directory}/gen/library-wrapped -d jibx -ss -ssi -sd 
-Ebindingfile test-resources/binding/library-binding.xml --noBuildXML -ns2p 
http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.wrapped.service";
 />
+                                    <arg line="-uri src/test/wsdl/library.wsdl 
-o ${project.build.directory}/gen/library-wrapped -d jibx -ss -ssi -sd 
-Ebindingfile src/test/binding/library-binding.xml --noBuildXML -ns2p 
http://ws.sosnoski.com/library/wsdl=org.apache.axis2.jibx.library.wrapped.service";
 />
                                 </java>
                                 <java 
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
                                     <classpath refid="maven.test.classpath" />
-                                    <arg line="-uri 
test-resources/wsdl/customer-echo.wsdl -o 
${project.build.directory}/gen/customer-echo -d jibx -Ebindingfile 
test-resources/binding/customer-binding.xml --noBuildXML -ns2p 
http://ws.apache.org/axis2/jibx/customer/wsdl=org.apache.axis2.jibx.customer"; />
+                                    <arg line="-uri 
src/test/wsdl/customer-echo.wsdl -o 
${project.build.directory}/gen/customer-echo -d jibx -Ebindingfile 
src/test/binding/customer-binding.xml --noBuildXML -ns2p 
http://ws.apache.org/axis2/jibx/customer/wsdl=org.apache.axis2.jibx.customer"; />
                                 </java>
                             </tasks>
                         </configuration>
@@ -153,8 +134,8 @@
                                     <classpath refid="maven.runtime.classpath" 
/>
                                     <classpath location="target/test-classes" 
/>
                                     <arg value="-v" />
-                                    <arg 
value="test-resources/binding/customer-binding.xml" />
-                                    <arg 
value="test-resources/binding/library-binding.xml" />
+                                    <arg 
value="src/test/binding/customer-binding.xml" />
+                                    <arg 
value="src/test/binding/library-binding.xml" />
                                 </java>
                             </tasks>
                         </configuration>
@@ -196,7 +177,7 @@
                             
<outputDirectory>${project.build.directory}/repo/library-unwrapped</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>test-resources/repo</directory>
+                                    <directory>src/test/repo</directory>
                                 </resource>
                                 <resource>
                                     
<directory>${project.build.directory}/gen/library-unwrapped/resources</directory>
@@ -215,7 +196,7 @@
                             
<outputDirectory>${project.build.directory}/repo/library-wrapped</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>test-resources/repo</directory>
+                                    <directory>src/test/repo</directory>
                                 </resource>
                                 <resource>
                                     
<directory>${project.build.directory}/gen/library-wrapped/resources</directory>

Modified: 
axis/axis2/java/core/trunk/modules/jibx/src/test/java/org/apache/axis2/jibx/Test.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jibx/src/test/java/org/apache/axis2/jibx/Test.java?rev=1340537&r1=1340533&r2=1340537&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/jibx/src/test/java/org/apache/axis2/jibx/Test.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jibx/src/test/java/org/apache/axis2/jibx/Test.java
 Sat May 19 18:49:34 2012
@@ -32,7 +32,7 @@ import javax.xml.namespace.QName;
  */
 public class Test extends TestCase {
     private static final String REPOSITORY_DIR =
-            System.getProperty("basedir", ".") + "/test-resources/repo/";
+            System.getProperty("basedir", ".") + "/src/test/repo/";
 
     public static final QName serviceName = new QName("EchoCustomerService");
     public static final QName operationName = new QName("echo");

Reply via email to