apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changes to deploy cxf

Browse Source
This commit is contained in:
Alex Huang 2012-11-19 16:53:09 -08:00
parent bd17d35adb
commit bcff47d4b0
5 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceEntity.java
View File

@ -38,7 +38,7 @@ public interface DataCenterResourceEntity extends CloudStackEntity, StateObject<
public enum State { 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."), 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."), 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; String _description;

1
engine/api/src/org/apache/cloudstack/engine/service/api/OrchestrationService.java
View File

@ -54,6 +54,7 @@ public interface OrchestrationService {
* @return VirtualMachineEntity * @return VirtualMachineEntity
*/ */
@POST @POST
@Path("/createvm")
VirtualMachineEntity createVirtualMachine( VirtualMachineEntity createVirtualMachine(
@QueryParam("id") String id, @QueryParam("id") String id,
@QueryParam("owner") String owner, @QueryParam("owner") String owner,

7
engine/service/src/main/java/org/apache/cloudstack/test/TimeService.java
View File

@ -38,5 +38,12 @@ public class TimeService {
DateFormatter formatter = new DateFormatter("dd/MM/yyyy hh:mm:ss"); DateFormatter formatter = new DateFormatter("dd/MM/yyyy hh:mm:ss");
return formatter.print(Calendar.getInstance().getTime(), Locale.getDefault()); return formatter.print(Calendar.getInstance().getTime(), Locale.getDefault());
} }
//
// @GET @Produces("text/plain")
// public ZoneEntity getZoneEntity() {
// return new ZoneEntityImpl();
// }
} }

4
engine/service/src/main/webapp/WEB-INF/beans.xml
View File

@ -10,11 +10,11 @@
<import resource="classpath:META-INF/cxf/cxf.xml" /> <import resource="classpath:META-INF/cxf/cxf.xml" />
<import resource="classpath:META-INF/cxf/cxf-servlet.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:server id="restContainer" address="/">
<jaxrs:serviceBeans> <jaxrs:serviceBeans>
<ref bean="provisioningService"/> <ref bean="timeService" />
</jaxrs:serviceBeans> </jaxrs:serviceBeans>
</jaxrs:server> </jaxrs:server>
</beans> </beans>

3
engine/service/src/main/webapp/WEB-INF/web.xml
View File

@ -12,6 +12,9 @@
org.springframework.web.context.ContextLoaderListener org.springframework.web.context.ContextLoaderListener
</listener-class> </listener-class>
</listener> </listener>
<listener>
<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
</listener>
<servlet> <servlet>
<servlet-name>CXFServlet</servlet-name> <servlet-name>CXFServlet</servlet-name>
<display-name>CXF Servlet</display-name> <display-name>CXF Servlet</display-name>