cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r697077 - in /cocoon/cocoon3/trunk: cocoon-controller/src/main/java/org/apache/cocoon/controller/ cocoon-controller/src/main/java/org/apache/cocoon/controller/node/ cocoon-controller/src/main/java/org/apache/cocoon/corona/ cocoon-controller...
Date Fri, 19 Sep 2008 12:58:41 GMT
Author: reinhard
Date: Fri Sep 19 05:58:40 2008
New Revision: 697077

URL: http://svn.apache.org/viewvc?rev=697077&view=rev
Log:
Corona -> Cocoon3: REST

Added:
    cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/
    cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/Controller.java
  (contents, props changed)
      - copied, changed from r697071, cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/corona/controller/Controller.java
    cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/DemoControllerDispatcher.java
  (contents, props changed)
      - copied, changed from r697071, cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/corona/controller/DemoControllerDispatcher.java
    cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/SpringControllerComponent.java
  (contents, props changed)
      - copied, changed from r697071, cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/corona/controller/SpringControllerComponent.java
    cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/node/
  (props changed)
      - copied from r697071, cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/corona/controller/node/
Removed:
    cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/corona/
Modified:
    cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/node/CallNode.java
    cocoon/cocoon3/trunk/cocoon-controller/src/main/resources/META-INF/cocoon/spring/corona-controller.xml
    cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/corona/rest/controller/SpringRESTController.java
    cocoon/cocoon3/trunk/cocoon-rest/src/main/resources/META-INF/cocoon/spring/corona-rest.xml
    cocoon/cocoon3/trunk/parent/it.bat

Copied: cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/Controller.java
(from r697071, cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/corona/controller/Controller.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/Controller.java?p2=cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/Controller.java&p1=cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/corona/controller/Controller.java&r1=697071&r2=697077&rev=697077&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/corona/controller/Controller.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/Controller.java
Fri Sep 19 05:58:40 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.controller;
+package org.apache.cocoon.controller;
 
 import java.io.OutputStream;
 import java.util.Map;

Propchange: cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/Controller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/Controller.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/Controller.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/Controller.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/DemoControllerDispatcher.java
(from r697071, cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/corona/controller/DemoControllerDispatcher.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/DemoControllerDispatcher.java?p2=cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/DemoControllerDispatcher.java&p1=cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/corona/controller/DemoControllerDispatcher.java&r1=697071&r2=697077&rev=697077&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/corona/controller/DemoControllerDispatcher.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/DemoControllerDispatcher.java
Fri Sep 19 05:58:40 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.controller;
+package org.apache.cocoon.controller;
 
 import java.io.IOException;
 import java.io.InputStream;

Propchange: cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/DemoControllerDispatcher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/DemoControllerDispatcher.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/DemoControllerDispatcher.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/DemoControllerDispatcher.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/SpringControllerComponent.java
(from r697071, cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/corona/controller/SpringControllerComponent.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/SpringControllerComponent.java?p2=cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/SpringControllerComponent.java&p1=cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/corona/controller/SpringControllerComponent.java&r1=697071&r2=697077&rev=697077&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/corona/controller/SpringControllerComponent.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/SpringControllerComponent.java
Fri Sep 19 05:58:40 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.controller;
+package org.apache.cocoon.controller;
 
 import java.io.OutputStream;
 import java.util.Map;

Propchange: cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/SpringControllerComponent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/SpringControllerComponent.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/SpringControllerComponent.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/SpringControllerComponent.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Propchange: cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/node/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/node/CallNode.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/node/CallNode.java?rev=697077&r1=697071&r2=697077&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/node/CallNode.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/node/CallNode.java
Fri Sep 19 05:58:40 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.corona.controller.node;
+package org.apache.cocoon.controller.node;
 
 import java.util.HashMap;
 import java.util.Map;

Modified: cocoon/cocoon3/trunk/cocoon-controller/src/main/resources/META-INF/cocoon/spring/corona-controller.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-controller/src/main/resources/META-INF/cocoon/spring/corona-controller.xml?rev=697077&r1=697076&r2=697077&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-controller/src/main/resources/META-INF/cocoon/spring/corona-controller.xml
(original)
+++ cocoon/cocoon3/trunk/cocoon-controller/src/main/resources/META-INF/cocoon/spring/corona-controller.xml
Fri Sep 19 05:58:40 2008
@@ -21,8 +21,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-  <bean name="controller:default" class="org.apache.cocoon.corona.controller.SpringControllerComponent"
scope="prototype" />
+  <bean name="controller:default" class="org.apache.cocoon.controller.SpringControllerComponent"
scope="prototype" />
 
-  <bean name="org.apache.cocoon.corona.controller.Controller/demo" class="org.apache.cocoon.corona.controller.DemoControllerDispatcher"
scope="prototype" />
+  <bean name="org.apache.cocoon.controller.Controller/demo" class="org.apache.cocoon.controller.DemoControllerDispatcher"
scope="prototype" />
 
 </beans>

Modified: cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/corona/rest/controller/SpringRESTController.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/corona/rest/controller/SpringRESTController.java?rev=697077&r1=697076&r2=697077&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/corona/rest/controller/SpringRESTController.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-rest/src/main/java/org/apache/cocoon/corona/rest/controller/SpringRESTController.java
Fri Sep 19 05:58:40 2008
@@ -31,7 +31,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.cocoon.corona.controller.Controller;
+import org.apache.cocoon.controller.Controller;
 import org.apache.cocoon.corona.rest.controller.annotation.BaseURL;
 import org.apache.cocoon.corona.rest.controller.annotation.Inject;
 import org.apache.cocoon.corona.rest.controller.annotation.RESTController;

Modified: cocoon/cocoon3/trunk/cocoon-rest/src/main/resources/META-INF/cocoon/spring/corona-rest.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-rest/src/main/resources/META-INF/cocoon/spring/corona-rest.xml?rev=697077&r1=697076&r2=697077&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-rest/src/main/resources/META-INF/cocoon/spring/corona-rest.xml
(original)
+++ cocoon/cocoon3/trunk/cocoon-rest/src/main/resources/META-INF/cocoon/spring/corona-rest.xml
Fri Sep 19 05:58:40 2008
@@ -28,7 +28,7 @@
   ">
 
   <!-- The REST controller -->
-  <bean name="org.apache.cocoon.corona.controller.Controller/rest-controller" class="org.apache.cocoon.corona.rest.controller.SpringRESTController">
+  <bean name="org.apache.cocoon.controller.Controller/rest-controller" class="org.apache.cocoon.corona.rest.controller.SpringRESTController">
     <property name="methodDelegator" ref="org.apache.cocoon.corona.rest.controller.MethodDelegator"
/>
     <property name="annotationCollector" ref="org.apache.cocoon.corona.rest.forms.util.AnnotationCollector"
/>
   </bean>

Modified: cocoon/cocoon3/trunk/parent/it.bat
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/it.bat?rev=697077&r1=697076&r2=697077&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/it.bat (original)
+++ cocoon/cocoon3/trunk/parent/it.bat Fri Sep 19 05:58:40 2008
@@ -15,4 +15,5 @@
 REM  KIND, either express or implied.  See the License for the
 REM  specific language governing permissions and limitations
 REM  under the License.
+REM mvn clean install -P it,skip-buildnumber,coocoon-subprojects-snapshots -Dhtmlunit.base-url=http://localhost:8888
 mvn clean install -P it,skip-buildnumber -Dhtmlunit.base-url=http://localhost:8888
\ No newline at end of file



Mime
View raw message