axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sandak...@apache.org
Subject svn commit: r671485 - in /webservices/axis2/trunk/java/modules: parent/pom.xml tool/axis2-eclipse-codegen-plugin/pom.xml tool/conf/codegen/.classpath tool/conf/codegen/build.properties tool/conf/codegen/plugin.xml
Date Wed, 25 Jun 2008 09:37:08 GMT
Author: sandakith
Date: Wed Jun 25 02:37:07 2008
New Revision: 671485

URL: http://svn.apache.org/viewvc?rev=671485&view=rev
Log:
Commitimg Fix by Saminda Wijeratne for the issue AXIS2-3855. Build fix of the Axis2 Eclipse
Cogegen Plugin to import it to eclipse as a plugin project

Modified:
    webservices/axis2/trunk/java/modules/parent/pom.xml
    webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
    webservices/axis2/trunk/java/modules/tool/conf/codegen/.classpath
    webservices/axis2/trunk/java/modules/tool/conf/codegen/build.properties
    webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml

Modified: webservices/axis2/trunk/java/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/parent/pom.xml?rev=671485&r1=671484&r2=671485&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/parent/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/parent/pom.xml Wed Jun 25 02:37:07 2008
@@ -138,7 +138,8 @@
         <stax.impl.groupid>org.codehaus.woodstox</stax.impl.groupid>
         <stax.impl.version>3.2.4</stax.impl.version>
         <tomcat.version>6.0.16</tomcat.version>
-        <woden.version>1.0M8</woden.version>
+        <!--<woden.version>1.0M8</woden.version>-->
+        <woden.version>1.0-SNAPSHOT</woden.version>
         <wsdl4j.version>1.6.2</wsdl4j.version>
         <xalan.version>2.7.0</xalan.version>
         <xerces.version>2.8.1</xerces.version>
@@ -149,6 +150,8 @@
         <xmlunit.version>1.1</xmlunit.version>
         <smack.version>3.0.4</smack.version>
         <commons.lang.version>2.3</commons.lang.version>
+        <javax.mail.version>1.4</javax.mail.version>
+        <axis2.jws.version>1.3</axis2.jws.version>
         <!-- The build failing if tests are skipped is very annoying -->
         <failIfNoTests>false</failIfNoTests>
         <m2Repository>'${settings.localRepository}'</m2Repository>

Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?rev=671485&r1=671484&r2=671485&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml Wed Jun
25 02:37:07 2008
@@ -248,6 +248,16 @@
             <artifactId>log4j</artifactId>
             <version>${log4j.version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <version>${javax.mail.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-jws-api</artifactId>
+            <version>${axis2.jws.version}</version>
+        </dependency>
     </dependencies>
     <distributionManagement>
         <repository>
@@ -313,6 +323,7 @@
                         <phase>package</phase>
                         <configuration>
                             <tasks>
+                                
                                 <property name="codegen.plugin.version"
                                           value="Axis2_Codegen_Wizard_${eclipse.plugins.version}"/>
                                 <property name="codegen.plugin.zip.name" value="axis2-eclipse-codegen-wizard.zip"/>
@@ -364,6 +375,51 @@
                                 <filter token="commons.httpclient.version" value="${commons.httpclient.version}"/>
                                 <filter token="commons.codec.version" value="${commons.codec.version}"/>
                                 <filter token="jibx.version" value="${jibx.version}"/>
+                                <filter token="javax.mail.version" value="${javax.mail.version}"/>
+                                <filter token="axis2.jws.version" value="${axis2.jws.version}"/>
+                                <filter token="geronimo.spec.javamail.version" value="${geronimo.spec.javamail.version}"/>
+                
+								<!--
+								  If it is neccessary to create the eclipse project manually without using "mvn eclipse:eclipse"
command uncomment the following section which copies 
+								  the required jars to the the project lib folder
+								  -->
+
+                                
+                                <!--
+                                <property name="m2.local.repo" value="${settings.localRepository}"/>
+                                <mkdir dir="./lib"/>
+                                <copy todir="./lib" file="${m2.local.repo}/org/apache/geronimo/specs/geronimo-activation_1.1_spec/${geronimo.spec.activation.version}/geronimo-activation_1.1_spec-${geronimo.spec.activation.version}.jar"
/>
+                                <copy todir="./lib" file="${m2.local.repo}/org/apache/ant/ant/${ant.version}/ant-${ant.version}.jar"
/>
+                                <copy todir="./lib" file="${m2.local.repo}/org/apache/ws/commons/axiom/axiom-api/${axiom.version}/axiom-api-${axiom.version}.jar"
/>
+                                <copy todir="./lib" file="${m2.local.repo}/org/apache/ws/commons/axiom/axiom-dom/${axiom.version}/axiom-dom-${axiom.version}.jar"
/>
+                                <copy todir="./lib" file="${m2.local.repo}/org/apache/ws/commons/axiom/axiom-impl/${axiom.version}/axiom-impl-${axiom.version}.jar"
/>
+                                <copy todir="./lib" file="${m2.local.repo}/commons-logging/commons-logging/${commons.logging.version}/commons-logging-${commons.logging.version}.jar"
/>
+                                <copy todir="./lib" file="${m2.local.repo}/org/apache/neethi/neethi/${neethi.version}/neethi-${neethi.version}.jar"
/>
+                                <copy todir="./lib" file="${m2.local.repo}/stax/stax-api/${stax.api.version}/stax-api-${stax.api.version}.jar"
/>
+                                <copy todir="./lib" file="${m2.local.repo}/org/codehaus/woodstox/wstx-asl/${stax.impl.version}/wstx-asl-${stax.impl.version}.jar"
/>
+                                <copy todir="./lib" file="${m2.local.repo}/org/apache/xmlbeans/xmlbeans/${xmlbeans.version}/xmlbeans-${xmlbeans.version}.jar"
/>
+                                <copy todir="./lib" file="${m2.local.repo}/org/apache/ws/commons/schema/XmlSchema/${xmlschema.version}/XmlSchema-${xmlschema.version}.jar"
/>
+                                <copy todir="./lib" file="${m2.local.repo}/log4j/log4j/${log4j.version}/log4j-${log4j.version}.jar"
/>
+                                <copy todir="./lib" file="${m2.local.repo}/wsdl4j/wsdl4j/${wsdl4j.version}/wsdl4j-${wsdl4j.version}.jar"
/>
+                                <copy todir="./lib" file="${m2.local.repo}/org/apache/woden/woden-api/${woden.version}/woden-api-${woden.version}.jar"
/>
+                                <copy todir="./lib" file="${m2.local.repo}/commons-codec/commons-codec/${commons.codec.version}/commons-codec-${commons.codec.version}.jar"
/>
+                                <copy todir="./lib" file="${m2.local.repo}/commons-httpclient/commons-httpclient/${commons.httpclient.version}/commons-httpclient-${commons.httpclient.version}.jar"
/>
+                                <copy todir="./lib" file="${m2.local.repo}/org/apache/axis2/axis2/${version}/axis2-${version}.jar"
/>
+                                <copy todir="./lib" file="${m2.local.repo}/org/apache/geronimo/specs/geronimo-javamail_1.4_spec/${geronimo.spec.javamail.version}/geronimo-javamail_1.4_spec-${geronimo.spec.javamail.version}.jar"
/>
+                                <copy todir="./lib" file="${m2.local.repo}/javax/mail/mail/${javax.mail.version}/mail-${javax.mail.version}.jar"
/>
+                                <copy todir="./lib" file="${m2.local.repo}/org/apache/axis2/axis2-jws-api/${axis2.jws.version}/axis2-jws-api-${axis2.jws.version}.jar"
/>
+                                -->
+                                
+                                <mkdir dir="./icons"/>
+                                <copy todir="./icons" overwrite="true">
+                                    <fileset dir="../conf/codegen/icons" />
+                                </copy>
+                                <copy todir="." file="../conf/codegen/build.properties"
overwrite="true" filtering="on"/>
+                                <copy todir="." file="../conf/codegen/help_toc.xml" overwrite="true"/>
+                                <copy todir="." file="../conf/codegen/plugin.xml" overwrite="true"
filtering="on"/>
+                                <copy todir="." file="../conf/codegen/.classpath" overwrite="true"
filtering="on"/>
+                                <copy todir="." file="../conf/codegen/.project" overwrite="true"
filtering="on"/>
+                                <copy todir="." file="../conf/codegen/readme.txt" overwrite="true"/>
 
                                 <unzip src="./target/axis2.eclipse.codegen.plugin-${pom.version}.jar"
                                        dest="./target/plugin/${codegen.plugin.version}"/>

Modified: webservices/axis2/trunk/java/modules/tool/conf/codegen/.classpath
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/conf/codegen/.classpath?rev=671485&r1=671484&r2=671485&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/conf/codegen/.classpath (original)
+++ webservices/axis2/trunk/java/modules/tool/conf/codegen/.classpath Wed Jun 25 02:37:07
2008
@@ -3,25 +3,26 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="lib" path="lib/geronimo-activation_1.1_spec-@activation.version@.jar"/>
-	<classpathentry kind="lib" path="lib/annogen-@annogen.version@.jar"/>
-	<classpathentry kind="lib" path="lib/axiom-api-@axiom.version@.jar"/>
-	<classpathentry kind="lib" path="lib/axiom-dom-@axiom.version@.jar"/>
-	<classpathentry kind="lib" path="lib/axiom-impl-@axiom.version@.jar"/>
-	<classpathentry kind="lib" path="lib/axis2-@version@.jar"/>
-	<classpathentry kind="lib" path="lib/commons-logging-@commons.logging.version@.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-@log4j.version@.jar"/>
-	<classpathentry kind="lib" path="lib/neethi-@neethi.version@.jar"/>
-	<classpathentry kind="lib" path="lib/stax-api-@stax.api.version@.jar"/>
-	<classpathentry kind="lib" path="lib/woden-@woden.version@.jar"/>
-	<classpathentry kind="lib" path="lib/wsdl4j-@wsdl4j.version@.jar"/>
-	<classpathentry kind="lib" path="lib/wstx-@stax.impl.version@.jar"/>
-	<classpathentry kind="lib" path="lib/xbean-@xbean.version@.jar"/>
-	<classpathentry kind="lib" path="lib/XmlSchema-@XmlSchema.version@.jar"/>
-	<classpathentry kind="lib" path="lib/commons-httpclient-@commons.httpclient.version@.jar"/>
-	<classpathentry kind="lib" path="lib/commons-codec-@commons.codec.version@.jar"/>
-	<classpathentry kind="lib" path="lib/axis2-jibx@version@.jar"/>
-	<classpathentry kind="lib" path="lib/jibx-bind-@jibx.version@.jar"/>
-	<classpathentry kind="lib" path="lib/jibx-run-@jibx.version@.jar"/>
 	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="lib" path="./lib/geronimo-activation_1.1_spec-@geronimo.spec.activation.version@.jar"
/>
+	<classpathentry kind="lib" path="./lib/ant-@ant.version@.jar" />
+	<classpathentry kind="lib" path="./lib/axiom-api-@axiom.version@.jar" />
+	<classpathentry kind="lib" path="./lib/axiom-dom-@axiom.version@.jar" />
+	<classpathentry kind="lib" path="./lib/axiom-impl-@axiom.version@.jar" />
+	<classpathentry kind="lib" path="./lib/commons-logging-@commons.logging.version@.jar"
/>
+	<classpathentry kind="lib" path="./lib/neethi-@neethi.version@.jar" />
+	<classpathentry kind="lib" path="./lib/stax-api-@stax.api.version@.jar" />
+	<classpathentry kind="lib" path="./lib/wstx-asl-@stax.impl.version@.jar" />
+	<classpathentry kind="lib" path="./lib/xmlbeans-@xmlbeans.version@.jar" />
+	<classpathentry kind="lib" path="./lib/XmlSchema-@xmlschema.version@.jar" />
+	<classpathentry kind="lib" path="./lib/log4j-@log4j.version@.jar" />
+	<classpathentry kind="lib" path="./lib/wsdl4j-@wsdl4j.version@.jar" />
+	<classpathentry kind="lib" path="./lib/woden-api-@woden.version@.jar" />
+	<classpathentry kind="lib" path="./lib/commons-codec-@commons.codec.version@.jar" />
+	<classpathentry kind="lib" path="./lib/commons-httpclient-@commons.httpclient.version@.jar"
/>
+	<classpathentry kind="lib" path="./lib/axis2-@version@.jar" />
+	<classpathentry kind="lib" path="./lib/geronimo-javamail_1.4_spec-@geronimo.spec.javamail.version@.jar"
/>
+	<classpathentry kind="lib" path="./lib/mail-@javax.mail.version@.jar" />
+	<classpathentry kind="lib" path="./lib/axis2-jws-api-@axis2.jws.version@.jar" />
 </classpath>
+

Modified: webservices/axis2/trunk/java/modules/tool/conf/codegen/build.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/conf/codegen/build.properties?rev=671485&r1=671484&r2=671485&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/conf/codegen/build.properties (original)
+++ webservices/axis2/trunk/java/modules/tool/conf/codegen/build.properties Wed Jun 25 02:37:07
2008
@@ -38,7 +38,7 @@
                lib/neethi-@neethi.version@.jar,\
                lib/stax-api-@stax.api.version@.jar,\
                lib/wsdl4j-@wsdl4j.version@.jar,\
-               lib/wstx-@stax.impl.version@.jar,\
+               lib/wstx-asl-@stax.impl.version@.jar,\
                lib/xmlbeans-@xmlbeans.version@.jar,\
                lib/XmlSchema-@xmlschema.version@.jar,\
                lib/woden-@woden.version@.jar,\

Modified: webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml?rev=671485&r1=671484&r2=671485&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml Wed Jun 25 02:37:07
2008
@@ -38,13 +38,13 @@
       <library name="lib/ant-@ant.version@.jar">
          <export name="*"/>
       </library>
-      <library name="lib/axiom-api-@axiom.version@.jar">
+      <library name="./lib/axiom-api-@axiom.version@.jar">
          <export name="*"/>
       </library>
-      <library name="lib/axiom-dom-@axiom.version@.jar">
+      <library name="./lib/axiom-dom-@axiom.version@.jar">
          <export name="*"/>
       </library>
-      <library name="lib/axiom-impl-@axiom.version@.jar">
+      <library name="./lib/axiom-impl-@axiom.version@.jar">
          <export name="*"/>
       </library>
       <library name="lib/commons-logging-@commons.logging.version@.jar">
@@ -89,6 +89,12 @@
       <library name="lib/jibx-run-@jibx.version@.jar">
          <export name="*"/>
       </library>
+      <library name="lib/mail-@javax.mail.version@.jar">
+         <export name="*"/>
+      </library>
+      <library name="lib/axis2-jws-api-@axis2.jws.version@.jar">
+         <export name="*"/>
+      </library>
    </runtime>
 
    <requires>



Mime
View raw message