You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by st...@apache.org on 2006/02/21 20:23:11 UTC
svn commit: r379561 - in /webservices/axis2/trunk/java: build.xml
etc/project.properties
Author: stevel
Date: Tue Feb 21 11:23:02 2006
New Revision: 379561
URL: http://svn.apache.org/viewcvs?rev=379561&view=rev
Log:
tweakage of pom generation with more must-have dependencies. Notice how the number of dependent libraries is slowly but surely increasing...
Modified:
webservices/axis2/trunk/java/build.xml
webservices/axis2/trunk/java/etc/project.properties
Modified: webservices/axis2/trunk/java/build.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/build.xml?rev=379561&r1=379560&r2=379561&view=diff
==============================================================================
--- webservices/axis2/trunk/java/build.xml (original)
+++ webservices/axis2/trunk/java/build.xml Tue Feb 21 11:23:02 2006
@@ -46,7 +46,8 @@
keeproot="true" />
<property name="target.dir" location="target"/>
- <property name="artifact.title" value="${project.id}-${project.currentVersion}" />
+ <property name="project.version" value="${axis2_version}" />
+ <property name="artifact.title" value="${project.id}-${project.version}" />
<property name="target.jar" location="${target.dir}/${artifact.title}.jar"/>
<property name="target.pom" location="${target.dir}/${artifact.title}.pom"/>
<available file="${basedir}/target/lib/axis-wsdl4j-1.2.jar" property="jars.present"/>
@@ -80,22 +81,48 @@
</maven>
</target>
- <!-- inline creation of a very minimal (zero dependency) pom -->
+ <!-- inline creation of a very minimal pom
+ Only libraries that absolutely must be present should be listed.
+ This POM omits a choice of StAX parser, because there are so many.
+ -->
<target name="m2-pom" depends="init" xmlns:m2="antlib:org.apache.maven.artifact.ant">
<echo message="Creating Pom ${target.pom}" level="verbose"/>
<!--ant1.7's echoxml makes this easier -->
+
+
<echo file="${target.pom}"><![CDATA[<project>
<modelVersion>4.0.0</modelVersion>
<groupId>${project.id}</groupId>
<artifactId>${project.id}</artifactId>
<packaging>jar</packaging>
- <version>${project.currentVersion}</version>
+ <version>${project.version}</version>
<dependencies>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>policy</artifactId>
+ <version>${policy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis.wsdl4j</artifactId>
+ <version>${axis.wsdl4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ws-commons</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>${XmlSchema.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>annogen</groupId>
+ <artifactId>annogen</artifactId>
+ <version>${annogen.version}</version>
+ </dependency>
+
</dependencies>
</project>
]]></echo>
@@ -141,60 +168,60 @@
<target name="quick" depends="create-lib"
description="make a distribution">
<mkdir dir="${basedir}/target/classes/"/>
- <path id="classpath">
- <fileset dir="${basedir}/target/lib">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <javac srcdir="${basedir}/modules"
- destdir="${basedir}/target/classes/"
- debug="true"
- source="1.4"
- classpathref="classpath">
- <include name="addressing/src/**/*.java"/>
- <include name="adb/src/**/*.java"/>
- <include name="codegen/src/**/*.java"/>
- <include name="common/src/**/*.java"/>
- <include name="core/src/**/*.java"/>
- <include name="integration/src/**/*.java"/>
- <include name="saaj/src/**/*.java"/>
- <include name="samples/src/**/*.java"/>
- <include name="security/src/**/*.java"/>
- <include name="wsdl/src/**/*.java"/>
+ <path id="classpath">
+ <fileset dir="${basedir}/target/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
+
+ <javac srcdir="${basedir}/modules"
+ destdir="${basedir}/target/classes/"
+ debug="true"
+ source="1.4"
+ classpathref="classpath">
+ <include name="addressing/src/**/*.java"/>
+ <include name="adb/src/**/*.java"/>
+ <include name="codegen/src/**/*.java"/>
+ <include name="common/src/**/*.java"/>
+ <include name="core/src/**/*.java"/>
+ <include name="integration/src/**/*.java"/>
+ <include name="saaj/src/**/*.java"/>
+ <include name="samples/src/**/*.java"/>
+ <include name="security/src/**/*.java"/>
+ <include name="wsdl/src/**/*.java"/>
<include name="xml/src/**/*.java"/>
- <include name="doom/src/**/*.java"/>
+ <include name="doom/src/**/*.java"/>
</javac>
- <copy todir="${basedir}/target/classes/">
- <fileset dir="${basedir}/modules/common/src">
- <include name="**/*.properties"/>
- <include name="**/*.xsl"/>
- </fileset>
- <fileset dir="${basedir}/modules/core/conf">
- <include name="**/*.properties"/>
- </fileset>
- <fileset dir="${basedir}/modules/core/src">
- <include name="**/*axis2*.xml"/>
- </fileset>
- <fileset dir="${basedir}/modules/codegen/src">
- <include name="**/*.properties"/>
- <include name="**/*.xsl"/>
- <include name="**/*.xsd"/>
- </fileset>
+ <copy todir="${basedir}/target/classes/">
+ <fileset dir="${basedir}/modules/common/src">
+ <include name="**/*.properties"/>
+ <include name="**/*.xsl"/>
+ </fileset>
+ <fileset dir="${basedir}/modules/core/conf">
+ <include name="**/*.properties"/>
+ </fileset>
+ <fileset dir="${basedir}/modules/core/src">
+ <include name="**/*axis2*.xml"/>
+ </fileset>
+ <fileset dir="${basedir}/modules/codegen/src">
+ <include name="**/*.properties"/>
+ <include name="**/*.xsl"/>
+ <include name="**/*.xsd"/>
+ </fileset>
</copy>
- <mkdir dir="${basedir}/target/repo/modules"/>
- <copy todir="${basedir}/target/repo/modules">
- <fileset dir="${basedir}/modules/addressing/target">
- <include name="**/*.mar"/>
- </fileset>
- <fileset dir="${basedir}/modules/security/target">
- <include name="**/*.mar"/>
- </fileset>
+ <mkdir dir="${basedir}/target/repo/modules"/>
+ <copy todir="${basedir}/target/repo/modules">
+ <fileset dir="${basedir}/modules/addressing/target">
+ <include name="**/*.mar"/>
+ </fileset>
+ <fileset dir="${basedir}/modules/security/target">
+ <include name="**/*.mar"/>
+ </fileset>
</copy>
- <copy todir="${basedir}/target/repo">
- <fileset dir="${basedir}/modules/core/src/org/apache/axis2/deployment">
- <include name="axis2.xml"/>
- </fileset>
+ <copy todir="${basedir}/target/repo">
+ <fileset dir="${basedir}/modules/core/src/org/apache/axis2/deployment">
+ <include name="axis2.xml"/>
+ </fileset>
</copy>
</target>
Modified: webservices/axis2/trunk/java/etc/project.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/etc/project.properties?rev=379561&r1=379560&r2=379561&view=diff
==============================================================================
--- webservices/axis2/trunk/java/etc/project.properties (original)
+++ webservices/axis2/trunk/java/etc/project.properties Tue Feb 21 11:23:02 2006
@@ -76,6 +76,8 @@
# -------------------------------------------------------------------
# Versions of dependencies
# -------------------------------------------------------------------
+#for JAM
+annogen.version=0.1.0
ant.version=1.6.5
axiom.version=1.0-SNAPSHOT
axis.wsdl4j.version=1.2
@@ -98,6 +100,7 @@
log4j.version=1.2.12
maven.itest.plugin.version=1.0
opensaml.version=1.0.1
+policy.version=1.0-SNAPSHOT
stax.api.version=1.0
stax.impl.groupid=woodstox
stax.impl.artifactid=wstx
@@ -110,10 +113,7 @@
XmlSchema.version=1.0-SNAPSHOT
xmlsec.version=1.2.1
xmlunit.version=1.0
-policy.version=1.0-SNAPSHOT
-#for JAM
-annogen.version=0.1.0
#stax.impl.groupid=stax
#stax.impl.artifactid=stax