[jboss-svn-commits] JBL Code SVN: r8972 - in labs/jbosslabs/trunk/portal-extensions: forge-contributor/src/java/org/jboss/forge/contributor and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jan 22 13:42:52 EST 2007
Author: adamw
Date: 2007-01-22 13:42:52 -0500 (Mon, 22 Jan 2007)
New Revision: 8972
Added:
labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/portal-hsqldb-ds.xml
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/maven.xml
labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/tld/forge.tld
Log:
http://jira.jboss.com/jira/browse/JBLAB-817
Added: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/portal-hsqldb-ds.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/portal-hsqldb-ds.xml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/portal-hsqldb-ds.xml 2007-01-22 18:42:52 UTC (rev 8972)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>PortalDS</jndi-name>
+ <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}portal${/}hypersonic${/}database</connection-url>
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+ <user-name>sa</user-name>
+ <password><![CDATA[]]></password>
+ </local-tx-datasource>
+</datasources>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java 2007-01-22 18:24:47 UTC (rev 8971)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java 2007-01-22 18:42:52 UTC (rev 8972)
@@ -33,12 +33,14 @@
import java.util.Set;
import org.jboss.forge.common.FacesTools;
+import org.jboss.forge.common.PermissionTools;
import org.jboss.forge.common.ForgeHelper;
import org.jboss.forge.common.projects.ProjectsHelper;
import org.jboss.forge.common.projects.project.Developers;
import org.jboss.forge.common.soa.LabsServices;
import org.jboss.forge.common.soa.projects.ProjectsService;
import org.jboss.portal.api.node.PortalNodeURL;
+import org.jboss.portal.identity.User;
import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.Node;
import org.jboss.shotoku.aop.CacheItem;
@@ -170,7 +172,8 @@
org.jboss.portal.identity.User projectLead = FacesTools.getUser();
if (projectLead != null) {
- String projectLeadEmail = projectLead.getRealEmail();
+ String projectLeadEmail = PermissionTools.getUserProfileModule().
+ getProperty(projectLead, User.INFO_USER_EMAIL_REAL).toString();
if (projectLeadEmail != null) {
@@ -444,15 +447,19 @@
LabsServices.getPrimatesService().getUser(username);
// Sending an email to project lead
- if (projectLead != null && projectLead.getRealEmail() != null) {
- System.out.println(projectLead.getRealEmail());
- ForgeHelper.postMail(
- projectLead.getRealEmail(),
- messages.getString("adminMailSubject"),
- getFormattedMessage("adminMailText",
- new Object[] { newXml, adminURL }),
- "labs-admin at jboss.com");
- }
+ if (projectLead != null) {
+ String realEmail = PermissionTools.getUserProfileModule().
+ getProperty(projectLead, User.INFO_USER_EMAIL_REAL).
+ toString();
+ if (realEmail != null) {
+ ForgeHelper.postMail(
+ realEmail,
+ messages.getString("adminMailSubject"),
+ getFormattedMessage("adminMailText",
+ new Object[] { newXml, adminURL }),
+ "labs-admin at jboss.com");
+ }
+ }
}
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/maven.xml 2007-01-22 18:24:47 UTC (rev 8971)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/maven.xml 2007-01-22 18:42:52 UTC (rev 8972)
@@ -35,11 +35,11 @@
<goal name="build">
<attainGoal name="buildGWT" />
- <attainGoal name="prj-war-build" />
+ <!--<attainGoal name="prj-war-build" />-->
</goal>
<goal name="deploy">
- <ant:copy file="target/tagme-servlet.war" toDir="${local.deploy.dir}" />
+ <!--<ant:copy file="target/tagme-servlet.war" toDir="${local.deploy.dir}" />-->
</goal>
<goal name="clean">
Modified: labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/tld/forge.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/tld/forge.tld 2007-01-22 18:24:47 UTC (rev 8971)
+++ labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/tld/forge.tld 2007-01-22 18:42:52 UTC (rev 8972)
@@ -171,4 +171,25 @@
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
+
+ <tag>
+ <name>ifEmpty</name>
+ <tagclass>org.jboss.forge.common.taglib.IfEmptyTag</tagclass>
+ <attribute>
+ <name>value</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <name>ifNotEmpty</name>
+ <tagclass>org.jboss.forge.common.taglib.IfNotEmptyTag</tagclass>
+ <attribute>
+ <name>value</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
</taglib>
More information about the jboss-svn-commits
mailing list