[Bug 64521] New: avoid moving i18n translations into classes dir since they are packaged into separate jars

2020-06-13 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64521

Bug ID: 64521
   Summary: avoid moving i18n translations into classes dir since
they are packaged into separate jars
   Product: Tomcat 10
   Version: unspecified
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Packaging
  Assignee: dev@tomcat.apache.org
  Reporter: raymond.a...@liferay.com
  Target Milestone: --

This simplifies a packaging complexity later when bnd is used more extensively.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[GitHub] [tomcat] rotty3000 opened a new pull request #300: Fix BZ 64521 - avoid moving i18n translations into classes dir since …

2020-06-13 Thread GitBox


rotty3000 opened a new pull request #300:
URL: https://github.com/apache/tomcat/pull/300


   …they are packaged into separate jars
   
   Signed-off-by: Raymond Augé 



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64521] avoid moving i18n translations into classes dir since they are packaged into separate jars

2020-06-13 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64521

--- Comment #1 from rotty3000  ---
https://github.com/apache/tomcat/pull/300

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64522] New: package jars in effective dependency order

2020-06-13 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64522

Bug ID: 64522
   Summary: package jars in effective dependency order
   Product: Tomcat 10
   Version: unspecified
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Packaging
  Assignee: dev@tomcat.apache.org
  Reporter: raymond.a...@liferay.com
  Target Milestone: --

This will play an important part later when we leverage bnd to help calculate
correct OSGi and JPMS metadata. These calculations will need to look at
dependencies for things like import package versions, module names, etc.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64522] package jars in effective dependency order

2020-06-13 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64522

rotty3000  changed:

   What|Removed |Added

   Hardware|PC  |All
 OS|Linux   |All

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Pass common flags to pcre makefile

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new ef416f7  Pass common flags to pcre makefile
ef416f7 is described below

commit ef416f7a6c5500b3f1232907097b9325b6379b38
Author: Mladen Turk 
AuthorDate: Sat Jun 13 16:59:38 2020 +0200

Pass common flags to pcre makefile
---
 native/iis/Makefile.vc  |  8 
 native/iis/pcre/Makefile.vc | 12 +++-
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/native/iis/Makefile.vc b/native/iis/Makefile.vc
index 4d3de57..817ab50 100644
--- a/native/iis/Makefile.vc
+++ b/native/iis/Makefile.vc
@@ -42,10 +42,10 @@ CLEANTARGET = rd /s /q $(WORKDIR)
 MAKEWORKDIR = md $(WORKDIR)
 NMAKE_WINVER=0x0700
 CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT 
-D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) -DHAVE_CONFIG_H 
$(CPUFLAGS)
-CFLAGS = $(CFLAGS) -DPCRE_STATIC -DJK_ISAPI -DISAPI_EXPORTS
+CFLAGS = $(CFLAGS) -DPCRE_STATIC -DJK_ISAPI -DISAPI_EXPORTS $(EXTRA_CFLAGS)
 CLOPTS = /c /nologo -MD -W3 -O2 -Ob2 -Zi -EHsc
 PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)
-LFLAGS = /nologo /DLL /INCREMENTAL:NO /DEBUG /OPT:REF /SUBSYSTEM:WINDOWS 
/MACHINE:$(MACHINE)
+LFLAGS = /nologo /DLL /INCREMENTAL:NO /DEBUG /OPT:REF /SUBSYSTEM:WINDOWS 
/MACHINE:$(MACHINE) $(EXTRA_LDFLAGS)
 LDLIBS = kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib 
strsafe.lib $(EXTRA_LIBS)
 INCDIR = -I.\pcre -I..\common
 
@@ -84,11 +84,11 @@ $(WORKDIR) :
$(CC) $(CLOPTS) $(CFLAGS) $(INCDIR) $(PDBFLAGS) $<
 
 $(BUILDRES): ..\common\jk.rc
-   $(RC)/l 0x409 /i "..\common" /d "JK_ISAPI" /d "NDEBUG" /fo $(BUILDRES) 
..\common\jk.rc
+   $(RC)/l 0x409 /i ..\common /d JK_ISAPI /d NDEBUG /fo $(BUILDRES) $@
 
 $(PCRELIB):
@cd .\pcre
-   $(MAKE) -f Makefile.vc
+   $(MAKE) -f Makefile.vc NMAKE_WINVER=$(NMAKE_WINVER) 
BUILD_CPU=$(BUILD_CPU) CPUFLAGS="$(CPUFLAGS)"
@if not ERRORLEVEL 0 exit /B 1
@cd ..
 
diff --git a/native/iis/pcre/Makefile.vc b/native/iis/pcre/Makefile.vc
index da07d88..25b05a8 100644
--- a/native/iis/pcre/Makefile.vc
+++ b/native/iis/pcre/Makefile.vc
@@ -23,22 +23,16 @@ MT = mt.exe
 !IF !DEFINED(BUILD_CPU) || "$(BUILD_CPU)" == ""
 !ERROR Must specify BUILD_CPU matching compiler x86 or x64
 !ENDIF
-!IF "$(BUILD_CPU)" == "z86"
-CPUFLAGS = -D_X86_=1
-!ELSE
-CPUFLAGS = -DWIN64 -D_WIN64
-!ENDIF
 
-BUILDLIB = $(WORKDIR)\$(PROJECT).lib
 WORKDIR = $(BUILD_CPU)_RELEASE
+BUILDLIB = $(WORKDIR)\$(PROJECT).lib
 CLEANTARGET = rd /s /q $(WORKDIR)
 MAKEWORKDIR = md $(WORKDIR)
-NMAKE_WINVER=0x0700
 CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT 
-D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER)
-CFLAGS = $(CFLAGS) -DPCRE_STATIC -DHAVE_CONFIG_H $(CPUFLAGS)
+CFLAGS = $(CFLAGS) -DPCRE_STATIC -DHAVE_CONFIG_H $(CPUFLAGS) $(EXTRA_CFLAGS)
 CLOPTS = /c /nologo -MD -W3 -O2 -Ob2 -Zi -EHsc
 PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)
-LFLAGS = -lib /nologo
+LFLAGS = -lib /nologo $(EXTRA_LFLAGS)
 
 OBJECTS = \
$(WORKDIR)\pcre_byte_order.obj \


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Add httpd lib and include to system paths

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 15a6fd0  Add httpd lib and include to system paths
15a6fd0 is described below

commit 15a6fd099f8a640f36b12064ee9db4d76408aaa8
Author: Mladen Turk 
AuthorDate: Sat Jun 13 16:38:37 2020 +0200

Add httpd lib and include to system paths
---
 native/apache-2.0/Makefile.vc | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/native/apache-2.0/Makefile.vc b/native/apache-2.0/Makefile.vc
index 28f0e8f..ad8f18b 100644
--- a/native/apache-2.0/Makefile.vc
+++ b/native/apache-2.0/Makefile.vc
@@ -23,6 +23,15 @@ MT = mt.exe
 !IF !DEFINED(APACHE2_HOME) || "$(APACHE2_HOME)" == ""
 !ERROR Cannot find APACHE2_HOME. Use nmake -f Makefile.vc APACHE2_HOME=dir
 !ENDIF
+!IF !DEFINED(APACHE2_LDIR) || "$(APACHE2_LDIR)" == ""
+APACHE2_LDIR=$(APACHE2_HOME)\lib
+!ENDIF
+!IF !DEFINED(APACHE2_INCS) || "$(APACHE2_INCS)" == ""
+APACHE2_INCS=$(APACHE2_HOME)\include
+!ENDIF
+
+LIB = $(LIB);$(APACHE2_LDIR)
+INCLUDE = $(INCLUDE);$(APACHE2_INCS)
 
 !IF !DEFINED(BUILD_CPU) || "$(BUILD_CPU)" == ""
 !ERROR Must specify BUILD_CPU matching compiler x86 or x64
@@ -52,9 +61,9 @@ CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT 
-D_WIN32_WINNT=$(NMAKE_WINV
 CFLAGS = $(CFLAGS)
 CLOPTS = /c /nologo -MD -W3 -O2 -Ob2 -Zi -EHsc
 PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)
-LFLAGS = /nologo /DLL /INCREMENTAL:NO /DEBUG /OPT:REF /SUBSYSTEM:WINDOWS 
/MACHINE:$(MACHINE) /libpath:$(APACHE2_HOME)\lib
+LFLAGS = /nologo /DLL /INCREMENTAL:NO /DEBUG /OPT:REF /SUBSYSTEM:WINDOWS 
/MACHINE:$(MACHINE)
 LDLIBS = kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib 
$(APACHE2_LIBS) $(EXTRA_LIBS)
-INCDIR = -I..\common -I$(APACHE2_HOME)\include
+INCDIR = -I..\common
 
 OBJECTS = \
$(WORKDIR)\jk_ajp12_worker.obj \


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Add support for EXTRA_LDFLAGS nad EXTRA_CFLAGS

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new b765083  Add support for EXTRA_LDFLAGS nad EXTRA_CFLAGS
b765083 is described below

commit b7650833fa497cb24317d7981a48255be4d408b9
Author: Mladen Turk 
AuthorDate: Sat Jun 13 16:48:24 2020 +0200

Add support for EXTRA_LDFLAGS nad EXTRA_CFLAGS
---
 native/apache-2.0/Makefile.vc | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/native/apache-2.0/Makefile.vc b/native/apache-2.0/Makefile.vc
index ad8f18b..8084f7d 100644
--- a/native/apache-2.0/Makefile.vc
+++ b/native/apache-2.0/Makefile.vc
@@ -26,12 +26,12 @@ MT = mt.exe
 !IF !DEFINED(APACHE2_LDIR) || "$(APACHE2_LDIR)" == ""
 APACHE2_LDIR=$(APACHE2_HOME)\lib
 !ENDIF
-!IF !DEFINED(APACHE2_INCS) || "$(APACHE2_INCS)" == ""
-APACHE2_INCS=$(APACHE2_HOME)\include
+!IF !DEFINED(APACHE2_IDIR) || "$(APACHE2_IDIR)" == ""
+APACHE2_IDIR=$(APACHE2_HOME)\include
 !ENDIF
 
 LIB = $(LIB);$(APACHE2_LDIR)
-INCLUDE = $(INCLUDE);$(APACHE2_INCS)
+INCLUDE = $(INCLUDE);$(APACHE2_IDIR)
 
 !IF !DEFINED(BUILD_CPU) || "$(BUILD_CPU)" == ""
 !ERROR Must specify BUILD_CPU matching compiler x86 or x64
@@ -58,10 +58,10 @@ MAKEWORKDIR = md $(WORKDIR)
 NMAKE_WINVER=0x0700
 
 CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT 
-D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) $(CPUFLAGS)
-CFLAGS = $(CFLAGS)
+CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS)
 CLOPTS = /c /nologo -MD -W3 -O2 -Ob2 -Zi -EHsc
 PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)
-LFLAGS = /nologo /DLL /INCREMENTAL:NO /DEBUG /OPT:REF /SUBSYSTEM:WINDOWS 
/MACHINE:$(MACHINE)
+LFLAGS = /nologo /DLL /INCREMENTAL:NO /DEBUG /OPT:REF /SUBSYSTEM:WINDOWS 
/MACHINE:$(MACHINE) $(EXTRA_LDLAGS)
 LDLIBS = kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib 
$(APACHE2_LIBS) $(EXTRA_LIBS)
 INCDIR = -I..\common
 
@@ -100,7 +100,7 @@ $(WORKDIR) :
$(CC) $(CLOPTS) $(CFLAGS) $(INCDIR) $(PDBFLAGS) $<
 
 $(BUILDRES): ..\common\jk.rc
-   $(RC) /l 0x409 /i "..\common" /d "MOD_JK" /d "NDEBUG" /fo $(BUILDRES) $@
+   $(RC) /l 0x409 /i ..\common /d NDEBUG /fo $(BUILDRES) $@
 
 $(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES)
$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LDLIBS) /out:$(BUILDBIN) 
/pdb:$(BUILDPDB)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Use .vc suffix for windows makefile

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new cf2f96c  Use .vc suffix for windows makefile
cf2f96c is described below

commit cf2f96cb8595b57ff7b2bd52cea7fd1d1c501a88
Author: Mladen Turk 
AuthorDate: Sat Jun 13 15:40:24 2020 +0200

Use .vc suffix for windows makefile
---
 native/iis/{Makefile => Makefile.vc}  | 4 ++--
 native/iis/README | 4 ++--
 native/iis/pcre/{Makefile => Makefile.vc} | 0
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/native/iis/Makefile b/native/iis/Makefile.vc
similarity index 95%
rename from native/iis/Makefile
rename to native/iis/Makefile.vc
index 9572e19..4d3de57 100644
--- a/native/iis/Makefile
+++ b/native/iis/Makefile.vc
@@ -88,7 +88,7 @@ $(BUILDRES): ..\common\jk.rc
 
 $(PCRELIB):
@cd .\pcre
-   $(MAKE)
+   $(MAKE) -f Makefile.vc
@if not ERRORLEVEL 0 exit /B 1
@cd ..
 
@@ -99,7 +99,7 @@ $(BUILDBIN): $(PCRELIB) $(WORKDIR) $(OBJECTS) $(BUILDRES)
 
 clean:
@cd .\pcre
-   $(MAKE) clean
+   $(MAKE) -f Makefile.vc clean
@if not ERRORLEVEL 0 exit /B 1
@cd ..
@-$(CLEANTARGET) 2>NUL
diff --git a/native/iis/README b/native/iis/README
index ac25a2d..2826220 100644
--- a/native/iis/README
+++ b/native/iis/README
@@ -29,12 +29,12 @@ Obtain the source code:
 Build  isapi_redirector.dll:
 
 c:\cmsc-15.0_28\setenv.bat x86
-nmake
+nmake -f Makefile.vc
 
 open new cmd.exe
 
 c:\cmsc-15.0_28\setenv.bat x64
-nmake
+nmake -f Makefile.vc
 
 Tomcat isapi_redirect DLLs may then be found in
 tomcat-connectors\native\iis\[x86|x64]_RELEASE
diff --git a/native/iis/pcre/Makefile b/native/iis/pcre/Makefile.vc
similarity index 100%
rename from native/iis/pcre/Makefile
rename to native/iis/pcre/Makefile.vc


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Use simple Makefile instead generated one

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 4748de1  Use simple Makefile instead generated one
4748de1 is described below

commit 4748de1482e7da5f27f0a3ea16128e72c579a361
Author: Mladen Turk 
AuthorDate: Sat Jun 13 16:16:01 2020 +0200

Use simple Makefile instead generated one
---
 native/apache-2.0/Makefile.vc | 352 ++
 1 file changed, 84 insertions(+), 268 deletions(-)

diff --git a/native/apache-2.0/Makefile.vc b/native/apache-2.0/Makefile.vc
index 5ebf402..28f0e8f 100644
--- a/native/apache-2.0/Makefile.vc
+++ b/native/apache-2.0/Makefile.vc
@@ -12,275 +12,91 @@
 # 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.
-
-!IFDEF APACHE20_HOME
-APR_LIB=libapr.lib
-APU_LIB=libaprutil.lib
-OUTDIR=.\Release20
-INTDIR=.\Release20
-APACHE2_HOME=$(APACHE20_HOME)
-!ELSE
-!IFDEF APACHE24_HOME
-APACHE2_HOME=$(APACHE24_HOME)
-OUTDIR=.\Release24
-INTDIR=.\Release24
-!ELSE
-!IFDEF APACHE22_HOME
-APACHE2_HOME=$(APACHE22_HOME)
-OUTDIR=.\Release22
-INTDIR=.\Release22
-!ENDIF
+#
+PROJECT = mod_jk
+# Tools
+CC = cl.exe
+LINK = link.exe
+RC = rc.exe
+MT = mt.exe
+
+!IF !DEFINED(APACHE2_HOME) || "$(APACHE2_HOME)" == ""
+!ERROR Cannot find APACHE2_HOME. Use nmake -f Makefile.vc APACHE2_HOME=dir
 !ENDIF
-APR_LIB=libapr-1.lib
-APU_LIB=libaprutil-1.lib
+
+!IF !DEFINED(BUILD_CPU) || "$(BUILD_CPU)" == ""
+!ERROR Must specify BUILD_CPU matching compiler x86 or x64
 !ENDIF
-!IFNDEF APACHE2_HOME
-!ERROR Missing APACHE2_HOME environment variable.
+!IF "$(BUILD_CPU)" == "x86"
+CPUFLAGS = -D_X86_=1
+MACHINE = X86
+!ELSE
+CPUFLAGS = -DWIN64 -D_WIN64
+MACHINE = AMD64
 !ENDIF
 
-TARGET=mod_jk$(SO_VERSION)$(SO_HTTPD_VERSION)
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-ARCH=X86
-
-ALL : "$(OUTDIR)\$(TARGET).so"
-
-
-CLEAN :
-   -@erase "$(INTDIR)\jk.res"
-   -@erase "$(INTDIR)\jk_ajp12_worker.obj"
-   -@erase "$(INTDIR)\jk_ajp13.obj"
-   -@erase "$(INTDIR)\jk_ajp13_worker.obj"
-   -@erase "$(INTDIR)\jk_ajp14.obj"
-   -@erase "$(INTDIR)\jk_ajp14_worker.obj"
-   -@erase "$(INTDIR)\jk_ajp_common.obj"
-   -@erase "$(INTDIR)\jk_connect.obj"
-   -@erase "$(INTDIR)\jk_context.obj"
-   -@erase "$(INTDIR)\jk_lb_worker.obj"
-   -@erase "$(INTDIR)\jk_map.obj"
-   -@erase "$(INTDIR)\jk_md5.obj"
-   -@erase "$(INTDIR)\jk_msg_buff.obj"
-   -@erase "$(INTDIR)\jk_pool.obj"
-   -@erase "$(INTDIR)\jk_shm.obj"
-   -@erase "$(INTDIR)\jk_sockbuf.obj"
-   -@erase "$(INTDIR)\jk_status.obj"
-   -@erase "$(INTDIR)\jk_uri_worker_map.obj"
-   -@erase "$(INTDIR)\jk_url.obj"
-   -@erase "$(INTDIR)\jk_util.obj"
-   -@erase "$(INTDIR)\jk_worker.obj"
-   -@erase "$(INTDIR)\mod_jk.obj"
-   -@erase "$(INTDIR)\mod_jk_src.idb"
-   -@erase "$(INTDIR)\mod_jk_src.pdb"
-   -@erase "$(OUTDIR)\mod_jk.exp"
-   -@erase "$(OUTDIR)\mod_jk.lib"
-   -@erase "$(OUTDIR)\$(TARGET).pdb"
-   -@erase "$(OUTDIR)\$(TARGET).so"
-
-"$(OUTDIR)" :
-if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\$(TARGET).bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=libhttpd.lib $(APR_LIB) $(APU_LIB) kernel32.lib user32.lib 
advapi32.lib mswsock.lib ws2_32.lib $(EXTRA_LIBS) /nologo /base:"0x6A6B" 
/subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\$(TARGET).pdb" /debug 
/machine:$(ARCH) /out:"$(OUTDIR)\$(TARGET).so" /implib:"$(OUTDIR)\mod_jk.lib" 
/libpath:"$(APACHE2_HOME)\lib" /opt:ref
-LINK32_OBJS= \
-   "$(INTDIR)\jk_ajp12_worker.obj" \
-   "$(INTDIR)\jk_ajp13.obj" \
-   "$(INTDIR)\jk_ajp13_worker.obj" \
-   "$(INTDIR)\jk_ajp14.obj" \
-   "$(INTDIR)\jk_ajp14_worker.obj" \
-   "$(INTDIR)\jk_ajp_common.obj" \
-   "$(INTDIR)\jk_connect.obj" \
-   "$(INTDIR)\jk_context.obj" \
-   "$(INTDIR)\jk_lb_worker.obj" \
-   "$(INTDIR)\jk_map.obj" \
-   "$(INTDIR)\jk_md5.obj" \
-   "$(INTDIR)\jk_msg_buff.obj" \
-   "$(INTDIR)\jk_pool.obj" \
-   "$(INTDIR)\jk_shm.obj" \
-   "$(INTDIR)\jk_sockbuf.obj" \
-   "$(INTDIR)\jk_status.obj" \
-   "$(INTDIR)\jk_uri_worker_map.obj" \
-   "$(INTDIR)\jk_url.obj" \
-   "$(INTDIR)\jk_util.obj" \
-   "$(INTDIR)\jk_worker.obj" \
-   "$(INTDIR)\jk.res" \
-   "$(INTDIR)\mod_jk.obj"
-
-"$(OUTDIR)\$(TARGET).so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-$(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-   @IF EXIST $(OUTDIR)\$(TARGET).manifest \
-   mt -nologo -manifest $(OUTDIR)\$(TARGET).manifest 
-outputresource:$(OUTDIR)\$(TARGET).so;2
-
-
-CPP_PROJ=-nologo -MD -W3 -O2 -Ob2 -Oy- -Zi -EHsc /I "..\common" /I 

[tomcat-connectors] branch master updated: Use correct windows WINVER

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new faec73d  Use correct windows WINVER
faec73d is described below

commit faec73d7d76a9fc51c9689397286710ce198da61
Author: Mladen Turk 
AuthorDate: Sat Jun 13 17:28:02 2020 +0200

Use correct windows WINVER
---
 native/apache-2.0/Makefile.vc | 6 --
 native/iis/Makefile.vc| 8 +---
 native/iis/pcre/Makefile.vc   | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/native/apache-2.0/Makefile.vc b/native/apache-2.0/Makefile.vc
index 8084f7d..72f3cdf 100644
--- a/native/apache-2.0/Makefile.vc
+++ b/native/apache-2.0/Makefile.vc
@@ -43,6 +43,9 @@ MACHINE = X86
 CPUFLAGS = -DWIN64 -D_WIN64
 MACHINE = AMD64
 !ENDIF
+!IF !DEFINED(WINVER) || "$(WINVER)" == ""
+WINVER = 0x0601
+!ENDIF
 
 # Modify library names or list them when calling nmake
 APACHE2_LIBS = libhttpd.lib libapr-1.lib libaprutil-1.lib
@@ -55,9 +58,8 @@ BUILDMFT = $(BUILDBIN).manifest
 WORKDIR = $(BUILD_CPU)_RELEASE
 CLEANTARGET = rd /s /q $(WORKDIR)
 MAKEWORKDIR = md $(WORKDIR)
-NMAKE_WINVER=0x0700
 
-CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT 
-D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) $(CPUFLAGS)
+CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT -D_WIN32_WINNT=$(WINVER) 
-DWINVER=$(WINVER) $(CPUFLAGS)
 CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS)
 CLOPTS = /c /nologo -MD -W3 -O2 -Ob2 -Zi -EHsc
 PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)
diff --git a/native/iis/Makefile.vc b/native/iis/Makefile.vc
index 817ab50..c745481 100644
--- a/native/iis/Makefile.vc
+++ b/native/iis/Makefile.vc
@@ -30,6 +30,9 @@ MACHINE = X86
 CPUFLAGS = -DWIN64 -D_WIN64
 MACHINE = AMD64
 !ENDIF
+!IF !DEFINED(WINVER) || "$(WINVER)" == ""
+WINVER = 0x0601
+!ENDIF
 
 BUILDBIN = $(WORKDIR)\$(PROJECT).dll
 BUILDRES = $(WORKDIR)\$(PROJECT).res
@@ -40,8 +43,7 @@ PCRELIB  = .\pcre\$(WORKDIR)\pcre.lib
 WORKDIR = $(BUILD_CPU)_RELEASE
 CLEANTARGET = rd /s /q $(WORKDIR)
 MAKEWORKDIR = md $(WORKDIR)
-NMAKE_WINVER=0x0700
-CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT 
-D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) -DHAVE_CONFIG_H 
$(CPUFLAGS)
+CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT -D_WIN32_WINNT=$(WINVER) 
-DWINVER=$(WINVER) -DHAVE_CONFIG_H $(CPUFLAGS)
 CFLAGS = $(CFLAGS) -DPCRE_STATIC -DJK_ISAPI -DISAPI_EXPORTS $(EXTRA_CFLAGS)
 CLOPTS = /c /nologo -MD -W3 -O2 -Ob2 -Zi -EHsc
 PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)
@@ -88,7 +90,7 @@ $(BUILDRES): ..\common\jk.rc
 
 $(PCRELIB):
@cd .\pcre
-   $(MAKE) -f Makefile.vc NMAKE_WINVER=$(NMAKE_WINVER) 
BUILD_CPU=$(BUILD_CPU) CPUFLAGS="$(CPUFLAGS)"
+   $(MAKE) -f Makefile.vc WINVER=$(WINVER) BUILD_CPU=$(BUILD_CPU) 
CPUFLAGS="$(CPUFLAGS)"
@if not ERRORLEVEL 0 exit /B 1
@cd ..
 
diff --git a/native/iis/pcre/Makefile.vc b/native/iis/pcre/Makefile.vc
index 25b05a8..9fb9306 100644
--- a/native/iis/pcre/Makefile.vc
+++ b/native/iis/pcre/Makefile.vc
@@ -28,7 +28,7 @@ WORKDIR = $(BUILD_CPU)_RELEASE
 BUILDLIB = $(WORKDIR)\$(PROJECT).lib
 CLEANTARGET = rd /s /q $(WORKDIR)
 MAKEWORKDIR = md $(WORKDIR)
-CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT 
-D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER)
+CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT -D_WIN32_WINNT=$(WINVER) 
-DWINVER=$(WINVER)
 CFLAGS = $(CFLAGS) -DPCRE_STATIC -DHAVE_CONFIG_H $(CPUFLAGS) $(EXTRA_CFLAGS)
 CLOPTS = /c /nologo -MD -W3 -O2 -Ob2 -Zi -EHsc
 PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Add windows makefile

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 4c9af8c  Add windows makefile
4c9af8c is described below

commit 4c9af8c2180ad84116e3d367ff26ff0ba715d4ef
Author: Mladen Turk 
AuthorDate: Sat Jun 13 12:16:05 2020 +0200

Add windows makefile
---
 native/iis/Makefile | 100 
 1 file changed, 100 insertions(+)

diff --git a/native/iis/Makefile b/native/iis/Makefile
new file mode 100644
index 000..f46844c
--- /dev/null
+++ b/native/iis/Makefile
@@ -0,0 +1,100 @@
+# 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 = isapi_redirect
+# Tools
+CC = cl.exe
+LINK = link.exe
+RC = rc.exe
+MT = mt.exe
+
+!IF !DEFINED(BUILD_CPU) || "$(BUILD_CPU)" == ""
+!ERROR Must specify BUILD_CPU matching compiler x86 or x64
+!ENDIF
+!IF "$(BUILD_CPU)" == "x86"
+CPUFLAGS = -D_X86_=1
+MACHINE = X86
+!ELSE
+CPUFLAGS = -DWIN64 -D_WIN64
+MACHINE = AMD64
+!ENDIF
+
+BUILDBIN = $(WORKDIR)\$(PROJECT).dll
+BUILDRES = $(WORKDIR)\$(PROJECT).res
+BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+PCRELIB  = .\pcre\$(WORKDIR)\pcre.lib
+
+WORKDIR = $(BUILD_CPU)_RELEASE
+CLEANTARGET=if exist "$(WORKDIR)" rd /s /q $(WORKDIR)
+MAKEWORKDIR=if not exist "$(WORKDIR)" md $(WORKDIR)
+NMAKE_WINVER=0x0700
+CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT 
-D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) -DHAVE_CONFIG_H 
$(CPUFLAGS)
+CFLAGS = $(CFLAGS) -DPCRE_STATIC -DJK_ISAPI -DISAPI_EXPORTS
+CLOPTS = /c /nologo -MD -W3 -O2 -Ob2 -Zi -EHsc
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)
+LFLAGS = /nologo /DLL /INCREMENTAL:NO /DEBUG /OPT:REF /SUBSYSTEM:WINDOWS 
/MACHINE:$(MACHINE)
+LDLIBS = kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib 
strsafe.lib $(EXTRA_LIBS)
+INCDIR = -I.\pcre -I..\common
+
+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_isapi_plugin.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
+
+all : pcre $(WORKDIR) $(BUILDBIN)
+
+$(WORKDIR) :
+   @$(MAKEWORKDIR)
+
+.c{$(WORKDIR)}.obj:
+   $(CC) $(CLOPTS) $(CFLAGS) $(INCDIR) $(PDBFLAGS) $<
+
+{..\common}.c{$(WORKDIR)}.obj:
+   $(CC) $(CLOPTS) $(CFLAGS) $(INCDIR) $(PDBFLAGS) $<
+
+$(BUILDRES): ..\common\jk.rc
+   $(RC)/l 0x409 /i "..\common" /d "JK_ISAPI" /d "NDEBUG" /fo $(BUILDRES) 
..\common\jk.rc
+
+$(PCRELIB):
+   cd .\pcre
+   $(MAKE)
+   cd ..
+$(BUILDBIN): $(PCRELIB) $(WORKDIR) $(OBJECTS) $(BUILDRES)
+   $(LINK) $(LFLAGS) $(OBJECTS) $(PCRELIB) $(BUILDRES) $(LDLIBS) 
/def:isapi.def /out:$(BUILDBIN) /pdb:$(BUILDPDB)
+
+clean:
+   @$(CLEANTARGET)
+   cd .\pcre
+   $(MAKE) clean
+   cd ..
+


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Allow Makefile for iis

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 89b2976  Allow Makefile for iis
89b2976 is described below

commit 89b29767f5305caf825ff5603c672af400f8c357
Author: Mladen Turk 
AuthorDate: Sat Jun 13 12:15:29 2020 +0200

Allow Makefile for iis
---
 native/.gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/native/.gitignore b/native/.gitignore
index 72ab134..850aacf 100644
--- a/native/.gitignore
+++ b/native/.gitignore
@@ -2,7 +2,6 @@ Makefile.in
 aclocal.m4
 configure
 config.log
-Makefile
 config.cache
 libtool
 config.status


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Update build instructions

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 4abc9ce  Update build instructions
4abc9ce is described below

commit 4abc9ce38d0c8a5665d09ce43c329b62725f6511
Author: Mladen Turk 
AuthorDate: Sat Jun 13 12:25:57 2020 +0200

Update build instructions
---
 native/iis/README | 26 --
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/native/iis/README b/native/iis/README
index 397b886..d86298f 100644
--- a/native/iis/README
+++ b/native/iis/README
@@ -12,19 +12,9 @@ To build the ISAPI redirector you will need to create the 
following build
 environment:
 
 - Git client
-- Subversion client
 - Mladen's Custom Microsoft Compiler Toolkit Compilation  
-https://github.com/mturk/cmsc (cb6be932c8c95a46262a64a89e68aae620dfdcee)  
-- Windows SDK  
-No documentation  
-No samples  
-Complete set of developer tools  
-- Windows DDK  
-Build environments  
-Tools  
-- Compile as per /tools/README.txt  
-- Install Perl as per /tools/README.txt  
-- Java 7 (releases only, can be replaced with any zip tool)
+https://github.com/mturk/cmsc/releases/tag/v15.0.28
+download cmsc-15.0_28-win7-x86_x64.zip and unzip in C:
 
 
 BUILDING
@@ -40,14 +30,14 @@ Obtain the source code:
 
 Build  isapi_redirector.dll:
 
-  c:\cmsc\setenv.bat /x86 
-  nmake -f Makefile.x86
- 
-  c:\cmsc\setenv.bat /x64
-  nmake -f Makefile.amd64
+  c:\cmsc-15.0_28\setenv.bat x86
+  nmake
+
+  c:\cmsc-15.0_28\setenv.bat x64
+  nmake -f
 
 Tomcat isapi_redirect DLLs may then be found in
-C:\tomcat-jk-1.2.x\native\iis\Release_[amd64|x86].
+C:\tomcat-jk-1.2.x\native\iis\[x86|x64]_RELEASE
 
 
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Embedd manifest file

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 45d624d  Embedd manifest file
45d624d is described below

commit 45d624df2a8c2b3a2aca33500b8aa3d3d08a09ed
Author: Mladen Turk 
AuthorDate: Sat Jun 13 13:01:19 2020 +0200

Embedd manifest file
---
 native/iis/Makefile | 14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/native/iis/Makefile b/native/iis/Makefile
index f46844c..d92a1d4 100644
--- a/native/iis/Makefile
+++ b/native/iis/Makefile
@@ -34,6 +34,7 @@ MACHINE = AMD64
 BUILDBIN = $(WORKDIR)\$(PROJECT).dll
 BUILDRES = $(WORKDIR)\$(PROJECT).res
 BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
+BUILDMFT = $(BUILDBIN).manifest
 PCRELIB  = .\pcre\$(WORKDIR)\pcre.lib
 
 WORKDIR = $(BUILD_CPU)_RELEASE
@@ -71,7 +72,7 @@ OBJECTS = \
$(WORKDIR)\jk_util.obj \
$(WORKDIR)\jk_worker.obj
 
-all : pcre $(WORKDIR) $(BUILDBIN)
+all : $(WORKDIR) $(PCRELIB) $(BUILDBIN)
 
 $(WORKDIR) :
@$(MAKEWORKDIR)
@@ -86,15 +87,18 @@ $(BUILDRES): ..\common\jk.rc
$(RC)/l 0x409 /i "..\common" /d "JK_ISAPI" /d "NDEBUG" /fo $(BUILDRES) 
..\common\jk.rc
 
 $(PCRELIB):
-   cd .\pcre
+   @cd .\pcre
$(MAKE)
-   cd ..
+   @cd ..
+
 $(BUILDBIN): $(PCRELIB) $(WORKDIR) $(OBJECTS) $(BUILDRES)
$(LINK) $(LFLAGS) $(OBJECTS) $(PCRELIB) $(BUILDRES) $(LDLIBS) 
/def:isapi.def /out:$(BUILDBIN) /pdb:$(BUILDPDB)
+   @if exist $(BUILDMFT) \
+   $(MT) -nologo -manifest $(BUILDMFT) 
-outputresource:$(BUILDBIN);2
 
 clean:
@$(CLEANTARGET)
-   cd .\pcre
+   @cd .\pcre
$(MAKE) clean
-   cd ..
+   @cd ..
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Remove useless .gitignore

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 25f9102  Remove useless .gitignore
25f9102 is described below

commit 25f91022e446e9095a42f3d5248424dffeb7f94f
Author: Mladen Turk 
AuthorDate: Sat Jun 13 12:29:23 2020 +0200

Remove useless .gitignore
---
 native/iis/.gitignore | 6 --
 1 file changed, 6 deletions(-)

diff --git a/native/iis/.gitignore b/native/iis/.gitignore
deleted file mode 100644
index 502b31a..000
--- a/native/iis/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Debug
-Release
-*.ncb
-*.opt
-*.plg
-Release_amd64


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Fix typos

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 1e51bff  Fix typos
1e51bff is described below

commit 1e51bff4960891cf6af8c3454d9dbdb0713d11fa
Author: Mladen Turk 
AuthorDate: Sat Jun 13 14:08:54 2020 +0200

Fix typos
---
 native/iis/README | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/native/iis/README b/native/iis/README
index d86298f..d3d6f7b 100644
--- a/native/iis/README
+++ b/native/iis/README
@@ -19,22 +19,24 @@ environment:
 
 BUILDING
 
- 
+
 Obtain the source code:
 
   c:
   cd \
   git clone  https://github.com/apache/tomcat-connectors.git tomcat-jk-1.2.x
   cd tomcat-jk-1.2.x\native\iis
- 
+
 
 Build  isapi_redirector.dll:
 
   c:\cmsc-15.0_28\setenv.bat x86
   nmake
 
+  open new cmd.exe
+
   c:\cmsc-15.0_28\setenv.bat x64
-  nmake -f
+  nmake
 
 Tomcat isapi_redirect DLLs may then be found in
 C:\tomcat-jk-1.2.x\native\iis\[x86|x64]_RELEASE


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Simplify docs

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new a74758c  Simplify docs
a74758c is described below

commit a74758cfa676a1e27635e804cb367c362bbbf708
Author: Mladen Turk 
AuthorDate: Sat Jun 13 14:13:16 2020 +0200

Simplify docs
---
 native/iis/README | 18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/native/iis/README b/native/iis/README
index d3d6f7b..ac25a2d 100644
--- a/native/iis/README
+++ b/native/iis/README
@@ -22,24 +22,22 @@ BUILDING
 
 Obtain the source code:
 
-  c:
-  cd \
-  git clone  https://github.com/apache/tomcat-connectors.git tomcat-jk-1.2.x
-  cd tomcat-jk-1.2.x\native\iis
+  git clone https://github.com/apache/tomcat-connectors.git
+  cd tomcat-connectors\native\iis
 
 
 Build  isapi_redirector.dll:
 
-  c:\cmsc-15.0_28\setenv.bat x86
-  nmake
+c:\cmsc-15.0_28\setenv.bat x86
+nmake
 
-  open new cmd.exe
+open new cmd.exe
 
-  c:\cmsc-15.0_28\setenv.bat x64
-  nmake
+c:\cmsc-15.0_28\setenv.bat x64
+nmake
 
 Tomcat isapi_redirect DLLs may then be found in
-C:\tomcat-jk-1.2.x\native\iis\[x86|x64]_RELEASE
+tomcat-connectors\native\iis\[x86|x64]_RELEASE
 
 
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Check for return value from subtask

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new ab91bce  Check for return value from subtask
ab91bce is described below

commit ab91bced3b7077075395e5a279d5b9e153a329cc
Author: Mladen Turk 
AuthorDate: Sat Jun 13 13:16:24 2020 +0200

Check for return value from subtask
---
 native/iis/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/native/iis/Makefile b/native/iis/Makefile
index d92a1d4..7e22e48 100644
--- a/native/iis/Makefile
+++ b/native/iis/Makefile
@@ -89,6 +89,7 @@ $(BUILDRES): ..\common\jk.rc
 $(PCRELIB):
@cd .\pcre
$(MAKE)
+   @if not ERRORLEVEL 0 exit /B 1
@cd ..
 
 $(BUILDBIN): $(PCRELIB) $(WORKDIR) $(OBJECTS) $(BUILDRES)
@@ -97,8 +98,9 @@ $(BUILDBIN): $(PCRELIB) $(WORKDIR) $(OBJECTS) $(BUILDRES)
$(MT) -nologo -manifest $(BUILDMFT) 
-outputresource:$(BUILDBIN);2
 
 clean:
-   @$(CLEANTARGET)
@cd .\pcre
$(MAKE) clean
+   @if not ERRORLEVEL 0 exit /B 1
@cd ..
+   @$(CLEANTARGET)
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Use simple rmdir/mkdir

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 8fc2706  Use simple rmdir/mkdir
8fc2706 is described below

commit 8fc2706cbee516aa330768ad19aefff2e91dafbb
Author: Mladen Turk 
AuthorDate: Sat Jun 13 13:30:25 2020 +0200

Use simple rmdir/mkdir
---
 native/iis/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/native/iis/Makefile b/native/iis/Makefile
index 7e22e48..a84190b 100644
--- a/native/iis/Makefile
+++ b/native/iis/Makefile
@@ -38,8 +38,8 @@ BUILDMFT = $(BUILDBIN).manifest
 PCRELIB  = .\pcre\$(WORKDIR)\pcre.lib
 
 WORKDIR = $(BUILD_CPU)_RELEASE
-CLEANTARGET=if exist "$(WORKDIR)" rd /s /q $(WORKDIR)
-MAKEWORKDIR=if not exist "$(WORKDIR)" md $(WORKDIR)
+CLEANTARGET = rd /s /q $(WORKDIR)
+MAKEWORKDIR = md $(WORKDIR)
 NMAKE_WINVER=0x0700
 CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT 
-D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) -DHAVE_CONFIG_H 
$(CPUFLAGS)
 CFLAGS = $(CFLAGS) -DPCRE_STATIC -DJK_ISAPI -DISAPI_EXPORTS
@@ -102,5 +102,5 @@ clean:
$(MAKE) clean
@if not ERRORLEVEL 0 exit /B 1
@cd ..
-   @$(CLEANTARGET)
+   @-$(CLEANTARGET)
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Silence The system cannot find the file specified message

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 26248d8  Silence The system cannot find the file specified message
26248d8 is described below

commit 26248d8a5df9594c637e0e61f8b53297ec747cb2
Author: Mladen Turk 
AuthorDate: Sat Jun 13 13:36:52 2020 +0200

Silence The system cannot find the file specified message
---
 native/iis/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/native/iis/Makefile b/native/iis/Makefile
index a84190b..9572e19 100644
--- a/native/iis/Makefile
+++ b/native/iis/Makefile
@@ -102,5 +102,4 @@ clean:
$(MAKE) clean
@if not ERRORLEVEL 0 exit /B 1
@cd ..
-   @-$(CLEANTARGET)
-
+   @-$(CLEANTARGET) 2>NUL


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Add pcre/Makefile

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new e98b2ec  Add pcre/Makefile
e98b2ec is described below

commit e98b2ec1b4d1b0c90156c46803892c6eded3df30
Author: Mladen Turk 
AuthorDate: Sat Jun 13 14:04:54 2020 +0200

Add pcre/Makefile
---
 native/iis/pcre/Makefile | 80 
 1 file changed, 80 insertions(+)

diff --git a/native/iis/pcre/Makefile b/native/iis/pcre/Makefile
new file mode 100644
index 000..da07d88
--- /dev/null
+++ b/native/iis/pcre/Makefile
@@ -0,0 +1,80 @@
+# 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 = pcre
+# Tools
+CC = cl.exe
+LINK = link.exe
+RC = rc.exe
+MT = mt.exe
+
+!IF !DEFINED(BUILD_CPU) || "$(BUILD_CPU)" == ""
+!ERROR Must specify BUILD_CPU matching compiler x86 or x64
+!ENDIF
+!IF "$(BUILD_CPU)" == "z86"
+CPUFLAGS = -D_X86_=1
+!ELSE
+CPUFLAGS = -DWIN64 -D_WIN64
+!ENDIF
+
+BUILDLIB = $(WORKDIR)\$(PROJECT).lib
+WORKDIR = $(BUILD_CPU)_RELEASE
+CLEANTARGET = rd /s /q $(WORKDIR)
+MAKEWORKDIR = md $(WORKDIR)
+NMAKE_WINVER=0x0700
+CFLAGS = $(CFLAGS) -DNDEBUG -DWIN32 -D_WINNT -DWINNT 
-D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER)
+CFLAGS = $(CFLAGS) -DPCRE_STATIC -DHAVE_CONFIG_H $(CPUFLAGS)
+CLOPTS = /c /nologo -MD -W3 -O2 -Ob2 -Zi -EHsc
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)
+LFLAGS = -lib /nologo
+
+OBJECTS = \
+   $(WORKDIR)\pcre_byte_order.obj \
+   $(WORKDIR)\pcre_chartables.obj \
+   $(WORKDIR)\pcre_compile.obj \
+   $(WORKDIR)\pcre_config.obj \
+   $(WORKDIR)\pcre_dfa_exec.obj \
+   $(WORKDIR)\pcre_exec.obj \
+   $(WORKDIR)\pcre_fullinfo.obj \
+   $(WORKDIR)\pcre_get.obj \
+   $(WORKDIR)\pcre_globals.obj \
+   $(WORKDIR)\pcre_jit_compile.obj \
+   $(WORKDIR)\pcre_maketables.obj \
+   $(WORKDIR)\pcre_newline.obj \
+   $(WORKDIR)\pcre_ord2utf8.obj \
+   $(WORKDIR)\pcre_refcount.obj \
+   $(WORKDIR)\pcre_string_utils.obj \
+   $(WORKDIR)\pcre_study.obj \
+   $(WORKDIR)\pcre_tables.obj \
+   $(WORKDIR)\pcre_ucd.obj \
+   $(WORKDIR)\pcre_valid_utf8.obj \
+   $(WORKDIR)\pcre_version.obj \
+   $(WORKDIR)\pcre_xclass.obj
+
+
+
+all : $(WORKDIR) $(BUILDLIB)
+
+$(WORKDIR) :
+   @$(MAKEWORKDIR)
+
+.c{$(WORKDIR)}.obj:
+   $(CC) $(CLOPTS) $(CFLAGS) $(PDBFLAGS) $<
+
+$(BUILDLIB): $(WORKDIR) $(OBJECTS)
+   $(LINK) $(LFLAGS) $(OBJECTS) /out:$(BUILDLIB)
+
+clean:
+   @-$(CLEANTARGET) 2>NUL


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat-connectors] branch master updated: Add install task defaults to APACHE2_HOME/modules unless PREFIX is defined on command line

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new ae75fe5  Add install task defaults to APACHE2_HOME/modules unless 
PREFIX is defined on command line
ae75fe5 is described below

commit ae75fe5daa80afe90fed83456045c1b7f6891063
Author: Mladen Turk 
AuthorDate: Sat Jun 13 17:54:56 2020 +0200

Add install task defaults to APACHE2_HOME/modules unless PREFIX is defined 
on command line
---
 native/apache-2.0/Makefile.vc | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/native/apache-2.0/Makefile.vc b/native/apache-2.0/Makefile.vc
index 72f3cdf..13d6980 100644
--- a/native/apache-2.0/Makefile.vc
+++ b/native/apache-2.0/Makefile.vc
@@ -29,6 +29,9 @@ APACHE2_LDIR=$(APACHE2_HOME)\lib
 !IF !DEFINED(APACHE2_IDIR) || "$(APACHE2_IDIR)" == ""
 APACHE2_IDIR=$(APACHE2_HOME)\include
 !ENDIF
+!IF !DEFINED(PREFIX) || "$PREFIX)" == ""
+PREFIX=$(APACHE2_HOME)\modules
+!ENDIF
 
 LIB = $(LIB);$(APACHE2_LDIR)
 INCLUDE = $(INCLUDE);$(APACHE2_IDIR)
@@ -109,5 +112,9 @@ $(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES)
@if exist $(BUILDMFT) \
$(MT) -nologo -manifest $(BUILDMFT) 
-outputresource:$(BUILDBIN);2
 
+install : all
+   @-xcopy /I /Y /Q "$(WORKDIR)\*.so"  "$(PREFIX)"
+   @-xcopy /I /Y /Q "$(WORKDIR)\*.pdb" "$(PREFIX)"
+
 clean:
@-$(CLEANTARGET) 2>NUL


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: Building mod_jk for Windows

2020-06-13 Thread Mark Thomas
On 13/06/2020 18:56, Christopher Schultz wrote:
> All,
> 
> I see Mladen has gone crazy updating mod_jk for IIS. The build process
> looks fairly straightforward in a way that isn't so straightforward
> for e.g. libtcnative.
> 
> I suspect most of it is the work that has gone into his "Custom
> Microsoft Compiler Toolkit Compilation" to make sure it has everything
> it needs.
> 
> I wonder if this could be Dockerized to make it even easier for just
> about anyone to perform a Windows build of mod_jk. Even better,
> perhaps a similar toolchain could be used to build libtcnative as well.

I haven't looked at what Mldaen has done for ISAPI but Tomcat Native for
Windows is already built using his custom toolkit. (And ISAPI was too
even before these changes.)

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: Building mod_jk for Windows

2020-06-13 Thread Michael Osipov

Am 2020-06-13 um 19:56 schrieb Christopher Schultz:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

All,

I see Mladen has gone crazy updating mod_jk for IIS. The build process
looks fairly straightforward in a way that isn't so straightforward
for e.g. libtcnative.

I suspect most of it is the work that has gone into his "Custom
Microsoft Compiler Toolkit Compilation" to make sure it has everything
it needs.

I wonder if this could be Dockerized to make it even easier for just
about anyone to perform a Windows build of mod_jk. Even better,
perhaps a similar toolchain could be used to build libtcnative as well.

Does anyone have extensive Docker experience? I certainly do not...


I prefer CMake for truly portable builds. Due to my recent work on 
libtcnative I have noticed that both the autoconf files als well as 
Makefiles have a lot of ancient cruft. I'd be happy to invoke just CMake 
and just make on any platform. That is a long-term goal for me with 
tcnative.


M

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Building mod_jk for Windows

2020-06-13 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

All,

I see Mladen has gone crazy updating mod_jk for IIS. The build process
looks fairly straightforward in a way that isn't so straightforward
for e.g. libtcnative.

I suspect most of it is the work that has gone into his "Custom
Microsoft Compiler Toolkit Compilation" to make sure it has everything
it needs.

I wonder if this could be Dockerized to make it even easier for just
about anyone to perform a Windows build of mod_jk. Even better,
perhaps a similar toolchain could be used to build libtcnative as well.

Does anyone have extensive Docker experience? I certainly do not...

- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl7lE2MACgkQHPApP6U8
pFgfDhAAq7i544Rb5JdlzwQao9PJjMOlpseKBioO7peF1Yofqf1o9SutLoIU7hyt
LXrdU5kevTQepHWJxbS7cHPmbnnWtdGaU88rMjDP9hote9ftQUDYiAfeL45fmufB
T1a76YXFXLvsae3rdupLy9RfRTlvLcHoKGscre5J/vACpzjsFoq0B3KVHerBxPJe
dsbaZAlM0CslzJ6AkbZKS5ZaVYuOM9XiXhY37c5Ki8Yy7NjuhPOcksotlcKph37P
RHW9Y0QEUNqtn4xn3KGyPPsiaMgHkgaSJ/md7pyvr3CQMefUuwSaiY2DQif5fMgD
Yigo69bCuqXcM3KytgPO4tZa48mCIc0oFIHZ1G3v+XNkBeFmteTRRp/fUmptmALC
1Js1dL7Xf0VuyO4eQU96fQ1aXg+PpIOO6sRil4xEIiIUfB3pyWowIV+qGXu0iGKk
+TzFWYp01S+uDW6tXAAbrwKCkPGwxSgsHW1ewQ0u+X+NvIHOak8XbaAYvDKXclsh
qz+6cX84cd4GrKU8ieP9RqtP/n4SI2yIFmEw2MCHyi/ojccIb7OdLgfftbfmCZo2
oBhHd3MvS0gtyLDxs0VI2dEi6bh3ly/AKHIylEwXnvY+BTD6kRkXL1y4S/LCcaXN
nKoplRvg2m9UzYaCW0oy9IyJUS/otsXe3eHjFNZ8hfV1/qizcp4=
=i0Jr
-END PGP SIGNATURE-

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: Bootstrap and modules

2020-06-13 Thread Mark Thomas
On 13/06/2020 03:53, Raymond Auge wrote:
> Actually Bootstrap has a comment
> 
> // Copied from ExceptionUtils since that class is not visible during start
> 
> So it seems like perhaps the change should be ported.

Agreed. So if we do that and make the other changes I outlined where
does that leave things from a JPMS / OSGi point of view?

Mark


> 
>  - Ray
> 
> On Fri, Jun 12, 2020 at 10:45 PM Raymond Auge  > wrote:
> 
> There is one difference between
> 
> org.apache.tomcat.util.ExceptionUtils.handleThrowable(Throwable)
> 
> and
> 
> org.apache.catalina.startup.Bootstrap.handleThrowable(Throwable)
> 
> that is that ExceptionUtils also swallows StackOverflowError while
> Bootstrap does not.
> Should that be ported over or is it a deal breaker? An option would
> be to add an additional method to Bootstrap that behaves like
> ExceptionUtils.
> 
> - Ray
> 
> 
> On Fri, Jun 12, 2020 at 9:27 AM Mark Thomas  > wrote:
> 
> On 12/06/2020 14:15, Raymond Auge wrote:
> > Hey Mark,
> >
> > I'll have to get back to this convo in a day or so.
> >
> > I'll test your theory but at first glance it sounds like going
> in the
> > right direction.
> 
> No rush. I'd rather take time and get this right.
> 
> Thanks,
> 
> Mark
> 
> 
> >
> > - Ray
> >
> > On Thu, Jun 11, 2020 at 5:08 PM Mark Thomas  
> > >> wrote:
> >
> >     On 11/06/2020 21:59, Mark Thomas wrote:
> >     > On 11/06/2020 21:24, Raymond Auge wrote:
> >     >> This can totally be fixed in configuration. There is no
> problem.
> >     I just
> >     >> wanted to make sure that in doing so we wouldn't just
> be pushing some
> >     >> dirt under the rug so to speak.
> >     >
> >     > I'm concerned we might be doing exactly that now we are
> heading into a
> >     > JPMS world and this seems like an opportunity to pause
> and see if
> >     there
> >     > is a better way.
> >     >
> >     > I've yet to get my head around JPMS and I might be
> mis-remembering
> >     some
> >     > of the things I have read.
> >     >
> >     > bootstrap.jar has everything it needs to start, create
> the class
> >     loader
> >     > hierarchy, switch to the catalinaLoader (which can see
> all the JARs
> >     > rather than just bootstrap.jar and tomcat-juli.jar) and
> then continue
> >     > with start-up.
> >     >
> >     > It does things this way because the class loader
> hierarchy and the
> >     > configuration of the class loaders is configurable. So
> we can't
> >     just put
> >     > everything on the class path before starting the JVM.
> >     >
> >     > Any static analysis of bootstrap.jar is always going to
> show it having
> >     > dependencies that won't be visible until Tomcat starts
> and the
> >     > catalinaLoader is up and running. To what extent does
> this cause
> >     > complications for JPMS and/or OSGi?
> >     >
> >     > Is this completely manageable with configuration? If it
> is, I
> >     think I'd
> >     > lean towards a configuration based solution primarily
> for backwards
> >     > compatibility reasons. What are the arguments against
> this approach?
> >     >
> >     > If this completely manageable with configuration are
> there any
> >     > particular classes that are causing more than their fair
> share of pain
> >     > where a small packaging change would provide a
> relatively large
> >     benefit?
> >
> >     Sorry. More thoughts occurred to me as I looked at the PRs
> again.
> >
> >     If we created o.a.c.startup.Constants, defined the
> constants required by
> >     the bootstrap classes there and then referenced those from
> o.a.c.Globals
> >     would that help?
> >
> >     Is it Tool's use of ExceptionUtils that is causing that
> class to be
> >     needed? If so would making Bootstrap.handleThrowable()
> package private
> >     and using that instead help?
> >
> >     Mark
> >
> >     >
> >     > Mark
> >     >
> >     >
> >     >>
> >     >> :)
> >     >>
> >     >> - Ray
> >     >>
> >     >> On Thu, Jun 11, 

[tomcat-connectors] branch master updated: Drop all that beta, rc, release bloatware from jk_version.h. We use git, and release should be as simple as clicking on the webpage

2020-06-13 Thread mturk
This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 0ff7479  Drop all that beta,rc,release bloatware from jk_version.h. We 
use git, and release should be as simple as clicking on the webpage
0ff7479 is described below

commit 0ff7479904e1a5447736b020a267b897ff826e1f
Author: Mladen Turk 
AuthorDate: Sat Jun 13 19:07:26 2020 +0200

Drop all that beta,rc,release bloatware from jk_version.h. We use git, and 
release should be as simple as clicking on the webpage
---
 native/apache-2.0/Makefile.vc |  2 +-
 native/common/jk.rc   | 35 +
 native/common/jk_version.h| 52 ---
 native/iis/Makefile.vc|  2 +-
 4 files changed, 31 insertions(+), 60 deletions(-)

diff --git a/native/apache-2.0/Makefile.vc b/native/apache-2.0/Makefile.vc
index 13d6980..e3d5bbe 100644
--- a/native/apache-2.0/Makefile.vc
+++ b/native/apache-2.0/Makefile.vc
@@ -105,7 +105,7 @@ $(WORKDIR) :
$(CC) $(CLOPTS) $(CFLAGS) $(INCDIR) $(PDBFLAGS) $<
 
 $(BUILDRES): ..\common\jk.rc
-   $(RC) /l 0x409 /i ..\common /d NDEBUG /fo $(BUILDRES) $@
+   $(RC) /l 0x409 /n /i ..\common /d NDEBUG /fo $(BUILDRES) ..\common\jk.rc
 
 $(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES)
$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LDLIBS) /out:$(BUILDBIN) 
/pdb:$(BUILDPDB)
diff --git a/native/common/jk.rc b/native/common/jk.rc
index e0eae36..a51a385 100644
--- a/native/common/jk.rc
+++ b/native/common/jk.rc
@@ -39,31 +39,27 @@
 
 
 1 VERSIONINFO
- FILEVERSION JK_VERSIONCSV
- PRODUCTVERSION JK_VERSIONCSV
- FILEFLAGSMASK 0x3fL
-#if defined(_DEBUG)
- FILEFLAGS 0x01L
-#else
- FILEFLAGS 0x00L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
+ FILEVERSION JK_VERSIONCSV,0
+ PRODUCTVERSION JK_VERSIONCSV,0
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+ FILEFLAGS 0x0L
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_APP
  FILESUBTYPE 0x0L
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
 BLOCK "040904b0"
 BEGIN
-VALUE "Comments", ASF_LICENSE "\0"
-  VALUE "CompanyName", "Apache Software Foundation\0"
-  VALUE "FileDescription", "Apache Tomcat Connector\0"
-  VALUE "FileVersion", JK_VERSTRING "\0"
-  VALUE "InternalName", PACKAGE "\0"
-  VALUE "LegalCopyright", ASF_COPYRIGHT "\0"
-  VALUE "OriginalFilename", PACKAGE "." JK_DLL_SUFFIX "\0"
-  VALUE "ProductName", "Apache Tomcat " PACKAGE " Connector\0"
-  VALUE "ProductVersion", JK_VERSTRING "\0"
+  VALUE "Comments", ASF_LICENSE
+  VALUE "CompanyName", "Apache Software Foundation"
+  VALUE "FileDescription", "Apache Tomcat Connector"
+  VALUE "FileVersion", JK_VERSTRING
+  VALUE "InternalName", JK_DISTNAME
+  VALUE "LegalCopyright", ASF_COPYRIGHT
+  VALUE "OriginalFilename", JK_DISTNAME "." JK_DLL_SUFFIX
+  VALUE "ProductName", "Apache Tomcat " JK_DISTNAME " Connector"
+  VALUE "ProductVersion", JK_EXPOSED_VERSION
 END
   END
   BLOCK "VarFileInfo"
@@ -71,4 +67,3 @@ BEGIN
 VALUE "Translation", 0x409, 1200
   END
 END
-
diff --git a/native/common/jk_version.h b/native/common/jk_version.h
index 8ac54cd..a4d06f0 100644
--- a/native/common/jk_version.h
+++ b/native/common/jk_version.h
@@ -22,57 +22,34 @@
 #ifndef __JK_VERSION_H
 #define __JK_VERSION_H
 
-/** START OF AREA TO MODIFY BEFORE RELEASING */
 #define JK_VERMAJOR 1
 #define JK_VERMINOR 2
-#define JK_VERFIX   49
+#define JK_VERMICRO 49
 
-/* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
-#define JK_VERISRELEASE 0
-/* Beta number */
-#define JK_VERBETA  0
-#define JK_BETASTRING   "0"
-/* Release candidate */
-#define JK_VERRC0
-#define JK_RCSTRING "0"
-
-/** END OF AREA TO MODIFY BEFORE RELEASING */
-
-#if !defined(PACKAGE)
 #if defined(JK_ISAPI)
-#define PACKAGE "isapi_redirector"
+#define JK_DISTNAME "isapi_redirector"
 #define JK_DLL_SUFFIX "dll"
 #elif defined(JK_NSAPI)
-#define PACKAGE "nsapi_redirector"
+#define JK_DISTNAME "nsapi_redirector"
 #define JK_DLL_SUFFIX "dll"
 #else
-#define PACKAGE "mod_jk"
+#define JK_DISTNAME "mod_jk"
 #define JK_DLL_SUFFIX "so"
 #endif
-#endif
 
 /* Build JK_EXPOSED_VERSION and JK_VERSION */
-#define JK_EXPOSED_VERSION_INT PACKAGE "/" JK_VERSTRING
+#define JK_EXPOSED_VERSION JK_DISTNAME "/" JK_VERSTRING
 
-#if (JK_VERBETA != 0)
-#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT "-beta-" JK_BETASTRING
-#else
-#undef JK_VERBETA
-#define JK_VERBETA 255
-#if (JK_VERRC != 0)
-#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT "-rc-" JK_RCSTRING
-#elif (JK_VERISRELEASE == 1)
-#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT
-#else
-#define JK_EXPOSED_VERSION JK_EXPOSED_VERSION_INT "-dev"
-#endif
+#if !defined(JK_VERSUFIX)
+#define JK_VERSUFIX ""
 #endif
-#define 

Re: Java library bug in JCEKS keystore loader

2020-06-13 Thread Michael Osipov

Am 2020-06-12 um 23:54 schrieb Christopher Schultz:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

All,

I've been writing a Java-based certification-expiration checking
utility that can handle all kinds of file formats like PEM and the
various keystore formats supported by the JVM.

Since it's not possible to tell what type of keystore is being loaded
without writing a bunch of magic-checking code or implementing an
ASN.1 parser (no thank you), I simply try all keystore types until I
find one that works. I'm using a rewindable InputStream which works well
.


there is no need to, use Apache Directory Kerby ASN.1 module. I use it 
too and it works very well for my certiticate tasks at work.


Michael

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: Bootstrap and modules

2020-06-13 Thread Raymond Auge
Hey Mark, I tested those changes and they solve the packaging issue for
both jpms and OSGi.

I'll update the pr to reflect the change later today I hope.

I did encounter some further jpms related issues but those were beyond
packaging and need other questions answered before moving forward.

- Ray

On Sat, Jun 13, 2020, 12:49 Mark Thomas,  wrote:

> On 13/06/2020 03:53, Raymond Auge wrote:
> > Actually Bootstrap has a comment
> >
> > // Copied from ExceptionUtils since that class is not visible during
> start
> >
> > So it seems like perhaps the change should be ported.
>
> Agreed. So if we do that and make the other changes I outlined where
> does that leave things from a JPMS / OSGi point of view?
>
> Mark
>
>
> >
> >  - Ray
> >
> > On Fri, Jun 12, 2020 at 10:45 PM Raymond Auge  > > wrote:
> >
> > There is one difference between
> >
> > org.apache.tomcat.util.ExceptionUtils.handleThrowable(Throwable)
> >
> > and
> >
> > org.apache.catalina.startup.Bootstrap.handleThrowable(Throwable)
> >
> > that is that ExceptionUtils also swallows StackOverflowError while
> > Bootstrap does not.
> > Should that be ported over or is it a deal breaker? An option would
> > be to add an additional method to Bootstrap that behaves like
> > ExceptionUtils.
> >
> > - Ray
> >
> >
> > On Fri, Jun 12, 2020 at 9:27 AM Mark Thomas  > > wrote:
> >
> > On 12/06/2020 14:15, Raymond Auge wrote:
> > > Hey Mark,
> > >
> > > I'll have to get back to this convo in a day or so.
> > >
> > > I'll test your theory but at first glance it sounds like going
> > in the
> > > right direction.
> >
> > No rush. I'd rather take time and get this right.
> >
> > Thanks,
> >
> > Mark
> >
> >
> > >
> > > - Ray
> > >
> > > On Thu, Jun 11, 2020 at 5:08 PM Mark Thomas  > 
> > > >> wrote:
> > >
> > > On 11/06/2020 21:59, Mark Thomas wrote:
> > > > On 11/06/2020 21:24, Raymond Auge wrote:
> > > >> This can totally be fixed in configuration. There is no
> > problem.
> > > I just
> > > >> wanted to make sure that in doing so we wouldn't just
> > be pushing some
> > > >> dirt under the rug so to speak.
> > > >
> > > > I'm concerned we might be doing exactly that now we are
> > heading into a
> > > > JPMS world and this seems like an opportunity to pause
> > and see if
> > > there
> > > > is a better way.
> > > >
> > > > I've yet to get my head around JPMS and I might be
> > mis-remembering
> > > some
> > > > of the things I have read.
> > > >
> > > > bootstrap.jar has everything it needs to start, create
> > the class
> > > loader
> > > > hierarchy, switch to the catalinaLoader (which can see
> > all the JARs
> > > > rather than just bootstrap.jar and tomcat-juli.jar) and
> > then continue
> > > > with start-up.
> > > >
> > > > It does things this way because the class loader
> > hierarchy and the
> > > > configuration of the class loaders is configurable. So
> > we can't
> > > just put
> > > > everything on the class path before starting the JVM.
> > > >
> > > > Any static analysis of bootstrap.jar is always going to
> > show it having
> > > > dependencies that won't be visible until Tomcat starts
> > and the
> > > > catalinaLoader is up and running. To what extent does
> > this cause
> > > > complications for JPMS and/or OSGi?
> > > >
> > > > Is this completely manageable with configuration? If it
> > is, I
> > > think I'd
> > > > lean towards a configuration based solution primarily
> > for backwards
> > > > compatibility reasons. What are the arguments against
> > this approach?
> > > >
> > > > If this completely manageable with configuration are
> > there any
> > > > particular classes that are causing more than their fair
> > share of pain
> > > > where a small packaging change would provide a
> > relatively large
> > > benefit?
> > >
> > > Sorry. More thoughts occurred to me as I looked at the PRs
> > again.
> > >
> > > If we created o.a.c.startup.Constants, defined the
> > constants required by
> > > the bootstrap classes there and 

[Bug 64514] classes missing from bootstrap.jar

2020-06-13 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64514

--- Comment #2 from rotty3000  ---
This issue was discussed on list and determined that if the missing parts being
small and benign enough to copy into bootstrap, that might be the best solution
as proposed by @markt:

> If we created o.a.c.startup.Constants, defined the constants required by
> the bootstrap classes there and then referenced those from o.a.c.Globals
> would that help?

It did!

> Is it Tool's use of ExceptionUtils that is causing that class to be
> needed? If so would making Bootstrap.handleThrowable() package private
> and using that instead help?

It does!

I've tested these changed and they solve the packaging issue for both OSGi and
JPMS.

PR update coming.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 64514] classes missing from bootstrap.jar

2020-06-13 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=64514

--- Comment #3 from rotty3000  ---
The outcome is essentially that both in usage and now in terms of real java
dependencies, bootstrap has no dependencies outside of java.base and
tomcat-juli.jar

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: Bootstrap and modules

2020-06-13 Thread Raymond Auge
Please see updated https://github.com/apache/tomcat/pull/296

- Ray

On Sat, Jun 13, 2020 at 3:35 PM Raymond Auge 
wrote:

> Hey Mark, I tested those changes and they solve the packaging issue for
> both jpms and OSGi.
>
> I'll update the pr to reflect the change later today I hope.
>
> I did encounter some further jpms related issues but those were beyond
> packaging and need other questions answered before moving forward.
>
> - Ray
>
> On Sat, Jun 13, 2020, 12:49 Mark Thomas,  wrote:
>
>> On 13/06/2020 03:53, Raymond Auge wrote:
>> > Actually Bootstrap has a comment
>> >
>> > // Copied from ExceptionUtils since that class is not visible during
>> start
>> >
>> > So it seems like perhaps the change should be ported.
>>
>> Agreed. So if we do that and make the other changes I outlined where
>> does that leave things from a JPMS / OSGi point of view?
>>
>> Mark
>>
>>
>> >
>> >  - Ray
>> >
>> > On Fri, Jun 12, 2020 at 10:45 PM Raymond Auge > > > wrote:
>> >
>> > There is one difference between
>> >
>> > org.apache.tomcat.util.ExceptionUtils.handleThrowable(Throwable)
>> >
>> > and
>> >
>> > org.apache.catalina.startup.Bootstrap.handleThrowable(Throwable)
>> >
>> > that is that ExceptionUtils also swallows StackOverflowError while
>> > Bootstrap does not.
>> > Should that be ported over or is it a deal breaker? An option would
>> > be to add an additional method to Bootstrap that behaves like
>> > ExceptionUtils.
>> >
>> > - Ray
>> >
>> >
>> > On Fri, Jun 12, 2020 at 9:27 AM Mark Thomas > > > wrote:
>> >
>> > On 12/06/2020 14:15, Raymond Auge wrote:
>> > > Hey Mark,
>> > >
>> > > I'll have to get back to this convo in a day or so.
>> > >
>> > > I'll test your theory but at first glance it sounds like going
>> > in the
>> > > right direction.
>> >
>> > No rush. I'd rather take time and get this right.
>> >
>> > Thanks,
>> >
>> > Mark
>> >
>> >
>> > >
>> > > - Ray
>> > >
>> > > On Thu, Jun 11, 2020 at 5:08 PM Mark Thomas > > 
>> > > >> wrote:
>> > >
>> > > On 11/06/2020 21:59, Mark Thomas wrote:
>> > > > On 11/06/2020 21:24, Raymond Auge wrote:
>> > > >> This can totally be fixed in configuration. There is no
>> > problem.
>> > > I just
>> > > >> wanted to make sure that in doing so we wouldn't just
>> > be pushing some
>> > > >> dirt under the rug so to speak.
>> > > >
>> > > > I'm concerned we might be doing exactly that now we are
>> > heading into a
>> > > > JPMS world and this seems like an opportunity to pause
>> > and see if
>> > > there
>> > > > is a better way.
>> > > >
>> > > > I've yet to get my head around JPMS and I might be
>> > mis-remembering
>> > > some
>> > > > of the things I have read.
>> > > >
>> > > > bootstrap.jar has everything it needs to start, create
>> > the class
>> > > loader
>> > > > hierarchy, switch to the catalinaLoader (which can see
>> > all the JARs
>> > > > rather than just bootstrap.jar and tomcat-juli.jar) and
>> > then continue
>> > > > with start-up.
>> > > >
>> > > > It does things this way because the class loader
>> > hierarchy and the
>> > > > configuration of the class loaders is configurable. So
>> > we can't
>> > > just put
>> > > > everything on the class path before starting the JVM.
>> > > >
>> > > > Any static analysis of bootstrap.jar is always going to
>> > show it having
>> > > > dependencies that won't be visible until Tomcat starts
>> > and the
>> > > > catalinaLoader is up and running. To what extent does
>> > this cause
>> > > > complications for JPMS and/or OSGi?
>> > > >
>> > > > Is this completely manageable with configuration? If it
>> > is, I
>> > > think I'd
>> > > > lean towards a configuration based solution primarily
>> > for backwards
>> > > > compatibility reasons. What are the arguments against
>> > this approach?
>> > > >
>> > > > If this completely manageable with configuration are
>> > there any
>> > > > particular classes that are causing more than their fair
>> > share of pain
>> > > > where a small packaging change would provide a
>> > relatively large
>> > > benefit?
>> > >

Re: Bootstrap classloader hierarchy and split packages

2020-06-13 Thread Raymond Auge
Forgive me if this is a well worn topic.

- Ray

On Sat, Jun 13, 2020 at 8:58 PM Raymond Auge 
wrote:

> Hello Tomcat Devs,
>
> Is it expected that when Bootstrap.init() invokes
> "org.apache.catalina.startup.Catalina"'s constructor (which it finds in
> catalina.jar) via reflection through catalinaLoader that some of the
> classes in the package org.apache.catalina.startup, originating in
> bootstrap.jar, are still used by classes loaded by the new classloader?
>
> The result is that there are now two jars in runtime loaded by two
> separate containers sharing classes from the same package.
>
> I just want to make sure this is by choice and not accidental because this
> is going to cause problems for both JPMS and OSGi and I need to figure out
> how to deal with it. The first thing that might need to happen is that
> bootstrap may need to export some of it's packages which will certainly
> result in a split package scenario (since other modules already provide
> those same packages). As you can guess in both module systems split
> packages are a challenge.
>
> Thx
> --
> *Raymond Augé* 
>  (@rotty3000)
> Senior Software Architect *Liferay, Inc.* 
>  (@Liferay)
>


-- 
*Raymond Augé* 
 (@rotty3000)
Senior Software Architect *Liferay, Inc.* 
 (@Liferay)


Bootstrap classloader hierarchy and split packages

2020-06-13 Thread Raymond Auge
Hello Tomcat Devs,

Is it expected that when Bootstrap.init() invokes
"org.apache.catalina.startup.Catalina"'s constructor (which it finds in
catalina.jar) via reflection through catalinaLoader that some of the
classes in the package org.apache.catalina.startup, originating in
bootstrap.jar, are still used by classes loaded by the new classloader?

The result is that there are now two jars in runtime loaded by two separate
containers sharing classes from the same package.

I just want to make sure this is by choice and not accidental because this
is going to cause problems for both JPMS and OSGi and I need to figure out
how to deal with it. The first thing that might need to happen is that
bootstrap may need to export some of it's packages which will certainly
result in a split package scenario (since other modules already provide
those same packages). As you can guess in both module systems split
packages are a challenge.

Thx
-- 
*Raymond Augé* 
 (@rotty3000)
Senior Software Architect *Liferay, Inc.* 
 (@Liferay)


Re: Bootstrap classloader hierarchy and split packages

2020-06-13 Thread Raymond Auge
Ok, I guess you can ignore this question because I think the conclusion is
that bootstrap cannot be used in JPMS at all.

I have figured out a boot process-ish and I can see things a little more
clearly now.

- Ray

On Sat, Jun 13, 2020 at 9:12 PM Raymond Auge 
wrote:

> Forgive me if this is a well worn topic.
>
> - Ray
>
> On Sat, Jun 13, 2020 at 8:58 PM Raymond Auge 
> wrote:
>
>> Hello Tomcat Devs,
>>
>> Is it expected that when Bootstrap.init() invokes
>> "org.apache.catalina.startup.Catalina"'s constructor (which it finds in
>> catalina.jar) via reflection through catalinaLoader that some of the
>> classes in the package org.apache.catalina.startup, originating in
>> bootstrap.jar, are still used by classes loaded by the new classloader?
>>
>> The result is that there are now two jars in runtime loaded by two
>> separate containers sharing classes from the same package.
>>
>> I just want to make sure this is by choice and not accidental because
>> this is going to cause problems for both JPMS and OSGi and I need to figure
>> out how to deal with it. The first thing that might need to happen is that
>> bootstrap may need to export some of it's packages which will certainly
>> result in a split package scenario (since other modules already provide
>> those same packages). As you can guess in both module systems split
>> packages are a challenge.
>>
>> Thx
>> --
>> *Raymond Augé* 
>>  (@rotty3000)
>> Senior Software Architect *Liferay, Inc.* 
>>  (@Liferay)
>>
>
>
> --
> *Raymond Augé* 
>  (@rotty3000)
> Senior Software Architect *Liferay, Inc.* 
>  (@Liferay)
>


-- 
*Raymond Augé* 
 (@rotty3000)
Senior Software Architect *Liferay, Inc.* 
 (@Liferay)