From 6cbdfb7e6db1d20aeb188b1304157c2ae9db19d7 Mon Sep 17 00:00:00 2001 From: Greg Richardson Date: Thu, 22 Feb 2007 19:39:55 +0000 Subject: [PATCH] Log4j related changes --- .../server-java/Jaas/windows/Makefile.am | 162 +++++++++--------- .../Svc/templates/windows/Makefile.am | 3 +- .../Svc/templates/windows/log4j.properties | 20 +++ .../server-java/Svc/windows/Makefile.am | 2 +- .../SetupAsWindowsService.java | 6 + .../server-java_msi/server-java_msi.vdproj | 40 +++++ 6 files changed, 150 insertions(+), 83 deletions(-) create mode 100644 CASA-auth-token/server-java/Svc/templates/windows/log4j.properties diff --git a/CASA-auth-token/server-java/Jaas/windows/Makefile.am b/CASA-auth-token/server-java/Jaas/windows/Makefile.am index 09200af9..b6989508 100644 --- a/CASA-auth-token/server-java/Jaas/windows/Makefile.am +++ b/CASA-auth-token/server-java/Jaas/windows/Makefile.am @@ -1,81 +1,81 @@ -####################################################################### -# -# Copyright (C) 2006 Novell, Inc. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This program 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 -# General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free -# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# -####################################################################### - -SUBDIRS = -DIST_SUBDIRS = - -EXTRA_DIST = - -ROOT = ../.. -LIB = lib - -LIBDIR = $(ROOT)/$(LIB) - -JAVAC= javac - -MODULE_NAME = CasaJaasSupport -MODULE_EXT = jar - -JAVAFILES = ../src/com/novell/casa/jaas/CasaLoginModule.java \ - ../src/com/novell/casa/jaas/CasaPrincipal.java - -BUILDDIR = ../build - -CLASSES = $(addprefix $(BUILDDIR)/, $(JAVAFILES:%.java=%.class)) - -LIBS = -CLASSPATH = $(LIBDIR)/java/CasaAuthToken.jar;$(LIBS) - -CUR_DIR := $(shell pwd) - -all: $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT) - -$(BUILDDIR)/%.class: %.java - @echo [======== Compiling $@ ========] - $(JAVAC) -g -sourcepath ../src -classpath "$(CLASSPATH)" -d $(BUILDDIR)/classes $< - -$(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT): $(BUILDDIR) $(CLASSES) - @echo [======== Jarring $@ ========] - jar cvf $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT) -C $(BUILDDIR)/classes . - cp $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT) $(LIBDIR)/java/ - -$(BUILDDIR): - [ -d $(BUILDDIR) ] || mkdir -p $(BUILDDIR) - [ -d $(BUILDDIR)/classes ] || mkdir -p $(BUILDDIR)/classes - [ -d $(LIBDIR) ] || mkdir -p $(LIBDIR) - [ -d $(LIBDIR)/java ] || mkdir -p $(LIBDIR)/java - -install-exec-local: - -uninstall-local: - -#installcheck-local: install - -clean-local: - if [ -d $(BUILDDIR) ]; then rm -rf $(BUILDDIR); fi - if [ -f $(LIBDIR)/java/$(MODULE_NAME).$(MODULE_EXT) ]; then rm -f $(LIBDIR)/java/$(MODULE_NAME).$(MODULE_EXT); fi - -distclean-local: - -maintainer-clean-local: - rm -f Makefile.in - rm -f Makefile - +####################################################################### +# +# Copyright (C) 2006 Novell, Inc. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This program 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 +# General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free +# Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# +# +####################################################################### + +SUBDIRS = +DIST_SUBDIRS = + +EXTRA_DIST = + +ROOT = ../.. +LIB = lib + +LIBDIR = $(ROOT)/$(LIB) + +JAVAC= javac + +MODULE_NAME = CasaJaasSupport +MODULE_EXT = jar + +JAVAFILES = ../src/com/novell/casa/jaas/CasaLoginModule.java \ + ../src/com/novell/casa/jaas/CasaPrincipal.java + +BUILDDIR = ../build + +CLASSES = $(addprefix $(BUILDDIR)/, $(JAVAFILES:%.java=%.class)) + +LIBS = ..\..\Svc\external\log4j-1.2.8.jar +CLASSPATH = $(LIBDIR)/java/CasaAuthToken.jar;$(LIBS) + +CUR_DIR := $(shell pwd) + +all: $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT) + +$(BUILDDIR)/%.class: %.java + @echo [======== Compiling $@ ========] + $(JAVAC) -g -sourcepath ../src -classpath "$(CLASSPATH)" -d $(BUILDDIR)/classes $< + +$(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT): $(BUILDDIR) $(CLASSES) + @echo [======== Jarring $@ ========] + jar cvf $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT) -C $(BUILDDIR)/classes . + cp $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT) $(LIBDIR)/java/ + +$(BUILDDIR): + [ -d $(BUILDDIR) ] || mkdir -p $(BUILDDIR) + [ -d $(BUILDDIR)/classes ] || mkdir -p $(BUILDDIR)/classes + [ -d $(LIBDIR) ] || mkdir -p $(LIBDIR) + [ -d $(LIBDIR)/java ] || mkdir -p $(LIBDIR)/java + +install-exec-local: + +uninstall-local: + +#installcheck-local: install + +clean-local: + if [ -d $(BUILDDIR) ]; then rm -rf $(BUILDDIR); fi + if [ -f $(LIBDIR)/java/$(MODULE_NAME).$(MODULE_EXT) ]; then rm -f $(LIBDIR)/java/$(MODULE_NAME).$(MODULE_EXT); fi + +distclean-local: + +maintainer-clean-local: + rm -f Makefile.in + rm -f Makefile + diff --git a/CASA-auth-token/server-java/Svc/templates/windows/Makefile.am b/CASA-auth-token/server-java/Svc/templates/windows/Makefile.am index 20dde242..ec7775d1 100644 --- a/CASA-auth-token/server-java/Svc/templates/windows/Makefile.am +++ b/CASA-auth-token/server-java/Svc/templates/windows/Makefile.am @@ -31,7 +31,8 @@ EXTRA_DIST = CasaAuthPolicyEditor.bat \ CasaIdenTokenSettingsEditor.bat \ CasaSvcSettingsEditor.bat \ startup.bat \ - shutdown.bat + shutdown.bat \ + log4j.properties .PHONY: package package-clean package-install package-uninstall package package-clean package-install package-uninstall: diff --git a/CASA-auth-token/server-java/Svc/templates/windows/log4j.properties b/CASA-auth-token/server-java/Svc/templates/windows/log4j.properties new file mode 100644 index 00000000..e37a050d --- /dev/null +++ b/CASA-auth-token/server-java/Svc/templates/windows/log4j.properties @@ -0,0 +1,20 @@ +######################################################## +# +# log4j properties +# +######################################################## + +# +# Root logger configuration. +# +log4j.rootLogger=info, DefaultAppender + +# +# DefaultAppender configuration. +# +log4j.appender.DefaultAppender=org.apache.log4j.RollingFileAppender +log4j.appender.DefaultAppender.File=ATS_INSTALL_DIRats/catalinabase/logs/ats.log +log4j.appender.DefaultAppender.MaxFileSize=100KB +log4j.appender.DefaultAppender.MaxBackupIndex=2 +log4j.appender.DefaultAppender.layout=org.apache.log4j.PatternLayout +log4j.appender.DefaultAppender.layout.ConversionPattern=%d{ISO8601} %p %C{2} %m%n diff --git a/CASA-auth-token/server-java/Svc/windows/Makefile.am b/CASA-auth-token/server-java/Svc/windows/Makefile.am index edc23380..953260a6 100644 --- a/CASA-auth-token/server-java/Svc/windows/Makefile.am +++ b/CASA-auth-token/server-java/Svc/windows/Makefile.am @@ -123,7 +123,7 @@ CLASSES = $(addprefix $(BUILDDIR)/, $(JAVAFILES:%.java=%.class)) AXIS_LIBS = $(AXIS_JARS_DIR)/axis.jar;$(AXIS_JARS_DIR)/saaj.jar;$(AXIS_JARS_DIR)/wss4j-1.5.0.jar;$(AXIS_JARS_DIR)/xml-apis.jar;$(AXIS_JARS_DIR)/xmlsec-1.2.1.jar;$(AXIS_JARS_DIR)/xercesImpl.jar #AXIS_LIBS = $(AXIS_JARS_DIR)/wss4j-1.5.0.jar -LIBS = $(TOMCAT_DIR)/servlet-api.jar +LIBS = $(TOMCAT_DIR)/servlet-api.jar;../external/log4j-1.2.8.jar CLASSPATH = $(AXIS_LIBS);$(IDENT_ABSTRACTION_DIR)/identity-abstraction.jar;$(IDENT_ABSTRACTION_DIR)/bandit-util.jar;$(IDENT_ABSTRACTION_DIR)/castor-1.0.4.jar;$(LIBS) CUR_DIR := $(shell pwd) diff --git a/CASA-auth-token/server-java/package/windows/SetupAsWindowsService/SetupAsWindowsService.java b/CASA-auth-token/server-java/package/windows/SetupAsWindowsService/SetupAsWindowsService.java index 2fc2b23e..1b732897 100644 --- a/CASA-auth-token/server-java/package/windows/SetupAsWindowsService/SetupAsWindowsService.java +++ b/CASA-auth-token/server-java/package/windows/SetupAsWindowsService/SetupAsWindowsService.java @@ -324,6 +324,12 @@ public class SetupAsWindowsService return iReturn; } + sCommand = sExe + " //US//CasaAuthTokenService ++JvmOptions \"-Dlog4j.configuration=file:" + sDirInstall + "/ats/etc/log4j.properties"; + if (ERROR_NO_ERROR != (iReturn = invokeCommand(sCommand))) + { + return iReturn; + } + sCommand = sExe + " //US//CasaAuthTokenService ++JvmOptions \"-Djava.io.tmpdir=" + sDirCatalinaBase+ "/temp\""; if (ERROR_NO_ERROR != (iReturn = invokeCommand(sCommand))) { diff --git a/CASA-auth-token/server-java/package/windows/server-java_msi/server-java_msi.vdproj b/CASA-auth-token/server-java/package/windows/server-java_msi/server-java_msi.vdproj index df2154bb..5deeb0d1 100644 --- a/CASA-auth-token/server-java/package/windows/server-java_msi/server-java_msi.vdproj +++ b/CASA-auth-token/server-java/package/windows/server-java_msi/server-java_msi.vdproj @@ -207,6 +207,12 @@ } "Entry" { + "MsmKey" = "8:_9C8919B94D6848F8A4EBFE340828E1FB" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_9CDF186732904E43A4D641CE90A04327" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -460,6 +466,20 @@ "InstallerClass" = "11:FALSE" "CustomActionData" = "8:" } + "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_25F52A1B54234255AB51404D52AA4CBE" + { + "Name" = "8:CommandLauncher.exe )InitConfigFile - ats.log)" + "Condition" = "8:" + "Object" = "8:_32E2D317FBCD4B25904D5402E547B8A8" + "FileType" = "3:2" + "InstallAction" = "3:1" + "Arguments" = "8:[ATS_JAVA_EXE] -cp [TARGETDIR]ats\\bin InitConfigFile ATS_INSTALL_DIR=[TARGETDIR] propertyfile=[PROPERTYFILE] template=[TARGETDIR]ats\\etc\\svc\\templates\\log4j.properties output=[TARGETDIR]ats\\etc\\log4j.properties" + "EntryPoint" = "8:" + "Sequence" = "3:17" + "Identifier" = "8:_EB425F32_F807_4C36_AC86_B75AEEEC7D29" + "InstallerClass" = "11:FALSE" + "CustomActionData" = "8:" + } "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_36863141C9454EFC8202B71293813223" { "Name" = "8:CommandLauncher.exe (DeleteFile - CasaSvcSettingsEditor.bat)" @@ -1479,6 +1499,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9C8919B94D6848F8A4EBFE340828E1FB" + { + "SourcePath" = "8:..\\..\\..\\Svc\\templates\\windows\\log4j.properties" + "TargetName" = "8:log4j.properties" + "Tag" = "8:" + "Folder" = "8:_DB2EB303AA7A4FA0874CCF7DE23125AB" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9CDF186732904E43A4D641CE90A04327" { "SourcePath" = "8:..\\..\\..\\Svc\\templates\\identoken.settings"