You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ch...@apache.org on 2006/01/09 17:22:39 UTC
svn commit: r367323 - in /webservices/axis2/trunk/java: maven.xml
xdocs/0_94/installationguide.html xdocs/0_94/userguide.html
Author: chinthaka
Date: Mon Jan 9 08:22:25 2006
New Revision: 367323
URL: http://svn.apache.org/viewcvs?rev=367323&view=rev
Log:
- Applying Azeez' patch on maven.xml
- improving the installationguide.html and userguide.html to include the information about new axis2 packaging structure.
Modified:
webservices/axis2/trunk/java/maven.xml
webservices/axis2/trunk/java/xdocs/0_94/installationguide.html
webservices/axis2/trunk/java/xdocs/0_94/userguide.html
Modified: webservices/axis2/trunk/java/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/maven.xml?rev=367323&r1=367322&r2=367323&view=diff
==============================================================================
--- webservices/axis2/trunk/java/maven.xml (original)
+++ webservices/axis2/trunk/java/maven.xml Mon Jan 9 08:22:25 2006
@@ -53,6 +53,8 @@
<j:set var="dist.name" value="${pom.artifactId}-${pom.currentVersion}"/>
<j:set var="dist.dir" value="target/dist"/>
+ <j:set var="modules" value="*"/>
+
<preGoal name="modules:reactor:init">
<j:set var="groupId" value="maven-itest-plugin"/>
<j:set var="artifactId" value="maven-itest-plugin"/>
@@ -91,7 +93,7 @@
<j:if test="${context.getVariable('modules') == null}">
<!-- The default is to build everything -->
- <j:set var="modules" value="*"/>
+ <j:set var="modules" value="${modules}"/>
</j:if>
<j:if test="${context.getVariable('module.includes') == null}">
@@ -138,6 +140,9 @@
</ant:fileset>
</ant:fileScanner>
+ <!-- Init/Reinit this variable -->
+ <j:set var="modules.reactor.includes" value=""/>
+
<!-- Setup the includes which will be used by the reactor -->
<j:forEach var="file" items="${scanner.iterator()}">
<!--
@@ -352,7 +357,7 @@
</goal>
<goal name="create-lib">
- <macros:copy-deps copyToDir="${target/lib}"/>
+ <macros:copy-deps copyToDir="${target/lib}" mods="*"/>
</goal>
<!-- ================================================================ -->
@@ -423,8 +428,8 @@
<ant:fileset file="modules/security/target/security.mar"/>
</ant:copy>
- <ant:delete dir="target/temp" />
- <ant:delete dir="target/apidocs" />
+ <ant:delete dir="target/temp"/>
+ <ant:delete dir="target/apidocs"/>
</goal>
<goal name="dist-min-bin" prereqs="init-dist,cache-min-deps">
@@ -516,62 +521,59 @@
<ant:echo>| Creating: Axis2 Standard Binary Distribution</ant:echo>
<ant:echo>+----------------------------------------------</ant:echo>
- <ant:mkdir dir="target/temp/std/bin/lib"/>
- <ant:mkdir dir="target/temp/std/bin/mar"/>
- <ant:mkdir dir="target/temp/std/bin/samples"/>
- <ant:mkdir dir="target/temp/std/bin/webapp"/>
+ <ant:property name="std.bin.temp.dir" value="target/temp/std/bin" />
+
+ <ant:mkdir dir="${std.bin.temp.dir}/lib"/>
+ <ant:mkdir dir="${std.bin.temp.dir}/bin"/>
+ <ant:mkdir dir="${std.bin.temp.dir}/modules"/>
+ <ant:mkdir dir="${std.bin.temp.dir}/samples"/>
+
+ <!-- Copy bin scripts -->
+ <ant:copy todir="${std.bin.temp.dir}/bin">
+ <ant:fileset dir="modules/tool/script"/>
+ </ant:copy>
<!-- Copy the 3rd party libs -->
- <ant:copy toDir="target/temp/std/bin/lib">
+ <ant:copy toDir="${std.bin.temp.dir}/lib">
<ant:fileset dir="${min_dep_cache}"/>
<ant:fileset dir="${std_dep_cache}"/>
</ant:copy>
<!-- Create axis2-core.jar -->
- <jar destfile="target/temp/std/bin/lib/axis2-core-${pom.currentVersion}.jar">
+ <jar destfile="${std.bin.temp.dir}/lib/axis2-core-${pom.currentVersion}.jar">
<fileset dir="modules/core/target/classes/"/>
<fileset dir="modules/common/target/classes/"/>
<fileset dir="modules/xml/target/classes/"/>
<fileset dir="modules/wsdl/target/classes/"/>
</jar>
- <ant:copy toDir="target/temp/std/bin/lib">
+ <ant:copy toDir="${std.bin.temp.dir}/lib">
<ant:fileset file="modules/adb/target/axis2-adb-${pom.currentVersion}.jar"/>
<ant:fileset file="modules/codegen/target/axis2-codegen-${pom.currentVersion}.jar"/>
<ant:fileset file="modules/doom/target/axis2-doom-${pom.currentVersion}.jar"/>
</ant:copy>
- <!-- Webapp -->
- <ant:copy toDir="target/temp/std/bin/webapp">
- <ant:fileset dir="modules/webapp">
- <ant:exclude name="**/.svn/**"/>
- <ant:exclude name="**/.*/**"/>
- </ant:fileset>
- </ant:copy>
-
<!-- Copy addressing mar -->
- <ant:copy toDir="target/temp/std/bin/mar">
+ <ant:copy toDir="${std.bin.temp.dir}/modules">
<ant:fileset file="modules/addressing/target/addressing.mar"/>
</ant:copy>
<!-- Copy the samples -->
- <ant:copy toDir="target/temp/std/bin/samples">
- <ant:fileset dir="modules/samples">
- <ant:exclude name="**/.svn/**"/>
- <ant:exclude name="**/classes/**"/>
- <ant:exclude name="**/target/**"/>
- <ant:exclude name="**/xdocs/**"/>
- <ant:exclude name="**/.*/**"/>
- </ant:fileset>
+ <ant:copy todir="${std.bin.temp.dir}/samples">
+ <ant:fileset dir="modules/samples/target/samples"/>
+ </ant:copy>
+ <ant:copy todir="${std.bin.temp.dir}/samples/userguide">
+ <ant:fileset file="${std.bin.temp.dir}/samples/groovyService.aar"/>
</ant:copy>
+ <ant:delete file="${std.bin.temp.dir}/samples/groovyService.aar" />
<!-- Copy the release documents -->
- <macros:copy-release-docs toDir="target/temp/std/bin"
+ <macros:copy-release-docs toDir="${std.bin.temp.dir}"
readmeFile="release-docs/readme-files/README-std-bin.txt"/>
<ant:zip file="${dist.dir}/axis2-std-${pom.currentVersion}-bin.zip"
- basedir="target/temp/std/bin"/>
- <ant:delete dir="target/temp/std/bin"/>
+ basedir="${std.bin.temp.dir}"/>
+ <ant:delete dir="${std.bin.temp.dir}"/>
</goal>
<goal name="dist-std-src" prereqs="init-dist">
@@ -642,7 +644,7 @@
<ant:mkdir dir="target/temp/docs/javadocs"/>
<ant:copy toDir="target/temp/docs/xdocs">
- <ant:fileset dir="xdocs" />
+ <ant:fileset dir="xdocs"/>
</ant:copy>
<ant:copy toDir="target/temp/docs/javadocs">
@@ -657,23 +659,23 @@
</ant:zip>
<ant:delete dir="target/temp/docs"/>
- <ant:echo message="***** IMPORTANT: Please manually copy the Eclipse & IDEA plugins" />
+ <ant:echo message="***** IMPORTANT: Please manually copy the Eclipse & IDEA plugins"/>
</goal>
<goal name="cache-min-deps" prereqs="init-dist">
<ant:mkdir dir="${min_dep_cache}"/>
<j:if test="${minDeps.uptodate != 'yes'}">
<macros:copy-deps copyToDir="${min_dep_cache}"
- modules="core,common,xml,wsdl,adb"/>
+ mods="core,common,xml,wsdl,adb"/>
<property name="minDeps.uptodate" value="yes"/>
</j:if>
</goal>
- <goal name="cache-std-deps" prereqs="cache-min-deps">
+ <goal name="cache-std-deps" prereqs="init-dist,cache-min-deps">
<ant:mkdir dir="${std_dep_cache}"/>
<j:if test="${stdDeps.uptodate != 'yes'}">
<macros:copy-deps copyToDir="${std_dep_cache}"
- modules="codegen,doom,webapp"/>
+ mods="codegen,doom"/>
<property name="stdDeps.uptodate" value="yes"/>
</j:if>
</goal>
@@ -761,10 +763,80 @@
<define:taglib uri="macros">
<define:tag name="copy-deps">
- <j:if test="${context.getVariable('modules') != null}">
- <property name="modules" value="${modules}"/>
+
+ <ant:echo message="######## MODULES=${mods}"/>
+ <ant:echo message="######## Copy2Dir=${copyToDir}"/>
+
+ <j:set var="modules" value="${mods}"/>
+
+ <!-- ######################### REACTOR INIT ##########################################-->
+
+ <j:if test="${context.getVariable('module.types') == null}">
+ <j:set var="module.types" value="modules,applications,plugins"/>
</j:if>
- <attainGoal name="modules:reactor:init"/>
+
+ <j:set var="module.includes" value="${modules}"/>
+
+ <j:if test="${context.getVariable('module.excludes') == null}">
+ <j:set var="module.excludes" value=""/>
+ </j:if>
+
+ <u:tokenize var="types" delim=",">${module.types}</u:tokenize>
+
+ <ant:fileScanner var="scanner">
+ <ant:fileset dir="${basedir}">
+ <j:forEach var="type" items="${types}">
+ <j:choose>
+ <j:when test="${context.getVariable('module.includes') == '*'}">
+ <ant:include name="${type}/*/project.xml"/>
+ </j:when>
+ <j:otherwise>
+ <u:tokenize var="includes" delim=",">${module.includes}</u:tokenize>
+ <j:forEach var="include" items="${includes}">
+ <u:available file="${basedir}/${type}/${include}/project.xml">
+ <ant:include name="${type}/${include}/project.xml"/>
+ </u:available>
+ </j:forEach>
+ </j:otherwise>
+ </j:choose>
+
+ <j:choose>
+ <j:when test="${context.getVariable('module.excludes') == '*'}">
+ <ant:exclude name="${type}/*/project.xml"/>
+ </j:when>
+ <j:otherwise>
+ <u:tokenize var="excludes" delim=",">${module.excludes}</u:tokenize>
+ <j:forEach var="exclude" items="${excludes}">
+ <u:available file="${basedir}/${type}/${exclude}/project.xml">
+ <ant:exclude name="${type}/${exclude}/project.xml"/>
+ </u:available>
+ </j:forEach>
+ </j:otherwise>
+ </j:choose>
+ </j:forEach>
+ </ant:fileset>
+ </ant:fileScanner>
+
+ <!-- Setup the includes which will be used by the reactor -->
+ <j:forEach var="file" items="${scanner.iterator()}">
+ <j:set var="directory"
+ value="${file.parentFile.parentFile.name}/${file.parentFile.name}"/>
+ <j:set var="filename" value="${directory}/${file.name}"/>
+ <j:choose>
+ <j:when test="${context.getVariable('modules.reactor.includes') == null}">
+ <j:set var="modules.directories" value="${directory}"/>
+ <j:set var="modules.reactor.includes" value="${filename}"/>
+ </j:when>
+ <j:otherwise>
+ <j:set var="modules.directories"
+ value="${modules.directories},${directory}"/>
+ <j:set var="modules.reactor.includes"
+ value="${modules.reactor.includes},${filename}"/>
+ </j:otherwise>
+ </j:choose>
+ </j:forEach>
+ <!-- #################### END OF REACTOR INIT #######################################-->
+
<ant:echo message="Fetching Dependencies for modules: ${modules.reactor.includes}"/>
<maven:reactor
basedir="${basedir}"
@@ -785,6 +857,9 @@
</ant:copy>
<ant:copy toFile="${toDir}/release-notes.html" filtering="on">
<ant:fileset file="release-notes.html"/>
+ </ant:copy>
+ <ant:copy toFile="${toDir}/LICENSE.txt" filtering="on">
+ <ant:fileset file="LICENSE.txt"/>
</ant:copy>
</define:tag>
</define:taglib>
Modified: webservices/axis2/trunk/java/xdocs/0_94/installationguide.html
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/xdocs/0_94/installationguide.html?rev=367323&r1=367322&r2=367323&view=diff
==============================================================================
--- webservices/axis2/trunk/java/xdocs/0_94/installationguide.html (original)
+++ webservices/axis2/trunk/java/xdocs/0_94/installationguide.html Mon Jan 9 08:22:25 2006
@@ -3,6 +3,16 @@
<head>
<meta http-equiv="content-type" content="">
<title>Axis2 Installation Guide</title>
+ <style type="text/css">
+<!--
+.style1 {
+ font-family: "Courier New", Courier, mono;
+ font-size: 14px;
+ font-style: italic;
+}
+.style2 {font-family: Arial, Helvetica, sans-serif}
+-->
+ </style>
</head>
<body lang="en">
@@ -36,15 +46,78 @@
<p>Axis2 is distributed in several formats and can be installed either as a
standalone server or as part of a J2EE compliant servlet container. Axis2 is
-distributed under the Apache License, version 2.0</p>
-
-<p>You can <a href="http://ws.apache.org/axis2/download.cgi">download</a>
-Axis2 as a zipped binary, WAR or the <a
-href="http://svn.apache.org/viewcvs.cgi/webservices/axis2/trunk/?root=Apache-SVN">source</a>
-depending on your requirements.</p>
-
-<p>Latest release Axis2 version 0.94</p>
-
+distributed under the Apache License, version 2.0. You can download Axis2 <a href="http://ws.apache.org/axis2/download.cgi">here</a>. Latest release of Axis2 is version 0.94 and followings are available for download in this release. </p>
+<table width="940" border="1" cellpadding="1">
+ <tr>
+ <th width="83" scope="col">Distribution Name</th>
+ <th width="633" scope="col">Description</th>
+ <th width="202" scope="col">Items</th>
+ </tr>
+ <tr>
+ <td>Minimal Distribution - Binary </td>
+ <td>This distribution is aimed at for the advanced users who will be embedding Axis2 and thus will contain the minimal runtime required for it to act as a Web Service client and/or a server (axis2-core-0.94.jar will contain compiled versions of common, xml, wsdl and core modules.) </td>
+ <td><ul>
+ <li>axis2-core-0.94.jar, axis2-adb-0.94.jar</li>
+ <li>third party distributable libraries</li>
+ <li>readme.txt and releaseNote.html </li>
+ </ul></td>
+ </tr>
+ <tr>
+ <td>Minimal Distribution - Source </td>
+ <td background="#_Toc96698083"><p>This will contain the sources of Axis2 minimal distribution. One can get binary distribution from this by typing <span class="style1">$maven dist-min-bin. </span>(<a href="#_Toc96698083">Set up Axis2 environment</a> before this) </p></td>
+ <td><ul>
+ <li>sources of Axis2 common, xml, wsdl, adb and core modules </li>
+ <li>readme.txt and releaseNote.html </li>
+ </ul></td>
+ </tr>
+ <tr>
+ <td>Standard Distribution - Binary </td>
+ <td>This is the complete version of Axis2 and will contain useful samples also for some one to get familiar with Axis2. (Since WS-Addressing implementation module is engaged in to Axis2, by default, this distribution will contain addressing.mar. But the other modules that are being developed within Axis2 will not be included here and are available to be downloaded separately from <a href="http://ws.apache.org/axis2/modules/index.html">here</a>.)</td>
+ <td><ul>
+ <li>all the content of minimal-binary distribution</li>
+ <li>Contents of codegen and DOOM modules</li>
+ <li>Samples</li>
+ <li>Addressing.mar</li>
+ </ul></td>
+ </tr>
+ <tr>
+ <td>Standard Distribution - Source </td>
+ <td>This will contain the sources of Axis2 standard distribution. One can get binary distribution from this by typing <span class="style1">$maven dist-standard-bin. </span>(<a href="#_Toc96698083">Set up Axis2 environment</a> before this) </td>
+ <td><ul>
+ <li>all the content of minimal-source distribution</li>
+ <li>Contents of codegen and DOOM modules</li>
+ <li>Samples</li>
+ </ul></td>
+ </tr>
+ <tr>
+ <td>War (Web Archive) Distribution </td>
+ <td>This will be the web application of Axis2 which can be deployed in most of the servlet containers. </td>
+ <td><ul>
+ <li>
+ all the content of the minimal distribution
+ </li>
+ <li>
+ Admin web app
+ </li>
+ </ul></td>
+ </tr>
+ <tr>
+ <td>Documents Distribution </td>
+ <td>This will make all the documents that are available in the site to be downloaded in one package.</td>
+ <td><ul>
+ <li>xdocs</li>
+ <li>java docs </li>
+ </ul></td>
+ </tr>
+ <tr>
+ <td>Plugin Distribution </td>
+ <td>This will contain the plugins that are created for Eclipse and IDEA.</td>
+ <td><ul>
+ <li>Intellij IDEA plugins</li>
+ <li>Eclipse plugins</li>
+ </ul></td>
+ </tr>
+</table>
<h3><a name="requirements">System Requirements</a></h3>
<table border="2">
Modified: webservices/axis2/trunk/java/xdocs/0_94/userguide.html
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/xdocs/0_94/userguide.html?rev=367323&r1=367322&r2=367323&view=diff
==============================================================================
--- webservices/axis2/trunk/java/xdocs/0_94/userguide.html (original)
+++ webservices/axis2/trunk/java/xdocs/0_94/userguide.html Mon Jan 9 08:22:25 2006
@@ -139,10 +139,11 @@
<h3><a name="Attention"></a>Attention</h3>
<ul>
- <li><p style="margin-bottom: 0in">This User's Guide is written based on
- <em>Axis2 binary distribution</em>. (The binary distribution can also be
+ <li>
+ <p style="margin-bottom: 0in">This User's Guide is written based on
+ <em>Axis2 standard binary distribution</em>. (The standard binary distribution can also be
created from the source distribution using the maven goal <code>$maven
- dist-bin)</code></p>
+ dist-std-bin). </code> Please refer the <a href="installationguide.html#Download">installation guide</a> for further information about the downloadable available in this release. </p>
</li>
<li><p>If you are new to Axis, it's highly recommended that you read <a
href="http://ws.apache.org/axis/java/user-guide.html"
@@ -1315,7 +1316,7 @@
runs.</p>
<pre><handler name="InFlowLogHandler" class="userguide.loggingmodule.LogHandler">
<order phase="loggingPhase" />
-</handler></pre>
+</handler></pre>
<p>To learn more on Phase rules, click on <a href="http://www.developer.com/java/web/article.php/3529321" target="_blank">here</a></p>
<h4><a name="step4loggingmodule">Step 4: Modify the "axis2.xml"</a></h4>
@@ -1329,63 +1330,63 @@
an extract of the phase section of the "axis2.xml".</p>
<pre><!-- ================================================= -->
<!-- Phases -->
-<!-- ================================================= -->
-
-<phaseOrder type="inflow">
- <!-- System pre defined phases -->
- <phase name="TransportIn"/>
- <phase name="PreDispatch"/>
- <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
- <handler name="AddressingBasedDispatcher"
- class="org.apache.axis2.engine.AddressingBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
-
- <handler name="RequestURIBasedDispatcher"
- class="org.apache.axis2.engine.RequestURIBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
-
- <handler name="SOAPActionBasedDispatcher"
- class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
-
- <handler name="SOAPMessageBodyBasedDispatcher"
- class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
- <order phase="Dispatch"/>
- </handler>
- <handler name="InstanceDispatcher"
- class="org.apache.axis2.engine.InstanceDispatcher">
- <order phase="PostDispatch"/>
- </handler>
- </phase>
- <!-- System pre defined phases -->
- <!-- After Postdispatch phase module author or or service author can add any phase he want -->
- <phase name="userphase1"/>
- <phase name="<font color="#33cc00">loggingPhase</font>"/>
- </phaseOrder>
- <phaseOrder type="outflow">
- <!-- user can add his own phases to this area -->
- <phase name="userphase1"/>
- <phase name="<font color="#33cc00">loggingPhase</font>"/>
- <!--system predefined phase-->
- <!--these phase will run irrespective of the service-->
- <phase name="PolicyDetermination"/>
- <phase name="MessageOut"/>
- </phaseOrder/>
- <phaseOrder type="INfaultflow">
- <!-- user can add his own phases to this area -->
- <phase name="userphase1"/>
- <phase name="<font color="#33cc00">loggingPhase</font>"/>
- </phaseOrder>
- <phaseOrder type="Outfaultflow">
- <!-- user can add his own phases to this area -->
- <phase name="userphase1"/>
- <phase name="<font color="#33cc00">loggingPhase</font>"/>
- <phase name="PolicyDetermination"/>
- <phase name="MessageOut"/>
- </phaseOrder>
+<!-- ================================================= -->
+
+<phaseOrder type="inflow">
+ <!-- System pre defined phases -->
+ <phase name="TransportIn"/>
+ <phase name="PreDispatch"/>
+ <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+ <handler name="AddressingBasedDispatcher"
+ class="org.apache.axis2.engine.AddressingBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="RequestURIBasedDispatcher"
+ class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="SOAPActionBasedDispatcher"
+ class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+
+ <handler name="SOAPMessageBodyBasedDispatcher"
+ class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+ <order phase="Dispatch"/>
+ </handler>
+ <handler name="InstanceDispatcher"
+ class="org.apache.axis2.engine.InstanceDispatcher">
+ <order phase="PostDispatch"/>
+ </handler>
+ </phase>
+ <!-- System pre defined phases -->
+ <!-- After Postdispatch phase module author or or service author can add any phase he want -->
+ <phase name="userphase1"/>
+ <phase name="<font color="#33cc00">loggingPhase</font>"/>
+ </phaseOrder>
+ <phaseOrder type="outflow">
+ <!-- user can add his own phases to this area -->
+ <phase name="userphase1"/>
+ <phase name="<font color="#33cc00">loggingPhase</font>"/>
+ <!--system predefined phase-->
+ <!--these phase will run irrespective of the service-->
+ <phase name="PolicyDetermination"/>
+ <phase name="MessageOut"/>
+ </phaseOrder/>
+ <phaseOrder type="INfaultflow">
+ <!-- user can add his own phases to this area -->
+ <phase name="userphase1"/>
+ <phase name="<font color="#33cc00">loggingPhase</font>"/>
+ </phaseOrder>
+ <phaseOrder type="Outfaultflow">
+ <!-- user can add his own phases to this area -->
+ <phase name="userphase1"/>
+ <phase name="<font color="#33cc00">loggingPhase</font>"/>
+ <phase name="PolicyDetermination"/>
+ <phase name="MessageOut"/>
+ </phaseOrder>
</pre>