Changes to deploy cxf

Alex Huang · Alex Huang · commit bcff47d4b0df · 2012-11-19T16:53:22.000-08:00
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
@@ -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;
 
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
@@ -54,6 +54,7 @@ public interface OrchestrationService {
      * @return VirtualMachineEntity
      */
     @POST
+    @Path("/createvm")
     VirtualMachineEntity createVirtualMachine(
             @QueryParam("id") String id,
             @QueryParam("owner") String owner,            
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
@@ -38,5 +38,12 @@ public String getDateTime()
         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();
+//    }
+
 }
 
diff --git 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>
diff --git 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>

Original file line number	Diff line number	Diff line change
`@@ -38,5 +38,12 @@ public String getDateTime()`
`38`	`38`	`DateFormatter formatter = new DateFormatter("dd/MM/yyyy hh:mm:ss");`
`39`	`39`	`return formatter.print(Calendar.getInstance().getTime(), Locale.getDefault());`
`40`	`40`	`}`
	`41`	`+`
	`42`	`+//`
	`43`	`+// @GET @Produces("text/plain")`
	`44`	`+// public ZoneEntity getZoneEntity() {`
	`45`	`+// return new ZoneEntityImpl();`
	`46`	`+// }`
	`47`	`+`
`41`	`48`	`}`
`42`	`49`