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

fixed build /start management server

Browse Source
This commit is contained in:
anthony 2011-05-05 16:11:44 -07:00
parent 4c6833b8f2
commit 2d52813ff2
5 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/com/cloud/storage/SwiftVO.java
View File

@ -62,19 +62,19 @@ public class SwiftVO implements Swift {
this.userName = userName;
this.token = token;
}
@Override
public String getHostName() {
return hostName;
}
@Override
public String getAccount() {
return account;
}
@Override
public String getUserName() {
return userName;
}
@Override
public String getToken() {
return token;
}

2
server/src/com/cloud/configuration/DefaultComponentLibrary.java
View File

@ -127,6 +127,7 @@ import com.cloud.storage.secondary.SecondaryStorageManagerImpl;
import com.cloud.storage.snapshot.SnapshotManagerImpl;
import com.cloud.storage.snapshot.SnapshotSchedulerImpl;
import com.cloud.storage.upload.UploadMonitorImpl;
import com.cloud.storage.dao.SwiftDaoImpl;
import com.cloud.template.HyervisorTemplateAdapter;
import com.cloud.template.TemplateAdapter;
import com.cloud.template.TemplateManagerImpl;
@ -271,6 +272,7 @@ public class DefaultComponentLibrary extends ComponentLibraryBase implements Com
addDao("NetworkDomainDao", NetworkDomainDaoImpl.class);
addDao("KeystoreDao", KeystoreDaoImpl.class);
addDao("DcDetailsDao", DcDetailsDaoImpl.class);
addDao("SwiftDao", SwiftDaoImpl.class);
}
@Override

2
server/src/com/cloud/storage/dao/SwiftDao.java
View File

@ -18,6 +18,8 @@
package com.cloud.storage.dao;
import java.util.List;
import com.cloud.storage.SwiftVO;
import com.cloud.utils.db.GenericDao;

29
server/src/com/cloud/storage/dao/SwiftDaoImpl.java Normal file
View File

@ -0,0 +1,29 @@
/**
* Copyright (C) 2010 Cloud.com, Inc. All rights reserved.
*
* This software is licensed under the GNU General Public License v3 or later.
*
* It is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
package com.cloud.storage.dao;
import javax.ejb.Local;
import com.cloud.storage.SwiftVO;
import org.apache.log4j.Logger;
import com.cloud.utils.db.GenericDaoBase;
@Local (value={SwiftDao.class})
public class SwiftDaoImpl extends GenericDaoBase<SwiftVO, Long> implements SwiftDao {
public static final Logger s_logger = Logger.getLogger(SwiftDaoImpl.class.getName());
}

5
setup/db/create-schema.sql
View File

@ -406,7 +406,7 @@ CREATE TABLE `cloud`.`snapshots` (
`created` datetime COMMENT 'Date Created',
`removed` datetime COMMENT 'Date removed. not null if removed',
`backup_snap_id` varchar(255) COMMENT 'Back up uuid of the snapshot',
`swift_id` unsigned COMMENT 'which swift',
`swift_id` bigint unsigned COMMENT 'which swift',
`swift_name` varchar(255) COMMENT 'Back up name in swift',
`prev_snap_id` bigint unsigned COMMENT 'Id of the most recent snapshot',
`hypervisor_type` varchar(32) NOT NULL COMMENT 'hypervisor that the snapshot was taken under',
@ -1489,11 +1489,12 @@ CREATE TABLE `cloud`.`keystore` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `cloud`.`swift` (
`id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT,
`id` bigint unsigned NOT NULL AUTO_INCREMENT,
`hostname` varchar(255),
`account` varchar(255) COMMENT ' account in swift',
`username` varchar(255) COMMENT ' username in swift',
`token` varchar(255) COMMENT 'token for this user',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;