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

[jboss-svn-commits at lists.jboss.org]

Author: lkrzyzanek
Date: 2009-03-20 08:37:48 -0400 (Fri, 20 Mar 2009)
New Revision: 25764

Modified:
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/HFURLPlugin.java
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/components/HFURLComponent.java
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/struts/components/HFURLComponentTest.java
Log:
added enabling/disabling functionality of HF URL links

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/HFURLPlugin.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/HFURLPlugin.java	2009-03-20 10:16:54 UTC (rev 25763)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/HFURLPlugin.java	2009-03-20 12:37:48 UTC (rev 25764)
@@ -26,6 +26,7 @@
 import org.jboss.labs.clearspace.plugin.hfurl.struts.mapping.HFURLMapping;
 
 import com.jivesoftware.base.plugin.Plugin;
+import com.jivesoftware.community.JiveGlobals;
 import com.jivesoftware.community.event.DocumentEventDispatcher;
 import com.jivesoftware.community.web.struts.JiveActionMapper;
 
@@ -51,7 +52,7 @@
    */
   private final String PLUGIN_NAME = "Human friendly URLs";
 
-  String hfURLPrefix;
+  public static final String HFURL_ENABLED_KEY = "hfurl.links.enabled";
 
   public void init() {
     log.debug("Init " + PLUGIN_NAME);
@@ -63,6 +64,11 @@
 
     DocumentEventDispatcher.getInstance().addListener(dbHFURLManager);
 
+    String enabledKey = JiveGlobals.getJiveProperty(HFURL_ENABLED_KEY);
+    if (enabledKey == null) {
+      JiveGlobals.setJiveProperty(HFURL_ENABLED_KEY, "false");
+    }
+
     log.debug("Initialize completed of plugin " + PLUGIN_NAME);
   }
 

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/components/HFURLComponent.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/components/HFURLComponent.java	2009-03-20 10:16:54 UTC (rev 25763)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/components/HFURLComponent.java	2009-03-20 12:37:48 UTC (rev 25764)
@@ -33,8 +33,10 @@
 import org.apache.struts2.StrutsException;
 import org.apache.struts2.components.URL;
 import org.jboss.labs.clearspace.plugin.hfurl.HFURLManager;
+import org.jboss.labs.clearspace.plugin.hfurl.HFURLPlugin;
 import org.springframework.dao.EmptyResultDataAccessException;
 
+import com.jivesoftware.community.JiveGlobals;
 import com.opensymphony.xwork2.util.ValueStack;
 
 /**
@@ -56,6 +58,12 @@
 
   @Override
   public boolean end(Writer writer, String body) {
+    final String hfURLEnabledStr = JiveGlobals.getJiveProperty(
+        HFURLPlugin.HFURL_ENABLED_KEY, "false");
+    if (!Boolean.parseBoolean(hfURLEnabledStr)) {
+      return super.end(writer, body);
+    }
+
     // write result of parent to String writer and then do modification
     Writer tempWriter = new StringWriter();
     boolean result = super.end(tempWriter, body);
@@ -102,11 +110,17 @@
    * @return document ID i.e. DOC-1234
    */
   protected static String getDocumentId(String url) {
+    log.trace("Test of question mark");
     final int questionMark = url.indexOf('?');
     if (questionMark != -1) {
       url = url.substring(0, questionMark);
     }
-
+    log.trace("Test of ;jsessionid");
+    final int jsessionid = url.indexOf(";jsessionid");
+    if (jsessionid != -1) {
+      url = url.substring(0, jsessionid);
+    }
+    log.trace("Test of .pdf");
     if (url.endsWith(".pdf")) {
       url = url.replace(".pdf", "");
     }

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/struts/components/HFURLComponentTest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/struts/components/HFURLComponentTest.java	2009-03-20 10:16:54 UTC (rev 25763)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/struts/components/HFURLComponentTest.java	2009-03-20 12:37:48 UTC (rev 25764)
@@ -41,7 +41,9 @@
 
     assertEquals("DOC-1234", HFURLComponent.getDocumentId("/community/docs/DOC-1234?decorator=print"));
     assertEquals("DOC-1234", HFURLComponent.getDocumentId("/community/docs/DOC-1234/edit?decorator=print"));
-    
+
+    assertEquals("DOC-1234", HFURLComponent.getDocumentId("/community/docs/DOC-1234;jsessionid=4666CC84E4D942F30DA3A5C3142D1DA4"));
+
   }
 
 }