Skip to content

Commit 2f51bcf

Browse files
author
Prasanna Santhanam
committed
CLOUDSTACK-2815: org.apache.cloudstack.dedicated.* to org.apache.cloudstack
Moving the package one level up so API discovery can discovery APIs from org.apache.cloudstack.api.* This also keeps the plugin uniform with the other plugins which have their APIs in org.apache.cloudstack.api namespace. Signed-off-by: Prasanna Santhanam <tsp@apache.org>
1 parent a9bfee1 commit 2f51bcf

20 files changed

Lines changed: 64 additions & 73 deletions

‎client/tomcatconf/componentContext.xml.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@
272272
<!--
273273
Dedicated Resources components
274274
-->
275-
<bean id="DedicatedResourceManagerImpl" class="org.apache.cloudstack.dedicated.manager.DedicatedResourceManagerImpl"/>
275+
<bean id="DedicatedResourceManagerImpl" class="org.apache.cloudstack.dedicated.DedicatedResourceManagerImpl"/>
276276
<bean id="ExplicitDedicationProcessor" class="org.apache.cloudstack.affinity.ExplicitDedicationProcessor">
277277
<property name="name" value="ExplicitDedicationProcessor"/>
278278
<property name="type" value="ExplicitDedication"/>

plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/DedicateClusterCmd.java renamed to plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateClusterCmd.java

Lines changed: 3 additions & 3 deletions
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 org.apache.cloudstack.dedicated.api.commands;
17+
package org.apache.cloudstack.api.commands;
1818

1919
import java.util.ArrayList;
2020
import java.util.List;
@@ -30,8 +30,8 @@
3030
import org.apache.cloudstack.api.response.ClusterResponse;
3131
import org.apache.cloudstack.api.response.DomainResponse;
3232
import org.apache.cloudstack.api.response.ListResponse;
33-
import org.apache.cloudstack.dedicated.api.response.DedicateClusterResponse;
34-
import org.apache.cloudstack.dedicated.services.DedicatedService;
33+
import org.apache.cloudstack.api.response.DedicateClusterResponse;
34+
import org.apache.cloudstack.dedicated.DedicatedService;
3535
import org.apache.log4j.Logger;
3636

3737
import com.cloud.dc.DedicatedResources;

plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/DedicateHostCmd.java renamed to plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateHostCmd.java

Lines changed: 3 additions & 3 deletions
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 org.apache.cloudstack.dedicated.api.commands;
17+
package org.apache.cloudstack.api.commands;
1818

1919
import java.util.ArrayList;
2020
import java.util.List;
@@ -30,8 +30,8 @@
3030
import org.apache.cloudstack.api.response.DomainResponse;
3131
import org.apache.cloudstack.api.response.HostResponse;
3232
import org.apache.cloudstack.api.response.ListResponse;
33-
import org.apache.cloudstack.dedicated.api.response.DedicateHostResponse;
34-
import org.apache.cloudstack.dedicated.services.DedicatedService;
33+
import org.apache.cloudstack.api.response.DedicateHostResponse;
34+
import org.apache.cloudstack.dedicated.DedicatedService;
3535
import org.apache.log4j.Logger;
3636

3737
import com.cloud.dc.DedicatedResources;

plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/DedicatePodCmd.java renamed to plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicatePodCmd.java

Lines changed: 3 additions & 3 deletions
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 org.apache.cloudstack.dedicated.api.commands;
17+
package org.apache.cloudstack.api.commands;
1818

1919
import java.util.ArrayList;
2020
import java.util.List;
@@ -30,8 +30,8 @@
3030
import org.apache.cloudstack.api.response.DomainResponse;
3131
import org.apache.cloudstack.api.response.ListResponse;
3232
import org.apache.cloudstack.api.response.PodResponse;
33-
import org.apache.cloudstack.dedicated.api.response.DedicatePodResponse;
34-
import org.apache.cloudstack.dedicated.services.DedicatedService;
33+
import org.apache.cloudstack.api.response.DedicatePodResponse;
34+
import org.apache.cloudstack.dedicated.DedicatedService;
3535
import org.apache.log4j.Logger;
3636

3737
import com.cloud.dc.DedicatedResources;

plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/DedicateZoneCmd.java renamed to plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/DedicateZoneCmd.java

Lines changed: 3 additions & 3 deletions
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 org.apache.cloudstack.dedicated.api.commands;
17+
package org.apache.cloudstack.api.commands;
1818

1919
import java.util.ArrayList;
2020
import java.util.List;
@@ -30,8 +30,8 @@
3030
import org.apache.cloudstack.api.response.DomainResponse;
3131
import org.apache.cloudstack.api.response.ListResponse;
3232
import org.apache.cloudstack.api.response.ZoneResponse;
33-
import org.apache.cloudstack.dedicated.api.response.DedicateZoneResponse;
34-
import org.apache.cloudstack.dedicated.services.DedicatedService;
33+
import org.apache.cloudstack.api.response.DedicateZoneResponse;
34+
import org.apache.cloudstack.dedicated.DedicatedService;
3535
import org.apache.log4j.Logger;
3636

3737
import com.cloud.dc.DedicatedResources;

plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ListDedicatedClustersCmd.java renamed to plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedClustersCmd.java

Lines changed: 3 additions & 3 deletions
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 org.apache.cloudstack.dedicated.api.commands;
17+
package org.apache.cloudstack.api.commands;
1818

1919
import java.util.ArrayList;
2020
import java.util.List;
@@ -30,8 +30,8 @@
3030
import org.apache.cloudstack.api.response.ClusterResponse;
3131
import org.apache.cloudstack.api.response.DomainResponse;
3232
import org.apache.cloudstack.api.response.ListResponse;
33-
import org.apache.cloudstack.dedicated.api.response.DedicateClusterResponse;
34-
import org.apache.cloudstack.dedicated.services.DedicatedService;
33+
import org.apache.cloudstack.api.response.DedicateClusterResponse;
34+
import org.apache.cloudstack.dedicated.DedicatedService;
3535
import org.apache.log4j.Logger;
3636

3737
import com.cloud.dc.DedicatedResourceVO;

plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ListDedicatedHostsCmd.java renamed to plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedHostsCmd.java

Lines changed: 3 additions & 3 deletions
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 org.apache.cloudstack.dedicated.api.commands;
17+
package org.apache.cloudstack.api.commands;
1818

1919
import java.util.ArrayList;
2020
import java.util.List;
@@ -30,8 +30,8 @@
3030
import org.apache.cloudstack.api.response.DomainResponse;
3131
import org.apache.cloudstack.api.response.HostResponse;
3232
import org.apache.cloudstack.api.response.ListResponse;
33-
import org.apache.cloudstack.dedicated.api.response.DedicateHostResponse;
34-
import org.apache.cloudstack.dedicated.services.DedicatedService;
33+
import org.apache.cloudstack.api.response.DedicateHostResponse;
34+
import org.apache.cloudstack.dedicated.DedicatedService;
3535
import org.apache.log4j.Logger;
3636

3737
import com.cloud.dc.DedicatedResourceVO;

plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ListDedicatedPodsCmd.java renamed to plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedPodsCmd.java

Lines changed: 3 additions & 3 deletions
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 org.apache.cloudstack.dedicated.api.commands;
17+
package org.apache.cloudstack.api.commands;
1818

1919
import java.util.ArrayList;
2020
import java.util.List;
@@ -30,8 +30,8 @@
3030
import org.apache.cloudstack.api.response.DomainResponse;
3131
import org.apache.cloudstack.api.response.ListResponse;
3232
import org.apache.cloudstack.api.response.PodResponse;
33-
import org.apache.cloudstack.dedicated.api.response.DedicatePodResponse;
34-
import org.apache.cloudstack.dedicated.services.DedicatedService;
33+
import org.apache.cloudstack.api.response.DedicatePodResponse;
34+
import org.apache.cloudstack.dedicated.DedicatedService;
3535
import org.apache.log4j.Logger;
3636

3737
import com.cloud.dc.DedicatedResourceVO;

plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ListDedicatedZonesCmd.java renamed to plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ListDedicatedZonesCmd.java

Lines changed: 3 additions & 3 deletions
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 org.apache.cloudstack.dedicated.api.commands;
17+
package org.apache.cloudstack.api.commands;
1818

1919
import java.util.ArrayList;
2020
import java.util.List;
@@ -30,8 +30,8 @@
3030
import org.apache.cloudstack.api.response.DomainResponse;
3131
import org.apache.cloudstack.api.response.ListResponse;
3232
import org.apache.cloudstack.api.response.ZoneResponse;
33-
import org.apache.cloudstack.dedicated.api.response.DedicateZoneResponse;
34-
import org.apache.cloudstack.dedicated.services.DedicatedService;
33+
import org.apache.cloudstack.api.response.DedicateZoneResponse;
34+
import org.apache.cloudstack.dedicated.DedicatedService;
3535
import org.apache.log4j.Logger;
3636

3737
import com.cloud.dc.DedicatedResourceVO;

plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/api/commands/ReleaseDedicatedClusterCmd.java renamed to plugins/dedicated-resources/src/org/apache/cloudstack/api/commands/ReleaseDedicatedClusterCmd.java

Lines changed: 2 additions & 2 deletions
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 org.apache.cloudstack.dedicated.api.commands;
17+
package org.apache.cloudstack.api.commands;
1818

1919
import javax.inject.Inject;
2020

@@ -26,7 +26,7 @@
2626
import org.apache.cloudstack.api.ServerApiException;
2727
import org.apache.cloudstack.api.response.ClusterResponse;
2828
import org.apache.cloudstack.api.response.SuccessResponse;
29-
import org.apache.cloudstack.dedicated.services.DedicatedService;
29+
import org.apache.cloudstack.dedicated.DedicatedService;
3030
import org.apache.log4j.Logger;
3131

3232
import com.cloud.event.EventTypes;

0 commit comments

Comments
 (0)