Fix problems caused by merging

Kelven Yang · Kelven Yang · commit f5d56b3d5dc3 · 2011-11-03T10:35:25.000-07:00
diff --git a/server/src/com/cloud/Identity/dao/IdentityDao.java b/server/src/com/cloud/Identity/dao/IdentityDao.java
@@ -16,7 +16,7 @@
  * 
  */
 
-package com.cloud.Identity.dao;
+package com.cloud.identity.dao;
 
 import com.cloud.api.IdentityMapper;
 import com.cloud.utils.db.GenericDao;
diff --git a/server/src/com/cloud/Identity/dao/IdentityVO.java b/server/src/com/cloud/Identity/dao/IdentityVO.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
-package com.cloud.Identity.dao;
+package com.cloud.identity.dao;
 
 import javax.persistence.Entity;
 
diff --git a/server/src/com/cloud/api/ApiDispatcher.java b/server/src/com/cloud/api/ApiDispatcher.java
@@ -40,8 +40,8 @@
 import com.cloud.exception.PermissionDeniedException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.Identity.dao.IdentityDao;
-import com.cloud.Identity.dao.IdentityDaoImpl;
+import com.cloud.identity.dao.IdentityDao;
+import com.cloud.identity.dao.IdentityDaoImpl;
 import com.cloud.server.ManagementServer;
 import com.cloud.user.Account;
 import com.cloud.user.UserContext;
diff --git a/server/src/com/cloud/api/IdentityTypeAdapter.java b/server/src/com/cloud/api/IdentityTypeAdapter.java
@@ -19,8 +19,8 @@
 
 import java.lang.reflect.Type;
 
-import com.cloud.Identity.dao.IdentityDao;
-import com.cloud.Identity.dao.IdentityDaoImpl;
+import com.cloud.identity.dao.IdentityDao;
+import com.cloud.identity.dao.IdentityDaoImpl;
 import com.google.gson.Gson;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
diff --git a/server/src/com/cloud/configuration/DefaultComponentLibrary.java b/server/src/com/cloud/configuration/DefaultComponentLibrary.java
@@ -65,7 +65,8 @@
 import com.cloud.host.dao.HostTagsDaoImpl;
 import com.cloud.hypervisor.HypervisorGuruManagerImpl;
 import com.cloud.hypervisor.dao.HypervisorCapabilitiesDaoImpl;
-import com.cloud.Identity.dao.IdentityDaoImpl;
+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;
@@ -157,7 +158,6 @@
 import com.cloud.utils.component.ComponentLocator.ComponentInfo;
 import com.cloud.utils.component.Manager;
 import com.cloud.utils.db.GenericDao;
-import com.cloud.uuididentity.IdentityServiceImpl;
 import com.cloud.vm.ClusteredVirtualMachineManagerImpl;
 import com.cloud.vm.ItWorkDaoImpl;
 import com.cloud.vm.UserVmManagerImpl;
diff --git a/server/src/com/cloud/identity/IdentityServiceImpl.java b/server/src/com/cloud/identity/IdentityServiceImpl.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
-package com.cloud.uuididentity;
+package com.cloud.identity;
 
 import java.util.Map;
 
@@ -24,7 +24,7 @@
 
 import com.cloud.api.IdentityMapper;
 import com.cloud.api.IdentityService;
-import com.cloud.Identity.dao.IdentityDao;
+import com.cloud.identity.dao.IdentityDao;
 import com.cloud.utils.component.Inject;
 import com.cloud.utils.component.Manager;
 
diff --git a/server/src/com/cloud/identity/dao/IdentityDaoImpl.java b/server/src/com/cloud/identity/dao/IdentityDaoImpl.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
-package com.cloud.Identity.dao;
+package com.cloud.identity.dao;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*`
`17`	`17`	`*/`
`18`	`18`
`19`		`-package com.cloud.Identity.dao;`
	`19`	`+package com.cloud.identity.dao;`
`20`	`20`
`21`	`21`	`import com.cloud.api.IdentityMapper;`
`22`	`22`	`import com.cloud.utils.db.GenericDao;`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`* along with this program. If not, see <http://www.gnu.org/licenses/>.`
`16`	`16`	`*`
`17`	`17`	`*/`
`18`		`-package com.cloud.Identity.dao;`
	`18`	`+package com.cloud.identity.dao;`
`19`	`19`
`20`	`20`	`import javax.persistence.Entity;`
`21`	`21`