mirror of
				https://github.com/apache/cloudstack.git
				synced 2025-11-04 00:02:37 +01:00 
			
		
		
		
	rename com.cloud.identity package to com.cloud.uuididentity as a previous deleted com.cloud.Identity name make git confused with com.cloud.identity under linux systems
This commit is contained in:
		
							parent
							
								
									0092ee1090
								
							
						
					
					
						commit
						85ad8ffca3
					
				@ -30,7 +30,6 @@ import java.util.regex.Matcher;
 | 
			
		||||
 | 
			
		||||
import org.apache.log4j.Logger;
 | 
			
		||||
 | 
			
		||||
import com.cloud.identity.dao.IdentityDao;
 | 
			
		||||
import com.cloud.api.BaseCmd.CommandType;
 | 
			
		||||
import com.cloud.api.commands.ListEventsCmd;
 | 
			
		||||
import com.cloud.async.AsyncCommandQueued;
 | 
			
		||||
@ -48,6 +47,7 @@ import com.cloud.utils.DateUtil;
 | 
			
		||||
import com.cloud.utils.component.ComponentLocator;
 | 
			
		||||
import com.cloud.utils.component.PluggableService;
 | 
			
		||||
import com.cloud.utils.exception.CloudRuntimeException;
 | 
			
		||||
import com.cloud.uuididentity.dao.IdentityDao;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * A class that dispatches API commands to the appropriate manager for execution.
 | 
			
		||||
 | 
			
		||||
@ -19,8 +19,8 @@ package com.cloud.api;
 | 
			
		||||
 | 
			
		||||
import java.lang.reflect.Type;
 | 
			
		||||
 | 
			
		||||
import com.cloud.identity.dao.IdentityDao;
 | 
			
		||||
import com.cloud.identity.dao.IdentityDaoImpl;
 | 
			
		||||
import com.cloud.uuididentity.dao.IdentityDao;
 | 
			
		||||
import com.cloud.uuididentity.dao.IdentityDaoImpl;
 | 
			
		||||
import com.google.gson.Gson;
 | 
			
		||||
import com.google.gson.JsonDeserializationContext;
 | 
			
		||||
import com.google.gson.JsonDeserializer;
 | 
			
		||||
 | 
			
		||||
@ -41,11 +41,11 @@ import com.cloud.api.ResponseObject;
 | 
			
		||||
import com.cloud.api.ResponseObjectTypeAdapter;
 | 
			
		||||
import com.cloud.configuration.Config;
 | 
			
		||||
import com.cloud.configuration.dao.ConfigurationDao;
 | 
			
		||||
import com.cloud.identity.dao.IdentityDao;
 | 
			
		||||
import com.cloud.identity.dao.IdentityDaoImpl;
 | 
			
		||||
import com.cloud.utils.component.ComponentLocator;
 | 
			
		||||
import com.cloud.utils.encoding.URLEncoder;
 | 
			
		||||
import com.cloud.utils.exception.CloudRuntimeException;
 | 
			
		||||
import com.cloud.uuididentity.dao.IdentityDao;
 | 
			
		||||
import com.cloud.uuididentity.dao.IdentityDaoImpl;
 | 
			
		||||
import com.google.gson.Gson;
 | 
			
		||||
import com.google.gson.annotations.SerializedName;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -65,8 +65,6 @@ import com.cloud.host.dao.HostDetailsDaoImpl;
 | 
			
		||||
import com.cloud.host.dao.HostTagsDaoImpl;
 | 
			
		||||
import com.cloud.hypervisor.HypervisorGuruManagerImpl;
 | 
			
		||||
import com.cloud.hypervisor.dao.HypervisorCapabilitiesDaoImpl;
 | 
			
		||||
import com.cloud.identity.IdentityServiceImpl;
 | 
			
		||||
import com.cloud.identity.dao.IdentityDaoImpl;
 | 
			
		||||
import com.cloud.keystore.KeystoreDaoImpl;
 | 
			
		||||
import com.cloud.keystore.KeystoreManagerImpl;
 | 
			
		||||
import com.cloud.maint.UpgradeManagerImpl;
 | 
			
		||||
@ -181,6 +179,8 @@ import com.cloud.utils.component.ComponentLocator.ComponentInfo;
 | 
			
		||||
import com.cloud.utils.component.Manager;
 | 
			
		||||
import com.cloud.utils.component.PluggableService;
 | 
			
		||||
import com.cloud.utils.db.GenericDao;
 | 
			
		||||
import com.cloud.uuididentity.IdentityServiceImpl;
 | 
			
		||||
import com.cloud.uuididentity.dao.IdentityDaoImpl;
 | 
			
		||||
import com.cloud.vm.ClusteredVirtualMachineManagerImpl;
 | 
			
		||||
import com.cloud.vm.ItWorkDaoImpl;
 | 
			
		||||
import com.cloud.vm.UserVmManagerImpl;
 | 
			
		||||
 | 
			
		||||
@ -32,7 +32,6 @@ import javax.naming.ConfigurationException;
 | 
			
		||||
 | 
			
		||||
import org.apache.log4j.Logger;
 | 
			
		||||
 | 
			
		||||
import com.cloud.identity.dao.IdentityDao;
 | 
			
		||||
import com.cloud.agent.AgentManager;
 | 
			
		||||
import com.cloud.agent.api.AgentControlAnswer;
 | 
			
		||||
import com.cloud.agent.api.Answer;
 | 
			
		||||
@ -126,6 +125,7 @@ import com.cloud.utils.db.Transaction;
 | 
			
		||||
import com.cloud.utils.events.SubscriptionMgr;
 | 
			
		||||
import com.cloud.utils.exception.CloudRuntimeException;
 | 
			
		||||
import com.cloud.utils.net.NetUtils;
 | 
			
		||||
import com.cloud.uuididentity.dao.IdentityDao;
 | 
			
		||||
import com.cloud.vm.ConsoleProxyVO;
 | 
			
		||||
import com.cloud.vm.NicProfile;
 | 
			
		||||
import com.cloud.vm.ReservationContext;
 | 
			
		||||
 | 
			
		||||
@ -15,7 +15,7 @@
 | 
			
		||||
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
 * 
 | 
			
		||||
 */
 | 
			
		||||
package com.cloud.identity;
 | 
			
		||||
package com.cloud.uuididentity;
 | 
			
		||||
 | 
			
		||||
import java.util.Map;
 | 
			
		||||
 | 
			
		||||
@ -24,9 +24,9 @@ import javax.naming.ConfigurationException;
 | 
			
		||||
 | 
			
		||||
import com.cloud.api.IdentityMapper;
 | 
			
		||||
import com.cloud.api.IdentityService;
 | 
			
		||||
import com.cloud.identity.dao.IdentityDao;
 | 
			
		||||
import com.cloud.utils.component.Inject;
 | 
			
		||||
import com.cloud.utils.component.Manager;
 | 
			
		||||
import com.cloud.uuididentity.dao.IdentityDao;
 | 
			
		||||
 | 
			
		||||
@Local(value = { IdentityService.class })
 | 
			
		||||
public class IdentityServiceImpl implements Manager, IdentityService {
 | 
			
		||||
@ -16,7 +16,7 @@
 | 
			
		||||
 * 
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
package com.cloud.identity.dao;
 | 
			
		||||
package com.cloud.uuididentity.dao;
 | 
			
		||||
 | 
			
		||||
import com.cloud.api.IdentityMapper;
 | 
			
		||||
import com.cloud.utils.db.GenericDao;
 | 
			
		||||
@ -15,7 +15,7 @@
 | 
			
		||||
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
 * 
 | 
			
		||||
 */
 | 
			
		||||
package com.cloud.identity.dao;
 | 
			
		||||
package com.cloud.uuididentity.dao;
 | 
			
		||||
 | 
			
		||||
import java.sql.PreparedStatement;
 | 
			
		||||
import java.sql.ResultSet;
 | 
			
		||||
@ -15,7 +15,7 @@
 | 
			
		||||
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
 * 
 | 
			
		||||
 */
 | 
			
		||||
package com.cloud.identity.dao;
 | 
			
		||||
package com.cloud.uuididentity.dao;
 | 
			
		||||
 | 
			
		||||
import javax.persistence.Entity;
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user