Author: thomas.heute(a)jboss.com
Date: 2008-06-27 09:08:10 -0400 (Fri, 27 Jun 2008)
New Revision: 11170
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_7/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml
Log:
Put back the timers, still need a process to regularly cleanup
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2008-06-27
13:06:21 UTC (rev 11169)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2008-06-27
13:08:10 UTC (rev 11170)
@@ -30,7 +30,7 @@
- jbp_identity_validation_workflow: Email verification, No admin approval
- jbp_identity_validation_approval_workflow: Email verification, Admin approval
-->
- <subscription-mode>automatic</subscription-mode>
+ <subscription-mode>jbp_identity_validation_approval_workflow</subscription-mode>
<!--
overwrite-workflow: overwrites existing process definitions
-->
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml 2008-06-27
13:06:21 UTC (rev 11169)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validate_email.xml 2008-06-27
13:08:10 UTC (rev 11170)
@@ -31,9 +31,7 @@
</transition>
</start-state>
<state name="validate_email">
- <!--
<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.UpdateEmailAction"/>
</transition>
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml 2008-06-27
13:06:21 UTC (rev 11169)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_approval_workflow.xml 2008-06-27
13:08:10 UTC (rev 11170)
@@ -31,9 +31,7 @@
</transition>
</start-state>
<state name="validate_email">
- <!--
<timer name="time_to_expire" duedate="2 days"
transition="timedOut" />
- -->
<transition name="validated" to="admin_approval"/>
<transition name="timedOut" to="end"/>
</state>
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml 2008-06-27
13:06:21 UTC (rev 11169)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/processes/jbp_identity_validation_workflow.xml 2008-06-27
13:08:10 UTC (rev 11170)
@@ -31,9 +31,7 @@
</transition>
</start-state>
<state name="validate_email">
- <!--
<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>
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2008-06-27
13:06:21 UTC (rev 11169)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2008-06-27
13:08:10 UTC (rev 11170)
@@ -68,7 +68,7 @@
<preference>
<!-- Use captcha verification -->
<name>captcha</name>
- <value>false</value>
+ <value>true</value>
</preference>
<preference>
<!--
Modified:
branches/JBoss_Portal_Branch_2_7/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml 2008-06-27
13:06:21 UTC (rev 11169)
+++
branches/JBoss_Portal_Branch_2_7/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml 2008-06-27
13:08:10 UTC (rev 11170)
@@ -55,8 +55,8 @@
<![CDATA[
<jbpm-configuration>
<jbpm-context>
- <service name="persistence"
factory="org.jbpm.persistence.db.DbPersistenceServiceFactory" />
- <!--service name="scheduler"
factory="org.jbpm.scheduler.db.DbSchedulerServiceFactory" /-->
+ <service name="persistence"
factory="org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory" />
+ <service name="scheduler"
factory="org.jbpm.scheduler.db.DbSchedulerServiceFactory" />
<service name="message"
factory="org.jbpm.msg.db.DbMessageServiceFactory" />
<service name="tx"
factory="org.jbpm.tx.TxServiceFactory"/>
</jbpm-context>
Show replies by date