cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [07/50] [abbrv] Removed all reminants of the IdentityService. Created the KeysManager to move the management of keys out of management server
Date Fri, 17 Jan 2014 22:40:09 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/68b8891c/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java b/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
deleted file mode 100644
index 3475104..0000000
--- a/server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
+++ /dev/null
@@ -1,241 +0,0 @@
-// 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 com.cloud.uuididentity.dao;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.ejb.Local;
-
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
-import com.cloud.exception.InvalidParameterValueException;
-import com.cloud.server.ResourceTag.ResourceObjectType;
-import com.cloud.utils.Pair;
-import com.cloud.utils.db.DB;
-import com.cloud.utils.db.GenericDaoBase;
-import com.cloud.utils.db.TransactionLegacy;
-
-@Component
-@Local(value = {IdentityDao.class})
-public class IdentityDaoImpl extends GenericDaoBase<IdentityVO, Long> implements IdentityDao
{
-    private static final Logger s_logger = Logger.getLogger(IdentityDaoImpl.class);
-
-    public IdentityDaoImpl() {
-    }
-
-    @Override
-    @DB
-    public Long getIdentityId(String tableName, String identityString) {
-        assert (tableName != null);
-        assert (identityString != null);
-
-        PreparedStatement pstmt = null;
-        TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.CLOUD_DB);
-        try {
-            try {
-                try {
-                    pstmt = txn.prepareAutoCloseStatement(String.format("SELECT uuid FROM
`%s`", tableName));
-                    pstmt.executeQuery();
-                } catch (SQLException e) {
-                    throw new InvalidParameterValueException("uuid field doesn't exist in
table " + tableName);
-                }
-
-                pstmt = txn.prepareAutoCloseStatement(String.format("SELECT id FROM `%s`
WHERE id=? OR uuid=?", tableName)
-
-                    // TODO : after graceful period, use following line turn on more secure
check
-                    // String.format("SELECT id FROM %s WHERE (id=? AND uuid IS NULL) OR
uuid=?", mapper.entityTableName())
-                    );
-
-                long id = 0;
-                try {
-                    // TODO : use regular expression to determine
-                    id = Long.parseLong(identityString);
-                } catch (NumberFormatException e) {
-                    // this could happen when it is a uuid string, so catch and ignore it
-                }
-
-                pstmt.setLong(1, id);
-                pstmt.setString(2, identityString);
-
-                ResultSet rs = pstmt.executeQuery();
-                if (rs.next()) {
-                    return rs.getLong(1);
-                } else {
-                    if (id == -1L)
-                        return id;
-
-                    throw new InvalidParameterValueException("Object " + tableName + "(uuid:
" + identityString + ") does not exist.");
-                }
-            } catch (SQLException e) {
-                s_logger.error("Unexpected exception ", e);
-            }
-        } finally {
-            txn.close();
-        }
-        return null;
-    }
-
-    @DB
-    @Override
-    public Pair<Long, Long> getAccountDomainInfo(String tableName, Long identityId,
ResourceObjectType resourceType) {
-        assert (tableName != null);
-
-        PreparedStatement pstmt = null;
-        TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.CLOUD_DB);
-        try {
-            Long domainId = null;
-            Long accountId = null;
-            //get domainId
-            try {
-                pstmt = txn.prepareAutoCloseStatement(String.format("SELECT domain_id FROM
`%s` WHERE id=?", tableName));
-                pstmt.setLong(1, identityId);
-                ResultSet rs = pstmt.executeQuery();
-                if (rs.next()) {
-                    if (rs.getLong(1) != 0) {
-                        domainId = rs.getLong(1);
-                    }
-                }
-            } catch (SQLException e) {
-            }
-
-            //get accountId
-            try {
-                String account = "account_id";
-                if (resourceType == ResourceObjectType.Project) {
-                    account = "project_account_id";
-                }
-                pstmt = txn.prepareAutoCloseStatement(String.format("SELECT " + account +
" FROM `%s` WHERE id=?", tableName));
-                pstmt.setLong(1, identityId);
-                ResultSet rs = pstmt.executeQuery();
-                if (rs.next()) {
-                    if (rs.getLong(1) != 0) {
-                        accountId = rs.getLong(1);
-                    }
-                }
-            } catch (SQLException e) {
-            }
-            return new Pair<Long, Long>(accountId, domainId);
-        } finally {
-            txn.close();
-        }
-    }
-
-    @DB
-    @Override
-    public String getIdentityUuid(String tableName, String identityString) {
-        assert (tableName != null);
-        assert (identityString != null);
-
-        PreparedStatement pstmt = null;
-        TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.CLOUD_DB);
-        try {
-            try {
-                pstmt = txn.prepareAutoCloseStatement(String.format("SELECT uuid FROM `%s`
WHERE id=? OR uuid=?", tableName)
-                    // String.format("SELECT uuid FROM %s WHERE (id=? AND uuid IS NULL) OR
uuid=?", tableName)
-                    );
-
-                long id = 0;
-                try {
-                    // TODO : use regular expression to determine
-                    id = Long.parseLong(identityString);
-                } catch (NumberFormatException e) {
-                    // this could happen when it is a uuid string, so catch and ignore it
-                }
-
-                pstmt.setLong(1, id);
-                pstmt.setString(2, identityString);
-
-                ResultSet rs = pstmt.executeQuery();
-                if (rs.next()) {
-                    String uuid = rs.getString(1);
-                    if (uuid != null && !uuid.isEmpty())
-                        return uuid;
-                    return identityString;
-                }
-            } catch (SQLException e) {
-                s_logger.error("Unexpected exception ", e);
-            }
-        } finally {
-            txn.close();
-        }
-
-        return identityString;
-    }
-
-    @Override
-    @DB
-    public void initializeDefaultUuid(String tableName) {
-        assert (tableName != null);
-        List<Long> l = getNullUuidRecords(tableName);
-
-        TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.CLOUD_DB);
-        try {
-            try {
-                txn.start();
-                for (Long id : l) {
-                    setInitialUuid(tableName, id);
-                }
-                txn.commit();
-            } catch (SQLException e) {
-                txn.rollback();
-                s_logger.error("Unexpected exception ", e);
-            }
-        } finally {
-            txn.close();
-        }
-    }
-
-    @DB
-    List<Long> getNullUuidRecords(String tableName) {
-        List<Long> l = new ArrayList<Long>();
-
-        PreparedStatement pstmt = null;
-        TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.CLOUD_DB);
-        try {
-            try {
-                pstmt = txn.prepareAutoCloseStatement(String.format("SELECT id FROM `%s`
WHERE uuid IS NULL", tableName));
-
-                ResultSet rs = pstmt.executeQuery();
-                while (rs.next()) {
-                    l.add(rs.getLong(1));
-                }
-            } catch (SQLException e) {
-                s_logger.error("Unexpected exception ", e);
-            }
-        } finally {
-            txn.close();
-        }
-        return l;
-    }
-
-    @DB
-    void setInitialUuid(String tableName, long id) throws SQLException {
-        TransactionLegacy txn = TransactionLegacy.currentTxn();
-
-        PreparedStatement pstmtUpdate = null;
-        pstmtUpdate = txn.prepareAutoCloseStatement(String.format("UPDATE `%s` SET uuid=?
WHERE id=?", tableName));
-
-        pstmtUpdate.setString(1, String.valueOf(id));
-        pstmtUpdate.setLong(2, id);
-        pstmtUpdate.executeUpdate();
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/68b8891c/server/src/com/cloud/uuididentity/dao/IdentityVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/uuididentity/dao/IdentityVO.java b/server/src/com/cloud/uuididentity/dao/IdentityVO.java
deleted file mode 100644
index c40f40b..0000000
--- a/server/src/com/cloud/uuididentity/dao/IdentityVO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-// 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 com.cloud.uuididentity.dao;
-
-import javax.persistence.Entity;
-
-/**
- */
-@Entity
-public class IdentityVO {
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/68b8891c/server/test/resources/network-mgr-component.xml
----------------------------------------------------------------------
diff --git a/server/test/resources/network-mgr-component.xml b/server/test/resources/network-mgr-component.xml
index b55a68b..a0ddce0 100644
--- a/server/test/resources/network-mgr-component.xml
+++ b/server/test/resources/network-mgr-component.xml
@@ -174,7 +174,6 @@ under the License.
         <dao name="UserDao" class="com.cloud.user.dao.UserDaoImpl" singleton="false"/>
         <dao name="NetworkOfferingServiceDao" class="com.cloud.offerings.dao.NetworkOfferingServiceMapDaoImpl"
singleton="false"/>
         <dao name="VirtualRouterProviderDao" class="com.cloud.network.dao.VirtualRouterProviderDaoImpl"
singleton="false"/>
-        <dao name="IdentityDao" class="com.cloud.uuididentity.dao.IdentityDaoImpl" singleton="false"/>
         <dao name="Site2SiteCustomerGatewayDao" class="com.cloud.network.dao.Site2SiteCustomerGatewayDaoImpl"
singleton="false"/>
         <dao name="Site2SiteVpnGatewayDao" class="com.cloud.network.dao.Site2SiteVpnGatewayDaoImpl"
singleton="false"/>
         <dao name="Site2SiteVpnConnectionDao" class="com.cloud.network.dao.Site2SiteVpnConnectionDaoImpl"
singleton="false"/>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/68b8891c/services/console-proxy-rdp/rdpconsole/pom.xml
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/pom.xml b/services/console-proxy-rdp/rdpconsole/pom.xml
index 5737a85..05585a1 100755
--- a/services/console-proxy-rdp/rdpconsole/pom.xml
+++ b/services/console-proxy-rdp/rdpconsole/pom.xml
@@ -72,7 +72,6 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk16</artifactId>
-      <version>1.46</version>
     </dependency>
   </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/68b8891c/systemvm/pom.xml
----------------------------------------------------------------------
diff --git a/systemvm/pom.xml b/systemvm/pom.xml
index e8d43ef..5de6452 100644
--- a/systemvm/pom.xml
+++ b/systemvm/pom.xml
@@ -51,7 +51,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.3</version>
         <configuration>
           <finalName>systemvm</finalName>
           <appendAssemblyId>false</appendAssemblyId>
@@ -71,7 +70,6 @@
       </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>2.6</version>
         <executions>
           <execution>
             <id>copy-resources</id>
@@ -102,7 +100,6 @@
       </plugin>
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.7</version>
         <executions>
           <execution>
             <id>build-cloud-scripts</id>


Mime
View raw message