diff --git a/client/pom.xml b/client/pom.xml
index e30d97b2c4e..a77c70bd3d8 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -688,6 +688,7 @@
+
@@ -713,6 +714,23 @@
+
+ download-files
+ prepare-package
+
+ run
+
+
+
+
+
+
+
+
+
+
+
+
@@ -805,37 +823,60 @@
org.bitbucket.joxley
wix-maven-plugin
1.1.1
-
- ${basedir}/target
-
- WixFirewallExtension
- WixUIExtension
-
- -dSourceClient=SourceDir\client -dSetupPathDir=SourceDir\setup -dUtilitiesPathDir=SourceDir\scripts -dPythonSitePackagesDir=SourceDir\python-site-packages
-
- ../scripts/installer/windows/acs.wxs
- ../scripts/installer/windows/WixInstallerDialog.wxs
- ../scripts/installer/windows/Setup_Databases.wxs
- target/client.wxs
- target/setupdb.wxs
- target/utilities.wxs
- target/python-site-packages.wxs
-
- target
-
- target/acs.wixobj
- target/client.wixobj
- target/setupdb.wixobj
- target/utilities.wixobj
- target/WixInstallerDialog.wixobj
- target/Setup_Databases.wixobj
- target/python-site-packages.wixobj
-
- target/acs.msi
-
- wix
+ wix-acs
+
+ ${basedir}/target
+
+ WixFirewallExtension
+ WixUIExtension
+ WixUtilExtension
+
+ -dSourceClient=SourceDir\client -dSetupPathDir=SourceDir\setup -dUtilitiesPathDir=SourceDir\scripts -dPythonSitePackagesDir=SourceDir\python-site-packages
+
+ ../scripts/installer/windows/acs.wxs
+ ../scripts/installer/windows/WixInstallerDialog.wxs
+ ../scripts/installer/windows/Setup_Databases.wxs
+ target/client.wxs
+ target/setupdb.wxs
+ target/utilities.wxs
+ target/python-site-packages.wxs
+
+ target
+
+ target/acs.wixobj
+ target/client.wixobj
+ target/setupdb.wixobj
+ target/utilities.wixobj
+ target/WixInstallerDialog.wixobj
+ target/Setup_Databases.wixobj
+ target/python-site-packages.wixobj
+
+ target/acs.msi
+
+
+ candle
+ light
+
+
+
+ wix-final
+
+ ${basedir}/target
+
+ WixBalExtension
+ WixUtilExtension
+
+
+ ../scripts/installer/windows/dependencies.wxs
+
+ target
+
+ target/dependencies.wixobj
+
+ target/acs-4.4.0.0.exe
+
candle
light
diff --git a/pom.xml b/pom.xml
index ecae71ac4ea..1763d687230 100644
--- a/pom.xml
+++ b/pom.xml
@@ -818,6 +818,7 @@
tools/ngui/static/bootstrap/*
tools/ngui/static/js/lib/*
**/.checkstyle
+ scripts/installer/windows/acs_license.rtf
diff --git a/scripts/common/keys/ssl-keys.py b/scripts/common/keys/ssl-keys.py
index 4ef50b04cb0..074a77704fb 100644
--- a/scripts/common/keys/ssl-keys.py
+++ b/scripts/common/keys/ssl-keys.py
@@ -27,16 +27,27 @@ from subprocess import call
import socket
import sys
import os
+import subprocess
+import traceback
def generateSSLKey(outputPath):
- hostName = socket.gethostbyname(socket.gethostname())
- keyFile = outputPath + os.sep + "cloud.keystore"
- print("HostName = %s" % hostName)
- print("OutputPath = %s" % keyFile)
- dname='cn="Cloudstack User",ou="' + hostName + '",o="' + hostName + '",c="Unknown"';
- print("dname = %s" % dname)
- return_code = call(["keytool", "-genkey", "-keystore", keyFile, "-storepass", "vmops.com", "-keypass", "vmops.com", "-keyalg", "RSA", "-validity", "3650", "-dname", dname])
- print("SSL key generated is : %s" % return_code)
+ logf = open("ssl-keys.log", "w")
+ hostName = socket.gethostbyname(socket.gethostname())
+ keyFile = outputPath + os.sep + "cloud.keystore"
+ logf.write("HostName = %s\n" % hostName)
+ logf.write("OutputPath = %s\n" % keyFile)
+ dname='cn="Cloudstack User",ou="' + hostName + '",o="' + hostName + '",c="Unknown"';
+ logf.write("dname = %s\n" % dname)
+ logf.flush()
+ try :
+ return_code = subprocess.Popen(["keytool", "-genkey", "-keystore", keyFile, "-storepass", "vmops.com", "-keypass", "vmops.com", "-keyalg", "RSA", "-validity", "3650", "-dname", dname],shell=True,stdout=logf, stderr=logf)
+ return_code.wait()
+ except OSError as e:
+ logf.flush()
+ traceback.print_exc(file=logf)
+ logf.flush()
+ logf.write("SSL key generated is : %s" % return_code)
+ logf.flush()
argsSize=len(sys.argv)
if argsSize != 2:
diff --git a/scripts/installer/windows/acs.wxs b/scripts/installer/windows/acs.wxs
index 150c472eb64..1c100e80969 100644
--- a/scripts/installer/windows/acs.wxs
+++ b/scripts/installer/windows/acs.wxs
@@ -8,7 +8,7 @@
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-
+
@@ -79,7 +79,7 @@
Value="-XX:MaxPermSize=512m -Xmx1024m -Xms256m" />
+ Value="[JAVA_HOME]\bin;[PYTHON_HOME];[SEVENZ_HOME];[ProgramFilesFolder]\cdrtools" />
@@ -101,13 +101,20 @@
Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\Tomcat6"
Type="raw" Win64="yes" />
+
+
+
+
+ Type='ownProcess' Vital='yes'>
+
+
+ Execute="commit" Return="check"/>
@@ -246,20 +253,20 @@
Execute="commit" Return="check" />
-
+
NOT Installed
NOT Installed
- NOT
+ NOT
Installed
- NOT Installed
- NOT Installed
- NOT Installed
+ NOT Installed
NOT Installed
- (NOT Installed) AND (CREATE_DATABASE = "1")
+ NOT Installed
+ NOT Installed
+ (NOT Installed) AND (CREATE_DATABASE = "1")
- (NOT Installed) AND ( "1"]]>)
+ (NOT Installed) AND ( "1"]]>)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file