Updated Branches: refs/heads/javelin e936c32a0 -> c622bee1e
made changes to work with the new injection stuff Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c622bee1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c622bee1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c622bee1 Branch: refs/heads/javelin Commit: c622bee1ed40717454fcebf228f9cbc0fe39c45d Parents: e936c32 Author: Alex Huang <[email protected]> Authored: Fri Dec 28 16:44:26 2012 -0800 Committer: Alex Huang <[email protected]> Committed: Fri Dec 28 16:44:26 2012 -0800 ---------------------------------------------------------------------- .../engine/service/api/ProvisioningService.java | 10 ----- .../datacenter/entity/api/ZoneEntityImpl.java | 3 -- .../service/api/ProvisioningServiceImpl.java | 2 - engine/service/src/main/webapp/WEB-INF/beans.xml | 28 ++++++++++++++- 4 files changed, 27 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c622bee1/engine/api/src/org/apache/cloudstack/engine/service/api/ProvisioningService.java ---------------------------------------------------------------------- diff --git a/engine/api/src/org/apache/cloudstack/engine/service/api/ProvisioningService.java b/engine/api/src/org/apache/cloudstack/engine/service/api/ProvisioningService.java index fc1d8dc..c2696bf 100755 --- a/engine/api/src/org/apache/cloudstack/engine/service/api/ProvisioningService.java +++ b/engine/api/src/org/apache/cloudstack/engine/service/api/ProvisioningService.java @@ -21,10 +21,6 @@ package org.apache.cloudstack.engine.service.api; import java.util.List; import java.util.Map; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; - import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntity; import org.apache.cloudstack.engine.datacenter.entity.api.PodEntity; import org.apache.cloudstack.engine.datacenter.entity.api.StorageEntity; @@ -39,8 +35,6 @@ import com.cloud.storage.StoragePool; * ProvisioningService registers and deregisters physical and virtual * resources that the management server can use. */ -@Path("/provisioning") -@Produces({"application/json"}) public interface ProvisioningService { StorageEntity registerStorage(String name, List<String> tags, Map<String, String> details); @@ -67,15 +61,11 @@ public interface ProvisioningService { List<Host> listHosts(); - @GET - @Path("/zone/{zoneid}/pods") List<PodEntity> listPods(); List<ZoneEntity> listZones(); List<StoragePool> listStorage(); - @GET - @Path("/{zoneid}") ZoneEntity getZone(String id); } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c622bee1/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java index cd3898c..71c1f25 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java @@ -24,10 +24,7 @@ import java.util.Date; import java.util.List; import java.util.Map; -import org.springframework.stereotype.Service; - -@Service("zoneService") public class ZoneEntityImpl implements ZoneEntity { String _id; String _name; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c622bee1/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java index f9a4ddf..2abceb8 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java @@ -29,14 +29,12 @@ import org.apache.cloudstack.engine.datacenter.entity.api.StorageEntity; import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntity; import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntityImpl; import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; import com.cloud.host.Host; import com.cloud.host.Status; import com.cloud.storage.StoragePool; @Component -@Service("provisioningService") public class ProvisioningServiceImpl implements ProvisioningService { @Override http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c622bee1/engine/service/src/main/webapp/WEB-INF/beans.xml ---------------------------------------------------------------------- diff --git a/engine/service/src/main/webapp/WEB-INF/beans.xml b/engine/service/src/main/webapp/WEB-INF/beans.xml index 4e3a255..4d20638 100755 --- a/engine/service/src/main/webapp/WEB-INF/beans.xml +++ b/engine/service/src/main/webapp/WEB-INF/beans.xml @@ -10,7 +10,7 @@ <import resource="classpath:META-INF/cxf/cxf.xml" /> <import resource="classpath:META-INF/cxf/cxf-servlet.xml" /> - <context:component-scan base-package="org.apache.cloudstack.engine.rest.service" /> + <context:component-scan base-package="org.apache.cloudstack" /> <jaxrs:server id="EngineService" address="/"> <jaxrs:serviceBeans> @@ -24,4 +24,30 @@ <bean class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider" /> </jaxrs:providers> </jaxrs:server> + + <bean id="onwireRegistry" class="org.apache.cloudstack.framework.serializer.OnwireClassRegistry" + init-method="scan" > + <property name="packages"> + <list> + <value>org.apache.cloudstack.framework</value> + </list> + </property> + </bean> + + <bean id="messageSerializer" class="org.apache.cloudstack.framework.serializer.JsonMessageSerializer"> + <property name="onwireClassRegistry" ref="onwireRegistry" /> + </bean> + + <bean id="transportProvider" class="org.apache.cloudstack.framework.server.ServerTransportProvider" init-method="initialize"> + <property name="workerPoolSize" value="5" /> + <property name="nodeId" value="Node1" /> + <property name="messageSerializer" ref="messageSerializer" /> + </bean> + + <bean id="rpcProvider" class="org.apache.cloudstack.framework.rpc.RpcProviderImpl" init-method="initialize"> + <constructor-arg ref="transportProvider" /> + <property name="messageSerializer" ref="messageSerializer" /> + </bean> + + <bean id="eventBus" class = "org.apache.cloudstack.framework.eventbus.EventBusBase" /> </beans>
