cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kelv...@apache.org
Subject git commit: Architecture refactoring - Stateless management server - Spring Framework initiatives
Date Fri, 19 Oct 2012 22:25:00 GMT
Updated Branches:
  refs/heads/javelin a75916d45 -> 8ef9e32cf


Architecture refactoring - Stateless management server - Spring Framework initiatives


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

Branch: refs/heads/javelin
Commit: 8ef9e32cfda4b1ce138ac167caa26521bd7a3508
Parents: a75916d
Author: Kelven Yang <kelven.yang@citrix.com>
Authored: Fri Oct 19 15:24:01 2012 -0700
Committer: Kelven Yang <kelven.yang@citrix.com>
Committed: Fri Oct 19 15:24:15 2012 -0700

----------------------------------------------------------------------
 client/WEB-INF/web.xml                             |    9 ++-
 pom.xml                                            |   81 +++++++++++++++
 utils/conf/db.properties                           |    1 +
 utils/src/com/cloud/utils/events/EventBus.java     |    4 +-
 utils/src/com/cloud/utils/events/EventBusBase.java |    5 +-
 utils/src/com/cloud/utils/events/Subscriber.java   |    4 +-
 6 files changed, 99 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8ef9e32c/client/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/client/WEB-INF/web.xml b/client/WEB-INF/web.xml
index 50f2455..c6fd30f 100644
--- a/client/WEB-INF/web.xml
+++ b/client/WEB-INF/web.xml
@@ -20,7 +20,14 @@
     xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
     version="2.5">
     
-    
+	<listener>
+  	  <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+    <context-param>    
+        <param-name>contextConfigLocation</param-name>    
+        <param-value>classpath:applicationContext.xml</param-value>    
+    </context-param>
+          
     <servlet>
         <servlet-name>cloudStartupServlet</servlet-name>
         <servlet-class>com.cloud.servlet.CloudStartupServlet</servlet-class>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8ef9e32c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3c14d4e..5f63ce6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,7 @@
     <cs.servlet.version>2.4</cs.servlet.version>
     <cs.jstl.version>1.2</cs.jstl.version>
     <cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version>
+    <org.springframework.version>3.0.5.RELEASE</org.springframework.version>
     <skipTests>true</skipTests>
 
   </properties>
@@ -169,6 +170,86 @@
       <version>${cs.junit.version}</version>
       <scope>test</scope>
     </dependency>
+    
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-core</artifactId>
+	  <version>${org.springframework.version}</version>
+	</dependency>
+ 
+	<dependency>
+  	  <groupId>org.springframework</groupId>
+  	  <artifactId>spring-expression</artifactId>
+  	  <version>${org.springframework.version}</version>
+	</dependency>
+ 
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-beans</artifactId>
+	  <version>${org.springframework.version}</version>
+	</dependency>
+ 
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-aop</artifactId>
+	  <version>${org.springframework.version}</version>
+	</dependency>
+ 
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-context</artifactId>
+	  <version>${org.springframework.version}</version>
+	</dependency>
+ 
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-context-support</artifactId>
+	  <version>${org.springframework.version}</version>
+	</dependency>
+ 
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-tx</artifactId>
+	  <version>${org.springframework.version}</version>
+	</dependency>
+ 
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-jdbc</artifactId>
+	  <version>${org.springframework.version}</version>
+	</dependency>
+ 
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-orm</artifactId>
+	  <version>${org.springframework.version}</version>
+	</dependency>
+ 
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-oxm</artifactId>
+	  <version>${org.springframework.version}</version>
+	</dependency>
+ 
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-web</artifactId>
+	  <version>${org.springframework.version}</version>
+	</dependency>
+ 
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-webmvc</artifactId>
+	  <version>${org.springframework.version}</version>
+	</dependency>
+ 
+	<dependency>
+	  <groupId>org.springframework</groupId>
+	  <artifactId>spring-test</artifactId>
+	  <version>${org.springframework.version}</version>
+	  <scope>test</scope>
+	</dependency>
+
   </dependencies>
 
   <build>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8ef9e32c/utils/conf/db.properties
----------------------------------------------------------------------
diff --git a/utils/conf/db.properties b/utils/conf/db.properties
index 6bdb6d6..8d98119 100644
--- a/utils/conf/db.properties
+++ b/utils/conf/db.properties
@@ -24,6 +24,7 @@ cluster.servlet.port=9090
 # CloudStack database settings
 db.cloud.username=cloud
 db.cloud.password=cloud
+db.root.password=
 db.cloud.host=localhost
 db.cloud.port=3306
 db.cloud.name=cloud

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8ef9e32c/utils/src/com/cloud/utils/events/EventBus.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/events/EventBus.java b/utils/src/com/cloud/utils/events/EventBus.java
index 4195acd..c1b6f70 100644
--- a/utils/src/com/cloud/utils/events/EventBus.java
+++ b/utils/src/com/cloud/utils/events/EventBus.java
@@ -17,9 +17,11 @@
 
 package com.cloud.utils.events;
 
+import java.io.Serializable;
+
 public interface EventBus {
 	void subscribe(String subject, Subscriber subscriber);
 	void unsubscribe(String subject, Subscriber subscriber);
 	
-	void publish(String subject, PublishScope scope, Object sender, String args);
+	void publish(String subject, PublishScope scope, Object sender, Serializable args);
 }

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8ef9e32c/utils/src/com/cloud/utils/events/EventBusBase.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/events/EventBusBase.java b/utils/src/com/cloud/utils/events/EventBusBase.java
index 0c135db..cd10f1d 100644
--- a/utils/src/com/cloud/utils/events/EventBusBase.java
+++ b/utils/src/com/cloud/utils/events/EventBusBase.java
@@ -17,6 +17,7 @@
 
 package com.cloud.utils.events;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -72,7 +73,7 @@ public class EventBusBase implements EventBus {
 
 	@Override
 	public void publish(String subject, PublishScope scope, Object sender,
-		String args) {
+		Serializable args) {
 		
 		if(_gate.enter(true)) {
 
@@ -283,7 +284,7 @@ public class EventBusBase implements EventBus {
 			_children.put(key, childNode);
 		}
 		
-		public void notifySubscribers(String subject, Object sender, String args) {
+		public void notifySubscribers(String subject, Object sender, Serializable args) {
 			for(Subscriber subscriber : _subscribers) {
 				subscriber.onPublishEvent(subject, sender, args);
 			}

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8ef9e32c/utils/src/com/cloud/utils/events/Subscriber.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/events/Subscriber.java b/utils/src/com/cloud/utils/events/Subscriber.java
index 7af283b..c3baa6f 100644
--- a/utils/src/com/cloud/utils/events/Subscriber.java
+++ b/utils/src/com/cloud/utils/events/Subscriber.java
@@ -17,6 +17,8 @@
 
 package com.cloud.utils.events;
 
+import java.io.Serializable;
+
 public interface Subscriber {
-	void onPublishEvent(String subject, Object sender, String args);
+	void onPublishEvent(String subject, Object sender, Serializable args);
 }


Mime
View raw message