You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2006/06/25 22:38:25 UTC
svn commit: r417072 - in /beehive/wsm/trunk: ./ lib/ samples/wsm-blank/
samples/wsm-blank/src-ws/ samples/wsm-blank/src/ samples/wsm-blank/src/web/
samples/wsm-blank/web/
Author: ekoneil
Date: Sun Jun 25 13:38:24 2006
New Revision: 417072
URL: http://svn.apache.org/viewvc?rev=417072&view=rev
Log:
Samples / build changes:
- use Maven's Ant integration tasks to make dependency downloads easier
- remove an old-school log4j.properties file
- fixup BUILDING / README-dist to reflect correct dependencies
Test: WSM pass
Added:
beehive/wsm/trunk/lib/
beehive/wsm/trunk/lib/maven-artifact-ant-2.0.2-dep.jar (with props)
beehive/wsm/trunk/samples/wsm-blank/src/web/
- copied from r413523, beehive/wsm/trunk/samples/wsm-blank/src-ws/web/
beehive/wsm/trunk/samples/wsm-blank/src/web/Blank.java
- copied unchanged from r417071, beehive/wsm/trunk/samples/wsm-blank/src-ws/web/Blank.java
Removed:
beehive/wsm/trunk/samples/wsm-blank/build-client.xml
beehive/wsm/trunk/samples/wsm-blank/src-ws/
beehive/wsm/trunk/samples/wsm-blank/src/log4j.properties
beehive/wsm/trunk/samples/wsm-blank/web/happyaxis.jsp
Modified:
beehive/wsm/trunk/BUILDING.txt
beehive/wsm/trunk/README-dist.txt
beehive/wsm/trunk/build.xml
beehive/wsm/trunk/pom.xml
beehive/wsm/trunk/wsm-imports.xml
Modified: beehive/wsm/trunk/BUILDING.txt
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/BUILDING.txt?rev=417072&r1=417071&r2=417072&view=diff
==============================================================================
--- beehive/wsm/trunk/BUILDING.txt (original)
+++ beehive/wsm/trunk/BUILDING.txt Sun Jun 25 13:38:24 2006
@@ -18,20 +18,14 @@
To build WSM, install the following software:
Ant 1.6.x
- Maven 2.x
+ Maven 2.0.2+
Tomcat 5.0.x
-The build uses Maven to download dependencies and to provide built WSM JARs for testing and uses
-Ant for compilation and testing.
-
-Download the dependencies with:
- mvn compile
- mvn test
-
-In Maven 2, there is likely a better way to do this, if you know it, please drop us a line!
+The build calls Maven from Ant to download the dependencies listed in pom.xml and uses Ant for
+compilation, testing, and generating documentation.
Build WSM:
- ant compile
+ ant build
Install WSM into your local Maven2 repository:
ant install
@@ -43,4 +37,19 @@
ant clean
Once the dependencies have been downloaded, a typical build process looks like:
- ant clean build install test
\ No newline at end of file
+
+ ant clean build install test
+
+Note, before building WSM for the first time, the JSR-173 API JAR file needs to be installed.
+To do this, download the JAR file from here:
+
+ http://www.ibiblio.org/maven/xmlbeans/jars/jsr173_1.0_api.jar
+
+and install it in your local Maven2 repository using this command:
+
+ mvn install:install-file -Dfile=<path-to-jar>/jsr173_1.0_api.jar -DgroupId=xmlbeans -DartifactId=xmlbeans-jsr173-api -Dversion=2.0-dev -Dpackaging=jar
+
+Together, this might be:
+
+ get http://www.ibiblio.org/maven/xmlbeans/jars/jsr173_1.0_api.jar > jsr173_1.0_api.jar
+ mvn install:install-file -Dfile=<path-to-jar>/jsr173_1.0_api.jar -DgroupId=xmlbeans -DartifactId=xmlbeans-jsr173-api -Dversion=2.0-dev -Dpackaging=jar
\ No newline at end of file
Modified: beehive/wsm/trunk/README-dist.txt
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/README-dist.txt?rev=417072&r1=417071&r2=417072&view=diff
==============================================================================
--- beehive/wsm/trunk/README-dist.txt (original)
+++ beehive/wsm/trunk/README-dist.txt Sun Jun 25 13:38:24 2006
@@ -14,14 +14,8 @@
separately:
- Axis 1.3+
-
-To add support for Beehive Controls, download:
-
- - Commons Discovery 0.2
- - Velocity 1.4 (with Dependencies)
- - Beehive Controls 1.0.1
-
-To add XMLBean support, download:
-
- XMLBeans 2.x
- - JSR 173 API
\ No newline at end of file
+ - JSR 173 API
+ - Velocity 1.4 (with Dependencies)
+ - Commons Discovery 0.2
+ - Beehive Controls 1.0.1
\ No newline at end of file
Modified: beehive/wsm/trunk/build.xml
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/build.xml?rev=417072&r1=417071&r2=417072&view=diff
==============================================================================
--- beehive/wsm/trunk/build.xml (original)
+++ beehive/wsm/trunk/build.xml Sun Jun 25 13:38:24 2006
@@ -18,10 +18,25 @@
$Header:$
-->
-<project name="Beehive/WSM" default="usage" basedir=".">
+<project name="Beehive/WSM"
+ default="usage"
+ basedir="."
+ xmlns:artifact="urn:maven-artifact-ant">
+ <property environment="os"/>
<import file="wsm-imports.xml"/>
+ <property name="maven-artifact-ant.jar" location="lib/maven-artifact-ant-2.0.2-dep.jar"/>
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant">
+ <classpath>
+ <pathelement location="${maven-artifact-ant.jar}"/>
+ </classpath>
+ </typedef>
+
+ <artifact:dependencies pathId=".forcedownload.">
+ <artifact:pom file="${basedir}/pom.xml"/>
+ </artifact:dependencies>
+
<property name="wsm.groupid" value="org.apache.beehive"/>
<property name="wsm.version" value="1.0-SNAPSHOT"/>
<property name="build.m2.dir" location="build/maven2/org/apache/beehive"/>
@@ -223,21 +238,24 @@
</target>
<target name="build.dist" description="Build a WSM distribution">
- <mkdir dir="build/dist"/>
- <mkdir dir="build/dist/lib"/>
-
- <copy todir="build/dist" file="NOTICE.txt"/>
- <copy todir="build/dist" file="LICENSE.txt"/>
- <copy tofile="build/dist/README.txt" file="README-dist.txt"/>
+ <property name="dist.dir" location="build/apache-beehive-wsm-${wsm.version}"/>
+ <mkdir dir="${dist.dir}"/>
+
+ <mkdir dir="${dist.dir}/lib"/>
+
+ <copy todir="${dist.dir}" file="NOTICE.txt"/>
+ <copy todir="${dist.dir}" file="LICENSE.txt"/>
+ <copy tofile="${dist.dir}/README.txt" file="README-dist.txt"/>
- <copy todir="build/dist/lib">
+ <copy todir="${dist.dir}/lib">
<fileset dir="build/jars" includes="*.jar"/>
+ <fileset refid="controls.fileset"/>
</copy>
<ant dir="samples/wsm-samples" target="clean" inheritAll="false"/>
<ant dir="samples/wsm-blank" target="clean" inheritAll="false"/>
- <copy todir="build/dist/samples">
+ <copy todir="${dist.dir}/samples">
<fileset dir="samples">
<include name="wsm-samples/**"/>
<include name="wsm-blank/**"/>
Added: beehive/wsm/trunk/lib/maven-artifact-ant-2.0.2-dep.jar
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/lib/maven-artifact-ant-2.0.2-dep.jar?rev=417072&view=auto
==============================================================================
Binary file - no diff available.
Propchange: beehive/wsm/trunk/lib/maven-artifact-ant-2.0.2-dep.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: beehive/wsm/trunk/pom.xml
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/pom.xml?rev=417072&r1=417071&r2=417072&view=diff
==============================================================================
--- beehive/wsm/trunk/pom.xml (original)
+++ beehive/wsm/trunk/pom.xml Sun Jun 25 13:38:24 2006
@@ -45,8 +45,13 @@
<version>0.2</version>
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
<groupId>xmlbeans</groupId>
- <artifactId>xmlpublic</artifactId>
+ <artifactId>xbean</artifactId>
<version>2.1.0</version>
</dependency>
<!-- This JAR has disappeared from the Maven2 repository and needs to be downloaded manually.
Modified: beehive/wsm/trunk/wsm-imports.xml
URL: http://svn.apache.org/viewvc/beehive/wsm/trunk/wsm-imports.xml?rev=417072&r1=417071&r2=417072&view=diff
==============================================================================
--- beehive/wsm/trunk/wsm-imports.xml (original)
+++ beehive/wsm/trunk/wsm-imports.xml Sun Jun 25 13:38:24 2006
@@ -20,7 +20,6 @@
<project name="wsm-imports" default="usage" basedir=".">
- <property environment="os"/>
<dirname property="wsm.home" file="${ant.file.wsm-imports}"/>
<property file="${wsm.home}/user.properties"/>