[jboss-svn-commits] JBL Code SVN: r31487 - in labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main: plugin and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Feb 8 07:38:31 EST 2010
Author: lkrzyzanek
Date: 2010-02-08 07:38:31 -0500 (Mon, 08 Feb 2010)
New Revision: 31487
Modified:
labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/RedirectToHFURLAction.java
labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/plugin/plugin.xml
labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/plugin/spring.xml
labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/plugin/struts.xml
Log:
small changes to work with SBS 4. RedirectToHFULRAction now uses urlToRedirect instead of url parameter
Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/RedirectToHFURLAction.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/RedirectToHFURLAction.java 2010-02-08 11:52:42 UTC (rev 31486)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/RedirectToHFURLAction.java 2010-02-08 12:38:31 UTC (rev 31487)
@@ -21,6 +21,8 @@
*/
package org.jboss.labs.clearspace.plugin.hfurl.struts;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.jboss.labs.clearspace.plugin.hfurl.HFURLManager;
import com.jivesoftware.community.action.JiveActionSupport;
@@ -34,9 +36,14 @@
public class RedirectToHFURLAction extends JiveActionSupport {
/**
+ * URL parameter
+ */
+ private String url = null;
+
+ /**
* URL to redirect
*/
- private String url = null;
+ private String urlToRedirect = null;
/**
* Parameters from URLs
@@ -45,27 +52,25 @@
private HFURLManager hfURLManager;
- public static final String URL_NOT_DEFINED = "urlNotDefined";
+ public static final String URL_NOT_DEFINED_RESULT = "urlNotDefined";
- @Override
public String execute() {
if (url == null || url.trim().equals("")) {
- url = "/";
- return URL_NOT_DEFINED;
+ urlToRedirect = "/";
+ return URL_NOT_DEFINED_RESULT;
}
if (params != null && params.length() > 0) {
- url = url + "?" + params;
+ urlToRedirect = url + "?" + params;
}
- String urlToRedirect = hfURLManager.getHFURLUnique(url, true);
+ urlToRedirect = hfURLManager.getHFURLUnique(url, true);
if (url.equals(urlToRedirect)) {
- url = addParameter(urlToRedirect, "uniqueTitle=false");
- return INPUT;
+ urlToRedirect = addParameter(urlToRedirect, "uniqueTitle=false");
+ return "input";
} else {
- url = urlToRedirect;
- return SUCCESS;
+ return "success";
}
}
@@ -84,10 +89,6 @@
this.url = url;
}
- public String getUrl() {
- return url;
- }
-
public void setHfURLManager(HFURLManager hfURLManager) {
this.hfURLManager = hfURLManager;
}
@@ -100,4 +101,8 @@
return params;
}
+ public String getUrlToRedirect() {
+ return urlToRedirect;
+ }
+
}
Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/plugin/plugin.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/plugin/plugin.xml 2010-02-08 11:52:42 UTC (rev 31486)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/plugin/plugin.xml 2010-02-08 12:38:31 UTC (rev 31487)
@@ -22,9 +22,6 @@
<decorator name="default" page="default/template.ftl">
<pattern>/wiki*</pattern>
</decorator>
- <decorator name="doc-default" page="/template/decorator/default/template.ftl">
- <pattern>/wiki*</pattern>
- </decorator>
</sitemesh>
<databaseKey>humanFriendlyURL</databaseKey>
Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/plugin/spring.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/plugin/spring.xml 2010-02-08 11:52:42 UTC (rev 31486)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/plugin/spring.xml 2010-02-08 12:38:31 UTC (rev 31487)
@@ -6,7 +6,7 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
http://www.directwebremoting.org/schema/spring-dwr http://www.directwebremoting.org/schema/spring-dwr-2.0.xsd"
- default-autowire="byName" default-init-method="init" default-destroy-method="destroy">
+ default-autowire="no" default-init-method="init" default-destroy-method="destroy">
<bean id="hfURLPlugin" class="org.jboss.labs.clearspace.plugin.hfurl.HFURLPlugin">
<property name="dbHFURLManager" ref="hfURLManager" />
@@ -26,6 +26,8 @@
<bean id="hfURLManager" class="org.jboss.labs.clearspace.plugin.hfurl.DbHFURLManager">
<property name="hfURLCache" ref="hfURLCache" />
+ <property name="hfURLDAO" ref="hfURLDAO" />
+ <property name="documentManager" ref="documentManager" />
<property name="hfULRPrefix" value="/wiki" />
<property name="docIdURLPrefix" value="/docs" />
Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/plugin/struts.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/plugin/struts.xml 2010-02-08 11:52:42 UTC (rev 31486)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/trunk/src/main/plugin/struts.xml 2010-02-08 12:38:31 UTC (rev 31487)
@@ -25,12 +25,12 @@
class="org.jboss.labs.clearspace.plugin.hfurl.struts.RedirectToHFURLAction">
<result name="success" type="httpheader">
<param name="status">301</param>
- <param name="headers.Location">${url}</param>
+ <param name="headers.Location">${urlToRedirect}</param>
<param name="parse">true</param>
</result>
<result name="input" type="httpheader">
<param name="status">302</param>
- <param name="headers.Location">${url}</param>
+ <param name="headers.Location">${urlToRedirect}</param>
<param name="parse">true</param>
</result>
<result name="urlNotDefined" type="redirect">/</result>
More information about the jboss-svn-commits
mailing list