[jboss-svn-commits] JBL Code SVN: r25783 - in labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src: main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/mapping and 2 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Mar 23 05:27:56 EDT 2009 

Author: lkrzyzanek
Date: 2009-03-23 05:27:56 -0400 (Mon, 23 Mar 2009)
New Revision: 25783

Modified:
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/DuplicateDocument.java
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/NavigationAction.java
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/mapping/HFURLMapping.java
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/web/navigation.ftl
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/struts/mapping/HFURLMappingTest.java
Log:
added urlSuffix for duplicate articles - for actions such as edit, versioin etc.

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/DuplicateDocument.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/DuplicateDocument.java	2009-03-23 08:22:30 UTC (rev 25782)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/DuplicateDocument.java	2009-03-23 09:27:56 UTC (rev 25783)
@@ -38,6 +38,8 @@
 
   private String documentID;
 
+  private String urlSuffix;
+
   private String subject;
 
   private List<Community> communities;
@@ -96,4 +98,12 @@
         "subject", this.subject).toString();
   }
 
+  public void setUrlSuffix(String urlSuffix) {
+    this.urlSuffix = urlSuffix;
+  }
+
+  public String getUrlSuffix() {
+    return urlSuffix;
+  }
+
 }

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/NavigationAction.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/NavigationAction.java	2009-03-23 08:22:30 UTC (rev 25782)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/NavigationAction.java	2009-03-23 09:27:56 UTC (rev 25783)
@@ -35,7 +35,6 @@
 import com.jivesoftware.community.Document;
 import com.jivesoftware.community.DocumentManager;
 import com.jivesoftware.community.DocumentObjectNotFoundException;
-import com.jivesoftware.community.JiveIterator;
 import com.jivesoftware.community.action.JiveActionSupport;
 
 /**
@@ -48,6 +47,8 @@
 
   List<String> docIds;
 
+  String urlSuffix;
+
   List<DuplicateDocument> documents = new ArrayList<DuplicateDocument>();
 
   protected DocumentManager documentManager;
@@ -63,6 +64,7 @@
         DuplicateDocument dupDoc = new DuplicateDocument();
         dupDoc.setDocumentID(doc.getDocumentID());
         dupDoc.setSubject(doc.getSubject());
+        dupDoc.setUrlSuffix(urlSuffix);
 
         dupDoc.setCommunities(getCommunities(doc));
 
@@ -121,4 +123,11 @@
     this.communityManager = communityManager;
   }
 
+  public String getUrlSuffix() {
+    return urlSuffix;
+  }
+
+  public void setUrlSuffix(String urlSuffix) {
+    this.urlSuffix = urlSuffix;
+  }
 }

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/mapping/HFURLMapping.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/mapping/HFURLMapping.java	2009-03-23 08:22:30 UTC (rev 25782)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/mapping/HFURLMapping.java	2009-03-23 09:27:56 UTC (rev 25783)
@@ -112,6 +112,14 @@
           for (int i = 0; i < documentIDs.size(); i++) {
             params.put("docIds[" + i + "]", documentIDs.get(i));
           }
+          StringBuilder suffix = new StringBuilder();
+          for (int i = 3; i < uriElements.length; i++) {
+            suffix.append(uriElements[i]);
+            if (i + 1 < uriElements.length) {
+              suffix.append('/');
+            }
+          }
+          params.put("urlSuffix", suffix.toString());
           uri = DOC_MORE_THAN_ONE;
         }
       }

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/web/navigation.ftl
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/web/navigation.ftl	2009-03-23 08:22:30 UTC (rev 25782)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/web/navigation.ftl	2009-03-23 09:27:56 UTC (rev 25783)
@@ -33,7 +33,7 @@
                   Beware - when it's enabled HF URL links then s.url tag with "/docs/..." value modify to HF URL back.
                   We need to avoid HF URL link now
                  -->
-                <a href="<@s.url value='/' includeParams='none' />docs/${doc.documentID}">
+                <a href="<@s.url value='/' includeParams='none' />docs/${doc.documentID}<#if  doc.urlSuffix?exists && "" != doc.urlSuffix?trim>/${doc.urlSuffix}</#if>">
                 <#list doc.communities as comm>
                   ${comm.name} &gt;
                 </#list>

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/struts/mapping/HFURLMappingTest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/struts/mapping/HFURLMappingTest.java	2009-03-23 08:22:30 UTC (rev 25782)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/struts/mapping/HFURLMappingTest.java	2009-03-23 09:27:56 UTC (rev 25783)
@@ -126,6 +126,16 @@
         .convertHFURL2StandardURL("/doc/duplicate", duplicateParams));
     assertEquals(DOC1, duplicateParams.get("docIds[0]"));
     assertEquals(DOC2, duplicateParams.get("docIds[1]"));
+
+    duplicateParams = new HashMap<String, String>();
+    assertEquals(HFURLMapping.DOC_MORE_THAN_ONE, actionMapping
+        .convertHFURL2StandardURL("/doc/duplicate/edit", duplicateParams));
+    assertEquals("edit", duplicateParams.get("urlSuffix"));
+    
+    duplicateParams = new HashMap<String, String>();
+    assertEquals(HFURLMapping.DOC_MORE_THAN_ONE, actionMapping
+        .convertHFURL2StandardURL("/doc/duplicate/version/1", duplicateParams));
+    assertEquals("version/1", duplicateParams.get("urlSuffix"));
   }
 
 }

More information about the jboss-svn-commits mailing list