Author: dims
Date: Sat Apr 14 08:42:40 2007
New Revision: 528822
URL: http://svn.apache.org/viewvc?view=rev&rev=528822
Log:
merge some chages from branch
Modified:
webservices/axis2/trunk/java/etc/project.properties
webservices/axis2/trunk/java/maven.xml
Modified: webservices/axis2/trunk/java/etc/project.properties
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/etc/project.properties?view=diff&rev=528822&r1=528821&r2=528822
==============================================================================
--- webservices/axis2/trunk/java/etc/project.properties (original)
+++ webservices/axis2/trunk/java/etc/project.properties Sat Apr 14 08:42:40 2007
@@ -33,7 +33,6 @@
http://mirrors.ibiblio.org/pub/mirrors/maven,\
http://people.apache.org/repo/m1-snapshot-repository/,\
http://repo1.maven.org/maven/,\
-http://people.apache.org/~deepal/maven/,\
http://ws.zones.apache.org/repository/,\
http://people.apache.org/repo/m1-ibiblio-rsync-repository/,\
http://jibx.sourceforge.net/maven/,\
@@ -131,7 +130,7 @@
stax.api.version=1.0.1
stax.impl.artifactid=wstx
stax.impl.groupid=org.codehaus.woodstox
-stax.impl.version=asl-3.2.0
+stax.impl.version=asl-3.2.1
stax_utils.version=20060915
woden.version=1.0-incubating-SNAPSHOT
wsdl4j.version=1.6.2
@@ -218,5 +217,6 @@
maven.html2xdoc.dir=./xdocs
maven.pdf.navigationFile=navigation-pdf.xml
maven.allreports.disable=true
+maven.xdoc.axis_doc_folder_name=1_2
Modified: webservices/axis2/trunk/java/maven.xml
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/maven.xml?view=diff&rev=528822&r1=528821&r2=528822
==============================================================================
--- webservices/axis2/trunk/java/maven.xml (original)
+++ webservices/axis2/trunk/java/maven.xml Sat Apr 14 08:42:40 2007
@@ -537,7 +537,7 @@
</ant:fileset>
</ant:copy>
- <ant:war destfile="target/dist/axis2.war"
+ <ant:war destfile="target/dist/axis2-${pom.currentVersion}.war"
webxml="modules/webapp/conf/web.xml">
<ant:lib dir="target/temp/war/lib">
<ant:include name="**"/>
@@ -773,6 +773,7 @@
<include name="soapwithattachments/**/*.*"/>
<include name="version/**/*.*"/>
<include name="servicelifecycle/**/*.*"/>
+ <include name="wsdl/*.*"/>
<include name="pojo/**/*.*"/>
<include name="ping/**/*.*"/>
<!-- Docs related samples -->
@@ -879,6 +880,41 @@
<ant:echo>+----------------------------------------------</ant:echo>
</goal>
+ <!--creates a backup of xdocs folder(xdocs-original) & apply the filter
to the
+ xdocs folder.This filter applied xdocs folder will be used by maven
site goal.
+ Once site generation is completed, the original content will be
replaced, so
+ svn diff will not see any difference.
+ @see preGoal name="site"
+ @see postGoal name="site" -->
+
+ <preGoal name="site">
+ <!--copy the content of the xdocs folder into a backup folder -->
+ <!--This backed up copy will be copied into xdocs @ postGoal="site" -->
+ <ant:mkdir dir="xdocs-original"/>
+ <copy todir="xdocs-original">
+ <fileset dir="xdocs"/>
+ </copy>
+
+ <ant:filter filtersfile="xdocs-original/dynamic-labels.properties" />
+ <ant:copy toDir="xdocs" filtering="on" overwrite="true" >
+ <ant:fileset dir="xdocs-original"/>
+ </ant:copy>
+
+ <ant:move toDir="xdocs/${maven.xdoc.axis_doc_folder_name}">
+ <ant:fileset dir="xdocs/@axis2_version_dir@"/>
+ </ant:move>
+ </preGoal>
+
+ <postGoal name="site">
+ <echo message="Replacing the original xdocs folder..."></echo>
+ <ant:delete dir="xdocs/${maven.xdoc.axis_doc_folder_name}"/>
+ <ant:copy toDir="xdocs" overwrite="true" >
+ <ant:fileset dir="xdocs-original"/>
+ </ant:copy>
+ <!-- Delete the backup of xdocs folder. @see preGoal name="site" -->
+ <ant:delete dir="xdocs-original"/>
+ </postGoal>
+
<goal name="dist-docs" prereqs="init-dist, javadocs">
<ant:echo>+----------------------------------------------</ant:echo>
<ant:echo>| Creating: Axis2 Docs Distribution</ant:echo>
@@ -893,11 +929,17 @@
<ant:mkdir dir="${docs.temp.dir}/javadocs"/>
<echo message="Applying dynamic label filter..."></echo>
+ <ant:copy toDir="xdocs/${maven.xdoc.axis_doc_folder_name}">
+ <ant:fileset dir="xdocs/@axis2_version_dir@"/>
+ </ant:copy>
<ant:filter filtersfile="xdocs/dynamic-labels.properties" />
<ant:copy toDir="${docs.temp.dir}/xdocs" filtering="on"
overwrite="true" >
- <ant:fileset dir="xdocs"/>
+ <ant:fileset dir="xdocs">
+ <ant:exclude name="@axis2_version_dir@/**"/>
+ </ant:fileset>
</ant:copy>
-
+ <!--delete renamed folder from xdocs folder-->
+ <ant:delete dir="xdocs/${maven.xdoc.axis_doc_folder_name}"/>
<ant:copy toDir="${docs.temp.dir}/javadocs">
<ant:fileset dir="target/apidocs"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
