From 954ad72fda138721f3a62fd6e39d01f65669f266 Mon Sep 17 00:00:00 2001
From: fhanik <fhanik@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 11 Nov 2008 15:58:23 +0000
Subject: [PATCH] Move the bayeux to a separate module

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@713070 13f79535-47bb-0310-9956-ffa450edef68
---
 .classpath                                         |  18 +-
 extras.xml                                         | 115 +----------
 modules/bayeux/.classpath                          |   9 +
 modules/bayeux/.project                            |  17 ++
 modules/bayeux/build.xml                           | 222 +++++++++++++++++++++
 .../java}/org/apache/cometd/bayeux/Bayeux.java     |   0
 .../java}/org/apache/cometd/bayeux/Channel.java    |   0
 .../java}/org/apache/cometd/bayeux/Client.java     |   0
 .../java}/org/apache/cometd/bayeux/DataFilter.java |   0
 .../java}/org/apache/cometd/bayeux/Listener.java   |   0
 .../java}/org/apache/cometd/bayeux/Message.java    |   0
 .../org/apache/cometd/bayeux/SecurityPolicy.java   |   0
 .../org/apache/tomcat/bayeux/BayeuxException.java  |   0
 .../org/apache/tomcat/bayeux/BayeuxRequest.java    |   0
 .../org/apache/tomcat/bayeux/BayeuxServlet.java    |   0
 .../org/apache/tomcat/bayeux/ChannelImpl.java      |   0
 .../java}/org/apache/tomcat/bayeux/ClientImpl.java |   0
 .../java}/org/apache/tomcat/bayeux/HttpError.java  |   0
 .../org/apache/tomcat/bayeux/MessageImpl.java      |   0
 .../org/apache/tomcat/bayeux/RequestBase.java      |   0
 .../org/apache/tomcat/bayeux/RequestFactory.java   |   0
 .../org/apache/tomcat/bayeux/TomcatBayeux.java     |   0
 .../tomcat/bayeux/request/MetaConnectRequest.java  |   0
 .../bayeux/request/MetaDisconnectRequest.java      |   0
 .../bayeux/request/MetaHandshakeRequest.java       |   0
 .../bayeux/request/MetaSubscribeRequest.java       |   0
 .../bayeux/request/MetaUnsubscribeRequest.java     |   0
 .../tomcat/bayeux/request/PublishRequest.java      |   0
 .../cometd/bayeux/samples/BayeuxStockTicker.java   |   0
 .../cometd/bayeux/samples/EchoChatClient.java      |   0
 .../bayeux/webapps}/cometd/WEB-INF/web.xml         |   0
 .../cometd/examples/simplechat/cometdchat.htm      |   0
 .../cometd/examples/simplechat/ticker.html         |   0
 .../bayeux/webapps}/cometd/index.html              |   0
 34 files changed, 252 insertions(+), 129 deletions(-)
 create mode 100644 modules/bayeux/.classpath
 create mode 100644 modules/bayeux/.project
 create mode 100644 modules/bayeux/build.xml
 rename {java => modules/bayeux/java}/org/apache/cometd/bayeux/Bayeux.java (100%)
 rename {java => modules/bayeux/java}/org/apache/cometd/bayeux/Channel.java (100%)
 rename {java => modules/bayeux/java}/org/apache/cometd/bayeux/Client.java (100%)
 rename {java => modules/bayeux/java}/org/apache/cometd/bayeux/DataFilter.java (100%)
 rename {java => modules/bayeux/java}/org/apache/cometd/bayeux/Listener.java (100%)
 rename {java => modules/bayeux/java}/org/apache/cometd/bayeux/Message.java (100%)
 rename {java => modules/bayeux/java}/org/apache/cometd/bayeux/SecurityPolicy.java (100%)
 rename {java => modules/bayeux/java}/org/apache/tomcat/bayeux/BayeuxException.java (100%)
 rename {java => modules/bayeux/java}/org/apache/tomcat/bayeux/BayeuxRequest.java (100%)
 rename {java => modules/bayeux/java}/org/apache/tomcat/bayeux/BayeuxServlet.java (100%)
 rename {java => modules/bayeux/java}/org/apache/tomcat/bayeux/ChannelImpl.java (100%)
 rename {java => modules/bayeux/java}/org/apache/tomcat/bayeux/ClientImpl.java (100%)
 rename {java => modules/bayeux/java}/org/apache/tomcat/bayeux/HttpError.java (100%)
 rename {java => modules/bayeux/java}/org/apache/tomcat/bayeux/MessageImpl.java (100%)
 rename {java => modules/bayeux/java}/org/apache/tomcat/bayeux/RequestBase.java (100%)
 rename {java => modules/bayeux/java}/org/apache/tomcat/bayeux/RequestFactory.java (100%)
 rename {java => modules/bayeux/java}/org/apache/tomcat/bayeux/TomcatBayeux.java (100%)
 rename {java => modules/bayeux/java}/org/apache/tomcat/bayeux/request/MetaConnectRequest.java (100%)
 rename {java => modules/bayeux/java}/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java (100%)
 rename {java => modules/bayeux/java}/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java (100%)
 rename {java => modules/bayeux/java}/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java (100%)
 rename {java => modules/bayeux/java}/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java (100%)
 rename {java => modules/bayeux/java}/org/apache/tomcat/bayeux/request/PublishRequest.java (100%)
 rename {test => modules/bayeux/test}/org/apache/cometd/bayeux/samples/BayeuxStockTicker.java (100%)
 rename {test => modules/bayeux/test}/org/apache/cometd/bayeux/samples/EchoChatClient.java (100%)
 rename {webapps => modules/bayeux/webapps}/cometd/WEB-INF/web.xml (100%)
 rename {webapps => modules/bayeux/webapps}/cometd/examples/simplechat/cometdchat.htm (100%)
 rename {webapps => modules/bayeux/webapps}/cometd/examples/simplechat/ticker.html (100%)
 rename {webapps => modules/bayeux/webapps}/cometd/index.html (100%)

diff --git a/.classpath b/.classpath
index 071456fad..1cddfd179 100644
--- a/.classpath
+++ b/.classpath
@@ -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>
diff --git a/extras.xml b/extras.xml
index 844531e47..f1dc1324f 100644
--- a/extras.xml
+++ b/extras.xml
@@ -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 @@ To run the sample application, copy the following applications into your CATALIN
 	  
   </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 -->
diff --git a/modules/bayeux/.classpath b/modules/bayeux/.classpath
new file mode 100644
index 000000000..889b127a8
--- /dev/null
+++ b/modules/bayeux/.classpath
@@ -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>
diff --git a/modules/bayeux/.project b/modules/bayeux/.project
new file mode 100644
index 000000000..872599e02
--- /dev/null
+++ b/modules/bayeux/.project
@@ -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>
diff --git a/modules/bayeux/build.xml b/modules/bayeux/build.xml
new file mode 100644
index 000000000..2ac30736d
--- /dev/null
+++ b/modules/bayeux/build.xml
@@ -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>
diff --git a/java/org/apache/cometd/bayeux/Bayeux.java b/modules/bayeux/java/org/apache/cometd/bayeux/Bayeux.java
similarity index 100%
rename from java/org/apache/cometd/bayeux/Bayeux.java
rename to modules/bayeux/java/org/apache/cometd/bayeux/Bayeux.java
diff --git a/java/org/apache/cometd/bayeux/Channel.java b/modules/bayeux/java/org/apache/cometd/bayeux/Channel.java
similarity index 100%
rename from java/org/apache/cometd/bayeux/Channel.java
rename to modules/bayeux/java/org/apache/cometd/bayeux/Channel.java
diff --git a/java/org/apache/cometd/bayeux/Client.java b/modules/bayeux/java/org/apache/cometd/bayeux/Client.java
similarity index 100%
rename from java/org/apache/cometd/bayeux/Client.java
rename to modules/bayeux/java/org/apache/cometd/bayeux/Client.java
diff --git a/java/org/apache/cometd/bayeux/DataFilter.java b/modules/bayeux/java/org/apache/cometd/bayeux/DataFilter.java
similarity index 100%
rename from java/org/apache/cometd/bayeux/DataFilter.java
rename to modules/bayeux/java/org/apache/cometd/bayeux/DataFilter.java
diff --git a/java/org/apache/cometd/bayeux/Listener.java b/modules/bayeux/java/org/apache/cometd/bayeux/Listener.java
similarity index 100%
rename from java/org/apache/cometd/bayeux/Listener.java
rename to modules/bayeux/java/org/apache/cometd/bayeux/Listener.java
diff --git a/java/org/apache/cometd/bayeux/Message.java b/modules/bayeux/java/org/apache/cometd/bayeux/Message.java
similarity index 100%
rename from java/org/apache/cometd/bayeux/Message.java
rename to modules/bayeux/java/org/apache/cometd/bayeux/Message.java
diff --git a/java/org/apache/cometd/bayeux/SecurityPolicy.java b/modules/bayeux/java/org/apache/cometd/bayeux/SecurityPolicy.java
similarity index 100%
rename from java/org/apache/cometd/bayeux/SecurityPolicy.java
rename to modules/bayeux/java/org/apache/cometd/bayeux/SecurityPolicy.java
diff --git a/java/org/apache/tomcat/bayeux/BayeuxException.java b/modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxException.java
similarity index 100%
rename from java/org/apache/tomcat/bayeux/BayeuxException.java
rename to modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxException.java
diff --git a/java/org/apache/tomcat/bayeux/BayeuxRequest.java b/modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxRequest.java
similarity index 100%
rename from java/org/apache/tomcat/bayeux/BayeuxRequest.java
rename to modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxRequest.java
diff --git a/java/org/apache/tomcat/bayeux/BayeuxServlet.java b/modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxServlet.java
similarity index 100%
rename from java/org/apache/tomcat/bayeux/BayeuxServlet.java
rename to modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxServlet.java
diff --git a/java/org/apache/tomcat/bayeux/ChannelImpl.java b/modules/bayeux/java/org/apache/tomcat/bayeux/ChannelImpl.java
similarity index 100%
rename from java/org/apache/tomcat/bayeux/ChannelImpl.java
rename to modules/bayeux/java/org/apache/tomcat/bayeux/ChannelImpl.java
diff --git a/java/org/apache/tomcat/bayeux/ClientImpl.java b/modules/bayeux/java/org/apache/tomcat/bayeux/ClientImpl.java
similarity index 100%
rename from java/org/apache/tomcat/bayeux/ClientImpl.java
rename to modules/bayeux/java/org/apache/tomcat/bayeux/ClientImpl.java
diff --git a/java/org/apache/tomcat/bayeux/HttpError.java b/modules/bayeux/java/org/apache/tomcat/bayeux/HttpError.java
similarity index 100%
rename from java/org/apache/tomcat/bayeux/HttpError.java
rename to modules/bayeux/java/org/apache/tomcat/bayeux/HttpError.java
diff --git a/java/org/apache/tomcat/bayeux/MessageImpl.java b/modules/bayeux/java/org/apache/tomcat/bayeux/MessageImpl.java
similarity index 100%
rename from java/org/apache/tomcat/bayeux/MessageImpl.java
rename to modules/bayeux/java/org/apache/tomcat/bayeux/MessageImpl.java
diff --git a/java/org/apache/tomcat/bayeux/RequestBase.java b/modules/bayeux/java/org/apache/tomcat/bayeux/RequestBase.java
similarity index 100%
rename from java/org/apache/tomcat/bayeux/RequestBase.java
rename to modules/bayeux/java/org/apache/tomcat/bayeux/RequestBase.java
diff --git a/java/org/apache/tomcat/bayeux/RequestFactory.java b/modules/bayeux/java/org/apache/tomcat/bayeux/RequestFactory.java
similarity index 100%
rename from java/org/apache/tomcat/bayeux/RequestFactory.java
rename to modules/bayeux/java/org/apache/tomcat/bayeux/RequestFactory.java
diff --git a/java/org/apache/tomcat/bayeux/TomcatBayeux.java b/modules/bayeux/java/org/apache/tomcat/bayeux/TomcatBayeux.java
similarity index 100%
rename from java/org/apache/tomcat/bayeux/TomcatBayeux.java
rename to modules/bayeux/java/org/apache/tomcat/bayeux/TomcatBayeux.java
diff --git a/java/org/apache/tomcat/bayeux/request/MetaConnectRequest.java b/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaConnectRequest.java
similarity index 100%
rename from java/org/apache/tomcat/bayeux/request/MetaConnectRequest.java
rename to modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaConnectRequest.java
diff --git a/java/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java b/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java
similarity index 100%
rename from java/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java
rename to modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaDisconnectRequest.java
diff --git a/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java b/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java
similarity index 100%
rename from java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java
rename to modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaHandshakeRequest.java
diff --git a/java/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java b/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java
similarity index 100%
rename from java/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java
rename to modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaSubscribeRequest.java
diff --git a/java/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java b/modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java
similarity index 100%
rename from java/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java
rename to modules/bayeux/java/org/apache/tomcat/bayeux/request/MetaUnsubscribeRequest.java
diff --git a/java/org/apache/tomcat/bayeux/request/PublishRequest.java b/modules/bayeux/java/org/apache/tomcat/bayeux/request/PublishRequest.java
similarity index 100%
rename from java/org/apache/tomcat/bayeux/request/PublishRequest.java
rename to modules/bayeux/java/org/apache/tomcat/bayeux/request/PublishRequest.java
diff --git a/test/org/apache/cometd/bayeux/samples/BayeuxStockTicker.java b/modules/bayeux/test/org/apache/cometd/bayeux/samples/BayeuxStockTicker.java
similarity index 100%
rename from test/org/apache/cometd/bayeux/samples/BayeuxStockTicker.java
rename to modules/bayeux/test/org/apache/cometd/bayeux/samples/BayeuxStockTicker.java
diff --git a/test/org/apache/cometd/bayeux/samples/EchoChatClient.java b/modules/bayeux/test/org/apache/cometd/bayeux/samples/EchoChatClient.java
similarity index 100%
rename from test/org/apache/cometd/bayeux/samples/EchoChatClient.java
rename to modules/bayeux/test/org/apache/cometd/bayeux/samples/EchoChatClient.java
diff --git a/webapps/cometd/WEB-INF/web.xml b/modules/bayeux/webapps/cometd/WEB-INF/web.xml
similarity index 100%
rename from webapps/cometd/WEB-INF/web.xml
rename to modules/bayeux/webapps/cometd/WEB-INF/web.xml
diff --git a/webapps/cometd/examples/simplechat/cometdchat.htm b/modules/bayeux/webapps/cometd/examples/simplechat/cometdchat.htm
similarity index 100%
rename from webapps/cometd/examples/simplechat/cometdchat.htm
rename to modules/bayeux/webapps/cometd/examples/simplechat/cometdchat.htm
diff --git a/webapps/cometd/examples/simplechat/ticker.html b/modules/bayeux/webapps/cometd/examples/simplechat/ticker.html
similarity index 100%
rename from webapps/cometd/examples/simplechat/ticker.html
rename to modules/bayeux/webapps/cometd/examples/simplechat/ticker.html
diff --git a/webapps/cometd/index.html b/modules/bayeux/webapps/cometd/index.html
similarity index 100%
rename from webapps/cometd/index.html
rename to modules/bayeux/webapps/cometd/index.html
-- 
2.11.0