[jboss-svn-commits] JBL Code SVN: r25784 - in labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src: main/java/org/jboss/labs/clearspace/plugin/hfurl/struts and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Mar 23 06:42:03 EDT 2009
Author: lkrzyzanek
Date: 2009-03-23 06:42:02 -0400 (Mon, 23 Mar 2009)
New Revision: 25784
Modified:
labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManager.java
labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/HFURLManager.java
labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/ReindexHfURLAction.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/main/resources/plugin_i18n.properties
labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/resources/struts.xml
labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/struts/mapping/HFURLMappingTest.java
Log:
added enable/disable function to Administration
Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManager.java 2009-03-23 09:27:56 UTC (rev 25783)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManager.java 2009-03-23 10:42:02 UTC (rev 25784)
@@ -35,6 +35,7 @@
import com.jivesoftware.community.Document;
import com.jivesoftware.community.DocumentState;
+import com.jivesoftware.community.JiveGlobals;
import com.jivesoftware.community.cache.Cache;
import com.jivesoftware.community.event.DocumentEvent;
import com.jivesoftware.community.event.DocumentListener;
@@ -64,6 +65,16 @@
return hfURLDAO.getIndexedURLsCount();
}
+ public boolean isHFLinksEnabled() {
+ return JiveGlobals.getJiveBooleanProperty(HFURLPlugin.HFURL_ENABLED_KEY);
+ }
+
+ public void setHFLinksEnabled(boolean enabled) {
+ JiveGlobals.setJiveProperty(HFURLPlugin.HFURL_ENABLED_KEY, Boolean
+ .toString(enabled));
+
+ }
+
public static String createHFURLTitle(String documentTitle) {
if (log.isDebugEnabled()) {
log.debug("createHFURLTitle from doc title: " + documentTitle);
Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/HFURLManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/HFURLManager.java 2009-03-23 09:27:56 UTC (rev 25783)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/HFURLManager.java 2009-03-23 10:42:02 UTC (rev 25784)
@@ -33,6 +33,21 @@
public interface HFURLManager {
/**
+ * Get status of Human friendly links
+ *
+ * @return true if HF links are enabled, otherwise false
+ */
+ public boolean isHFLinksEnabled();
+
+ /**
+ * Set if HF links are enabled or disabled
+ *
+ * @param enabled
+ * true if HF links are enabled, false if disabled
+ */
+ public void setHFLinksEnabled(boolean enabled);
+
+ /**
* Get count of indexed URLs
*
* @return
Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/ReindexHfURLAction.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/ReindexHfURLAction.java 2009-03-23 09:27:56 UTC (rev 25783)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/ReindexHfURLAction.java 2009-03-23 10:42:02 UTC (rev 25784)
@@ -38,8 +38,11 @@
private HFURLManager hfURLManager;
+ private boolean enabled;
+
public void prepare() {
indexedURLs = hfURLManager.getIndexedURLsCount();
+ enabled = hfURLManager.isHFLinksEnabled();
}
@Override
@@ -47,11 +50,28 @@
hfURLManager.updateIndex();
addActionMessage(getText("plugin.hfurl.admin.hf-urls.reindex.text.sucess"));
-
+
prepare();
return SUCCESS;
}
+ public String enable() {
+ changeEnabled(true);
+ addActionMessage(getText("plugin.hfurl.admin.hf-urls.enabled.text.enabled.sucess"));
+ return SUCCESS;
+ }
+
+ public String disable() {
+ changeEnabled(false);
+ addActionMessage(getText("plugin.hfurl.admin.hf-urls.enabled.text.disabled.sucess"));
+ return SUCCESS;
+ }
+
+ protected void changeEnabled(boolean status) {
+ hfURLManager.setHFLinksEnabled(status);
+ prepare();
+ }
+
public void setHfURLManager(HFURLManager hfURLManager) {
this.hfURLManager = hfURLManager;
}
@@ -64,4 +84,12 @@
return indexedURLs;
}
+ public void setEnabled(boolean enabled) {
+ this.enabled = enabled;
+ }
+
+ public boolean isEnabled() {
+ return enabled;
+ }
+
}
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-23 09:27:56 UTC (rev 25783)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/struts/components/HFURLComponent.java 2009-03-23 10:42:02 UTC (rev 25784)
@@ -33,10 +33,8 @@
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;
/**
@@ -58,9 +56,7 @@
@Override
public boolean end(Writer writer, String body) {
- boolean hfURLEnabled = JiveGlobals
- .getJiveBooleanProperty(HFURLPlugin.HFURL_ENABLED_KEY);
- if (!hfURLEnabled) {
+ if (!hfURLManager.isHFLinksEnabled()) {
return super.end(writer, body);
}
Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/resources/plugin_i18n.properties
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/resources/plugin_i18n.properties 2009-03-23 09:27:56 UTC (rev 25783)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/resources/plugin_i18n.properties 2009-03-23 10:42:02 UTC (rev 25784)
@@ -6,6 +6,13 @@
plugin.hfurl.admin.hf-urls.reindex.submit=Update index
plugin.hfurl.admin.hf-urls.reindex.text.sucess=Index was sucessfuly updated
+plugin.hfurl.admin.hf-urls.enabled.description=Enable or disable human friendly links
+plugin.hfurl.admin.hf-urls.enabled.status.change2enabled=Enable
+plugin.hfurl.admin.hf-urls.enabled.status.change2disabled=Disable
+plugin.hfurl.admin.hf-urls.enabled.text.enabled.sucess=Human friendly links was sucessfuly enabled.
+plugin.hfurl.admin.hf-urls.enabled.text.disabled.sucess=Human friendly links was sucessfuly disabled.
+
+
# Navigation
plugin.hfurl.navigation.name=Article navigation
plugin.hfurl.navigation.description=More then one document is matching to your request. Please choose which document did you mean.
Modified: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/resources/struts.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/resources/struts.xml 2009-03-23 09:27:56 UTC (rev 25783)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/resources/struts.xml 2009-03-23 10:42:02 UTC (rev 25784)
@@ -42,6 +42,28 @@
/plugins/human-friendly-urls/admin/human-friendly-urls.ftl
</result>
</action>
+
+ <action name="human-friendly-urls-enable"
+ class="org.jboss.labs.clearspace.plugin.hfurl.struts.ReindexHfURLAction" method="enable">
+ <result name="input" type="freemarker">
+ /plugins/human-friendly-urls/admin/human-friendly-urls.ftl
+ </result>
+ <result name="success" type="freemarker">
+ /plugins/human-friendly-urls/admin/human-friendly-urls.ftl
+ </result>
+ </action>
+
+ <action name="human-friendly-urls-disable"
+ class="org.jboss.labs.clearspace.plugin.hfurl.struts.ReindexHfURLAction" method="disable">
+ <result name="input" type="freemarker">
+ /plugins/human-friendly-urls/admin/human-friendly-urls.ftl
+ </result>
+ <result name="success" type="freemarker">
+ /plugins/human-friendly-urls/admin/human-friendly-urls.ftl
+ </result>
+ </action>
+
+
</package>
</struts>
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 09:27:56 UTC (rev 25783)
+++ 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 10:42:02 UTC (rev 25784)
@@ -50,6 +50,13 @@
public void setupHFURLMapping() {
actionMapping = new HFURLMapping();
actionMapping.setHfURLManager(new HFURLManager() {
+ public boolean isHFLinksEnabled() {
+ return false;
+ }
+
+ public void setHFLinksEnabled(boolean enabled) {
+ }
+
public String getHfULRPrefix() {
return null;
}
@@ -131,7 +138,7 @@
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));
More information about the jboss-svn-commits
mailing list