etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix problems caused by merging

This commit is contained in:
Kelven Yang 2011-11-03 10:35:25 -07:00
parent 7e9b210d5c
commit f5d56b3d5d
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/Identity/dao/IdentityDao.java
View File

@ -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;

2
server/src/com/cloud/Identity/dao/IdentityVO.java
View File

@ -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;

4
server/src/com/cloud/api/ApiDispatcher.java
View File

@ -40,8 +40,8 @@ import com.cloud.exception.InvalidParameterValueException;
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;

4
server/src/com/cloud/api/IdentityTypeAdapter.java
View File

@ -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.identity.dao.IdentityDao;
import com.cloud.identity.dao.IdentityDaoImpl;
import com.google.gson.Gson;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;

4
server/src/com/cloud/configuration/DefaultComponentLibrary.java
View File

@ -65,7 +65,8 @@ 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.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.ComponentLibraryBase;
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;

4
server/src/com/cloud/uuididentity/IdentityServiceImpl.java → server/src/com/cloud/identity/IdentityServiceImpl.java
View File

@ -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 javax.naming.ConfigurationException;
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;

2
server/src/com/cloud/identity/dao/IdentityDaoImpl.java
View File

@ -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;