From de3e4457c3a31f9be8cbe7e2c89f55cd8a973199 Mon Sep 17 00:00:00 2001 From: Juan Carlos Luciani Date: Tue, 16 Jan 2007 11:21:37 +0000 Subject: [PATCH] Fixed file eol-style problems as well as issues introduced in the makesystem with the Windows Install check-in. --- CASA-auth-token/server-java/Jaas/Makefile.am | 84 +- .../server-java/Jaas/linux/Makefile.am | 170 ++-- .../server-java/Jaas/windows/Makefile.am | 162 ++-- CASA-auth-token/server-java/Svc/Makefile.am | 2 +- .../server-java/Svc/tomcat5/conf/Makefile.am | 86 +- .../Svc/tomcat5/conf/windows/Makefile.am | 74 +- .../Svc/tomcat5/conf/windows/server-sun.xml | 764 +++++++-------- .../server-java/Svc/windows/Makefile.am | 418 ++++----- .../server-java/Svc/windows/crypto.properties | 12 +- CASA-auth-token/server-java/configure.in | 604 ++++++------ .../server-java/package/Makefile.am | 76 +- .../windows/ClientKeystoreSetup/Makefile.am | 138 +-- .../windows/InitConfigFile/Makefile.am | 138 +-- .../windows/InitConfigFile/Program.jsl | 884 +++++++++--------- .../server-java/package/windows/Makefile.am | 88 +- .../MungeCryptoPropertiesFilePath/Makefile.am | 138 +-- .../MungeCryptoPropertiesFilePath/Program.jsl | 624 ++++++------- .../windows/ServerKeystoreSetup/Makefile.am | 138 +-- .../package/windows/UpdateWarFile/Makefile.am | 138 +-- .../package/windows/UpdateWarFile/Program.jsl | 834 ++++++++--------- .../windows/server-java_msi/Makefile.am | 138 +-- 21 files changed, 2855 insertions(+), 2855 deletions(-) diff --git a/CASA-auth-token/server-java/Jaas/Makefile.am b/CASA-auth-token/server-java/Jaas/Makefile.am index e7e619da..aaea1e90 100644 --- a/CASA-auth-token/server-java/Jaas/Makefile.am +++ b/CASA-auth-token/server-java/Jaas/Makefile.am @@ -1,42 +1,42 @@ -####################################################################### -# -# 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 = src $(TARGET_OS) - -DIST_SUBDIRS = src linux windows - -EXTRA_DIST = $(JAVAFILES) \ - make_test.sh \ - run_test.sh - -JAVAFILES = src/com/novell/casa/jaas/CasaLoginModule.java \ - src/com/novell/casa/jaas/CasaPrincipal.java - -.PHONY: package package-clean package-install package-uninstall -package package-clean package-install package-uninstall: - $(MAKE) -C $(TARGET_OS) $@ - -clean-local: - if [ -d lib ]; then rm -rf lib; fi - -maintainer-clean-local: - rm -f Makefile.in - +####################################################################### +# +# 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 = src $(TARGET_OS) + +DIST_SUBDIRS = src linux windows + +EXTRA_DIST = $(JAVAFILES) \ + make_test.sh \ + run_test.sh + +JAVAFILES = src/com/novell/casa/jaas/CasaLoginModule.java \ + src/com/novell/casa/jaas/CasaPrincipal.java + +.PHONY: package package-clean package-install package-uninstall +package package-clean package-install package-uninstall: + $(MAKE) -C $(TARGET_OS) $@ + +clean-local: + if [ -d lib ]; then rm -rf lib; fi + +maintainer-clean-local: + rm -f Makefile.in + diff --git a/CASA-auth-token/server-java/Jaas/linux/Makefile.am b/CASA-auth-token/server-java/Jaas/linux/Makefile.am index 2ffc6e3e..064dca06 100644 --- a/CASA-auth-token/server-java/Jaas/linux/Makefile.am +++ b/CASA-auth-token/server-java/Jaas/linux/Makefile.am @@ -1,85 +1,85 @@ -####################################################################### -# -# 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. -# -# Author: Juan Carlos Luciani -# -####################################################################### - -SUBDIRS = - -DIST_SUBDIRS = - -CFILES = - -EXTRA_DIST = client_keystore_setup.sh \ - crypto.properties - - -ROOT = ../.. - -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) - -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. +# +# Author: Juan Carlos Luciani +# +####################################################################### + +SUBDIRS = + +DIST_SUBDIRS = + +CFILES = + +EXTRA_DIST = client_keystore_setup.sh \ + crypto.properties + + +ROOT = ../.. + +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) + +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/Jaas/windows/Makefile.am b/CASA-auth-token/server-java/Jaas/windows/Makefile.am index 432d22f1..09200af9 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 = +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/Makefile.am b/CASA-auth-token/server-java/Svc/Makefile.am index 27f7e977..1bcde1de 100644 --- a/CASA-auth-token/server-java/Svc/Makefile.am +++ b/CASA-auth-token/server-java/Svc/Makefile.am @@ -20,7 +20,7 @@ ####################################################################### SUBDIRS = src -DIST_SUBDIRS = src external tomcat5 linux manifest templates +DIST_SUBDIRS = src external tomcat5 linux manifest templates windows EXTRA_DIST = README \ TODO \ diff --git a/CASA-auth-token/server-java/Svc/tomcat5/conf/Makefile.am b/CASA-auth-token/server-java/Svc/tomcat5/conf/Makefile.am index 6fc87482..4b0edf6d 100644 --- a/CASA-auth-token/server-java/Svc/tomcat5/conf/Makefile.am +++ b/CASA-auth-token/server-java/Svc/tomcat5/conf/Makefile.am @@ -1,43 +1,43 @@ -####################################################################### -# -# 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. -# -# Author: Juan Carlos Luciani -# -####################################################################### - -SUBDIRS = $(TARGET_OS) - -DIST_SUBDIRS = Catalina linux windows - -CFILES = - -EXTRA_DIST = catalina.policy \ - catalina.properties \ - jk2.properties \ - server.xml \ - server-minimal.xml \ - tomcat-users.xml \ - web.xml - -.PHONY: package package-clean package-install package-uninstall -package package-clean package-install package-uninstall: - $(MAKE) -C $(TARGET_OS) $@ - -maintainer-clean-local: - rm -f Makefile.in - +####################################################################### +# +# 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. +# +# Author: Juan Carlos Luciani +# +####################################################################### + +SUBDIRS = $(TARGET_OS) + +DIST_SUBDIRS = Catalina linux windows + +CFILES = + +EXTRA_DIST = catalina.policy \ + catalina.properties \ + jk2.properties \ + server.xml \ + server-minimal.xml \ + tomcat-users.xml \ + web.xml + +.PHONY: package package-clean package-install package-uninstall +package package-clean package-install package-uninstall: + $(MAKE) -C $(TARGET_OS) $@ + +maintainer-clean-local: + rm -f Makefile.in + diff --git a/CASA-auth-token/server-java/Svc/tomcat5/conf/windows/Makefile.am b/CASA-auth-token/server-java/Svc/tomcat5/conf/windows/Makefile.am index 1d7f1050..1308db3f 100644 --- a/CASA-auth-token/server-java/Svc/tomcat5/conf/windows/Makefile.am +++ b/CASA-auth-token/server-java/Svc/tomcat5/conf/windows/Makefile.am @@ -1,37 +1,37 @@ -####################################################################### -# -# 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. -# -# Author: Greg Richardson -# -####################################################################### - -SUBDIRS = - -DIST_SUBDIRS = - -CFILES = - -EXTRA_DIST = server-sun.xml - -.PHONY: package package-clean package-install package-uninstall -package package-clean package-install package-uninstall: - $(MAKE) -C $(TARGET_OS) $@ - -maintainer-clean-local: - rm -f Makefile.in - +####################################################################### +# +# 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. +# +# Author: Greg Richardson +# +####################################################################### + +SUBDIRS = + +DIST_SUBDIRS = + +CFILES = + +EXTRA_DIST = server-sun.xml + +.PHONY: package package-clean package-install package-uninstall +package package-clean package-install package-uninstall: + $(MAKE) -C $(TARGET_OS) $@ + +maintainer-clean-local: + rm -f Makefile.in + diff --git a/CASA-auth-token/server-java/Svc/tomcat5/conf/windows/server-sun.xml b/CASA-auth-token/server-java/Svc/tomcat5/conf/windows/server-sun.xml index ea974c70..ba2bd301 100644 --- a/CASA-auth-token/server-java/Svc/tomcat5/conf/windows/server-sun.xml +++ b/CASA-auth-token/server-java/Svc/tomcat5/conf/windows/server-sun.xml @@ -1,382 +1,382 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CASA-auth-token/server-java/Svc/windows/Makefile.am b/CASA-auth-token/server-java/Svc/windows/Makefile.am index c2e96609..e732d89e 100644 --- a/CASA-auth-token/server-java/Svc/windows/Makefile.am +++ b/CASA-auth-token/server-java/Svc/windows/Makefile.am @@ -1,209 +1,209 @@ -####################################################################### -# -# 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. -# -# Author: Greg Richardson -# -####################################################################### - -SUBDIRS = - -DIST_SUBDIRS = - -CFILES = - -EXTRA_DIST = crypto.properties - -ROOT = ../.. - -LIBDIR = $(ROOT)/$(LIB) - -IDENT_ABSTRACTION_DIR = $(BANDIT_DIR) -#AXIS_JARS_DIR = $(PWD)/external -AXIS_JARS_DIR = ../external - - -MANIFEST_DIR = ../manifest - -JAVAC= javac - -WEBAPP_NAME = CasaAuthTokenSvc -WEBAPP_EXT = war -MODULE_NAME = CasaAuthToken -MODULE_EXT = jar -AUTH_TOKEN_SETTINGS_EDITOR_MODULE_NAME = CasaAuthTokenSettingsEditor -IDEN_TOKEN_SETTINGS_EDITOR_MODULE_NAME = CasaIdenTokenSettingsEditor -SVC_SETTINGS_EDITOR_MODULE_NAME = CasaSvcSettingsEditor -AUTH_POLICY_EDITOR_MODULE_NAME = CasaAuthPolicyEditor - -JAVAFILES = ../src/com/novell/casa/authtoksvc/ProtoDefs.java \ - ../src/com/novell/casa/authtoksvc/AuthMechConfig.java \ - ../src/com/novell/casa/authtoksvc/SvcConfig.java \ - ../src/com/novell/casa/authtoksvc/IdenTokenConfig.java \ - ../src/com/novell/casa/authtoksvc/AuthTokenConfig.java \ - ../src/com/novell/casa/authtoksvc/EnabledSvcsConfig.java \ - ../src/com/novell/casa/authtoksvc/AuthMechanism.java \ - ../src/com/novell/casa/authtoksvc/WSSecurity.java \ - ../src/com/novell/casa/authtoksvc/SessionToken.java \ - ../src/com/novell/casa/authtoksvc/Authenticate.java \ - ../src/com/novell/casa/authtoksvc/RpcMethod.java \ - ../src/com/novell/casa/authtoksvc/Rpc.java \ - ../src/com/novell/casa/authtoksvc/GetAuthPolicy.java \ - ../src/com/novell/casa/authtoksvc/Base64Coder.java \ - ../src/com/novell/casa/authtoksvc/AuthReqMsg.java \ - ../src/com/novell/casa/authtoksvc/AuthRespMsg.java \ - ../src/com/novell/casa/authtoksvc/IdentityToken.java \ - ../src/com/novell/casa/authtoksvc/CasaIdentityToken.java \ - ../src/com/novell/casa/authtoksvc/AuthToken.java \ - ../src/com/novell/casa/authtoksvc/GetAuthPolicyReqMsg.java \ - ../src/com/novell/casa/authtoksvc/GetAuthPolicyRespMsg.java \ - ../src/com/novell/casa/authtoksvc/GetAuthToken.java \ - ../src/com/novell/casa/authtoksvc/GetAuthTokReqMsg.java \ - ../src/com/novell/casa/authtoksvc/GetAuthTokRespMsg.java \ - ../src/com/novell/casa/authtoksvc/Krb5Authenticate.java \ - ../src/com/novell/casa/authtoksvc/PwdAuthenticate.java \ - ../src/com/novell/casa/authtoksvc/IVerifySetting.java \ - ../src/com/novell/casa/authtoksvc/SettingsFileUtil.java \ - ../src/com/novell/casa/authtoksvc/SettingsFileSAXHandler.java \ - ../src/com/novell/casa/authtoksvc/AuthPolicyEditor.java \ - ../src/com/novell/casa/authtoksvc/AuthTokenSettingsEditor.java \ - ../src/com/novell/casa/authtoksvc/IdenTokenSettingsEditor.java \ - ../src/com/novell/casa/authtoksvc/SvcSettingsEditor.java - -BUILDDIR = ../build - -AUTHTOKEN_FILES = -C $(BUILDDIR)/webapp/WEB-INF/classes com - -AUTH_TOKEN_SETTINGS_EDITOR_FILES = -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/IVerifySetting.class \ - -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/SettingsFileUtil.class \ - -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/AuthTokenSettingsEditor.class \ - -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/AuthTokenConfig.class - -IDEN_TOKEN_SETTINGS_EDITOR_FILES = -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/IVerifySetting.class \ - -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/SettingsFileUtil.class \ - -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/IdenTokenSettingsEditor.class \ - -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/IdenTokenConfig.class - -SVC_SETTINGS_EDITOR_FILES = -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/IVerifySetting.class \ - -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/SettingsFileUtil.class \ - -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/SvcSettingsEditor.class \ - -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/SvcConfig.class - -AUTH_POLICY_EDITOR_FILES = -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/AuthPolicyEditor.class - -WEBAPP = $(WEBAPP_NAME).$(WEBAPP_EXT) - -AUTH_TOKEN_SETTINGS_EDITOR = $(AUTH_TOKEN_SETTINGS_EDITOR_MODULE_NAME).$(MODULE_EXT) - -IDEN_TOKEN_SETTINGS_EDITOR = $(IDEN_TOKEN_SETTINGS_EDITOR_MODULE_NAME).$(MODULE_EXT) - -SVC_SETTINGS_EDITOR = $(SVC_SETTINGS_EDITOR_MODULE_NAME).$(MODULE_EXT) - -AUTH_POLICY_EDITOR = $(AUTH_POLICY_EDITOR_MODULE_NAME).$(MODULE_EXT) - -CLASSES = $(addprefix $(BUILDDIR)/, $(JAVAFILES:%.java=%.class)) - -#AXIS_LIBS = $(AXIS_JARS_DIR)/axis.jar:$(AXIS_JARS_DIR)/axis-ant.jar:$(AXIS_JARS_DIR)/commons-discovery-0.2.jar:$(AXIS_JARS_DIR)/commons-logging-1.0.4.jar:$(AXIS_JARS_DIR)/commons-logging-api.jar:$(AXIS_JARS_DIR)/jaxrpc.jar:$(AXIS_JARS_DIR)/log4j-1.2.8.jar:$(AXIS_JARS_DIR)/saaj.jar:$(AXIS_JARS_DIR)/wsdl4j-1.5.1.jar:$(AXIS_JARS_DIR)/wss4j-1.5.0.jar:$(AXIS_JARS_DIR)/xalan.jar:$(AXIS_JARS_DIR)/xercesImpl.jar:$(AXIS_JARS_DIR)/xml-apis.jar:$(AXIS_JARS_DIR)/xmlsec-1.2.1.jar -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 -CLASSPATH = $(AXIS_LIBS);$(IDENT_ABSTRACTION_DIR)/identity-abstraction.jar;$(IDENT_ABSTRACTION_DIR)/bandit-util.jar;$(LIBS) - -CUR_DIR := $(shell pwd) - -all: $(BUILDDIR)/$(WEBAPP) $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT) $(BUILDDIR)/$(AUTH_TOKEN_SETTINGS_EDITOR) $(BUILDDIR)/$(IDEN_TOKEN_SETTINGS_EDITOR) $(BUILDDIR)/$(SVC_SETTINGS_EDITOR) $(BUILDDIR)/$(AUTH_POLICY_EDITOR) - -$(BUILDDIR)/%.class: %.java - @echo [======== Compiling $@ ========] - $(JAVAC) -g -sourcepath ../src -classpath "$(CLASSPATH)" -d $(BUILDDIR)/webapp/WEB-INF/classes $< - -# The following two lines may need to be added below before we jar-up the war for builds where there is no identity-abstraction install -# cp $(IDENT_ABSTRACTION_DIR)/*.jar $(BUILDDIR)/webapp/WEB-INF/lib/ -# rm $(BUILDDIR)/webapp/WEB-INF/lib/identity-abstraction.jar - -$(BUILDDIR)/$(WEBAPP): $(BUILDDIR) $(CLASSES) - @echo [======== Creating Webapp $@ ========] - cp ../web.xml $(BUILDDIR)/webapp/WEB-INF/web.xml - cp ../templates/svc.settings $(BUILDDIR)/webapp/WEB-INF/conf/svc.settings - cp ../templates/authtoken.settings $(BUILDDIR)/webapp/WEB-INF/conf/authtoken.settings - cp ../templates/identoken.settings $(BUILDDIR)/webapp/WEB-INF/conf/identoken.settings - cp ../windows/crypto.properties $(BUILDDIR)/webapp/WEB-INF/classes/crypto.properties - cp ../src/com/novell/casa/authtoksvc/Krb5_mechanism.settings $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/Krb5Authenticate/mechanism.settings - cp ../src/com/novell/casa/authtoksvc/Pwd_mechanism.settings $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/PwdAuthenticate/mechanism.settings - cp $(AXIS_JARS_DIR)/*.jar $(BUILDDIR)/webapp/WEB-INF/lib/ - ls $(BUILDDIR)/webapp/WEB-INF/lib/ - jar cvf $(BUILDDIR)/$(WEBAPP) -C $(BUILDDIR)/webapp . - echo "LIBDIR = $(LIBDIR)" - cp $(BUILDDIR)/$(WEBAPP) $(LIBDIR)/java/ - -$(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT): $(BUILDDIR) $(CLASSES) - @echo [======== Jarring $@ ========] - jar cvf $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT) $(AUTHTOKEN_FILES) - cp $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT) $(LIBDIR)/java/ - -$(BUILDDIR)/$(AUTH_TOKEN_SETTINGS_EDITOR): $(BUILDDIR) $(CLASSES) - @echo [======== Jarring $@ ========] - jar cvmf $(MANIFEST_DIR)/AuthTokenSettingsEditor.txt $(BUILDDIR)/$(AUTH_TOKEN_SETTINGS_EDITOR) $(AUTH_TOKEN_SETTINGS_EDITOR_FILES) - cp $(BUILDDIR)/$(AUTH_TOKEN_SETTINGS_EDITOR) $(LIBDIR)/java/ - -$(BUILDDIR)/$(IDEN_TOKEN_SETTINGS_EDITOR): $(BUILDDIR) $(CLASSES) - @echo [======== Jarring $@ ========] - jar cvmf $(MANIFEST_DIR)/IdenTokenSettingsEditor.txt $(BUILDDIR)/$(IDEN_TOKEN_SETTINGS_EDITOR) $(IDEN_TOKEN_SETTINGS_EDITOR_FILES) - cp $(BUILDDIR)/$(IDEN_TOKEN_SETTINGS_EDITOR) $(LIBDIR)/java/ - -$(BUILDDIR)/$(SVC_SETTINGS_EDITOR): $(BUILDDIR) $(CLASSES) - @echo [======== Jarring $@ ========] - jar cvmf $(MANIFEST_DIR)/SvcSettingsEditor.txt $(BUILDDIR)/$(SVC_SETTINGS_EDITOR) $(SVC_SETTINGS_EDITOR_FILES) - cp $(BUILDDIR)/$(SVC_SETTINGS_EDITOR) $(LIBDIR)/java/ - -$(BUILDDIR)/$(AUTH_POLICY_EDITOR): $(BUILDDIR) $(CLASSES) - @echo [======== Jarring $@ ========] - jar cvmf $(MANIFEST_DIR)/AuthPolicyEditor.txt $(BUILDDIR)/$(AUTH_POLICY_EDITOR) $(AUTH_POLICY_EDITOR_FILES) - cp $(BUILDDIR)/$(AUTH_POLICY_EDITOR) $(LIBDIR)/java/ - -$(BUILDDIR): - [ -d $(BUILDDIR) ] || mkdir -p $(BUILDDIR) - [ -d $(BUILDDIR)/webapp ] || mkdir -p $(BUILDDIR)/webapp - [ -d $(BUILDDIR)/webapp/WEB-INF ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF - [ -d $(BUILDDIR)/webapp/WEB-INF/classes ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/classes - [ -d $(BUILDDIR)/webapp/WEB-INF/lib ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/lib - [ -d $(BUILDDIR)/webapp/WEB-INF/conf ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/conf - [ -d $(BUILDDIR)/webapp/WEB-INF/conf/enabled_services ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/conf/enabled_services - [ -d $(BUILDDIR)/webapp/WEB-INF/conf/auth_mechanisms ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/conf/auth_mechanisms - [ -d $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms - [ -d $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/Krb5Authenticate ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/Krb5Authenticate - [ -d $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/PwdAuthenticate ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/PwdAuthenticate - [ -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 - if [ -f $(LIBDIR)/java/$(WEBAPP) ]; then rm -f $(LIBDIR)/java/$(WEBAPP); 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. +# +# Author: Greg Richardson +# +####################################################################### + +SUBDIRS = + +DIST_SUBDIRS = + +CFILES = + +EXTRA_DIST = crypto.properties + +ROOT = ../.. + +LIBDIR = $(ROOT)/$(LIB) + +IDENT_ABSTRACTION_DIR = $(BANDIT_DIR) +#AXIS_JARS_DIR = $(PWD)/external +AXIS_JARS_DIR = ../external + + +MANIFEST_DIR = ../manifest + +JAVAC= javac + +WEBAPP_NAME = CasaAuthTokenSvc +WEBAPP_EXT = war +MODULE_NAME = CasaAuthToken +MODULE_EXT = jar +AUTH_TOKEN_SETTINGS_EDITOR_MODULE_NAME = CasaAuthTokenSettingsEditor +IDEN_TOKEN_SETTINGS_EDITOR_MODULE_NAME = CasaIdenTokenSettingsEditor +SVC_SETTINGS_EDITOR_MODULE_NAME = CasaSvcSettingsEditor +AUTH_POLICY_EDITOR_MODULE_NAME = CasaAuthPolicyEditor + +JAVAFILES = ../src/com/novell/casa/authtoksvc/ProtoDefs.java \ + ../src/com/novell/casa/authtoksvc/AuthMechConfig.java \ + ../src/com/novell/casa/authtoksvc/SvcConfig.java \ + ../src/com/novell/casa/authtoksvc/IdenTokenConfig.java \ + ../src/com/novell/casa/authtoksvc/AuthTokenConfig.java \ + ../src/com/novell/casa/authtoksvc/EnabledSvcsConfig.java \ + ../src/com/novell/casa/authtoksvc/AuthMechanism.java \ + ../src/com/novell/casa/authtoksvc/WSSecurity.java \ + ../src/com/novell/casa/authtoksvc/SessionToken.java \ + ../src/com/novell/casa/authtoksvc/Authenticate.java \ + ../src/com/novell/casa/authtoksvc/RpcMethod.java \ + ../src/com/novell/casa/authtoksvc/Rpc.java \ + ../src/com/novell/casa/authtoksvc/GetAuthPolicy.java \ + ../src/com/novell/casa/authtoksvc/Base64Coder.java \ + ../src/com/novell/casa/authtoksvc/AuthReqMsg.java \ + ../src/com/novell/casa/authtoksvc/AuthRespMsg.java \ + ../src/com/novell/casa/authtoksvc/IdentityToken.java \ + ../src/com/novell/casa/authtoksvc/CasaIdentityToken.java \ + ../src/com/novell/casa/authtoksvc/AuthToken.java \ + ../src/com/novell/casa/authtoksvc/GetAuthPolicyReqMsg.java \ + ../src/com/novell/casa/authtoksvc/GetAuthPolicyRespMsg.java \ + ../src/com/novell/casa/authtoksvc/GetAuthToken.java \ + ../src/com/novell/casa/authtoksvc/GetAuthTokReqMsg.java \ + ../src/com/novell/casa/authtoksvc/GetAuthTokRespMsg.java \ + ../src/com/novell/casa/authtoksvc/Krb5Authenticate.java \ + ../src/com/novell/casa/authtoksvc/PwdAuthenticate.java \ + ../src/com/novell/casa/authtoksvc/IVerifySetting.java \ + ../src/com/novell/casa/authtoksvc/SettingsFileUtil.java \ + ../src/com/novell/casa/authtoksvc/SettingsFileSAXHandler.java \ + ../src/com/novell/casa/authtoksvc/AuthPolicyEditor.java \ + ../src/com/novell/casa/authtoksvc/AuthTokenSettingsEditor.java \ + ../src/com/novell/casa/authtoksvc/IdenTokenSettingsEditor.java \ + ../src/com/novell/casa/authtoksvc/SvcSettingsEditor.java + +BUILDDIR = ../build + +AUTHTOKEN_FILES = -C $(BUILDDIR)/webapp/WEB-INF/classes com + +AUTH_TOKEN_SETTINGS_EDITOR_FILES = -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/IVerifySetting.class \ + -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/SettingsFileUtil.class \ + -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/AuthTokenSettingsEditor.class \ + -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/AuthTokenConfig.class + +IDEN_TOKEN_SETTINGS_EDITOR_FILES = -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/IVerifySetting.class \ + -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/SettingsFileUtil.class \ + -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/IdenTokenSettingsEditor.class \ + -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/IdenTokenConfig.class + +SVC_SETTINGS_EDITOR_FILES = -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/IVerifySetting.class \ + -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/SettingsFileUtil.class \ + -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/SvcSettingsEditor.class \ + -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/SvcConfig.class + +AUTH_POLICY_EDITOR_FILES = -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/AuthPolicyEditor.class + +WEBAPP = $(WEBAPP_NAME).$(WEBAPP_EXT) + +AUTH_TOKEN_SETTINGS_EDITOR = $(AUTH_TOKEN_SETTINGS_EDITOR_MODULE_NAME).$(MODULE_EXT) + +IDEN_TOKEN_SETTINGS_EDITOR = $(IDEN_TOKEN_SETTINGS_EDITOR_MODULE_NAME).$(MODULE_EXT) + +SVC_SETTINGS_EDITOR = $(SVC_SETTINGS_EDITOR_MODULE_NAME).$(MODULE_EXT) + +AUTH_POLICY_EDITOR = $(AUTH_POLICY_EDITOR_MODULE_NAME).$(MODULE_EXT) + +CLASSES = $(addprefix $(BUILDDIR)/, $(JAVAFILES:%.java=%.class)) + +#AXIS_LIBS = $(AXIS_JARS_DIR)/axis.jar:$(AXIS_JARS_DIR)/axis-ant.jar:$(AXIS_JARS_DIR)/commons-discovery-0.2.jar:$(AXIS_JARS_DIR)/commons-logging-1.0.4.jar:$(AXIS_JARS_DIR)/commons-logging-api.jar:$(AXIS_JARS_DIR)/jaxrpc.jar:$(AXIS_JARS_DIR)/log4j-1.2.8.jar:$(AXIS_JARS_DIR)/saaj.jar:$(AXIS_JARS_DIR)/wsdl4j-1.5.1.jar:$(AXIS_JARS_DIR)/wss4j-1.5.0.jar:$(AXIS_JARS_DIR)/xalan.jar:$(AXIS_JARS_DIR)/xercesImpl.jar:$(AXIS_JARS_DIR)/xml-apis.jar:$(AXIS_JARS_DIR)/xmlsec-1.2.1.jar +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 +CLASSPATH = $(AXIS_LIBS);$(IDENT_ABSTRACTION_DIR)/identity-abstraction.jar;$(IDENT_ABSTRACTION_DIR)/bandit-util.jar;$(LIBS) + +CUR_DIR := $(shell pwd) + +all: $(BUILDDIR)/$(WEBAPP) $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT) $(BUILDDIR)/$(AUTH_TOKEN_SETTINGS_EDITOR) $(BUILDDIR)/$(IDEN_TOKEN_SETTINGS_EDITOR) $(BUILDDIR)/$(SVC_SETTINGS_EDITOR) $(BUILDDIR)/$(AUTH_POLICY_EDITOR) + +$(BUILDDIR)/%.class: %.java + @echo [======== Compiling $@ ========] + $(JAVAC) -g -sourcepath ../src -classpath "$(CLASSPATH)" -d $(BUILDDIR)/webapp/WEB-INF/classes $< + +# The following two lines may need to be added below before we jar-up the war for builds where there is no identity-abstraction install +# cp $(IDENT_ABSTRACTION_DIR)/*.jar $(BUILDDIR)/webapp/WEB-INF/lib/ +# rm $(BUILDDIR)/webapp/WEB-INF/lib/identity-abstraction.jar + +$(BUILDDIR)/$(WEBAPP): $(BUILDDIR) $(CLASSES) + @echo [======== Creating Webapp $@ ========] + cp ../web.xml $(BUILDDIR)/webapp/WEB-INF/web.xml + cp ../templates/svc.settings $(BUILDDIR)/webapp/WEB-INF/conf/svc.settings + cp ../templates/authtoken.settings $(BUILDDIR)/webapp/WEB-INF/conf/authtoken.settings + cp ../templates/identoken.settings $(BUILDDIR)/webapp/WEB-INF/conf/identoken.settings + cp ../windows/crypto.properties $(BUILDDIR)/webapp/WEB-INF/classes/crypto.properties + cp ../src/com/novell/casa/authtoksvc/Krb5_mechanism.settings $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/Krb5Authenticate/mechanism.settings + cp ../src/com/novell/casa/authtoksvc/Pwd_mechanism.settings $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/PwdAuthenticate/mechanism.settings + cp $(AXIS_JARS_DIR)/*.jar $(BUILDDIR)/webapp/WEB-INF/lib/ + ls $(BUILDDIR)/webapp/WEB-INF/lib/ + jar cvf $(BUILDDIR)/$(WEBAPP) -C $(BUILDDIR)/webapp . + echo "LIBDIR = $(LIBDIR)" + cp $(BUILDDIR)/$(WEBAPP) $(LIBDIR)/java/ + +$(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT): $(BUILDDIR) $(CLASSES) + @echo [======== Jarring $@ ========] + jar cvf $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT) $(AUTHTOKEN_FILES) + cp $(BUILDDIR)/$(MODULE_NAME).$(MODULE_EXT) $(LIBDIR)/java/ + +$(BUILDDIR)/$(AUTH_TOKEN_SETTINGS_EDITOR): $(BUILDDIR) $(CLASSES) + @echo [======== Jarring $@ ========] + jar cvmf $(MANIFEST_DIR)/AuthTokenSettingsEditor.txt $(BUILDDIR)/$(AUTH_TOKEN_SETTINGS_EDITOR) $(AUTH_TOKEN_SETTINGS_EDITOR_FILES) + cp $(BUILDDIR)/$(AUTH_TOKEN_SETTINGS_EDITOR) $(LIBDIR)/java/ + +$(BUILDDIR)/$(IDEN_TOKEN_SETTINGS_EDITOR): $(BUILDDIR) $(CLASSES) + @echo [======== Jarring $@ ========] + jar cvmf $(MANIFEST_DIR)/IdenTokenSettingsEditor.txt $(BUILDDIR)/$(IDEN_TOKEN_SETTINGS_EDITOR) $(IDEN_TOKEN_SETTINGS_EDITOR_FILES) + cp $(BUILDDIR)/$(IDEN_TOKEN_SETTINGS_EDITOR) $(LIBDIR)/java/ + +$(BUILDDIR)/$(SVC_SETTINGS_EDITOR): $(BUILDDIR) $(CLASSES) + @echo [======== Jarring $@ ========] + jar cvmf $(MANIFEST_DIR)/SvcSettingsEditor.txt $(BUILDDIR)/$(SVC_SETTINGS_EDITOR) $(SVC_SETTINGS_EDITOR_FILES) + cp $(BUILDDIR)/$(SVC_SETTINGS_EDITOR) $(LIBDIR)/java/ + +$(BUILDDIR)/$(AUTH_POLICY_EDITOR): $(BUILDDIR) $(CLASSES) + @echo [======== Jarring $@ ========] + jar cvmf $(MANIFEST_DIR)/AuthPolicyEditor.txt $(BUILDDIR)/$(AUTH_POLICY_EDITOR) $(AUTH_POLICY_EDITOR_FILES) + cp $(BUILDDIR)/$(AUTH_POLICY_EDITOR) $(LIBDIR)/java/ + +$(BUILDDIR): + [ -d $(BUILDDIR) ] || mkdir -p $(BUILDDIR) + [ -d $(BUILDDIR)/webapp ] || mkdir -p $(BUILDDIR)/webapp + [ -d $(BUILDDIR)/webapp/WEB-INF ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF + [ -d $(BUILDDIR)/webapp/WEB-INF/classes ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/classes + [ -d $(BUILDDIR)/webapp/WEB-INF/lib ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/lib + [ -d $(BUILDDIR)/webapp/WEB-INF/conf ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/conf + [ -d $(BUILDDIR)/webapp/WEB-INF/conf/enabled_services ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/conf/enabled_services + [ -d $(BUILDDIR)/webapp/WEB-INF/conf/auth_mechanisms ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/conf/auth_mechanisms + [ -d $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms + [ -d $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/Krb5Authenticate ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/Krb5Authenticate + [ -d $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/PwdAuthenticate ] || mkdir -p $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/PwdAuthenticate + [ -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 + if [ -f $(LIBDIR)/java/$(WEBAPP) ]; then rm -f $(LIBDIR)/java/$(WEBAPP); fi + +distclean-local: + +maintainer-clean-local: + rm -f Makefile.in + rm -f Makefile diff --git a/CASA-auth-token/server-java/Svc/windows/crypto.properties b/CASA-auth-token/server-java/Svc/windows/crypto.properties index 89f7eb42..52442646 100644 --- a/CASA-auth-token/server-java/Svc/windows/crypto.properties +++ b/CASA-auth-token/server-java/Svc/windows/crypto.properties @@ -1,6 +1,6 @@ -org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin -org.apache.ws.security.crypto.merlin.keystore.type=jks -org.apache.ws.security.crypto.merlin.keystore.password=secret -org.apache.ws.security.crypto.merlin.keystore.alias=signingKey -org.apache.ws.security.crypto.merlin.alias.password=secret -org.apache.ws.security.crypto.merlin.file=ATS_INSTALL_DIRats\etc\keys\server\jks-store +org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin +org.apache.ws.security.crypto.merlin.keystore.type=jks +org.apache.ws.security.crypto.merlin.keystore.password=secret +org.apache.ws.security.crypto.merlin.keystore.alias=signingKey +org.apache.ws.security.crypto.merlin.alias.password=secret +org.apache.ws.security.crypto.merlin.file=ATS_INSTALL_DIRats\etc\keys\server\jks-store diff --git a/CASA-auth-token/server-java/configure.in b/CASA-auth-token/server-java/configure.in index 8b26ea77..c619f293 100644 --- a/CASA-auth-token/server-java/configure.in +++ b/CASA-auth-token/server-java/configure.in @@ -1,302 +1,302 @@ -####################################################################### -# -# 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. -# -# -####################################################################### - -AC_INIT(CASA_auth_token_svc, 1.7.1,,CASA_auth_token_svc) -AC_CONFIG_SRCDIR(autogen.sh) -AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(tar-pax) - -RELEASE=`date +%Y%m%d_%H%M` -AC_SUBST(RELEASE) -AM_MAINTAINER_MODE - -# -# Check for a valid C# compiler -# -#AC_CHECK_PROG(CSC, csc, csc) -#test -z "$CSC" && AC_CHECK_PROG(CSC, mcs, mcs) -#test -z "$CSC" && AC_MSG_ERROR([no acceptable C Sharp compiler found in \$PATH]) - -# -# Check for valid C# compiler in linux -# -case $host_os in - cygwin*) - ;; - *) - AC_CHECK_PROG(CSC, csc, csc) - test -z "$CSC" && AC_CHECK_PROG(CSC, mcs, mcs) - test -z "$CSC" && AC_MSG_ERROR([no acceptable C Sharp compiler found in \$PATH]) - - ;; -esac - -case $CSC in - # - # Mono-specific configuration - # - mcs) - CSC_EXEFLAG=/target:exe - CSC_LIBFLAG=/target:library - CSC_EXEFLAG=/target:exe - CSC_WINEXEFLAG=/target:winexe - CSCFLAGS='/d:MONO /warn:4 /d:TRACE -d:LINUX' - CSCFLAGS_DEBUG="/debug+ /d:DEBUG" - CSCFLAGS_OPTIMIZE="/optimize+" - MONO=mono - MONO_DEBUG='mono --debug' - MONO_PATH= - SYSTEM_XML='System.Xml.dll' - ;; - # - # .NET-specific configuration - # - csc) - CSC_EXEFLAG=/target:exe - CSC_LIBFLAG=/target:library - CSC_EXEFLAG=/target:exe - CSC_WINEXEFLAG=/target:winexe - CSCFLAGS='/d:DOTNET /warn:4 /d:TRACE /nologo' - CSCFLAGS_DEBUG="/debug+ /d:DEBUG" - CSCFLAGS_OPTIMIZE="/optimize+" - MONO= - MONO_DEBUG= - MONO_PATH= - SYSTEM_XML='System.XML.dll' - ;; -esac - -AC_SUBST(CSC) -AC_SUBST(CSC_EXEFLAG) -AC_SUBST(CSC_LIBFLAG) -AC_SUBST(CSC_WINEXEFLAG) -AC_SUBST(CSCFLAGS) -AC_SUBST(CSCFLAGS_DEBUG) -AC_SUBST(MONO) -AC_SUBST(MONO_PATH) -AC_SUBST(SYSTEM_XML) - -SRCDIR='$(top_srcdir)' -DOCDIR="$SRCDIR/doc" -TOOLDIR='$(top_srcdir)/tools' -AC_SUBST(SRCDIR) -AC_SUBST(DOCDIR) -AC_SUBST(TOOLDIR) -EMPTY= -SPACE='$(EMPTY) $(EMPTY)' - -AC_SUBST(EMPTY) -AC_SUBST(SPACE) - -# -# Check for operating system and set TARGET_OS -# -case $host_os in - cygwin*) - TARGET_OS='windows' - ;; - *) - TARGET_OS='linux' - ;; -esac - -AC_SUBST(TARGET_OS) -AM_CONDITIONAL(LINUX, test "$TARGET_OS" = "linux") -AM_CONDITIONAL(WINDOWS, test "$TARGET_OS" = "windows") - -# -# Check for architecture and set TARGET_ARCH -# ia64 needs to be treated as non64. - -case $target_cpu in - x86_64|p*pc64|s390x) - LIB=lib64 - ;; - *ia64|*) - LIB=lib - ;; -esac - -AC_SUBST(LIB) -AM_CONDITIONAL(LIB64, test "$LIB" = lib64) - -# -# -# Set platform-specific variables -# -case $TARGET_OS in - # - # Linux-specific configuration - # - linux) - # - # Set variables - # - COMMON_CLEAN_FILES='' - ICON_EXT='.ico' - ICON_FLAG='/resource:' - PLATFORM_SUBDIRS=$LINUX_SUBDIRS - SEP='/' - LINK=gcc - ;; - # - # Windows-specific configuration - # - windows) - COMMON_CLEAN_FILES='*.suo */*.suo *.csproj.user */*.csproj.user bin obj */bin */obj *.xml */*.xml *.pdb */*.pdb' - ICON_EXT='.ico' - ICON_FLAG='/win32icon:' - PLATFORM_SUBDIRS=$WINDOWS_SUBDIRS - SEP='$(EMPTY)\\$(EMPTY)' - LINK=link.exe - ;; -esac -AC_SUBST(COMMON_CLEAN_FILES) -AC_SUBST(ICON_EXT) -AC_SUBST(ICON_FLAG) -AC_SUBST(PLATFORM_SUBDIRS) -AC_SUBST(SEP) -AC_SUBST(LINK) - -# -# Run standard macros -# -AM_PROG_CC_STDC -AC_PROG_INSTALL -AC_HEADER_STDC - -####### -# -# set CFLAGS -# -case $host_os in - linux*) - CFLAGS="$CFLAGS" - ;; - cygwin*) - CC=cl.exe - CFLAGS="-D WIN32 -D SSCS_WIN32_PLAT_F -D N_PLAT_CLIENT -MT -Ox" - ;; -esac - -# -# Handle --enable-debug -# -AC_ARG_ENABLE(debug, [ - --enable-debug configure the Makefiles to build in DEBUG mode], - [case "${enableval}" in - yes) enable_debug=true ;; - no) enable_debug=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;; - esac],[enable_debug=false]) -AM_CONDITIONAL(DEBUG, test x$enable_debug = xtrue) -if test "$enable_debug" = "true" -then - # Build debug version. - # CFLAGS="$CFLAGS_DEBUG $CFLAGS -DDBG -DDEBUG" - CFLAGS="$CFLAGS_DEBUG $CFLAGS -g -DDBG -DDEBUG \ --fPIC -DPIC -DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall \ --D_REENTRANT -DALIGNMENT -DN_PLAT_UNIX \ --DUNIX -DLINUX -DIAPX38" - CSCFLAGS="$CSCFLAGS_DEBUG $CSCFLAGS" - CXXFLAGS="$CXXFLAGS_DEBUG $CXXFLAGS" - DEVENV_CONFIGURATION=Debug - MONO=$MONO_DEBUG -else - # Build optimized version. - CFLAGS="$CFLAGS_OPTIMIZE $CFLAGS -g -fPIC -DPIC \ --DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall \ --D_REENTRANT -DALIGNMENT -DN_PLAT_UNIX \ --DUNIX -DLINUX -DIAPX38" - CSCFLAGS="$CSCFLAGS_OPTIMIZE $CSCFLAGS" - CXXFLAGS="$CXXFLAGS_OPTIMIZE $CXXFLAGS" - DEVENV_CONFIGURATION=Release -fi -AC_SUBST(CSCFLAGS) -AC_SUBST(DEVENV_CONFIGURATION) - -##comment out due to build failure -# Check for GCC version to add fstack-protector flag -# -#GCC_VER="`gcc -dumpversion`" -#case "$GCC_VER" in -# 3*) -# ;; -# 4*) -# CFLAGS="$CFLAGS -fstack-protector" -# ;; -# *) -# ;; -#esac - -AC_SUBST(GCC_VER) - -# -# Configure PKG_CONFIG -# -AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -if test "x$PKG_CONFIG" = "xno"; then - AC_MSG_ERROR([You need to install pkg-config]) -fi - -# -# Configure files -# -AC_OUTPUT([ -Makefile -package/Makefile -package/linux/Makefile -package/linux/CASA_auth_token_svc.spec -package/windows/Makefile -package/windows/ClientKeystoreSetup/Makefile -package/windows/InitConfigFile/Makefile -package/windows/MungeCryptoPropertiesFilePath/Makefile -package/windows/ServerKeystoreSetup/Makefile -package/windows/UpdateWarFile/Makefile -package/windows/server-java_msi/Makefile -Svc/Makefile -Svc/external/Makefile -Svc/src/Makefile -Svc/src/com/Makefile -Svc/src/com/novell/Makefile -Svc/src/com/novell/casa/Makefile -Svc/src/com/novell/casa/authtoksvc/Makefile -Svc/tomcat5/Makefile -Svc/tomcat5/conf/Makefile -Svc/tomcat5/conf/Catalina/Makefile -Svc/tomcat5/conf/Catalina/localhost/Makefile -Svc/tomcat5/conf/linux/Makefile -Svc/tomcat5/conf/windows/Makefile -Svc/linux/Makefile -Svc/templates/Makefile -Svc/manifest/Makefile -Svc/windows/Makefile -Jaas/Makefile -Jaas/src/Makefile -Jaas/src/com/Makefile -Jaas/src/com/novell/Makefile -Jaas/src/com/novell/casa/Makefile -Jaas/src/com/novell/casa/jaas/Makefile -Jaas/src/com/novell/casa/jaas/sample/Makefile -Jaas/linux/Makefile -Jaas/windows/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. +# +# +####################################################################### + +AC_INIT(CASA_auth_token_svc, 1.7.1,,CASA_auth_token_svc) +AC_CONFIG_SRCDIR(autogen.sh) +AC_CANONICAL_SYSTEM +AM_INIT_AUTOMAKE(tar-pax) + +RELEASE=`date +%Y%m%d_%H%M` +AC_SUBST(RELEASE) +AM_MAINTAINER_MODE + +# +# Check for a valid C# compiler +# +#AC_CHECK_PROG(CSC, csc, csc) +#test -z "$CSC" && AC_CHECK_PROG(CSC, mcs, mcs) +#test -z "$CSC" && AC_MSG_ERROR([no acceptable C Sharp compiler found in \$PATH]) + +# +# Check for valid C# compiler in linux +# +case $host_os in + cygwin*) + ;; + *) + AC_CHECK_PROG(CSC, csc, csc) + test -z "$CSC" && AC_CHECK_PROG(CSC, mcs, mcs) + test -z "$CSC" && AC_MSG_ERROR([no acceptable C Sharp compiler found in \$PATH]) + + ;; +esac + +case $CSC in + # + # Mono-specific configuration + # + mcs) + CSC_EXEFLAG=/target:exe + CSC_LIBFLAG=/target:library + CSC_EXEFLAG=/target:exe + CSC_WINEXEFLAG=/target:winexe + CSCFLAGS='/d:MONO /warn:4 /d:TRACE -d:LINUX' + CSCFLAGS_DEBUG="/debug+ /d:DEBUG" + CSCFLAGS_OPTIMIZE="/optimize+" + MONO=mono + MONO_DEBUG='mono --debug' + MONO_PATH= + SYSTEM_XML='System.Xml.dll' + ;; + # + # .NET-specific configuration + # + csc) + CSC_EXEFLAG=/target:exe + CSC_LIBFLAG=/target:library + CSC_EXEFLAG=/target:exe + CSC_WINEXEFLAG=/target:winexe + CSCFLAGS='/d:DOTNET /warn:4 /d:TRACE /nologo' + CSCFLAGS_DEBUG="/debug+ /d:DEBUG" + CSCFLAGS_OPTIMIZE="/optimize+" + MONO= + MONO_DEBUG= + MONO_PATH= + SYSTEM_XML='System.XML.dll' + ;; +esac + +AC_SUBST(CSC) +AC_SUBST(CSC_EXEFLAG) +AC_SUBST(CSC_LIBFLAG) +AC_SUBST(CSC_WINEXEFLAG) +AC_SUBST(CSCFLAGS) +AC_SUBST(CSCFLAGS_DEBUG) +AC_SUBST(MONO) +AC_SUBST(MONO_PATH) +AC_SUBST(SYSTEM_XML) + +SRCDIR='$(top_srcdir)' +DOCDIR="$SRCDIR/doc" +TOOLDIR='$(top_srcdir)/tools' +AC_SUBST(SRCDIR) +AC_SUBST(DOCDIR) +AC_SUBST(TOOLDIR) +EMPTY= +SPACE='$(EMPTY) $(EMPTY)' + +AC_SUBST(EMPTY) +AC_SUBST(SPACE) + +# +# Check for operating system and set TARGET_OS +# +case $host_os in + cygwin*) + TARGET_OS='windows' + ;; + *) + TARGET_OS='linux' + ;; +esac + +AC_SUBST(TARGET_OS) +AM_CONDITIONAL(LINUX, test "$TARGET_OS" = "linux") +AM_CONDITIONAL(WINDOWS, test "$TARGET_OS" = "windows") + +# +# Check for architecture and set TARGET_ARCH +# ia64 needs to be treated as non64. + +case $target_cpu in + x86_64|p*pc64|s390x) + LIB=lib64 + ;; + *ia64|*) + LIB=lib + ;; +esac + +AC_SUBST(LIB) +AM_CONDITIONAL(LIB64, test "$LIB" = lib64) + +# +# +# Set platform-specific variables +# +case $TARGET_OS in + # + # Linux-specific configuration + # + linux) + # + # Set variables + # + COMMON_CLEAN_FILES='' + ICON_EXT='.ico' + ICON_FLAG='/resource:' + PLATFORM_SUBDIRS=$LINUX_SUBDIRS + SEP='/' + LINK=gcc + ;; + # + # Windows-specific configuration + # + windows) + COMMON_CLEAN_FILES='*.suo */*.suo *.csproj.user */*.csproj.user bin obj */bin */obj *.xml */*.xml *.pdb */*.pdb' + ICON_EXT='.ico' + ICON_FLAG='/win32icon:' + PLATFORM_SUBDIRS=$WINDOWS_SUBDIRS + SEP='$(EMPTY)\\$(EMPTY)' + LINK=link.exe + ;; +esac +AC_SUBST(COMMON_CLEAN_FILES) +AC_SUBST(ICON_EXT) +AC_SUBST(ICON_FLAG) +AC_SUBST(PLATFORM_SUBDIRS) +AC_SUBST(SEP) +AC_SUBST(LINK) + +# +# Run standard macros +# +AM_PROG_CC_STDC +AC_PROG_INSTALL +AC_HEADER_STDC + +####### +# +# set CFLAGS +# +case $host_os in + linux*) + CFLAGS="$CFLAGS" + ;; + cygwin*) + CC=cl.exe + CFLAGS="-D WIN32 -D SSCS_WIN32_PLAT_F -D N_PLAT_CLIENT -MT -Ox" + ;; +esac + +# +# Handle --enable-debug +# +AC_ARG_ENABLE(debug, [ + --enable-debug configure the Makefiles to build in DEBUG mode], + [case "${enableval}" in + yes) enable_debug=true ;; + no) enable_debug=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;; + esac],[enable_debug=false]) +AM_CONDITIONAL(DEBUG, test x$enable_debug = xtrue) +if test "$enable_debug" = "true" +then + # Build debug version. + # CFLAGS="$CFLAGS_DEBUG $CFLAGS -DDBG -DDEBUG" + CFLAGS="$CFLAGS_DEBUG $CFLAGS -g -DDBG -DDEBUG \ +-fPIC -DPIC -DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall \ +-D_REENTRANT -DALIGNMENT -DN_PLAT_UNIX \ +-DUNIX -DLINUX -DIAPX38" + CSCFLAGS="$CSCFLAGS_DEBUG $CSCFLAGS" + CXXFLAGS="$CXXFLAGS_DEBUG $CXXFLAGS" + DEVENV_CONFIGURATION=Debug + MONO=$MONO_DEBUG +else + # Build optimized version. + CFLAGS="$CFLAGS_OPTIMIZE $CFLAGS -g -fPIC -DPIC \ +-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall \ +-D_REENTRANT -DALIGNMENT -DN_PLAT_UNIX \ +-DUNIX -DLINUX -DIAPX38" + CSCFLAGS="$CSCFLAGS_OPTIMIZE $CSCFLAGS" + CXXFLAGS="$CXXFLAGS_OPTIMIZE $CXXFLAGS" + DEVENV_CONFIGURATION=Release +fi +AC_SUBST(CSCFLAGS) +AC_SUBST(DEVENV_CONFIGURATION) + +##comment out due to build failure +# Check for GCC version to add fstack-protector flag +# +#GCC_VER="`gcc -dumpversion`" +#case "$GCC_VER" in +# 3*) +# ;; +# 4*) +# CFLAGS="$CFLAGS -fstack-protector" +# ;; +# *) +# ;; +#esac + +AC_SUBST(GCC_VER) + +# +# Configure PKG_CONFIG +# +AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +if test "x$PKG_CONFIG" = "xno"; then + AC_MSG_ERROR([You need to install pkg-config]) +fi + +# +# Configure files +# +AC_OUTPUT([ +Makefile +package/Makefile +package/linux/Makefile +package/linux/CASA_auth_token_svc.spec +package/windows/Makefile +package/windows/ClientKeystoreSetup/Makefile +package/windows/InitConfigFile/Makefile +package/windows/MungeCryptoPropertiesFilePath/Makefile +package/windows/ServerKeystoreSetup/Makefile +package/windows/UpdateWarFile/Makefile +package/windows/server-java_msi/Makefile +Svc/Makefile +Svc/external/Makefile +Svc/src/Makefile +Svc/src/com/Makefile +Svc/src/com/novell/Makefile +Svc/src/com/novell/casa/Makefile +Svc/src/com/novell/casa/authtoksvc/Makefile +Svc/tomcat5/Makefile +Svc/tomcat5/conf/Makefile +Svc/tomcat5/conf/Catalina/Makefile +Svc/tomcat5/conf/Catalina/localhost/Makefile +Svc/tomcat5/conf/linux/Makefile +Svc/tomcat5/conf/windows/Makefile +Svc/linux/Makefile +Svc/templates/Makefile +Svc/manifest/Makefile +Svc/windows/Makefile +Jaas/Makefile +Jaas/src/Makefile +Jaas/src/com/Makefile +Jaas/src/com/novell/Makefile +Jaas/src/com/novell/casa/Makefile +Jaas/src/com/novell/casa/jaas/Makefile +Jaas/src/com/novell/casa/jaas/sample/Makefile +Jaas/linux/Makefile +Jaas/windows/Makefile +]) + diff --git a/CASA-auth-token/server-java/package/Makefile.am b/CASA-auth-token/server-java/package/Makefile.am index 2d2d834b..7c3e9e38 100644 --- a/CASA-auth-token/server-java/package/Makefile.am +++ b/CASA-auth-token/server-java/package/Makefile.am @@ -1,38 +1,38 @@ -####################################################################### -# -# 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. -# -# Author: Juan Carlos Luciani -# -####################################################################### - -SUBDIRS = $(TARGET_OS) - -DIST_SUBDIRS = linux windows - -EXTRA_DIST = - -.PHONY: package package-clean package-install package-uninstall -package package-clean package-install package-uninstall: - $(MAKE) -C $(TARGET_OS) $@ - -clean-local: - if [ -d lib ]; then rm -rf lib; fi - -maintainer-clean-local: - rm -f Makefile.in - +####################################################################### +# +# 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. +# +# Author: Juan Carlos Luciani +# +####################################################################### + +SUBDIRS = $(TARGET_OS) + +DIST_SUBDIRS = linux windows + +EXTRA_DIST = + +.PHONY: package package-clean package-install package-uninstall +package package-clean package-install package-uninstall: + $(MAKE) -C $(TARGET_OS) $@ + +clean-local: + if [ -d lib ]; then rm -rf lib; fi + +maintainer-clean-local: + rm -f Makefile.in + diff --git a/CASA-auth-token/server-java/package/windows/ClientKeystoreSetup/Makefile.am b/CASA-auth-token/server-java/package/windows/ClientKeystoreSetup/Makefile.am index 826fe1db..becb7afc 100644 --- a/CASA-auth-token/server-java/package/windows/ClientKeystoreSetup/Makefile.am +++ b/CASA-auth-token/server-java/package/windows/ClientKeystoreSetup/Makefile.am @@ -1,69 +1,69 @@ -####################################################################### -# -# Copyright (C) 2004 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. -# -# Author: Greg Richardson -# -####################################################################### - -SUBDIRS = - -DIST_SUBDIRS = - -EXTRA_DIST = ClientKeyStoreSetup.vjsproj Program.jsl - -if DEBUG -TARGET_CFG = Debug -else -TARGET_CFG = Release -endif - -PACKAGE = ClientKeystoreSetup -TARGET_FILE = $(PACKAGE).exe -LOG_FILE = $(PACKAGE).log - -.PHONY: package package-clean package-install package-uninstall devenv - -package: $(TARGET_FILE) - -devenv: - @if ! test -x "$(VSINSTALLDIR)/Common7/IDE/devenv.exe"; then echo "Error: Microsoft Visual Studio .NET is currently required to build MSI and MSM packages"; exit 1; fi - -$(TARGET_FILE): devenv - @rm -f $(LOG_FILE) $@ - @CMD='"$(VSINSTALLDIR)/Common7/IDE/devenv.exe" ../server-java_msi/server-java_msi.sln /build $(TARGET_CFG) /project $(PACKAGE) /out $(LOG_FILE)'; \ - echo $$CMD; \ - if eval $$CMD; then \ - ls -l bin/$(TARGET_CFG)/$(TARGET_FILE); \ - else \ - grep -a "ERROR:" $(LOG_FILE); \ - fi - -package-clean clean-local: - rm -rf Release/* Release Debug/* Debug*/Release */Debug *.log *.suo - -clean: - rm -rf Release/* Release Debug/* Debug */Release */Debug *.log *.suo - -distclean-local: package-clean - rm -f Makefile - -maintainer-clean-local: - rm -f Makefile.in - - - +####################################################################### +# +# Copyright (C) 2004 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. +# +# Author: Greg Richardson +# +####################################################################### + +SUBDIRS = + +DIST_SUBDIRS = + +EXTRA_DIST = ClientKeystoreSetup.vjsproj Program.jsl + +if DEBUG +TARGET_CFG = Debug +else +TARGET_CFG = Release +endif + +PACKAGE = ClientKeystoreSetup +TARGET_FILE = $(PACKAGE).exe +LOG_FILE = $(PACKAGE).log + +.PHONY: package package-clean package-install package-uninstall devenv + +package: $(TARGET_FILE) + +devenv: + @if ! test -x "$(VSINSTALLDIR)/Common7/IDE/devenv.exe"; then echo "Error: Microsoft Visual Studio .NET is currently required to build MSI and MSM packages"; exit 1; fi + +$(TARGET_FILE): devenv + @rm -f $(LOG_FILE) $@ + @CMD='"$(VSINSTALLDIR)/Common7/IDE/devenv.exe" ../server-java_msi/server-java_msi.sln /build $(TARGET_CFG) /project $(PACKAGE) /out $(LOG_FILE)'; \ + echo $$CMD; \ + if eval $$CMD; then \ + ls -l bin/$(TARGET_CFG)/$(TARGET_FILE); \ + else \ + grep -a "ERROR:" $(LOG_FILE); \ + fi + +package-clean clean-local: + rm -rf Release/* Release Debug/* Debug*/Release */Debug *.log *.suo + +clean: + rm -rf Release/* Release Debug/* Debug */Release */Debug *.log *.suo + +distclean-local: package-clean + rm -f Makefile + +maintainer-clean-local: + rm -f Makefile.in + + + diff --git a/CASA-auth-token/server-java/package/windows/InitConfigFile/Makefile.am b/CASA-auth-token/server-java/package/windows/InitConfigFile/Makefile.am index 71a2ed7a..68e06626 100644 --- a/CASA-auth-token/server-java/package/windows/InitConfigFile/Makefile.am +++ b/CASA-auth-token/server-java/package/windows/InitConfigFile/Makefile.am @@ -1,69 +1,69 @@ -####################################################################### -# -# Copyright (C) 2004 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. -# -# Author: Greg Richardson -# -####################################################################### - -SUBDIRS = - -DIST_SUBDIRS = - -EXTRA_DIST = InitConfigFile.vjsproj Program.jsl - -if DEBUG -TARGET_CFG = Debug -else -TARGET_CFG = Release -endif - -PACKAGE = InitConfigFile -TARGET_FILE = $(PACKAGE).exe -LOG_FILE = $(PACKAGE).log - -.PHONY: package package-clean package-install package-uninstall devenv - -package: $(TARGET_FILE) - -devenv: - @if ! test -x "$(VSINSTALLDIR)/Common7/IDE/devenv.exe"; then echo "Error: Microsoft Visual Studio .NET is currently required to build MSI and MSM packages"; exit 1; fi - -$(TARGET_FILE): devenv - @rm -f $(LOG_FILE) $@ - @CMD='"$(VSINSTALLDIR)/Common7/IDE/devenv.exe" ../server-java_msi/server-java_msi.sln /build $(TARGET_CFG) /project $(PACKAGE) /out $(LOG_FILE)'; \ - echo $$CMD; \ - if eval $$CMD; then \ - ls -l bin/$(TARGET_CFG)/$(TARGET_FILE); \ - else \ - grep -a "ERROR:" $(LOG_FILE); \ - fi - -package-clean clean-local: - rm -rf Release/* Release Debug/* Debug*/Release */Debug *.log *.suo - -clean: - rm -rf Release/* Release Debug/* Debug */Release */Debug *.log *.suo - -distclean-local: package-clean - rm -f Makefile - -maintainer-clean-local: - rm -f Makefile.in - - - +####################################################################### +# +# Copyright (C) 2004 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. +# +# Author: Greg Richardson +# +####################################################################### + +SUBDIRS = + +DIST_SUBDIRS = + +EXTRA_DIST = InitConfigFile.vjsproj Program.jsl + +if DEBUG +TARGET_CFG = Debug +else +TARGET_CFG = Release +endif + +PACKAGE = InitConfigFile +TARGET_FILE = $(PACKAGE).exe +LOG_FILE = $(PACKAGE).log + +.PHONY: package package-clean package-install package-uninstall devenv + +package: $(TARGET_FILE) + +devenv: + @if ! test -x "$(VSINSTALLDIR)/Common7/IDE/devenv.exe"; then echo "Error: Microsoft Visual Studio .NET is currently required to build MSI and MSM packages"; exit 1; fi + +$(TARGET_FILE): devenv + @rm -f $(LOG_FILE) $@ + @CMD='"$(VSINSTALLDIR)/Common7/IDE/devenv.exe" ../server-java_msi/server-java_msi.sln /build $(TARGET_CFG) /project $(PACKAGE) /out $(LOG_FILE)'; \ + echo $$CMD; \ + if eval $$CMD; then \ + ls -l bin/$(TARGET_CFG)/$(TARGET_FILE); \ + else \ + grep -a "ERROR:" $(LOG_FILE); \ + fi + +package-clean clean-local: + rm -rf Release/* Release Debug/* Debug*/Release */Debug *.log *.suo + +clean: + rm -rf Release/* Release Debug/* Debug */Release */Debug *.log *.suo + +distclean-local: package-clean + rm -f Makefile + +maintainer-clean-local: + rm -f Makefile.in + + + diff --git a/CASA-auth-token/server-java/package/windows/InitConfigFile/Program.jsl b/CASA-auth-token/server-java/package/windows/InitConfigFile/Program.jsl index 3276ebe4..943426a1 100644 --- a/CASA-auth-token/server-java/package/windows/InitConfigFile/Program.jsl +++ b/CASA-auth-token/server-java/package/windows/InitConfigFile/Program.jsl @@ -1,442 +1,442 @@ -/*********************************************************************** - * - * Copyright (C) 2006 Novell, Inc. All Rights Reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; version 2.1 - * of the License. - * - * 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 - * Library 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, Novell, Inc. - * - * To contact Novell about this file by physical or electronic mail, - * you may find current contact information at www.novell.com. - * - * Author: Juan Carlos Luciani - * - ***********************************************************************/ - -package InitConfigFile; - -import java.io.*; -import java.util.*; - -/** - * Summary description for Program - */ -public class Program -{ - final static int ERROR_NO_ERROR = 0; - final static int ERROR_INVALID_NUMBER_OF_PARAMS = -1; - final static int ERROR_MISSING_TEMPLATE = -3; - final static int ERROR_MISSING_TEMPLATE_FILE = -8; - final static int ERROR_OUTPUT_PROPERTY_MISSING = -9; - final static int ERROR_OUTPUT_COPY_FAILED = -12; - final static int ERROR_IO_EXCEPTION = -13; - final static int ERROR_MISSING_PROPERTIES = -15; - final static int ERROR_UNABLE_TO_READ_PROPERTIES = -16; - final static int ERROR_PROPERTIES_FILE_IS_EMPTY = -17; - final static int ERROR_MISSING_INSTALL_DIR = -18; - final static int ERROR_INSTALL_DIR_NOT_A_DIR = -19; - final static int ERROR_BAD_INSTALL_DIR_PARAM = -20; - final static int ERROR_BAD_PROPERTY_FILE_PARAM = -21; - final static int ERROR_MISSING_PROPERTIES_FILE = -22; - final static int ERROR_MISSING_INSTALL_DIR_PARAM = -23; - final static int ERROR_MISSING_PROPERTY_FILE_PARAM = -24; - final static int ERROR_BAD_TEMPLATE_FILE_PARAM = -25; - final static int ERROR_BAD_OUTPUT_FILE_PARAM = -26; - final static int ERROR_MISSING_TEMPLATE_FILE_PARAM = -27; - final static int ERROR_MISSING_OUTPUT_FILE_PARAM = -28; - final static int ERROR_BAD_PROPERTY_PARAM = -29; - - final static String TEMPLATE_FILE_PARAM = "template="; - final static String OUTPUT_FILE_PARAM = "output="; - final static String INSTALL_DIR_PARAM = "ATS_INSTALL_DIR="; - final static String INSTALL_DIR_PROPERTY = "ATS_INSTALL_DIR"; - final static String PROPERTY_FILE_PARAM = "propertyfile="; - - Properties properties; - File fileProperties; - FileInputStream fisProperties; - File fileTemplate; - File fileOutput; - File file; - FileWriter fw; - String[] rgsSearchFor; - String[] rgsReplaceWith; - String sInstallDir; - String sTemplate; - String sOutput; - - public static void main(String[] args) - { - Program p = new Program(args); - } - - Program(String[] args) - { - int rc = ERROR_NO_ERROR; - - properties = new Properties(); - fileProperties = null; - fisProperties = null; - fileTemplate = null; - fileOutput = null; - - try - { - file = new File("c:\\test.log"); - fw = new FileWriter(file); - - log("Here we go: " + args.length); - for (int i = 0; i < args.length; i++) - { - log("Arg " + i + " = " + args[i]); - } - - // Process the arguments - if (ERROR_NO_ERROR == (rc = processArgs(args))) - { - // Process the properties - if (ERROR_NO_ERROR == (rc = processProperties())) - { - rc = createOutputFile(); - } - } - - } - catch (IOException e) - { - rc = ERROR_IO_EXCEPTION; - } - finally - { - try - { - log("return code = " + rc); - fw.flush(); - fw.close(); - } - catch (Exception e1) - { - } - } - System.exit(rc); - } - - int processArgs(String[] args) - { - String sProperties; - File fileInstallDir = null; - int i; - int iEquals; - String sKey; - String sValue; - - // Validate the number of parameters - if (args.length < 3) - { - return ERROR_INVALID_NUMBER_OF_PARAMS; - } - - for (i = 0; i < args.length; i++) - { - log("arg[" + i + "] = " +args[i]); - - // is this the install dir param? - if (args[i].startsWith(INSTALL_DIR_PARAM)) - { - // Make sure it is more the the param tag - if (args[i].length() <= INSTALL_DIR_PARAM.length()) - { - return ERROR_BAD_INSTALL_DIR_PARAM; - } - - sInstallDir = args[i].substring(INSTALL_DIR_PARAM.length()).trim(); - fileInstallDir = new File(sInstallDir); - - // Make sure the install dir can be found - if (!fileInstallDir.exists()) - { - return ERROR_MISSING_INSTALL_DIR; - } - - // Make sure the install dir is a directory - if (!fileInstallDir.isDirectory()) - { - return ERROR_INSTALL_DIR_NOT_A_DIR; - } - - properties.setProperty(INSTALL_DIR_PROPERTY, sInstallDir); - } - - // is this the properties file param? - else if (args[i].startsWith(PROPERTY_FILE_PARAM)) - { - // Make sure it is more than the param tag - if (args[i].length() <= PROPERTY_FILE_PARAM.length()) - { - return ERROR_BAD_PROPERTY_FILE_PARAM; - } - - sProperties = args[i].substring(PROPERTY_FILE_PARAM.length()).trim(); - fileProperties = new File(sProperties); - - // Make sure the properties file can be found - if (!fileProperties.exists()) - { - return ERROR_MISSING_PROPERTIES_FILE; - } - - // Read the properties - try - { - fisProperties = new FileInputStream(fileProperties); - properties.load(fisProperties); - } - catch (IOException ioe) - { - return ERROR_UNABLE_TO_READ_PROPERTIES; - } - } - - else if (args[i].startsWith(TEMPLATE_FILE_PARAM)) - { - // Make sure it is more than the param tag - if (args[i].length() <= TEMPLATE_FILE_PARAM.length()) - { - return ERROR_BAD_TEMPLATE_FILE_PARAM; - } - - sTemplate = args[i].substring(TEMPLATE_FILE_PARAM.length()).trim(); - fileTemplate = new File(sTemplate); - - // Make sure the template file can be found - if (!fileTemplate.exists()) - { - log(ERROR_MISSING_TEMPLATE_FILE, sTemplate); - return ERROR_MISSING_TEMPLATE_FILE; - } - } - - else if (args[i].startsWith(OUTPUT_FILE_PARAM)) - { - // Make sure it is more than the param tag - if (args[i].length() <= OUTPUT_FILE_PARAM.length()) - { - return ERROR_BAD_OUTPUT_FILE_PARAM; - } - - sOutput = args[i].substring(OUTPUT_FILE_PARAM.length()).trim(); - fileOutput = new File(sOutput); - } - - // Handle additional parameters - else - { - if (-1 == (iEquals = args[i].indexOf("=")) || - 0 == iEquals || - args[i].length() == iEquals) - { - return ERROR_BAD_PROPERTY_PARAM; - } - sKey = args[i].substring(0, iEquals); - sValue = args[i].substring(iEquals + 1); - properties.setProperty(sKey, sValue); - } - } - - // Make sure we got an install dir - if (null == fileInstallDir) - { - return ERROR_MISSING_INSTALL_DIR_PARAM; - } - - // Make sure we got a template file - if (null == fileTemplate) - { - return ERROR_MISSING_TEMPLATE_FILE_PARAM; - } - - // Make sure we got an output file - if (null == fileOutput) - { - return ERROR_MISSING_OUTPUT_FILE_PARAM; - } - - // Note: the properties file parameter is optional - - return ERROR_NO_ERROR; - } - - int processProperties() - { - try - { - Enumeration e; - String sKey; - String sValue; - int i = 0; - - e = properties.propertyNames(); - - rgsSearchFor = new String[properties.size()]; - rgsReplaceWith = new String[properties.size()]; - - while (e.hasMoreElements()) - { - sKey = (String)e.nextElement(); - sValue = (String)properties.get(sKey); - - log("Property key = " + sKey + " Value = " + sValue); - - rgsSearchFor[i] = sKey; - rgsReplaceWith[i] = sValue; - i++; - } - } - catch (Exception ex1) - { - return -111; - } - - return ERROR_NO_ERROR; - } - - int createOutputFile() - { - LineNumberReader lnr = null; - FileWriter fwOutput = null; - String sLineTemplate; - String sLineOutput; - int iSearchFor; - int i; - - try - { - // Open the files - lnr = new LineNumberReader(new FileReader(fileTemplate)); - } - catch (Exception e) - { - return -40; - } - - try - { - fwOutput = new FileWriter(fileOutput); - } - catch (Exception e) - { - return -41; - } - try - { - // For each line of text in the template file... - while (null != (sLineTemplate = lnr.readLine())) - { - sLineOutput = sLineTemplate; - log("<-- " + sLineOutput); - - // For each term to be replaced... - for (i = 0; i < rgsSearchFor.length; i++) - { - log("searching for " + rgsSearchFor[i]); - // Replace all instances of the term on the line - while (-1 != (iSearchFor = sLineOutput.indexOf(rgsSearchFor[i]))) - { - log("replacing " + rgsSearchFor[i] + " at position " + iSearchFor + " with " + rgsReplaceWith[i]); - sLineOutput = sLineOutput.substring(0, iSearchFor) + rgsReplaceWith[i] + - sLineOutput.substring(iSearchFor + rgsSearchFor[i].length()); - } - } - try - { - fwOutput.write(sLineOutput + "\r\n"); - log("--> " + sLineOutput); - } - catch (Exception e) - { - return -42; - } - } - - // Clean up - fwOutput.flush(); - fwOutput.close(); - lnr.close(); - } - catch (Exception e) - { - return ERROR_OUTPUT_COPY_FAILED; - } - return ERROR_NO_ERROR; - } - - void log(int err) - { - log(err, null); - } - - void log(int err, String s) - { - String sMessage = ""; - - switch (err) - { - case ERROR_NO_ERROR: - sMessage = "No error"; - break; - case ERROR_INVALID_NUMBER_OF_PARAMS: - sMessage = "Invalid number of parameters: 4 expected"; - break; - case ERROR_MISSING_TEMPLATE: - sMessage = "Template file not found"; - break; -// case ERROR_TEMPLATE_PROPERTY_MISSING: -// sMessage = "Template file parameter missing"; -// break; - case ERROR_OUTPUT_PROPERTY_MISSING: - sMessage = "Output file parameter missing"; - break; - case ERROR_OUTPUT_COPY_FAILED: - sMessage = "Unable to create output file"; - break; - case ERROR_IO_EXCEPTION: - sMessage = "IOException"; - break; - case ERROR_MISSING_PROPERTIES: - sMessage = "Properties file not found"; - break; - case ERROR_UNABLE_TO_READ_PROPERTIES: - sMessage = "Unable to read properties file"; - break; - default: - sMessage = "Unknown error: " + err; - break; - } - - if (null != s) - { - sMessage = sMessage + s; - } - log(sMessage); - } - - void log(String s) - { - try - { - fw.write(this.getClass().getName() + ": " + s + "\r\n"); - } - catch (IOException ioe) - { - } - } -} +/*********************************************************************** + * + * Copyright (C) 2006 Novell, Inc. All Rights Reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; version 2.1 + * of the License. + * + * 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 + * Library 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, Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, + * you may find current contact information at www.novell.com. + * + * Author: Juan Carlos Luciani + * + ***********************************************************************/ + +package InitConfigFile; + +import java.io.*; +import java.util.*; + +/** + * Summary description for Program + */ +public class Program +{ + final static int ERROR_NO_ERROR = 0; + final static int ERROR_INVALID_NUMBER_OF_PARAMS = -1; + final static int ERROR_MISSING_TEMPLATE = -3; + final static int ERROR_MISSING_TEMPLATE_FILE = -8; + final static int ERROR_OUTPUT_PROPERTY_MISSING = -9; + final static int ERROR_OUTPUT_COPY_FAILED = -12; + final static int ERROR_IO_EXCEPTION = -13; + final static int ERROR_MISSING_PROPERTIES = -15; + final static int ERROR_UNABLE_TO_READ_PROPERTIES = -16; + final static int ERROR_PROPERTIES_FILE_IS_EMPTY = -17; + final static int ERROR_MISSING_INSTALL_DIR = -18; + final static int ERROR_INSTALL_DIR_NOT_A_DIR = -19; + final static int ERROR_BAD_INSTALL_DIR_PARAM = -20; + final static int ERROR_BAD_PROPERTY_FILE_PARAM = -21; + final static int ERROR_MISSING_PROPERTIES_FILE = -22; + final static int ERROR_MISSING_INSTALL_DIR_PARAM = -23; + final static int ERROR_MISSING_PROPERTY_FILE_PARAM = -24; + final static int ERROR_BAD_TEMPLATE_FILE_PARAM = -25; + final static int ERROR_BAD_OUTPUT_FILE_PARAM = -26; + final static int ERROR_MISSING_TEMPLATE_FILE_PARAM = -27; + final static int ERROR_MISSING_OUTPUT_FILE_PARAM = -28; + final static int ERROR_BAD_PROPERTY_PARAM = -29; + + final static String TEMPLATE_FILE_PARAM = "template="; + final static String OUTPUT_FILE_PARAM = "output="; + final static String INSTALL_DIR_PARAM = "ATS_INSTALL_DIR="; + final static String INSTALL_DIR_PROPERTY = "ATS_INSTALL_DIR"; + final static String PROPERTY_FILE_PARAM = "propertyfile="; + + Properties properties; + File fileProperties; + FileInputStream fisProperties; + File fileTemplate; + File fileOutput; + File file; + FileWriter fw; + String[] rgsSearchFor; + String[] rgsReplaceWith; + String sInstallDir; + String sTemplate; + String sOutput; + + public static void main(String[] args) + { + Program p = new Program(args); + } + + Program(String[] args) + { + int rc = ERROR_NO_ERROR; + + properties = new Properties(); + fileProperties = null; + fisProperties = null; + fileTemplate = null; + fileOutput = null; + + try + { + file = new File("c:\\test.log"); + fw = new FileWriter(file); + + log("Here we go: " + args.length); + for (int i = 0; i < args.length; i++) + { + log("Arg " + i + " = " + args[i]); + } + + // Process the arguments + if (ERROR_NO_ERROR == (rc = processArgs(args))) + { + // Process the properties + if (ERROR_NO_ERROR == (rc = processProperties())) + { + rc = createOutputFile(); + } + } + + } + catch (IOException e) + { + rc = ERROR_IO_EXCEPTION; + } + finally + { + try + { + log("return code = " + rc); + fw.flush(); + fw.close(); + } + catch (Exception e1) + { + } + } + System.exit(rc); + } + + int processArgs(String[] args) + { + String sProperties; + File fileInstallDir = null; + int i; + int iEquals; + String sKey; + String sValue; + + // Validate the number of parameters + if (args.length < 3) + { + return ERROR_INVALID_NUMBER_OF_PARAMS; + } + + for (i = 0; i < args.length; i++) + { + log("arg[" + i + "] = " +args[i]); + + // is this the install dir param? + if (args[i].startsWith(INSTALL_DIR_PARAM)) + { + // Make sure it is more the the param tag + if (args[i].length() <= INSTALL_DIR_PARAM.length()) + { + return ERROR_BAD_INSTALL_DIR_PARAM; + } + + sInstallDir = args[i].substring(INSTALL_DIR_PARAM.length()).trim(); + fileInstallDir = new File(sInstallDir); + + // Make sure the install dir can be found + if (!fileInstallDir.exists()) + { + return ERROR_MISSING_INSTALL_DIR; + } + + // Make sure the install dir is a directory + if (!fileInstallDir.isDirectory()) + { + return ERROR_INSTALL_DIR_NOT_A_DIR; + } + + properties.setProperty(INSTALL_DIR_PROPERTY, sInstallDir); + } + + // is this the properties file param? + else if (args[i].startsWith(PROPERTY_FILE_PARAM)) + { + // Make sure it is more than the param tag + if (args[i].length() <= PROPERTY_FILE_PARAM.length()) + { + return ERROR_BAD_PROPERTY_FILE_PARAM; + } + + sProperties = args[i].substring(PROPERTY_FILE_PARAM.length()).trim(); + fileProperties = new File(sProperties); + + // Make sure the properties file can be found + if (!fileProperties.exists()) + { + return ERROR_MISSING_PROPERTIES_FILE; + } + + // Read the properties + try + { + fisProperties = new FileInputStream(fileProperties); + properties.load(fisProperties); + } + catch (IOException ioe) + { + return ERROR_UNABLE_TO_READ_PROPERTIES; + } + } + + else if (args[i].startsWith(TEMPLATE_FILE_PARAM)) + { + // Make sure it is more than the param tag + if (args[i].length() <= TEMPLATE_FILE_PARAM.length()) + { + return ERROR_BAD_TEMPLATE_FILE_PARAM; + } + + sTemplate = args[i].substring(TEMPLATE_FILE_PARAM.length()).trim(); + fileTemplate = new File(sTemplate); + + // Make sure the template file can be found + if (!fileTemplate.exists()) + { + log(ERROR_MISSING_TEMPLATE_FILE, sTemplate); + return ERROR_MISSING_TEMPLATE_FILE; + } + } + + else if (args[i].startsWith(OUTPUT_FILE_PARAM)) + { + // Make sure it is more than the param tag + if (args[i].length() <= OUTPUT_FILE_PARAM.length()) + { + return ERROR_BAD_OUTPUT_FILE_PARAM; + } + + sOutput = args[i].substring(OUTPUT_FILE_PARAM.length()).trim(); + fileOutput = new File(sOutput); + } + + // Handle additional parameters + else + { + if (-1 == (iEquals = args[i].indexOf("=")) || + 0 == iEquals || + args[i].length() == iEquals) + { + return ERROR_BAD_PROPERTY_PARAM; + } + sKey = args[i].substring(0, iEquals); + sValue = args[i].substring(iEquals + 1); + properties.setProperty(sKey, sValue); + } + } + + // Make sure we got an install dir + if (null == fileInstallDir) + { + return ERROR_MISSING_INSTALL_DIR_PARAM; + } + + // Make sure we got a template file + if (null == fileTemplate) + { + return ERROR_MISSING_TEMPLATE_FILE_PARAM; + } + + // Make sure we got an output file + if (null == fileOutput) + { + return ERROR_MISSING_OUTPUT_FILE_PARAM; + } + + // Note: the properties file parameter is optional + + return ERROR_NO_ERROR; + } + + int processProperties() + { + try + { + Enumeration e; + String sKey; + String sValue; + int i = 0; + + e = properties.propertyNames(); + + rgsSearchFor = new String[properties.size()]; + rgsReplaceWith = new String[properties.size()]; + + while (e.hasMoreElements()) + { + sKey = (String)e.nextElement(); + sValue = (String)properties.get(sKey); + + log("Property key = " + sKey + " Value = " + sValue); + + rgsSearchFor[i] = sKey; + rgsReplaceWith[i] = sValue; + i++; + } + } + catch (Exception ex1) + { + return -111; + } + + return ERROR_NO_ERROR; + } + + int createOutputFile() + { + LineNumberReader lnr = null; + FileWriter fwOutput = null; + String sLineTemplate; + String sLineOutput; + int iSearchFor; + int i; + + try + { + // Open the files + lnr = new LineNumberReader(new FileReader(fileTemplate)); + } + catch (Exception e) + { + return -40; + } + + try + { + fwOutput = new FileWriter(fileOutput); + } + catch (Exception e) + { + return -41; + } + try + { + // For each line of text in the template file... + while (null != (sLineTemplate = lnr.readLine())) + { + sLineOutput = sLineTemplate; + log("<-- " + sLineOutput); + + // For each term to be replaced... + for (i = 0; i < rgsSearchFor.length; i++) + { + log("searching for " + rgsSearchFor[i]); + // Replace all instances of the term on the line + while (-1 != (iSearchFor = sLineOutput.indexOf(rgsSearchFor[i]))) + { + log("replacing " + rgsSearchFor[i] + " at position " + iSearchFor + " with " + rgsReplaceWith[i]); + sLineOutput = sLineOutput.substring(0, iSearchFor) + rgsReplaceWith[i] + + sLineOutput.substring(iSearchFor + rgsSearchFor[i].length()); + } + } + try + { + fwOutput.write(sLineOutput + "\r\n"); + log("--> " + sLineOutput); + } + catch (Exception e) + { + return -42; + } + } + + // Clean up + fwOutput.flush(); + fwOutput.close(); + lnr.close(); + } + catch (Exception e) + { + return ERROR_OUTPUT_COPY_FAILED; + } + return ERROR_NO_ERROR; + } + + void log(int err) + { + log(err, null); + } + + void log(int err, String s) + { + String sMessage = ""; + + switch (err) + { + case ERROR_NO_ERROR: + sMessage = "No error"; + break; + case ERROR_INVALID_NUMBER_OF_PARAMS: + sMessage = "Invalid number of parameters: 4 expected"; + break; + case ERROR_MISSING_TEMPLATE: + sMessage = "Template file not found"; + break; +// case ERROR_TEMPLATE_PROPERTY_MISSING: +// sMessage = "Template file parameter missing"; +// break; + case ERROR_OUTPUT_PROPERTY_MISSING: + sMessage = "Output file parameter missing"; + break; + case ERROR_OUTPUT_COPY_FAILED: + sMessage = "Unable to create output file"; + break; + case ERROR_IO_EXCEPTION: + sMessage = "IOException"; + break; + case ERROR_MISSING_PROPERTIES: + sMessage = "Properties file not found"; + break; + case ERROR_UNABLE_TO_READ_PROPERTIES: + sMessage = "Unable to read properties file"; + break; + default: + sMessage = "Unknown error: " + err; + break; + } + + if (null != s) + { + sMessage = sMessage + s; + } + log(sMessage); + } + + void log(String s) + { + try + { + fw.write(this.getClass().getName() + ": " + s + "\r\n"); + } + catch (IOException ioe) + { + } + } +} diff --git a/CASA-auth-token/server-java/package/windows/Makefile.am b/CASA-auth-token/server-java/package/windows/Makefile.am index b16ada9d..a64deac1 100644 --- a/CASA-auth-token/server-java/package/windows/Makefile.am +++ b/CASA-auth-token/server-java/package/windows/Makefile.am @@ -1,44 +1,44 @@ -####################################################################### -# -# 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. -# -# Author: Greg Richardson -# -####################################################################### - -SUBDIRS = ClientKeystoreSetup InitConfigFile MungeCryptoPropertiesFilePath ServerKeystoreSetup UpdateWarFile server-java_msi - -DIST_SUBDIRS = ClientKeystoreSetup InitConfigFile MungeCryptoPropertiesFilePath ServerKeystoreSetup UpdateWarFile server-java_msi - -EXTRA_DIST = - -.PHONY: package package-clean package-install package-uninstall -package package-clean package-install package-uninstall: - $(MAKE) -C ClientKeystoreSetup $@ - $(MAKE) -C InitConfigFile $@ - $(MAKE) -C MungeCryptoPropertiesFilePath $@ - $(MAKE) -C ServerKeystoreSetup $@ - $(MAKE) -C UpdateWarFile $@ - $(MAKE) -C server-java_msi $@ - -clean-local: - if [ -d lib ]; then rm -rf lib; fi - -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. +# +# Author: Greg Richardson +# +####################################################################### + +SUBDIRS = ClientKeystoreSetup InitConfigFile MungeCryptoPropertiesFilePath ServerKeystoreSetup UpdateWarFile server-java_msi + +DIST_SUBDIRS = ClientKeystoreSetup InitConfigFile MungeCryptoPropertiesFilePath ServerKeystoreSetup UpdateWarFile server-java_msi + +EXTRA_DIST = + +.PHONY: package package-clean package-install package-uninstall +package package-clean package-install package-uninstall: + $(MAKE) -C ClientKeystoreSetup $@ + $(MAKE) -C InitConfigFile $@ + $(MAKE) -C MungeCryptoPropertiesFilePath $@ + $(MAKE) -C ServerKeystoreSetup $@ + $(MAKE) -C UpdateWarFile $@ + $(MAKE) -C server-java_msi $@ + +clean-local: + if [ -d lib ]; then rm -rf lib; fi + +maintainer-clean-local: + rm -f Makefile.in + rm -f Makefile + diff --git a/CASA-auth-token/server-java/package/windows/MungeCryptoPropertiesFilePath/Makefile.am b/CASA-auth-token/server-java/package/windows/MungeCryptoPropertiesFilePath/Makefile.am index 74515ec6..696e7f98 100644 --- a/CASA-auth-token/server-java/package/windows/MungeCryptoPropertiesFilePath/Makefile.am +++ b/CASA-auth-token/server-java/package/windows/MungeCryptoPropertiesFilePath/Makefile.am @@ -1,69 +1,69 @@ -####################################################################### -# -# Copyright (C) 2004 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. -# -# Author: Greg Richardson -# -####################################################################### - -SUBDIRS = - -DIST_SUBDIRS = - -EXTRA_DIST = MungeCryptoPropertiesFilePath.vjsproj Program.jsl - -if DEBUG -TARGET_CFG = Debug -else -TARGET_CFG = Release -endif - -PACKAGE = MungeCryptoPropertiesFilePath -TARGET_FILE = $(PACKAGE).exe -LOG_FILE = $(PACKAGE).log - -.PHONY: package package-clean package-install package-uninstall devenv - -package: $(TARGET_FILE) - -devenv: - @if ! test -x "$(VSINSTALLDIR)/Common7/IDE/devenv.exe"; then echo "Error: Microsoft Visual Studio .NET is currently required to build MSI and MSM packages"; exit 1; fi - -$(TARGET_FILE): devenv - @rm -f $(LOG_FILE) $@ - @CMD='"$(VSINSTALLDIR)/Common7/IDE/devenv.exe" ../server-java_msi/server-java_msi.sln /build $(TARGET_CFG) /project $(PACKAGE) /out $(LOG_FILE)'; \ - echo $$CMD; \ - if eval $$CMD; then \ - ls -l bin/$(TARGET_CFG)/$(TARGET_FILE); \ - else \ - grep -a "ERROR:" $(LOG_FILE); \ - fi - -package-clean clean-local: - rm -rf Release/* Release Debug/* Debug*/Release */Debug *.log *.suo - -clean: - rm -rf Release/* Release Debug/* Debug */Release */Debug *.log *.suo - -distclean-local: package-clean - rm -f Makefile - -maintainer-clean-local: - rm -f Makefile.in - - - +####################################################################### +# +# Copyright (C) 2004 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. +# +# Author: Greg Richardson +# +####################################################################### + +SUBDIRS = + +DIST_SUBDIRS = + +EXTRA_DIST = MungeCryptoPropertiesFilePath.vjsproj Program.jsl + +if DEBUG +TARGET_CFG = Debug +else +TARGET_CFG = Release +endif + +PACKAGE = MungeCryptoPropertiesFilePath +TARGET_FILE = $(PACKAGE).exe +LOG_FILE = $(PACKAGE).log + +.PHONY: package package-clean package-install package-uninstall devenv + +package: $(TARGET_FILE) + +devenv: + @if ! test -x "$(VSINSTALLDIR)/Common7/IDE/devenv.exe"; then echo "Error: Microsoft Visual Studio .NET is currently required to build MSI and MSM packages"; exit 1; fi + +$(TARGET_FILE): devenv + @rm -f $(LOG_FILE) $@ + @CMD='"$(VSINSTALLDIR)/Common7/IDE/devenv.exe" ../server-java_msi/server-java_msi.sln /build $(TARGET_CFG) /project $(PACKAGE) /out $(LOG_FILE)'; \ + echo $$CMD; \ + if eval $$CMD; then \ + ls -l bin/$(TARGET_CFG)/$(TARGET_FILE); \ + else \ + grep -a "ERROR:" $(LOG_FILE); \ + fi + +package-clean clean-local: + rm -rf Release/* Release Debug/* Debug*/Release */Debug *.log *.suo + +clean: + rm -rf Release/* Release Debug/* Debug */Release */Debug *.log *.suo + +distclean-local: package-clean + rm -f Makefile + +maintainer-clean-local: + rm -f Makefile.in + + + diff --git a/CASA-auth-token/server-java/package/windows/MungeCryptoPropertiesFilePath/Program.jsl b/CASA-auth-token/server-java/package/windows/MungeCryptoPropertiesFilePath/Program.jsl index 5144235f..05f05ea4 100644 --- a/CASA-auth-token/server-java/package/windows/MungeCryptoPropertiesFilePath/Program.jsl +++ b/CASA-auth-token/server-java/package/windows/MungeCryptoPropertiesFilePath/Program.jsl @@ -1,312 +1,312 @@ -/*********************************************************************** - * - * Copyright (C) 2006 Novell, Inc. All Rights Reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; version 2.1 - * of the License. - * - * 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 - * Library 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, Novell, Inc. - * - * To contact Novell about this file by physical or electronic mail, - * you may find current contact information at www.novell.com. - * - * Author: Juan Carlos Luciani - * - ***********************************************************************/ - -package MungeCryptoPropertiesFilePath; - -import java.io.*; -import java.util.*; - -/** - * Summary description for Program - */ -public class Program -{ - final static int ERROR_NO_ERROR = 0; - final static int ERROR_INVALID_NUMBER_OF_PARAMS = -1; - final static int ERROR_MISSING_INPUT_FILE = -2; - final static int ERROR_OUTPUT_COPY_FAILED = -3; - final static int ERROR_IO_EXCEPTION = -4; - final static int ERROR_BAD_INPUT_FILE_PARAM = -5; - final static int ERROR_BAD_OUTPUT_FILE_PARAM = -6; - final static int ERROR_MISSING_INPUT_FILE_PARAM = -7; - final static int ERROR_MISSING_OUTPUT_FILE_PARAM = -8; - final static int ERROR_CANNOT_READ_FILE = -9; - final static int ERROR_CANNOT_CREATE_FILE = -10; - - final static String INPUT_FILE_PARAM = "input="; - final static String OUTPUT_FILE_PARAM = "output="; - final static String FILE_KEY = "org.apache.ws.security.crypto.merlin.file="; - - File fileInput; - File fileOutput; - File file; - FileWriter fw; - String sInput; - String sOutput; - - public static void main(String[] args) - { - Program p = new Program(args); - } - - Program(String[] args) - { - int rc = ERROR_NO_ERROR; - - fileInput = null; - fileOutput = null; - - try - { - file = new File("c:\\test5.log"); - fw = new FileWriter(file); - - log("Here we go: " + args.length); - for (int i = 0; i < args.length; i++) - { - log("Arg " + i + " = " + args[i]); - } - - // Process the arguments - if (ERROR_NO_ERROR == (rc = processArgs(args))) - { - // Process the file - rc = createOutputFile(); - } - - } - catch (IOException e) - { - rc = ERROR_IO_EXCEPTION; - } - finally - { - try - { - log("return code = " + rc); - fw.flush(); - fw.close(); - } - catch (Exception e1) - { - } - } - System.exit(rc); - } - - int processArgs(String[] args) - { - int i; - - // Validate the number of parameters - if (args.length != 2) - { - return ERROR_INVALID_NUMBER_OF_PARAMS; - } - - for (i = 0; i < args.length; i++) - { - log("arg[" + i + "] = " +args[i]); - - if (args[i].startsWith(INPUT_FILE_PARAM)) - { - // Make sure it is more than the param tag - if (args[i].length() <= INPUT_FILE_PARAM.length()) - { - return ERROR_BAD_INPUT_FILE_PARAM; - } - - sInput = args[i].substring(INPUT_FILE_PARAM.length()).trim(); - fileInput = new File(sInput); - - // Make sure the input file can be found - if (!fileInput.exists()) - { - log(ERROR_MISSING_INPUT_FILE, sInput); - return ERROR_MISSING_INPUT_FILE; - } - } - - else if (args[i].startsWith(OUTPUT_FILE_PARAM)) - { - // Make sure it is more than the param tag - if (args[i].length() <= OUTPUT_FILE_PARAM.length()) - { - return ERROR_BAD_OUTPUT_FILE_PARAM; - } - - sOutput = args[i].substring(OUTPUT_FILE_PARAM.length()).trim(); - fileOutput = new File(sOutput); - } - } - - // Make sure we got an input file - if (null == fileInput) - { - return ERROR_MISSING_INPUT_FILE_PARAM; - } - - // Make sure we got an output file - if (null == fileOutput) - { - return ERROR_MISSING_OUTPUT_FILE_PARAM; - } - - return ERROR_NO_ERROR; - } - - int createOutputFile() - { - LineNumberReader lnr = null; - FileWriter fwOutput = null; - String sLineTemplate; - String sLineOutput; - int iSearchFor; - - try - { - // Open the file - lnr = new LineNumberReader(new FileReader(fileInput)); - } - catch (Exception e) - { - return ERROR_CANNOT_READ_FILE; - } - - try - { - fwOutput = new FileWriter(fileOutput); - } - catch (Exception e) - { - return ERROR_CANNOT_CREATE_FILE; - } - try - { - // For each line of text in the template file... - while (null != (sLineTemplate = lnr.readLine())) - { - sLineOutput = sLineTemplate; - log("<-- " + sLineOutput); - - if (sLineOutput.trim().startsWith(FILE_KEY)) - { - // Replace all instances of the line separator on the line - while (-1 != (iSearchFor = sLineOutput.indexOf("\\"))) - { - log("replacing \\ at position " + iSearchFor + " with //"); - sLineOutput = sLineOutput.substring(0, iSearchFor) + "//" + - sLineOutput.substring(iSearchFor + 1); - } - } - try - { - fwOutput.write(sLineOutput + "\r\n"); - log("--> " + sLineOutput); - } - catch (Exception e) - { - return -42; - } - } - - // Clean up - fwOutput.flush(); - fwOutput.close(); - lnr.close(); - } - catch (Exception e) - { - return ERROR_OUTPUT_COPY_FAILED; - } - return ERROR_NO_ERROR; - } - - void log(int err) - { - log(err, null); - } - - void log(int err, String s) - { - String sMessage = ""; - - switch (err) - { - case ERROR_NO_ERROR: - sMessage = "No error"; - break; - case ERROR_INVALID_NUMBER_OF_PARAMS: - sMessage = "Invalid number of parameters: 2 expected"; - break; - - case ERROR_MISSING_INPUT_FILE: - sMessage = "Invalid number of parameters: 2 expected"; - break; - - case ERROR_OUTPUT_COPY_FAILED: - sMessage = "Unable to create output file"; - break; - - case ERROR_IO_EXCEPTION: - sMessage = "IOException"; - break; - - case ERROR_BAD_INPUT_FILE_PARAM: - sMessage = "Invalid input file parameter"; - break; - - case ERROR_BAD_OUTPUT_FILE_PARAM: - sMessage = "Invalid output file parameter"; - break; - - case ERROR_MISSING_INPUT_FILE_PARAM: - sMessage = "Missing input file parameter"; - break; - - case ERROR_MISSING_OUTPUT_FILE_PARAM: - sMessage = "Missing output file parameter"; - break; - - case ERROR_CANNOT_READ_FILE: - sMessage = "Cannot read file"; - break; - - case ERROR_CANNOT_CREATE_FILE: - sMessage = "Cannot create file"; - break; - - default: - sMessage = "Unknown error: " + err; - break; - } - - if (null != s) - { - sMessage = sMessage + s; - } - log(sMessage); - } - - void log(String s) - { - try - { - fw.write(this.getClass().getName() + ": " + s + "\r\n"); - } - catch (IOException ioe) - { - } - } -} +/*********************************************************************** + * + * Copyright (C) 2006 Novell, Inc. All Rights Reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; version 2.1 + * of the License. + * + * 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 + * Library 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, Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, + * you may find current contact information at www.novell.com. + * + * Author: Juan Carlos Luciani + * + ***********************************************************************/ + +package MungeCryptoPropertiesFilePath; + +import java.io.*; +import java.util.*; + +/** + * Summary description for Program + */ +public class Program +{ + final static int ERROR_NO_ERROR = 0; + final static int ERROR_INVALID_NUMBER_OF_PARAMS = -1; + final static int ERROR_MISSING_INPUT_FILE = -2; + final static int ERROR_OUTPUT_COPY_FAILED = -3; + final static int ERROR_IO_EXCEPTION = -4; + final static int ERROR_BAD_INPUT_FILE_PARAM = -5; + final static int ERROR_BAD_OUTPUT_FILE_PARAM = -6; + final static int ERROR_MISSING_INPUT_FILE_PARAM = -7; + final static int ERROR_MISSING_OUTPUT_FILE_PARAM = -8; + final static int ERROR_CANNOT_READ_FILE = -9; + final static int ERROR_CANNOT_CREATE_FILE = -10; + + final static String INPUT_FILE_PARAM = "input="; + final static String OUTPUT_FILE_PARAM = "output="; + final static String FILE_KEY = "org.apache.ws.security.crypto.merlin.file="; + + File fileInput; + File fileOutput; + File file; + FileWriter fw; + String sInput; + String sOutput; + + public static void main(String[] args) + { + Program p = new Program(args); + } + + Program(String[] args) + { + int rc = ERROR_NO_ERROR; + + fileInput = null; + fileOutput = null; + + try + { + file = new File("c:\\test5.log"); + fw = new FileWriter(file); + + log("Here we go: " + args.length); + for (int i = 0; i < args.length; i++) + { + log("Arg " + i + " = " + args[i]); + } + + // Process the arguments + if (ERROR_NO_ERROR == (rc = processArgs(args))) + { + // Process the file + rc = createOutputFile(); + } + + } + catch (IOException e) + { + rc = ERROR_IO_EXCEPTION; + } + finally + { + try + { + log("return code = " + rc); + fw.flush(); + fw.close(); + } + catch (Exception e1) + { + } + } + System.exit(rc); + } + + int processArgs(String[] args) + { + int i; + + // Validate the number of parameters + if (args.length != 2) + { + return ERROR_INVALID_NUMBER_OF_PARAMS; + } + + for (i = 0; i < args.length; i++) + { + log("arg[" + i + "] = " +args[i]); + + if (args[i].startsWith(INPUT_FILE_PARAM)) + { + // Make sure it is more than the param tag + if (args[i].length() <= INPUT_FILE_PARAM.length()) + { + return ERROR_BAD_INPUT_FILE_PARAM; + } + + sInput = args[i].substring(INPUT_FILE_PARAM.length()).trim(); + fileInput = new File(sInput); + + // Make sure the input file can be found + if (!fileInput.exists()) + { + log(ERROR_MISSING_INPUT_FILE, sInput); + return ERROR_MISSING_INPUT_FILE; + } + } + + else if (args[i].startsWith(OUTPUT_FILE_PARAM)) + { + // Make sure it is more than the param tag + if (args[i].length() <= OUTPUT_FILE_PARAM.length()) + { + return ERROR_BAD_OUTPUT_FILE_PARAM; + } + + sOutput = args[i].substring(OUTPUT_FILE_PARAM.length()).trim(); + fileOutput = new File(sOutput); + } + } + + // Make sure we got an input file + if (null == fileInput) + { + return ERROR_MISSING_INPUT_FILE_PARAM; + } + + // Make sure we got an output file + if (null == fileOutput) + { + return ERROR_MISSING_OUTPUT_FILE_PARAM; + } + + return ERROR_NO_ERROR; + } + + int createOutputFile() + { + LineNumberReader lnr = null; + FileWriter fwOutput = null; + String sLineTemplate; + String sLineOutput; + int iSearchFor; + + try + { + // Open the file + lnr = new LineNumberReader(new FileReader(fileInput)); + } + catch (Exception e) + { + return ERROR_CANNOT_READ_FILE; + } + + try + { + fwOutput = new FileWriter(fileOutput); + } + catch (Exception e) + { + return ERROR_CANNOT_CREATE_FILE; + } + try + { + // For each line of text in the template file... + while (null != (sLineTemplate = lnr.readLine())) + { + sLineOutput = sLineTemplate; + log("<-- " + sLineOutput); + + if (sLineOutput.trim().startsWith(FILE_KEY)) + { + // Replace all instances of the line separator on the line + while (-1 != (iSearchFor = sLineOutput.indexOf("\\"))) + { + log("replacing \\ at position " + iSearchFor + " with //"); + sLineOutput = sLineOutput.substring(0, iSearchFor) + "//" + + sLineOutput.substring(iSearchFor + 1); + } + } + try + { + fwOutput.write(sLineOutput + "\r\n"); + log("--> " + sLineOutput); + } + catch (Exception e) + { + return -42; + } + } + + // Clean up + fwOutput.flush(); + fwOutput.close(); + lnr.close(); + } + catch (Exception e) + { + return ERROR_OUTPUT_COPY_FAILED; + } + return ERROR_NO_ERROR; + } + + void log(int err) + { + log(err, null); + } + + void log(int err, String s) + { + String sMessage = ""; + + switch (err) + { + case ERROR_NO_ERROR: + sMessage = "No error"; + break; + case ERROR_INVALID_NUMBER_OF_PARAMS: + sMessage = "Invalid number of parameters: 2 expected"; + break; + + case ERROR_MISSING_INPUT_FILE: + sMessage = "Invalid number of parameters: 2 expected"; + break; + + case ERROR_OUTPUT_COPY_FAILED: + sMessage = "Unable to create output file"; + break; + + case ERROR_IO_EXCEPTION: + sMessage = "IOException"; + break; + + case ERROR_BAD_INPUT_FILE_PARAM: + sMessage = "Invalid input file parameter"; + break; + + case ERROR_BAD_OUTPUT_FILE_PARAM: + sMessage = "Invalid output file parameter"; + break; + + case ERROR_MISSING_INPUT_FILE_PARAM: + sMessage = "Missing input file parameter"; + break; + + case ERROR_MISSING_OUTPUT_FILE_PARAM: + sMessage = "Missing output file parameter"; + break; + + case ERROR_CANNOT_READ_FILE: + sMessage = "Cannot read file"; + break; + + case ERROR_CANNOT_CREATE_FILE: + sMessage = "Cannot create file"; + break; + + default: + sMessage = "Unknown error: " + err; + break; + } + + if (null != s) + { + sMessage = sMessage + s; + } + log(sMessage); + } + + void log(String s) + { + try + { + fw.write(this.getClass().getName() + ": " + s + "\r\n"); + } + catch (IOException ioe) + { + } + } +} diff --git a/CASA-auth-token/server-java/package/windows/ServerKeystoreSetup/Makefile.am b/CASA-auth-token/server-java/package/windows/ServerKeystoreSetup/Makefile.am index e702777e..48b20db9 100644 --- a/CASA-auth-token/server-java/package/windows/ServerKeystoreSetup/Makefile.am +++ b/CASA-auth-token/server-java/package/windows/ServerKeystoreSetup/Makefile.am @@ -1,69 +1,69 @@ -####################################################################### -# -# Copyright (C) 2004 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. -# -# Author: Greg Richardson -# -####################################################################### - -SUBDIRS = - -DIST_SUBDIRS = - -EXTRA_DIST = ServerKeystoreSetup.vjsproj Program.jsl - -if DEBUG -TARGET_CFG = Debug -else -TARGET_CFG = Release -endif - -PACKAGE = ServerKeystoreSetup -TARGET_FILE = $(PACKAGE).exe -LOG_FILE = $(PACKAGE).log - -.PHONY: package package-clean package-install package-uninstall devenv - -package: $(TARGET_FILE) - -devenv: - @if ! test -x "$(VSINSTALLDIR)/Common7/IDE/devenv.exe"; then echo "Error: Microsoft Visual Studio .NET is currently required to build MSI and MSM packages"; exit 1; fi - -$(TARGET_FILE): devenv - @rm -f $(LOG_FILE) $@ - @CMD='"$(VSINSTALLDIR)/Common7/IDE/devenv.exe" ../server-java_msi/server-java_msi.sln /build $(TARGET_CFG) /project $(PACKAGE) /out $(LOG_FILE)'; \ - echo $$CMD; \ - if eval $$CMD; then \ - ls -l bin/$(TARGET_CFG)/$(TARGET_FILE); \ - else \ - grep -a "ERROR:" $(LOG_FILE); \ - fi - -package-clean clean-local: - rm -rf Release/* Release Debug/* Debug*/Release */Debug *.log *.suo - -clean: - rm -rf Release/* Release Debug/* Debug */Release */Debug *.log *.suo - -distclean-local: package-clean - rm -f Makefile - -maintainer-clean-local: - rm -f Makefile.in - - - +####################################################################### +# +# Copyright (C) 2004 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. +# +# Author: Greg Richardson +# +####################################################################### + +SUBDIRS = + +DIST_SUBDIRS = + +EXTRA_DIST = ServerKeystoreSetup.vjsproj Program.jsl + +if DEBUG +TARGET_CFG = Debug +else +TARGET_CFG = Release +endif + +PACKAGE = ServerKeystoreSetup +TARGET_FILE = $(PACKAGE).exe +LOG_FILE = $(PACKAGE).log + +.PHONY: package package-clean package-install package-uninstall devenv + +package: $(TARGET_FILE) + +devenv: + @if ! test -x "$(VSINSTALLDIR)/Common7/IDE/devenv.exe"; then echo "Error: Microsoft Visual Studio .NET is currently required to build MSI and MSM packages"; exit 1; fi + +$(TARGET_FILE): devenv + @rm -f $(LOG_FILE) $@ + @CMD='"$(VSINSTALLDIR)/Common7/IDE/devenv.exe" ../server-java_msi/server-java_msi.sln /build $(TARGET_CFG) /project $(PACKAGE) /out $(LOG_FILE)'; \ + echo $$CMD; \ + if eval $$CMD; then \ + ls -l bin/$(TARGET_CFG)/$(TARGET_FILE); \ + else \ + grep -a "ERROR:" $(LOG_FILE); \ + fi + +package-clean clean-local: + rm -rf Release/* Release Debug/* Debug*/Release */Debug *.log *.suo + +clean: + rm -rf Release/* Release Debug/* Debug */Release */Debug *.log *.suo + +distclean-local: package-clean + rm -f Makefile + +maintainer-clean-local: + rm -f Makefile.in + + + diff --git a/CASA-auth-token/server-java/package/windows/UpdateWarFile/Makefile.am b/CASA-auth-token/server-java/package/windows/UpdateWarFile/Makefile.am index 33d144a8..69612f95 100644 --- a/CASA-auth-token/server-java/package/windows/UpdateWarFile/Makefile.am +++ b/CASA-auth-token/server-java/package/windows/UpdateWarFile/Makefile.am @@ -1,69 +1,69 @@ -####################################################################### -# -# Copyright (C) 2004 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. -# -# Author: Greg Richardson -# -####################################################################### - -SUBDIRS = - -DIST_SUBDIRS = - -EXTRA_DIST = UpdateWarFile.vjsproj Program.jsl - -if DEBUG -TARGET_CFG = Debug -else -TARGET_CFG = Release -endif - -PACKAGE = UpdateWarFile -TARGET_FILE = $(PACKAGE).exe -LOG_FILE = $(PACKAGE).log - -.PHONY: package package-clean package-install package-uninstall devenv - -package: $(TARGET_FILE) - -devenv: - @if ! test -x "$(VSINSTALLDIR)/Common7/IDE/devenv.exe"; then echo "Error: Microsoft Visual Studio .NET is currently required to build MSI and MSM packages"; exit 1; fi - -$(TARGET_FILE): devenv - @rm -f $(LOG_FILE) $@ - @CMD='"$(VSINSTALLDIR)/Common7/IDE/devenv.exe" ../server-java_msi/server-java_msi.sln /build $(TARGET_CFG) /project $(PACKAGE) /out $(LOG_FILE)'; \ - echo $$CMD; \ - if eval $$CMD; then \ - ls -l bin/$(TARGET_CFG)/$(TARGET_FILE); \ - else \ - grep -a "ERROR:" $(LOG_FILE); \ - fi - -package-clean clean-local: - rm -rf Release/* Release Debug/* Debug*/Release */Debug *.log *.suo - -clean: - rm -rf Release/* Release Debug/* Debug */Release */Debug *.log *.suo - -distclean-local: package-clean - rm -f Makefile - -maintainer-clean-local: - rm -f Makefile.in - - - +####################################################################### +# +# Copyright (C) 2004 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. +# +# Author: Greg Richardson +# +####################################################################### + +SUBDIRS = + +DIST_SUBDIRS = + +EXTRA_DIST = UpdateWarFile.vjsproj Program.jsl + +if DEBUG +TARGET_CFG = Debug +else +TARGET_CFG = Release +endif + +PACKAGE = UpdateWarFile +TARGET_FILE = $(PACKAGE).exe +LOG_FILE = $(PACKAGE).log + +.PHONY: package package-clean package-install package-uninstall devenv + +package: $(TARGET_FILE) + +devenv: + @if ! test -x "$(VSINSTALLDIR)/Common7/IDE/devenv.exe"; then echo "Error: Microsoft Visual Studio .NET is currently required to build MSI and MSM packages"; exit 1; fi + +$(TARGET_FILE): devenv + @rm -f $(LOG_FILE) $@ + @CMD='"$(VSINSTALLDIR)/Common7/IDE/devenv.exe" ../server-java_msi/server-java_msi.sln /build $(TARGET_CFG) /project $(PACKAGE) /out $(LOG_FILE)'; \ + echo $$CMD; \ + if eval $$CMD; then \ + ls -l bin/$(TARGET_CFG)/$(TARGET_FILE); \ + else \ + grep -a "ERROR:" $(LOG_FILE); \ + fi + +package-clean clean-local: + rm -rf Release/* Release Debug/* Debug*/Release */Debug *.log *.suo + +clean: + rm -rf Release/* Release Debug/* Debug */Release */Debug *.log *.suo + +distclean-local: package-clean + rm -f Makefile + +maintainer-clean-local: + rm -f Makefile.in + + + diff --git a/CASA-auth-token/server-java/package/windows/UpdateWarFile/Program.jsl b/CASA-auth-token/server-java/package/windows/UpdateWarFile/Program.jsl index 769b9aa8..d429ab69 100644 --- a/CASA-auth-token/server-java/package/windows/UpdateWarFile/Program.jsl +++ b/CASA-auth-token/server-java/package/windows/UpdateWarFile/Program.jsl @@ -1,417 +1,417 @@ -/*********************************************************************** - * - * Copyright (C) 2006 Novell, Inc. All Rights Reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; version 2.1 - * of the License. - * - * 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 - * Library 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, Novell, Inc. - * - * To contact Novell about this file by physical or electronic mail, - * you may find current contact information at www.novell.com. - * - * Author: Juan Carlos Luciani - * - ***********************************************************************/ - -package UpdateWarFile; - -import java.lang.Throwable; -import java.lang.NullPointerException; -import com.zerog.ia.api.pub.*; -import java.util.*; -import java.net.*; -import java.io.*; -import java.util.zip.*; -import java.util.jar.*; - -/** - * Summary description for Program - */ -public class Program -{ - final static String INSTALL_DIR_PARAM = "ATS_INSTALL_DIR="; - - final static int ERROR_NO_ERROR = 0; - final static int ERROR_IO_EXCEPTION = -1; - final static int ERROR_INVALID_NUMBER_OF_PARAMS = -2; - final static int ERROR_BAD_INSTALL_DIR_PARAM = -3; - final static int ERROR_MISSING_INSTALL_DIR = -4; - final static int ERROR_INSTALL_DIR_NOT_A_DIR = -5; - final static int ERROR_MISSING_INSTALL_DIR_PARAM = -6; - final static int ERROR_WAR_TEMPLATE_FILE_MISSING = -7; - final static int ERROR_NEW_JAR_CANNOT_BE_REPLACED = -8; - final static int ERROR_JAR_COPY_FAILED = -9; - final static int ERROR_CREATE_WAR_FILE_FAILED = -10; - final static int ERROR_CREATE_WAR_FOS_FAILED = -11; - final static int ERROR_OPEN_JAR_TEMPLATE_FAILED = -12; - final static int ERROR_JOS_FLUSH_FAILED = -13; - final static int ERROR_ADD_FILE_TO_JAR_FAILED = -14; - final static int ERROR_JOS_CLOSE_FAILED = -15; - final static int ERROR_FOS_CLOSE_FAILED = -16; - final static int ERROR_JFTEMPLATE_CLOSE_FAILED = -17; - - String sInstallDir; - File file; - FileWriter fw; - - public static void main(String[] args) - { - Program p = new Program(args); - } - - Program(String[] args) - { - int rc = ERROR_NO_ERROR; - - sInstallDir = null; - - try - { - file = new File("c:\\test3.log"); - fw = new FileWriter(file); - - log("Here we go: " + args.length); - for (int i = 0; i < args.length; i++) - { - log("Arg " + i + " = " + args[i]); - } - - // Process the arguments - if (ERROR_NO_ERROR == (rc = processArgs(args))) - { - // Create the modified war file - rc = createWarFile(); - } - } - catch (IOException e) - { - rc = ERROR_IO_EXCEPTION; - } - finally - { - try - { - log("return code = " + rc); - fw.flush(); - fw.close(); - } - catch (Exception e1) - { - } - } - System.exit(rc); - } - - int processArgs(String[] args) - { - File fileInstallDir = null; - int i; - - // Validate the number of parameters - if (args.length != 1) - { - return ERROR_INVALID_NUMBER_OF_PARAMS; - } - - for (i = 0; i < args.length; i++) - { - log("arg[" + i + "] = " + args[i]); - - // is this the install dir param? - if (args[i].startsWith(INSTALL_DIR_PARAM)) - { - // Make sure it is more than the param tag - if (args[i].length() <= INSTALL_DIR_PARAM.length()) - { - return ERROR_BAD_INSTALL_DIR_PARAM; - } - - sInstallDir = args[i].substring(INSTALL_DIR_PARAM.length()).trim(); - fileInstallDir = new File(sInstallDir); - - // Make sure the install dir can be found - if (!fileInstallDir.exists()) - { - return ERROR_MISSING_INSTALL_DIR; - } - - // Make sure the install dir is a directory - if (!fileInstallDir.isDirectory()) - { - return ERROR_INSTALL_DIR_NOT_A_DIR; - } - } - } - - // Make sure we got an install dir - if (null == fileInstallDir) - { - return ERROR_MISSING_INSTALL_DIR_PARAM; - } - - return ERROR_NO_ERROR; - } - - int createWarFile() - { - String sWarTemplate = sInstallDir + "ats\\etc\\svc\\templates\\CasaAuthTokenSvc.war"; - String sWarNew = sInstallDir + "ats\\catalinabase\\webapps\\CasaAuthTokenSvc.war"; - File fileWarTemplate = new File(sWarTemplate);; - File fileWarNew = new File(sWarNew); - FileOutputStream fosWarNew = null; - ZipOutputStream josWarNew = null; - ZipFile jfTemplate = null; - int rc = ERROR_NO_ERROR; - - // Ensure that the war template exists - log("looking for war template: " + sWarTemplate); - if (!fileWarTemplate.exists()) - { - rc = ERROR_WAR_TEMPLATE_FILE_MISSING; - } - - if (rc == ERROR_NO_ERROR) - { - // Ensure that the new jar name does not exist - if (fileWarNew.exists()) - { - log("war file already exists: " + sWarNew); - if (!fileWarNew.delete()) - { - log("could not delete war file: " + sWarNew); - rc = ERROR_NEW_JAR_CANNOT_BE_REPLACED; - } - } - } - - if (rc == ERROR_NO_ERROR) - { - // Create/open the new jar - try - { - log("create new war file output stream: " + sWarNew); - fosWarNew = new FileOutputStream(fileWarNew); - josWarNew = new ZipOutputStream(fosWarNew); - } - catch (IOException ioe0) - { - log(ioe0.toString()); - rc = ERROR_CREATE_WAR_FOS_FAILED; - } - } - - if (rc == ERROR_NO_ERROR) - { - // Open the old jar - try - { - jfTemplate = new ZipFile(sWarTemplate); - } - catch (IOException ioe1) - { - rc = ERROR_OPEN_JAR_TEMPLATE_FAILED; - } - } - - if (rc == ERROR_NO_ERROR) - { - // Transfer the files - rc = moveFilesFromJarToJar(josWarNew, jfTemplate); - } - - // Add the files - if (rc == ERROR_NO_ERROR) - { - int i; - String [] rgsFilesToAdd = new String[1]; - rgsFilesToAdd[0] = sInstallDir + "ats\\etc\\svc\\templates\\crypto.properties"; - String [] rgsNames = new String[1]; - rgsNames[0] = "WEB-INF/classes/crypto.properties"; - for (i = 0; i < rgsFilesToAdd.length; i++) - { - log("Adding file: " + rgsFilesToAdd[i] + " with name " + rgsNames[i]); - rc = addFileToJar(rgsFilesToAdd[i], rgsNames[i], josWarNew); - } - } - - // Close up - if (null != josWarNew) - { - try - { - josWarNew.flush(); - } - catch (IOException ioe2) - { - rc = ERROR_JOS_FLUSH_FAILED; - } - try - { - josWarNew.close(); - } - catch (IOException ioe3) - { - rc = ERROR_JOS_CLOSE_FAILED; - } - try - { - fosWarNew.close(); - } - catch (IOException ioe4) - { - rc = ERROR_FOS_CLOSE_FAILED; - } - } - if (null != jfTemplate) - { - try - { - jfTemplate.close(); - } - catch (IOException ioe5) - { - rc = ERROR_JFTEMPLATE_CLOSE_FAILED; - } - } - - return rc; - } - - int moveFilesFromJarToJar(ZipOutputStream josDst, ZipFile jfSrc) - { - int rc = ERROR_NO_ERROR; - try - { - Enumeration entries = jfSrc.entries(); - ZipEntry jeLoop; - InputStream isLoop; - ZipEntry zeIndex; - int bRead; - byte [] b = new byte[4096]; - - while (entries.hasMoreElements()) - { - jeLoop = (ZipEntry)entries.nextElement(); - - // Skip WEB-INF/classes/cypto.properties - if (jeLoop.getName().equalsIgnoreCase("WEB-INF/classes/crypto.properties")) - { - log("skipping: " + "WEB-INF/classes/crypto.properties"); - continue; - } - - // Move the rest of the files over - else - { - log("Transferring jar file: " + jeLoop.getName()); - - // Create the input stream - isLoop = jfSrc.getInputStream(jeLoop); - - // Set up the output stream - zeIndex = new ZipEntry(jeLoop.getName()); - josDst.putNextEntry( zeIndex); - - // Transfer the file contents - while (-1 != (bRead = isLoop.read(b))) - { - josDst.write(b, 0, bRead); - } - - // all done - josDst.closeEntry(); - isLoop.close(); - } - } - } - catch (Exception e) - { - rc = ERROR_JAR_COPY_FAILED; - } - return rc; - } - - int addFileToJar(String sFilename, String sName, ZipOutputStream josJarNew) - { - FileInputStream fis; - ZipEntry je; - int bRead; - byte [] b = new byte[4096]; - int rc = ERROR_NO_ERROR; - - try - { - // Create the input stream - fis = new FileInputStream(sFilename); - - // Set up the output stream - je = new ZipEntry(sName); - josJarNew.putNextEntry(je); - - // Tansfer the contents of the file - while (-1 != (bRead = fis.read(b))) - { - josJarNew.write(b, 0, bRead); - } - - // All done - fis.close(); - josJarNew.closeEntry(); - } - catch (Exception e) - { - log(e.toString()); - rc = ERROR_ADD_FILE_TO_JAR_FAILED; - } - return rc; - } - - void log(int err) - { - log(err, null); - } - - void log(int err, String s) - { - String sMessage = ""; - - switch (err) - { - case ERROR_NO_ERROR: - sMessage = "No error"; - break; - case ERROR_INVALID_NUMBER_OF_PARAMS: - sMessage = "Invalid number of parameters: 4 expected"; - break; - default: - sMessage = "Unknown error: " + err; - break; - } - - if (null != s) - { - sMessage = sMessage + s; - } - log(sMessage); - } - - void log(String s) - { - try - { - fw.write(this.getClass().getName() + ": " + s + "\r\n"); - } - catch (IOException ioe) - { - } - } -} +/*********************************************************************** + * + * Copyright (C) 2006 Novell, Inc. All Rights Reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; version 2.1 + * of the License. + * + * 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 + * Library 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, Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, + * you may find current contact information at www.novell.com. + * + * Author: Juan Carlos Luciani + * + ***********************************************************************/ + +package UpdateWarFile; + +import java.lang.Throwable; +import java.lang.NullPointerException; +import com.zerog.ia.api.pub.*; +import java.util.*; +import java.net.*; +import java.io.*; +import java.util.zip.*; +import java.util.jar.*; + +/** + * Summary description for Program + */ +public class Program +{ + final static String INSTALL_DIR_PARAM = "ATS_INSTALL_DIR="; + + final static int ERROR_NO_ERROR = 0; + final static int ERROR_IO_EXCEPTION = -1; + final static int ERROR_INVALID_NUMBER_OF_PARAMS = -2; + final static int ERROR_BAD_INSTALL_DIR_PARAM = -3; + final static int ERROR_MISSING_INSTALL_DIR = -4; + final static int ERROR_INSTALL_DIR_NOT_A_DIR = -5; + final static int ERROR_MISSING_INSTALL_DIR_PARAM = -6; + final static int ERROR_WAR_TEMPLATE_FILE_MISSING = -7; + final static int ERROR_NEW_JAR_CANNOT_BE_REPLACED = -8; + final static int ERROR_JAR_COPY_FAILED = -9; + final static int ERROR_CREATE_WAR_FILE_FAILED = -10; + final static int ERROR_CREATE_WAR_FOS_FAILED = -11; + final static int ERROR_OPEN_JAR_TEMPLATE_FAILED = -12; + final static int ERROR_JOS_FLUSH_FAILED = -13; + final static int ERROR_ADD_FILE_TO_JAR_FAILED = -14; + final static int ERROR_JOS_CLOSE_FAILED = -15; + final static int ERROR_FOS_CLOSE_FAILED = -16; + final static int ERROR_JFTEMPLATE_CLOSE_FAILED = -17; + + String sInstallDir; + File file; + FileWriter fw; + + public static void main(String[] args) + { + Program p = new Program(args); + } + + Program(String[] args) + { + int rc = ERROR_NO_ERROR; + + sInstallDir = null; + + try + { + file = new File("c:\\test3.log"); + fw = new FileWriter(file); + + log("Here we go: " + args.length); + for (int i = 0; i < args.length; i++) + { + log("Arg " + i + " = " + args[i]); + } + + // Process the arguments + if (ERROR_NO_ERROR == (rc = processArgs(args))) + { + // Create the modified war file + rc = createWarFile(); + } + } + catch (IOException e) + { + rc = ERROR_IO_EXCEPTION; + } + finally + { + try + { + log("return code = " + rc); + fw.flush(); + fw.close(); + } + catch (Exception e1) + { + } + } + System.exit(rc); + } + + int processArgs(String[] args) + { + File fileInstallDir = null; + int i; + + // Validate the number of parameters + if (args.length != 1) + { + return ERROR_INVALID_NUMBER_OF_PARAMS; + } + + for (i = 0; i < args.length; i++) + { + log("arg[" + i + "] = " + args[i]); + + // is this the install dir param? + if (args[i].startsWith(INSTALL_DIR_PARAM)) + { + // Make sure it is more than the param tag + if (args[i].length() <= INSTALL_DIR_PARAM.length()) + { + return ERROR_BAD_INSTALL_DIR_PARAM; + } + + sInstallDir = args[i].substring(INSTALL_DIR_PARAM.length()).trim(); + fileInstallDir = new File(sInstallDir); + + // Make sure the install dir can be found + if (!fileInstallDir.exists()) + { + return ERROR_MISSING_INSTALL_DIR; + } + + // Make sure the install dir is a directory + if (!fileInstallDir.isDirectory()) + { + return ERROR_INSTALL_DIR_NOT_A_DIR; + } + } + } + + // Make sure we got an install dir + if (null == fileInstallDir) + { + return ERROR_MISSING_INSTALL_DIR_PARAM; + } + + return ERROR_NO_ERROR; + } + + int createWarFile() + { + String sWarTemplate = sInstallDir + "ats\\etc\\svc\\templates\\CasaAuthTokenSvc.war"; + String sWarNew = sInstallDir + "ats\\catalinabase\\webapps\\CasaAuthTokenSvc.war"; + File fileWarTemplate = new File(sWarTemplate);; + File fileWarNew = new File(sWarNew); + FileOutputStream fosWarNew = null; + ZipOutputStream josWarNew = null; + ZipFile jfTemplate = null; + int rc = ERROR_NO_ERROR; + + // Ensure that the war template exists + log("looking for war template: " + sWarTemplate); + if (!fileWarTemplate.exists()) + { + rc = ERROR_WAR_TEMPLATE_FILE_MISSING; + } + + if (rc == ERROR_NO_ERROR) + { + // Ensure that the new jar name does not exist + if (fileWarNew.exists()) + { + log("war file already exists: " + sWarNew); + if (!fileWarNew.delete()) + { + log("could not delete war file: " + sWarNew); + rc = ERROR_NEW_JAR_CANNOT_BE_REPLACED; + } + } + } + + if (rc == ERROR_NO_ERROR) + { + // Create/open the new jar + try + { + log("create new war file output stream: " + sWarNew); + fosWarNew = new FileOutputStream(fileWarNew); + josWarNew = new ZipOutputStream(fosWarNew); + } + catch (IOException ioe0) + { + log(ioe0.toString()); + rc = ERROR_CREATE_WAR_FOS_FAILED; + } + } + + if (rc == ERROR_NO_ERROR) + { + // Open the old jar + try + { + jfTemplate = new ZipFile(sWarTemplate); + } + catch (IOException ioe1) + { + rc = ERROR_OPEN_JAR_TEMPLATE_FAILED; + } + } + + if (rc == ERROR_NO_ERROR) + { + // Transfer the files + rc = moveFilesFromJarToJar(josWarNew, jfTemplate); + } + + // Add the files + if (rc == ERROR_NO_ERROR) + { + int i; + String [] rgsFilesToAdd = new String[1]; + rgsFilesToAdd[0] = sInstallDir + "ats\\etc\\svc\\templates\\crypto.properties"; + String [] rgsNames = new String[1]; + rgsNames[0] = "WEB-INF/classes/crypto.properties"; + for (i = 0; i < rgsFilesToAdd.length; i++) + { + log("Adding file: " + rgsFilesToAdd[i] + " with name " + rgsNames[i]); + rc = addFileToJar(rgsFilesToAdd[i], rgsNames[i], josWarNew); + } + } + + // Close up + if (null != josWarNew) + { + try + { + josWarNew.flush(); + } + catch (IOException ioe2) + { + rc = ERROR_JOS_FLUSH_FAILED; + } + try + { + josWarNew.close(); + } + catch (IOException ioe3) + { + rc = ERROR_JOS_CLOSE_FAILED; + } + try + { + fosWarNew.close(); + } + catch (IOException ioe4) + { + rc = ERROR_FOS_CLOSE_FAILED; + } + } + if (null != jfTemplate) + { + try + { + jfTemplate.close(); + } + catch (IOException ioe5) + { + rc = ERROR_JFTEMPLATE_CLOSE_FAILED; + } + } + + return rc; + } + + int moveFilesFromJarToJar(ZipOutputStream josDst, ZipFile jfSrc) + { + int rc = ERROR_NO_ERROR; + try + { + Enumeration entries = jfSrc.entries(); + ZipEntry jeLoop; + InputStream isLoop; + ZipEntry zeIndex; + int bRead; + byte [] b = new byte[4096]; + + while (entries.hasMoreElements()) + { + jeLoop = (ZipEntry)entries.nextElement(); + + // Skip WEB-INF/classes/cypto.properties + if (jeLoop.getName().equalsIgnoreCase("WEB-INF/classes/crypto.properties")) + { + log("skipping: " + "WEB-INF/classes/crypto.properties"); + continue; + } + + // Move the rest of the files over + else + { + log("Transferring jar file: " + jeLoop.getName()); + + // Create the input stream + isLoop = jfSrc.getInputStream(jeLoop); + + // Set up the output stream + zeIndex = new ZipEntry(jeLoop.getName()); + josDst.putNextEntry( zeIndex); + + // Transfer the file contents + while (-1 != (bRead = isLoop.read(b))) + { + josDst.write(b, 0, bRead); + } + + // all done + josDst.closeEntry(); + isLoop.close(); + } + } + } + catch (Exception e) + { + rc = ERROR_JAR_COPY_FAILED; + } + return rc; + } + + int addFileToJar(String sFilename, String sName, ZipOutputStream josJarNew) + { + FileInputStream fis; + ZipEntry je; + int bRead; + byte [] b = new byte[4096]; + int rc = ERROR_NO_ERROR; + + try + { + // Create the input stream + fis = new FileInputStream(sFilename); + + // Set up the output stream + je = new ZipEntry(sName); + josJarNew.putNextEntry(je); + + // Tansfer the contents of the file + while (-1 != (bRead = fis.read(b))) + { + josJarNew.write(b, 0, bRead); + } + + // All done + fis.close(); + josJarNew.closeEntry(); + } + catch (Exception e) + { + log(e.toString()); + rc = ERROR_ADD_FILE_TO_JAR_FAILED; + } + return rc; + } + + void log(int err) + { + log(err, null); + } + + void log(int err, String s) + { + String sMessage = ""; + + switch (err) + { + case ERROR_NO_ERROR: + sMessage = "No error"; + break; + case ERROR_INVALID_NUMBER_OF_PARAMS: + sMessage = "Invalid number of parameters: 4 expected"; + break; + default: + sMessage = "Unknown error: " + err; + break; + } + + if (null != s) + { + sMessage = sMessage + s; + } + log(sMessage); + } + + void log(String s) + { + try + { + fw.write(this.getClass().getName() + ": " + s + "\r\n"); + } + catch (IOException ioe) + { + } + } +} diff --git a/CASA-auth-token/server-java/package/windows/server-java_msi/Makefile.am b/CASA-auth-token/server-java/package/windows/server-java_msi/Makefile.am index b2f1fd57..4ae142a4 100644 --- a/CASA-auth-token/server-java/package/windows/server-java_msi/Makefile.am +++ b/CASA-auth-token/server-java/package/windows/server-java_msi/Makefile.am @@ -1,69 +1,69 @@ -####################################################################### -# -# Copyright (C) 2004 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. -# -# Author: Greg Richardson -# -####################################################################### - -SUBDIRS = - -DIST_SUBDIRS = - -EXTRA_DIST = server-java_msi.vdproj - -if DEBUG -TARGET_CFG = Debug -else -TARGET_CFG = Release -endif - -PACKAGE = server-java_msi -TARGET_FILE = $(PACKAGE).msi -LOG_FILE = $(PACKAGE).log - -.PHONY: package package-clean package-install package-uninstall devenv - -package: $(TARGET_FILE) - -devenv: - @if ! test -x "$(VSINSTALLDIR)/Common7/IDE/devenv.exe"; then echo "Error: Microsoft Visual Studio .NET is currently required to build MSI and MSM packages"; exit 1; fi - -$(TARGET_FILE): devenv - @rm -f $(LOG_FILE) $@ - @CMD='"$(VSINSTALLDIR)/Common7/IDE/devenv.exe" server-java_msi.sln /build $(TARGET_CFG) /project $(PACKAGE) /out $(LOG_FILE)'; \ - echo $$CMD; \ - if eval $$CMD; then \ - ls -l $(TARGET_CFG)/$(TARGET_FILE); \ - else \ - grep -a "ERROR:" $(LOG_FILE); \ - fi - -package-clean clean-local: - rm -rf Release/* Release Debug/* Debug*/Release */Debug *.log *.suo - -clean: - rm -rf Release/* Release Debug/* Debug */Release */Debug *.log *.suo - -distclean-local: package-clean - rm -f Makefile - -maintainer-clean-local: - rm -f Makefile.in - - - +####################################################################### +# +# Copyright (C) 2004 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. +# +# Author: Greg Richardson +# +####################################################################### + +SUBDIRS = + +DIST_SUBDIRS = + +EXTRA_DIST = server-java_msi.vdproj + +if DEBUG +TARGET_CFG = Debug +else +TARGET_CFG = Release +endif + +PACKAGE = server-java_msi +TARGET_FILE = $(PACKAGE).msi +LOG_FILE = $(PACKAGE).log + +.PHONY: package package-clean package-install package-uninstall devenv + +package: $(TARGET_FILE) + +devenv: + @if ! test -x "$(VSINSTALLDIR)/Common7/IDE/devenv.exe"; then echo "Error: Microsoft Visual Studio .NET is currently required to build MSI and MSM packages"; exit 1; fi + +$(TARGET_FILE): devenv + @rm -f $(LOG_FILE) $@ + @CMD='"$(VSINSTALLDIR)/Common7/IDE/devenv.exe" server-java_msi.sln /build $(TARGET_CFG) /project $(PACKAGE) /out $(LOG_FILE)'; \ + echo $$CMD; \ + if eval $$CMD; then \ + ls -l $(TARGET_CFG)/$(TARGET_FILE); \ + else \ + grep -a "ERROR:" $(LOG_FILE); \ + fi + +package-clean clean-local: + rm -rf Release/* Release Debug/* Debug*/Release */Debug *.log *.suo + +clean: + rm -rf Release/* Release Debug/* Debug */Release */Debug *.log *.suo + +distclean-local: package-clean + rm -f Makefile + +maintainer-clean-local: + rm -f Makefile.in + + +