You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ap...@apache.org on 2014/03/26 06:05:58 UTC
git commit: updated refs/heads/master to b6fe4e2
Repository: cloudstack
Updated Branches:
refs/heads/master 4ebb92c49 -> b6fe4e216
CLOUDSTACK-6105: Fixed the issue where Logs were not getting generated properly
Signed-off-by: Abhinandan Prateek <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b6fe4e21
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b6fe4e21
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b6fe4e21
Branch: refs/heads/master
Commit: b6fe4e21680ed308ede0cb527b6b5a37c35f547a
Parents: 4ebb92c
Author: Damodar Reddy <da...@citrix.com>
Authored: Tue Mar 25 16:38:06 2014 +0530
Committer: Abhinandan Prateek <ap...@apache.org>
Committed: Wed Mar 26 10:35:26 2014 +0530
----------------------------------------------------------------------
scripts/installer/windows/acs.wxs | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b6fe4e21/scripts/installer/windows/acs.wxs
----------------------------------------------------------------------
diff --git a/scripts/installer/windows/acs.wxs b/scripts/installer/windows/acs.wxs
index 7967478..adb2b6c 100644
--- a/scripts/installer/windows/acs.wxs
+++ b/scripts/installer/windows/acs.wxs
@@ -80,10 +80,6 @@
</Component>
</Directory>
</DirectoryRef>
- <!-- DirectoryRef Id="WEBAPPS"> <Directory Id="clientId" FileSource="client\WEB-INF\classes">
- <Component Id="copyAllToConf" Guid="0e081e69-5c30-426e-b711-b7750115f62b"
- KeyPath="yes"> <CopyFile Id="AllFiles" DestinationDirectory="CONF" SourceName="*"
- /> </Component> </Directory> </DirectoryRef -->
<DirectoryRef Id="WEBAPPS">
<Component Id="copyToConf" Guid="99da8926-1eec-4a7f-ac7f-1326d8e73ea0"
KeyPath="yes">
@@ -185,8 +181,6 @@
</Component>
<!-- Updating Tomcat's catalina base -->
- <!-- Property Id='TomcatDirectory' Value="$(env.CATALINA_HOME)\bin\Tomcat6.exe"
- / -->
<Property Id='TOMCATDIRECTORY'>
<RegistrySearch Id="TomcatSearch" Name="InstallPath"
Root="HKLM" Key="SOFTWARE\Apache Software Foundation\Tomcat\6.0\Tomcat6"
@@ -195,16 +189,24 @@
<CustomAction Id="TomcatPath" Property="TOMCATDIRECTORY1"
Value="[TOMCATDIRECTORY]\bin\Tomcat6.exe">
</CustomAction>
-
+
<Condition
Message="Apache tomcat6 is not installed please do install tomcat6 first"><![CDATA[(Installed OR TOMCATDIRECTORY)]]></Condition>
<CustomAction Id="UpdateTomcatCatalinaBase"
- ExeCommand="//US//Tomcat6 --JvmOptions=-Dcatalina.base=[INSTALLDIR];-Xms512m;-Xmx1024m;-XX:MaxPermSize=512m"
+ ExeCommand='//US//Tomcat6 --JvmOptions=-Dcatalina.base=[INSTALLDIR];-Djava.io.tmpdir=[INSTALLDIR]\temp;-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager;-Dcatalina.home="[TOMCATDIRECTORY]";-Xms512m;-Xmx1024m;-XX:MaxPermSize=512m'
Property="TOMCATDIRECTORY1" Execute="commit" Return="check" />
+ <CustomAction Id="UpdateTomcatClassPath"
+ ExeCommand='//US//Tomcat6 --Classpath="[TOMCATDIRECTORY]\bin\bootstrap.jar";"[TOMCATDIRECTORY]\bin\tomcat-juli.jar";[INSTALLDIR]\conf'
+ Property="TOMCATDIRECTORY1" Execute="commit" Return="check" />
+ <CustomAction Id="DeleteFiles" Directory='INSTALLDIR'
+ ExeCommand="[SystemFolder]cmd.exe /c del [INSTALLDIR]\webapps\client\WEB-INF\classes\db.properties [INSTALLDIR]\webapps\client\WEB-INF\classes\log4j*.xml"
+ Execute="commit" Return="check" />
<InstallExecuteSequence>
<InstallServices Sequence="4999"></InstallServices>
- <Custom Action="TomcatPath" Before="UpdateTomcatCatalinaBase">NOT Installed</Custom>
+ <Custom Action="TomcatPath" Before="UpdateTomcatClassPath">NOT Installed</Custom>
+ <Custom Action="UpdateTomcatClassPath" Before="UpdateTomcatCatalinaBase">NOT Installed</Custom>
<Custom Action="UpdateTomcatCatalinaBase" Before="InstallFinalize">NOT Installed</Custom>
+ <Custom Action="DeleteFiles" Before="InstallFinalize">NOT Installed</Custom>
</InstallExecuteSequence>
<UIRef Id="WixUI_Mondo" />
<Feature Id='Complete' Title='ACS' Description='The complete package.'