cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject [4/4] git commit: Removed the Time Service now that we know how to use cxf
Date Fri, 07 Dec 2012 23:21:42 GMT
Removed the Time Service now that we know how to use 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/862dff7d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/862dff7d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/862dff7d

Branch: refs/heads/javelin
Commit: 862dff7d3795c9c357d27d068c3cadea074dc03c
Parents: 9375ea0
Author: Alex Huang <alex.huang@citrix.com>
Authored: Tue Nov 20 09:54:54 2012 -0800
Committer: Alex Huang <alex.huang@citrix.com>
Committed: Fri Dec 7 15:21:19 2012 -0800

----------------------------------------------------------------------
 .../org/apache/cloudstack/test/TimeService.java    |   49 ---------------
 engine/service/src/main/webapp/WEB-INF/beans.xml   |    2 +-
 2 files changed, 1 insertions(+), 50 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/862dff7d/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
deleted file mode 100755
index dc2d1c6..0000000
--- a/engine/service/src/main/java/org/apache/cloudstack/test/TimeService.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cloudstack.test;
-
-import java.util.Calendar;
-import java.util.Locale;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.springframework.format.datetime.DateFormatter;
-import org.springframework.stereotype.Service;
-
-@Service("timeService")
-@Path("/time")
-public class TimeService {
-
-    @GET @Produces("text/plain")
-    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();
-//    }
-
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/862dff7d/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 25d62f1..6f6cf3b 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.test" resourcePattern="**/*.jar"/>
+  <context:component-scan base-package="org.apache.cloudstack.test"/>
 
   <jaxrs:server id="restContainer" address="/">
     <jaxrs:serviceBeans>


Mime
View raw message