[jboss-cvs] JBossBlog SVN: r238 - in trunk: resources and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 4 11:47:15 EST 2008
Author: adamw
Date: 2008-03-04 11:47:15 -0500 (Tue, 04 Mar 2008)
New Revision: 238
Modified:
trunk/build.properties
trunk/build.xml
trunk/resources/META-INF/persistence-prod.xml
trunk/resources/components.properties
trunk/resources/templates/atom_standard.vm
trunk/src/action/org/jboss/blog/session/cache/FeedsChangesObserver.java
trunk/src/action/org/jboss/blog/session/security/FeedsIdentity.java
trunk/src/action/org/jboss/blog/session/security/SecurityObserver.java
trunk/src/action/org/jboss/blog/session/xml/velocity/TemplateModBean.java
trunk/view/layout/menu.xhtml
trunk/view/manage/index.xhtml
Log:
Modified: trunk/build.properties
===================================================================
--- trunk/build.properties 2008-03-04 12:53:20 UTC (rev 237)
+++ trunk/build.properties 2008-03-04 16:47:15 UTC (rev 238)
@@ -1,5 +1,5 @@
#jboss.home = /Users/adamwarski/portal-extensions/feeds/binaries
jboss.home = /Users/adamwarski/jboss/jboss-4.2
#jboss.home = /Users/adamwarski/jboss/jboss-4.0.5
-#profile = design
+profile = dev
#jboss.home = /Users/adamwarski/jboss/jboss-design
\ No newline at end of file
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-03-04 12:53:20 UTC (rev 237)
+++ trunk/build.xml 2008-03-04 16:47:15 UTC (rev 238)
@@ -377,7 +377,7 @@
<touch file="${ear.deploy.dir}/META-INF/application.xml"/>
</target>
- <target name="deploy" depends="archive,datasource" description="Deploy to JBoss AS">
+ <target name="deploy" depends="archive" description="Deploy to JBoss AS">
<fail unless="jboss.home">jboss.home not set</fail>
<copy todir="${deploy.dir}" file="${dist.dir}/${project.name}.ear" />
<copy todir="${deploy.dir}" file="${dist.dir}/${jar.api.name}" />
Modified: trunk/resources/META-INF/persistence-prod.xml
===================================================================
--- trunk/resources/META-INF/persistence-prod.xml 2008-03-04 12:53:20 UTC (rev 237)
+++ trunk/resources/META-INF/persistence-prod.xml 2008-03-04 16:47:15 UTC (rev 238)
@@ -27,7 +27,6 @@
<property name="hibernate.hbm2ddl.auto" value="update"/>
<property name="hibernate.show_sql" value="false"/>
<property name="hibernate.format_sql" value="false"/>
- <property name="hibernate.jdbc.batch_size" value="20"/>
<property name="jboss.entity.manager.factory.jndi.name" value="java:/blogEntityManagerFactory"/>
<property name="hibernate.connection.useUnicode" value="true" />
<property name="hibernate.connection.characterEncoding" value="UTF-8" />
@@ -38,10 +37,9 @@
<property name="hibernate.cache.provider_configuration_file_resource_path" value="blog-ehcache.xml" />
<!-- Search -->
- <!-- use a file system based index -->
+ <!-- use a file system based index
<property name="hibernate.search.default.directory_provider"
value="org.hibernate.search.store.FSDirectoryProvider"/>
- <!-- directory where the indexes will be stored -->
<property name="hibernate.search.default.indexBase"
value="/home/awarski/blog/index"/>
@@ -50,7 +48,7 @@
<property name="hibernate.ejb.event.post-update"
value="org.hibernate.search.event.FullTextIndexEventListener"/>
<property name="hibernate.ejb.event.post-delete"
- value="org.hibernate.search.event.FullTextIndexEventListener"/>
+ value="org.hibernate.search.event.FullTextIndexEventListener"/> -->
</properties>
</persistence-unit>
Modified: trunk/resources/components.properties
===================================================================
--- trunk/resources/components.properties 2008-03-04 12:53:20 UTC (rev 237)
+++ trunk/resources/components.properties 2008-03-04 16:47:15 UTC (rev 238)
@@ -1,2 +1,2 @@
jndiPattern \#{ejbName}/local
-debug true
+debug false
Modified: trunk/resources/templates/atom_standard.vm
===================================================================
--- trunk/resources/templates/atom_standard.vm 2008-03-04 12:53:20 UTC (rev 237)
+++ trunk/resources/templates/atom_standard.vm 2008-03-04 16:47:15 UTC (rev 238)
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<feed xmlns="http://www.w3.org/2005/Atom">
- <id>$tools.feedLink($feed)</id>
- <title><![CDATA[$feed.title]]></title>
+ <id>$tools.feedLink($feed, $xmlType)</id>
+ <title type="html"><![CDATA[$feed.title]]></title>
<updated>$tools.formatDate($tools.feedPubDate($feed, $posts))</updated>
<author>
<name>$feed.author</name>
</author>
<link rel="alternate" type="text/html" href="$tools.feedPageLink($feed)"/>
- <link rel="self" href="$tools.feedLink($feed, $xmlType)"/>
+ <link rel="self" type="application/atom+xml" href="$tools.feedLink($feed, $xmlType)"/>
#foreach($post in $posts)
<entry>
<id>$tools.postLink($post)</id>
- <title><![CDATA[$post.title]]></title>
+ <title type="html"><![CDATA[$post.title]]></title>
<link rel="alternate" type="text/html" href="$tools.postLink($post)"/>
<updated>$tools.formatDate($post.modified)</updated>
<published>$tools.formatDate($post.published)</published>
- <content type="text/html" xml:lang="en">
+ <content type="html" xml:lang="en">
<![CDATA[$post.content]]>
</content>
@@ -27,4 +27,4 @@
#end
</entry>
#end
-</feed>
\ No newline at end of file
+</feed>
Modified: trunk/src/action/org/jboss/blog/session/cache/FeedsChangesObserver.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/cache/FeedsChangesObserver.java 2008-03-04 12:53:20 UTC (rev 237)
+++ trunk/src/action/org/jboss/blog/session/cache/FeedsChangesObserver.java 2008-03-04 16:47:15 UTC (rev 238)
@@ -5,6 +5,7 @@
import org.jboss.seam.annotations.In;
import org.jboss.blog.model.feed.Feed;
import org.jboss.blog.model.Post;
+import org.jboss.blog.model.Template;
/**
* @author <a href="mailto:adam at warski.org">Adam Warski</a>
@@ -13,7 +14,7 @@
public class FeedsChangesObserver {
@In
private CacheManager cacheManager;
-
+
@Observer({"org.jboss.blog.feed.updated", "org.jboss.blog.feed.deleted"})
public void feedUpdated(Feed feed) {
cacheManager.evictAll();
@@ -33,4 +34,14 @@
public void postAdded(Post post) {
cacheManager.evictAll();
}
+
+ @Observer({"org.jboss.blog.template.updated", "org.jboss.blog.template.deleted"})
+ public void templateUpdated(Template template) {
+ cacheManager.evictAll();
+ }
+
+ @Observer("org.jboss.blog.template.added")
+ public void templateAdded(Template template) {
+ cacheManager.evictAll();
+ }
}
Modified: trunk/src/action/org/jboss/blog/session/security/FeedsIdentity.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/security/FeedsIdentity.java 2008-03-04 12:53:20 UTC (rev 237)
+++ trunk/src/action/org/jboss/blog/session/security/FeedsIdentity.java 2008-03-04 16:47:15 UTC (rev 238)
@@ -63,6 +63,8 @@
FactHandle fh = getSecurityContext().getFactHandle(r);
getSecurityContext().retract(fh);
}
+
+ securityContext.fireAllRules();
}
}
@@ -87,6 +89,8 @@
break;
}
}
+
+ securityContext.fireAllRules();
}
}
Modified: trunk/src/action/org/jboss/blog/session/security/SecurityObserver.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/security/SecurityObserver.java 2008-03-04 12:53:20 UTC (rev 237)
+++ trunk/src/action/org/jboss/blog/session/security/SecurityObserver.java 2008-03-04 16:47:15 UTC (rev 238)
@@ -33,15 +33,17 @@
@Observer({"org.jboss.blog.group.added"})
public void groupAdded(Group group) {
- securityMod.setRole(FeedsSecurityRole.GROUP_ADMIN);
- securityMod.setGroup(group);
- securityMod.setRestrictedSecurityUser(identity.getSecurityUser());
+ if (!identity.hasPermission("group", "edit", group)) {
+ securityMod.setRole(FeedsSecurityRole.GROUP_ADMIN);
+ securityMod.setGroup(group);
+ securityMod.setRestrictedSecurityUser(identity.getSecurityUser());
- securityMod.addSecurityUserAsSuperUser();
+ securityMod.addSecurityUserAsSuperUser();
- entityManager.flush();
+ entityManager.flush();
- authenticator.flushRoles();
+ authenticator.flushRoles();
+ }
}
@Observer({"org.jboss.blog.group.deleted"})
Modified: trunk/src/action/org/jboss/blog/session/xml/velocity/TemplateModBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/xml/velocity/TemplateModBean.java 2008-03-04 12:53:20 UTC (rev 237)
+++ trunk/src/action/org/jboss/blog/session/xml/velocity/TemplateModBean.java 2008-03-04 16:47:15 UTC (rev 238)
@@ -5,6 +5,7 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.security.Restrict;
import org.jboss.seam.faces.FacesMessages;
+import org.jboss.seam.core.Events;
import javax.persistence.EntityManager;
import javax.faces.application.FacesMessage;
@@ -20,6 +21,9 @@
@In
private FacesMessages facesMessages;
+ @In
+ private Events events;
+
private Template template;
public Template getTemplate() {
@@ -41,6 +45,8 @@
facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "blog.template.added", template.getName(),
template.getType());
+
+ events.raiseEvent("org.jboss.blog.template.added", template);
}
@Restrict("#{identity.hasPermission('template', 'edit', templateMod.template)}")
@@ -49,6 +55,8 @@
facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "blog.template.updated", template.getName(),
template.getType());
+
+ events.raiseEvent("org.jboss.blog.template.updated", template);
}
@Restrict("#{identity.hasPermission('template', 'delete', templateMod.template)}")
@@ -57,5 +65,7 @@
facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "blog.template.deleted", template.getName(),
template.getType());
+
+ events.raiseEvent("org.jboss.blog.template.deleted", template);
}
}
Modified: trunk/view/layout/menu.xhtml
===================================================================
--- trunk/view/layout/menu.xhtml 2008-03-04 12:53:20 UTC (rev 237)
+++ trunk/view/layout/menu.xhtml 2008-03-04 16:47:15 UTC (rev 238)
@@ -26,16 +26,18 @@
</li>
<li><a href="https://www.redhat.com/apps/store/jboss/">Subscribe</a>  |  </li>
<li><a href="http://www.jboss.com/index.html?op=checkage&module=user">Register</a>  |  </li>
- <li>
- Search:
- <h:inputText style="border: 1px solid #6e6e6e; font: 10px Verdana, Helvetica, Arial, sans-serif; padding-left: 2px; margin-left: 10px;"
- value="#{postSearch.query}" />
- <h:commandButton value="Search" action="/search/search.xhtml"
- image="http://labs.jboss.com/file-access/default/theme/images/common/ico_searcharrow.gif"
- style="width:13px; height:13px">
- <s:conversationPropagation value="none" />
- </h:commandButton>
- </li>
+ <s:fragment rendered="false">
+ <li>
+ Search:
+ <h:inputText style="border: 1px solid #6e6e6e; font: 10px Verdana, Helvetica, Arial, sans-serif; padding-left: 2px; margin-left: 10px;"
+ value="#{postSearch.query}" />
+ <h:commandButton value="Search" action="/search/search.xhtml"
+ image="http://labs.jboss.com/file-access/default/theme/images/common/ico_searcharrow.gif"
+ style="width:13px; height:13px">
+ <s:conversationPropagation value="none" />
+ </h:commandButton>
+ </li>
+ </s:fragment>
</ul>
</h:form>
</div>
Modified: trunk/view/manage/index.xhtml
===================================================================
--- trunk/view/manage/index.xhtml 2008-03-04 12:53:20 UTC (rev 237)
+++ trunk/view/manage/index.xhtml 2008-03-04 16:47:15 UTC (rev 238)
@@ -55,7 +55,9 @@
<dt>Global posts operations:</dt>
<hr />
<dd><s:link value="Fix html in all posts" action="#{feedView.fixHtml}" /></dd>
- <dd><s:link value="Re-index posts (for search)" action="#{postSearch.reindex}" /></dd>
+ <s:fragment rendered="false">
+ <dd><s:link value="Re-index posts (for search)" action="#{postSearch.reindex}" /></dd>
+ </s:fragment>
</s:fragment>
<dt>Existing feed operations:</dt>
<hr />
More information about the jboss-cvs-commits
mailing list