You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by fh...@apache.org on 2008/11/11 16:58:23 UTC
svn commit: r713070 - in /tomcat/trunk: ./ java/org/apache/cometd/
java/org/apache/tomcat/bayeux/ modules/bayeux/ modules/bayeux/java/
modules/bayeux/java/org/ modules/bayeux/java/org/apache/
modules/bayeux/java/org/apache/cometd/ modules/bayeux/java/o...
Author: fhanik
Date: Tue Nov 11 07:58:23 2008
New Revision: 713070
URL: http://svn.apache.org/viewvc?rev=713070&view=rev
Log:
Move the bayeux to a separate module
Added:
tomcat/trunk/modules/bayeux/
tomcat/trunk/modules/bayeux/.classpath
tomcat/trunk/modules/bayeux/.project
tomcat/trunk/modules/bayeux/build.xml
tomcat/trunk/modules/bayeux/java/
tomcat/trunk/modules/bayeux/java/org/
tomcat/trunk/modules/bayeux/java/org/apache/
tomcat/trunk/modules/bayeux/java/org/apache/cometd/
- copied from r713063, tomcat/trunk/java/org/apache/cometd/
tomcat/trunk/modules/bayeux/java/org/apache/tomcat/
tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/
- copied from r713063, tomcat/trunk/java/org/apache/tomcat/bayeux/
tomcat/trunk/modules/bayeux/test/
tomcat/trunk/modules/bayeux/test/org/
tomcat/trunk/modules/bayeux/test/org/apache/
tomcat/trunk/modules/bayeux/test/org/apache/cometd/
tomcat/trunk/modules/bayeux/test/org/apache/cometd/bayeux/
tomcat/trunk/modules/bayeux/test/org/apache/cometd/bayeux/samples/
- copied from r713063, tomcat/trunk/test/org/apache/cometd/bayeux/samples/
tomcat/trunk/modules/bayeux/webapps/
tomcat/trunk/modules/bayeux/webapps/cometd/
- copied from r713063, tomcat/trunk/webapps/cometd/
Removed:
tomcat/trunk/java/org/apache/cometd/
tomcat/trunk/java/org/apache/tomcat/bayeux/
tomcat/trunk/test/org/apache/cometd/bayeux/samples/
tomcat/trunk/webapps/cometd/
Modified:
tomcat/trunk/.classpath
tomcat/trunk/extras.xml
Modified: tomcat/trunk/.classpath
URL: http://svn.apache.org/viewvc/tomcat/trunk/.classpath?rev=713070&r1=713069&r2=713070&view=diff
==============================================================================
--- tomcat/trunk/.classpath (original)
+++ tomcat/trunk/.classpath Tue Nov 11 07:58:23 2008
@@ -1,20 +1,4 @@
<?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.
--->
<classpath>
<classpathentry excluding="**/.svn/**|org/apache/naming/factory/webservices/" kind="src" path="java"/>
<classpathentry kind="src" path="test"/>
@@ -24,5 +8,7 @@
<classpathentry kind="var" path="TOMCAT_LIBS_BASE/json-20080701/json.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
+ <classpathentry kind="lib" path="output/extras/webservices/jaxrpc.jar"/>
+ <classpathentry kind="lib" path="output/extras/webservices/wsdl4j.jar"/>
<classpathentry kind="output" path=".settings/output"/>
</classpath>
Modified: tomcat/trunk/extras.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/extras.xml?rev=713070&r1=713069&r2=713070&view=diff
==============================================================================
--- tomcat/trunk/extras.xml (original)
+++ tomcat/trunk/extras.xml Tue Nov 11 07:58:23 2008
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Tomcat 6.0" default="extras" basedir=".">
+<project name="Tomcat 6.0" default="extras" basedir="../..">
<!-- ===================== Initialize Property Values =================== -->
@@ -80,11 +80,6 @@
<property name="tomcat-juli-adapters.jar" value="${tomcat.extras}/tomcat-juli-adapters.jar"/>
<property name="catalina-ws.jar" value="${tomcat.extras}/catalina-ws.jar"/>
- <property name="cometd-api.jar" value="${tomcat.extras}/cometd-api.jar"/>
- <property name="tomcat-bayeux.jar" value="${tomcat.extras}/tomcat-bayeux.jar"/>
- <property name="cometd.war" value="${tomcat.extras}/cometd.war"/>
- <property name="tomcat-bayeux-samples.jar" value="${tomcat.extras}/tomcat-bayeux-samples.jar"/>
-
<property name="catalina-jmx-remote.jar" value="${tomcat.extras}/catalina-jmx-remote.jar"/>
<!-- Classpath -->
@@ -230,112 +225,6 @@
</target>
- <target name="bayeux">
- <mkdir dir="${tomcat.extras}"/>
-
- <antcall target="downloadgz">
- <param name="sourcefile" value="${dojo-js.loc}"/>
- <param name="destfile" value="${dojo-js.jar}"/>
- </antcall>
-
- <copy todir="${tomcat.extras}" file="${json-lib.home}/${json-lib.jar}"/>
- <!-- Classpath -->
- <path id="tomcat.bayeux.classpath">
- <pathelement path="${tomcat.classpath}"/>
- <pathelement path="${json-lib.home}/${json-lib.jar}"/>
- </path>
-
- <!-- compile org.apache.tomcat.bayeux -->
- <!-- compile org.apache.cometd -->
- <javac srcdir="java" destdir="${tomcat.classes}"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- source="${compile.source}"
- optimize="${compile.optimize}">
- <classpath refid="tomcat.bayeux.classpath" />
- <include name="org/apache/tomcat/bayeux/**" />
- <include name="org/apache/cometd/**" />
- </javac>
-
- <!-- Cometd API JAR File -->
- <jar jarfile="${cometd-api.jar}">
- <fileset dir="${tomcat.classes}">
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- <include name="org/apache/cometd/**" />
- </fileset>
- </jar>
- <!-- Cometd API JAR File -->
- <jar jarfile="${tomcat-bayeux.jar}">
- <fileset dir="${tomcat.classes}">
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- <include name="org/apache/tomcat/bayeux/**" />
- </fileset>
- </jar>
-
- <!-- cometd samples application -->
- <javac srcdir="test" destdir="${tomcat.classes}"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- source="${compile.source}"
- optimize="${compile.optimize}">
- <classpath refid="tomcat.bayeux.classpath" />
- <include name="org/apache/tomcat/bayeux/**" />
- <include name="org/apache/cometd/**" />
- </javac>
-
- <!-- Cometd samples JAR File -->
- <jar jarfile="${tomcat-bayeux-samples.jar}">
- <fileset dir="${tomcat.classes}">
- <exclude name="**/package.html" />
- <exclude name="**/LocalStrings_*" />
- <include name="org/apache/cometd/bayeux/samples/**" />
- </fileset>
- </jar>
-
- <!-- build samples webapplication /cometd -->
- <property name="cometd-app" value="${base.path}/cometd"/>
- <mkdir dir="${cometd-app}"/>
-
- <copy todir="${cometd-app}">
- <fileset dir="${basedir}/webapps/cometd">
- <include name="**/**"/>
- </fileset>
- <fileset dir="${dojo-js.home}">
- <include name="dojo/**"/>
- <include name="dojox/**"/>
- </fileset>
- </copy>
- <mkdir dir="${cometd-app}/WEB-INF/lib"/>
- <copy todir="${cometd-app}/WEB-INF/lib" file="${tomcat-bayeux-samples.jar}"/>
-
- <zip zipfile="${cometd.war}">
- <fileset dir="${cometd-app}">
- <include name="**/**"/>
- </fileset>
- </zip>
-
- <delete dir="${cometd-app}"/>
-
- <!-- create checksums -->
- <checksum file="${cometd-api.jar}" forceOverwrite="yes" fileext=".md5" />
- <checksum file="${tomcat-bayeux.jar}" forceOverwrite="yes" fileext=".md5" />
- <checksum file="${cometd.war}" forceOverwrite="yes" fileext=".md5" />
- <checksum file="${tomcat.extras}/${json-lib.jar}" forceOverwrite="yes" fileext=".md5" />
-
- <!-- print out how to -->
- <echo>You've built the Tomcat Bayeux libraries, simply add the following libraries to your CATALINA_HOME/lib directory:
- ${cometd-api.jar}
- ${tomcat-bayeux.jar}
- ${tomcat.extras}/${json-lib.jar}
-To run the sample application, copy the following applications into your CATALINA_BASE/webapps directory
- ${cometd.war}
- </echo>
- </target>
-
-
-
<target name="jmx-remote" >
<!-- Create the JAR file -->
<jar jarfile="${catalina-jmx-remote.jar}">
@@ -349,7 +238,7 @@
</target>
- <target name="extras" depends="prepare,commons-logging,webservices,bayeux,jmx-remote">
+ <target name="extras" depends="prepare,commons-logging,webservices,jmx-remote">
</target>
<!-- Download and dependency building -->
Added: tomcat/trunk/modules/bayeux/.classpath
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/bayeux/.classpath?rev=713070&view=auto
==============================================================================
--- tomcat/trunk/modules/bayeux/.classpath (added)
+++ tomcat/trunk/modules/bayeux/.classpath Tue Nov 11 07:58:23 2008
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="java"/>
+ <classpathentry kind="src" path="test"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/tomcat-trunk"/>
+ <classpathentry kind="var" path="TOMCAT_LIBS_BASE/json-20080701/json.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: tomcat/trunk/modules/bayeux/.project
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/bayeux/.project?rev=713070&view=auto
==============================================================================
--- tomcat/trunk/modules/bayeux/.project (added)
+++ tomcat/trunk/modules/bayeux/.project Tue Nov 11 07:58:23 2008
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>tomcat-bayeux</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: tomcat/trunk/modules/bayeux/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/bayeux/build.xml?rev=713070&view=auto
==============================================================================
--- tomcat/trunk/modules/bayeux/build.xml (added)
+++ tomcat/trunk/modules/bayeux/build.xml Tue Nov 11 07:58:23 2008
@@ -0,0 +1,222 @@
+<?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="Tomcat 6.0" default="bayeux" basedir="../..">
+
+
+ <!-- ===================== Initialize Property Values =================== -->
+
+ <!-- See "build.properties.sample" in the top level directory for all -->
+ <!-- property values you must customize for successful building!!! -->
+ <property file="${user.home}/build.properties"/>
+ <property file="${basedir}/build.properties"/>
+ <property file="${basedir}/build.properties.default"/>
+
+ <!-- Project Properties -->
+ <property name="project" value="apache-tomcat" />
+ <property name="name" value="Apache Tomcat" />
+ <property name="year" value="2008" />
+ <property name="version.major" value="6" />
+ <property name="version.minor" value="0" />
+ <property name="version.build" value="0" />
+ <property name="version.patch" value="0" />
+ <property name="version.suffix" value="-dev" />
+
+ <property name="version" value="${version.major}.${version.minor}.${version.build}${version.suffix}" />
+ <property name="version.number" value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
+ <property name="version.major.minor" value="${version.major}.${version.minor}" />
+
+ <property name="final.name" value="${project}-${version}" />
+ <property name="final-src.name" value="${project}-${version}-src" />
+
+ <!-- Build Defaults -->
+ <property name="tomcat.build" value="${basedir}/output/build"/>
+ <property name="tomcat.classes" value="${basedir}/output/classes"/>
+ <property name="tomcat.dist" value="${basedir}/output/dist"/>
+ <property name="tomcat.extras" value="${basedir}/output/extras"/>
+ <property name="tomcat.deployer" value="${basedir}/output/deployer"/>
+ <property name="tomcat.release" value="${basedir}/output/release"/>
+ <property name="test.failonerror" value="true"/>
+ <property name="test.runner" value="junit.textui.TestRunner"/>
+
+ <!-- Can't be lower - jsp uses templates -->
+ <property name="compile.source" value="1.5"/>
+
+ <!-- JAR artifacts -->
+ <property name="cometd-api.jar" value="${tomcat.extras}/cometd-api.jar"/>
+ <property name="tomcat-bayeux.jar" value="${tomcat.extras}/tomcat-bayeux.jar"/>
+ <property name="cometd.war" value="${tomcat.extras}/cometd.war"/>
+ <property name="tomcat-bayeux-samples.jar" value="${tomcat.extras}/tomcat-bayeux-samples.jar"/>
+
+ <!-- Classpath -->
+ <path id="tomcat.classpath">
+ <pathelement location="${tomcat.classes}"/>
+ </path>
+
+ <target name="prepare">
+ <mkdir dir="${tomcat.extras}"/>
+ </target>
+
+ <target name="clean">
+ <delete dir="${tomcat.extras}"/>
+ </target>
+
+
+ <target name="bayeux">
+ <mkdir dir="${tomcat.extras}"/>
+
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${dojo-js.loc}"/>
+ <param name="destfile" value="${dojo-js.jar}"/>
+ </antcall>
+
+ <copy todir="${tomcat.extras}" file="${json-lib.home}/${json-lib.jar}"/>
+ <!-- Classpath -->
+ <path id="tomcat.bayeux.classpath">
+ <pathelement path="${tomcat.classpath}"/>
+ <pathelement path="${json-lib.home}/${json-lib.jar}"/>
+ </path>
+
+ <!-- compile org.apache.tomcat.bayeux -->
+ <!-- compile org.apache.cometd -->
+ <javac srcdir="java" destdir="${tomcat.classes}"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ source="${compile.source}"
+ optimize="${compile.optimize}">
+ <classpath refid="tomcat.bayeux.classpath" />
+ <include name="org/apache/tomcat/bayeux/**" />
+ <include name="org/apache/cometd/**" />
+ </javac>
+
+ <!-- Cometd API JAR File -->
+ <jar jarfile="${cometd-api.jar}">
+ <fileset dir="${tomcat.classes}">
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ <include name="org/apache/cometd/**" />
+ </fileset>
+ </jar>
+ <!-- Cometd API JAR File -->
+ <jar jarfile="${tomcat-bayeux.jar}">
+ <fileset dir="${tomcat.classes}">
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ <include name="org/apache/tomcat/bayeux/**" />
+ </fileset>
+ </jar>
+
+ <!-- cometd samples application -->
+ <javac srcdir="test" destdir="${tomcat.classes}"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ source="${compile.source}"
+ optimize="${compile.optimize}">
+ <classpath refid="tomcat.bayeux.classpath" />
+ <include name="org/apache/tomcat/bayeux/**" />
+ <include name="org/apache/cometd/**" />
+ </javac>
+
+ <!-- Cometd samples JAR File -->
+ <jar jarfile="${tomcat-bayeux-samples.jar}">
+ <fileset dir="${tomcat.classes}">
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ <include name="org/apache/cometd/bayeux/samples/**" />
+ </fileset>
+ </jar>
+
+ <!-- build samples webapplication /cometd -->
+ <property name="cometd-app" value="${base.path}/cometd"/>
+ <mkdir dir="${cometd-app}"/>
+
+ <copy todir="${cometd-app}">
+ <fileset dir="${basedir}/webapps/cometd">
+ <include name="**/**"/>
+ </fileset>
+ <fileset dir="${dojo-js.home}">
+ <include name="dojo/**"/>
+ <include name="dojox/**"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${cometd-app}/WEB-INF/lib"/>
+ <copy todir="${cometd-app}/WEB-INF/lib" file="${tomcat-bayeux-samples.jar}"/>
+
+ <zip zipfile="${cometd.war}">
+ <fileset dir="${cometd-app}">
+ <include name="**/**"/>
+ </fileset>
+ </zip>
+
+ <delete dir="${cometd-app}"/>
+
+ <!-- create checksums -->
+ <checksum file="${cometd-api.jar}" forceOverwrite="yes" fileext=".md5" />
+ <checksum file="${tomcat-bayeux.jar}" forceOverwrite="yes" fileext=".md5" />
+ <checksum file="${cometd.war}" forceOverwrite="yes" fileext=".md5" />
+ <checksum file="${tomcat.extras}/${json-lib.jar}" forceOverwrite="yes" fileext=".md5" />
+
+ <!-- print out how to -->
+ <echo>You've built the Tomcat Bayeux libraries, simply add the following libraries to your CATALINA_HOME/lib directory:
+ ${cometd-api.jar}
+ ${tomcat-bayeux.jar}
+ ${tomcat.extras}/${json-lib.jar}
+To run the sample application, copy the following applications into your CATALINA_BASE/webapps directory
+ ${cometd.war}
+ </echo>
+ </target>
+
+
+
+ <!-- Download and dependency building -->
+ <target name="proxyflags">
+ <!-- check proxy parameters. -->
+ <condition property="useproxy">
+ <equals arg1="${proxy.use}" arg2="on" />
+ </condition>
+ </target>
+
+ <target name="setproxy" depends="proxyflags" if="useproxy">
+ <taskdef name="setproxy"
+ classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" />
+ <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+ proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+ <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+ </target>
+
+ <target name="testexist">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+
+ <target name="downloadfile" unless="exist" depends="setproxy,testexist">
+ <!-- Download extract the file -->
+ <mkdir dir="${destdir}" />
+ <get src="${sourcefile}" dest="${destfile}" />
+ </target>
+
+ <target name="downloadgz" unless="exist" depends="setproxy,testexist">
+ <!-- Download and extract the package -->
+ <get src="${sourcefile}" dest="${base.path}/file.tar.gz" />
+ <gunzip src="${base.path}/file.tar.gz" dest="${base.path}/file.tar"/>
+ <untar src="${base.path}/file.tar" dest="${base.path}"/>
+ <delete file="${base.path}/file.tar"/>
+ <delete file="${base.path}/file.tar.gz"/>
+ </target>
+
+
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org