[jboss-svn-commits] JBL Code SVN: r25985 - in labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk: src and 6 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Apr 8 09:11:29 EDT 2009 

Author: lkrzyzanek
Date: 2009-04-08 09:11:28 -0400 (Wed, 08 Apr 2009)
New Revision: 25985

Added:
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/changes/
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/changes/changes.xml
Modified:
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/pom.xml
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManager.java
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/NavigationAction.java
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/mapping/HFURLMapping.java
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/resources/plugin.xml
   labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManagerTest.java
Log:
Fixed bugs ORG-174 and ORG-175 (Deleting and restoring articles with duplicate title.
Added changes.xml
Version increased to 1.0.1


Property changes on: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk
___________________________________________________________________
Name: svn:ignore
   + target

.settings

.project

.classpath


Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/pom.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/pom.xml	2009-04-08 09:32:44 UTC (rev 25984)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/pom.xml	2009-04-08 13:11:28 UTC (rev 25985)
@@ -6,8 +6,8 @@
   <groupId>org.jboss.labs.clearspace.plugin</groupId>
   <artifactId>human-friendly-urls</artifactId>
   <name>Clearspace plugin: Human friendly URLs</name>
-  <description>Plugin offers human friendly URLs in CS</description>
-  <version>1.0.0</version>
+  <description>Plugin offers human friendly URLs in Clearspace</description>
+  <version>1.0.1</version>
 
   <parent>
     <groupId>org.jboss.labs</groupId>
@@ -108,4 +108,25 @@
       <url>http://maven.jivesoftware.com/archiva/repository/jive.snapshots/</url>
     </repository>
   </repositories>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-changes-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>changes-report</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>cobertura-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </reporting>
+
 </project>

Added: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/changes/changes.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/changes/changes.xml	                        (rev 0)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/changes/changes.xml	2009-04-08 13:11:28 UTC (rev 25985)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document xmlns="http://maven.apache.org/changes/1.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
+
+  <properties>
+    <title>Clearspace plugin: Human friendly URL</title>
+    <author email="lkrzyzan at redhat.com">Libor Krzyzanek</author>
+  </properties>
+
+  <body>
+
+    <release version="1.0.1" date="2009-??-??" description="Bug fix release">
+      <action type="fix" dev="lkrzyzan" date="2009-04-08">
+        <fixes issue="ORG-174" />
+        <fixes issue="ORG-175"/>
+      </action>
+    </release>
+
+    <release version="1.0.0" date="2009-04-01" description="Initial version" />
+
+  </body>
+
+</document>


Property changes on: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/changes/changes.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManager.java	2009-04-08 09:32:44 UTC (rev 25984)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManager.java	2009-04-08 13:11:28 UTC (rev 25985)
@@ -140,10 +140,15 @@
     if (!isHFLinksEnabled()) {
       return standardURL;
     }
-    
+
     String hfURL = standardURL;
     try {
-      if (standardURL != null && standardURL.contains(docIdURLPrefix + "/")) {
+      // fixed bug ORG-174 and ORG-175 for deleting and restoring the article -
+      // for these actions are standard URL returned.
+      if (standardURL != null && standardURL.contains(docIdURLPrefix + "/")
+          && !standardURL.contains("/delete")
+          && !standardURL.contains("/restore")) {
+
         final String documentId = getDocumentId(standardURL);
         final String hfTitle = getHfURLTitle(documentId);
         hfURL = standardURL.replaceFirst(docIdURLPrefix + "/" + documentId,

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/NavigationAction.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/NavigationAction.java	2009-04-08 09:32:44 UTC (rev 25984)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/NavigationAction.java	2009-04-08 13:11:28 UTC (rev 25985)
@@ -73,7 +73,7 @@
 
         documents.add(dupDoc);
       } catch (DocumentObjectNotFoundException e) {
-        log.error("Document not found for HF URL", e);
+        log.error("Document not found for duplicated HF URL.", e);
         // TODO Probably we can remove record from HF URL Map
       } catch (CommunityNotFoundException e) {
 

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/mapping/HFURLMapping.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/mapping/HFURLMapping.java	2009-04-08 09:32:44 UTC (rev 25984)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/mapping/HFURLMapping.java	2009-04-08 13:11:28 UTC (rev 25985)
@@ -49,6 +49,7 @@
 
   private HFURLManager hfURLManager;
 
+  @SuppressWarnings("unchecked")
   public void process(String uri, ActionMapping mapping) {
     Map<String, String> params = mapping.getParams();
     if (null == params) {

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/resources/plugin.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/resources/plugin.xml	2009-04-08 09:32:44 UTC (rev 25984)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/resources/plugin.xml	2009-04-08 13:11:28 UTC (rev 25985)
@@ -3,7 +3,7 @@
   <name>human-friendly-urls</name>
   <description>Plugin offers human friendly URLs for documents based on their title</description>
   <author>JBoss.org</author>
-  <version>1.0.0</version>
+  <version>1.0.1</version>
   <minServerVersion>2.5.0</minServerVersion>
 
   <!-- Plugin class -->

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManagerTest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManagerTest.java	2009-04-08 09:32:44 UTC (rev 25984)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManagerTest.java	2009-04-08 13:11:28 UTC (rev 25985)
@@ -47,6 +47,7 @@
 
   private Cache<String, String> hfURLCache;
 
+  @SuppressWarnings("unchecked")
   @Before
   public void setupHFURLManager() {
     hfURLManager = new DummyHFURLManager();
@@ -154,6 +155,16 @@
         .getHFURL("/docs/DOC-1234"));
     assertEquals("/wiki/documentwithfriendlyurl.pdf", hfURLManager
         .getHFURL("/docs/DOC-1234.pdf"));
+    assertEquals("/wiki/documentwithfriendlyurl/edit", hfURLManager
+        .getHFURL("/docs/DOC-1234/edit"));
+    assertEquals("/wiki/documentwithfriendlyurl?decorator=print", hfURLManager
+        .getHFURL("/docs/DOC-1234?decorator=print"));
+    
+    assertEquals("/docs/DOC-1234/delete", hfURLManager
+        .getHFURL("/docs/DOC-1234/delete"));
+    assertEquals("/docs/DOC-1234/restore", hfURLManager
+        .getHFURL("/docs/DOC-1234/restore"));
+    
   }
 
   @Test

More information about the jboss-svn-commits mailing list