[jboss-svn-commits] JBL Code SVN: r25737 - in labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src: main/resources and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Mar 19 11:19:00 EDT 2009
Author: lkrzyzanek
Date: 2009-03-19 11:19:00 -0400 (Thu, 19 Mar 2009)
New Revision: 25737
Removed:
labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/resources/plugin-settings.properties
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/HFURLPlugin.java
labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/struts/mapping/HFURLMappingTest.java
Log:
hf url mapping prefix moved to struts.xml from properties.
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-19 15:14:46 UTC (rev 25736)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/DbHFURLManager.java 2009-03-19 15:19:00 UTC (rev 25737)
@@ -58,6 +58,8 @@
private HFURLDAO hfURLDAO;
+ private String hfULRPrefix;
+
public long getIndexedURLsCount() {
return hfURLDAO.getIndexedURLsCount();
}
@@ -96,6 +98,16 @@
hfURLCache.clear();
}
+ public String getHfURLTitle(String documentID) throws EmptyResultDataAccessException {
+ String hfURLTitle = hfURLCache.get(documentID);
+ if (hfURLTitle == null) {
+ HFURLBean bean = hfURLDAO.getByDocumentId(documentID);
+ hfURLTitle = bean.getHfTitle();
+ hfURLCache.put(documentID, hfURLTitle);
+ }
+ return hfURLTitle;
+ }
+
public List<String> getDocumentID(String hfURLTitle) {
List<String> docIds = new ArrayList<String>();
if (hfURLCache.containsValue(hfURLTitle)) {
@@ -248,4 +260,12 @@
this.hfURLCache = hfURLCache;
}
+ public void setHfULRPrefix(String hfULRPrefix) {
+ this.hfULRPrefix = hfULRPrefix;
+ }
+
+ public String getHfULRPrefix() {
+ return hfULRPrefix;
+ }
+
}
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-19 15:14:46 UTC (rev 25736)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/HFURLManager.java 2009-03-19 15:19:00 UTC (rev 25737)
@@ -23,6 +23,8 @@
import java.util.List;
+import org.springframework.dao.EmptyResultDataAccessException;
+
/**
* Manager for handling with Human friendly URLs.
*
@@ -54,4 +56,20 @@
*/
public List<String> getDocumentID(String hfURLTitle);
+ /**
+ * Get HF URL Title for document ID
+ *
+ * @param documentID i.e. DOC-1234
+ * @return
+ * @throws EmptyResultDataAccessException if hf url title not found for given documentID
+ */
+ public String getHfURLTitle(String documentID) throws EmptyResultDataAccessException;
+
+ /**
+ * Prefix for HF URLs
+ *
+ * @return prefix for HF URL i.e. /wiki
+ */
+ public String getHfULRPrefix();
+
}
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-19 15:14:46 UTC (rev 25736)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/java/org/jboss/labs/clearspace/plugin/hfurl/HFURLPlugin.java 2009-03-19 15:19:00 UTC (rev 25737)
@@ -21,9 +21,6 @@
*/
package org.jboss.labs.clearspace.plugin.hfurl;
-import java.io.IOException;
-import java.util.Properties;
-
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.jboss.labs.clearspace.plugin.hfurl.struts.mapping.HFURLMapping;
@@ -54,20 +51,15 @@
*/
private final String PLUGIN_NAME = "Human friendly URLs";
- /**
- * HF URL Mapping prefix
- */
- private final String URL_MAPPING_PREFIX_KEY = "urlmapping.prefix";
+ String hfURLPrefix;
- private Properties pluginSettings = null;
-
public void init() {
log.debug("Init " + PLUGIN_NAME);
// cannot use urlmapping in plugin.xml - mapping class is not managed by
// spring
- String prefix = getSettings().getProperty(URL_MAPPING_PREFIX_KEY);
- JiveActionMapper.addURLMapping(prefix, hfURLMapping);
+ JiveActionMapper.addURLMapping(dbHFURLManager.getHfULRPrefix(),
+ hfURLMapping);
DocumentEventDispatcher.getInstance().addListener(dbHFURLManager);
@@ -77,26 +69,11 @@
public void destroy() {
DocumentEventDispatcher.getInstance().removeListener(dbHFURLManager);
- String prefix = getSettings().getProperty(URL_MAPPING_PREFIX_KEY);
- JiveActionMapper.removeURLMapping(prefix);
+ JiveActionMapper.removeURLMapping(dbHFURLManager.getHfULRPrefix());
log.debug(PLUGIN_NAME + " destroyed");
}
- private Properties getSettings() {
- if (pluginSettings == null) {
- pluginSettings = new Properties();
- try {
- pluginSettings.load(HFURLPlugin.class
- .getResourceAsStream("/plugin-settings.properties"));
- } catch (IOException e) {
- throw new RuntimeException(
- "Cannot get plugin-settings.properties for plugin: " + PLUGIN_NAME);
- }
- }
- return pluginSettings;
- }
-
public void setDbHFURLManager(DbHFURLManager dbHFURLManager) {
this.dbHFURLManager = dbHFURLManager;
}
Deleted: labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/resources/plugin-settings.properties
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/resources/plugin-settings.properties 2009-03-19 15:14:46 UTC (rev 25736)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/main/resources/plugin-settings.properties 2009-03-19 15:19:00 UTC (rev 25737)
@@ -1,4 +0,0 @@
-# Settings for HF URL plugin
-
-# Prefix for URL mapping of HF URLs
-urlmapping.prefix=/wiki
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-19 15:14:46 UTC (rev 25736)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-hfurl/src/test/java/org/jboss/labs/clearspace/plugin/hfurl/struts/mapping/HFURLMappingTest.java 2009-03-19 15:19:00 UTC (rev 25737)
@@ -31,6 +31,7 @@
import org.jboss.labs.clearspace.plugin.hfurl.HFURLManager;
import org.junit.Before;
import org.junit.Test;
+import org.springframework.dao.EmptyResultDataAccessException;
/**
* Tests of HFURLMapping
@@ -49,15 +50,19 @@
public void setupHFURLMapping() {
actionMapping = new HFURLMapping();
actionMapping.setHfURLManager(new HFURLManager() {
+ public String getHfULRPrefix() {
+ return null;
+ }
+ public String getHfURLTitle(String documentID)
+ throws EmptyResultDataAccessException {
+ return null;
+ }
+
public long getIndexedURLsCount() {
return 0;
}
- public String createHFURLTitle(String documentTitle) {
- return null;
- }
-
public void updateIndex() {
}
More information about the jboss-svn-commits
mailing list