[jboss-svn-commits] JBL Code SVN: r36564 - in labs/jbossforums/branches/forums130P27/forums: src/main/org/jboss/portlet/forums/ui and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Jan 22 11:05:51 EST 2011
Author: sviluppatorefico
Date: 2011-01-22 11:05:49 -0500 (Sat, 22 Jan 2011)
New Revision: 36564
Modified:
labs/jbossforums/branches/forums130P27/forums/build.xml
labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/util/NotificationEngine.java
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ear/META-INF/application.xml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-as5-ear/META-INF/application.xml
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-ear/META-INF/application.xml
Log:
no picketlink library inside. It must be used externally configuring the picketlink deployer
Modified: labs/jbossforums/branches/forums130P27/forums/build.xml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/build.xml 2011-01-21 19:16:09 UTC (rev 36563)
+++ labs/jbossforums/branches/forums130P27/forums/build.xml 2011-01-22 16:05:49 UTC (rev 36564)
@@ -267,7 +267,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,portal-forums-uif.jar"/>
<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" />
@@ -303,7 +302,6 @@
<fileset dir="${jboss.hibernate.lib}" includes="hibernate-commons-annotations.jar"/>
<fileset dir="${build.lib}" includes="portal-forums.war,portal-forums-ui.jar,portal-forums-ha.sar,portal-forums-authz-plugin.sar,portal-forums-uif-ha.jar"/>
<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" />
@@ -320,7 +318,6 @@
<fileset dir="${jboss.hibernate.lib}" includes="hibernate-commons-annotations.jar"/>
<fileset dir="${build.lib}" includes="portal-forums.war,portal-forums-ui.jar,portal-forums-ha-jbp.sar,portal-forums-authz-plugin.sar,portal-forums-uif-ha-jbp.jar"/>
<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" />
@@ -337,7 +334,6 @@
<fileset dir="${jboss.hibernate.lib}" includes="hibernate-commons-annotations.jar"/>
<fileset dir="${build.lib}" includes="portal-forums.war,portal-forums-ui.jar,portal-forums-ha.sar,portal-forums-authz-plugin.sar,portal-forums-uif-ha-as5.jar"/>
<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/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java 2011-01-21 19:16:09 UTC (rev 36563)
+++ labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java 2011-01-22 16:05:49 UTC (rev 36564)
@@ -310,23 +310,9 @@
return false;
}
};
-
- 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);
}
@@ -735,6 +721,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)
{
@@ -757,6 +744,7 @@
{
return null;
}
+ UserProfileModule upm = getUserProfileModule();
Object property = upm.getProperty(user, User.INFO_USER_LAST_LOGIN_DATE);
if (property!=null)
{
Modified: labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/util/NotificationEngine.java
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/util/NotificationEngine.java 2011-01-21 19:16:09 UTC (rev 36563)
+++ labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/util/NotificationEngine.java 2011-01-22 16:05:49 UTC (rev 36564)
@@ -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/forums130P27/forums/src/resources/portal-forums-ear/META-INF/application.xml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ear/META-INF/application.xml 2011-01-21 19:16:09 UTC (rev 36563)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ear/META-INF/application.xml 2011-01-22 16:05:49 UTC (rev 36564)
@@ -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/forums130P27/forums/src/resources/portal-forums-ha-as5-ear/META-INF/application.xml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-as5-ear/META-INF/application.xml 2011-01-21 19:16:09 UTC (rev 36563)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-as5-ear/META-INF/application.xml 2011-01-22 16:05:49 UTC (rev 36564)
@@ -41,9 +41,6 @@
<java>portlet-api.jar</java>
</module>
<module>
- <java>picketlink-idm-1.1.5.CR01.jar</java>
- </module>
- <module>
<java>lucene.jar</java>
</module>
<module>
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-ear/META-INF/application.xml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-ear/META-INF/application.xml 2011-01-21 19:16:09 UTC (rev 36563)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-ear/META-INF/application.xml 2011-01-22 16:05:49 UTC (rev 36564)
@@ -41,9 +41,6 @@
<java>portlet-api.jar</java>
</module>
<module>
- <java>picketlink-idm-1.1.5.CR01.jar</java>
- </module>
- <module>
<java>lucene.jar</java>
</module>
<module>
More information about the jboss-svn-commits
mailing list