First release of msi to consumer

CASA-auth-token/server-java/configure.in

@@ -270,6 +270,7 @@ package/windows/ClientKeystoreSetup/Makefile
 package/windows/InitConfigFile/Makefile
 package/windows/MungeCryptoPropertiesFilePath/Makefile
 package/windows/ServerKeystoreSetup/Makefile
+package/windows/SetupAsWindowsService/Makefile
 package/windows/UpdateWarFile/Makefile
 package/windows/server-java_msi/Makefile
 Svc/Makefile

CASA-auth-token/server-java/package/windows/Makefile.am

@@ -20,9 +20,9 @@
 #
 #######################################################################
 
-SUBDIRS = ClientKeystoreSetup InitConfigFile MungeCryptoPropertiesFilePath ServerKeystoreSetup UpdateWarFile server-java_msi
+SUBDIRS = ClientKeystoreSetup InitConfigFile MungeCryptoPropertiesFilePath ServerKeystoreSetup SetupAsWindowsService UpdateWarFile server-java_msi
 
-DIST_SUBDIRS = ClientKeystoreSetup InitConfigFile MungeCryptoPropertiesFilePath ServerKeystoreSetup UpdateWarFile server-java_msi
+DIST_SUBDIRS = ClientKeystoreSetup InitConfigFile MungeCryptoPropertiesFilePath ServerKeystoreSetup SetupAsWindowsService UpdateWarFile server-java_msi
 
 EXTRA_DIST =
 
@@ -32,6 +32,7 @@ package package-clean package-install package-uninstall:
 	$(MAKE) -C InitConfigFile  $@
 	$(MAKE) -C MungeCryptoPropertiesFilePath $@
 	$(MAKE) -C ServerKeystoreSetup $@
+	$(MAKE) -C SetupAsWindowsService $@
 	$(MAKE) -C UpdateWarFile $@
 	$(MAKE) -C server-java_msi $@
 

CASA-auth-token/server-java/package/windows/SetupAsWindowsService/Makefile.am

@@ -0,0 +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 <grichardson@novell.com>
+#
+#######################################################################
+
+SUBDIRS =
+
+DIST_SUBDIRS =
+
+EXTRA_DIST = SetupAsWindowsService.vjsproj Program.jsl
+
+if DEBUG
+TARGET_CFG = Debug
+else
+TARGET_CFG = Release
+endif
+
+PACKAGE = SetupAsWindowsService
+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
+
+
+

CASA-auth-token/server-java/package/windows/SetupAsWindowsService/Program.jsl

@@ -0,0 +1,524 @@
+/***********************************************************************
+ * 
+ *  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 <jluciani@novell.com>
+ *  
+ ***********************************************************************/
+
+package SetupAsWindowsService;
+
+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_EXEC_FAILED					= -2;
+	final static int ERROR_EXEC_INTERRUPTED				= -3;
+
+	//	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_PROPERTY	= "ATS_INSTALL_DIR";
+	final static String PROPERTY_FILE_PARAM		= "propertyfile=";
+	final static String INSTALL_DIR = "installdir=";
+	final static String PROPERTY_FILE = "propertyfile=";
+
+	Properties		properties;
+	File			fileProperties;
+	FileInputStream	fisProperties;
+	File			fileOutput;
+	File			file;
+	FileWriter		fw;
+	String			sInstallDir;
+	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;
+		fileOutput = null;
+
+		try
+		{
+			file = new File("c:\\test6.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 = setupService();
+				}
+			}
+
+		}
+		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 != 2)
+		{
+			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))
+			{
+				// Make sure it is more the the param tag
+				if (args[i].length() <= INSTALL_DIR.length())
+				{
+					return ERROR_BAD_INSTALL_DIR_PARAM;
+				}
+
+				sInstallDir = args[i].substring(INSTALL_DIR.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;
+				}
+			}
+
+			// 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;
+		}
+
+		// Note: the properties file parameter is optional
+
+		return ERROR_NO_ERROR;
+	}
+
+	int processProperties()
+	{
+		try
+		{
+			Enumeration e;
+			String sKey;
+			String sValue;
+
+			e = properties.propertyNames();
+
+			while (e.hasMoreElements())
+			{
+				sKey = (String)e.nextElement();
+				sValue = (String)properties.get(sKey);
+
+				log("Property key = " + sKey + "  Value = " + sValue);
+			}
+		}
+		catch (Exception ex1)
+		{
+			return -111;
+		}
+
+		return ERROR_NO_ERROR;
+	}
+
+	int setupService()
+	{
+		String sDirInstall = (String)properties.get(INSTALL_DIR_PROPERTY);
+		String sDirCatalinaBase = sInstallDir + "ats/catalinabase";
+		String sDirCatalinaHome = (String)properties.get("TOMCAT_HOME");
+		String sExe = sDirCatalinaHome + "/bin/tomcat5.exe";
+		String sFileJaasConf = (String)properties.get("JAAS_CONF");
+		String sDirConfig  = sDirInstall + "ats/etc/svc";
+		String sDirJavaHome = (String)properties.get("ATS_JAVA_HOME");
+		String sLogPrefix = "casa-auth-token-svc";
+		String sDirLogs = sDirCatalinaBase + "/logs";
+		String sCommand = "";
+		int iReturn = ERROR_NO_ERROR;
+
+		sCommand = sExe + " //IS//CasaAuthTokenService --StartClass org.apache.catalina.startup.Bootstrap --StopClass org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop";
+		if (ERROR_NO_ERROR != (iReturn = invokeCommand(sCommand)))
+		{
+			return iReturn;
+		}
+
+		sCommand = sExe + " //US//CasaAuthTokenService --Startup auto";
+		if (ERROR_NO_ERROR != (iReturn = invokeCommand(sCommand)))
+		{
+			return iReturn;
+		}
+
+		sCommand = sExe + " //US//CasaAuthTokenService --JvmOptions \"-Dcatalina.base=" + sDirCatalinaBase + "\"";
+		if (ERROR_NO_ERROR != (iReturn = invokeCommand(sCommand)))
+		{
+			return iReturn;
+		}
+
+		sCommand = sExe + " //US//CasaAuthTokenService ++JvmOptions \"-Dcatalina.home=" + sDirCatalinaHome + "\"";
+		if (ERROR_NO_ERROR != (iReturn = invokeCommand(sCommand)))
+		{
+			return iReturn;
+		}
+
+		sCommand = sExe + " //US//CasaAuthTokenService ++JvmOptions \"-Djava.endorsed.dirs=" + sDirCatalinaHome + "/common/endorsed\"";
+		if (ERROR_NO_ERROR != (iReturn = invokeCommand(sCommand)))
+		{
+			return iReturn;
+		}
+
+		sCommand = sExe + " //US//CasaAuthTokenService ++JvmOptions \"-Djava.security.auth.login.config=" + sFileJaasConf + "\"";
+		if (ERROR_NO_ERROR != (iReturn = invokeCommand(sCommand)))
+		{
+			return iReturn;
+		}
+
+		sCommand = sExe + " //US//CasaAuthTokenService ++JvmOptions \"-Dcom.novell.casa.authtoksvc.config=" + sDirConfig + "\"";
+		if (ERROR_NO_ERROR != (iReturn = invokeCommand(sCommand)))
+		{
+			return iReturn;
+		}
+
+		sCommand = sExe + " //US//CasaAuthTokenService ++JvmOptions \"-Djava.io.tmpdir=" + sDirCatalinaBase+ "/temp\"";
+		if (ERROR_NO_ERROR != (iReturn = invokeCommand(sCommand)))
+		{
+			return iReturn;
+		}
+
+		sCommand = sExe + " //US//CasaAuthTokenService --StartMode jvm --StopMode jvm";
+		if (ERROR_NO_ERROR != (iReturn = invokeCommand(sCommand)))
+		{
+			return iReturn;
+		}
+
+		sCommand = sExe + " //US//CasaAuthTokenService --JvmMs 128 --JvmMx 512";
+		if (ERROR_NO_ERROR != (iReturn = invokeCommand(sCommand)))
+		{
+			return iReturn;
+		}
+
+		sCommand = sExe + " //US//CasaAuthTokenService --Classpath \"" + sDirCatalinaHome + "/bin/bootstrap.jar\"";
+		if (ERROR_NO_ERROR != (iReturn = invokeCommand(sCommand)))
+		{
+			return iReturn;
+		}
+
+		sCommand = sExe + " //US//CasaAuthTokenService --Jvm \"" + sDirJavaHome + "/jre/bin/server/jvm.dll\"";
+		if (ERROR_NO_ERROR != (iReturn = invokeCommand(sCommand)))
+		{
+			return iReturn;
+		}
+
+		sCommand = sExe + " //US//CasaAuthTokenService --LogPath \"" + sDirLogs + "\"";
+		if (ERROR_NO_ERROR != (iReturn = invokeCommand(sCommand)))
+		{
+			return iReturn;
+		}
+
+		sCommand = sExe + " //US//CasaAuthTokenService --LogPrefix \"" + sLogPrefix + "_service.log\"";
+		if (ERROR_NO_ERROR != (iReturn = invokeCommand(sCommand)))
+		{
+			return iReturn;
+		}
+
+		sCommand = sExe + " //US//CasaAuthTokenService --StdOutput \"" + sDirLogs +
+			File.separator + sLogPrefix + "_stdout.log\"";
+		if (ERROR_NO_ERROR != (iReturn = invokeCommand(sCommand)))
+		{
+			return iReturn;
+		}
+
+		sCommand = sExe + " //US//CasaAuthTokenService --StdError \"" + sDirLogs +
+			File.separator + sLogPrefix + "_stderr.log\"";
+		if (ERROR_NO_ERROR != (iReturn = invokeCommand(sCommand)))
+		{
+			return iReturn;
+		}
+
+		sCommand = sExe + " //US//CasaAuthTokenService --DisplayName " + "CasaAuthTokenSvc";
+		if (ERROR_NO_ERROR != (iReturn = invokeCommand(sCommand)))
+		{
+			return iReturn;
+		}
+
+		sCommand = sExe + " //US//CasaAuthTokenService --Description " + "\"Casa Authentication Token Service\"";
+		if (ERROR_NO_ERROR != (iReturn = invokeCommand(sCommand)))
+		{
+			return iReturn;
+		}
+/*
+		sCommand += sTomcatDir;
+
+		String casaConfDir = new File(SystemConfig.getConfDir(), "casa").getAbsolutePath();
+		String libDir = SystemConfig.getLibDir().getAbsolutePath();
+		String tomcatDir = new File(SystemConfig.getShareDir(), "tomcat").getAbsolutePath();
+		String binDir = SystemConfig.getBinDir().getAbsolutePath() + File.separator;
+		String tomcatBinDir = tomcatDir + File.separator + "bin" + File.separator;
+		String tomcatLogDir = SystemConfig.getLogDir().getAbsolutePath();
+		String jvmOptions = "\"-Dcatalina.base=" + tomcatDir + ";" +
+			"-Dcom.novell.casa.authtoksvc.config=" + casaConfDir + ";" +
+			"-Djava.security.auth.login.config=" + casaConfDir + "\\casa-jaas.conf;" +
+			"-Dcatalina.home=" + tomcatDir + ";" +
+			"-Djava.endorsed.dirs=" + tomcatDir + ";" +
+			"-Djava.io.tmpdir=" + tomcatDir + "\\temp;" +
+			"-Djava.library.path=" + libDir + "\"";
+		String jvmDll = new File(SystemConfig.getJavaDir(), "jre/bin/server/jvm.dll").getAbsolutePath();
+		String serviceName = serviceAddress.get(services.ZEN_SERVER);
+		String displayName = Res.getString(Res.ZENWORKS_SERVER_NAME);
+		String description = Res.getString(Res.ZENWORKS_SERVER_DESCRIPTION);
+		String exe = binDir + "zenserver";
+		String logPrefix = "novell-zenworks-server";
+
+		String dependsOn = "";
+		if (FirstServerConfigureAction.isFirstServer() &&
+		   IsEmbeddedDBConfigureAction.isEmbedded())
+		{
+			dependsOn = serviceAddress.get(services.ZEN_DATABASE);
+		}
+
+		String commandType = getCommandType(serviceName, exe);
+
+
+		String[] args = new String[]{
+            String sCommand = "";
+			
+		sCommand = 
+			sDirTomcat + 
+			"//" + "IS" + "//" + "AuthTokenService" +
+            " --Startup" + "auto",
+            "--StartClass", "org.apache.catalina.startup.Bootstrap",
+            "--StopClass", "org.apache.catalina.startup.Bootstrap",
+            "--StartParams", "start",
+            "--StopParams", "stop",
+            "--Classpath", tomcatBinDir + "bootstrap.jar",
+            "--Jvm", jvmDll,
+            "--JvmOptions", jvmOptions,
+            "--StartMode", "jvm",
+            "--StopMode", "jvm",
+            "--JvmMx", "512",
+            "--LogPath", tomcatLogDir,
+            "--LogPrefix", logPrefix + "_service.log",
+            "--StdOutput", tomcatLogDir + File.separator + logPrefix + "_stdout.log",
+            "--StdError", tomcatLogDir + File.separator + logPrefix + "_stderr.log",
+            "--DisplayName", displayName,
+            "--Description", description,
+            "--DependsOn", dependsOn,
+            
+            //don't put anything after the dependsOn param because the dependsOn string may be empty
+            //resulting in an invalid dependency being created.
+ * 
+        };
+ */
+		return ERROR_NO_ERROR;
+	}
+
+	int invokeCommand(String sCommand)
+	{
+		Process p;
+		int rc;
+
+		log("invoke command: " + sCommand);
+		Runtime runtime = Runtime.getRuntime();
+		try
+		{
+			p = runtime.exec(sCommand);
+			try
+			{
+				rc = p.waitFor();
+				log("invoke command return code: " + rc);
+			}
+			catch (InterruptedException ie)
+			{
+				log(ERROR_EXEC_INTERRUPTED, sCommand);
+				return ERROR_EXEC_INTERRUPTED;
+			}
+		}
+		catch (IOException e)
+		{
+			log("IOException");
+			log(e.get_StackTrace());
+			return ERROR_EXEC_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_IO_EXCEPTION:
+				sMessage = "IOException";
+				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)
+		{
+		}
+	}
+}

CASA-auth-token/server-java/package/windows/SetupAsWindowsService/Properties/AssemblyInfo.jsl

@@ -0,0 +1,36 @@
+import System.Reflection.*;
+import System.Runtime.CompilerServices.*;
+import System.Runtime.InteropServices.*;
+
+//
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+
+/** @assembly AssemblyTitle("SetupAsWindowsService") */
+/** @assembly AssemblyDescription("") */
+/** @assembly AssemblyCompany("Novell") */
+/** @assembly AssemblyProduct("SetupAsWindowsService") */
+/** @assembly AssemblyCopyright("Copyright © Novell 2007") */
+/** @assembly AssemblyTrademark("") */
+/** @assembly AssemblyCulture("") */
+
+
+// The ComVisible attribute controls accessibility of an individual type
+// or member, or of all types within this assembly, from COM.  To access
+// a type or member in this assembly from COM, set the ComVisible attribute
+// on that type or member to true.
+/** @assembly ComVisible(false) */
+
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+
+/** @assembly AssemblyVersion("1.0.0.0") */

CASA-auth-token/server-java/package/windows/SetupAsWindowsService/SetupAsWindowsService.vjsproj

@@ -0,0 +1,43 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{BED4F512-4A94-4EC2-9479-43AFA8E4EAE1}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>SetupAsWindowsService</RootNamespace>
+    <AssemblyName>SetupAsWindowsService</AssemblyName>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.jsl" />
+    <Compile Include="Properties\AssemblyInfo.jsl" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.VisualJSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

CASA-auth-token/server-java/package/windows/server-java_msi/Makefile.am

@@ -33,7 +33,7 @@ TARGET_CFG = Release
 endif
 
 PACKAGE = server-java_msi
-TARGET_FILE = $(PACKAGE).msi
+TARGET_FILE = CasaAuthTokenServer.msi
 LOG_FILE = $(PACKAGE).log
 
 .PHONY: package package-clean package-install package-uninstall devenv

CASA-auth-token/server-java/package/windows/server-java_msi/server-java.sln

@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "server-java_msi", "package\windows\server-java_msi\server-java_msi.vdproj", "{90300F7B-A68F-403B-A5A5-E36580054EFF}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x86 = Debug|x86
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{90300F7B-A68F-403B-A5A5-E36580054EFF}.Debug|x86.ActiveCfg = Debug
-		{90300F7B-A68F-403B-A5A5-E36580054EFF}.Debug|x86.Build.0 = Debug
-		{90300F7B-A68F-403B-A5A5-E36580054EFF}.Release|x86.ActiveCfg = Release
-		{90300F7B-A68F-403B-A5A5-E36580054EFF}.Release|x86.Build.0 = Release
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

CASA-auth-token/server-java/package/windows/server-java_msi/server-java_msi.sln

@@ -6,6 +6,9 @@ EndProject
 Project("{E6FDF86B-F3D1-11D4-8576-0002A516ECE8}") = "ClientKeystoreSetup", "..\ClientKeystoreSetup\ClientKeystoreSetup.vjsproj", "{89D5D921-A2E6-4ED9-A724-8C7DAAC09AC5}"
 EndProject
 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "server-java_msi", "server-java_msi.vdproj", "{124289E1-BD76-485B-A779-C2372332D538}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BED4F512-4A94-4EC2-9479-43AFA8E4EAE1} = {BED4F512-4A94-4EC2-9479-43AFA8E4EAE1}
+	EndProjectSection
 EndProject
 Project("{E6FDF86B-F3D1-11D4-8576-0002A516ECE8}") = "InitConfigFile", "..\InitConfigFile\InitConfigFile.vjsproj", "{E3528B18-D4A0-4604-B2C5-8EE36E094A40}"
 EndProject
@@ -13,6 +16,8 @@ Project("{E6FDF86B-F3D1-11D4-8576-0002A516ECE8}") = "ServerKeystoreSetup", "..\S
 EndProject
 Project("{E6FDF86B-F3D1-11D4-8576-0002A516ECE8}") = "MungeCryptoPropertiesFilePath", "..\MungeCryptoPropertiesFilePath\MungeCryptoPropertiesFilePath.vjsproj", "{75D8742F-4778-4978-9032-ED9649BA402D}"
 EndProject
+Project("{E6FDF86B-F3D1-11D4-8576-0002A516ECE8}") = "SetupAsWindowsService", "..\SetupAsWindowsService\SetupAsWindowsService.vjsproj", "{BED4F512-4A94-4EC2-9479-43AFA8E4EAE1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
@@ -43,6 +48,10 @@ Global
 		{75D8742F-4778-4978-9032-ED9649BA402D}.Debug|x86.Build.0 = Debug|x86
 		{75D8742F-4778-4978-9032-ED9649BA402D}.Release|x86.ActiveCfg = Release|x86
 		{75D8742F-4778-4978-9032-ED9649BA402D}.Release|x86.Build.0 = Release|x86
+		{BED4F512-4A94-4EC2-9479-43AFA8E4EAE1}.Debug|x86.ActiveCfg = Debug|x86
+		{BED4F512-4A94-4EC2-9479-43AFA8E4EAE1}.Debug|x86.Build.0 = Debug|x86
+		{BED4F512-4A94-4EC2-9479-43AFA8E4EAE1}.Release|x86.ActiveCfg = Release|x86
+		{BED4F512-4A94-4EC2-9479-43AFA8E4EAE1}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

CASA-auth-token/server-java/package/windows/server-java_msi/server-java_msi.vdproj

@@ -63,6 +63,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_33BD777FB0CA488F96B43C8A9D0D1638"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_4023D519AC024666B875F39FEE70302D"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -87,12 +93,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_49BCEB6FBEFC42F09F5A5C1EBCD8C3B0"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_4BC8F27506B949C887592E0802F41093"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -105,36 +105,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_550207C2304641D5BE96CBBC4E6F79A6"
-        "OwnerKey" = "8:_24EE971158ED49B38B0773EA58C33E6F"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_550207C2304641D5BE96CBBC4E6F79A6"
-        "OwnerKey" = "8:_A76F97BE8A8049FEB37D29E540FBE2F9"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_550207C2304641D5BE96CBBC4E6F79A6"
-        "OwnerKey" = "8:_F483B367258C4C0196BA64210B2F9050"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_550207C2304641D5BE96CBBC4E6F79A6"
-        "OwnerKey" = "8:_E9000CEAF5CD467E91E857EE453F7775"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_550207C2304641D5BE96CBBC4E6F79A6"
-        "OwnerKey" = "8:_9BFD505E12784C9A97B3D567C0BEB8C1"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_584C024AC27449499E146D5216888C07"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -237,8 +207,38 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_AF7F81C3E40940B6897005FE1851CFC9"
+        "MsmKey" = "8:_AF6A9BB074714DE9926EE019616BE3D0"
-        "OwnerKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_24EE971158ED49B38B0773EA58C33E6F"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_AF6A9BB074714DE9926EE019616BE3D0"
+        "OwnerKey" = "8:_33BD777FB0CA488F96B43C8A9D0D1638"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_AF6A9BB074714DE9926EE019616BE3D0"
+        "OwnerKey" = "8:_F483B367258C4C0196BA64210B2F9050"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_AF6A9BB074714DE9926EE019616BE3D0"
+        "OwnerKey" = "8:_E9000CEAF5CD467E91E857EE453F7775"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_AF6A9BB074714DE9926EE019616BE3D0"
+        "OwnerKey" = "8:_A76F97BE8A8049FEB37D29E540FBE2F9"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_AF6A9BB074714DE9926EE019616BE3D0"
+        "OwnerKey" = "8:_9BFD505E12784C9A97B3D567C0BEB8C1"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -358,7 +358,7 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_A76F97BE8A8049FEB37D29E540FBE2F9"
+        "OwnerKey" = "8:_33BD777FB0CA488F96B43C8A9D0D1638"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -376,13 +376,19 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_A76F97BE8A8049FEB37D29E540FBE2F9"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
         "OwnerKey" = "8:_9BFD505E12784C9A97B3D567C0BEB8C1"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_550207C2304641D5BE96CBBC4E6F79A6"
+        "OwnerKey" = "8:_AF6A9BB074714DE9926EE019616BE3D0"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -393,7 +399,7 @@
         "DisplayName" = "8:Debug"
         "IsDebugOnly" = "11:TRUE"
         "IsReleaseOnly" = "11:FALSE"
-        "OutputFilename" = "8:Debug\\server-java_msi.msi"
+        "OutputFilename" = "8:Debug\\CasaAuthTokenServer.msi"
         "PackageFilesAs" = "3:2"
         "PackageFileSize" = "3:-2147483648"
         "CabType" = "3:1"
@@ -425,7 +431,7 @@
         "DisplayName" = "8:Release"
         "IsDebugOnly" = "11:FALSE"
         "IsReleaseOnly" = "11:TRUE"
-        "OutputFilename" = "8:Release\\server-java_msi.msi"
+        "OutputFilename" = "8:Release\\CasaAuthTokenServer.msi"
         "PackageFilesAs" = "3:2"
         "PackageFileSize" = "3:-2147483648"
         "CabType" = "3:1"
@@ -461,7 +467,7 @@
             "InstallAction" = "3:1"
             "Arguments" = "8:ATS_INSTALL_DIR=[TARGETDIR] propertyfile=[TARGETDIR]install.properties  template=[TARGETDIR]ats\\etc\\svc\\templates\\jaas.conf output=[TARGETDIR]ats\\etc\\svc\\jaas.conf"
             "EntryPoint" = "8:"
-            "Sequence" = "3:9"
+            "Sequence" = "3:7"
             "Identifier" = "8:_D5524CA6_C0E8_4F38_AD79_08EF4DC7C653"
             "InstallerClass" = "11:FALSE"
             "CustomActionData" = "8:"
@@ -489,36 +495,22 @@
             "InstallAction" = "3:1"
             "Arguments" = "8:ATS_INSTALL_DIR=[TARGETDIR] propertyfile=[TARGETDIR]install.properties  template=[TARGETDIR]ats\\etc\\svc\\templates\\CasaAuthPolicyEditor.bat output=[TARGETDIR]ats\\bin\\CasaAuthPolicyEditor.bat"
             "EntryPoint" = "8:"
-            "Sequence" = "3:12"
+            "Sequence" = "3:10"
             "Identifier" = "8:_5BF5119E_CA43_4187_8AE0_4B8D98A2C3AF"
             "InstallerClass" = "11:FALSE"
             "CustomActionData" = "8:"
             }
-            "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_6BE9D82D9532484FBB618382ABFCEC0B"
+            "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_641A2854068F40CA97BB2570FCBD8646"
             {
-            "Name" = "8:Primary output from InitConfigFile (Active) (auth.policy)"
+            "Name" = "8:Primary output from SetupAsWindowsService (Active)"
             "Condition" = "8:"
-            "Object" = "8:_9BFD505E12784C9A97B3D567C0BEB8C1"
+            "Object" = "8:_33BD777FB0CA488F96B43C8A9D0D1638"
             "FileType" = "3:2"
             "InstallAction" = "3:1"
-            "Arguments" = "8:ATS_INSTALL_DIR=[TARGETDIR] propertyfile=[TARGETDIR]install.properties template=[TARGETDIR]ats\\etc\\svc\\templates\\auth.policy output=[TARGETDIR]ats\\etc\\svc\\auth.policy"
+            "Arguments" = "8:installdir=[TARGETDIR] propertyfile=[PROPERTYFILE]"
             "EntryPoint" = "8:"
-            "Sequence" = "3:8"
+            "Sequence" = "3:15"
-            "Identifier" = "8:_5774F5EF_7A04_42F2_92BA_34697D177C7A"
+            "Identifier" = "8:_388E4C75_9DA9_47B5_9835_364652FF75A5"
-            "InstallerClass" = "11:FALSE"
-            "CustomActionData" = "8:"
-            }
-            "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_703047ED920041B78BFD3383382F10FE"
-            {
-            "Name" = "8:Primary output from InitConfigFile (Active) (iaRealms.xml)"
-            "Condition" = "8:"
-            "Object" = "8:_9BFD505E12784C9A97B3D567C0BEB8C1"
-            "FileType" = "3:2"
-            "InstallAction" = "3:1"
-            "Arguments" = "8:ATS_INSTALL_DIR=[TARGETDIR] propertyfile=[TARGETDIR]install.properties template=[TARGETDIR]ats\\etc\\svc\\templates\\iaRealms.xml output=[TARGETDIR]ats\\etc\\svc\\iaRealms.xml "
-            "EntryPoint" = "8:"
-            "Sequence" = "3:7"
-            "Identifier" = "8:_0C3360E9_5435_4D1F_8A7E_95BB23F0377B"
             "InstallerClass" = "11:FALSE"
             "CustomActionData" = "8:"
             }
@@ -531,7 +523,7 @@
             "InstallAction" = "3:1"
             "Arguments" = "8:ATS_INSTALL_DIR=[TARGETDIR] propertyfile=[TARGETDIR]install.properties  template=[TARGETDIR]ats\\etc\\svc\\templates\\CasaIdenTokenSettingsEditor.bat output=[TARGETDIR]ats\\bin\\CasaIdenTokenSettingsEditor.bat"
             "EntryPoint" = "8:"
-            "Sequence" = "3:14"
+            "Sequence" = "3:12"
             "Identifier" = "8:_CF4E38AE_8DA5_447D_9330_0DD26864178E"
             "InstallerClass" = "11:FALSE"
             "CustomActionData" = "8:"
@@ -559,7 +551,7 @@
             "InstallAction" = "3:1"
             "Arguments" = "8:ATS_INSTALL_DIR=[TARGETDIR] propertyfile=[TARGETDIR]install.properties  template=[TARGETDIR]ats\\etc\\svc\\templates\\svc.settings output=[TARGETDIR]ats\\etc\\svc\\svc.settings IAREALMS_FILE_PATH=[TARGETDIR]ats\\etc\\svc\\iaRealms.xml"
             "EntryPoint" = "8:"
-            "Sequence" = "3:16"
+            "Sequence" = "3:14"
             "Identifier" = "8:_DF0105D8_6D43_4643_9E4C_36F9131DCBBA"
             "InstallerClass" = "11:FALSE"
             "CustomActionData" = "8:"
@@ -573,7 +565,7 @@
             "InstallAction" = "3:1"
             "Arguments" = "8:ATS_INSTALL_DIR=[TARGETDIR] propertyfile=[TARGETDIR]install.properties  template=[TARGETDIR]ats\\etc\\svc\\templates\\shutdown.bat output=[TARGETDIR]ats\\bin\\shutdown.bat"
             "EntryPoint" = "8:"
-            "Sequence" = "3:11"
+            "Sequence" = "3:9"
             "Identifier" = "8:_783B8556_08E3_4304_A23D_BE54FBC69705"
             "InstallerClass" = "11:FALSE"
             "CustomActionData" = "8:"
@@ -587,7 +579,7 @@
             "InstallAction" = "3:1"
             "Arguments" = "8:ATS_INSTALL_DIR=[TARGETDIR] propertyfile=[TARGETDIR]install.properties  template=[TARGETDIR]ats\\etc\\svc\\templates\\startup.bat output=[TARGETDIR]ats\\bin\\startup.bat"
             "EntryPoint" = "8:"
-            "Sequence" = "3:10"
+            "Sequence" = "3:8"
             "Identifier" = "8:_A652A5B9_DE90_418E_9E3E_C803D9496C26"
             "InstallerClass" = "11:FALSE"
             "CustomActionData" = "8:"
@@ -629,7 +621,7 @@
             "InstallAction" = "3:1"
             "Arguments" = "8:ATS_INSTALL_DIR=[TARGETDIR] propertyfile=[TARGETDIR]install.properties  template=[TARGETDIR]ats\\etc\\svc\\templates\\CasaSvcSettingsEditor.bat output=[TARGETDIR]ats\\bin\\CasaSvcSettingsEditor.bat"
             "EntryPoint" = "8:"
-            "Sequence" = "3:15"
+            "Sequence" = "3:13"
             "Identifier" = "8:_B3396B9F_264C_447E_86E7_18E989866C40"
             "InstallerClass" = "11:FALSE"
             "CustomActionData" = "8:"
@@ -671,7 +663,7 @@
             "InstallAction" = "3:1"
             "Arguments" = "8:ATS_INSTALL_DIR=[TARGETDIR] propertyfile=[TARGETDIR]install.properties  template=[TARGETDIR]ats\\etc\\svc\\templates\\CasaAuthTokenSettingsEditor.bat output=[TARGETDIR]ats\\bin\\CasaAuthTokenSettingsEditor.bat"
             "EntryPoint" = "8:"
-            "Sequence" = "3:13"
+            "Sequence" = "3:11"
             "Identifier" = "8:_18FC0D9A_DD2F_4D55_BED7_6D85A053D2E1"
             "InstallerClass" = "11:FALSE"
             "CustomActionData" = "8:"
@@ -919,26 +911,6 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_49BCEB6FBEFC42F09F5A5C1EBCD8C3B0"
-            {
-            "SourcePath" = "8:..\\..\\..\\Svc\\templates\\auth.policy"
-            "TargetName" = "8:auth.policy"
-            "Tag" = "8:"
-            "Folder" = "8:_DB2EB303AA7A4FA0874CCF7DE23125AB"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4BC8F27506B949C887592E0802F41093"
             {
             "SourcePath" = "8:..\\..\\..\\Svc\\templates\\startup.bat"
@@ -1279,26 +1251,6 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_AF7F81C3E40940B6897005FE1851CFC9"
-            {
-            "SourcePath" = "8:..\\..\\..\\Svc\\templates\\iaRealms.xml"
-            "TargetName" = "8:iaRealms.xml"
-            "Tag" = "8:"
-            "Folder" = "8:_DB2EB303AA7A4FA0874CCF7DE23125AB"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
-            "IsolateTo" = "8:"
-            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B29E25690B014C0B846CFC4698D08846"
             {
             "SourcePath" = "8:..\\..\\..\\Svc\\tomcat5\\conf\\catalina.properties"
@@ -2483,7 +2435,7 @@
         }
         "MergeModule"
         {
-            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_550207C2304641D5BE96CBBC4E6F79A6"
+            "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_AF6A9BB074714DE9926EE019616BE3D0"
             {
             "UseDynamicProperties" = "11:TRUE"
             "IsDependency" = "11:TRUE"
@@ -2528,6 +2480,34 @@
                 {
                 }
             }
+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_33BD777FB0CA488F96B43C8A9D0D1638"
+            {
+            "SourcePath" = "8:..\\SetupAsWindowsService\\obj\\x86\\Debug\\SetupAsWindowsService.exe"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_62B357DC6D484761A18291FA3525320C"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            "ProjectOutputGroupRegister" = "3:1"
+            "OutputConfiguration" = "8:"
+            "OutputGroupCanonicalName" = "8:Built"
+            "OutputProjectGuid" = "8:{BED4F512-4A94-4EC2-9479-43AFA8E4EAE1}"
+            "ShowKeyOutput" = "11:TRUE"
+                "ExcludeFilters"
+                {
+                }
+            }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_9BFD505E12784C9A97B3D567C0BEB8C1"
             {
             "SourcePath" = "8:..\\InitConfigFile\\obj\\x86\\Debug\\InitConfigFile.exe"