[jboss-svn-commits] JBL Code SVN: r36565 - in labs/jbossforums/branches/noejbforums130P27/forums: src/main/org/jboss/portlet/forums/impl and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Jan 22 11:10:13 EST 2011
Author: sviluppatorefico
Date: 2011-01-22 11:10:13 -0500 (Sat, 22 Jan 2011)
New Revision: 36565
Modified:
labs/jbossforums/branches/noejbforums130P27/forums/build.xml
labs/jbossforums/branches/noejbforums130P27/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java
labs/jbossforums/branches/noejbforums130P27/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
labs/jbossforums/branches/noejbforums130P27/forums/src/main/org/jboss/portlet/forums/ui/view/ViewCategory.java
labs/jbossforums/branches/noejbforums130P27/forums/src/main/org/jboss/portlet/forums/util/NotificationEngine.java
labs/jbossforums/branches/noejbforums130P27/forums/src/resources/portal-forums-ear/META-INF/application.xml
labs/jbossforums/branches/noejbforums130P27/forums/src/resources/portal-forums-ha-as5-ear/META-INF/application.xml
labs/jbossforums/branches/noejbforums130P27/forums/src/resources/portal-forums-ha-ear/META-INF/application.xml
labs/jbossforums/branches/noejbforums130P27/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml
Log:
no picketlink library inside. It must be used externally configuring the picketlink deployer
Modified: labs/jbossforums/branches/noejbforums130P27/forums/build.xml
===================================================================
--- labs/jbossforums/branches/noejbforums130P27/forums/build.xml 2011-01-22 16:05:49 UTC (rev 36564)
+++ labs/jbossforums/branches/noejbforums130P27/forums/build.xml 2011-01-22 16:10:13 UTC (rev 36565)
@@ -249,7 +249,6 @@
<fileset dir="${jboss.hibernate.lib}" includes="hibernate-commons-annotations.jar,ejb3-persistence.jar"/>
<fileset dir="${build.lib}" includes="portal-forums.war,portal-forums-ui.jar,portal-forums.sar,portal-forums-authz-plugin.sar"/>
<fileset dir="${facelets.lib}" includes="jsf-facelets.jar,jsf-example.jar"/>
- <fileset dir="${picketlink.lib}" includes="picketlink-idm-1.1.5.CR01.jar"/>
<fileset dir="${jakarta.commons.lib}" includes="commons-beanutils.jar,commons-codec.jar,commons-collections.jar,commons-digester-1.7-brew.jar"/>
<fileset dir="${sun.portlet.lib}" includes="jsf-portlet.jar" />
<fileset dir="${portlet.lib}" includes="portlet-api.jar" />
@@ -291,7 +290,6 @@
<!--fileset dir="${jakarta.lucene.root}/lib" includes="lucene.jar"/-->
<fileset dir="${build.lib}" includes="portal-forums.war,portal-forums-ui.jar,portal-forums-ha.sar,portal-forums-authz-plugin.sar"/>
<fileset dir="${facelets.lib}" includes="jsf-facelets.jar,jsf-example.jar"/>
- <fileset dir="${picketlink.lib}" includes="picketlink-idm-1.1.5.CR01.jar"/>
<fileset dir="${jakarta.commons.lib}" includes="commons-beanutils.jar,commons-codec.jar,commons-collections.jar,commons-digester-1.7-brew.jar"/>
<fileset dir="${sun.portlet.lib}" includes="jsf-portlet.jar" />
<fileset dir="${portlet.lib}" includes="portlet-api.jar" />
@@ -307,7 +305,6 @@
<!--fileset dir="${jakarta.lucene.root}/lib" includes="lucene.jar"/-->
<fileset dir="${build.lib}" includes="portal-forums.war,portal-forums-ui.jar,portal-forums-ha-jbp.sar,portal-forums-authz-plugin.sar"/>
<fileset dir="${facelets.lib}" includes="jsf-facelets.jar,jsf-example.jar"/>
- <fileset dir="${picketlink.lib}" includes="picketlink-idm-1.1.5.CR01.jar"/>
<fileset dir="${jakarta.commons.lib}" includes="commons-beanutils.jar,commons-codec.jar,commons-collections.jar,commons-digester-1.7-brew.jar"/>
<fileset dir="${sun.portlet.lib}" includes="jsf-portlet.jar" />
<fileset dir="${portlet.lib}" includes="portlet-api.jar" />
@@ -323,7 +320,6 @@
<!--fileset dir="${jakarta.lucene.root}/lib" includes="lucene.jar"/-->
<fileset dir="${build.lib}" includes="portal-forums.war,portal-forums-ui.jar,portal-forums-ha-as5.sar,portal-forums-authz-plugin.sar"/>
<fileset dir="${facelets.lib}" includes="jsf-facelets.jar,jsf-example.jar"/>
- <fileset dir="${picketlink.lib}" includes="picketlink-idm-1.1.5.CR01.jar"/>
<fileset dir="${jakarta.commons.lib}" includes="commons-beanutils.jar,commons-codec.jar,commons-collections.jar,commons-digester-1.7-brew.jar"/>
<fileset dir="${sun.portlet.lib}" includes="jsf-portlet.jar" />
<fileset dir="${portlet.lib}" includes="portlet-api.jar" />
Modified: labs/jbossforums/branches/noejbforums130P27/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java
===================================================================
--- labs/jbossforums/branches/noejbforums130P27/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java 2011-01-22 16:05:49 UTC (rev 36564)
+++ labs/jbossforums/branches/noejbforums130P27/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java 2011-01-22 16:10:13 UTC (rev 36565)
@@ -33,8 +33,6 @@
import java.util.List;
import java.util.Map;
-import javax.naming.InitialContext;
-
import org.apache.log4j.Logger;
import org.hibernate.HibernateException;
import org.hibernate.Query;
@@ -80,7 +78,6 @@
private HibernateProvider hibernate;
private SessionFactory factory;
- private UserProfileModule userProfileModule;
private NotificationEngine notificationEngine;
@@ -103,11 +100,6 @@
super.startService();
factory = hibernate.getSessionFactory();
- try {
- userProfileModule = PortalUtil.getUserProfileModule();
- } catch (Exception e) {
- e.printStackTrace();
- }
notificationEngine = new NotificationEngine(this);
notificationEngine.setFrom(fromAddress);
// Define the chain of interceptors
@@ -2064,7 +2056,13 @@
}
public UserProfileModule getUserProfileModule() {
- return this.userProfileModule;
+ UserProfileModule userProfileModule = null;
+ try {
+ userProfileModule = PortalUtil.getUserProfileModule();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return userProfileModule;
}
protected Session getSession () {
Modified: labs/jbossforums/branches/noejbforums130P27/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
===================================================================
--- labs/jbossforums/branches/noejbforums130P27/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java 2011-01-22 16:05:49 UTC (rev 36564)
+++ labs/jbossforums/branches/noejbforums130P27/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java 2011-01-22 16:10:13 UTC (rev 36565)
@@ -314,22 +314,9 @@
}
};
- private final static UserProfileModule upm;
static
{
- UserProfileModule temporary = null;
- try
- {
- temporary = getUserProfileModule();
- } catch (Exception e)
- {
- JSFUtil.handleException(e);
- } finally
- {
- upm = temporary;
- }
-
sdfForLastLoginDate = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy",Locale.ENGLISH);
}
@@ -749,6 +736,7 @@
{
property = user.getClass().getField(propertyName).get(user)
.toString();
+ UserProfileModule upm = getUserProfileModule();
Object value = upm.getProperty(user, property);
if (value != null && value.toString().trim().length() != 0)
{
@@ -771,6 +759,7 @@
{
return null;
}
+ UserProfileModule upm = getUserProfileModule();
Object property = upm.getProperty(user, User.INFO_USER_LAST_LOGIN_DATE);
if (property!=null)
{
Modified: labs/jbossforums/branches/noejbforums130P27/forums/src/main/org/jboss/portlet/forums/ui/view/ViewCategory.java
===================================================================
--- labs/jbossforums/branches/noejbforums130P27/forums/src/main/org/jboss/portlet/forums/ui/view/ViewCategory.java 2011-01-22 16:05:49 UTC (rev 36564)
+++ labs/jbossforums/branches/noejbforums130P27/forums/src/main/org/jboss/portlet/forums/ui/view/ViewCategory.java 2011-01-22 16:10:13 UTC (rev 36565)
@@ -197,16 +197,25 @@
* @author sshah
*/
public ViewCategory()
- {
- super();
- try
- {
- this.execute();
- }
- catch(Exception e)
- {
- JSFUtil.handleException(e);
- }
+ {
+ super();
+ }
+ /**
+ *
+ */
+ public boolean isInitialized()
+ {
+ boolean initialized = false;
+ try
+ {
+ this.execute();
+ initialized = true;
+ }
+ catch(Exception e)
+ {
+ JSFUtil.handleException(e);
+ }
+ return initialized;
}
//ui actions supported by this bean----------------------------------------------------------------------------------------------------
Modified: labs/jbossforums/branches/noejbforums130P27/forums/src/main/org/jboss/portlet/forums/util/NotificationEngine.java
===================================================================
--- labs/jbossforums/branches/noejbforums130P27/forums/src/main/org/jboss/portlet/forums/util/NotificationEngine.java 2011-01-22 16:05:49 UTC (rev 36564)
+++ labs/jbossforums/branches/noejbforums130P27/forums/src/main/org/jboss/portlet/forums/util/NotificationEngine.java 2011-01-22 16:10:13 UTC (rev 36565)
@@ -84,7 +84,6 @@
public static final int MODE_REPOST = 2;
private ForumsModule forumsModule;
- private UserProfileModule userProfileModule;
private TemplateLoader mailTemplates;
private String from;
private QueuedExecutor executor;
@@ -99,7 +98,6 @@
InitialContext ctx = new InitialContext();
tm = (TransactionManager)ctx.lookup("java:TransactionManager");
executor = new QueuedExecutor(new LinkedQueue());
- userProfileModule = forumsModule.getUserProfileModule();
}
catch (NamingException e)
{
@@ -181,6 +179,7 @@
{
StringBuffer fromBuf = null;
try {
+ UserProfileModule userProfileModule = forumsModule.getUserProfileModule();
if ( (userProfileModule.getProperty(post.getPoster().getUser(),User.INFO_USER_NAME_GIVEN) != null)
&& (userProfileModule.getProperty(post.getPoster().getUser(),User.INFO_USER_NAME_FAMILY) != null))
{
@@ -460,6 +459,7 @@
StringBuffer buffer = null;
Address[] to = null;
MimeMessage m = new MimeMessage(session);
+ UserProfileModule userProfileModule = forumsModule.getUserProfileModule();
String email = userProfileModule.getProperty(watcher,User.INFO_USER_EMAIL_REAL).toString();
if ( email != null ) {
m.setFrom(new InternetAddress(from));
Modified: labs/jbossforums/branches/noejbforums130P27/forums/src/resources/portal-forums-ear/META-INF/application.xml
===================================================================
--- labs/jbossforums/branches/noejbforums130P27/forums/src/resources/portal-forums-ear/META-INF/application.xml 2011-01-22 16:05:49 UTC (rev 36564)
+++ labs/jbossforums/branches/noejbforums130P27/forums/src/resources/portal-forums-ear/META-INF/application.xml 2011-01-22 16:10:13 UTC (rev 36565)
@@ -55,9 +55,6 @@
<java>portlet-api.jar</java>
</module>
<module>
- <java>picketlink-idm-1.1.5.CR01.jar</java>
- </module>
- <module>
<web>
<web-uri>portal-forums.war</web-uri>
<!--context-root>/forums</context-root-->
Modified: labs/jbossforums/branches/noejbforums130P27/forums/src/resources/portal-forums-ha-as5-ear/META-INF/application.xml
===================================================================
--- labs/jbossforums/branches/noejbforums130P27/forums/src/resources/portal-forums-ha-as5-ear/META-INF/application.xml 2011-01-22 16:05:49 UTC (rev 36564)
+++ labs/jbossforums/branches/noejbforums130P27/forums/src/resources/portal-forums-ha-as5-ear/META-INF/application.xml 2011-01-22 16:10:13 UTC (rev 36565)
@@ -41,9 +41,6 @@
<java>portlet-api.jar</java>
</module>
<module>
- <java>picketlink-idm-1.1.5.CR01.jar</java>
- </module>
- <module>
<web>
<web-uri>portal-forums.war</web-uri>
<!--context-root>/forums</context-root-->
Modified: labs/jbossforums/branches/noejbforums130P27/forums/src/resources/portal-forums-ha-ear/META-INF/application.xml
===================================================================
--- labs/jbossforums/branches/noejbforums130P27/forums/src/resources/portal-forums-ha-ear/META-INF/application.xml 2011-01-22 16:05:49 UTC (rev 36564)
+++ labs/jbossforums/branches/noejbforums130P27/forums/src/resources/portal-forums-ha-ear/META-INF/application.xml 2011-01-22 16:10:13 UTC (rev 36565)
@@ -41,9 +41,6 @@
<java>portlet-api.jar</java>
</module>
<module>
- <java>picketlink-idm-1.1.5.CR01.jar</java>
- </module>
- <module>
<web>
<web-uri>portal-forums.war</web-uri>
<!--context-root>/forums</context-root-->
Modified: labs/jbossforums/branches/noejbforums130P27/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml
===================================================================
--- labs/jbossforums/branches/noejbforums130P27/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml 2011-01-22 16:05:49 UTC (rev 36564)
+++ labs/jbossforums/branches/noejbforums130P27/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml 2011-01-22 16:10:13 UTC (rev 36565)
@@ -32,6 +32,7 @@
class="forumscontainer"
>
+<c:if test="#{category.initialized}">
<ui:composition template="/views/common/common.xhtml">
<ui:define name="mainContent">
<h:form>
@@ -226,4 +227,5 @@
</h:form>
</ui:define>
</ui:composition>
+</c:if>
</div>
More information about the jboss-svn-commits
mailing list