summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apache-commons/download/commons-codec-1.3-src.tar.gzbin0 -> 80427 bytes
-rw-r--r--apache-commons/java/codec/makefile.mk81
-rw-r--r--apache-commons/java/httpclient/makefile.mk84
-rw-r--r--apache-commons/java/lang/makefile.mk81
-rw-r--r--apache-commons/java/logging/makefile.mk85
-rw-r--r--apache-commons/patches/codec.patch17
-rw-r--r--apache-commons/patches/logging.patch25
-rw-r--r--apache-commons/prj/build.lst6
-rw-r--r--apache-commons/prj/d.lst5
-rw-r--r--swext/mediawiki/build.xml7
-rw-r--r--swext/mediawiki/makefile.mk12
-rw-r--r--swext/prj/build.lst2
-rwxr-xr-xtomcat/makefile.mk69
-rwxr-xr-xtomcat/prj/build.lst2
-rwxr-xr-xtomcat/prj/d.lst1
-rw-r--r--tomcat/tomcat.patch36
16 files changed, 503 insertions, 10 deletions
diff --git a/apache-commons/download/commons-codec-1.3-src.tar.gz b/apache-commons/download/commons-codec-1.3-src.tar.gz
new file mode 100644
index 000000000000..13e0063fbdf9
--- /dev/null
+++ b/apache-commons/download/commons-codec-1.3-src.tar.gz
Binary files differ
diff --git a/apache-commons/java/codec/makefile.mk b/apache-commons/java/codec/makefile.mk
new file mode 100644
index 000000000000..4f45192831b4
--- /dev/null
+++ b/apache-commons/java/codec/makefile.mk
@@ -0,0 +1,81 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.1 $
+#
+# last change: $Author: rene $ $Date: 2008-02-04 09:02:06 $
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+# GNU Lesser General Public License Version 2.1
+# =============================================
+# Copyright 2005 by Sun Microsystems, Inc.
+# 901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1, as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=apache-commons
+TARGET=commons-codec
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# override buildfile
+ANT_BUILDFILE=build.xml
+
+.INCLUDE : antsettings.mk
+
+.IF "$(SOLAR_JAVA)" != ""
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=commons-codec-1.3-src
+
+TARFILE_ROOTDIR=commons-codec-1.3
+
+PATCH_FILE_NAME=patches$/codec.patch
+
+#CONVERTFILES=build.xml
+
+OUT2CLASS=dist$/commons-codec-1.3.jar
+
+.IF "$(JAVACISGCJ)"=="yes"
+JAVA_HOME=
+.EXPORT : JAVA_HOME
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+.ELSE
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+.ENDIF
+
+.ENDIF # $(SOLAR_JAVA)!= ""
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+
+.IF "$(SOLAR_JAVA)" != ""
+.INCLUDE : tg_ext.mk
+.ENDIF
+
diff --git a/apache-commons/java/httpclient/makefile.mk b/apache-commons/java/httpclient/makefile.mk
new file mode 100644
index 000000000000..b8ba0ba4309d
--- /dev/null
+++ b/apache-commons/java/httpclient/makefile.mk
@@ -0,0 +1,84 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.1 $
+#
+# last change: $Author: rene $ $Date: 2008-02-04 09:02:06 $
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+# GNU Lesser General Public License Version 2.1
+# =============================================
+# Copyright 2005 by Sun Microsystems, Inc.
+# 901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1, as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=apache-commons
+TARGET=commons-httpclient
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# override buildfile
+ANT_BUILDFILE=build.xml
+
+.INCLUDE : antsettings.mk
+
+.IF "$(SOLAR_JAVA)" != ""
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=commons-httpclient-3.1-src
+
+TARFILE_ROOTDIR=commons-httpclient-3.1
+
+#PATCH_FILE_NAME=patches$/httpclient.patch
+
+#CONVERTFILES=build.xml
+
+OUT2CLASS=dist$/commons-httpclient.jar
+
+COMMONS_LOGGING_JAR=..$/..$/..$/..$/$(INPATH)$/class$/commons-logging-1.1.1-SNAPSHOT.jar
+COMMONS_CODEC_JAR=..$/..$/..$/..$/$/$(INPATH)$/class$/commons-codec-1.3.jar
+
+.IF "$(JAVACISGCJ)"=="yes"
+JAVA_HOME=
+.EXPORT : JAVA_HOME
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist
+.ELSE
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) -Dcommons-codec.jar=$(COMMONS_CODEC_JAR) -f $(ANT_BUILDFILE) dist
+.ENDIF
+
+.ENDIF # $(SOLAR_JAVA)!= ""
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+
+.IF "$(SOLAR_JAVA)" != ""
+.INCLUDE : tg_ext.mk
+.ENDIF
+
diff --git a/apache-commons/java/lang/makefile.mk b/apache-commons/java/lang/makefile.mk
new file mode 100644
index 000000000000..5a6c1f89f803
--- /dev/null
+++ b/apache-commons/java/lang/makefile.mk
@@ -0,0 +1,81 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.1 $
+#
+# last change: $Author: rene $ $Date: 2008-02-04 09:02:06 $
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+# GNU Lesser General Public License Version 2.1
+# =============================================
+# Copyright 2005 by Sun Microsystems, Inc.
+# 901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1, as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=apache-commons
+TARGET=commons-lang
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# override buildfile
+ANT_BUILDFILE=build.xml
+
+.INCLUDE : antsettings.mk
+
+.IF "$(SOLAR_JAVA)" != ""
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=commons-lang-2.3-src
+
+TARFILE_ROOTDIR=commons-lang-2.3-src
+
+#PATCH_FILE_NAME=patches$/logging.patch
+
+#CONVERTFILES=build.xml
+
+OUT2CLASS=dist$/commons-lang-2.3.jar
+
+.IF "$(JAVACISGCJ)"=="yes"
+JAVA_HOME=
+.EXPORT : JAVA_HOME
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar
+.ELSE
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar
+.ENDIF
+
+.ENDIF # $(SOLAR_JAVA)!= ""
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+
+.IF "$(SOLAR_JAVA)" != ""
+.INCLUDE : tg_ext.mk
+.ENDIF
+
diff --git a/apache-commons/java/logging/makefile.mk b/apache-commons/java/logging/makefile.mk
new file mode 100644
index 000000000000..f8488cf6a5a6
--- /dev/null
+++ b/apache-commons/java/logging/makefile.mk
@@ -0,0 +1,85 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.1 $
+#
+# last change: $Author: rene $ $Date: 2008-02-04 09:02:06 $
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+# GNU Lesser General Public License Version 2.1
+# =============================================
+# Copyright 2005 by Sun Microsystems, Inc.
+# 901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1, as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJNAME=apache-commons
+TARGET=commons-logging
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# override buildfile
+ANT_BUILDFILE=build.xml
+
+.INCLUDE : antsettings.mk
+
+.IF "$(SOLAR_JAVA)" != ""
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=commons-logging-1.1.1-src
+
+TARFILE_ROOTDIR=commons-logging-1.1.1-src
+
+PATCH_FILE_NAME=patches$/logging.patch
+
+#CONVERTFILES=build.xml
+
+OUT2CLASS=target$/commons-logging-1.1.1-SNAPSHOT.jar
+
+.IF "$(SYSTEM_TOMCAT)" != "YES"
+SERVLETAPI_JAR := $(SOLARVER)$/$(INPATH)$/bin$/servlet-api.jar
+.ENDIF
+
+.IF "$(JAVACISGCJ)"=="yes"
+JAVA_HOME=
+.EXPORT : JAVA_HOME
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -Dservletapi.jar=$(SERVLETAPI_JAR) -f $(ANT_BUILDFILE) compile build-jar
+.ELSE
+BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) -Dservletapi.jar=$(SERVLETAPI_JAR) compile build-jar
+.ENDIF
+
+.ENDIF # $(SOLAR_JAVA)!= ""
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+
+.IF "$(SOLAR_JAVA)" != ""
+.INCLUDE : tg_ext.mk
+.ENDIF
+
diff --git a/apache-commons/patches/codec.patch b/apache-commons/patches/codec.patch
new file mode 100644
index 000000000000..dea25ad263d2
--- /dev/null
+++ b/apache-commons/patches/codec.patch
@@ -0,0 +1,17 @@
+--- misc/build/commons-codec-1.3/build.xml-old 2008-01-31 15:28:58.000000000 +0100
++++ misc/build/commons-codec-1.3/build.xml 2008-01-31 15:29:21.000000000 +0100
+@@ -90,14 +90,12 @@
+ </target>
+ <target name="dist" depends="compile,javadoc" description="Create binary distribution">
+ <mkdir dir="${dist.home}"/>
+- <copy file="../LICENSE" todir="${dist.home}"/>
+ <copy file="${basedir}/RELEASE-NOTES.txt" todir="${dist.home}"/>
+ <antcall target="jar"/>
+ </target>
+ <target name="jar" depends="compile" description="Create jar">
+ <mkdir dir="${dist.home}"/>
+ <mkdir dir="${build.home}/classes/META-INF"/>
+- <copy file="../LICENSE" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
+ <jar jarfile="${dist.home}/${final.name}.jar" basedir="${build.home}/classes" manifest="${build.home}/conf/MANIFEST.MF"/>
+ </target>
+ <target name="install-jar" depends="jar" description="--> Installs jar file in ${lib.repo}">
diff --git a/apache-commons/patches/logging.patch b/apache-commons/patches/logging.patch
new file mode 100644
index 000000000000..b1c4b6652fa0
--- /dev/null
+++ b/apache-commons/patches/logging.patch
@@ -0,0 +1,25 @@
+*** misc/build/commons-logging-1.1.1-src/build.xml-old 2008-02-01 13:16:54.000000000 +0100
+--- misc/build/commons-logging-1.1.1-src/build.xml 2008-02-01 13:17:09.000000000 +0100
+***************
+*** 127,136 ****
+ <!-- ========== Compiler Defaults ========================================= -->
+
+ <!-- Version of java class files to generate. -->
+! <property name="target.version" value="1.1"/>
+
+ <!-- Version of java source to accept -->
+! <property name="source.version" value="1.2"/>
+
+ <!-- Should Java compilations set the 'debug' compiler option? -->
+ <property name="compile.debug" value="true"/>
+--- 127,136 ----
+ <!-- ========== Compiler Defaults ========================================= -->
+
+ <!-- Version of java class files to generate. -->
+! <property name="target.version" value="1.3"/>
+
+ <!-- Version of java source to accept -->
+! <property name="source.version" value="1.3"/>
+
+ <!-- Should Java compilations set the 'debug' compiler option? -->
+ <property name="compile.debug" value="true"/>
diff --git a/apache-commons/prj/build.lst b/apache-commons/prj/build.lst
new file mode 100644
index 000000000000..ffa3a806d40b
--- /dev/null
+++ b/apache-commons/prj/build.lst
@@ -0,0 +1,6 @@
+ac apache-common : solenv TOMCAT:tomcat NULL
+ac apache-common usr1 - all ac_mkout NULL
+ac apache-commons\java\codec nmake - all ac_codec NULL
+ac apache-commons\java\lang nmake - all ac_lang NULL
+ac apache-commons\java\logging nmake - all ac_logging NULL
+ac apache-commons\java\httpclient nmake - all ac_httpclient ac_logging ac_codec NULL
diff --git a/apache-commons/prj/d.lst b/apache-commons/prj/d.lst
new file mode 100644
index 000000000000..21f6e01700ea
--- /dev/null
+++ b/apache-commons/prj/d.lst
@@ -0,0 +1,5 @@
+..\%__SRC%\class\commons-logging-1.1.1-SNAPSHOT.jar %_DEST%\bin%_EXT%\commons-logging-1.1.1.jar
+..\%__SRC%\class\commons-codec-1.3.jar %_DEST%\bin%_EXT%\commons-codec-1.3.jar
+..\%__SRC%\class\commons-httpclient.jar %_DEST%\bin%_EXT%\commons-httpclient-3.1.jar
+..\%__SRC%\class\commons-lang-2.3.jar %_DEST%\bin%_EXT%\commons-lang-2.3.jar
+
diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml
index ce986abdcd33..c9e65269d64f 100644
--- a/swext/mediawiki/build.xml
+++ b/swext/mediawiki/build.xml
@@ -5,9 +5,9 @@
*
* $RCSfile: build.xml,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: mav $ $Date: 2008-02-01 13:25:30 $
+ * last change: $Author: rene $ $Date: 2008-02-04 09:02:13 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -93,7 +93,8 @@
<target name="jar" depends="compile, init">
<jar basedir="${classes}" compress="true" jarfile="${dist}/${name}.jar">
<manifest>
- <attribute name="Class-Path" value="commons-codec-1.3.jar commons-lang-2.3.jar commons-httpclient-3.0.1.jar commons-logging-1.1.jar"/>
+ <!-- FIXME: Set Class-Path correctly for the system case !-->
+ <attribute name="Class-Path" value="commons-codec-1.3.jar commons-lang-2.3.jar commons-httpclient-3.1.jar commons-logging-1.1.1.jar"/>
<attribute name="RegistrationClassName" value="com.sun.star.wiki.WikiEditorImpl"/>
</manifest>
</jar>
diff --git a/swext/mediawiki/makefile.mk b/swext/mediawiki/makefile.mk
index c2f7ebfe411d..ab5d5ee40e77 100644
--- a/swext/mediawiki/makefile.mk
+++ b/swext/mediawiki/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.4 $
+# $Revision: 1.5 $
#
-# last change: $Author: rene $ $Date: 2008-02-01 10:21:44 $
+# last change: $Author: rene $ $Date: 2008-02-04 09:02:13 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -42,10 +42,10 @@ TARGET=mediawiki
ALLTAR: ANTBUILD
.IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
-COMMONS_CODEC_JAR=jars/commons-codec-1.3.jar
-COMMONS_LANG_JAR=jars/commons-lang-2.3.jar
-COMMONS_HTTPCLIENT_JAR=jars/commons-httpclient-3.0.1.jar
-COMMONS_LOGGING_JAR=jars/commons-logging-1.1.jar
+COMMONS_CODEC_JAR=$(SOLARVER)$/$(INPATH)$/bin$/commons-codec-1.3.jar
+COMMONS_LANG_JAR=$(SOLARVER)$/$(INPATH)$/bin$/commons-lang-2.3.jar
+COMMONS_HTTPCLIENT_JAR=$(SOLARVER)$/$(INPATH)$/bin$/commons-httpclient-3.1.jar
+COMMONS_LOGGING_JAR=$(SOLARVER)$/$(INPATH)$/bin$/commons-logging-1.1.1.jar
.ENDIF
.IF "$(SYSTEM_XML_APIS)" != "YES"
diff --git a/swext/prj/build.lst b/swext/prj/build.lst
index d7e3fe045f6a..44176a3f7224 100644
--- a/swext/prj/build.lst
+++ b/swext/prj/build.lst
@@ -1,4 +1,4 @@
-swext swext : xalan jut javaunohelper ridljar unoil jurt NULL
+swext swext : XALAN:xalan jut javaunohelper ridljar unoil jurt APACHE_COMMONS:apache-commons NULL
swext swext usr1 - all swext_mkout NULL
swext swext\mediawiki nmake - all swext_wiki NULL
diff --git a/tomcat/makefile.mk b/tomcat/makefile.mk
new file mode 100755
index 000000000000..4ab0b35c514e
--- /dev/null
+++ b/tomcat/makefile.mk
@@ -0,0 +1,69 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.mk,v $
+#
+# $Revision: 1.1 $
+#
+# last change: $Author: rene $ $Date: 2008-02-04 09:02:14 $
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+# GNU Lesser General Public License Version 2.1
+# =============================================
+# Copyright 2005 by Sun Microsystems, Inc.
+# 901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1, as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+#*************************************************************************
+
+PRJ=.
+
+PRJNAME=tomacat
+TARGET=servlet
+
+.IF "$(SOLAR_JAVA)" != ""
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=jakarta-tomcat-5.0.30-src
+
+TARFILE_ROOTDIR=jakarta-tomcat-5.0.30-src
+
+#CONVERTFILES=build$/build.xml
+
+PATCH_FILE_NAME=tomcat.patch
+
+BUILD_DIR=jakarta-servletapi-5
+BUILD_ACTION=$(ANT)
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+
+.INCLUDE : tg_ext.mk
+
+.ELSE
+@all:
+ @echo java disabled
+.ENDIF
diff --git a/tomcat/prj/build.lst b/tomcat/prj/build.lst
new file mode 100755
index 000000000000..184f6dd19b3e
--- /dev/null
+++ b/tomcat/prj/build.lst
@@ -0,0 +1,2 @@
+to tomcat : solenv NULL
+to tomcat nmake - all to_mkout NULL
diff --git a/tomcat/prj/d.lst b/tomcat/prj/d.lst
new file mode 100755
index 000000000000..825601e3b2ad
--- /dev/null
+++ b/tomcat/prj/d.lst
@@ -0,0 +1 @@
+..\%__SRC%\misc\build\jakarta-tomcat-5.0.30-src\jakarta-servletapi-5\jsr154\dist\lib\servlet-api.jar %_DEST%\bin%_EXT%\servlet-api.jar
diff --git a/tomcat/tomcat.patch b/tomcat/tomcat.patch
new file mode 100644
index 000000000000..133b67d69fba
--- /dev/null
+++ b/tomcat/tomcat.patch
@@ -0,0 +1,36 @@
+*** /dev/null 2008-02-01 11:10:25.957002171 +0100
+--- misc/build/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/build.xml 2008-02-01 16:10:27.000000000 +0100
+***************
+*** 0 ****
+--- 1,31 ----
++ <project name="jsr152 and jsr154 in Debian" default="debuild" basedir=".">
++
++ <target name="debuild"
++ description="Build jsr154 and jsr152 for Debian (Default)">
++ <echo message="Building Servlet 2.4 API"/>
++ <ant antfile="jsr154/build.xml"
++ target="dist"
++ inheritAll="false"
++ />
++ <echo message="Building JSP 2.0 API"/>
++ <ant antfile="jsr152/build.xml"
++ target="dist"
++ inheritAll="false"
++ />
++ </target>
++
++ <target name="clean" description="Clean">
++ <echo message="Cleaning JSP 2.0 API"/>
++ <ant antfile="jsr152/build.xml"
++ target="clean"
++ inheritAll="false"
++ />
++ <echo message="Cleaning Servlet 2.4 API"/>
++ <ant antfile="jsr154/build.xml"
++ target="clean"
++ inheritAll="false"
++ />
++ <delete dir="tmp"/>
++ </target>
++
++ </project>