JBoss Portal SVN: r11269 - in branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default: images and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-07-02 16:50:40 -0400 (Wed, 02 Jul 2008)
New Revision: 11269
Added:
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/related.html
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/epp.html
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/info-banner.png
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/project.html
Log:
Good enough for Alpha
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/epp.html
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/epp.html 2008-07-02 20:22:53 UTC (rev 11268)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/epp.html 2008-07-02 20:50:40 UTC (rev 11269)
@@ -10,7 +10,9 @@
</td>
<td align="right" valign="top"><img
src="/portal/content/default/images/jbosslogo.png" border="0" /></td>
- <td>All the following services are <a
+ </tr>
+ <tr>
+ <td colspan="2">All the following services are <a
href="http://www.redhat.com/jboss/platforms/portals/">available
with the Enterprise Portal Platform</a>. The Enterprise Portal Platform
is a set of components with long term support. Only bug fixes are
@@ -23,7 +25,7 @@
<table border="0" cellpadding="2" width="100%">
<tbody>
<tr>
- <td class="portlet-section-alternate" align="left" valign="top">
+ <td align="left" valign="top">
<h2><font> <a
href="http://www.jboss.com/services/profsupport" target="_blank">Professional
Support</a> </font></h2>
@@ -41,7 +43,7 @@
it here, right now</a>.</td>
</tr>
<tr>
- <td class="portlet-section-alternate" align="left" valign="top">
+ <td align="left" valign="top">
<h2><font> <a
href="http://www.jboss.com/services/consulting" target="_blank">Consulting
Services</a> </font></h2>
@@ -51,7 +53,7 @@
delivered by certified consultants. </font></td>
</tr>
<tr>
- <td class="portlet-section-alternate" align="left" valign="top">
+ <td align="left" valign="top">
<h2><font> <a
href="http://www.jboss.com/services/training" target="_blank">Training
and Certification</a> </font></h2>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/info-banner.png
===================================================================
(Binary files differ)
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html 2008-07-02 20:22:53 UTC (rev 11268)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html 2008-07-02 20:50:40 UTC (rev 11269)
@@ -7,7 +7,7 @@
<map name="Map">
<area shape="rect" coords="1,1,229,71" href="/portal/content/default/epp.html">
<area shape="rect" coords="231,1,439,71" href="/portal/content/default/project.html">
- <area shape="rect" coords="441,1,623,71" href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=215">
+ <area shape="rect" coords="441,1,623,71" href="/portal/content/default/related.html">
</map>
</div>
<div style="margin-left:215px; margin-top:30px">
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/project.html
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/project.html 2008-07-02 20:22:53 UTC (rev 11268)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/project.html 2008-07-02 20:50:40 UTC (rev 11269)
@@ -12,14 +12,14 @@
</td>
</tr>
<tr>
- <td class="portlet-section-alternate" align="left" valign="top">
+ <td align="left" valign="top">
<h2><font> <a
href="http://labs.jboss.com/portal/jbossportal/index.html"
target="_blank">JBoss Portal Home</a> </font></h2>
<font> The Epicenter of everything JBoss Portal.</font></td>
</tr>
<tr>
- <td class="portlet-section-alternate" align="left" valign="top">
+ <td align="left" valign="top">
<h2><font> <a
href="http://labs.jboss.com/portal/jbossportal/docs/index.html"
target="_blank">Documentation</a> </font></h2>
@@ -27,7 +27,7 @@
documentation, tutorials, and javadoc.</font></td>
</tr>
<tr>
- <td class="portlet-section-alternate" align="left" valign="top">
+ <td align="left" valign="top">
<h2><font> <a
href="http://www.jboss.com/index.html?module=bb&op=viewforum&f=215"
target="_blank">Forums</a> </font></h2>
@@ -43,7 +43,7 @@
and community members are always there to help. </font></td>
</tr>
<tr>
- <td class="portlet-section-alternate" align="left" valign="top">
+ <td align="left" valign="top">
<h2><font> <a
href="http://www.jboss.com/wiki/Wiki.jsp?page=JBossPortal"
target="_blank">Wiki</a> </font></h2>
@@ -51,7 +51,7 @@
contributed collection of important resources regarding JBoss Portal.</font></td>
</tr>
<tr>
- <td class="portlet-section-alternate" align="left" valign="top">
+ <td align="left" valign="top">
<h2><font> <a
href="http://jira.jboss.com/jira/secure/BrowseProject.jspa?id=10050"
target="_blank">Jira</a> </font></h2>
Added: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/related.html
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/related.html (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/related.html 2008-07-02 20:50:40 UTC (rev 11269)
@@ -0,0 +1,34 @@
+
+<table border="0" cellpadding="2" width="100%">
+ <tbody>
+ <tr>
+ <td class="portlet-section-body" colspan="2" align="left"
+ valign="top">
+ <h2>Related projects <br />
+ </h2>
+ <p><font>There are a couple of related projects that are listed here.</font></p>
+ </td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+ <h2><font> <a
+ href="http://www.jboss.org/portletcontainer"
+ target="_blank">JBoss Portlet Container</a> </font></h2>
+ <font> The JBoss Portlet Container is included in JBoss Portal, it can also be used without the other services.
+ It can be used for prototyping, developing simple portals and during development. The JBoss Portlet Container
+ is available out of the box for JBoss AS or Apache Tomcat.</font></td>
+ </tr>
+ <tr>
+ <td align="left" valign="top">
+ <h2><font> <a
+ href="http://www.jboss.org/portletbridge"
+ target="_blank">JBoss Portlet Bridge</a> </font></h2>
+ <font> The JBoss Portlet Bridge is designed to be able to write JSF, Seam and RichFaces portlets and have them running
+ within JBoss Portal</font></td>
+ </tr>
+ </tbody>
+</table>
+<br />
+<a href="/portal/content/default/index.html"><img
+ src="/portal/content/default/images/back.gif" border="0" alt="back"
+ align="absmiddle" /> Back</a>
Property changes on: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/related.html
___________________________________________________________________
Name: svn:executable
+ *
16 years
JBoss Portal SVN: r11268 - in branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default: images and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-07-02 16:22:53 -0400 (Wed, 02 Jul 2008)
New Revision: 11268
Added:
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/info-banner.png
Removed:
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/info-banner.gif
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html
Log:
Updating default content (still need to write the corresponding pages)
Deleted: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/info-banner.gif
===================================================================
(Binary files differ)
Added: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/info-banner.png
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/info-banner.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html 2008-07-02 19:00:53 UTC (rev 11267)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html 2008-07-02 20:22:53 UTC (rev 11268)
@@ -1,13 +1,13 @@
<div>
- <img src="default/images/2_7-go-faster.gif" width="626" height="148" style="margin:10px auto auto auto" alt="JBoss Portal 2.7: Go Faster!"/>
+ <img src="default/images/2_7-go-faster.gif" width="624" height="148" style="margin:10px auto auto auto" alt="JBoss Portal 2.7: Go Faster!"/>
</div>
<br/>
<div>
- <img src="default/images/info-banner.gif" width="626" height="73" border="0" usemap="#Map" alt="Services"/>
+ <img src="default/images/info-banner.png" width="624" height="71" border="0" usemap="#Map" alt="Services"/>
<map name="Map">
- <area shape="rect" coords="1,1,201,72" href="/portal/content/default/epp.html">
- <area shape="rect" coords="201,0,439,73" href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=215">
- <area shape="rect" coords="439,1,626,73" href="/portal/content/default/project.html">
+ <area shape="rect" coords="1,1,229,71" href="/portal/content/default/epp.html">
+ <area shape="rect" coords="231,1,439,71" href="/portal/content/default/project.html">
+ <area shape="rect" coords="441,1,623,71" href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=215">
</map>
</div>
<div style="margin-left:215px; margin-top:30px">
16 years
JBoss Portal SVN: r11267 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-07-02 15:00:53 -0400 (Wed, 02 Jul 2008)
New Revision: 11267
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
Log:
JBPORTAL-2054 merging clustering config change from 2.6
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-07-02 15:43:51 UTC (rev 11266)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-07-02 19:00:53 UTC (rev 11267)
@@ -379,6 +379,31 @@
<depends optional-attribute-name="ThemeService" proxy-type="attribute">portal:service=ThemeService</depends>
</mbean>
+ <!--
+ Node locking scheme possible values (NodeLockingScheme attribute):
+ OPTIMISTIC
+ PESSIMISTIC (default)
+
+
+ Isolation level possible values (IsolationLevel attribute):
+ SERIALIZABLE
+ REPEATABLE_READ (default)
+ READ_COMMITTED
+ READ_UNCOMMITTED
+ NONE
+ Note that this attribute is IGNORED if your NodeLockingScheme attribute is set at OPTIMISTIC.
+
+ Cache modes possible values (CacheMode attribute):
+ LOCAL
+ REPL_ASYNC
+ REPL_SYNC
+ INVALIDATION_ASYNC
+ INVALIDATION_SYNC
+
+ If you use REPL_SYNC and a UDP-based ClusterConfig we recommend you comment out the FC (flow control)
+ protocol in the ClusterConfig section below.
+ -->
+
<!--
| Uncomment in clustered mode : replicated cache for hibernate
@portal.single.xml.close@
@@ -391,7 +416,7 @@
org.jboss.cache.JBossTransactionManagerLookup
</attribute>
- <attribute name="NodeLockingScheme">OPTIMISTIC</attribute>
+ <attribute name="NodeLockingScheme">PESSIMISTIC</attribute>
<attribute name="IsolationLevel">REPEATABLE_READ</attribute>
<attribute name="CacheMode">REPL_SYNC</attribute>
16 years
JBoss Portal SVN: r11266 - in modules/portlet/trunk/portlet/src/test/java/org/jboss/portal: unit and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-07-02 11:43:51 -0400 (Wed, 02 Jul 2008)
New Revision: 11266
Modified:
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletmode/PortletModeTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java
Log:
fixing duplicate assertion name
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletmode/PortletModeTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletmode/PortletModeTestCase.java 2008-07-02 15:38:13 UTC (rev 11265)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/ext/portletmode/PortletModeTestCase.java 2008-07-02 15:43:51 UTC (rev 11266)
@@ -53,7 +53,7 @@
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-(a)TestCase({Assertion.EXT_PORTLET_MODE_1})
+(a)TestCase({Assertion.EXT_PORTLET_MODE_7})
public class PortletModeTestCase
{
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java 2008-07-02 15:38:13 UTC (rev 11265)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assertion.java 2008-07-02 15:43:51 UTC (rev 11266)
@@ -1875,6 +1875,7 @@
EXT_PORTLET_MODE_4(new EXT("PortletMode"), "Can set the portlet mode on render URL before having set the content type on the response"),
EXT_PORTLET_MODE_5(new EXT("PortletMode"), "Can set null portlet mode during render phase"),
EXT_PORTLET_MODE_6(new EXT("PortletMode"), "Can use set the portlet mode on action URL before having set the content type on the response"),
+ EXT_PORTLET_MODE_7(new EXT("PortletMode"), "Test custom portlet modes wether they are portal or portlet managed."),
EXT_PORTLET_REQUESTS_1(new EXT("PortletRequest"), "Test that a POST request having a content type set to x-www-form-urlencoded will make the body content unavailable " +
" as an input stream or a reader and the parameters are decoded."),
@@ -1899,8 +1900,6 @@
" If a resource parameter is set that has the same name as a render parameter, the render" +
" parameter must be the last entry in the parameter value array."),
- EXT_PORTLET_MODE_1(new EXT("PortletMode"), "Test custom portlet modes wether they are portal or portlet managed."),
-
EXT_PORTLET_RESPONSES_1(new EXT("PortletResponse"), "Test that character encoding is ignored as specified by the spec in PLT.12.3.1"),
EXT_PORTLET_RESPONSES_2(new EXT("PortletResponse"), "Not setting the content type before getting a stream will use the content type defined" +
" by the portlet request response content type."),
16 years
JBoss Portal SVN: r11265 - branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-07-02 11:38:13 -0400 (Wed, 02 Jul 2008)
New Revision: 11265
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
Log:
JBPORTAL-2054 Thanks Chris for fixing comment mess. I have re-enabled PESSIMISTIC locking as default
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-07-02 13:38:17 UTC (rev 11264)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-07-02 15:38:13 UTC (rev 11265)
@@ -526,7 +526,7 @@
</attribute>
- <attribute name="NodeLockingScheme">OPTIMISTIC</attribute>
+ <attribute name="NodeLockingScheme">PESSIMISTIC</attribute>
<attribute name="IsolationLevel">REPEATABLE_READ</attribute>
<attribute name="CacheMode">REPL_ASYNC</attribute>
16 years
JBoss Portal SVN: r11264 - in branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin: roles and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-07-02 09:38:17 -0400 (Wed, 02 Jul 2008)
New Revision: 11264
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/index.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/deleteRole.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/deleteUser.xhtml
Log:
Minor visual fixes
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/index.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/index.xhtml 2008-07-02 13:21:04 UTC (rev 11263)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/index.xhtml 2008-07-02 13:38:17 UTC (rev 11264)
@@ -14,9 +14,10 @@
</ui:define>
<ui:define name="content">
- <h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /></h3>
<h:messages style="list-style:none" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
+
+ <h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /></h3>
<h:form>
<h:panelGrid>
<h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}" action="searchUsers"
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/deleteRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/deleteRole.xhtml 2008-07-02 13:21:04 UTC (rev 11263)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/deleteRole.xhtml 2008-07-02 13:38:17 UTC (rev 11264)
@@ -26,13 +26,13 @@
<div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div>
<div class="portlet-msg-body">
<h3>
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_DELETE}" />
- <h:outputText id="rolename" value="#{rolemanagementbean.uiRole.name}"/>
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_DELETE}" /> 
+ <h:outputText id="rolename" value="'#{rolemanagementbean.uiRole.name}'"/> 
<h:outputText value="(#{rolemanagementbean.uiRole.displayName})" />
</h3>
<p class="portlet-msg-alert">
#{bundle.IDENTITY_WARNING_CONFIRM_DELETE_ROLE}
- #{rolemanagementbean.uiRole.name}
+ '#{rolemanagementbean.uiRole.name}'
</p>
<h:form>
<h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="roleAdmin"
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/deleteUser.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/deleteUser.xhtml 2008-07-02 13:21:04 UTC (rev 11263)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/deleteUser.xhtml 2008-07-02 13:38:17 UTC (rev 11264)
@@ -26,13 +26,13 @@
<div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div>
<div class="portlet-msg-body">
<h3>
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_DELETE}" />
- <h:outputText value="#{useradministrationbean.uiUser.username}" />
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_DELETE}" /> 
+ <h:outputText value="'#{useradministrationbean.uiUser.username}'" /> 
<h:outputText value="(#{useradministrationbean.uiUser.attribute.email})" />
</h3>
<p class="portlet-msg-alert">
#{bundle.IDENTITY_WARNING_CONFIRM_DELETE_USER}
- #{useradministrationbean.uiUser.username}
+ '#{useradministrationbean.uiUser.username}'
</p>
<h:form>
<h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="searchUsers"
16 years
JBoss Portal SVN: r11263 - in branches/JBoss_Portal_Branch_2_7/core-identity/src: main/org/jboss/portal/core/identity/ui/validators and 8 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-07-02 09:21:04 -0400 (Wed, 02 Jul 2008)
New Revision: 11263
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/AssignRoleAction.java
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/LostPasswordAction.java
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CaptchaValidator.java
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CurrentPasswordValidator.java
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/EmailValidator.java
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/PasswordValidator.java
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/index.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/confirm.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/index.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/status.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/status.xhtml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/success.xhtml
Log:
- Simple cleanup (while doing testing)
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/AssignRoleAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/AssignRoleAction.java 2008-07-02 10:01:26 UTC (rev 11262)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/AssignRoleAction.java 2008-07-02 13:21:04 UTC (rev 11263)
@@ -119,7 +119,7 @@
catch (Exception e)
{
e.printStackTrace();
- ctx.addMessage(null, new FacesMessage("Problem while fetching user."));
+ ctx.addMessage(null, new FacesMessage(FacesMessage.SEVERITY_FATAL, "Problem while fetching user.", "Problem while fetching user."));
}
return "userAdmin";
}
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java 2008-07-02 10:01:26 UTC (rev 11262)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java 2008-07-02 13:21:04 UTC (rev 11263)
@@ -210,7 +210,9 @@
}
else
{
- FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_VALIDATION_ERROR_REGISTRATION")));
+ FacesContext.getCurrentInstance().addMessage("status", new FacesMessage(FacesMessage.SEVERITY_ERROR,
+ bundle.getString("IDENTITY_VALIDATION_ERROR_REGISTRATION"),
+ bundle.getString("IDENTITY_VALIDATION_ERROR_REGISTRATION")));
}
}
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/LostPasswordAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/LostPasswordAction.java 2008-07-02 10:01:26 UTC (rev 11262)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/LostPasswordAction.java 2008-07-02 13:21:04 UTC (rev 11263)
@@ -175,7 +175,9 @@
{
log.error("", e);
FacesContext.getCurrentInstance().addMessage(null,
- new FacesMessage(bundle.getString("IDENTITY_LOST_PASSWORD_ERROR")));
+ new FacesMessage(FacesMessage.SEVERITY_ERROR,
+ bundle.getString("IDENTITY_LOST_PASSWORD_ERROR"),
+ bundle.getString("IDENTITY_LOST_PASSWORD_ERROR")));
return "status";
}
}
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CaptchaValidator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CaptchaValidator.java 2008-07-02 10:01:26 UTC (rev 11262)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CaptchaValidator.java 2008-07-02 13:21:04 UTC (rev 11263)
@@ -50,7 +50,9 @@
if ( tester.equals(Boolean.FALSE))
{
- throw new ValidatorException(new FacesMessage(bundle.getString("IDENTITY_VALIDATION_ERROR_CAPTCHA_INCORRECT")));
+ throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR,
+ bundle.getString("IDENTITY_VALIDATION_ERROR_CAPTCHA_INCORRECT"),
+ bundle.getString("IDENTITY_VALIDATION_ERROR_CAPTCHA_INCORRECT")));
}
}
}
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CurrentPasswordValidator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CurrentPasswordValidator.java 2008-07-02 10:01:26 UTC (rev 11262)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/CurrentPasswordValidator.java 2008-07-02 13:21:04 UTC (rev 11263)
@@ -59,12 +59,16 @@
}
catch (Exception e)
{
- throw new ValidatorException(new FacesMessage(bundle.getString("IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR")));
+ throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR,
+ bundle.getString("IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR"),
+ bundle.getString("IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR")));
}
if (user == null || (!user.validatePassword((String) value)))
{
- throw new ValidatorException(new FacesMessage(bundle.getString("IDENTITY_VALIDATION_ERROR_INVALID_PASSWORD")));
+ throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR,
+ bundle.getString("IDENTITY_VALIDATION_ERROR_INVALID_PASSWORD"),
+ bundle.getString("IDENTITY_VALIDATION_ERROR_INVALID_PASSWORD")));
}
}
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/EmailValidator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/EmailValidator.java 2008-07-02 10:01:26 UTC (rev 11262)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/EmailValidator.java 2008-07-02 13:21:04 UTC (rev 11263)
@@ -51,7 +51,7 @@
if (!Pattern.matches(EMAIL_VALIDATION, (String) value))
{
- throw new ValidatorException(new FacesMessage(bundle.getString("IDENTITY_VALIDATION_ERROR_INVALID_EMAIL")));
+ throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, bundle.getString("IDENTITY_VALIDATION_ERROR_INVALID_EMAIL"), bundle.getString("IDENTITY_VALIDATION_ERROR_INVALID_EMAIL")));
}
}
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/PasswordValidator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/PasswordValidator.java 2008-07-02 10:01:26 UTC (rev 11262)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/PasswordValidator.java 2008-07-02 13:21:04 UTC (rev 11263)
@@ -47,12 +47,16 @@
if (value == null || password == null || !password.equals((String) value))
{
- throw new ValidatorException(new FacesMessage(bundle.getString("IDENTITY_VALIDATION_ERROR_PASSWORD_DOESNT_MATCH")));
+ throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR,
+ bundle.getString("IDENTITY_VALIDATION_ERROR_PASSWORD_DOESNT_MATCH"),
+ bundle.getString("IDENTITY_VALIDATION_ERROR_PASSWORD_DOESNT_MATCH")));
}
}
else
{
- throw new ValidatorException(new FacesMessage(bundle.getString("IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR")));
+ throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR,
+ bundle.getString("IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR"),
+ bundle.getString("IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR")));
}
}
}
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java 2008-07-02 10:01:26 UTC (rev 11262)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java 2008-07-02 13:21:04 UTC (rev 11263)
@@ -46,6 +46,7 @@
{
/** The username regex */
// private static final String NICKNAME_VALIDATION = "^[a-zA-Z]([a-zA-Z0-9]+(([\\.\\-\\_]?[a-zA-Z0-9]+)+)?)";
+
/** The user module */
private UserModule userModule;
@@ -69,14 +70,16 @@
// checking jBPM context
if (registrationService.checkUsername(username))
{
- throw new ValidatorException(new FacesMessage(bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN")
- + username));
+ throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR,
+ bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN"),
+ bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN")));
}
User u = userModule.findUserByUserName(username);
// User found so this nickname is already taken
- throw new ValidatorException(new FacesMessage(bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN")
- + u.getUserName()));
+ throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR,
+ bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN"),
+ bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN")));
}
catch (NoSuchUserException e)
{
@@ -84,17 +87,23 @@
}
catch (IllegalArgumentException e)
{
- throw new ValidatorException(new FacesMessage(bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_ERROR")));
+ throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR,
+ bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_ERROR"),
+ bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_ERROR")));
}
catch (IdentityException e)
{
log.error("Error validation username", e);
- throw new ValidatorException(new FacesMessage(bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_ERROR")));
+ throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR,
+ bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_ERROR"),
+ bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_ERROR")));
}
catch (CoreIdentityConfigurationException e)
{
log.error("Error validation username", e);
- throw new ValidatorException(new FacesMessage(bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_ERROR")));
+ throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR,
+ bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_ERROR"),
+ bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_ERROR")));
}
}
}
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2008-07-02 10:01:26 UTC (rev 11262)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2008-07-02 13:21:04 UTC (rev 11263)
@@ -178,4 +178,6 @@
IDENTITY_DYNAMIC_VALUE_TEST2=test label2
javax.portlet.title=User profile
-javax.portlet.keywords=management,user
\ No newline at end of file
+javax.portlet.keywords=management,user
+
+javax.faces.component.UIInput.REQUIRED=Value is required
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2008-07-02 10:01:26 UTC (rev 11262)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2008-07-02 13:21:04 UTC (rev 11263)
@@ -294,3 +294,4 @@
IDENTITY_YIM = Identifiant Yahoo
javax.portlet.title=Utilisateur
+javax.faces.component.UIInput.REQUIRED=Valeur requise
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2008-07-02 10:01:26 UTC (rev 11262)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2008-07-02 13:21:04 UTC (rev 11263)
@@ -39,7 +39,7 @@
<supported-locale>it</supported-locale>
<supported-locale>ru</supported-locale>
</locale-config>
-
+ <message-bundle>conf.bundles.Identity</message-bundle>
</application>
<factory>
<faces-context-factory>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/index.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/index.xhtml 2008-07-02 10:01:26 UTC (rev 11262)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/index.xhtml 2008-07-02 13:21:04 UTC (rev 11263)
@@ -15,7 +15,7 @@
<ui:define name="content">
<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /></h3>
- <h:messages id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
+ <h:messages style="list-style:none" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
<h:form>
<h:panelGrid>
@@ -41,7 +41,7 @@
</td>
</tr>
<c:if test="#{useradministrationbean.pendingCount > 0}">
- <tr class="portlet-section-body">
+ <tr class="line-item">
<td> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_COUNT_PENDING_USERS}" /></td>
<td><h:outputText value="#{useradministrationbean.pendingCount}" /></td>
</tr>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles.xhtml 2008-07-02 10:01:26 UTC (rev 11262)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles.xhtml 2008-07-02 13:21:04 UTC (rev 11263)
@@ -15,7 +15,7 @@
<ui:define name="content">
<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" /></h3>
- <h:messages id="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
+ <h:messages style="list-style:none" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
<br/>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/confirm.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/confirm.xhtml 2008-07-02 10:01:26 UTC (rev 11262)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/common/confirm.xhtml 2008-07-02 13:21:04 UTC (rev 11263)
@@ -27,7 +27,8 @@
</h:column>
</h:dataTable>
</c:if>
- <h:messages />
+ <h:messages style="list-style:none" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
+ fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
<hr/>
<p style="text-align: right;">
<h:commandButton value="#{bundle.IDENTITY_BUTTON_EDIT}" action="revise" styleClass="portlet-form-button"/>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/index.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/index.xhtml 2008-07-02 10:01:26 UTC (rev 11262)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/index.xhtml 2008-07-02 13:21:04 UTC (rev 11263)
@@ -20,5 +20,6 @@
</c:choose>
</c:otherwise>
</c:choose>
- <h:messages />
+ <h:messages style="list-style:none" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
+ fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
</div>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/status.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/status.xhtml 2008-07-02 10:01:26 UTC (rev 11262)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/lostPassword/status.xhtml 2008-07-02 13:21:04 UTC (rev 11263)
@@ -12,7 +12,8 @@
<h:outputText value="#{bundle.IDENTITY_LOST_PASSWORD_STATUS_TITLE}" />
</ui:define>
<ui:define name="content">
- <h:messages />
+ <h:messages style="list-style:none" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
+ fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
</ui:define>
</ui:composition>
</div>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/status.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/status.xhtml 2008-07-02 10:01:26 UTC (rev 11262)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/profile/status.xhtml 2008-07-02 13:21:04 UTC (rev 11263)
@@ -17,7 +17,8 @@
</ui:define>
<ui:define name="content">
- <h3><h:messages /></h3>
+ <h3><h:messages style="list-style:none" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
+ fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/></h3>
</ui:define>
</ui:composition>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/success.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/success.xhtml 2008-07-02 10:01:26 UTC (rev 11262)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/register/success.xhtml 2008-07-02 13:21:04 UTC (rev 11263)
@@ -12,7 +12,8 @@
<h:outputText value="#{bundle.IDENTITY_REGISTER_STATUS_TITLE}"/>
</ui:define>
<ui:define name="content">
- <h3><h:messages /></h3>
+ <h3><h:messages style="list-style:none" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
+ fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/></h3>
</ui:define>
</ui:composition>
</div>
\ No newline at end of file
16 years
JBoss Portal SVN: r11262 - branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-07-02 06:01:26 -0400 (Wed, 02 Jul 2008)
New Revision: 11262
Removed:
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/support.html
Log:
- Removed
Deleted: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/support.html
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/support.html 2008-07-02 09:56:09 UTC (rev 11261)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/support.html 2008-07-02 10:01:26 UTC (rev 11262)
@@ -1,36 +0,0 @@
-<table width="100%" border="0" cellpadding="2">
-<tr>
-<td valign="top" align="left" class="portlet-section-body"><font class="portlet-font">JBoss Inc. delivers the Professional Support, Consulting, and Training that you need whether you are testing a proof of concept, deploying a mission-critical application, or rolling out JEMS across your enterprise. </font></td>
-<td valign="top" align="right"><img src="default/images/jbosslogo.png"></td>
-</tr>
-<tr>
-<td colspan="2">
-<table width="100%" border="0" cellpadding="2">
-<tr>
-<td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td>
-<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
-<a href="http://www.jboss.com/services/profsupport" target="_blank">Professional Support</a>
-<br/>
-The JBoss Subscription is a set of services and tools that assist you during every stage of the application lifecycle - from design and development, thru testing and deployment, to on-going management and monitoring of your enterprise application deployments. JBoss Subscriptions allow you to reduce business, legal, and technical risks while enabling you to more effectively utilize your team's resources. A JBoss Subscription will ensure that you achieve a much greater success rate for all of your JEMS-based projects.
-</font></td>
-</tr>
-<tr>
-<td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td>
-<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
-<a href="http://www.jboss.com/services/consulting" target="_blank">Consulting Services</a>
-<br/>
-JBoss offers short-term on-site JEMS consulting engagements that provide you expert assistance at various stages of the application lifecycle. All engagements are delivered by certified JEMS consultants.
-</font></td>
-</tr>
-<tr>
-<td class="portlet-section-alternate" width="16" valign="top" align="left"><img src="default/images/check.gif"></td>
-<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
-<a href="http://www.jboss.com/services/training" target="_blank">Training and Certification</a>
-<br/>
-A Certified JBoss Web Developer is capable of implementing presentation tier components for J2EE applications. They have the base knowledge on Servlet and JSP technology, Portlet specification, Tomcat Servlet container and JBoss Portal. A Certified JBoss Developer for web tier is able to implement and deploy presentation components (Web Archives) on Tomcat server and Portlet components on JBoss Portal implementation.
-</font></td>
-</tr>
-</table>
-</table>
-<br/>
-<a href="default/index.html"><img src="default/images/back.gif" border="0" alt="back"></a>
16 years
JBoss Portal SVN: r11261 - in branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default: images and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-07-02 05:56:09 -0400 (Wed, 02 Jul 2008)
New Revision: 11261
Added:
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/epp.html
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/stamp.png
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/project.html
Log:
- Modified default CMS content
Copied: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/epp.html (from rev 11253, branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/support.html)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/epp.html (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/epp.html 2008-07-02 09:56:09 UTC (rev 11261)
@@ -0,0 +1,75 @@
+<table border="0" cellpadding="2" width="100%">
+ <tbody>
+ <tr>
+ <td class="portlet-section-body" align="left" valign="top">
+ <h2>Enteprise Portal Platform</h2>
+ <p><font>JBoss Enterprise Middleware delivers the
+ Professional Support, Consulting, and Training that you need whether
+ you are testing a proof of concept, deploying a mission-critical
+ application, or rolling out JBoss Portal across your enterprise. </font></p>
+ </td>
+ <td align="right" valign="top"><img
+ src="/portal/content/default/images/jbosslogo.png" border="0" /></td>
+ <td>All the following services are <a
+ href="http://www.redhat.com/jboss/platforms/portals/">available
+ with the Enterprise Portal Platform</a>. The Enterprise Portal Platform
+ is a set of components with long term support. Only bug fixes are
+ applied to guarantee the best stability in a mission critical
+ environment.
+ <td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <table border="0" cellpadding="2" width="100%">
+ <tbody>
+ <tr>
+ <td class="portlet-section-alternate" align="left" valign="top">
+ <h2><font> <a
+ href="http://www.jboss.com/services/profsupport" target="_blank">Professional
+ Support</a> </font></h2>
+ <font> The JBoss Subscription is a set of services and
+ tools that assist you during every stage of the application
+ lifecycle - from design and development, thru testing and
+ deployment, to on-going management and monitoring of your
+ enterprise application deployments. JBoss Subscriptions allow you
+ to reduce business, legal, and technical risks while enabling you
+ to more effectively utilize your team's resources.</font> Support is
+ guaranteed through the <a
+ href="https://support.redhat.com/jbossnetwork/login.html">Customer
+ Support Portal</a>. If you don't have a subscription yet, you can <a
+ href="https://www.redhat.com/apps/store/jboss/portal.html">buy
+ it here, right now</a>.</td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate" align="left" valign="top">
+ <h2><font> <a
+ href="http://www.jboss.com/services/consulting" target="_blank">Consulting
+ Services</a> </font></h2>
+ <font>JBoss Enteprise Middleware offers short-term on-site
+ consulting engagements that provide you expert assistance at
+ various stages of the application lifecycle. All engagements are
+ delivered by certified consultants. </font></td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate" align="left" valign="top">
+ <h2><font> <a
+ href="http://www.jboss.com/services/training" target="_blank">Training
+ and Certification</a> </font></h2>
+ <font> A Certified JBoss Web Developer is capable of
+ implementing presentation tier components for J2EE applications.
+ They have the base knowledge on Servlet and JSP technology,
+ Portlet specification, Tomcat Servlet container and JBoss Portal.
+ A Certified JBoss Developer for web tier is able to implement and
+ deploy presentation components (Web Archives) on Tomcat server and
+ Portlet components on JBoss Portal implementation. </font></td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+ </tbody>
+</table>
+<br />
+<a href="/portal/content/default/index.html"><img
+ src="/portal/content/default/images/back.gif" border="0" alt="back"
+ align="absmiddle" /> Back</a>
Added: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/stamp.png
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/stamp.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html 2008-07-02 09:35:40 UTC (rev 11260)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html 2008-07-02 09:56:09 UTC (rev 11261)
@@ -5,8 +5,11 @@
<div>
<img src="default/images/info-banner.gif" width="626" height="73" border="0" usemap="#Map" alt="Services"/>
<map name="Map">
- <area shape="rect" coords="1,1,201,72" href="/portal/content/default/support.html">
+ <area shape="rect" coords="1,1,201,72" href="/portal/content/default/epp.html">
<area shape="rect" coords="201,0,439,73" href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=215">
<area shape="rect" coords="439,1,626,73" href="/portal/content/default/project.html">
</map>
</div>
+<div style="margin-left:215px; margin-top:30px">
+ <img src="default/images/stamp.png" alt="Stamp"/>
+</div>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/project.html
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/project.html 2008-07-02 09:35:40 UTC (rev 11260)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/project.html 2008-07-02 09:56:09 UTC (rev 11261)
@@ -1,67 +1,73 @@
-<table width="100%" border="0" cellpadding="2">
- <tr>
- <td valign="top" align="left" class="portlet-section-body" colspan="2"><font class="portlet-font">JBoss Inc. delivers the
- Professional Support, Consulting, and Training that you need whether you are testing a proof of concept,
- deploying a mission-critical application, or rolling out JEMS across your enterprise. </font></td>
- </tr>
- <tr>
- <td colspan="2">
- <table width="100%" border="0" cellpadding="2">
- <tr>
- <td class="portlet-section-alternate" width="16" valign="top" align="left"><img
- src="default/images/check.gif"></td>
- <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
- <a href="http://labs.jboss.com/portal/jbossportal/index.html" target="_blank">JBoss Portal Home</a>
- <br/>
- The Epicenter of everything JBoss Portal.</font></td>
- </tr>
- <tr>
- <td class="portlet-section-alternate" width="16" valign="top" align="left"><img
- src="default/images/check.gif"></td>
- <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
- <a href="http://labs.jboss.com/portal/jbossportal/docs/index.html" target="_blank">Documentation</a>
- <br/>
- Here you will find user documentation, reference documentation, tutorials, and javadoc.</font></td>
- </tr>
- <tr>
- <td class="portlet-section-alternate" width="16" valign="top" align="left"><img
- src="default/images/check.gif"></td>
- <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
- <a href="http://www.jboss.com/index.html?module=bb&op=viewforum&f=215" target="_blank">Forums</a>
- <br/>
- Our forums are the main channel of communication between all community
- members. If you have any questions or concerns, please use
- our <a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=215" target="_blank">User
- Forums</a>, <a href="/index.html?module=bb&op=viewforum&f=205" target="_blank">Developer
- Forums</a>, or <a href="http://jboss.org/index.html?module=bb&op=viewforum&f=232" target="_blank">WSRP Forums</a> to voice them. Project developers and community members are always there to help.
- </font></td>
- </tr>
- <tr>
- <td class="portlet-section-alternate" width="16" valign="top" align="left"><img
- src="default/images/check.gif"></td>
- <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
- <a href="http://www.jboss.com/wiki/Wiki.jsp?page=JBossPortal" target="_blank">Wiki</a>
- <br/>
- Our wiki knowledge base is a user and developer contributed collection of important resources regarding
- JBoss Portal.</font></td>
- </tr>
- <tr>
- <td class="portlet-section-alternate" width="16" valign="top" align="left"><img
- src="default/images/check.gif"></td>
- <td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font">
- <a href="http://jira.jboss.com/jira/secure/BrowseProject.jspa?id=10050" target="_blank">Jira</a>
- <br/>
- JBoss Portal uses the JIRA tracking and project management system to organize and prioritize tasks.<br>
- <a href="http://jira.jboss.com/jira/secure/BrowseProject.jspa?id=10050" target="_blank">JBoss Portal</a>
- | <a
- href="http://jira.jboss.com/jira/browse/JBPORTAL?report=com.atlassian.jira.plug..."
- target="_blank">Open Issues</a>
- | <a
- href="http://jira.jboss.com/jira/browse/JBPORTAL?report=com.atlassian.jira.plug..."
- target="_blank">Roadmap</a></font></td>
- </tr>
- </table>
+
+<table border="0" cellpadding="2" width="100%">
+ <tbody>
+ <tr>
+ <td class="portlet-section-body" colspan="2" align="left"
+ valign="top">
+ <h2>Project <br />
+ </h2>
+ <p><font>JBoss Portal as a project is where all the innovation happens, freely available
+ it exists to satisfy both the comunnity and the customers looking for the future of the
+ <a href="/portal/content/default/support.html">Enterprise Portal Platform</a>.</font></p>
+ </td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate" align="left" valign="top">
+ <h2><font> <a
+ href="http://labs.jboss.com/portal/jbossportal/index.html"
+ target="_blank">JBoss Portal Home</a> </font></h2>
+ <font> The Epicenter of everything JBoss Portal.</font></td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate" align="left" valign="top">
+ <h2><font> <a
+ href="http://labs.jboss.com/portal/jbossportal/docs/index.html"
+ target="_blank">Documentation</a> </font></h2>
+ <font> Here you will find user documentation, reference
+ documentation, tutorials, and javadoc.</font></td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate" align="left" valign="top">
+ <h2><font> <a
+ href="http://www.jboss.com/index.html?module=bb&op=viewforum&f=215"
+ target="_blank">Forums</a> </font></h2>
+ <font> Our forums are the main channel of communication
+ between all community members. If you have any questions or concerns,
+ please use our <a
+ href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=215"
+ target="_blank">User Forums</a>, <a
+ href="/index.html?module=bb&op=viewforum&f=205"
+ target="_blank">Developer Forums</a>, or <a
+ href="http://jboss.org/index.html?module=bb&op=viewforum&f=232"
+ target="_blank">WSRP Forums</a> to voice them. Project developers
+ and community members are always there to help. </font></td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate" align="left" valign="top">
+ <h2><font> <a
+ href="http://www.jboss.com/wiki/Wiki.jsp?page=JBossPortal"
+ target="_blank">Wiki</a> </font></h2>
+ <font> Our wiki knowledge base is a user and developer
+ contributed collection of important resources regarding JBoss Portal.</font></td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate" align="left" valign="top">
+ <h2><font> <a
+ href="http://jira.jboss.com/jira/secure/BrowseProject.jspa?id=10050"
+ target="_blank">Jira</a> </font></h2>
+ <font> JBoss Portal uses the JIRA tracking and project
+ management system to organize and prioritize tasks.<br />
+ <a
+ href="http://jira.jboss.com/jira/secure/BrowseProject.jspa?id=10050"
+ target="_blank">JBoss Portal</a> | <a
+ href="http://jira.jboss.com/jira/browse/JBPORTAL?report=com.atlassian.jira.plug..."
+ target="_blank">Open Issues</a> | <a
+ href="http://jira.jboss.com/jira/browse/JBPORTAL?report=com.atlassian.jira.plug..."
+ target="_blank">Roadmap</a></font></td>
+ </tr>
+ </tbody>
</table>
-<br/>
-<a href="default/index.html"><img src="default/images/back.gif" border="0" alt="back"></a>
-
+<br />
+<a href="/portal/content/default/index.html"><img
+ src="/portal/content/default/images/back.gif" border="0" alt="back"
+ align="absmiddle" /> Back</a>
16 years
JBoss Portal SVN: r11260 - branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-07-02 05:35:40 -0400 (Wed, 02 Jul 2008)
New Revision: 11260
Modified:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml
Log:
- Reverted use of ui:repeat as it doesn't work properly e.g. prop.name doesn't show. Will be investigated for 2.7 though.
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2008-07-02 09:19:08 UTC (rev 11259)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2008-07-02 09:35:40 UTC (rev 11260)
@@ -89,8 +89,9 @@
<th class="descColumn">#{i18n.edit_consumer_prop_desc}</th>
<th>#{i18n.edit_consumer_prop_value}</th>
</tr>
- <tr jsfc="ui:repeat" value="#{consumer.producerInfo.registrationInfo.registrationProperties}"
- var="prop" title="#{prop.description.label.value}">
+ <c:forEach items="#{consumer.producerInfo.registrationInfo.registrationProperties}"
+ var="prop">
+ <tr title="#{prop.description.label.value}">
<td>#{prop.name}</td>
<td>#{prop.description.label.value}</td>
<td>
@@ -101,6 +102,7 @@
rendered="#{prop.determinedInvalid}"/>
</td>
</tr>
+ </c:forEach>
</table>
<h:commandLink action="#{consumer.update}"
value="#{i18n.edit_consumer_registration_update_props}"
@@ -132,8 +134,8 @@
<th class="descColumn">#{i18n.edit_consumer_prop_desc}</th>
<th>#{i18n.edit_consumer_prop_value}</th>
</tr>
- <tr jsfc="ui:repeat" value="#{consumer.expectedRegistrationInfo.registrationProperties}"
- var="prop" title="#{prop.description.label.value}">
+ <c:forEach items="#{consumer.expectedRegistrationInfo.registrationProperties}" var="prop">
+ <tr title="#{prop.description.label.value}">
<td>#{prop.name}</td>
<td>#{prop.description.label.value}</td>
<td>
@@ -142,6 +144,7 @@
rendered="#{prop.determinedInvalid}"/>
</td>
</tr>
+ </c:forEach>
</table>
</c:when>
<c:otherwise>
16 years