1:41 a.m.
Author: mladen.turk(a)jboss.com
Date: 2008-02-01 02:41:05 -0500 (Fri, 01 Feb 2008)
New Revision: 1319
Added:
trunk/httpd/httpd-2.2/modules/jk/NMAKEmakefile
trunk/httpd/httpd-2.2/modules/jk/NMAKEmodjk
trunk/httpd/httpd-2.2/modules/jk/VERSION
Removed:
trunk/httpd/httpd-2.2/modules/mod_jk/
Log:
Remove mod_jk to jk
Added: trunk/httpd/httpd-2.2/modules/jk/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/modules/jk/NMAKEmakefile (rev 0)
+++ trunk/httpd/httpd-2.2/modules/jk/NMAKEmakefile 2008-02-01 07:41:05 UTC (rev 1319)
@@ -0,0 +1,43 @@
+# Copyright 2001-2007 The Apache Software Foundation or its licensors, as
+# applicable.
+#
+# Licensed 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.
+#
+# ====================================================================
+#
+# NMAKEmakefile Master mod_jk module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <..\..\NMAKEcommon.inc>
+!include <..\..\NMAKEhttpd.inc>
+
+MODULES = \
+ $(SRCDIR)\NMAKEmodjk
+
+$(MODULES):
+ @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install
+
+$(WORKDIR):
+ @$(MAKEWORKDIR)
+
+install: $(WORKDIR) $(MODULES)
+ @xcopy "$(WORKDIR)\*.so" "$(BUILDMOD)" /Y /Q 2>NUL
Property changes on: trunk/httpd/httpd-2.2/modules/jk/NMAKEmakefile
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/jk/NMAKEmodjk
===================================================================
--- trunk/httpd/httpd-2.2/modules/jk/NMAKEmodjk (rev 0)
+++ trunk/httpd/httpd-2.2/modules/jk/NMAKEmodjk 2008-02-01 07:41:05 UTC (rev 1319)
@@ -0,0 +1,91 @@
+# Copyright 2001-2007 The Apache Software Foundation or its licensors, as
+# applicable.
+#
+# Licensed 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.
+#
+# ====================================================================
+#
+# NMAKEmakefile jk module makefile.
+#
+# Originally contributed by Mladen Turk <mturk redhat.com>
+#
+# ====================================================================
+#
+
+TARGET=DLL
+PROJECT = mod_jk
+
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <..\..\NMAKEcommon.inc>
+!include <..\..\NMAKEhttpd.inc>
+
+LDIRS = /libpath:"$(BUILDLIB)"
+LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib
$(LIBAPR) $(LIBAPU) $(LIBHTTPD)
+CFLAGS = $(CFLAGS) -DPROXY_DECLARE_EXPORT
+
+INCLUDES = -I$(SRCDIR)\common -I$(BUILDINC)
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).so
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDMFT = $(BUILDBIN).manifest
+
+RCFLAGS = $(RCFLAGS) /d BIN_NAME="$(PROJECT).so" /d LONG_NAME="jk_module
for Apache"
+
+OBJECTS = \
+ $(WORKDIR)\jk_ajp12_worker.obj \
+ $(WORKDIR)\jk_ajp13.obj \
+ $(WORKDIR)\jk_ajp13_worker.obj \
+ $(WORKDIR)\jk_ajp14.obj \
+ $(WORKDIR)\jk_ajp14_worker.obj \
+ $(WORKDIR)\jk_ajp_common.obj \
+ $(WORKDIR)\jk_connect.obj \
+ $(WORKDIR)\jk_context.obj \
+ $(WORKDIR)\jk_lb_worker.obj \
+ $(WORKDIR)\jk_map.obj \
+ $(WORKDIR)\jk_md5.obj \
+ $(WORKDIR)\jk_msg_buff.obj \
+ $(WORKDIR)\jk_pool.obj \
+ $(WORKDIR)\jk_shm.obj \
+ $(WORKDIR)\jk_sockbuf.obj \
+ $(WORKDIR)\jk_status.obj \
+ $(WORKDIR)\jk_uri_worker_map.obj \
+ $(WORKDIR)\jk_url.obj \
+ $(WORKDIR)\jk_util.obj \
+ $(WORKDIR)\jk_worker.obj \
+ $(WORKDIR)\mod_jk.obj
+
+!IF DEFINED(HAVE_JNI) && DEFINED(JAVA_HOME)
+OBJECTS = $(OBJECTS) $(WORKDIR)\jk_jni_worker.obj
+INCLUDES = $(INCLUDES) -I$(JAVA_HOME)\include -I$(JAVA_HOME)\include\win32
+!ENDIF
+
+{$(SRCDIR)\common}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)\apache-2.0}.c{$(WORKDIR)}.obj:
+ $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+$(BUILDRES): ..\..\build\win32\httpd.rc
+ $(RC) $(RCFLAGS) /i "$(BUILDINC)" /fo $(BUILDRES) ..\..\build\win32\httpd.rc
+
+$(BUILDBIN): $(OBJECTS) $(BUILDRES)
+ $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB)
/out:$(BUILDBIN)
+ IF EXIST $(BUILDMFT) \
+ mt -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
+
+install: $(BUILDBIN)
Property changes on: trunk/httpd/httpd-2.2/modules/jk/NMAKEmodjk
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/httpd/httpd-2.2/modules/jk/VERSION
===================================================================
--- trunk/httpd/httpd-2.2/modules/jk/VERSION (rev 0)
+++ trunk/httpd/httpd-2.2/modules/jk/VERSION 2008-02-01 07:41:05 UTC (rev 1319)
@@ -0,0 +1 @@
+1.2.26
Property changes on: trunk/httpd/httpd-2.2/modules/jk/VERSION
___________________________________________________________________
Name: svn:eol-style
+ native