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 13:34:15 UTC
svn commit: r822672 - in /incubator/wink/trunk: wink-examples/apps/QADefect/
wink-examples/apps/SimpleDefects/ wink-examples/ext/History/
wink-examples/ext/MultiPart/ wink-examples/ext/Spring/
wink-scripts/wink-dist/
Author: elman
Date: Wed Oct 7 11:34:14 2009
New Revision: 822672
URL: http://svn.apache.org/viewvc?rev=822672&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/apps/SimpleDefects/build.xml
incubator/wink/trunk/wink-examples/apps/SimpleDefects/pom.xml
incubator/wink/trunk/wink-examples/ext/History/build.xml
incubator/wink/trunk/wink-examples/ext/History/pom.xml
incubator/wink/trunk/wink-examples/ext/MultiPart/build.xml
incubator/wink/trunk/wink-examples/ext/MultiPart/pom.xml
incubator/wink/trunk/wink-examples/ext/Spring/build.xml
incubator/wink/trunk/wink-examples/ext/Spring/pom.xml
incubator/wink/trunk/wink-scripts/wink-dist/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=822672&r1=822671&r2=822672&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/QADefect/build.xml (original)
+++ incubator/wink/trunk/wink-examples/apps/QADefect/build.xml Wed Oct 7 11:34:14 2009
@@ -19,69 +19,78 @@
-->
<project name="QADefects" default="dist" basedir=".">
- <description>
+ <description>
Ant build file for Wink example QA Defects
</description>
- <property name="final.war.name" value="QADefect.war" />
- <property name="sdk.jar.name" value="@SDK_JAR_NAME@" />
+ <property name="final.war.name" value="QADefect.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" />
- <property name="resources" location="${main}/resources" />
-
-
- <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" basedir="${webapp}" excludes="WEB-INF/**">
-
- <webinf dir="${webapp}/WEB-INF" includes="**/*" />
- <classes dir="${build.classes}" includes="**/*" />
- <classes dir="${resources}" includes="**/*" />
- <lib dir="${sdk.lib}" includes="*.jar" excludes="spring*.jar"/>
- <lib file="${sdk.jar}" />
- </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="build.lib" location="${build}/lib" />
+ <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.json" location="${sdk.base}/ext/wink-json-provider" />
+ <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" />
+ <property name="resources" location="${main}/resources" />
+
+
+ <target name="init">
+ <!-- Create the build directory structure used by compile -->
+ <mkdir dir="${build.classes}" />
+ <mkdir dir="${build.lib}" />
+ </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}" />
+ <fileset dir="${sdk.json}" includes="**/*.jar" />
+ <fileset dir="${examples.lib}" includes="geronimo-j2ee_1.4_spec-1.1.jar" />
+ </path>
+
+ <copy todir="${build.lib}" flatten="true">
+ <fileset dir="${sdk.lib}" includes="**/*.jar" />
+ <fileset file="${sdk.jar}">
+ </fileset>
+ <fileset dir="${sdk.json}" includes="**/*.jar" />
+ </copy>
+
+ <!-- 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">
+ <fileset dir="${webapp}/WEB-INF">
+ <exclude name="WEB-INF" />
+ </fileset>
+ <webinf dir="${webapp}/WEB-INF" includes="**/*" />
+ <classes dir="${build.classes}" includes="**/*" />
+ <lib dir="${build.lib}" includes="*.jar" />
+ </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/apps/SimpleDefects/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/SimpleDefects/build.xml?rev=822672&r1=822671&r2=822672&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/SimpleDefects/build.xml (original)
+++ incubator/wink/trunk/wink-examples/apps/SimpleDefects/build.xml Wed Oct 7 11:34:14 2009
@@ -19,66 +19,72 @@
-->
<project name="SimpleDefects" default="dist" basedir=".">
- <description>
+ <description>
Ant build file for Wink example Simple Defects
</description>
- <property name="final.war.name" value="SimpleDefects.war" />
- <property name="sdk.jar.name" value="@SDK_JAR_NAME@" />
+ <property name="final.war.name" value="SimpleDefects.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" />
- <property name="resources" location="${main}/resources" />
-
-
- <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" basedir="${webapp}" excludes="WEB-INF/**">
-
- <webinf dir="${webapp}/WEB-INF" includes="**/*" />
- <classes dir="${build.classes}" includes="**/*" />
- <lib dir="${sdk.lib}" includes="*.jar" excludes="spring*.jar"/>
- <lib file="${sdk.jar}" />
- </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="build.lib" location="${build}/lib" />
+ <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.json" location="${sdk.base}/ext/wink-json-provider" />
+ <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" />
+ <property name="resources" location="${main}/resources" />
+
+
+ <target name="init">
+ <!-- Create the build directory structure used by compile -->
+ <mkdir dir="${build.classes}" />
+ <mkdir dir="${build.lib}" />
+ </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}" />
+ <fileset dir="${sdk.json}" includes="**/*.jar" />
+ </path>
+
+ <copy todir="${build.lib}" flatten="true">
+ <fileset dir="${sdk.lib}" includes="**/*.jar" />
+ <fileset file="${sdk.jar}">
+ </fileset>
+ <fileset dir="${sdk.json}" includes="**/*.jar" />
+ </copy>
+
+ <!-- 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="${build.lib}" includes="*.jar" />
+ </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/apps/SimpleDefects/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/SimpleDefects/pom.xml?rev=822672&r1=822671&r2=822672&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/SimpleDefects/pom.xml (original)
+++ incubator/wink/trunk/wink-examples/apps/SimpleDefects/pom.xml Wed Oct 7 11:34:14 2009
@@ -1,24 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
+ <!--
+ 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
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!-- Project detailes -->
<modelVersion>4.0.0</modelVersion>
<artifactId>SimpleDefects</artifactId>
@@ -42,12 +41,16 @@
<artifactId>wink-server</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-json-provider</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee_1.4_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-spring-support</artifactId>
- </dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-spring-support</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/wink/trunk/wink-examples/ext/History/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/History/build.xml?rev=822672&r1=822671&r2=822672&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/History/build.xml (original)
+++ incubator/wink/trunk/wink-examples/ext/History/build.xml Wed Oct 7 11:34:14 2009
@@ -19,66 +19,71 @@
-->
<project name="Locking" default="dist" basedir=".">
- <description>
+ <description>
Ant build file for Wink example Simple Defects
</description>
- <property name="final.war.name" value="History.war" />
- <property name="sdk.jar.name" value="@SDK_JAR_NAME@" />
+ <property name="final.war.name" value="History.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" />
- <property name="resources" location="${main}/resources" />
-
-
- <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" basedir="${webapp}" excludes="WEB-INF/**">
-
- <webinf dir="${webapp}/WEB-INF" includes="**/*" />
- <classes dir="${build.classes}" includes="**/*" />
- <lib dir="${sdk.lib}" includes="*.jar" excludes="spring*.jar"/>
- <lib file="${sdk.jar}" />
- </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="build.lib" location="${build}/lib" />
+ <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.json" location="${sdk.base}/ext/wink-json-provider" />
+ <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" />
+ <property name="resources" location="${main}/resources" />
+
+
+ <target name="init">
+ <!-- Create the build directory structure used by compile -->
+ <mkdir dir="${build.classes}" />
+ <mkdir dir="${build.lib}" />
+ </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}" />
+ <fileset dir="${sdk.json}" includes="**/*.jar" />
+ </path>
+
+ <copy todir="${build.lib}" flatten="true">
+ <fileset dir="${sdk.lib}" includes="**/*.jar" />
+ <fileset file="${sdk.jar}">
+ </fileset>
+ <fileset dir="${sdk.json}" includes="**/*.jar" />
+ </copy>
+
+ <!-- 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="${build.lib}" includes="*.jar" />
+ </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/History/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/History/pom.xml?rev=822672&r1=822671&r2=822672&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/History/pom.xml (original)
+++ incubator/wink/trunk/wink-examples/ext/History/pom.xml Wed Oct 7 11:34:14 2009
@@ -1,24 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
+ <!--
+ 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
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!-- Project detailes -->
<modelVersion>4.0.0</modelVersion>
<artifactId>History</artifactId>
@@ -48,11 +47,15 @@
<groupId>org.apache.wink</groupId>
<artifactId>wink-common</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.wink</groupId>
<artifactId>wink-component-test-support</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-json-provider</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
</dependency>
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=822672&r1=822671&r2=822672&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/MultiPart/build.xml (original)
+++ incubator/wink/trunk/wink-examples/ext/MultiPart/build.xml Wed Oct 7 11:34:14 2009
@@ -19,66 +19,74 @@
-->
<project name="MultiPart" default="dist" basedir=".">
- <description>
- Ant build file for Wink example Simple Defects
+ <description>
+ Ant build file for Wink example MultiPart
</description>
- <property name="final.war.name" value="MultiPart.war" />
- <property name="sdk.jar.name" value="@SDK_JAR_NAME@" />
+ <property name="final.war.name" value="MultiPart.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" />
- <property name="resources" location="${main}/resources" />
-
-
- <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" basedir="${webapp}" excludes="WEB-INF/**">
-
- <webinf dir="${webapp}/WEB-INF" includes="**/*" />
- <classes dir="${build.classes}" includes="**/*" />
- <lib dir="${sdk.lib}" includes="*.jar" excludes="spring*.jar"/>
- <lib file="${sdk.jar}" />
- </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="build.lib" location="${build}/lib" />
+ <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.json" location="${sdk.base}/ext/wink-json-provider" />
+ <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" />
+ <property name="resources" location="${main}/resources" />
+
+
+ <target name="init">
+ <!-- Create the build directory structure used by compile -->
+ <mkdir dir="${build.classes}" />
+ <mkdir dir="${build.lib}" />
+ </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}" />
+ <fileset dir="${sdk.json}" includes="**/*.jar" />
+ </path>
+
+ <copy todir="${build.lib}" flatten="true">
+ <fileset dir="${sdk.lib}" includes="**/*.jar" />
+ <fileset file="${sdk.jar}">
+ </fileset>
+ <fileset dir="${sdk.json}" includes="**/*.jar" />
+ </copy>
+
+ <!-- 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">
+ <fileset dir="${webapp}/WEB-INF">
+ <exclude name="WEB-INF" />
+ </fileset>
+ <webinf dir="${webapp}/WEB-INF" includes="**/*" />
+ <classes dir="${build.classes}" includes="**/*" />
+ <lib dir="${build.lib}" includes="*.jar" />
+ </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/MultiPart/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/MultiPart/pom.xml?rev=822672&r1=822671&r2=822672&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/MultiPart/pom.xml (original)
+++ incubator/wink/trunk/wink-examples/ext/MultiPart/pom.xml Wed Oct 7 11:34:14 2009
@@ -1,24 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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
+ <!--
+ 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
+ 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.
+ -->
- 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!-- Project detailes -->
<modelVersion>4.0.0</modelVersion>
<artifactId>MultiPart</artifactId>
@@ -33,7 +32,7 @@
<build>
<finalName>MultiPart</finalName>
</build>
-<!-- Dependency on Wink library -->
+ <!-- Dependency on Wink library -->
<dependencies>
<dependency>
<groupId>org.apache.wink</groupId>
@@ -44,21 +43,25 @@
<artifactId>wink-server</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-component-test-support</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee_1.4_spec</artifactId>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-json-provider</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-component-test-support</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee_1.4_spec</artifactId>
</dependency>
</dependencies>
</project>
Modified: incubator/wink/trunk/wink-examples/ext/Spring/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/Spring/build.xml?rev=822672&r1=822671&r2=822672&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/Spring/build.xml (original)
+++ incubator/wink/trunk/wink-examples/ext/Spring/build.xml Wed Oct 7 11:34:14 2009
@@ -19,67 +19,77 @@
-->
<project name="Spring" default="dist" basedir=".">
- <description>
- Ant build file for Wink example Bookmarks
+ <description>
+ Ant build file for Wink example Spring
</description>
- <property name="final.war.name" value="Spring.war" />
- <property name="sdk.jar.name" value="@SDK_JAR_NAME@" />
+ <property name="final.war.name" value="Spring.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">
- <include name="**/*.xml" />
- <include name="**/*.properties" />
- </webinf>
- <classes dir="${build.classes}" includes="**/*" />
- <lib dir="${sdk.lib}" includes="*.jar" />
- <lib file="${sdk.jar}" />
- </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="build.lib" location="${build}/lib" />
+ <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.json" location="${sdk.base}/ext/wink-json-provider" />
+ <property name="sdk.spring" location="${sdk.base}/ext/wink-spring-support" />
+ <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" />
+ <property name="resources" location="${main}/resources" />
+
+
+ <target name="init">
+ <!-- Create the build directory structure used by compile -->
+ <mkdir dir="${build.classes}" />
+ <mkdir dir="${build.lib}" />
+ </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}" />
+ <fileset dir="${sdk.json}" includes="**/*.jar" />
+ <fileset dir="${sdk.spring}" includes="**/*.jar" />
+ </path>
+
+ <copy todir="${build.lib}" flatten="true">
+ <fileset dir="${sdk.lib}" includes="**/*.jar" />
+ <fileset file="${sdk.jar}">
+ </fileset>
+ <fileset dir="${sdk.json}" includes="**/*.jar" />
+ <fileset dir="${sdk.spring}" includes="**/*.jar" />
+ </copy>
+
+ <!-- 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">
+ <fileset dir="${webapp}/WEB-INF">
+ <exclude name="WEB-INF" />
+ </fileset>
+ <webinf dir="${webapp}/WEB-INF" includes="**/*" />
+ <classes dir="${build.classes}" includes="**/*" />
+ <lib dir="${build.lib}" includes="*.jar" />
+ </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/Spring/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/ext/Spring/pom.xml?rev=822672&r1=822671&r2=822672&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/ext/Spring/pom.xml (original)
+++ incubator/wink/trunk/wink-examples/ext/Spring/pom.xml Wed Oct 7 11:34:14 2009
@@ -1,24 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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
+ <!--
+ 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
+ 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.
+ -->
- 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!-- Project detailes -->
<modelVersion>4.0.0</modelVersion>
<artifactId>Spring</artifactId>
@@ -43,9 +42,13 @@
<groupId>org.apache.wink</groupId>
<artifactId>wink-server</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-spring-support</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-json-provider</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-spring-support</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/wink/trunk/wink-scripts/wink-dist/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-scripts/wink-dist/build.xml?rev=822672&r1=822671&r2=822672&view=diff
==============================================================================
--- incubator/wink/trunk/wink-scripts/wink-dist/build.xml (original)
+++ incubator/wink/trunk/wink-scripts/wink-dist/build.xml Wed Oct 7 11:34:14 2009
@@ -122,14 +122,17 @@
<ant target="copy.pom.dependencies">
<property name="pom.file" value="${project.root}/wink-common/pom.xml" />
<property name="dependency.target" value="${dist.lib}" />
+ <property name="dependency.scope" value="runtime" />
</ant>
<ant target="copy.pom.dependencies">
<property name="pom.file" value="${project.root}/wink-client/pom.xml" />
<property name="dependency.target" value="${dist.lib}" />
+ <property name="dependency.scope" value="runtime" />
</ant>
<ant target="copy.pom.dependencies">
<property name="pom.file" value="${project.root}/wink-server/pom.xml" />
<property name="dependency.target" value="${dist.lib}" />
+ <property name="dependency.scope" value="runtime" />
</ant>
<!-- Delete files that already appear in the distribution -->
@@ -173,6 +176,7 @@
<ant target="copy.pom.dependencies">
<property name="pom.file" value="${extension.folder}/pom.xml" />
<property name="dependency.target" value="${dist.ext}/${extension.name}/lib" />
+ <property name="dependency.scope" value="runtime" />
</ant>
<!-- Delete files that already appear in distribution or main lib -->
@@ -204,7 +208,7 @@
<target name="copy.pom.dependencies">
<echo>"${pom.file}"</echo>
<pom id="maven.project" file="${pom.file}" />
- <dependencies filesetId="dependency.fileset" useScope="runtime">
+ <dependencies filesetId="dependency.fileset" useScope="${dependency.scope}">
<pom refid="maven.project" />
</dependencies>
@@ -306,6 +310,7 @@
<!-- Collect all dependencies -->
<foreach target="copy.pom.dependencies" param="pom.file" delimiter=";">
<param name="dependency.target" value="${dist.examples}/lib" />
+ <param name="dependency.scope" value="compile" />
<path>
<fileset dir="${dist.examples}" id="example.poms">
<include name="**/pom.xml" />