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

CLOUDSTACK-292: Add missing jars to cloud-deps

Browse Source 
- fixes axiom-impl version to avoid class load exception
- with copying of libs is not done in cloud.spec anymore, add jars to
  cloud-deps
- make aws-api package depend on cloud-deps
This commit is contained in:
Rohit Yadav 2012-10-09 16:20:03 +05:30
parent 428f8ae152
commit e8a737ec49
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
awsapi/pom.xml
View File

@ -53,6 +53,11 @@
<artifactId>axiom-impl</artifactId> <artifactId>axiom-impl</artifactId>
<version>${cs.axiom.version}</version> <version>${cs.axiom.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
<version>${cs.axiom.version}</version>
</dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>

12
cloud.spec
View File

@ -286,6 +286,7 @@ Summary: CloudStack CloudBridge
Group: System Environment/Libraries Group: System Environment/Libraries
Requires: java >= 1.6.0 Requires: java >= 1.6.0
Requires: tomcat6 Requires: tomcat6
Requires: %{name}-deps = %{version}
%if 0%{?fedora} > 15 %if 0%{?fedora} > 15
Requires: apache-commons-lang Requires: apache-commons-lang
%endif %endif
@ -459,6 +460,17 @@ fi
%files deps %files deps
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%{_javadir}/axiom-*.jar
%{_javadir}/axis2-*.jar
%{_javadir}/antlr*.jar
%{_javadir}/XmlSchema-*.jar
%{_javadir}/json-simple*.jar
%{_javadir}/neethi*.jar
%{_javadir}/woden*.jar
%{_javadir}/xercesImpl*.jar
%{_javadir}/xml-apis*.jar
%{_javadir}/dom4j*.jar
%{_javadir}/javassist*.jar
%{_javadir}/commons-codec-1.6.jar %{_javadir}/commons-codec-1.6.jar
%{_javadir}/commons-dbcp-1.4.jar %{_javadir}/commons-dbcp-1.4.jar
%{_javadir}/commons-pool-1.6.jar %{_javadir}/commons-pool-1.6.jar

1
wscript_build
View File

@ -164,6 +164,7 @@ def build_dependences ():
bld.install_files('${JAVADIR}',start_path.ant_glob(["CAStorSDK-*.jar", "javax.persistence-2.0.0.jar", "apache-log4j-extras-1.1.jar", "libvirt-0.4.9.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(["CAStorSDK-*.jar", "javax.persistence-2.0.0.jar", "apache-log4j-extras-1.1.jar", "libvirt-0.4.9.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-nodep-2.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-nodep-2.2.2.jar", "xmlrpc-common-3.*.jar",
"axiom*.jar", "axis2*.jar", "antlr*.jar", "XmlSchema*.jar", "json-simple*.jar", "neethi*.jar", "woden*.jar", "xercesImpl*.jar", "xml-apis*.jar", "dom4j*.jar", "javassist*.jar",
"xmlrpc-client-3.*.jar", "wsdl4j-1.6.2.jar", "bcprov-jdk16-1.45.jar", "jsch-0.1.42.jar", "jasypt-1.9.0.jar", "commons-configuration-1.8.jar", "mail-1.4.jar", "activation-1.1.jar", "xapi-5.6.100-1-SNAPSHOT.jar"], excl = excludes), cwd=start_path) "xmlrpc-client-3.*.jar", "wsdl4j-1.6.2.jar", "bcprov-jdk16-1.45.jar", "jsch-0.1.42.jar", "jasypt-1.9.0.jar", "commons-configuration-1.8.jar", "mail-1.4.jar", "activation-1.1.jar", "xapi-5.6.100-1-SNAPSHOT.jar"], excl = excludes), cwd=start_path)
#def build_console_proxy (): #def build_console_proxy ():