[jboss-cvs] JBossBlog SVN: r62 - in trunk-esial/blog-core/src: java/org/jboss/blog/service/store and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 13 12:44:40 EDT 2007
Author: acrignon
Date: 2007-03-13 12:44:40 -0400 (Tue, 13 Mar 2007)
New Revision: 62
Added:
trunk-esial/blog-core/src/java/org/jboss/blog/ui/templateManager.java
Removed:
trunk-esial/blog-core/src/java/org/jboss/blog/templateManager.java
Modified:
trunk-esial/blog-core/src/java/org/jboss/blog/service/store/BlogStoreService.java
trunk-esial/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.hbm.xml
trunk-esial/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java
trunk-esial/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java
trunk-esial/blog-core/src/web/WEB-INF/faces-config.xml
trunk-esial/blog-core/src/web/views/blog_view.xhtml
Log:
- evolution of the template system
- add template in database
- still a problem saving/retrieving the template
Modified: trunk-esial/blog-core/src/java/org/jboss/blog/service/store/BlogStoreService.java
===================================================================
--- trunk-esial/blog-core/src/java/org/jboss/blog/service/store/BlogStoreService.java 2007-03-13 00:07:46 UTC (rev 61)
+++ trunk-esial/blog-core/src/java/org/jboss/blog/service/store/BlogStoreService.java 2007-03-13 16:44:40 UTC (rev 62)
@@ -135,4 +135,8 @@
* if no user is logged in.
*/
public BlogAuthor newBlogAuthor(Object request);
+
+ public String retrieveTemplatePostsList(BlogName blogName) throws Exception;
+
+ public void saveTemplatePostsList(BlogName blogName,String s) throws Exception;
}
Modified: trunk-esial/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.hbm.xml
===================================================================
--- trunk-esial/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.hbm.xml 2007-03-13 00:07:46 UTC (rev 61)
+++ trunk-esial/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.hbm.xml 2007-03-13 16:44:40 UTC (rev 62)
@@ -27,6 +27,8 @@
<property name="link" column="LINK" />
<property name="description" column="DESCRIPTION" type="text" />
+
+ <property name="templatePostsList" column="TPLPOSTSLIST" type="text" />
<bag name="modelPosts" inverse="true">
<key column="BLOG_ID" not-null="true" />
Modified: trunk-esial/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java
===================================================================
--- trunk-esial/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java 2007-03-13 00:07:46 UTC (rev 61)
+++ trunk-esial/blog-core/src/java/org/jboss/blog/service/store/hibernate/HBlogModel.java 2007-03-13 16:44:40 UTC (rev 62)
@@ -21,6 +21,7 @@
private BlogAuthor author;
private String title;
private String description;
+ private String templatePostsList;
private String link;
private Date created;
@@ -80,7 +81,15 @@
public void setDescription(String description) {
this.description = description;
}
+
+ public String getTemplatePostsList() {
+ return templatePostsList;
+ }
+ public void setTemplatePostsList(String s) {
+ this.templatePostsList = s;
+ }
+
public String getLink() {
return link;
}
Modified: trunk-esial/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java
===================================================================
--- trunk-esial/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java 2007-03-13 00:07:46 UTC (rev 61)
+++ trunk-esial/blog-core/src/java/org/jboss/blog/service/store/hibernate/HibernateBlogStoreService.java 2007-03-13 16:44:40 UTC (rev 62)
@@ -441,4 +441,23 @@
public void setPermissionsService(BlogPermissionsService permissionsService) {
this.permissionsService = permissionsService;
}
+
+ /**
+ * @jmx.managed-operation
+ * @jmx.managed-parameter type="org.jboss.blog.BlogName"
+ */
+ public String retrieveTemplatePostsList(BlogName blogName) throws Exception{
+ return (String)sf.getCurrentSession().createQuery("select hbm.tplpostslist from HBlogModel hbm where hbm.blogName = :name").setParameter("name", blogName).uniqueResult();
+ }
+
+
+ /**
+ * @jmx.managed-operation
+ * @jmx.managed-parameter type="org.jboss.blog.BlogName"
+ * @jmx.managed-parameter type="java.lang.String"
+ */
+ public void saveTemplatePostsList(BlogName blogName,String s) throws Exception{
+ HBlogModel hbm = (HBlogModel) sf.getCurrentSession().createQuery("from HBlogModel as model where model.blogName = :name").setParameter("name", blogName).uniqueResult();
+ hbm.setTemplatePostsList(s);
+ }
}
Deleted: trunk-esial/blog-core/src/java/org/jboss/blog/templateManager.java
===================================================================
--- trunk-esial/blog-core/src/java/org/jboss/blog/templateManager.java 2007-03-13 00:07:46 UTC (rev 61)
+++ trunk-esial/blog-core/src/java/org/jboss/blog/templateManager.java 2007-03-13 16:44:40 UTC (rev 62)
@@ -1,71 +0,0 @@
-package org.jboss.blog;
-
-import java.io.*;
-
-import freemarker.template.*;
-
-import javax.servlet.http.*;
-
-import javax.servlet.*;
-
-
-public class templateManager extends HttpServlet {
-
- private String listePosts;
- private String template = "<p><b>plop</b></p>";
-
- public templateManager(){
-
- }
-
- public void setListePosts(String s){
- listePosts = s;
- }
-
- public String getListePosts(){
-
- String s = "";
-
- try{
- SimpleHash modelRoot = new SimpleHash();
-
- Template t = new Template("test",new StringReader(this.getTemplate()),new Configuration());
-
- Writer out = new OutputStreamWriter(System.out);
- t.process(modelRoot, out);
- modelRoot.put("pouet","pouet");
- s = template.toString();
- }
- catch(Exception e){
- s = e.getMessage();
- }
- return s;
- }
-
- public void setTemplate(String s){
- template = s;
- }
-
- public String getTemplate(){
- return template;
- }
-
- public void doGet(HttpServletRequest req, HttpServletResponse res){
- res.setContentType("text/html");
- try {
- PrintWriter out = res.getWriter();
- SimpleHash modelRoot = new SimpleHash();
- Template t = new Template("test",new StringReader(this.getTemplate()),new Configuration());
- t.process(modelRoot, out);
- out.close();
- } catch (Exception e) {
- // TODO Auto-generated catch block
- e.getMessage();
- }
- }
-
- public void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
- this.doGet(req, res);
- }
-
-}
\ No newline at end of file
Copied: trunk-esial/blog-core/src/java/org/jboss/blog/ui/templateManager.java (from rev 55, trunk-esial/blog-core/src/java/org/jboss/blog/templateManager.java)
===================================================================
--- trunk-esial/blog-core/src/java/org/jboss/blog/ui/templateManager.java (rev 0)
+++ trunk-esial/blog-core/src/java/org/jboss/blog/ui/templateManager.java 2007-03-13 16:44:40 UTC (rev 62)
@@ -0,0 +1,90 @@
+package org.jboss.blog.ui;
+
+import java.io.*;
+import freemarker.template.*;
+import org.jboss.blog.tools.*;
+import org.jboss.blog.*;
+
+public class templateManager {
+
+ private String listOfPosts;
+ private String templatePostsList = "init_template";
+ private boolean allowPostsList = true;
+ private BlogView blogView;
+
+ public templateManager(){
+
+ }
+
+ public void setListOfPosts(String s){
+ listOfPosts = s;
+ }
+
+ public String getListOfPosts(){
+
+ String s = "init s";
+ String str = "init str";
+
+ try{
+ SimpleHash modelRoot = new SimpleHash();
+ str = BlogTools.getBlogService().getStoreService().retrieveTemplatePostsList(blogView.getBlogName());//blogView.getBlogName()
+ if(str==null)
+ str = "null";
+ Template t = new Template("test",new StringReader(str),new Configuration());
+ Writer out = new OutputStreamWriter(System.out);
+ modelRoot.put("pouet","pouet");
+ t.process(modelRoot, out);
+ s = t.toString();
+ s = str;
+ }
+ catch(Exception e){
+ s = e.getMessage();
+ }
+ return s;
+ }
+
+ public void setTemplatePostsList(String s){
+ templatePostsList = s;
+ try{
+ BlogTools.getBlogService().getStoreService().saveTemplatePostsList(blogView.getBlogName(),"<p><b>plop</b></p>");
+ }catch(Exception e){
+ //e.getMessage();
+ }
+ }
+
+ public String getTemplatePostsList(){
+ return templatePostsList;
+ }
+
+ public boolean getAllowPostsList(){
+ return allowPostsList;
+ }
+
+ public void setAllowPostsList(boolean b){
+ allowPostsList = b;
+ }
+
+ public BlogView getBlogView(){
+ return blogView;
+ }
+
+ public void setBlogView(BlogView bv){
+ blogView = bv;
+ }
+
+ public String saveTemplatePostsList(){
+ String s = "saveNotOK";
+ //save the tempate in the database
+ try{
+ BlogTools.getBlogService().getStoreService().saveTemplatePostsList(blogView.getBlogName(),"<p><b>plop</b></p>");
+ s = "saveOK";
+ allowPostsList = false;
+ }catch(Exception e){
+ s = e.getMessage();
+ templatePostsList = s;
+ }
+ return s;
+ }
+
+
+}
\ No newline at end of file
Modified: trunk-esial/blog-core/src/web/WEB-INF/faces-config.xml
===================================================================
--- trunk-esial/blog-core/src/web/WEB-INF/faces-config.xml 2007-03-13 00:07:46 UTC (rev 61)
+++ trunk-esial/blog-core/src/web/WEB-INF/faces-config.xml 2007-03-13 16:44:40 UTC (rev 62)
@@ -89,8 +89,8 @@
<managed-bean>
<managed-bean-name>templ</managed-bean-name>
- <managed-bean-class>org.jboss.blog.templateManager</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
+ <managed-bean-class>org.jboss.blog.ui.templateManager</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<!-- Post/ blog view -->
@@ -251,4 +251,20 @@
</navigation-case>
</navigation-rule>
+ <navigation-rule>
+ <from-view-id>/views/template_posts_list.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>saveOK</from-outcome>
+ <to-view-id>/views/blog_view.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
+ <from-view-id>*</from-view-id>
+ <navigation-case>
+ <from-outcome>toTemplatePostsList</from-outcome>
+ <to-view-id>/views/template_posts_list.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
</faces-config>
Modified: trunk-esial/blog-core/src/web/views/blog_view.xhtml
===================================================================
--- trunk-esial/blog-core/src/web/views/blog_view.xhtml 2007-03-13 00:07:46 UTC (rev 61)
+++ trunk-esial/blog-core/src/web/views/blog_view.xhtml 2007-03-13 16:44:40 UTC (rev 62)
@@ -42,12 +42,19 @@
</h:panelGrid>
- <h:outputText escape="false" value="#{templ.listePosts}"/>
+ <h:form rendered="#{!blogView.defaultBlog}">
+ <h:commandLink value="Click here to modify the template used to display the posts list." action="toTemplatePostsList"/>
+ </h:form>
+
+ <h:panelGroup>
+ <h:outputText escape="false" value="#{templ.listOfPosts}"/>
+ </h:panelGroup>
<h:form>
+ <h:panelGroup rendered="#{!blogView.defaultBlog}">
<h:dataTable value="#{blogView.posts}" var="post" binding="#{blogView.postsData}"
rowClasses="posts-row,posts-row-alternate" styleClass="posts"
- rendered="#{!blogView.defaultBlog}">
+ rendered="#{templ.allowPostsList}">
<h:column>
<f:facet name="header">
<h:outputText value="Title"/>
@@ -100,8 +107,8 @@
</h:panelGroup>
</h:dataTable>
+ </h:panelGroup>
-
</h:form>
<h:form>
More information about the jboss-cvs-commits
mailing list