incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: Revert: javassist related recent changes
Date Wed, 10 Oct 2012 07:23:19 GMT
Updated Branches:
  refs/heads/4.0 a2aa0e237 -> f20d6369e


Revert: javassist related recent changes

Changes:
 - Have javassist dependency in awsapi/pom.xml
 - Have it deployed by waf while rpm building in wscript_build
 - Fixed dependency in debian/control
 - Add javassist pkg in cloud-deps for debian

This is a squashed commit of the following:

commit eed46e7749f2716d0046f6c8237e9900043078ee
Author: Rohit Yadav <bhaisaab@apache.org>
Date:   Wed Oct 10 12:42:41 2012 +0530

    Revert: Add javaassist dependence"

    Reverted javassist but axis2-1.5.1.jar is still first in the classpath
    This reverts commit 7bcbae5e91a4cd122d0efa7f2542eab73debb6df.

commit eab6b6afe9331bf3920fafbd59695141366a2a61
Author: Rohit Yadav <bhaisaab@apache.org>
Date:   Wed Oct 10 12:38:42 2012 +0530

    Revert: "maven: Remove javassist as a dependency for AWS API"

    We want javassist to be fetched by mvn and get it packaged in
    cloud-deps.
    This reverts commit 850433240401cd318f1d8d8b0fa2032a60d52c1f.

commit 35af1ebdb6340105f342dbfc461f5fb892b9ab76
Author: Rohit Yadav <bhaisaab@apache.org>
Date:   Wed Oct 10 12:36:43 2012 +0530

    Revert: "add javassit on the classpath"

    We don't need javassist from a distro's repo. That is included in
    cloud-deps.
    This reverts commit 66daa1a2bc6e86adea265a8a0b8b512756c8f77c.

commit cb11d153fbb809aad94f0a3d19f3efba13691d71
Author: Rohit Yadav <bhaisaab@apache.org>
Date:   Wed Oct 10 12:34:09 2012 +0530

    Revert: "fix rpm build"

    We need javaassist for awsapi package.
    This reverts commit c49f3beccfcd1257eca1ea06606fb55b3fdf5093.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f20d6369
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f20d6369
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f20d6369

Branch: refs/heads/4.0
Commit: f20d6369e45443440afb8241e0112b235918ebe7
Parents: a2aa0e2
Author: Rohit Yadav <bhaisaab@apache.org>
Authored: Wed Oct 10 12:46:51 2012 +0530
Committer: Rohit Yadav <bhaisaab@apache.org>
Committed: Wed Oct 10 12:49:38 2012 +0530

----------------------------------------------------------------------
 awsapi/pom.xml              |    7 +++++++
 cloud.spec                  |    2 +-
 debian/cloud-awsapi.install |    1 +
 debian/control              |    2 +-
 wscript_build               |    2 +-
 wscript_configure           |    3 ---
 6 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f20d6369/awsapi/pom.xml
----------------------------------------------------------------------
diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index b1b67c6..d2f0721 100644
--- a/awsapi/pom.xml
+++ b/awsapi/pom.xml
@@ -207,6 +207,13 @@
         <artifactId>dom4j</artifactId>
         <version>1.6.1</version>
     </dependency>
+    <dependency>
+        <groupId>javassist</groupId>
+        <artifactId>javassist</artifactId>
+        <version>3.9.0.GA</version>
+    </dependency>
+
+
 </dependencies>
 
 <build>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f20d6369/cloud.spec
----------------------------------------------------------------------
diff --git a/cloud.spec b/cloud.spec
index 864a47b..e267e58 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -286,7 +286,6 @@ Summary:   CloudStack CloudBridge
 Group:     System Environment/Libraries
 Requires: java >= 1.6.0
 Requires: tomcat6
-Requires: javassist
 Requires: %{name}-deps = %{version}
 %if 0%{?fedora} > 15
 Requires: apache-commons-lang
@@ -471,6 +470,7 @@ fi
 %{_javadir}/xercesImpl*.jar
 %{_javadir}/xml-apis*.jar
 %{_javadir}/dom4j*.jar
+%{_javadir}/javassist*.jar
 %{_javadir}/commons-fileupload*.jar
 %{_javadir}/commons-codec-1.6.jar
 %{_javadir}/commons-dbcp-1.4.jar

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f20d6369/debian/cloud-awsapi.install
----------------------------------------------------------------------
diff --git a/debian/cloud-awsapi.install b/debian/cloud-awsapi.install
index 59642cb..9304eb3 100644
--- a/debian/cloud-awsapi.install
+++ b/debian/cloud-awsapi.install
@@ -34,3 +34,4 @@
 /usr/share/java/woden*.jar
 /usr/share/java/xercesImpl*.jar
 /usr/share/java/xml-apis*.jar
+/usr/share/java/javassist*.jar

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f20d6369/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index 7762e73..6158cec 100644
--- a/debian/control
+++ b/debian/control
@@ -120,6 +120,6 @@ Description: CloudStack commandline tool
 Package: cloud-awsapi
 Provides: cloud-awsapi
 Architecture: any
-Depends: openjdk-6-jre, tomcat6, libcommons-lang-java, libjavassist-java
+Depends: openjdk-6-jre, tomcat6, libcommons-lang-java
 Description: CloudStack AWS API wrapper
  The CloudStack Amazon Webservices API wrapper

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f20d6369/wscript_build
----------------------------------------------------------------------
diff --git a/wscript_build b/wscript_build
index 1fafa26..595b38f 100644
--- a/wscript_build
+++ b/wscript_build
@@ -164,7 +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", 
          "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", "commons-fileupload*.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",
"commons-fileupload*.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)
 
 #def build_console_proxy ():

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f20d6369/wscript_configure
----------------------------------------------------------------------
diff --git a/wscript_configure b/wscript_configure
index 58aa8be..5cde646 100644
--- a/wscript_configure
+++ b/wscript_configure
@@ -67,7 +67,6 @@ systemjars = {
                 "tomcat6/jasper.jar",
                 "tomcat6/jasper-el.jar",
                 "tomcat6/jasper-jdt.jar",
-		"javassist.jar",
                 
 	),
 	'CentOS':
@@ -80,7 +79,6 @@ systemjars = {
                 "tomcat6/jasper.jar",
                 "tomcat6/jasper-el.jar",
                 "tomcat6/jasper-jdt.jar",
-		"javassist.jar",
 		#"tomcat6/catalina.jar", # all supported distros put the file there
 	),
 	'Ubuntu':
@@ -103,7 +101,6 @@ systemjars = {
 		"jna.jar",
 		"log4j-1.2.jar",
 		"catalina-tribes.jar",
-		"javassist.jar",
 	),
 	'Windows':
 	(


Mime
View raw message