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 di...@apache.org on 2007/08/01 05:27:25 UTC
svn commit: r561632 - in /webservices/axis2/trunk/java/modules:
distribution/pom.xml documentation/xdocs/dynamic-labels.properties
documentation/xdocs/index.xml parent/pom.xml
Author: dims
Date: Tue Jul 31 20:27:24 2007
New Revision: 561632
URL: http://svn.apache.org/viewvc?view=rev&rev=561632
Log:
get the docs dist working right with filtering
Modified:
webservices/axis2/trunk/java/modules/distribution/pom.xml
webservices/axis2/trunk/java/modules/documentation/xdocs/dynamic-labels.properties
webservices/axis2/trunk/java/modules/documentation/xdocs/index.xml
webservices/axis2/trunk/java/modules/parent/pom.xml
Modified: webservices/axis2/trunk/java/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/pom.xml?view=diff&rev=561632&r1=561631&r2=561632
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/pom.xml Tue Jul 31 20:27:24 2007
@@ -246,23 +246,41 @@
<phase>package</phase>
<configuration>
<tasks>
- <!-- TODO : filtering is not working -->
- <filter filtersfile="../../modules/documentation/xdocs/dynamic-labels.properties" />
- <copy todir="target/xdocs" filtering="on">
- <fileset dir="../../modules/documentation/xdocs">
- <exclude name="**/*.gif"/>
- <exclude name="**/*.jpg"/>
- <exclude name="**/*.png"/>
- </fileset>
- </copy>
- <!-- copy images without filtering -->
- <copy todir="target/xdocs" >
- <fileset dir="../../modules/documentation/xdocs">
- <include name="**/*.gif"/>
- <include name="**/*.jpg"/>
- <include name="**/*.png"/>
- </fileset>
- </copy>
+ <copy toDir="target/xdocs/${docs.folder.version}">
+ <fileset dir="../documentation/xdocs/@axis2_version_dir@">
+ <exclude name="**/*.xml"/>
+ </fileset>
+ </copy>
+
+ <filter filtersfile="../documentation/xdocs/dynamic-labels.properties"/>
+
+ <copy toDir="target/xdocs/${docs.folder.version}" filtering="on" overwrite="true">
+ <globmapper from="*.xml" to="*.html"/>
+ <fileset dir="../documentation/xdocs/@axis2_version_dir@"/>
+ </copy>
+
+ <copy toDir="target/xdocs" filtering="on" overwrite="true">
+ <globmapper from="*.xml" to="*.html"/>
+ <fileset dir="../documentation/xdocs">
+ <exclude name="@axis2_version_dir@/**"/>
+ <exclude name="**/*.gif"/>
+ <exclude name="**/*.jpg"/>
+ <exclude name="**/*.png"/>
+ </fileset>
+ </copy>
+
+ <copy toDir="target/xdocs" filtering="off" overwrite="true">
+ <fileset dir="../documentation/xdocs">
+ <exclude name="@axis2_version_dir@/**"/>
+ <include name="**/*.gif"/>
+ <include name="**/*.jpg"/>
+ <include name="**/*.png"/>
+ <include name="**/*.css"/>
+ <include name="**/*.xsd"/>
+ <include name="**/*.cgi"/>
+ <include name="**/*.properties"/>
+ </fileset>
+ </copy>
</tasks>
</configuration>
<goals>
Modified: webservices/axis2/trunk/java/modules/documentation/xdocs/dynamic-labels.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/documentation/xdocs/dynamic-labels.properties?view=diff&rev=561632&r1=561631&r2=561632
==============================================================================
--- webservices/axis2/trunk/java/modules/documentation/xdocs/dynamic-labels.properties (original)
+++ webservices/axis2/trunk/java/modules/documentation/xdocs/dynamic-labels.properties Tue Jul 31 20:27:24 2007
@@ -1,21 +1,22 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-axis2_version=1.2
-axis2_version_dir=1_2
-
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+axis2_version=1.3
+axis2_version_dir=1_3
+
Modified: webservices/axis2/trunk/java/modules/documentation/xdocs/index.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/documentation/xdocs/index.xml?view=diff&rev=561632&r1=561631&r2=561632
==============================================================================
--- webservices/axis2/trunk/java/modules/documentation/xdocs/index.xml (original)
+++ webservices/axis2/trunk/java/modules/documentation/xdocs/index.xml Tue Jul 31 20:27:24 2007
@@ -36,10 +36,10 @@
here, you can visit the <a href=
"http://ws.apache.org/axis2/c/"><strong>Apache Axis2/C</strong></a>
Web site for Axis2/C implementation information.</p>
-<h2>03rd August 2007 - Apache Axis2/Java Version 1.3 Released!</h2>
+<h2>03rd August 2007 - Apache Axis2/Java Version 1.3 Released!</h2>
<p>[ <a href=
"http://ws.apache.org/axis2/download.cgi"><strong>Download</strong></a>
-] | [ <a href="1_2/index.html"><strong>Documents Home</strong></a>
+] | [ <a href="1_3/index.html"><strong>Documents Home</strong></a>
]</p>
<p>Apache Axis2 is the core engine for Web services. It is a
complete re-design and re-write of the widely used <a href=
@@ -214,8 +214,8 @@
"mailto:axis-user@ws.apache.org">axis-user@ws.apache.org</a>". Make
sure to prefix the subject of the mail with [Axis2].</p>
<h2>Features of Axis2 Latest Version</h2>
-<p>Apache Axis2 Version 1.3 comes with performance improvements and
-a number bug fixes over the 1.2 release. Check out the complete list of
+<p>Apache Axis2 Version 1.3 comes with performance improvements and
+a number bug fixes over the 1.2 release. Check out the complete list of
features below.</p>
<h3>Programming Model</h3>
<ul>
Modified: webservices/axis2/trunk/java/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/parent/pom.xml?view=diff&rev=561632&r1=561631&r2=561632
==============================================================================
--- webservices/axis2/trunk/java/modules/parent/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/parent/pom.xml Tue Jul 31 20:27:24 2007
@@ -84,7 +84,8 @@
<soapmonitor.mar.version>SNAPSHOT</soapmonitor.mar.version>
<mex.mar.version>SNAPSHOT</mex.mar.version>
<ping.mar.version>SNAPSHOT</ping.mar.version>
- <scripting.mar.version>1.3</scripting.mar.version>
+ <docs.folder.version>1_3</docs.folder.version>
+ <scripting.mar.version>SNAPSHOT</scripting.mar.version>
<annogen.version>0.1.0</annogen.version>
<ant.version>1.7.0</ant.version>
<antlr.version>2.7.4</antlr.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org