apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix rpm installation

Browse Source
This commit is contained in:
Edison Su 2012-09-04 22:30:24 -07:00
parent c4955e82e8
commit caebc0ce74
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cloud.spec
View File

@ -164,6 +164,7 @@ Requires: %{name}-utils = %{version}
Requires: apache-commons-dbcp Requires: apache-commons-dbcp
Requires: apache-commons-collections Requires: apache-commons-collections
Requires: jakarta-commons-httpclient Requires: jakarta-commons-httpclient
Requires: jakarta-taglibs-standard
Requires: mysql-connector-java Requires: mysql-connector-java
%endif %endif

2
setup/bindir/cloud-setup-databases.in
View File

@ -69,7 +69,7 @@ class DBDeployer(object):
dbDotProperties = {} dbDotProperties = {}
dbDotPropertiesIndex = 0 dbDotPropertiesIndex = 0
encryptionKeyFile = '@MSCONF@/key' encryptionKeyFile = '@MSCONF@/key'
encryptionJarPath = '@JAVADIR@/cloud-jasypt-1.8.jar' encryptionJarPath = '@JAVADIR@/jasypt-1.9.0.jar'
success = False success = False
magicString = 'This_is_a_magic_string_i_think_no_one_will_duplicate' magicString = 'This_is_a_magic_string_i_think_no_one_will_duplicate'
tmpMysqlFile = os.path.join(os.path.expanduser('~/'), 'cloudstackmysql.tmp.sql') tmpMysqlFile = os.path.join(os.path.expanduser('~/'), 'cloudstackmysql.tmp.sql')

4
wscript_build
View File

@ -162,9 +162,9 @@ def build_dependences ():
start_path = bld.path.find_dir ("deps") start_path = bld.path.find_dir ("deps")
bld.install_files('${JAVADIR}',start_path.ant_glob(["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(["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", "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", "icontrol-1.0.jar", "manageontap-1.0.jar", "vmware-vim-1.0.jar", "vmware-vim25-1.0.jar", "jasypt-1.9.0.jar", "commons-configuration-1.8.jar", "commons-lang-2.6.jar", "ejb-api.3.0.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-20120825.123319-1.jar"], excl = excludes), cwd=start_path) "xmlrpc-client-3.*.jar", "axis-1.4.jar", "wsdl4j-1.6.2.jar", "bcprov-jdk16-1.46.jar", "jsch-0.1.42.jar", "icontrol-1.0.jar", "manageontap-1.0.jar", "vmware-vim-1.0.jar", "vmware-vim25-1.0.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-20120825.123319-1.jar"], excl = excludes), cwd=start_path)
#def build_console_proxy (): #def build_console_proxy ():
# binary unsubstitutable files: # binary unsubstitutable files:

11
wscript_configure
View File

@ -61,12 +61,23 @@ systemjars = {
"tomcat6-servlet-2.5-api.jar", "tomcat6-servlet-2.5-api.jar",
"tomcat6-el-2.1-api-6.0.24.jar", "tomcat6-el-2.1-api-6.0.24.jar",
"tomcat6-jsp-2.1-api-6.0.24.jar", "tomcat6-jsp-2.1-api-6.0.24.jar",
"jakarta-taglibs-core-1.1.1.jar",
"jakarta-taglibs-standard-1.1.1.jar",
"tomcat6/jasper.jar",
"tomcat6/jasper-el.jar",
"tomcat6/jasper-jdt.jar",
), ),
'CentOS': 'CentOS':
( (
"tomcat6-servlet-2.5-api.jar", "tomcat6-servlet-2.5-api.jar",
"tomcat6-jsp-2.1-api-6.0.24.jar", "tomcat6-jsp-2.1-api-6.0.24.jar",
"tomcat6-el-2.1-api-6.0.24.jar", "tomcat6-el-2.1-api-6.0.24.jar",
"jakarta-taglibs-core-1.1.1.jar",
"jakarta-taglibs-standard-1.1.1.jar",
"tomcat6/jasper.jar",
"tomcat6/jasper-el.jar",
"tomcat6/jasper-jdt.jar",
#"tomcat6/catalina.jar", # all supported distros put the file there #"tomcat6/catalina.jar", # all supported distros put the file there
), ),
'Ubuntu': 'Ubuntu':