JBoss Portal SVN: r8235 - trunk/core-identity/src/resources/portal-identity-sar/conf and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-12 04:04:19 -0400 (Wed, 12 Sep 2007)
New Revision: 8235
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml
trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml
Log:
minor
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-11 21:35:43 UTC (rev 8234)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-12 08:04:19 UTC (rev 8235)
@@ -26,9 +26,9 @@
<!--
subscription mode - defines the workflow used for registering users
available default options:
- - automatic
- - jbp_identity_validation_workflow
- - jbp_identity_validation_approval_workflow
+ - automatic: No email validation, No admin approval
+ - jbp_identity_validation_workflow: Email verification, No admin approval
+ - jbp_identity_validation_approval_workflow: Email verification, Admin approval
-->
<subscription-mode>automatic</subscription-mode>
<!--
@@ -36,7 +36,7 @@
-->
<overwrite-workflow>false</overwrite-workflow>
<!--
- email-domain: used for sending e-mails
+ email-domain: used in the email template sent for email verification
-->
<email-domain>jboss.org</email-domain>
<!--
Modified: trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-11 21:35:43 UTC (rev 8234)
+++ trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-12 08:04:19 UTC (rev 8235)
@@ -26,9 +26,9 @@
<!--
subscription mode - defines the workflow used for registering users
available default options:
- - automatic
- - jbp_identity_validation_workflow
- - jbp_identity_validation_approval_workflow
+ - automatic: No email validation, No admin approval
+ - jbp_identity_validation_workflow: Email verification, No admin approval
+ - jbp_identity_validation_approval_workflow: Email verification, Admin approval
-->
<subscription-mode>automatic</subscription-mode>
<!--
@@ -36,7 +36,7 @@
-->
<overwrite-workflow>false</overwrite-workflow>
<!--
- email-domain: used for sending e-mails
+ email-domain: used in the email template sent for email verification
-->
<email-domain>jboss.org</email-domain>
<!--
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r8234 - in trunk/core-admin/src/resources/portal-admin-war: WEB-INF/jsf and 1 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-09-11 17:35:43 -0400 (Tue, 11 Sep 2007)
New Revision: 8234
Added:
trunk/core-admin/src/resources/portal-admin-war/img/
trunk/core-admin/src/resources/portal-admin-war/img/pathSeparator.png
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml
Log:
- JBPORTAL-1690: added action* styles.
- JBPORTAL-1691: added placeholder image.
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2007-09-11 21:17:00 UTC (rev 8233)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2007-09-11 21:35:43 UTC (rev 8234)
@@ -15,8 +15,8 @@
<li>
<h:commandLink action="instances">Portlet Instances</h:commandLink>
</li>
- <li>></li>
- <li class="selected">
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected actionDelete">
<span class="objectName">#{instancemgr.selectedInstance.id}</span> instance Delete
</li>
</ul>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-09-11 21:17:00 UTC (rev 8233)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-09-11 21:35:43 UTC (rev 8234)
@@ -30,20 +30,21 @@
<f:param name="plugin" value="info"/>
</h:commandLink>
</td>
- <td><h:commandLink action="#{instancemgr.selectInstance}">
- <h:outputText value="Security"/>
+ <td><h:commandLink action="#{instancemgr.selectInstance}" styleClass="actionSecurity">
<f:param name="id" value="#{instance.id}"/>
<f:param name="plugin" value="security"/>
+ Security
</h:commandLink> | <h:panelGroup
rendered="#{! empty(instancemgr.selectedInstancesPrefs[instance.id])}"><h:commandLink
- action="#{instancemgr.selectInstance}">
- <h:outputText value="Preferences"/>
+ action="#{instancemgr.selectInstance}" styleClass="actionPreferences">
<f:param name="id" value="#{instance.id}"/>
<f:param name="plugin" value="preferences"/>
+ Preferences
</h:commandLink> | </h:panelGroup><h:commandLink action="confirmDeleteInstance"
+ styleClass="actionDelete"
actionListener="#{instancemgr.selectInstance}">
- <h:outputText value="Delete"/>
<f:param name="id" value="#{instance.id}"/>
+ Delete
</h:commandLink>
</td>
</tr>
@@ -74,8 +75,8 @@
<li>
<h:commandLink action="#{instancemgr.selectInstance}">Portlet Instances</h:commandLink>
</li>
- <li>></li>
- <li class="selected">
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected actionDetails">
<span class="objectName">#{instancemgr.selectedInstance.id}</span> portlet details
</li>
</ul>
@@ -101,8 +102,8 @@
<li>
<h:commandLink action="#{instancemgr.selectInstance}">Portlet Instances</h:commandLink>
</li>
- <li>></li>
- <li class="selected">
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected actionPreferences">
<span class="objectName">#{instancemgr.selectedInstance.id}</span> preferences
</li>
</ul>
@@ -124,8 +125,8 @@
<li>
<h:commandLink action="#{instancemgr.selectInstance}">Portlet Instances</h:commandLink>
</li>
- <li>></li>
- <li class="selected">
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected actionSecurity">
<span class="objectName">#{instancemgr.selectedInstance.id}</span> security settings
</li>
</ul>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-09-11 21:17:00 UTC (rev 8233)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-09-11 21:35:43 UTC (rev 8234)
@@ -27,7 +27,7 @@
<ul class="objectpath">
<c:forEach items="#{portalobjectmgr.selectedObjectPath}" var="node">
<c:if test="#{node.type != PortalObject.TYPE_CONTEXT}">
- <li>></li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
</c:if>
<li class="#{node.id == portalobjectmgr.selectedObject.id ? 'selected' : ''}">
<h:commandLink action="#{portalobjectmgr.selectObject}">
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-09-11 21:17:00 UTC (rev 8233)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-09-11 21:35:43 UTC (rev 8234)
@@ -5,7 +5,8 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:jbp="http://www.jboss.com/portal"
xmlns:c="http://java.sun.com/jstl/core"
- xmlns:pfc="http://www.jboss.com/portal/facelet/common">
+ xmlns:pfc="http://www.jboss.com/portal/facelet/common"
+ xmlns:portlet="http://java.sun.com/portlet">
<ui:composition template="portletsTemplate.xhtml">
@@ -56,12 +57,12 @@
<td><h:selectBooleanCheckbox disabled="true" value="#{portlet.remotable}"/></td>
<td>
<h:panelGroup rendered="#{!empty portlet.info.preferences.keys}">
- <h:commandLink action="#{portletmgr.selectPortlet}">
+ <h:commandLink action="#{portletmgr.selectPortlet}" styleClass="actionPreferences">
<f:param name="id" value="#{portlet.context.id}"/>
<f:param name="plugin" value="preferences"/>
Preferences
</h:commandLink> | </h:panelGroup>
- <h:commandLink action="#{portletmgr.selectPortlet}">
+ <h:commandLink action="#{portletmgr.selectPortlet}" styleClass="actionCreateInstance">
<f:param name="id" value="#{portlet.context.id}"/>
<f:param name="plugin" value="createInstance"/>
Create instance
@@ -94,8 +95,8 @@
<li>
<h:commandLink action="#{portletmgr.selectPortlet}">Portlet Definitions</h:commandLink>
</li>
- <li>></li>
- <li class="selected">
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected actionDetails">
<span class="objectName">#{portletmgr.selectedPortlet.name.value}</span> details
</li>
</ul>
@@ -113,8 +114,8 @@
<li>
<h:commandLink action="#{portletmgr.selectPortlet}">Portlet Definitions</h:commandLink>
</li>
- <li>></li>
- <li class="selected">
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected actionPreferences">
<span class="objectName">#{portletmgr.selectedPortlet.name.value}</span> preferences
</li>
</ul>
@@ -132,8 +133,8 @@
<li>
<h:commandLink action="#{portletmgr.selectPortlet}">Portlet Definitions</h:commandLink>
</li>
- <li>></li>
- <li class="selected">
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected actionCreateInstance">
<span class="objectName">#{portletmgr.selectedPortlet.name.value}</span> instance creation
</li>
</ul>
Added: trunk/core-admin/src/resources/portal-admin-war/img/pathSeparator.png
===================================================================
(Binary files differ)
Property changes on: trunk/core-admin/src/resources/portal-admin-war/img/pathSeparator.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r8233 - in branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war: WEB-INF/jsf and 1 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-09-11 17:17:00 -0400 (Tue, 11 Sep 2007)
New Revision: 8233
Added:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/pathSeparator.png
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml
Log:
- JBPORTAL-1690: added action* styles.
- JBPORTAL-1691: added placeholder image.
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2007-09-11 16:10:40 UTC (rev 8232)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2007-09-11 21:17:00 UTC (rev 8233)
@@ -15,8 +15,8 @@
<li>
<h:commandLink action="instances">Portlet Instances</h:commandLink>
</li>
- <li>></li>
- <li class="selected">
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected actionDelete">
<span class="objectName">#{instancemgr.selectedInstance.id}</span> instance Delete
</li>
</ul>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-09-11 16:10:40 UTC (rev 8232)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-09-11 21:17:00 UTC (rev 8233)
@@ -30,20 +30,21 @@
<f:param name="plugin" value="info"/>
</h:commandLink>
</td>
- <td><h:commandLink action="#{instancemgr.selectInstance}">
- <h:outputText value="Security"/>
+ <td><h:commandLink action="#{instancemgr.selectInstance}" styleClass="actionSecurity">
<f:param name="id" value="#{instance.id}"/>
<f:param name="plugin" value="security"/>
+ Security
</h:commandLink> | <h:panelGroup
rendered="#{! empty(instancemgr.selectedInstancesPrefs[instance.id])}"><h:commandLink
- action="#{instancemgr.selectInstance}">
- <h:outputText value="Preferences"/>
+ action="#{instancemgr.selectInstance}" styleClass="actionPreferences">
<f:param name="id" value="#{instance.id}"/>
<f:param name="plugin" value="preferences"/>
+ Preferences
</h:commandLink> | </h:panelGroup><h:commandLink action="confirmDeleteInstance"
+ styleClass="actionDelete"
actionListener="#{instancemgr.selectInstance}">
- <h:outputText value="Delete"/>
<f:param name="id" value="#{instance.id}"/>
+ Delete
</h:commandLink>
</td>
</tr>
@@ -74,8 +75,8 @@
<li>
<h:commandLink action="#{instancemgr.selectInstance}">Portlet Instances</h:commandLink>
</li>
- <li>></li>
- <li class="selected">
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected actionDetails">
<span class="objectName">#{instancemgr.selectedInstance.id}</span> portlet details
</li>
</ul>
@@ -101,8 +102,8 @@
<li>
<h:commandLink action="#{instancemgr.selectInstance}">Portlet Instances</h:commandLink>
</li>
- <li>></li>
- <li class="selected">
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected actionPreferences">
<span class="objectName">#{instancemgr.selectedInstance.id}</span> preferences
</li>
</ul>
@@ -124,8 +125,8 @@
<li>
<h:commandLink action="#{instancemgr.selectInstance}">Portlet Instances</h:commandLink>
</li>
- <li>></li>
- <li class="selected">
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected actionSecurity">
<span class="objectName">#{instancemgr.selectedInstance.id}</span> security settings
</li>
</ul>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-09-11 16:10:40 UTC (rev 8232)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-09-11 21:17:00 UTC (rev 8233)
@@ -27,7 +27,7 @@
<ul class="objectpath">
<c:forEach items="#{portalobjectmgr.selectedObjectPath}" var="node">
<c:if test="#{node.type != PortalObject.TYPE_CONTEXT}">
- <li>></li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
</c:if>
<li class="#{node.id == portalobjectmgr.selectedObject.id ? 'selected' : ''}">
<h:commandLink action="#{portalobjectmgr.selectObject}">
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-09-11 16:10:40 UTC (rev 8232)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-09-11 21:17:00 UTC (rev 8233)
@@ -5,7 +5,8 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:jbp="http://www.jboss.com/portal"
xmlns:c="http://java.sun.com/jstl/core"
- xmlns:pfc="http://www.jboss.com/portal/facelet/common">
+ xmlns:pfc="http://www.jboss.com/portal/facelet/common"
+ xmlns:portlet="http://java.sun.com/portlet">
<ui:composition template="portletsTemplate.xhtml">
@@ -56,12 +57,12 @@
<td><h:selectBooleanCheckbox disabled="true" value="#{portlet.remotable}"/></td>
<td>
<h:panelGroup rendered="#{!empty portlet.info.preferences.keys}">
- <h:commandLink action="#{portletmgr.selectPortlet}">
+ <h:commandLink action="#{portletmgr.selectPortlet}" styleClass="actionPreferences">
<f:param name="id" value="#{portlet.context.id}"/>
<f:param name="plugin" value="preferences"/>
Preferences
</h:commandLink> | </h:panelGroup>
- <h:commandLink action="#{portletmgr.selectPortlet}">
+ <h:commandLink action="#{portletmgr.selectPortlet}" styleClass="actionCreateInstance">
<f:param name="id" value="#{portlet.context.id}"/>
<f:param name="plugin" value="createInstance"/>
Create instance
@@ -94,8 +95,8 @@
<li>
<h:commandLink action="#{portletmgr.selectPortlet}">Portlet Definitions</h:commandLink>
</li>
- <li>></li>
- <li class="selected">
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected actionDetails">
<span class="objectName">#{portletmgr.selectedPortlet.name.value}</span> details
</li>
</ul>
@@ -113,8 +114,8 @@
<li>
<h:commandLink action="#{portletmgr.selectPortlet}">Portlet Definitions</h:commandLink>
</li>
- <li>></li>
- <li class="selected">
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected actionPreferences">
<span class="objectName">#{portletmgr.selectedPortlet.name.value}</span> preferences
</li>
</ul>
@@ -132,8 +133,8 @@
<li>
<h:commandLink action="#{portletmgr.selectPortlet}">Portlet Definitions</h:commandLink>
</li>
- <li>></li>
- <li class="selected">
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected actionCreateInstance">
<span class="objectName">#{portletmgr.selectedPortlet.name.value}</span> instance creation
</li>
</ul>
Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/pathSeparator.png
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/pathSeparator.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r8232 - in branches/JBoss_Portal_Branch_2_6/core-identity/src: resources/portal-identity-sar/conf/processes and 8 other directories.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-11 12:10:40 -0400 (Tue, 11 Sep 2007)
New Revision: 8232
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/custom.xml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet-instances.xml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
Log:
- update missing changes
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-09-11 16:10:40 UTC (rev 8232)
@@ -75,6 +75,7 @@
/** . */
private static final Logger log = Logger.getLogger(EditProfileAction.class);
+ /** The EditProfileAction constructor */
public EditProfileAction()
{
FacesContext ctx = FacesContext.getCurrentInstance();
@@ -191,6 +192,7 @@
ExternalContext ectx = ctx.getExternalContext();
Map params = ectx.getRequestParameterMap();
this.currentUser = (String) params.get("currentUser");
+ this.windowState = null;
if (this.currentUser == null)
{
this.currentUser = ectx.getRemoteUser();
@@ -201,6 +203,7 @@
public String updateProfile()
{
+ FacesContext ctx = FacesContext.getCurrentInstance();
try
{
User user = identityUserBean.findUserByUserName(this.currentUser);
@@ -209,17 +212,29 @@
}
catch (RuntimeException e)
{
- ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_PROFILE_ERROR")));
log.error("",e);
}
catch (IdentityException e)
{
- ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale());
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(bundle.getString("IDENTITY_EDIT_PROFILE_ERROR")));
log.error("",e);
}
- return "editProfile";
+ if ( windowState != null)
+ {
+ try
+ {
+ JBossActionResponse response = (JBossActionResponse) ctx.getExternalContext().getResponse();
+ response.setWindowState(windowState);
+ }
+ catch(Exception e)
+ {
+ log.error("", e);
+ }
+ }
+ return "start";
}
public String changePassword()
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/custom.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/custom.xml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/custom.xml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE process-definition PUBLIC
- "-//jBpm/jBpm Mapping DTD 2.0//EN"
- "http://jbpm.org/dtd/processdefinition-2.0.dtd">
-
-<process-definition name="custom">
+<process-definition name="custom"
+ xmlns="urn:jbpm.org:jpdl-3.1">
<start-state>
<transition to="end">
<action class="org.jboss.portal.core.identity.services.workflow.impl.CreateUserAction"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -21,11 +21,9 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<!DOCTYPE process-definition PUBLIC
- "-//jBpm/jBpm Mapping DTD 2.0//EN"
- "http://jbpm.org/dtd/processdefinition-2.0.dtd">
-
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Schema for correct timer usage broken in jBPM 3.1.x
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<process-definition name="jbp_identity_validate_email">
<start-state>
<transition to="validate_email">
@@ -40,4 +38,4 @@
<transition name="timedOut" to="end"/>
</state>
<end-state name="end"/>
-</process-definition>
\ No newline at end of file
+</process-definition>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -21,11 +21,9 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<!DOCTYPE process-definition PUBLIC
- "-//jBpm/jBpm Mapping DTD 2.0//EN"
- "http://jbpm.org/dtd/processdefinition-2.0.dtd">
-
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Schema for correct timer usage broken in jBPM 3.1.x
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<process-definition name="jbp_identity_validation_approval_workflow">
<start-state>
<transition to="validate_email">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -21,11 +21,9 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<!DOCTYPE process-definition PUBLIC
- "-//jBpm/jBpm Mapping DTD 2.0//EN"
- "http://jbpm.org/dtd/processdefinition-2.0.dtd">
-
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Schema for correct timer usage broken in jBPM 3.1.x
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<process-definition name="jbp_identity_validation_workflow">
<start-state>
<transition to="validate_email">
@@ -33,11 +31,11 @@
</transition>
</start-state>
<state name="validate_email">
- <timer name="time_to_expire" duedate="2 days" transition="timedOut" />
+ <timer name="time_to_expire" duedate="2 days" transition="timedOut" />
<transition name="validated" to="end">
<action class="org.jboss.portal.core.identity.services.workflow.impl.CreateUserAction"/>
</transition>
<transition name="timedOut" to="end"/>
</state>
<end-state name="end"/>
-</process-definition>
\ No newline at end of file
+</process-definition>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -331,19 +331,25 @@
<from-outcome>adminChangePassword</from-outcome>
<to-view-id>/WEB-INF/jsf/admin/user/changePassword.xhtml</to-view-id>
</navigation-case>
+ <navigation-case>
+ <from-outcome>start</from-outcome>
+ <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id>
+ </navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/WEB-INF/jsf/admin/*</from-view-id>
<navigation-case>
+ <from-outcome>start</from-outcome>
+ <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+ <navigation-rule>
+ <from-view-id>/WEB-INF/jsf/admin/*</from-view-id>
+ <navigation-case>
<from-action>#{editprofilemgr.adminEditProfile}</from-action>
<from-outcome>editProfile</from-outcome>
<to-view-id>/WEB-INF/jsf/admin/editProfile.xhtml</to-view-id>
</navigation-case>
- <navigation-case>
- <from-action>#{editprofilemgr.updateProfile}</from-action>
- <from-outcome>editProfile</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id>
- </navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/WEB-INF/jsf/admin/*</from-view-id>
@@ -424,7 +430,18 @@
<from-action>#{lostpasswordmgr.doomed}</from-action>
<from-outcome>lostPassword</from-outcome>
<to-view-id>/WEB-INF/jsf/admin/editProfile.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
+ </navigation-case>
+ </navigation-rule>
+ <navigation-rule>
+ <from-view-id>/WEB-INF/jsf/admin/user/changePassword.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>status</from-outcome>
+ <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>searchUsers</from-outcome>
+ <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
</faces-config>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -27,7 +27,7 @@
<portlet-app>
<portlet>
- <portlet-name>CoreIdentityUserPortlet</portlet-name>
+ <portlet-name>IdentityUserPortlet</portlet-name>
<ajax>
<partial-refresh>false</partial-refresh>
</ajax>
@@ -39,7 +39,7 @@
</header-content>
</portlet>
<portlet>
- <portlet-name>CoreIdentityAdminPortlet</portlet-name>
+ <portlet-name>IdentityAdminPortlet</portlet-name>
<ajax>
<partial-refresh>false</partial-refresh>
</ajax>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -19,7 +19,8 @@
<f:selectItems value="#{identityrolemgr.roleSelectItems}" />
</h:selectManyCheckbox>
<hr/>
- <h:commandButton value="Submit" action="#{assignrolemgr.updateRoles}" styleClass="portlet-form-button"/>
+ <h:commandButton id="cancel" action="userAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{assignrolemgr.updateRoles}" styleClass="portlet-form-button"/>
</h:form>
</ui:define>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -7,7 +7,9 @@
class="identity-ui">
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
-<ui:define name="title"/>
+<ui:define name="title">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+</ui:define>
<ui:define name="content">
<h:form>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -22,7 +22,8 @@
<h:inputText id="roledisplayname" value="#{createrolemgr.uiRole.displayName}"/>
</h:panelGrid>
<hr/>
- <h:commandButton value="Submit" action="#{createrolemgr.createRole}" styleClass="portlet-form-button"/>
+ <h:commandButton id="cancel" action="roleAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{createrolemgr.createRole}" styleClass="portlet-form-button"/>
</h:form>
</ui:define>
</ui:composition>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -22,7 +22,8 @@
<h:inputText value="#{editrolemgr.uiRole.displayName}"/>
</h:panelGrid>
<hr/>
- <h:commandButton value="Submit" action="#{editrolemgr.updateRole}" styleClass="portlet-form-button"/>
+ <h:commandButton id="cancel" action="roleAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{editrolemgr.updateRole}" styleClass="portlet-form-button"/>
</h:form>
</ui:define>
</ui:composition>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -44,7 +44,7 @@
<f:facet name="header">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/>
</f:facet>
- <h:commandLink action="#{editprofilemgr.editProfile}">
+ <h:commandLink action="#{editprofilemgr.adminEditProfile}">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE}"/>
<f:param name="currentUser" value="#{uiUser.username}"/>
</h:commandLink> |
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -7,7 +7,9 @@
class="identity-ui">
<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml">
-<ui:define name="title" />
+<ui:define name="title">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+</ui:define>
<ui:define name="content">
<h:form>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -32,6 +32,7 @@
</h:panelGrid>
<hr/>
+ <h:commandButton id="cancel" action="searchUsers" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
<h:commandButton value="Submit" action="#{editprofilemgr.changePassword}" styleClass="portlet-form-button"/>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -19,7 +19,8 @@
<f:selectItems value="#{identityrolemgr.roleSelectItems}" />
</h:selectManyCheckbox>
<hr/>
- <h:commandButton value="Submit" action="register" styleClass="portlet-form-button"/>
+ <h:commandButton id="cancel" action="userAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="register" styleClass="portlet-form-button"/>
</h:form>
</ui:define>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -17,6 +17,7 @@
<h:form>
<p><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION}" /></p>
<hr/>
+ <h:commandButton id="cancel" action="userAdmin" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
<h:commandLink action="#{lostpasswordmgr.doomed}">
<h:outputText value="#{bundle.IDENTITY_BUTTON_SUBMIT}" />
<f:param name="currentUser" value="#{editprofilemgr.uiUser.username}" />
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -29,6 +29,7 @@
</c:if>
<h:messages />
<hr/>
+ <h:commandButton id="cancel" action="start" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
<h:commandButton value="#{bundle.IDENTITY_BUTTON_EDIT}" action="revise" styleClass="portlet-form-button"/>
<h:commandButton id="#{subscriptionMode}" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" actionListener="#{manager.register}" action="registered" styleClass="portlet-form-button"/>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -36,7 +36,7 @@
<h:message for="theme" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
<h:outputText value="#{bundle.IDENTITY_LOCALE}"/>
- <h:selectOneMenu id="locale" value="#{manager.uiUser.attribute.locale}" required="#{metadataservice.locale.required}">
+ <h:selectOneMenu id="locale" value="#{manager.uiUser.attribute.locale}" required="#{metadataservice.locale.required}">
<f:selectItems value="#{metadataservice.locale.values}" />
</h:selectOneMenu>
<h:panelGroup />
@@ -148,6 +148,7 @@
</h:panelGrid>
<hr/>
+ <h:commandButton id="cancel" action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
<h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{manager.updateProfile}" styleClass="portlet-form-button"/>
</h:form>
</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -42,6 +42,7 @@
<ui:include src="/WEB-INF/jsf/common/captcha.xhtml" />
<hr/>
+ <h:commandButton id="cancel" action="start" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
<h:commandButton id="submit" action="register" value="#{bundle.IDENTITY_BUTTON_SUBMIT}" styleClass="portlet-form-button"/>
</h:form>
</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -24,7 +24,8 @@
<!-- include captcha -->
<ui:include src="/WEB-INF/jsf/common/captcha.xhtml" />
- <hr/>
+ <hr/>
+ <h:commandButton id="cancel" action="start" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
<h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{lostpasswordmgr.doomed}" styleClass="portlet-form-button"/>
</h:form>
</ui:define>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -17,7 +17,7 @@
<h:commandLink value="#{bundle.IDENTITY_REGISTER}" action="register"/>
</li>
<li id="currentTab">
- <h:commandLink value="#{bundle.IDENTITY_LOST_PASSWORD}" action="lostPassword"/>
+ <h:outputText value="#{bundle.IDENTITY_LOST_PASSWORD}" />
</li>
</ul>
</h:form>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -30,6 +30,7 @@
<h:message for="email" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
</h:panelGrid>
<hr/>
+ <h:commandButton id="cancel" action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
<h:commandButton value="Submit" action="#{editprofilemgr.changeEmail}" styleClass="portlet-form-button"/>
</h:form>
</ui:define>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -38,6 +38,7 @@
</h:panelGrid>
<hr/>
+ <h:commandButton id="cancel" action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
<h:commandButton value="Submit" action="#{editprofilemgr.changePassword}" styleClass="portlet-form-button"/>
</h:form>
</ui:define>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfile.xhtml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -19,21 +19,21 @@
<h:outputText value="#{bundle.IDENTITY_USERNAME}:"/>
<h:outputText value="#{editprofilemgr.uiUser.username}"/>
- <h:outputText value="#{bundle.IDENTITY_EMAIL}:"/>
- <h:outputText value="#{editprofilemgr.uiUser.attribute.email}"/>
+ <h:outputText value="#{bundle.IDENTITY_EMAIL}:" rendered="#{editprofilemgr.uiUser.attribute.email != null}"/>
+ <h:outputText value="#{editprofilemgr.uiUser.attribute.email}" rendered="#{editprofilemgr.uiUser.attribute.email != null}"/>
- <h:outputText value="#{bundle.IDENTITY_GIVENNAME}:"/>
- <h:outputText value="#{editprofilemgr.uiUser.attribute.givenname}"/>
+ <h:outputText value="#{bundle.IDENTITY_GIVENNAME}:" rendered="#{editprofilemgr.uiUser.attribute.givenname != null}"/>
+ <h:outputText value="#{editprofilemgr.uiUser.attribute.givenname}" rendered="#{editprofilemgr.uiUser.attribute.givenname != null}"/>
- <h:outputText value="#{bundle.IDENTITY_FAMILYNAME}:"/>
- <h:outputText value="#{editprofilemgr.uiUser.attribute.familyname}"/>
-
- <h:outputText value="#{bundle.IDENTITY_HOMEPAGE}:"/>
- <h:outputText value="#{editprofilemgr.uiUser.attribute.homepage}"/>
+ <h:outputText value="#{bundle.IDENTITY_FAMILYNAME}:" rendered="#{editprofilemgr.uiUser.attribute.familyname != null}"/>
+ <h:outputText value="#{editprofilemgr.uiUser.attribute.familyname}" rendered="#{editprofilemgr.uiUser.attribute.familyname != null}"/>
- <h:outputText value="#{bundle.IDENTITY_LOCATION}:"/>
- <h:outputText value="#{editprofilemgr.uiUser.attribute.location}"/>
+ <h:outputText value="#{bundle.IDENTITY_LOCATION}:" rendered="#{editprofilemgr.uiUser.attribute.location != null}"/>
+ <h:outputText value="#{editprofilemgr.uiUser.attribute.location}" rendered="#{editprofilemgr.uiUser.attribute.location != null}"/>
+ <h:outputText value="#{bundle.IDENTITY_HOMEPAGE}:" rendered="#{editprofilemgr.uiUser.attribute.homepage != null}"/>
+ <h:outputText value="#{editprofilemgr.uiUser.attribute.homepage}" rendered="#{editprofilemgr.uiUser.attribute.homepage != null}"/>
+
</h:panelGrid>
</ui:define>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -11,7 +11,7 @@
<h:form>
<ul class="topnav">
<li id="currentTab">
- <h:commandLink value="#{bundle.IDENTITY_WELCOME}" action="start"/>
+ <h:outputText value="#{bundle.IDENTITY_WELCOME}"/>
</li>
<li>
<h:commandLink value="#{bundle.IDENTITY_REGISTER}" action="register"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet-instances.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet-instances.xml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet-instances.xml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -29,14 +29,14 @@
<deployments>
<deployment>
<instance>
- <instance-id>CoreIdentityUserPortletInstance</instance-id>
- <portlet-ref>CoreIdentityUserPortlet</portlet-ref>
+ <instance-id>IdentityUserPortletInstance</instance-id>
+ <portlet-ref>IdentityUserPortlet</portlet-ref>
</instance>
</deployment>
<deployment>
<instance>
- <instance-id>CoreIdentityAdminPortletInstance</instance-id>
- <portlet-ref>CoreIdentityAdminPortlet</portlet-ref>
+ <instance-id>IdentityAdminPortletInstance</instance-id>
+ <portlet-ref>IdentityAdminPortlet</portlet-ref>
<security-constraint>
<policy-permission>
<role-name>Admin</role-name>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2007-09-11 15:46:48 UTC (rev 8231)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2007-09-11 16:10:40 UTC (rev 8232)
@@ -30,7 +30,7 @@
<portlet>
<description>User portlet</description>
- <portlet-name>CoreIdentityUserPortlet</portlet-name>
+ <portlet-name>IdentityUserPortlet</portlet-name>
<display-name>User portlet</display-name>
<portlet-class>org.jboss.portal.faces.loader.FacesPortlet</portlet-class>
<init-param>
@@ -65,7 +65,7 @@
<portlet>
<description>User and role management portlet</description>
- <portlet-name>CoreIdentityAdminPortlet</portlet-name>
+ <portlet-name>IdentityAdminPortlet</portlet-name>
<display-name>User management portlet</display-name>
<portlet-class>org.jboss.portal.faces.loader.FacesPortlet</portlet-class>
<init-param>
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r8231 - branches/JBoss_Portal_Branch_2_6/faces.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-11 11:46:48 -0400 (Tue, 11 Sep 2007)
New Revision: 8231
Modified:
branches/JBoss_Portal_Branch_2_6/faces/.classpath
Log:
Eclipse update
Modified: branches/JBoss_Portal_Branch_2_6/faces/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/faces/.classpath 2007-09-11 15:27:23 UTC (rev 8230)
+++ branches/JBoss_Portal_Branch_2_6/faces/.classpath 2007-09-11 15:46:48 UTC (rev 8231)
@@ -12,10 +12,10 @@
<classpathentry combineaccessrules="false" kind="src" path="/api"/>
<classpathentry combineaccessrules="false" kind="src" path="/server"/>
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/bridge"/>
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-jsr168api-lib.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-bridge-lib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r8230 - in branches/JBoss_Portal_Branch_2_6: core/src/resources/portal-core-sar/conf/hibernate/workflow and 3 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-11 11:27:23 -0400 (Tue, 11 Sep 2007)
New Revision: 8230
Added:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/workflow/
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/workflow/ehcache.xml
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml
Removed:
branches/JBoss_Portal_Branch_2_6/workflow/src/resources/portal-workflow-sar/conf/
Modified:
branches/JBoss_Portal_Branch_2_6/workflow/src/main/org/jboss/portal/workflow/service/JbpmThreadService.java
branches/JBoss_Portal_Branch_2_6/workflow/src/main/org/jboss/portal/workflow/service/JbpmThreadServiceMBean.java
branches/JBoss_Portal_Branch_2_6/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml
Log:
Fix jbpm timeout
Added: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/workflow/ehcache.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/workflow/ehcache.xml (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/workflow/ehcache.xml 2007-09-11 15:27:23 UTC (rev 8230)
@@ -0,0 +1,61 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<ehcache>
+
+ <!-- Sets the path to the directory where cache .data files are created.
+
+ If the path is a Java System Property it is replaced by
+ its value in the running VM.
+
+ The following properties are translated:
+ user.home - User's home directory
+ user.dir - User's current working directory
+ java.io.tmpdir - Default temp file path -->
+ <diskStore path="java.io.tmpdir/workflow"/>
+
+
+ <!--Default Cache configuration. These will applied to caches programmatically created through
+ the CacheManager.
+
+ The following attributes are required for defaultCache:
+
+ maxInMemory - Sets the maximum number of objects that will be created in memory
+ eternal - Sets whether elements are eternal. If eternal, timeouts are ignored and the element
+ is never expired.
+ timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
+ if the element is not eternal. Idle time is now - last accessed time
+ timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
+ if the element is not eternal. TTL is now - creation time
+ overflowToDisk - Sets whether elements can overflow to disk when the in-memory cache
+ has reached the maxInMemory limit.
+
+ -->
+ <defaultCache
+ maxElementsInMemory="10000"
+ eternal="false"
+ timeToIdleSeconds="120"
+ timeToLiveSeconds="120"
+ overflowToDisk="false"
+ />
+</ehcache>
Added: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml 2007-09-11 15:27:23 UTC (rev 8230)
@@ -0,0 +1,170 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<!DOCTYPE hibernate-configuration PUBLIC
+ "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+
+<hibernate-configuration>
+ <session-factory>
+ <!-- jdbc connection properties -->
+ <property name="connection.datasource">java:@portal.datasource.name@</property>
+
+ <!-- other hibernate properties -->
+ <property name="show_sql">@portal.sql.show@</property>
+ <property name="hibernate.format_sql">true</property>
+ <property name="hibernate.use_sql_comments">true</property>
+
+ <!-- caching properties -->
+ <property name="cache.use_second_level_cache">true</property>
+ <property name="cache.use_query_cache">true</property>
+ <property name="cache.provider_configuration_file_resource_path">conf/hibernate/workflow/ehcache.xml</property>
+ <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
+
+ <!-- managed environment transaction configuration -->
+ <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
+ <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
+
+ <!-- ############################################ -->
+ <!-- # mapping files with external dependencies # -->
+ <!-- ############################################ -->
+
+ <!-- following mapping file has a dependendy on -->
+ <!-- 'bsh-{version}.jar'. -->
+ <!-- uncomment this if you don't have bsh on your -->
+ <!-- classpath. you won't be able to use the -->
+ <!-- script element in process definition files -->
+ <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/>
+
+ <!-- following mapping files have a dependendy on -->
+ <!-- 'jbpm-identity-{version}.jar', mapping files -->
+ <!-- of the pluggable jbpm identity component. -->
+ <!-- comment out the following 3 lines if you don't-->
+ <!-- want to use the default jBPM identity mgmgt -->
+ <!-- component -->
+ <mapping resource="org/jbpm/identity/User.hbm.xml"/>
+ <mapping resource="org/jbpm/identity/Group.hbm.xml"/>
+ <mapping resource="org/jbpm/identity/Membership.hbm.xml"/>
+
+ <!-- ###################### -->
+ <!-- # jbpm mapping files # -->
+ <!-- ###################### -->
+
+ <!-- hql queries and type defs -->
+ <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml"/>
+
+ <!-- graph.def mapping files -->
+ <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/Node.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/Transition.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/Event.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/Action.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/SuperState.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/>
+ <mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/>
+
+ <!-- graph.node mapping files -->
+ <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/State.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/>
+
+ <!-- context.def mapping files -->
+ <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/>
+ <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/>
+
+ <!-- taskmgmt.def mapping files -->
+ <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/def/Task.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/>
+
+ <!-- module.def mapping files -->
+ <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/>
+
+ <!-- bytes mapping files -->
+ <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/>
+
+ <!-- file.def mapping files -->
+ <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/>
+
+ <!-- scheduler.def mapping files -->
+ <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/>
+ <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/>
+
+ <!-- graph.exe mapping files -->
+ <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/>
+
+ <!-- module.exe mapping files -->
+ <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/>
+
+ <!-- context.exe mapping files -->
+ <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/>
+
+ <!-- msg.db mapping files -->
+ <mapping resource="org/jbpm/msg/Message.hbm.xml"/>
+ <mapping resource="org/jbpm/msg/db/TextMessage.hbm.xml"/>
+ <mapping resource="org/jbpm/command/ExecuteActionCommand.hbm.xml"/>
+ <mapping resource="org/jbpm/command/ExecuteNodeCommand.hbm.xml"/>
+ <mapping resource="org/jbpm/command/SignalCommand.hbm.xml"/>
+ <mapping resource="org/jbpm/command/TaskInstanceEndCommand.hbm.xml"/>
+
+ <!-- taskmgmt.exe mapping files -->
+ <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/>
+
+ <!-- scheduler.exe mapping files -->
+ <mapping resource="org/jbpm/scheduler/exe/Timer.hbm.xml"/>
+
+ <!-- logging mapping files -->
+ <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/>
+ <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/>
+ <mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/ActionLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/TransitionLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/VariableLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/VariableCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/VariableDeleteLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/VariableUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/TaskLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml"/>
+
+ </session-factory>
+</hibernate-configuration>
Modified: branches/JBoss_Portal_Branch_2_6/workflow/src/main/org/jboss/portal/workflow/service/JbpmThreadService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/workflow/src/main/org/jboss/portal/workflow/service/JbpmThreadService.java 2007-09-11 15:06:22 UTC (rev 8229)
+++ branches/JBoss_Portal_Branch_2_6/workflow/src/main/org/jboss/portal/workflow/service/JbpmThreadService.java 2007-09-11 15:27:23 UTC (rev 8230)
@@ -22,9 +22,7 @@
******************************************************************************/
package org.jboss.portal.workflow.service;
-import org.jboss.logging.Logger;
import org.jbpm.JbpmConfiguration;
-import org.jbpm.JbpmContext;
import org.jbpm.msg.command.CommandExecutorThread;
import org.jbpm.scheduler.impl.SchedulerThread;
@@ -35,128 +33,62 @@
public class JbpmThreadService implements JbpmThreadServiceMBean
{
- private String jbpmConfigurationResource = null;
+ private int schedulerInterval = 5000;
- private String jbpmContextName = null;
+ private int priority = 1;
-// private String commandExecutorInterval = null;
+ private WorkflowService workflowService = null;
- private String schedulerInterval = null;
-
- private String priority = null;
-
-// private String maxResultCount = null;
-
- private Logger log = Logger.getLogger(JbpmThreadService.class);
-
private CommandExecutorThread commandExecutorThread = null;
private SchedulerThread schedulerThread = null;
public void start()
{
- if (jbpmConfigurationResource==null) {
- log.debug("using default jbpm cfg resource");
- } else {
- log.debug("using jbpm cfg resource: '"+jbpmConfigurationResource+"'");
- }
+ JbpmConfiguration jbpmConfiguration = workflowService.getJbpmConfiguration();
- if (jbpmContextName==null) {
- log.debug("using default jbpm context");
- jbpmContextName = JbpmContext.DEFAULT_JBPM_CONTEXT_NAME;
- } else {
- log.debug("using jbpm context: '"+jbpmContextName+"'");
- }
-
-// int commandExecutorIntervalInt = Integer.parseInt(getInitParameter(commandExecutorInterval, "5000"));
- int schedulerIntervalInt = Integer.parseInt(getInitParameter(schedulerInterval, "5000"));
- int priorityInt = Integer.parseInt(getInitParameter(priority, "1"));
-// int maxResultCountInt = Integer.parseInt(getInitParameter(maxResultCount, "1"));
-
- JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance(jbpmConfigurationResource);
-
commandExecutorThread = new CommandExecutorThread(jbpmConfiguration);
-// commandExecutorThread.setInterval(commandExecutorIntervalInt);
- commandExecutorThread.setPriority(priorityInt);
+ commandExecutorThread.setPriority(priority);
commandExecutorThread.start();
schedulerThread = new SchedulerThread(jbpmConfiguration);
- schedulerThread.setPriority(priorityInt);
- schedulerThread.setInterval(schedulerIntervalInt);
-// schedulerThread.setMaxResultCount(maxResultCountInt);
+ schedulerThread.setPriority(priority);
+ schedulerThread.setInterval(schedulerInterval);
schedulerThread.start();
}
- protected String getInitParameter(String name, String defaultValue) {
- if (name!=null) {
- return name;
- }
- return defaultValue;
- }
-
public void stop()
{
- if ( (schedulerThread!=null)
- && (schedulerThread.isAlive())
- ) {
- schedulerThread.destroy();
- }
- if ( (commandExecutorThread!=null)
- && (commandExecutorThread.isAlive())
- ) {
- commandExecutorThread.destroy();
- }
-
}
-
- public String getJbpmConfigurationResource()
+
+ public int getSchedulerInterval()
{
- return jbpmConfigurationResource;
- }
-
- public void setJbpmConfigurationResource(String jbpmConfigurationResource)
- {
- this.jbpmConfigurationResource = jbpmConfigurationResource;
- }
-
- public String getJbpmContextName()
- {
- return jbpmContextName;
- }
-
- public void setJbpmContextName(String jbpmContextName)
- {
- this.jbpmContextName = jbpmContextName;
- }
-
- public String getSchedulerInterval()
- {
return schedulerInterval;
}
- public void setSchedulerInterval(String schedulerInterval)
+ public void setSchedulerInterval(int schedulerInterval)
{
this.schedulerInterval = schedulerInterval;
}
- public String getPriority()
+ public int getPriority()
{
return priority;
}
- public void setPriority(String priority)
+ public void setPriority(int priority)
{
this.priority = priority;
}
- public SchedulerThread getSchedulerThread()
+ public WorkflowService getWorkflowService()
{
- return schedulerThread;
+ return workflowService;
}
- public void setSchedulerThread(SchedulerThread schedulerThread)
+ public void setWorkflowService(WorkflowService workflowService)
{
- this.schedulerThread = schedulerThread;
+ this.workflowService = workflowService;
}
}
Modified: branches/JBoss_Portal_Branch_2_6/workflow/src/main/org/jboss/portal/workflow/service/JbpmThreadServiceMBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/workflow/src/main/org/jboss/portal/workflow/service/JbpmThreadServiceMBean.java 2007-09-11 15:06:22 UTC (rev 8229)
+++ branches/JBoss_Portal_Branch_2_6/workflow/src/main/org/jboss/portal/workflow/service/JbpmThreadServiceMBean.java 2007-09-11 15:27:23 UTC (rev 8230)
@@ -22,7 +22,6 @@
******************************************************************************/
package org.jboss.portal.workflow.service;
-import org.jbpm.scheduler.impl.SchedulerThread;
/**
* @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
@@ -30,25 +29,20 @@
*/
public interface JbpmThreadServiceMBean
{
- public String getJbpmConfigurationResource();
+ public void start();
+
+ public void stop();
- public void setJbpmConfigurationResource(String jbpmConfigurationResource);
+ public WorkflowService getWorkflowService();
- public String getJbpmContextName();
+ public void setWorkflowService(WorkflowService workflowService);
- public void setJbpmContextName(String jbpmContextName);
+ public int getSchedulerInterval();
- public String getSchedulerInterval();
+ public void setSchedulerInterval(int schedulerInterval);
- public void setSchedulerInterval(String schedulerInterval);
+ public int getPriority();
- public String getPriority();
-
- public void setPriority(String priority);
-
- public SchedulerThread getSchedulerThread();
-
- public void setSchedulerThread(SchedulerThread schedulerThread);
-
+ public void setPriority(int priority);
}
Modified: branches/JBoss_Portal_Branch_2_6/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml 2007-09-11 15:06:22 UTC (rev 8229)
+++ branches/JBoss_Portal_Branch_2_6/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml 2007-09-11 15:27:23 UTC (rev 8230)
@@ -38,7 +38,9 @@
<mbean
code="org.jboss.portal.workflow.service.JbpmThreadService"
name="portal:service=Thread,type=WorkflowService">
- <attribute name="JbpmConfigurationResource">conf/hibernate/workflow/hibernate.cfg.xml</attribute>
+ <depends optional-attribute-name="WorkflowService"
+ proxy-type="attribute">portal:service=Workflow,type=WorkflowService</depends>
+ <attribute name="SchedulerInterval">60000</attribute>
</mbean>
<!-- Workflow service -->
@@ -55,6 +57,7 @@
<jbpm-context>
<service name="persistence" factory="org.jbpm.persistence.db.DbPersistenceServiceFactory" />
<service name="scheduler" factory="org.jbpm.scheduler.db.DbSchedulerServiceFactory" />
+ <service name="message" factory="org.jbpm.msg.db.DbMessageServiceFactory" />
</jbpm-context>
<string name="resource.hibernate.cfg.xml" value="conf/hibernate/workflow/hibernate.cfg.xml"/>
<string name="resource.business.calendar" value="org/jbpm/calendar/jbpm.business.calendar.properties"/>
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r8229 - in branches/JBoss_Portal_Branch_2_6/core-identity/src: main/org/jboss/portal/core/identity/services/metadata and 4 other directories.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-11 11:06:22 -0400 (Tue, 11 Sep 2007)
New Revision: 8229
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityUserManagementServiceImpl.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationService.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml
Log:
- removed the dependencies on jBPM when using subscription mode automatic
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityUserManagementServiceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityUserManagementServiceImpl.java 2007-09-11 14:58:05 UTC (rev 8228)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityUserManagementServiceImpl.java 2007-09-11 15:06:22 UTC (rev 8229)
@@ -68,10 +68,10 @@
/** The core-identity configuration service */
private IdentityUIConfigurationService identityUIConfigurationService;
- /** . */
+ /** The JNDI binding */
private JNDI.Binding jndiBinding;
- /** . */
+ /** The jndi name */
private String jndiName = null;
public void startService() throws Exception
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationService.java 2007-09-11 14:58:05 UTC (rev 8228)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationService.java 2007-09-11 15:06:22 UTC (rev 8229)
@@ -48,6 +48,6 @@
* @return WorkflowService
* @throws NamingException
*/
- WorkflowService getWorkflowService() throws NamingException;
+ WorkflowService getWorkflowService();
}
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java 2007-09-11 14:58:05 UTC (rev 8228)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java 2007-09-11 15:06:22 UTC (rev 8229)
@@ -77,10 +77,10 @@
/** Identity user profile */
private UserProfileModule userProfileModule;
- /** . */
+ /** The JNDI binding */
private JNDI.Binding jndiBinding;
- /** . */
+ /** The jndi name */
private String jndiName = null;
public void startService() throws Exception
@@ -92,19 +92,25 @@
// Creating IdentityUIConfiguration
this.configuration = this.createConfiguration();
- // Loading Workflow if subscriptionmodes != automatic
+ // Loading workflow if subscriptionmodes != automatic
if (this.configuration.enableWorkflow())
{
+ this.workflowService = this.getWorkflowService();
+
String subscriptionMode = this.configuration.getSubscriptionMode();
String adminSubscriptionMode = this.configuration.getAdminSubscriptionMode();
String emailValidationProcess = IdentityConstants.jbp_identity_validate_email_process_name;
- if (subscriptionMode != null && adminSubscriptionMode != null && emailValidationProcess != null)
+ if ( workflowService != null
+ && subscriptionMode != null
+ && adminSubscriptionMode != null
+ && emailValidationProcess != null)
{
// automatically load email validation process
this.createJBPMContext(emailValidationProcess);
this.createJBPMContext(subscriptionMode);
this.createJBPMContext(adminSubscriptionMode);
+ log.info("jBPM worfklow started ...");
}
else
{
@@ -113,12 +119,12 @@
}
else
{
- log.info("not starting jBPM workflow.");
+ log.info("not starting jBPM workflow ...");
}
}
catch (Exception e)
{
- log.error("Error while starting service: ", e);
+ log.error("Error while starting core identity services ...", e);
super.stopService();
}
@@ -192,21 +198,17 @@
this.userProfileModule = userProfileModule;
}
- public WorkflowService getWorkflowService() throws NamingException
+ public WorkflowService getWorkflowService()
{
- if (workflowService == null)
+ if ( workflowService == null)
{
try
{
- workflowService = (WorkflowService) new InitialContext().lookup("java:/portal/Workflow");
+ this.workflowService = (WorkflowService) new InitialContext().lookup("java:/portal/WorkflowService");
}
catch (Exception e)
{
- // OK - if not using jBPM
- if (this.configuration.enableWorkflow())
- {
- throw new RuntimeException("failed to load WorkflowService", e);
- }
+ log.error("", e);
}
}
return workflowService;
@@ -271,7 +273,7 @@
}
};
- // Adding callback method for ui-components
+ // Adding callback for ui-components
TypeBinding cb = schema.getType(new javax.xml.namespace.QName("UIComponent"));
cb.setBeforeSetParentCallback(componentCallback);
@@ -306,7 +308,7 @@
}
};
- // Adding callback method for ui-component values
+ // Adding callback for ui-component values
TypeBinding vb = schema.getType(new javax.xml.namespace.QName("componentValues"));
vb.setBeforeSetParentCallback(valueCallback);
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java 2007-09-11 14:58:05 UTC (rev 8228)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java 2007-09-11 15:06:22 UTC (rev 8229)
@@ -107,7 +107,7 @@
}
}
- public WorkflowService getWorkflowService() throws NamingException
+ public WorkflowService getWorkflowService()
{
if (this.workflowService == null)
{
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java 2007-09-11 14:58:05 UTC (rev 8228)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java 2007-09-11 15:06:22 UTC (rev 8229)
@@ -62,10 +62,10 @@
/** The logger */
private static final Logger log = Logger.getLogger(ValidateEmailService.class);
- /** . */
+ /** The JNDI binding */
private JNDI.Binding jndiBinding;
- /** . */
+ /** The jndi name */
private String jndiName = null;
public void startService() throws Exception
@@ -94,18 +94,7 @@
{
if ( workflowService == null)
{
- try
- {
workflowService = (WorkflowService) identityUIConfigurationService.getWorkflowService();
- }
- catch (Exception e)
- {
- // OK if workflow is disabled
- if (identityUIConfigurationService.getConfiguration().enableWorkflow())
- {
- throw new RuntimeException(e);
- }
- }
}
return this.workflowService;
}
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml 2007-09-11 14:58:05 UTC (rev 8228)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml 2007-09-11 15:06:22 UTC (rev 8229)
@@ -29,7 +29,7 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <attribute name="InstanceId">CoreIdentityUserPortletInstance</attribute>
+ <attribute name="InstanceId">IdentityUserPortletInstance</attribute>
<depends
optional-attribute-name="ValidateEmailService"
proxy-type="attribute">portal:service=ValidateEmailService,type=IdentityUI
@@ -42,7 +42,7 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <attribute name="InstanceId">CoreIdentityUserPortletInstance</attribute>
+ <attribute name="InstanceId">IdentityUserPortletInstance</attribute>
<attribute name="Path">/validateEmail</attribute>
<depends
optional-attribute-name="Factory"
@@ -58,11 +58,6 @@
<depends optional-attribute-name="IdentityServiceController" proxy-type="attribute">
portal:service=Module,type=IdentityServiceController
</depends>
- <!-- comment if no workflow is required -->
- <depends optional-attribute-name="WorkflowService" proxy-type="attribute">
- portal:service=Workflow,type=WorkflowService
- </depends>
- <!-- -->
<attribute name="JNDIName">java:portal/IdentityUIConfigurationService</attribute>
</mbean>
@@ -103,12 +98,6 @@
<depends optional-attribute-name="IdentityUserManagementService" proxy-type="attribute">
portal:service=IdentityUserManagementService,type=IdentityUI
</depends>
- <!-- comment if no workflow is required -->
- <depends optional-attribute-name="WorkflowService" proxy-type="attribute">
- portal:service=Workflow,type=WorkflowService
- </depends>
- <!-- -->
- <attribute name="JNDIName">java:portal/RegistrationService</attribute>
</mbean>
<mbean
@@ -123,12 +112,6 @@
<depends optional-attribute-name="IdentityUserManagementService" proxy-type="attribute">
portal:service=IdentityUserManagementService,type=IdentityUI
</depends>
- <!-- comment if no workflow is required -->
- <depends optional-attribute-name="WorkflowService" proxy-type="attribute">
- portal:service=Workflow,type=WorkflowService
- </depends>
- <!-- -->
- <attribute name="JNDIName">java:portal/ValidateEmailService</attribute>
</mbean>
<mbean
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-11 14:58:05 UTC (rev 8228)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-11 15:06:22 UTC (rev 8229)
@@ -23,12 +23,33 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<identity-ui-configuration>
-
+ <!--
+ subscription mode - defines the workflow used for registering users
+ available default options:
+ - automatic
+ - jbp_identity_validation_workflow
+ - jbp_identity_validation_approval_workflow
+ -->
<subscription-mode>automatic</subscription-mode>
+ <!--
+ overwrite-workflow: overwrites existing process definitions
+ -->
<overwrite-workflow>false</overwrite-workflow>
+ <!--
+ email-domain: used for sending e-mails
+ -->
<email-domain>jboss.org</email-domain>
+ <!--
+ email-from: sender address
+ -->
<email-from>do-no-reply(a)jboss.com</email-from>
+ <!--
+ password-generation-characters: characters used for generating a random password
+ -->
<password-generation-characters>0123456789aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWyYzZ*#!+-/"</password-generation-characters>
+ <!--
+ default-roles: roles set on user registration
+ -->
<default-roles>
<role>User</role>
</default-roles>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-11 14:58:05 UTC (rev 8228)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-11 15:06:22 UTC (rev 8229)
@@ -8,27 +8,27 @@
<h:form>
<h:panelGrid columns="2" cellpadding="3">
- <h:outputText for="username" value="#{bundle.IDENTITY_USERNAME}"/>
+ <h:outputText value="#{bundle.IDENTITY_USERNAME}"/>
<h:inputText id="username" value="#{manager.uiUser.username}" required="true">
<f:validator validatorId="UsernameValidator"/>
</h:inputText>
<h:panelGroup />
<h:message for="username" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
- <h:outputText for="#{metadataservice.email.name}" value="#{bundle.IDENTITY_EMAIL}"/>
+ <h:outputText value="#{bundle.IDENTITY_EMAIL}"/>
<h:inputText id="#{metadataservice.email.name}" value="#{manager.uiUser.attribute.email}" required="#{metadataservice.email.required}">
<f:validator validatorId="#{metadataservice.email.validator}"/>
</h:inputText>
<h:panelGroup />
<h:message for="#{metadataservice.email.name}" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
- <h:outputText for="password" value="#{bundle.IDENTITY_PASSWORD}"/>
+ <h:outputText value="#{bundle.IDENTITY_PASSWORD}"/>
<h:inputSecret id="password" value="#{manager.uiUser.password}" required="true">
<f:validateLength minimum="6"/>
</h:inputSecret>
<h:panelGroup />
<h:message for="password" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
- <h:outputText for="passwordCheck" value="#{bundle.IDENTITY_REGISTER_PASSWORD_CONFIRM}"/>
+ <h:outputText value="#{bundle.IDENTITY_REGISTER_PASSWORD_CONFIRM}"/>
<h:inputSecret id="passwordCheck" required="true">
<f:validator validatorId="PasswordValidator"/>
</h:inputSecret>
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r8228 - in branches/JBoss_Portal_Branch_2_6/workflow/src: resources/portal-workflow-sar/META-INF and 1 other directory.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-11 10:58:05 -0400 (Tue, 11 Sep 2007)
New Revision: 8228
Modified:
branches/JBoss_Portal_Branch_2_6/workflow/src/main/org/jboss/portal/workflow/service/WorkflowServiceImpl.java
branches/JBoss_Portal_Branch_2_6/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml
Log:
- added workflow service to JNDI
Modified: branches/JBoss_Portal_Branch_2_6/workflow/src/main/org/jboss/portal/workflow/service/WorkflowServiceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/workflow/src/main/org/jboss/portal/workflow/service/WorkflowServiceImpl.java 2007-09-11 14:46:31 UTC (rev 8227)
+++ branches/JBoss_Portal_Branch_2_6/workflow/src/main/org/jboss/portal/workflow/service/WorkflowServiceImpl.java 2007-09-11 14:58:05 UTC (rev 8228)
@@ -23,6 +23,7 @@
package org.jboss.portal.workflow.service;
import org.apache.log4j.Logger;
+import org.jboss.portal.jems.as.JNDI;
import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jbpm.JbpmConfiguration;
@@ -32,15 +33,23 @@
*/
public class WorkflowServiceImpl extends AbstractJBossService implements WorkflowService
{
+ /** . */
+ private static Logger log = Logger.getLogger(WorkflowServiceImpl.class);
+
+ /** . */
+ private JbpmConfiguration jbpmConfiguration = null;
- private static Logger log = Logger.getLogger(WorkflowServiceImpl.class);
+ /** . */
+ private String jbpmConfigurationXml = null;
- private JbpmConfiguration jbpmConfiguration = null;
- private String jbpmConfigurationXml = null;
+ /** . */
+ private JNDI.Binding jndiBinding;
+
+ /** . */
+ private String jndiName = null;
/**
*
- *
*/
public WorkflowServiceImpl()
{
@@ -50,12 +59,13 @@
/**
*
*/
- public void startService()
+ public void startService() throws Exception
{
+ super.startService();
try
{
log.debug("---------------------------------------------------");
- log.debug("Workflow Service successfully started......");
+ log.debug("Workflow Service successfully started ......");
log.debug("---------------------------------------------------");
//initialize the jbpm configuration
@@ -66,16 +76,38 @@
this.stopService();
throw new RuntimeException(e);
}
+
+ if (this.jndiName != null)
+ {
+ jndiBinding = new JNDI.Binding(jndiName, this);
+ jndiBinding.bind();
+ }
}
/**
*
*/
- public void stopService()
+ public void stopService() throws Exception
{
-
+ super.stopService();
+
+ if (jndiBinding != null)
+ {
+ jndiBinding.unbind();
+ jndiBinding = null;
+ }
}
+ public String getJNDIName()
+ {
+ return this.jndiName;
+ }
+
+ public void setJNDIName(String jndiName)
+ {
+ this.jndiName = jndiName;
+ }
+
/**
*
* @return
Modified: branches/JBoss_Portal_Branch_2_6/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml 2007-09-11 14:46:31 UTC (rev 8227)
+++ branches/JBoss_Portal_Branch_2_6/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml 2007-09-11 14:58:05 UTC (rev 8228)
@@ -66,6 +66,7 @@
</jbpm-configuration>
]]>
</attribute>
+ <attribute name="JNDIName">java:/portal/WorkflowService</attribute>
</mbean>
</server>
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r8227 - in trunk/workflow/src: resources/portal-workflow-sar/META-INF and 1 other directory.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-11 10:46:31 -0400 (Tue, 11 Sep 2007)
New Revision: 8227
Modified:
trunk/workflow/src/main/org/jboss/portal/workflow/service/WorkflowServiceImpl.java
trunk/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml
Log:
- added workflow service to JNDI
Modified: trunk/workflow/src/main/org/jboss/portal/workflow/service/WorkflowServiceImpl.java
===================================================================
--- trunk/workflow/src/main/org/jboss/portal/workflow/service/WorkflowServiceImpl.java 2007-09-11 14:45:33 UTC (rev 8226)
+++ trunk/workflow/src/main/org/jboss/portal/workflow/service/WorkflowServiceImpl.java 2007-09-11 14:46:31 UTC (rev 8227)
@@ -23,6 +23,7 @@
package org.jboss.portal.workflow.service;
import org.apache.log4j.Logger;
+import org.jboss.portal.jems.as.JNDI;
import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jbpm.JbpmConfiguration;
@@ -32,15 +33,23 @@
*/
public class WorkflowServiceImpl extends AbstractJBossService implements WorkflowService
{
+ /** . */
+ private static Logger log = Logger.getLogger(WorkflowServiceImpl.class);
+
+ /** . */
+ private JbpmConfiguration jbpmConfiguration = null;
- private static Logger log = Logger.getLogger(WorkflowServiceImpl.class);
+ /** . */
+ private String jbpmConfigurationXml = null;
- private JbpmConfiguration jbpmConfiguration = null;
- private String jbpmConfigurationXml = null;
+ /** . */
+ private JNDI.Binding jndiBinding;
+
+ /** . */
+ private String jndiName = null;
/**
*
- *
*/
public WorkflowServiceImpl()
{
@@ -50,12 +59,13 @@
/**
*
*/
- public void startService()
+ public void startService() throws Exception
{
+ super.startService();
try
{
log.debug("---------------------------------------------------");
- log.debug("Workflow Service successfully started......");
+ log.debug("Workflow Service successfully started ......");
log.debug("---------------------------------------------------");
//initialize the jbpm configuration
@@ -66,16 +76,38 @@
this.stopService();
throw new RuntimeException(e);
}
+
+ if (this.jndiName != null)
+ {
+ jndiBinding = new JNDI.Binding(jndiName, this);
+ jndiBinding.bind();
+ }
}
/**
*
*/
- public void stopService()
+ public void stopService() throws Exception
{
-
+ super.stopService();
+
+ if (jndiBinding != null)
+ {
+ jndiBinding.unbind();
+ jndiBinding = null;
+ }
}
+ public String getJNDIName()
+ {
+ return this.jndiName;
+ }
+
+ public void setJNDIName(String jndiName)
+ {
+ this.jndiName = jndiName;
+ }
+
/**
*
* @return
Modified: trunk/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml 2007-09-11 14:45:33 UTC (rev 8226)
+++ trunk/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml 2007-09-11 14:46:31 UTC (rev 8227)
@@ -59,7 +59,8 @@
<string name="resource.varmapping" value="org/jbpm/context/exe/jbpm.varmapping.xml"/>
</jbpm-configuration>
]]>
- </attribute>
+ </attribute>
+ <attribute name="JNDIName">java:/portal/WorkflowService</attribute>
</mbean>
<!-- ApprovePublish workflow service -->
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r8226 - in trunk/core-identity/src: main/org/jboss/portal/core/identity/services/metadata and 4 other directories.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-11 10:45:33 -0400 (Tue, 11 Sep 2007)
New Revision: 8226
Modified:
trunk/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityUserManagementServiceImpl.java
trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationService.java
trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java
trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java
trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java
trunk/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml
trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml
Log:
- removed the dependencies on jBPM when using subscription mode automatic
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityUserManagementServiceImpl.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityUserManagementServiceImpl.java 2007-09-11 12:36:29 UTC (rev 8225)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/impl/IdentityUserManagementServiceImpl.java 2007-09-11 14:45:33 UTC (rev 8226)
@@ -68,10 +68,10 @@
/** The core-identity configuration service */
private IdentityUIConfigurationService identityUIConfigurationService;
- /** . */
+ /** The JNDI binding */
private JNDI.Binding jndiBinding;
- /** . */
+ /** The jndi name */
private String jndiName = null;
public void startService() throws Exception
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationService.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationService.java 2007-09-11 12:36:29 UTC (rev 8225)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationService.java 2007-09-11 14:45:33 UTC (rev 8226)
@@ -48,6 +48,6 @@
* @return WorkflowService
* @throws NamingException
*/
- WorkflowService getWorkflowService() throws NamingException;
+ WorkflowService getWorkflowService();
}
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java 2007-09-11 12:36:29 UTC (rev 8225)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java 2007-09-11 14:45:33 UTC (rev 8226)
@@ -77,10 +77,10 @@
/** Identity user profile */
private UserProfileModule userProfileModule;
- /** . */
+ /** The JNDI binding */
private JNDI.Binding jndiBinding;
- /** . */
+ /** The jndi name */
private String jndiName = null;
public void startService() throws Exception
@@ -92,19 +92,25 @@
// Creating IdentityUIConfiguration
this.configuration = this.createConfiguration();
- // Loading Workflow if subscriptionmodes != automatic
+ // Loading workflow if subscriptionmodes != automatic
if (this.configuration.enableWorkflow())
{
+ this.workflowService = this.getWorkflowService();
+
String subscriptionMode = this.configuration.getSubscriptionMode();
String adminSubscriptionMode = this.configuration.getAdminSubscriptionMode();
String emailValidationProcess = IdentityConstants.jbp_identity_validate_email_process_name;
- if (subscriptionMode != null && adminSubscriptionMode != null && emailValidationProcess != null)
+ if ( workflowService != null
+ && subscriptionMode != null
+ && adminSubscriptionMode != null
+ && emailValidationProcess != null)
{
// automatically load email validation process
this.createJBPMContext(emailValidationProcess);
this.createJBPMContext(subscriptionMode);
this.createJBPMContext(adminSubscriptionMode);
+ log.info("jBPM worfklow started ...");
}
else
{
@@ -113,12 +119,12 @@
}
else
{
- log.info("not starting jBPM workflow.");
+ log.info("not starting jBPM workflow ...");
}
}
catch (Exception e)
{
- log.error("Error while starting service: ", e);
+ log.error("Error while starting core identity services ...", e);
super.stopService();
}
@@ -192,21 +198,17 @@
this.userProfileModule = userProfileModule;
}
- public WorkflowService getWorkflowService() throws NamingException
+ public WorkflowService getWorkflowService()
{
- if (workflowService == null)
+ if ( workflowService == null)
{
try
{
- workflowService = (WorkflowService) new InitialContext().lookup("java:/portal/Workflow");
+ this.workflowService = (WorkflowService) new InitialContext().lookup("java:/portal/WorkflowService");
}
catch (Exception e)
{
- // OK - if not using jBPM
- if (this.configuration.enableWorkflow())
- {
- throw new RuntimeException("failed to load WorkflowService", e);
- }
+ log.error("", e);
}
}
return workflowService;
@@ -271,7 +273,7 @@
}
};
- // Adding callback method for ui-components
+ // Adding callback for ui-components
TypeBinding cb = schema.getType(new javax.xml.namespace.QName("UIComponent"));
cb.setBeforeSetParentCallback(componentCallback);
@@ -306,7 +308,7 @@
}
};
- // Adding callback method for ui-component values
+ // Adding callback for ui-component values
TypeBinding vb = schema.getType(new javax.xml.namespace.QName("componentValues"));
vb.setBeforeSetParentCallback(valueCallback);
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java 2007-09-11 12:36:29 UTC (rev 8225)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java 2007-09-11 14:45:33 UTC (rev 8226)
@@ -107,7 +107,7 @@
}
}
- public WorkflowService getWorkflowService() throws NamingException
+ public WorkflowService getWorkflowService()
{
if (this.workflowService == null)
{
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java 2007-09-11 12:36:29 UTC (rev 8225)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/ValidateEmailServiceImpl.java 2007-09-11 14:45:33 UTC (rev 8226)
@@ -62,10 +62,10 @@
/** The logger */
private static final Logger log = Logger.getLogger(ValidateEmailService.class);
- /** . */
+ /** The JNDI binding */
private JNDI.Binding jndiBinding;
- /** . */
+ /** The jndi name */
private String jndiName = null;
public void startService() throws Exception
@@ -94,18 +94,7 @@
{
if ( workflowService == null)
{
- try
- {
workflowService = (WorkflowService) identityUIConfigurationService.getWorkflowService();
- }
- catch (Exception e)
- {
- // OK if workflow is disabled
- if (identityUIConfigurationService.getConfiguration().enableWorkflow())
- {
- throw new RuntimeException(e);
- }
- }
}
return this.workflowService;
}
Modified: trunk/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml 2007-09-11 12:36:29 UTC (rev 8225)
+++ trunk/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml 2007-09-11 14:45:33 UTC (rev 8226)
@@ -29,7 +29,7 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <attribute name="InstanceId">CoreIdentityUserPortletInstance</attribute>
+ <attribute name="InstanceId">IdentityUserPortletInstance</attribute>
<depends
optional-attribute-name="ValidateEmailService"
proxy-type="attribute">portal:service=ValidateEmailService,type=IdentityUI
@@ -42,7 +42,7 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <attribute name="InstanceId">CoreIdentityUserPortletInstance</attribute>
+ <attribute name="InstanceId">IdentityUserPortletInstance</attribute>
<attribute name="Path">/validateEmail</attribute>
<depends
optional-attribute-name="Factory"
@@ -58,11 +58,6 @@
<depends optional-attribute-name="IdentityServiceController" proxy-type="attribute">
portal:service=Module,type=IdentityServiceController
</depends>
- <!-- comment if no workflow is required -->
- <depends optional-attribute-name="WorkflowService" proxy-type="attribute">
- portal:service=Workflow,type=WorkflowService
- </depends>
- <!-- -->
<attribute name="JNDIName">java:portal/IdentityUIConfigurationService</attribute>
</mbean>
@@ -103,12 +98,6 @@
<depends optional-attribute-name="IdentityUserManagementService" proxy-type="attribute">
portal:service=IdentityUserManagementService,type=IdentityUI
</depends>
- <!-- comment if no workflow is required -->
- <depends optional-attribute-name="WorkflowService" proxy-type="attribute">
- portal:service=Workflow,type=WorkflowService
- </depends>
- <!-- -->
- <attribute name="JNDIName">java:portal/RegistrationService</attribute>
</mbean>
<mbean
@@ -123,12 +112,6 @@
<depends optional-attribute-name="IdentityUserManagementService" proxy-type="attribute">
portal:service=IdentityUserManagementService,type=IdentityUI
</depends>
- <!-- comment if no workflow is required -->
- <depends optional-attribute-name="WorkflowService" proxy-type="attribute">
- portal:service=Workflow,type=WorkflowService
- </depends>
- <!-- -->
- <attribute name="JNDIName">java:portal/ValidateEmailService</attribute>
</mbean>
<mbean
Modified: trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-11 12:36:29 UTC (rev 8225)
+++ trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-11 14:45:33 UTC (rev 8226)
@@ -23,12 +23,33 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<identity-ui-configuration>
-
+ <!--
+ subscription mode - defines the workflow used for registering users
+ available default options:
+ - automatic
+ - jbp_identity_validation_workflow
+ - jbp_identity_validation_approval_workflow
+ -->
<subscription-mode>automatic</subscription-mode>
+ <!--
+ overwrite-workflow: overwrites existing process definitions
+ -->
<overwrite-workflow>false</overwrite-workflow>
+ <!--
+ email-domain: used for sending e-mails
+ -->
<email-domain>jboss.org</email-domain>
+ <!--
+ email-from: sender address
+ -->
<email-from>do-no-reply(a)jboss.com</email-from>
+ <!--
+ password-generation-characters: characters used for generating a random password
+ -->
<password-generation-characters>0123456789aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWyYzZ*#!+-/"</password-generation-characters>
+ <!--
+ default-roles: roles set on user registration
+ -->
<default-roles>
<role>User</role>
</default-roles>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-11 12:36:29 UTC (rev 8225)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-11 14:45:33 UTC (rev 8226)
@@ -8,27 +8,27 @@
<h:form>
<h:panelGrid columns="2" cellpadding="3">
- <h:outputText for="username" value="#{bundle.IDENTITY_USERNAME}"/>
+ <h:outputText value="#{bundle.IDENTITY_USERNAME}"/>
<h:inputText id="username" value="#{manager.uiUser.username}" required="true">
<f:validator validatorId="UsernameValidator"/>
</h:inputText>
<h:panelGroup />
<h:message for="username" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
- <h:outputText for="#{metadataservice.email.name}" value="#{bundle.IDENTITY_EMAIL}"/>
+ <h:outputText value="#{bundle.IDENTITY_EMAIL}"/>
<h:inputText id="#{metadataservice.email.name}" value="#{manager.uiUser.attribute.email}" required="#{metadataservice.email.required}">
<f:validator validatorId="#{metadataservice.email.validator}"/>
</h:inputText>
<h:panelGroup />
<h:message for="#{metadataservice.email.name}" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
- <h:outputText for="password" value="#{bundle.IDENTITY_PASSWORD}"/>
+ <h:outputText value="#{bundle.IDENTITY_PASSWORD}"/>
<h:inputSecret id="password" value="#{manager.uiUser.password}" required="true">
<f:validateLength minimum="6"/>
</h:inputSecret>
<h:panelGroup />
<h:message for="password" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
- <h:outputText for="passwordCheck" value="#{bundle.IDENTITY_REGISTER_PASSWORD_CONFIRM}"/>
+ <h:outputText value="#{bundle.IDENTITY_REGISTER_PASSWORD_CONFIRM}"/>
<h:inputSecret id="passwordCheck" required="true">
<f:validator validatorId="PasswordValidator"/>
</h:inputSecret>
18 years, 7 months
- 1
- 0