Author: shameera
Date: Sun Jun 2 18:48:55 2013
New Revision: 1488761
URL: http://svn.apache.org/r1488761
Log:
Applying patch for AXIS2-5576
Modified:
axis/axis2/java/core/trunk/README.txt
axis/axis2/java/core/trunk/build.xml
Modified: axis/axis2/java/core/trunk/README.txt
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/README.txt?rev=1488761&r1=1488760&r2=1488761&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/README.txt (original)
+++ axis/axis2/java/core/trunk/README.txt Sun Jun 2 18:48:55 2013
@@ -12,28 +12,28 @@ We use Maven 2 (http://maven.apache.org)
pom.xml in each module, as well as at the top level. Use "mvn install"
(or "mvn clean install" to clean up first) to build.
-IMPORTANT: the *first* time you build a given version of Axis2, you will not
+IMPORTANT: the *first* time you build a given version of Axis2, you may not
be able to do a regular "mvn install" from the top level - this is because
we have a couple of custom Maven plugins that (due to some dependency-
resolution issues in Maven) must be built and installed in your local
-repository before a build will succeed. This means you need to do one
-of the following:
+repository before a build will succeed. This being said, it is worth
+trying "mvn install" none-the-less. In the case where this fails, it
+means you need to do the following:
- 1) Use ant (http://ant.apache.org) to build the first time. There is
- a build.xml at the top level which automatically builds the plugins
- first and then runs a regular "mvn install".
-
- 2) Manually "mvn install" both of the plugins in the following places:
+ 1) Manually "mvn install" both of the plugins in the following places:
modules/tool/axis2-mar-maven-plugin
modules/tool/axis2-aar-maven-plugin
-
+
___________________
Documentation
===================
Documentation can be found in the 'docs' distribution of this release
-and in the main site.
+and in the main site. To build the documentation locally, simply do
+"mvn site". Additionally, the Axis2 Javadoc documentation can be
+produced by executing "mvn javadoc:javadoc".
+Users should then look in $AXIS2_HOME/target for the documentation.
___________________
Deploying
Modified: axis/axis2/java/core/trunk/build.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/build.xml?rev=1488761&r1=1488760&r2=1488761&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/build.xml (original)
+++ axis/axis2/java/core/trunk/build.xml Sun Jun 2 18:48:55 2013
@@ -1,115 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- ~ 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.
- -->
-<project name="axis2_build" default="install">
-
- <!-- set the property to indicate that JAVA_HOME is set -->
- <target name="cond_check">
- <property environment="env"/>
- <condition property="JAVA_HOME_SET">
- <isset property="env.JAVA_HOME"/>
- </condition>
- </target>
-
- <!-- fail if JAVA_HOME isn't set, otherwise we don't execute the body -->
- <target name="check_environment" unless="JAVA_HOME_SET"
depends="cond_check">
- <fail message="The environment variable JAVA_HOME is not set. Set this
variable to the directory where the JDK is installed."/>
- </target>
-
- <!-- set the property to indicate that MAVEN_HOME is set -->
- <target name="cond_check2">
- <property environment="env"/>
- <condition property="MAVEN_HOME_SET">
- <isset property="env.MAVEN_HOME"/>
- </condition>
- </target>
-
- <!-- fail if MAVEN_HOME isn't set, otherwise we don't execute the body -->
- <target name="check_environment2" unless="MAVEN_HOME_SET"
depends="cond_check2">
- <fail message="The environment variable MAVEN_HOME is not set. Set
this variable to the directory where Maven is installed."/>
- </target>
-
- <!-- initialize properties -->
- <target name="init" depends="check_environment, check_environment2">
- <!--macro for maven -->
- <condition property="maven.executable" value="cmd.exe">
- <os family="windows"/>
- </condition>
-
- <condition property="maven.line1" value="/c
${env.MAVEN_HOME}/bin/mvn.bat">
- <os family="windows"/>
- </condition>
-
- <condition property="maven.line2"
- value="--offline">
- <istrue value="${offline}"/>
- </condition>
-
- <condition property="maven.line3"
- value="-Dtest=false">
- <istrue value="${skip}"/>
- </condition>
-
- <property name="maven.executable" value="mvn"/>
- <property name="maven.line1" value=""/>
- <property name="maven.line2" value=""/>
- <property name="maven.line3" value=""/>
-
- <presetdef name="mvn">
- <exec failonerror="true" executable="${maven.executable}">
- <env key="MAVEN_TERMINATE_CMD" value="on"/>
- <arg line="${maven.line1}"/>
- <arg line="${maven.line2}"/>
- <arg line="${maven.line3}"/>
- </exec>
- </presetdef>
- </target>
-
- <target name="clean" depends="init">
- <mvn>
- <arg value="clean"/>
- </mvn>
- </target>
-
- <target name="install" depends="init">
- <mvn searchpath="true"
dir="${basedir}/modules/tool/axis2-aar-maven-plugin" failonerror="true">
- <arg line="install"/>
- </mvn>
- <mvn searchpath="true"
dir="${basedir}/modules/tool/axis2-mar-maven-plugin" failonerror="true">
- <arg line="install"/>
- </mvn>
- <mvn searchpath="true" dir="${basedir}" failonerror="true">
- <arg line="-Drelease install"/>
- </mvn>
- </target>
-
- <target name="deploy" depends="init">
- <mvn searchpath="true"
dir="${basedir}/modules/tool/axis2-aar-maven-plugin" failonerror="true">
- <arg line="deploy"/>
- </mvn>
- <mvn searchpath="true"
dir="${basedir}/modules/tool/axis2-mar-maven-plugin" failonerror="true">
- <arg line="deploy"/>
- </mvn>
- <mvn searchpath="true" dir="${basedir}" failonerror="true">
- <arg line="-Drelease deploy"/>
- </mvn>
- </target>
-</project>
-
