cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r638754 - in /cocoon/trunk/blocks/cocoon-it: pom.xml src/main/java/org/apache/cocoon/micro/it/DemoServlet.java src/main/java/org/apache/cocoon/micro/it/ParameterPassingMatcher.java
Date Wed, 19 Mar 2008 09:09:11 GMT
Author: reinhard
Date: Wed Mar 19 02:09:03 2008
New Revision: 638754

URL: http://svn.apache.org/viewvc?rev=638754&view=rev
Log:
- back to Java 1.4 :-(
- integrate cocoon-it into the build system of trunk

Modified:
    cocoon/trunk/blocks/cocoon-it/pom.xml
    cocoon/trunk/blocks/cocoon-it/src/main/java/org/apache/cocoon/micro/it/DemoServlet.java
    cocoon/trunk/blocks/cocoon-it/src/main/java/org/apache/cocoon/micro/it/ParameterPassingMatcher.java

Modified: cocoon/trunk/blocks/cocoon-it/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-it/pom.xml?rev=638754&r1=638753&r2=638754&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-it/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-it/pom.xml Wed Mar 19 02:09:03 2008
@@ -24,26 +24,25 @@
   <packaging>jar</packaging>
 
   <parent>
-    <artifactId>cocoon-micro</artifactId>
-    <groupId>org.apache.cocoon.micro</groupId>
-    <version>1-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <groupId>org.apache.cocoon</groupId>
+    <version>6-SNAPSHOT</version>
   </parent>
-  <name>Cocoon Micro: Integration Tests Block [jar]</name>
-  <artifactId>cocoon-micro-it-block</artifactId>
+  <name>Cocoon: Integration Tests Block</name>
+  <artifactId>cocoon-it</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <description>
-    Integration test suite for Micro Cocoon.
+    Integration test suite for Cocoon.
   </description>
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.cocoon.micro</groupId>
-      <artifactId>cocoon-micro-core</artifactId>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.cocoon.micro</groupId>
-      <artifactId>cocoon-micro-servlet-service-components</artifactId>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-servlet-service-components</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: cocoon/trunk/blocks/cocoon-it/src/main/java/org/apache/cocoon/micro/it/DemoServlet.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-it/src/main/java/org/apache/cocoon/micro/it/DemoServlet.java?rev=638754&r1=638753&r2=638754&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-it/src/main/java/org/apache/cocoon/micro/it/DemoServlet.java
(original)
+++ cocoon/trunk/blocks/cocoon-it/src/main/java/org/apache/cocoon/micro/it/DemoServlet.java
Wed Mar 19 02:09:03 2008
@@ -25,21 +25,20 @@
 import javax.servlet.http.HttpServletResponse;
 
 public class DemoServlet extends HttpServlet {
-    
-    private Map<String, String> storage;
-    
-    public void setStorage(Map<String, String> storage) {
+
+    private Map storage;
+
+    public void setStorage(Map storage) {
         this.storage = storage;
     }
-    
-    protected void doGet(HttpServletRequest req, HttpServletResponse resp)
-            throws ServletException, IOException {
+
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException,
IOException {
         String requestURI = req.getPathInfo();
         if ("/setCode".equals(requestURI)) {
             storage.put("code", req.getParameter("code"));
             resp.setStatus(HttpServletResponse.SC_OK);
         } else if ("/getCode".equals(requestURI)) {
-            resp.setStatus(Integer.valueOf((String)storage.get("code")));
+            resp.setStatus(Integer.parseInt(((String) storage.get("code"))));
         }
     }
 }

Modified: cocoon/trunk/blocks/cocoon-it/src/main/java/org/apache/cocoon/micro/it/ParameterPassingMatcher.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-it/src/main/java/org/apache/cocoon/micro/it/ParameterPassingMatcher.java?rev=638754&r1=638753&r2=638754&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-it/src/main/java/org/apache/cocoon/micro/it/ParameterPassingMatcher.java
(original)
+++ cocoon/trunk/blocks/cocoon-it/src/main/java/org/apache/cocoon/micro/it/ParameterPassingMatcher.java
Wed Mar 19 02:09:03 2008
@@ -26,10 +26,10 @@
 public class ParameterPassingMatcher implements Matcher {
 
     public Map match(String pattern, Map objectModel, Parameters parameters) throws PatternException
{
-        if("empty".equals(pattern)) {
+        if ("empty".equals(pattern)) {
             return null;
         }
-        Map<String, Object> returnMap = new HashMap<String, Object>();
+        Map returnMap = new HashMap();
         returnMap.put("param1", "simple");
         return returnMap;
     }



Mime
View raw message