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 6752abe1233..1a331e3a5f9 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;
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 0bb256da726..4231914cb35 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,
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 817db59afe1..dc2d1c65ea8 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();
+// }
+
}
diff --git a/engine/service/src/main/webapp/WEB-INF/beans.xml b/engine/service/src/main/webapp/WEB-INF/beans.xml
index 28b7d6b41bf..25d62f127e0 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 @@
-
+
-
+
diff --git a/engine/service/src/main/webapp/WEB-INF/web.xml b/engine/service/src/main/webapp/WEB-INF/web.xml
index a89e6ed4c9d..7a3f1520bc3 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
+
+ org.springframework.web.util.Log4jConfigListener
+
CXFServlet
CXF Servlet