Skip to content

Commit b88033f

Browse files
sudisonsudison
committed
fix installation issue
1 parent f20f388 commit b88033f

5 files changed

Lines changed: 21 additions & 22 deletions

File tree

‎build/package.xml‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -200,26 +200,22 @@
200200
<zip destfile="${dist.dir}/systemvm.zip" duplicate="preserve" update="true">
201201
<!-- Console proxy now includes an agent shell, therefore we need to package agent related distribution -->
202202
<zipfileset dir="${deps.dir}">
203-
<include name="cloud-xmlrpc-client-3.1.3.jar" />
204-
<include name="cloud-xmlrpc-common-3.1.3.jar" />
205-
<include name="cloud-ws-commons-util-1.0.2.jar" />
206-
<include name="cloud-log4j.jar" />
207-
<include name="cloud-apache-log4j-extras-1.0.jar" />
208-
<include name="cloud-google-gson-1.7.1.jar" />
209-
<include name="cloud-commons-httpclient-3.1.jar" />
210-
<include name="cloud-commons-logging-1.1.1.jar" />
211-
<include name="cloud-commons-collections-3.2.1.jar" />
212-
<include name="cloud-commons-codec-1.5.jar" />
213-
<include name="cloud-commons-pool-1.5.6.jar" />
214-
<include name="cloud-cglib.jar" />
215-
<include name="cloud-axis.jar" />
216-
<include name="cloud-commons-discovery.jar" />
217-
<include name="cloud-wsdl4j.jar" />
218-
<include name="vmware-apputils.jar" />
219-
<include name="vmware-vim.jar" />
220-
<include name="vmware-lib-jaxrpc.jar" />
221-
<include name="vmware-vim25.jar" />
222-
<include name="cloud-ejb-api-3.0.jar" />
203+
<include name="xmlrpc-client-3.1.3.jar" />
204+
<include name="xmlrpc-common-3.1.3.jar" />
205+
<include name="ws-commons-util-1.0.2.jar" />
206+
<include name="log4j*.jar" />
207+
<include name="apache-log4j-extras-1.1.jar" />
208+
<include name="gson-1.7.1.jar" />
209+
<include name="commons-httpclient-3.1.jar" />
210+
<include name="commons-logging-1.1.1.jar" />
211+
<include name="commons-collections-3.1.jar" />
212+
<include name="commons-codec-1.6.jar" />
213+
<include name="commons-pool-1.6.jar" />
214+
<include name="cglib-*.jar" />
215+
<include name="axis-*.jar" />
216+
<include name="discovery-*.jar" />
217+
<include name="wsdl4j-*.jar" />
218+
<include name="ejb-api-3.0.jar" />
223219
</zipfileset>
224220
<zipfileset dir="${jar.dir}">
225221
<include name="${agent.jar}" />

‎cloud.spec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,7 @@ fi
475475
%{_javadir}/asm-3.1.jar
476476
%{_javadir}/xapi-5.6.100-1-SNAPSHOT.jar
477477
%{_javadir}/log4j-*.jar
478+
%{_javadir}/apache-log4j-extras-1.1.jar
478479
%{_javadir}/trilead-ssh2-build213-svnkit-1.3-patch.jar
479480
%{_javadir}/cglib-2.2.jar
480481
%{_javadir}/xmlrpc-common-3.*.jar

‎debian/cloud-deps.install‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
/usr/share/java/mail-1.4.jar
2424
/usr/share/java/httpcore-4.0.jar
2525
/usr/share/java/log4j-*.jar
26+
/usr/share/java/apache-log4j-extras-1.1.jar
2627
/usr/share/java/trilead-ssh2-build213-svnkit-1.3-patch.jar
2728
/usr/share/java/cglib-2.2.jar
2829
/usr/share/java/xmlrpc-common-3.*.jar

‎scripts/storage/secondary/cloud-install-sys-tmplt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ DISKSPACE=5120000 #free disk space required in kilobytes
4040
dbHost=
4141
dbUser=
4242
dbPassword=
43+
jasypt='/usr/share/java/jasypt-1.9.0.jar'
4344
while getopts 'm:h:f:u:Ft:e:s:o:r:d' OPTION
4445
do
4546
case $OPTION in
@@ -129,7 +130,7 @@ then
129130
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/')
130131
if [ ! $encPassword == "" ]
131132
then
132-
dbPassword=(`java -classpath /usr/share/java/cloud-jasypt-1.8.jar org.jasypt.intf.cli.JasyptPBEStringDecryptionCLI decrypt.sh input=$encPassword password=$msKey verbose=false`)
133+
dbPassword=(`java -classpath $jasypt org.jasypt.intf.cli.JasyptPBEStringDecryptionCLI decrypt.sh input=$encPassword password=$msKey verbose=false`)
133134
if [ ! $dbPassword ]
134135
then
135136
echo "Failed to decrypt DB password from db.properties"

‎wscript_build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ def build_dependences ():
162162

163163
start_path = bld.path.find_dir ("deps")
164164

165-
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",
165+
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",
166166
"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",
167167
"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)
168168

0 commit comments

Comments
 (0)