You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2012/09/07 14:13:45 UTC
[6/6] git commit: fix installation issue
fix installation issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b88033ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b88033ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b88033ff
Branch: refs/heads/master
Commit: b88033ff2ac13c7aaacfc62876acd6ae0dcc862e
Parents: f20f388
Author: Edison Su <su...@gmail.com>
Authored: Fri Sep 7 01:09:27 2012 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Fri Sep 7 05:12:27 2012 -0700
----------------------------------------------------------------------
build/package.xml | 36 +++++++---------
cloud.spec | 1 +
debian/cloud-deps.install | 1 +
scripts/storage/secondary/cloud-install-sys-tmplt | 3 +-
wscript_build | 2 +-
5 files changed, 21 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b88033ff/build/package.xml
----------------------------------------------------------------------
diff --git a/build/package.xml b/build/package.xml
index 275d265..01c702f 100755
--- a/build/package.xml
+++ b/build/package.xml
@@ -200,26 +200,22 @@
<zip destfile="${dist.dir}/systemvm.zip" duplicate="preserve" update="true">
<!-- Console proxy now includes an agent shell, therefore we need to package agent related distribution -->
<zipfileset dir="${deps.dir}">
- <include name="cloud-xmlrpc-client-3.1.3.jar" />
- <include name="cloud-xmlrpc-common-3.1.3.jar" />
- <include name="cloud-ws-commons-util-1.0.2.jar" />
- <include name="cloud-log4j.jar" />
- <include name="cloud-apache-log4j-extras-1.0.jar" />
- <include name="cloud-google-gson-1.7.1.jar" />
- <include name="cloud-commons-httpclient-3.1.jar" />
- <include name="cloud-commons-logging-1.1.1.jar" />
- <include name="cloud-commons-collections-3.2.1.jar" />
- <include name="cloud-commons-codec-1.5.jar" />
- <include name="cloud-commons-pool-1.5.6.jar" />
- <include name="cloud-cglib.jar" />
- <include name="cloud-axis.jar" />
- <include name="cloud-commons-discovery.jar" />
- <include name="cloud-wsdl4j.jar" />
- <include name="vmware-apputils.jar" />
- <include name="vmware-vim.jar" />
- <include name="vmware-lib-jaxrpc.jar" />
- <include name="vmware-vim25.jar" />
- <include name="cloud-ejb-api-3.0.jar" />
+ <include name="xmlrpc-client-3.1.3.jar" />
+ <include name="xmlrpc-common-3.1.3.jar" />
+ <include name="ws-commons-util-1.0.2.jar" />
+ <include name="log4j*.jar" />
+ <include name="apache-log4j-extras-1.1.jar" />
+ <include name="gson-1.7.1.jar" />
+ <include name="commons-httpclient-3.1.jar" />
+ <include name="commons-logging-1.1.1.jar" />
+ <include name="commons-collections-3.1.jar" />
+ <include name="commons-codec-1.6.jar" />
+ <include name="commons-pool-1.6.jar" />
+ <include name="cglib-*.jar" />
+ <include name="axis-*.jar" />
+ <include name="discovery-*.jar" />
+ <include name="wsdl4j-*.jar" />
+ <include name="ejb-api-3.0.jar" />
</zipfileset>
<zipfileset dir="${jar.dir}">
<include name="${agent.jar}" />
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b88033ff/cloud.spec
----------------------------------------------------------------------
diff --git a/cloud.spec b/cloud.spec
index fed252f..4bbff9a 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -475,6 +475,7 @@ fi
%{_javadir}/asm-3.1.jar
%{_javadir}/xapi-5.6.100-1-SNAPSHOT.jar
%{_javadir}/log4j-*.jar
+%{_javadir}/apache-log4j-extras-1.1.jar
%{_javadir}/trilead-ssh2-build213-svnkit-1.3-patch.jar
%{_javadir}/cglib-2.2.jar
%{_javadir}/xmlrpc-common-3.*.jar
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b88033ff/debian/cloud-deps.install
----------------------------------------------------------------------
diff --git a/debian/cloud-deps.install b/debian/cloud-deps.install
index 5b11d63..e11f7e0 100644
--- a/debian/cloud-deps.install
+++ b/debian/cloud-deps.install
@@ -23,6 +23,7 @@
/usr/share/java/mail-1.4.jar
/usr/share/java/httpcore-4.0.jar
/usr/share/java/log4j-*.jar
+/usr/share/java/apache-log4j-extras-1.1.jar
/usr/share/java/trilead-ssh2-build213-svnkit-1.3-patch.jar
/usr/share/java/cglib-2.2.jar
/usr/share/java/xmlrpc-common-3.*.jar
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b88033ff/scripts/storage/secondary/cloud-install-sys-tmplt
----------------------------------------------------------------------
diff --git a/scripts/storage/secondary/cloud-install-sys-tmplt b/scripts/storage/secondary/cloud-install-sys-tmplt
index 12e8ea9..55f3d18 100755
--- a/scripts/storage/secondary/cloud-install-sys-tmplt
+++ b/scripts/storage/secondary/cloud-install-sys-tmplt
@@ -40,6 +40,7 @@ DISKSPACE=5120000 #free disk space required in kilobytes
dbHost=
dbUser=
dbPassword=
+jasypt='/usr/share/java/jasypt-1.9.0.jar'
while getopts 'm:h:f:u:Ft:e:s:o:r:d' OPTION
do
case $OPTION in
@@ -129,7 +130,7 @@ then
encPassword=$(sed '/^\#/d' /etc/cloud/management/db.properties | grep 'db.cloud.password' | tail -n 1 | cut -d "=" -f2- | sed 's/^[[:space:]]*//;s/[[:space:]]*$//'i | sed 's/^ENC(\(.*\))/\1/')
if [ ! $encPassword == "" ]
then
- dbPassword=(`java -classpath /usr/share/java/cloud-jasypt-1.8.jar org.jasypt.intf.cli.JasyptPBEStringDecryptionCLI decrypt.sh input=$encPassword password=$msKey verbose=false`)
+ dbPassword=(`java -classpath $jasypt org.jasypt.intf.cli.JasyptPBEStringDecryptionCLI decrypt.sh input=$encPassword password=$msKey verbose=false`)
if [ ! $dbPassword ]
then
echo "Failed to decrypt DB password from db.properties"
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b88033ff/wscript_build
----------------------------------------------------------------------
diff --git a/wscript_build b/wscript_build
index 9bb645b..3598880 100644
--- a/wscript_build
+++ b/wscript_build
@@ -162,7 +162,7 @@ def build_dependences ():
start_path = bld.path.find_dir ("deps")
- bld.install_files('${JAVADIR}',start_path.ant_glob(["libvirt-0.4.8.jar", "axis2-1.5.1.jar", "jstl-1.2.jar", "commons-discovery-0.5.jar", "commons-codec-1.6.jar", "ejb-api-3.0.jar", "xmlrpc-client-3.1.3.jar", "commons-dbcp-1.4.jar", "commons-pool-1.6.jar", "gson-1.7.1.jar",
+ bld.install_files('${JAVADIR}',start_path.ant_glob(["apache-log4j-extras-1.1.jar", "libvirt-0.4.8.jar", "axis2-1.5.1.jar", "jstl-1.2.jar", "commons-discovery-0.5.jar", "commons-codec-1.6.jar", "ejb-api-3.0.jar", "xmlrpc-client-3.1.3.jar", "commons-dbcp-1.4.jar", "commons-pool-1.6.jar", "gson-1.7.1.jar",
"netscaler-1.0.jar", "netscaler-sdx-1.0.jar", "backport-util-concurrent-3.1.jar", "ehcache-1.5.0.jar", "httpcore-4.0.jar", "log4j-1.2.16.jar", "trilead-ssh2-build213-svnkit-1.3-patch.jar", "cglib-2.2.jar", "xmlrpc-common-3.*.jar",
"xmlrpc-client-3.*.jar", "axis-1.4.jar", "wsdl4j-1.6.2.jar", "bcprov-jdk16-1.46.jar", "jsch-0.1.42.jar", "jasypt-1.9.0.jar", "commons-configuration-1.8.jar", "commons-lang-2.6.jar", "mail-1.4.jar", "activation-1.1.jar", "mysql-connector-java-5.1.21.jar", "hibernate-jpa-2.0-api-1.0.0.Final.jar", "hibernate-entitymanager-3.5.1-Final.jar", "hibernate-core-3.5.1-Final.jar", "hibernate-commons-annotations-3.2.0.Final.jar", "hibernate-annotations-3.5.1-Final.jar", "asm-3.1.jar", "xapi-5.6.100-1-SNAPSHOT.jar"], excl = excludes), cwd=start_path)