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:56 UTC

svn commit: r561633 - in /webservices/axis2/branches/java/1_3/modules: distribution/pom.xml documentation/xdocs/dynamic-labels.properties documentation/xdocs/index.xml parent/pom.xml

Author: dims
Date: Tue Jul 31 20:27:55 2007
New Revision: 561633

URL: http://svn.apache.org/viewvc?view=rev&rev=561633
Log:
get the docs dist working right with filtering

Modified:
    webservices/axis2/branches/java/1_3/modules/distribution/pom.xml
    webservices/axis2/branches/java/1_3/modules/documentation/xdocs/dynamic-labels.properties
    webservices/axis2/branches/java/1_3/modules/documentation/xdocs/index.xml
    webservices/axis2/branches/java/1_3/modules/parent/pom.xml

Modified: webservices/axis2/branches/java/1_3/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/distribution/pom.xml?view=diff&rev=561633&r1=561632&r2=561633
==============================================================================
--- webservices/axis2/branches/java/1_3/modules/distribution/pom.xml (original)
+++ webservices/axis2/branches/java/1_3/modules/distribution/pom.xml Tue Jul 31 20:27:55 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/branches/java/1_3/modules/documentation/xdocs/dynamic-labels.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/documentation/xdocs/dynamic-labels.properties?view=diff&rev=561633&r1=561632&r2=561633
==============================================================================
--- webservices/axis2/branches/java/1_3/modules/documentation/xdocs/dynamic-labels.properties (original)
+++ webservices/axis2/branches/java/1_3/modules/documentation/xdocs/dynamic-labels.properties Tue Jul 31 20:27:55 2007
@@ -16,6 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-axis2_version=1.2
-axis2_version_dir=1_2
+
+axis2_version=1.3
+axis2_version_dir=1_3
 

Modified: webservices/axis2/branches/java/1_3/modules/documentation/xdocs/index.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/documentation/xdocs/index.xml?view=diff&rev=561633&r1=561632&r2=561633
==============================================================================
--- webservices/axis2/branches/java/1_3/modules/documentation/xdocs/index.xml (original)
+++ webservices/axis2/branches/java/1_3/modules/documentation/xdocs/index.xml Tue Jul 31 20:27:55 2007
@@ -39,7 +39,7 @@
 <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=

Modified: webservices/axis2/branches/java/1_3/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/parent/pom.xml?view=diff&rev=561633&r1=561632&r2=561633
==============================================================================
--- webservices/axis2/branches/java/1_3/modules/parent/pom.xml (original)
+++ webservices/axis2/branches/java/1_3/modules/parent/pom.xml Tue Jul 31 20:27:55 2007
@@ -80,6 +80,7 @@
               as the maven-release-plugin will not update this value.
         -->
         <version>1.3-SNAPSHOT</version>
+        <docs.folder.version>1_3</docs.folder.version>
 	<addressing.mar.version>1.3</addressing.mar.version>
 	<soapmonitor.mar.version>1.3</soapmonitor.mar.version>
 	<mex.mar.version>1.3</mex.mar.version>



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org