Updated Branches: refs/heads/master 97ca7791b -> 6f1989519
Remove unused RandomlyIncreasingVMInstanceDaoImpl to avoid confusion. Confirmed with Kishan about this. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6f198951 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6f198951 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6f198951 Branch: refs/heads/master Commit: 6f19895191edd0b9bc2ab2524f969afb9fc0a3b4 Parents: 97ca779 Author: Min Chen <[email protected]> Authored: Thu Feb 28 14:17:58 2013 -0800 Committer: Min Chen <[email protected]> Committed: Thu Feb 28 14:17:58 2013 -0800 ---------------------------------------------------------------------- client/tomcatconf/componentContext.xml.in | 1 - client/tomcatconf/nonossComponentContext.xml.in | 1 - .../dao/RandomlyIncreasingVMInstanceDaoImpl.java | 36 --------------- 3 files changed, 0 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6f198951/client/tomcatconf/componentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in index a09e858..87fc6f8 100644 --- a/client/tomcatconf/componentContext.xml.in +++ b/client/tomcatconf/componentContext.xml.in @@ -48,7 +48,6 @@ <bean id="consoleProxyManagerImpl" class="com.cloud.consoleproxy.ConsoleProxyManagerImpl" /> <bean id="securityGroupManagerImpl2" class="com.cloud.network.security.SecurityGroupManagerImpl2" /> <bean id="premiumSecondaryStorageManagerImpl" class="com.cloud.secstorage.PremiumSecondaryStorageManagerImpl" /> - <!-- <bean id="randomlyIncreasingVMInstanceDaoImpl" class="com.cloud.vm.dao.RandomlyIncreasingVMInstanceDaoImpl" /> --> <bean id="userVmDaoImpl" class="com.cloud.vm.dao.UserVmDaoImpl" /> <bean id="ipv6AddressManagerImpl" class="com.cloud.network.Ipv6AddressManagerImpl" /> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6f198951/client/tomcatconf/nonossComponentContext.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in index ba61875..ac77ab7 100644 --- a/client/tomcatconf/nonossComponentContext.xml.in +++ b/client/tomcatconf/nonossComponentContext.xml.in @@ -49,7 +49,6 @@ <bean id="consoleProxyManagerImpl" class="com.cloud.consoleproxy.ConsoleProxyManagerImpl" /> <bean id="securityGroupManagerImpl2" class="com.cloud.network.security.SecurityGroupManagerImpl2" /> <bean id="premiumSecondaryStorageManagerImpl" class="com.cloud.secstorage.PremiumSecondaryStorageManagerImpl" /> - <!-- <bean id="randomlyIncreasingVMInstanceDaoImpl" class="com.cloud.vm.dao.RandomlyIncreasingVMInstanceDaoImpl" /> --> <bean id="userVmDaoImpl" class="com.cloud.vm.dao.UserVmDaoImpl" /> <bean id="ipv6AddressManagerImpl" class="com.cloud.network.Ipv6AddressManagerImpl" /> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6f198951/server/src/com/cloud/vm/dao/RandomlyIncreasingVMInstanceDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/dao/RandomlyIncreasingVMInstanceDaoImpl.java b/server/src/com/cloud/vm/dao/RandomlyIncreasingVMInstanceDaoImpl.java deleted file mode 100644 index cc5c536..0000000 --- a/server/src/com/cloud/vm/dao/RandomlyIncreasingVMInstanceDaoImpl.java +++ /dev/null @@ -1,36 +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.vm.dao; - - -import javax.ejb.Local; - -import org.apache.log4j.Logger; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Component; - -@Local(value = { UserVmDao.class }) -public class RandomlyIncreasingVMInstanceDaoImpl extends UserVmDaoImpl { - - public static final Logger s_logger = Logger.getLogger(RandomlyIncreasingVMInstanceDaoImpl.class); - - @Override - public <K> K getNextInSequence(final Class<K> clazz, final String name) { - return getRandomlyIncreasingNextInSequence(clazz, name); - } - -}
