Updated Branches: refs/heads/javelin 6866613af -> bcff47d4b
Changes to deploy cxf Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/bcff47d4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/bcff47d4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/bcff47d4 Branch: refs/heads/javelin Commit: bcff47d4b0df39efebd5a88434ef57ab47b8d901 Parents: bd17d35 Author: Alex Huang <[email protected]> Authored: Mon Nov 19 16:53:09 2012 -0800 Committer: Alex Huang <[email protected]> Committed: Mon Nov 19 16:53:22 2012 -0800 ---------------------------------------------------------------------- .../entity/api/DataCenterResourceEntity.java | 2 +- .../engine/service/api/OrchestrationService.java | 1 + .../org/apache/cloudstack/test/TimeService.java | 7 +++++++ engine/service/src/main/webapp/WEB-INF/beans.xml | 4 ++-- engine/service/src/main/webapp/WEB-INF/web.xml | 3 +++ 5 files changed, 14 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bcff47d4/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java ---------------------------------------------------------------------- diff --git a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java index 6752abe..1a331e3 100755 --- a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java +++ b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java @@ -38,7 +38,7 @@ public interface DataCenterResourceEntity extends CloudStackEntity, StateObject< public enum State { Disabled("The resource is disabled so CloudStack should not use it. This is the initial state of all resources added to CloudStack."), Enabled("The resource is now enabled for CloudStack to use."), - Deactivated("The resource is disactivated so CloudStack should not use it for new resource needs."); + Deactivated("The resource is deactivated so CloudStack should not use it for new resource needs."); String _description; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bcff47d4/engine/api/src/org/apache/cloudstack/engine/service/api/OrchestrationService.java ---------------------------------------------------------------------- diff --git a/engine/api/src/org/apache/cloudstack/engine/service/api/OrchestrationService.java b/engine/api/src/org/apache/cloudstack/engine/service/api/OrchestrationService.java index 0bb256d..4231914 100755 --- a/engine/api/src/org/apache/cloudstack/engine/service/api/OrchestrationService.java +++ b/engine/api/src/org/apache/cloudstack/engine/service/api/OrchestrationService.java @@ -54,6 +54,7 @@ public interface OrchestrationService { * @return VirtualMachineEntity */ @POST + @Path("/createvm") VirtualMachineEntity createVirtualMachine( @QueryParam("id") String id, @QueryParam("owner") String owner, http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bcff47d4/engine/service/src/main/java/org/apache/cloudstack/test/TimeService.java ---------------------------------------------------------------------- diff --git a/engine/service/src/main/java/org/apache/cloudstack/test/TimeService.java b/engine/service/src/main/java/org/apache/cloudstack/test/TimeService.java index 817db59..dc2d1c6 100755 --- a/engine/service/src/main/java/org/apache/cloudstack/test/TimeService.java +++ b/engine/service/src/main/java/org/apache/cloudstack/test/TimeService.java @@ -38,5 +38,12 @@ public class TimeService { DateFormatter formatter = new DateFormatter("dd/MM/yyyy hh:mm:ss"); return formatter.print(Calendar.getInstance().getTime(), Locale.getDefault()); } + +// +// @GET @Produces("text/plain") +// public ZoneEntity getZoneEntity() { +// return new ZoneEntityImpl(); +// } + } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bcff47d4/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 28b7d6b..25d62f1 100755 --- a/engine/service/src/main/webapp/WEB-INF/beans.xml +++ b/engine/service/src/main/webapp/WEB-INF/beans.xml @@ -10,11 +10,11 @@ <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.service.api" /> + <context:component-scan base-package="org.apache.cloudstack.test" resourcePattern="**/*.jar"/> <jaxrs:server id="restContainer" address="/"> <jaxrs:serviceBeans> - <ref bean="provisioningService"/> + <ref bean="timeService" /> </jaxrs:serviceBeans> </jaxrs:server> </beans> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bcff47d4/engine/service/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/engine/service/src/main/webapp/WEB-INF/web.xml b/engine/service/src/main/webapp/WEB-INF/web.xml index a89e6ed..7a3f152 100644 --- a/engine/service/src/main/webapp/WEB-INF/web.xml +++ b/engine/service/src/main/webapp/WEB-INF/web.xml @@ -12,6 +12,9 @@ org.springframework.web.context.ContextLoaderListener </listener-class> </listener> + <listener> + <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class> + </listener> <servlet> <servlet-name>CXFServlet</servlet-name> <display-name>CXF Servlet</display-name>
