cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject [2/2] git commit: updated refs/heads/vmsync to 422d9b8
Date Thu, 27 Jun 2013 22:42:13 GMT
Disabled ssp plugin because I don't have the db


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

Branch: refs/heads/vmsync
Commit: 422d9b8daf281c6c897125d0ff0bf526c67b3f2b
Parents: a407b33
Author: Alex Huang <alex.huang@gmail.com>
Authored: Thu Jun 27 15:43:02 2013 -0700
Committer: Alex Huang <alex.huang@gmail.com>
Committed: Thu Jun 27 15:43:02 2013 -0700

----------------------------------------------------------------------
 client/tomcatconf/componentContext.xml.in                |  2 ++
 .../framework/jobs/impl/AsyncJobManagerImpl.java         | 11 ++---------
 .../src/com/cloud/network/dao/SspCredentialVO.java       |  6 +++---
 3 files changed, 7 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/422d9b8d/client/tomcatconf/componentContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in
index 61bca48..8aa3917 100644
--- a/client/tomcatconf/componentContext.xml.in
+++ b/client/tomcatconf/componentContext.xml.in
@@ -73,6 +73,7 @@
   <!--
     Stratosphere SSP support components
   -->
+  <!--
   <bean id="sspCredentialDaoImpl" class="com.cloud.network.dao.SspCredentialDaoImpl"/>
   <bean id="sspTenantDaoImpl" class="com.cloud.network.dao.SspTenantDaoImpl"/>
   <bean id="sspUuidDaoImpl" class="com.cloud.network.dao.SspUuidDaoImpl"/>
@@ -82,6 +83,7 @@
   <bean id="StratosphereSsp" class="com.cloud.network.element.SspElement">
     <property name="name" value="StratosphereSsp"/>
   </bean>
+  -->
 
 <!--
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/422d9b8d/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
----------------------------------------------------------------------
diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
index 5c3908d..9879efc 100644
--- a/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
+++ b/framework/jobs/src/org/apache/cloudstack/framework/jobs/impl/AsyncJobManagerImpl.java
@@ -19,15 +19,12 @@ package org.apache.cloudstack.framework.jobs.impl;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.sql.PreparedStatement;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Random;
-import java.util.TimeZone;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.RejectedExecutionException;
@@ -841,16 +838,12 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager,
 
     @DB
     protected List<Long> wakeupScan() {
-        List<Long> standaloneList = new ArrayList<Long>();
-
         Date cutDate = DateUtil.currentGMTTime();
-
         Transaction txn = Transaction.currentTxn();
-        PreparedStatement pstmt = null;
 
         SearchCriteria<Long> sc = JoinJobTimeSearch.create();
-        sc.setParameters("beginTime", DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"),
cutDate));
-        sc.setParameters("endTime", DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"),
cutDate));
+        sc.setParameters("beginTime", cutDate);
+        sc.setParameters("endTime", cutDate);
 
         List<Long> result = _joinMapDao.customSearch(sc, null);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/422d9b8d/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspCredentialVO.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspCredentialVO.java
b/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspCredentialVO.java
index 9511e84..8bc3946 100644
--- a/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspCredentialVO.java
+++ b/plugins/network-elements/stratosphere-ssp/src/com/cloud/network/dao/SspCredentialVO.java
@@ -32,7 +32,7 @@ public class SspCredentialVO {
     private long id;
 
     @Column(name="data_center_id")
-    private long dataCenterId; // Actually, this is zoneId
+    private long zoneId; // Actually, this is zoneId, then name it as zone id.
 
     // XXX: We might want to restrict access to this by cloudstack privileges.
     @Column(name="username")
@@ -42,11 +42,11 @@ public class SspCredentialVO {
     private String password;
 
     public long getZoneId() {
-        return dataCenterId;
+        return zoneId;
     }
 
     public void setZoneId(long zoneId) {
-        this.dataCenterId = zoneId;
+        this.zoneId = zoneId;
     }
 
     public String getUsername() {


Mime
View raw message