You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by el...@apache.org on 2009/10/07 14:28:49 UTC
svn commit: r822692 - in /incubator/wink/trunk/wink-examples:
apps/QADefect/build.xml ext/MultiPart/build.xml
ext/RuntimeRegistration/build.xml ext/WebDAV/build.xml
Author: elman
Date: Wed Oct 7 12:28:49 2009
New Revision: 822692
URL: http://svn.apache.org/viewvc?rev=822692&view=rev
Log:
fix scripts according to a new zip distribution format.
See [WINK-183] for more details about the new format.
Modified:
incubator/wink/trunk/wink-examples/apps/QADefect/build.xml
incubator/wink/trunk/wink-examples/ext/MultiPart/build.xml
incubator/wink/trunk/wink-examples/ext/RuntimeRegistration/build.xml
incubator/wink/trunk/wink-examples/ext/WebDAV/build.xml
Modified: incubator/wink/trunk/wink-examples/apps/QADefect/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefect/build.xml?rev=822692&r1=822691&r2=822692&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/QADefect/build.xml (original)
+++ incubator/wink/trunk/wink-examples/apps/QADefect/build.xml Wed Oct 7 12:28:49 2009
@@ -78,8 +78,9 @@
<!-- Create the war file -->
<war destfile="${final.war}" webxml="${webapp}/WEB-INF/web.xml">
- <fileset dir="${webapp}/WEB-INF">
+ <fileset dir="${webapp}" includes="**/*">
<exclude name="WEB-INF" />
+ <exclude name="META-INF" />
</fileset>
<webinf dir="${webapp}/WEB-INF" includes="**/*" />
<classes dir="${build.classes}" includes="**/*" />
Modified: incubator/wink/trunk/wink-examples/ext/MultiPart/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/MultiPart/build.xml?rev=822692&r1=822691&r2=822692&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/MultiPart/build.xml (original)
+++ incubator/wink/trunk/wink-examples/ext/MultiPart/build.xml Wed Oct 7 12:28:49 2009
@@ -74,8 +74,9 @@
<!-- Create the war file -->
<war destfile="${final.war}" webxml="${webapp}/WEB-INF/web.xml">
- <fileset dir="${webapp}/WEB-INF">
+ <fileset dir="${webapp}" includes="**/*">
<exclude name="WEB-INF" />
+ <exclude name="META-INF" />
</fileset>
<webinf dir="${webapp}/WEB-INF" includes="**/*" />
<classes dir="${build.classes}" includes="**/*" />
Modified: incubator/wink/trunk/wink-examples/ext/RuntimeRegistration/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/RuntimeRegistration/build.xml?rev=822692&r1=822691&r2=822692&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/RuntimeRegistration/build.xml (original)
+++ incubator/wink/trunk/wink-examples/ext/RuntimeRegistration/build.xml Wed Oct 7 12:28:49 2009
@@ -19,65 +19,65 @@
-->
<project name="RuntimeRegistration" default="dist" basedir=".">
- <description>
+ <description>
Ant build file for Wink example RuntimeRegistration
</description>
- <property name="final.war.name" value="RuntimeRegistration.war" />
- <property name="sdk.jar.name" value="@SDK_JAR_NAME@" />
+ <property name="final.war.name" value="RuntimeRegistration.war" />
+ <property name="sdk.jar.name" value="@SDK_JAR_NAME@" />
- <!-- set global properties for this build -->
- <property name="build" location="build" />
- <property name="build.classes" location="${build}/classes" />
- <property name="sdk.base" location="${basedir}/../../.." />
- <property name="sdk.lib" location="${sdk.base}/lib" />
- <property name="sdk.dist" location="${sdk.base}/dist" />
- <property name="sdk.jar" location="${sdk.dist}/${sdk.jar.name}" />
- <property name="final.war" location="${basedir}/${final.war.name}" />
- <property name="main" location="${basedir}/src/main" />
- <property name="webapp" location="${main}/webapp" />
-
-
- <target name="init">
- <!-- Create the time stamp -->
- <tstamp />
- <!-- Create the build directory structure used by compile -->
- <mkdir dir="${build.classes}" />
- </target>
-
-
- <target name="compile" depends="init" description="compile the source ">
- <!-- Set classpath for SDK lib -->
- <path id="sdk.classpath">
- <fileset dir="${sdk.lib}" includes="**/*.jar" />
- <pathelement path="${sdk.jar}" />
- </path>
-
- <!-- Compile the java code -->
- <javac srcdir="${main}/java" destdir="${build.classes}">
- <classpath refid="sdk.classpath" />
- </javac>
- </target>
-
-
- <target name="dist" depends="compile" description="generate the distribution">
-
- <!-- Create the war file -->
- <war destfile="${final.war}" webxml="${webapp}/WEB-INF/web.xml">
- <webinf dir="${webapp}/WEB-INF" includes="**/*" />
- <classes dir="${build.classes}" includes="**/*" />
- <lib dir="${sdk.lib}" includes="*.jar" excludes="spring*.jar"/>
- <lib file="${sdk.jar}" />
- <fileset dir="src/main/webapp" includes="*.html" />
- </war>
- </target>
-
-
- <target name="clean" description="clean up">
- <!-- Delete the ${build} and ${dist} directory trees -->
- <delete dir="${build}" />
- <delete file="${final.war}" />
- </target>
+ <!-- set global properties for this build -->
+ <property name="build" location="build" />
+ <property name="build.classes" location="${build}/classes" />
+ <property name="sdk.base" location="${basedir}/../../.." />
+ <property name="sdk.lib" location="${sdk.base}/lib" />
+ <property name="examples.lib" location="${sdk.base}/examples/lib" />
+ <property name="sdk.dist" location="${sdk.base}/dist" />
+ <property name="sdk.jar" location="${sdk.dist}/${sdk.jar.name}" />
+ <property name="final.war" location="${basedir}/${final.war.name}" />
+ <property name="main" location="${basedir}/src/main" />
+ <property name="webapp" location="${main}/webapp" />
+
+
+ <target name="init">
+ <!-- Create the build directory structure used by compile -->
+ <mkdir dir="${build.classes}" />
+ </target>
+
+
+ <target name="compile" depends="init" description="compile the source ">
+ <!-- Set classpath for SDK lib -->
+ <path id="sdk.classpath">
+ <fileset dir="${sdk.lib}" includes="**/*.jar" />
+ <fileset dir="${examples.lib}" includes="geronimo-j2ee_1.4_spec-1.1.jar" />
+ <pathelement path="${sdk.jar}" />
+ </path>
+
+ <!-- Compile the java code -->
+ <javac srcdir="${main}/java" destdir="${build.classes}">
+ <classpath refid="sdk.classpath" />
+ </javac>
+ </target>
+
+
+ <target name="dist" depends="compile" description="generate the distribution">
+
+ <!-- Create the war file -->
+ <war destfile="${final.war}" webxml="${webapp}/WEB-INF/web.xml">
+ <webinf dir="${webapp}/WEB-INF" includes="**/*" />
+ <classes dir="${build.classes}" includes="**/*" />
+ <lib dir="${sdk.lib}" includes="*.jar" />
+ <lib file="${sdk.jar}" />
+ <fileset dir="src/main/webapp" includes="*.html" />
+ </war>
+ </target>
+
+
+ <target name="clean" description="clean up">
+ <!-- Delete the ${build} and ${dist} directory trees -->
+ <delete dir="${build}" />
+ <delete file="${final.war}" />
+ </target>
</project>
Modified: incubator/wink/trunk/wink-examples/ext/WebDAV/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/WebDAV/build.xml?rev=822692&r1=822691&r2=822692&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/WebDAV/build.xml (original)
+++ incubator/wink/trunk/wink-examples/ext/WebDAV/build.xml Wed Oct 7 12:28:49 2009
@@ -33,6 +33,7 @@
<property name="sdk.base" location="${basedir}/../../.." />
<property name="sdk.lib" location="${sdk.base}/lib" />
<property name="sdk.dist" location="${sdk.base}/dist" />
+ <property name="examples.lib" location="${sdk.base}/examples/lib" />
<property name="sdk.jar" location="${sdk.dist}/${sdk.jar.name}" />
<property name="final.war" location="${basedir}/${final.war.name}" />
<property name="main" location="${basedir}/src/main" />
@@ -45,8 +46,6 @@
<target name="init">
- <!-- Create the time stamp -->
- <tstamp />
<!-- Create the build directory structure used by compile -->
<mkdir dir="${build.classes}" />
</target>
@@ -58,6 +57,7 @@
<path id="sdk.classpath">
<fileset dir="${sdk.lib}" includes="**/*.jar" />
<pathelement path="${sdk.jar}" />
+ <fileset dir="${examples.lib}" includes="geronimo-j2ee_1.4_spec-1.1.jar" />
</path>
<!-- Compile the java code -->
@@ -65,7 +65,6 @@
<src path="${main}/java" />
<src path="${qadefect.main}/java" />
<classpath refid="sdk.classpath" />
-
</javac>
</target>
@@ -80,7 +79,7 @@
<fileset dir="${qadefect.webapp}" includes="**/*" />
<classes dir="${build.classes}" includes="**/*" />
<classes dir="${qadefect.resources}" includes="**/*" />
- <lib dir="${sdk.lib}" includes="*.jar" excludes="spring*.jar"/>
+ <lib dir="${sdk.lib}" includes="*.jar" />
<lib file="${sdk.jar}" />
</war>
</target>