Skip to content

Commit 5fb6edd

Browse files
author
Alex Huang
committed
Changed the package to name to org.apache.cloudstack
1 parent ae8560b commit 5fb6edd

14 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎core/src/com/cloud/agent/api/SecStorageSetupCommand.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
// under the License.
1717
package com.cloud.agent.api;
1818

19+
import org.apache.cloudstack.framework.security.keystore.KeystoreManager;
20+
1921
import com.cloud.agent.api.to.DataStoreTO;
20-
import com.cloud.keystore.KeystoreManager;
2122

2223
public class SecStorageSetupCommand extends Command {
2324
private DataStoreTO store;

‎framework/security/resources/META-INF/cloudstack/core/spring-framework-security-core-context.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,5 @@
2626
http://www.springframework.org/schema/context
2727
http://www.springframework.org/schema/context/spring-context-3.0.xsd"
2828
>
29-
<bean id="keystoreManagerImpl" class="com.cloud.keystore.KeystoreManagerImpl" />
30-
29+
<bean id="keystoreManagerImpl" class="org.apache.cloudstack.framework.security.KeystoreManagerImpl" />
3130
</beans>

framework/security/src/com/cloud/keystore/KeystoreDao.java renamed to framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// KIND, either express or implied. See the License for the
1515
// specific language governing permissions and limitations
1616
// under the License.
17-
package com.cloud.keystore;
17+
package org.apache.cloudstack.framework.security.keystore;
1818

1919
import java.util.List;
2020

framework/security/src/com/cloud/keystore/KeystoreDaoImpl.java renamed to framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreDaoImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// KIND, either express or implied. See the License for the
1515
// specific language governing permissions and limitations
1616
// under the License.
17-
package com.cloud.keystore;
17+
package org.apache.cloudstack.framework.security.keystore;
1818

1919
import java.sql.PreparedStatement;
2020
import java.util.Collections;

framework/security/src/com/cloud/keystore/KeystoreManager.java renamed to framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// KIND, either express or implied. See the License for the
1515
// specific language governing permissions and limitations
1616
// under the License.
17-
package com.cloud.keystore;
17+
package org.apache.cloudstack.framework.security.keystore;
1818

1919
import com.cloud.agent.api.LogLevel;
2020
import com.cloud.agent.api.LogLevel.Log4jLevel;

framework/security/src/com/cloud/keystore/KeystoreManagerImpl.java renamed to framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreManagerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// KIND, either express or implied. See the License for the
1515
// specific language governing permissions and limitations
1616
// under the License.
17-
package com.cloud.keystore;
17+
package org.apache.cloudstack.framework.security.keystore;
1818

1919
import java.io.IOException;
2020
import java.security.KeyStore;

framework/security/src/com/cloud/keystore/KeystoreVO.java renamed to framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreVO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// KIND, either express or implied. See the License for the
1515
// specific language governing permissions and limitations
1616
// under the License.
17-
package com.cloud.keystore;
17+
package org.apache.cloudstack.framework.security.keystore;
1818

1919
import javax.persistence.Column;
2020
import javax.persistence.Entity;

‎server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.apache.log4j.Logger;
2626

2727
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
28+
import org.apache.cloudstack.framework.security.keystore.KeystoreManager;
2829

2930
import com.cloud.agent.AgentManager;
3031
import com.cloud.agent.api.GetVncPortAnswer;
@@ -33,7 +34,6 @@
3334
import com.cloud.host.HostVO;
3435
import com.cloud.host.dao.HostDao;
3536
import com.cloud.info.ConsoleProxyInfo;
36-
import com.cloud.keystore.KeystoreManager;
3737
import com.cloud.server.ManagementServer;
3838
import com.cloud.utils.NumbersUtil;
3939
import com.cloud.utils.component.ManagerBase;

‎server/src/com/cloud/consoleproxy/AgentHookBase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.google.gson.GsonBuilder;
2727

2828
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
29+
import org.apache.cloudstack.framework.security.keystore.KeystoreManager;
2930

3031
import com.cloud.agent.AgentManager;
3132
import com.cloud.agent.api.AgentControlAnswer;
@@ -44,7 +45,6 @@
4445
import com.cloud.host.HostVO;
4546
import com.cloud.host.Status;
4647
import com.cloud.host.dao.HostDao;
47-
import com.cloud.keystore.KeystoreManager;
4848
import com.cloud.server.ManagementServer;
4949
import com.cloud.servlet.ConsoleProxyPasswordBasedEncryptor;
5050
import com.cloud.servlet.ConsoleProxyServlet;

‎server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
import org.apache.cloudstack.context.CallContext;
3737
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
3838
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
39+
import org.apache.cloudstack.framework.security.keystore.KeystoreDao;
40+
import org.apache.cloudstack.framework.security.keystore.KeystoreManager;
41+
import org.apache.cloudstack.framework.security.keystore.KeystoreVO;
3942
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
4043
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
4144
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
@@ -80,9 +83,6 @@
8083
import com.cloud.info.RunningHostCountInfo;
8184
import com.cloud.info.RunningHostInfoAgregator;
8285
import com.cloud.info.RunningHostInfoAgregator.ZoneHostInfo;
83-
import com.cloud.keystore.KeystoreDao;
84-
import com.cloud.keystore.KeystoreManager;
85-
import com.cloud.keystore.KeystoreVO;
8686
import com.cloud.network.Network;
8787
import com.cloud.network.NetworkModel;
8888
import com.cloud.network.Networks.TrafficType;

0 commit comments

Comments
 (0)