You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2014/02/25 12:31:09 UTC
[1/2] git commit: updated refs/heads/master to bb23e3a
Repository: cloudstack
Updated Branches:
refs/heads/master 14689d781 -> bb23e3ac1
Update the XenServer library to version 6.2.0-1 in the poms.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bb23e3ac
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bb23e3ac
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bb23e3ac
Branch: refs/heads/master
Commit: bb23e3ac1f5af8d7cbfaab313bb254dc86be0f92
Parents: 7aa70fe
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Tue Feb 25 12:29:00 2014 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Feb 25 12:30:46 2014 +0100
----------------------------------------------------------------------
deps/XenServerJava/Makefile | 44 ----------------------------------------
deps/XenServerJava/pom.xml | 2 +-
pom.xml | 2 +-
3 files changed, 2 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb23e3ac/deps/XenServerJava/Makefile
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/Makefile b/deps/XenServerJava/Makefile
deleted file mode 100644
index c78144a..0000000
--- a/deps/XenServerJava/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# Makefile to compile the Xen Java SDK bindings
-
-BINDINGJAVAFILES := $(wildcard com/xensource/xenapi/*.java)
-BINDINGCLASSFILES := $(BINDINGJAVAFILES:.java=.class)
-BINDINGJAR := xenserver-5.6.100-1.jar
-
-CLASSPATH := :../cloud-xmlrpc-client-3.1.3.jar:../cloud-xmlrpc-common-3.1.3.jar:../cloud-ws-commons-util-1.0.2.jar
-EXAMPLECLASSPATH := :$(BINDINGJAR)$(CLASSPATH)
-
-.PHONY: all
-all: $(BINDINGJAR) tests
- @ :
-
-# Target to compile the automated tests
-.PHONY: tests
-tests: $(patsubst %.java,%.class,$(wildcard *.java))
- @ :
-
-.PHONY: docs
-docs:
- javadoc -classpath ${CLASSPATH} -d doc -link http://java.sun.com/javase/6/docs/api com/xensource/xenapi/*.java
-
-%.class: %.java
- javac -cp ${CLASSPATH} $^
-
-$(BINDINGJAR): $(BINDINGCLASSFILES)
- jar -cvf $@ com/xensource/xenapi/*.class
-
-.PHONY: cleanclass
-cleanclass:
- rm -f com/xensource/xenapi/*.class
- rm -f *.class
-
-.PHONY: cleanjar
-cleanjar:
- rm -f $(BINDINGJAR)
-
-.PHONY: cleandocs
-cleandocs:
- rm -rf doc
-
-.PHONY: clean
-clean: cleanjar cleanclass cleandocs
- @ :
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb23e3ac/deps/XenServerJava/pom.xml
----------------------------------------------------------------------
diff --git a/deps/XenServerJava/pom.xml b/deps/XenServerJava/pom.xml
index 84d9a97..c9a4e86 100644
--- a/deps/XenServerJava/pom.xml
+++ b/deps/XenServerJava/pom.xml
@@ -25,7 +25,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>xapi</artifactId>
- <version>5.6.100-1-SNAPSHOT</version>
+ <version>6.2.0-1-SNAPSHOT</version>
<name>Apache XenSource XAPI</name>
<description>XenSource XAPI Java Bindings</description>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb23e3ac/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1e9e8d8..c0b8219 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
<cs.ehcache.version>2.6.6</cs.ehcache.version>
<cs.gson.version>1.7.1</cs.gson.version>
<cs.guava.version>14.0-rc1</cs.guava.version>
- <cs.xapi.version>5.6.100-1-SNAPSHOT</cs.xapi.version>
+ <cs.xapi.version>6.2.0-1-SNAPSHOT</cs.xapi.version>
<cs.httpclient.version>3.1</cs.httpclient.version>
<cs.httpcore.version>4.2.1</cs.httpcore.version>
<cs.mysql.version>5.1.21</cs.mysql.version>
[2/2] git commit: updated refs/heads/master to bb23e3a
Posted by hu...@apache.org.
Fix jetty:run startup to include the mysql driver as a dependency for developers
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7aa70fe8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7aa70fe8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7aa70fe8
Branch: refs/heads/master
Commit: 7aa70fe82a55f0c5b52c5b905af2f123315570b0
Parents: 14689d7
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Tue Feb 25 12:13:29 2014 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Feb 25 12:30:46 2014 +0100
----------------------------------------------------------------------
client/pom.xml | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7aa70fe8/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 4eb421d..0980b64 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -365,6 +365,14 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.26</version>
+ <dependencies>
+ <!-- specify the dependent jdbc driver here -->
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${cs.mysql.version}</version>
+ </dependency>
+ </dependencies>
<configuration>
<scanIntervalSeconds>0</scanIntervalSeconds>
<stopPort>9966</stopPort>