[Glassbox-commits] glassbox/webClient/src/glassbox/installer/web/controller InstallerController.java, 1.14.2.2, 1.14.2.3

[John D. H. <jh...@us...>]

Update of /cvsroot/glassbox/glassbox/webClient/src/glassbox/installer/web/controller
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12659/src/glassbox/installer/web/controller

Modified Files:
      Tag: Installer_Rework
	InstallerController.java 
Log Message:
fixes for handling the bin directory and getGlassboxLaunchCommand() when a custom script has been set.

See GLASSBOX-174

Index: InstallerController.java
===================================================================
RCS file: /cvsroot/glassbox/glassbox/webClient/src/glassbox/installer/web/controller/InstallerController.java,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -C2 -d -r1.14.2.2 -r1.14.2.3
*** InstallerController.java	19 Apr 2007 22:00:50 -0000	1.14.2.2
--- InstallerController.java	21 Apr 2007 03:51:37 -0000	1.14.2.3
***************
*** 60,64 ****
          
      	GlassboxInstaller installer = factory.getInstaller();
!     	
  		String customScript = request.getParameter("customScript");
  		if (customScript == null) 
--- 60,68 ----
          
      	GlassboxInstaller installer = factory.getInstaller();
! 		
! 		// reset installer
! 		installer.setCustomScriptToWrap(null);
! 		installer.setCustomLibDirectory(null);
! 
  		String customScript = request.getParameter("customScript");
  		if (customScript == null) 
***************
*** 83,90 ****
      		log.info("Launcher Glassbox Installer("+installer+")...");
      		installer.install();
-     		
-     		// reset installer
-     		installer.setCustomScriptToWrap(null);
-     		installer.setCustomLibDirectory(null);
  
  //    		return new ModelAndView("configureInstaller"); // return the read-view
--- 87,90 ----