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/06/25 16:07:23 UTC

git commit: updated refs/heads/master to 05b79a1

Repository: cloudstack
Updated Branches:
  refs/heads/master ab0dca038 -> 05b79a127


Fix the license headers Nitin forgot.


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

Branch: refs/heads/master
Commit: 05b79a127a0eae6d44def3626c944b080b7bcf5b
Parents: ab0dca0
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Wed Jun 25 16:07:00 2014 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Wed Jun 25 16:07:00 2014 +0200

----------------------------------------------------------------------
 .../resourcedetail/SnapshotPolicyDetailVO.java  | 22 +++++++++++++--
 .../dao/SnapshotPolicyDetailsDao.java           | 19 ++++++++++++-
 .../dao/SnapshotPolicyDetailsDaoImpl.java       | 29 ++++++++++++++++----
 3 files changed, 60 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/05b79a12/engine/schema/src/org/apache/cloudstack/resourcedetail/SnapshotPolicyDetailVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/SnapshotPolicyDetailVO.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/SnapshotPolicyDetailVO.java
index 9c9fc20..2ee48e6 100644
--- a/engine/schema/src/org/apache/cloudstack/resourcedetail/SnapshotPolicyDetailVO.java
+++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/SnapshotPolicyDetailVO.java
@@ -1,7 +1,21 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 package org.apache.cloudstack.resourcedetail;
 
-import org.apache.cloudstack.api.ResourceDetail;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -9,6 +23,8 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
+import org.apache.cloudstack.api.ResourceDetail;
+
 @Entity
 @Table(name = "snapshot_policy_details")
 public class SnapshotPolicyDetailVO implements ResourceDetail {
@@ -33,7 +49,7 @@ public class SnapshotPolicyDetailVO implements ResourceDetail {
     }
 
     public SnapshotPolicyDetailVO(long id, String name, String value) {
-        this.resourceId = id;
+        resourceId = id;
         this.name = name;
         this.value = value;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/05b79a12/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/SnapshotPolicyDetailsDao.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/SnapshotPolicyDetailsDao.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/SnapshotPolicyDetailsDao.java
index 4556688..133f119 100644
--- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/SnapshotPolicyDetailsDao.java
+++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/SnapshotPolicyDetailsDao.java
@@ -1,8 +1,25 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 package org.apache.cloudstack.resourcedetail.dao;
 
-import com.cloud.utils.db.GenericDao;
 import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
 import org.apache.cloudstack.resourcedetail.SnapshotPolicyDetailVO;
 
+import com.cloud.utils.db.GenericDao;
+
 public interface SnapshotPolicyDetailsDao extends GenericDao<SnapshotPolicyDetailVO, Long>, ResourceDetailsDao<SnapshotPolicyDetailVO> {
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/05b79a12/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/SnapshotPolicyDetailsDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/SnapshotPolicyDetailsDaoImpl.java b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/SnapshotPolicyDetailsDaoImpl.java
index ead7680..88e21d6 100644
--- a/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/SnapshotPolicyDetailsDaoImpl.java
+++ b/engine/schema/src/org/apache/cloudstack/resourcedetail/dao/SnapshotPolicyDetailsDaoImpl.java
@@ -1,14 +1,31 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
 package org.apache.cloudstack.resourcedetail.dao;
 
-import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
-import org.apache.cloudstack.resourcedetail.SnapshotPolicyDetailVO;
+import javax.ejb.Local;
+
 import org.springframework.stereotype.Component;
 
-import javax.ejb.Local;
+import org.apache.cloudstack.resourcedetail.ResourceDetailsDaoBase;
+import org.apache.cloudstack.resourcedetail.SnapshotPolicyDetailVO;
 
- @Component
- @Local(value = {SnapshotPolicyDetailsDao.class})
- public class SnapshotPolicyDetailsDaoImpl extends ResourceDetailsDaoBase<SnapshotPolicyDetailVO> implements SnapshotPolicyDetailsDao {
+@Component
+@Local(value = {SnapshotPolicyDetailsDao.class})
+public class SnapshotPolicyDetailsDaoImpl extends ResourceDetailsDaoBase<SnapshotPolicyDetailVO> implements SnapshotPolicyDetailsDao {
 
     @Override
     public void addDetail(long resourceId, String key, String value, boolean display) {