xlawrence 2005/04/25 16:45:56 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/blogs BlogPingListener.java
src/java/org/jahia/blogs/actions AbstractAction.java
BlogDefinitionNames.java
NewPostAction.java
Log:
Container Definitions names are now stored in a properties files
Revision Changes Path
1.1.2.5 +3 -1 jahia/src/java/org/jahia/blogs/BlogPingListener.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/blogs/BlogPingListener.java.diff?r1=1.1.2.4&r2=1.1.2.5&f=h
1.1.2.8 +1 -1
jahia/src/java/org/jahia/blogs/actions/AbstractAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/blogs/actions/AbstractAction.java.diff?r1=1.1.2.7&r2=1.1.2.8&f=h
1.1.2.6 +55 -21
jahia/src/java/org/jahia/blogs/actions/BlogDefinitionNames.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/blogs/actions/BlogDefinitionNames.java.diff?r1=1.1.2.5&r2=1.1.2.6&f=h
1.1.2.12 +6 -0 jahia/src/java/org/jahia/blogs/actions/NewPostAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/blogs/actions/NewPostAction.java.diff?r1=1.1.2.11&r2=1.1.2.12&f=h
Index: BlogPingListener.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/blogs/Attic/BlogPingListener.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- BlogPingListener.java 25 Apr 2005 08:34:47 -0000 1.1.2.4
+++ BlogPingListener.java 25 Apr 2005 14:45:55 -0000 1.1.2.5
@@ -81,7 +81,7 @@
// log4j logger
static Logger log = Logger.getLogger(BlogPingListener.class);
- static BlogDefinitionNames containerNames = new BlogDefinitionNames();
+ private BlogDefinitionNames containerNames;
/**
* Sends a ping
@@ -92,6 +92,8 @@
try {
if
(source.getDefinition().getName().equals(containerNames.getValue(
containerNames.BLOG_TB_PING_LIST))) {
+
+ containerNames = new BlogDefinitionNames(je.getParams());
// send a ping
String[] res = preparePingData(je);
Index: AbstractAction.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/blogs/actions/Attic/AbstractAction.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- AbstractAction.java 22 Apr 2005 12:56:52 -0000 1.1.2.7
+++ AbstractAction.java 25 Apr 2005 14:45:55 -0000 1.1.2.8
@@ -147,7 +147,7 @@
ParamBean.GET_METHOD);
// Load the container definition names from the Porpeties file
- containerNames = new BlogDefinitionNames();
+ containerNames = new BlogDefinitionNames(jParams);
log.debug("Init sucessfull");
}
Index: BlogDefinitionNames.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/blogs/actions/Attic/BlogDefinitionNames.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BlogDefinitionNames.java 22 Apr 2005 16:00:24 -0000 1.1.2.5
+++ BlogDefinitionNames.java 25 Apr 2005 14:45:55 -0000 1.1.2.6
@@ -37,8 +37,17 @@
package org.jahia.blogs.actions;
+import org.jahia.params.ParamBean;
+
+import java.io.FileOutputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.File;
+
import java.util.Properties;
+import org.apache.log4j.Logger;
+
/**
*
<content:declareContainerList name="entries" title="List of entries">
@@ -107,6 +116,11 @@
*/
public class BlogDefinitionNames {
+ // log4j logger
+ static Logger log = Logger.getLogger(BlogDefinitionNames.class);
+
+ public static final String RELATIVE_PATH =
"/WEB-INF/etc/config/blogs.properties";
+
public static final String BLOG_POSTS_LIST_NAME = "postContainerList";
public static final String POST_TITLE = "postTitle";
public static final String POST_BODY = "postBody";
@@ -126,35 +140,47 @@
public static final String TB_PING_IP = "pingIP";
private Properties names;
+ private ParamBean jParams;
/** Creates a new instance of BlogDefinitionNames */
- public BlogDefinitionNames() {
- names = new Properties();
- load();
+ public BlogDefinitionNames(ParamBean jParams) {
+ try {
+ this.jParams = jParams;
+ names = new Properties();
+ load();
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
}
/**
* Loads the definition names and values
*/
- private void load() {
- names.setProperty(BLOG_POSTS_LIST_NAME, "entries");
- names.setProperty(BLOG_TB_LIST, "trackbacks");
- names.setProperty(BLOG_TB_PING_LIST, "trackBackPingURLs");
-
- names.setProperty(POST_TITLE, "title");
- names.setProperty(POST_BODY, "body");
- names.setProperty(POST_DATE, "date");
- names.setProperty(POST_AUTHOR, "author");
- names.setProperty(POST_EXCERPT, "excerpt");
- names.setProperty(POST_KEYWORDS, "keyWords");
+ private void load() throws IOException {
- names.setProperty(TB_PING_URL, "pingURL");
-
- names.setProperty(TB_URL, "trackBackUrl");
- names.setProperty(TB_TITLE, "trackBackTitle");
- names.setProperty(TB_BLOG_NAME, "trackBackBlog_name");
- names.setProperty(TB_EXCERPT, "trackBackExcerpt");
- names.setProperty(TB_PING_IP, "trackBackPing_IP");
+ FileInputStream fis = new FileInputStream(getFile());
+ names.load(fis);
+ fis.close();
+
+// names.setProperty(BLOG_POSTS_LIST_NAME, "entries");
+// names.setProperty(BLOG_TB_LIST, "trackbacks");
+// names.setProperty(BLOG_TB_PING_LIST, "trackBackPingURLs");
+//
+// names.setProperty(POST_TITLE, "title");
+// names.setProperty(POST_BODY, "body");
+// names.setProperty(POST_DATE, "date");
+// names.setProperty(POST_AUTHOR, "author");
+// names.setProperty(POST_EXCERPT, "excerpt");
+// names.setProperty(POST_KEYWORDS, "keyWords");
+//
+// names.setProperty(TB_PING_URL, "pingURL");
+//
+// names.setProperty(TB_URL, "trackBackUrl");
+// names.setProperty(TB_TITLE, "trackBackTitle");
+// names.setProperty(TB_BLOG_NAME, "trackBackBlog_name");
+// names.setProperty(TB_EXCERPT, "trackBackExcerpt");
+// names.setProperty(TB_PING_IP, "trackBackPing_IP");
}
/**
@@ -163,4 +189,12 @@
public String getValue(String name) {
return names.getProperty(name);
}
+
+ /**
+ * returns the properties file
+ */
+ private File getFile() throws IOException {
+ return new File(jParams.settings().getPathResolver().
+ resolvePath(RELATIVE_PATH));
+ }
}
Index: NewPostAction.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/blogs/actions/Attic/NewPostAction.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- NewPostAction.java 25 Apr 2005 13:09:21 -0000 1.1.2.11
+++ NewPostAction.java 25 Apr 2005 14:45:55 -0000 1.1.2.12
@@ -219,6 +219,12 @@
super.setCategories(categories, postContainer);
}
+ java.util.Enumeration en = postContainer.getFields();
+ while (en.hasMoreElements()) {
+ JahiaField f = (JahiaField)en.nextElement();
+ log.debug(f.getDefinition().getName());
+ }
+
JahiaField field = postContainer.getField(fieldName);
field.setValue(fieldValue);
