JBoss Portal SVN: r8275 - modules/common/trunk/common.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2007-09-14 15:05:13 -0400 (Fri, 14 Sep 2007)
New Revision: 8275
Modified:
modules/common/trunk/common/pom.xml
Log:
reporting and test changes
Modified: modules/common/trunk/common/pom.xml
===================================================================
--- modules/common/trunk/common/pom.xml 2007-09-14 19:03:28 UTC (rev 8274)
+++ modules/common/trunk/common/pom.xml 2007-09-14 19:05:13 UTC (rev 8275)
@@ -194,6 +194,39 @@
</testResource>
</testResources>
</build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-changes-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <linkXref>true</linkXref>
+ <targetJdk>1.5</targetJdk>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+
<properties>
<!--<build.resources>src/test/resources</build.resources>-->
<!--<env.build_resources>src/test/resources</env.build_resources>-->
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r8274 - branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-09-14 15:03:28 -0400 (Fri, 14 Sep 2007)
New Revision: 8274
Added:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_Add.gif
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_Delete.gif
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_Details.gif
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_IsDefault.gif
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_Layout.gif
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_MakeDefault.gif
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_MoveDown.gif
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_MoveUp.gif
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_Properties.gif
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_Rename.gif
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_Security.gif
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_Theme.gif
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/objectPath_Arrow.gif
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/pathBackground.png
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/pathSeparator.png
Log:
- JBPORTAL-1642: added action icons and pictures for object path navigation.
Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_Add.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_Add.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_Delete.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_Delete.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_Details.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_Details.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_IsDefault.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_IsDefault.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_Layout.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_Layout.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_MakeDefault.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_MakeDefault.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_MoveDown.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_MoveDown.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_MoveUp.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_MoveUp.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_Properties.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_Properties.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_Rename.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_Rename.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_Security.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_Security.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_Theme.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_Theme.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/objectPath_Arrow.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/objectPath_Arrow.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/pathBackground.png
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/pathBackground.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/pathSeparator.png
===================================================================
(Binary files differ)
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r8273 - in trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf: common and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-09-14 15:01:19 -0400 (Fri, 14 Sep 2007)
New Revision: 8273
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml
Log:
- JBPORTAL-1695: added divs for easier styling.
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-14 19:01:13 UTC (rev 8272)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-14 19:01:19 UTC (rev 8273)
@@ -12,30 +12,36 @@
<ui:param name="portalObjectScreen" value="Delete"/>
<ui:define name="content">
- <h3>Delete <h:outputText value="#{portalobjectmgr.selectedObjectType}"/></h3>
+ <div class="portlet-msg">
+ <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div>
+ <div class="portlet-msg-body">
+ <h3>Delete <h:outputText value="#{portalobjectmgr.selectedObjectType}"/></h3>
- <p class="portlet-msg-alert">WARNING! You are about to delete the
- <span class="objectName">#{portalobjectmgr.selectedObject.name}</span>
- #{portalobjectmgr.selectedObject.typeName} from the
- <c:if test="#{not empty portalobjectmgr.selectedObjectParent.name}">
- <span class="objectName">#{portalobjectmgr.selectedObjectParent.name}</span>
- </c:if>
- #{portalobjectmgr.selectedObjectParent.typeName}!
- </p>
+ <p class="portlet-msg-alert">WARNING! You are about to delete the
+ <span class="objectName">#{portalobjectmgr.selectedObject.name}</span>
+ #{portalobjectmgr.selectedObject.typeName} from the
+ <c:if test="#{not empty portalobjectmgr.selectedObjectParent.name}">
+ <span class="objectName">#{portalobjectmgr.selectedObjectParent.name}</span>
+ </c:if>
+ #{portalobjectmgr.selectedObjectParent.typeName}!
+ </p>
- <p class="portlet-class">Are you sure you want to delete this #{portalobjectmgr.selectedObjectType}?</p>
+ <p class="portlet-class">Are you sure you want to delete this #{portalobjectmgr.selectedObjectType}?</p>
- <h:form>
- <h:commandButton value="Delete" action="objects" actionListener="#{portalobjectmgr.destroyObject}"
- styleClass="portlet-form-button">
- <f:attribute name="objectId" value="#{portalobjectmgr.selectedObject.id}"/>
- </h:commandButton>
- <h:commandButton value="Cancel" action="objects" actionListener="#{portalobjectmgr.selectParentObject}"
- styleClass="portlet-form-button"/>
- </h:form>
+ <h:form>
+ <h:commandButton value="Delete" action="objects" actionListener="#{portalobjectmgr.destroyObject}"
+ styleClass="portlet-form-button">
+ <f:attribute name="objectId" value="#{portalobjectmgr.selectedObject.id}"/>
+ </h:commandButton>
+ <h:commandButton value="Cancel" action="objects"
+ actionListener="#{portalobjectmgr.selectParentObject}"
+ styleClass="portlet-form-button"/>
+ </h:form>
+ </div>
+ </div>
</ui:define>
</ui:composition>
-</div>
\ No newline at end of file
+</div>
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-14 19:01:13 UTC (rev 8272)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2007-09-14 19:01:19 UTC (rev 8273)
@@ -23,23 +23,28 @@
</h:form>
<br/>
- <h3>Delete <span class="objectName">#{instancemgr.selectedInstance.id}</span></h3>
+ <div class="portlet-msg">
+ <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div>
+ <div class="portlet-msg-body">
+ <h3>Delete <span class="objectName">#{instancemgr.selectedInstance.id}</span></h3>
- <p class="portlet-msg-alert">WARNING! You are about to delete the
- <span class="objectName">#{instancemgr.selectedInstance.id}</span> portlet instance causing windows
- referencing it to not be able to display their content anymore.
- </p>
+ <p class="portlet-msg-alert">WARNING! You are about to delete the
+ <span class="objectName">#{instancemgr.selectedInstance.id}</span> portlet instance causing windows
+ referencing it to not be able to display their content anymore.
+ </p>
- <p class="portlet-class">Are you sure you want to delete this portlet instance?</p>
+ <p class="portlet-class">Are you sure you want to delete this portlet instance?</p>
- <h:form>
- <h:commandButton value="Delete" action="instances" actionListener="#{instancemgr.deleteInstance}"
- styleClass="portlet-form-button">
- <f:attribute name="instanceId" value="#{instancemgr.selectedInstance.id}"/>
- </h:commandButton>
- <h:commandButton value="Cancel" action="instances" actionListener="objects"
- styleClass="portlet-form-button"/>
- </h:form>
+ <h:form>
+ <h:commandButton value="Delete" action="instances" actionListener="#{instancemgr.deleteInstance}"
+ styleClass="portlet-form-button">
+ <f:attribute name="instanceId" value="#{instancemgr.selectedInstance.id}"/>
+ </h:commandButton>
+ <h:commandButton value="Cancel" action="instances" actionListener="objects"
+ styleClass="portlet-form-button"/>
+ </h:form>
+ </div>
+ </div>
</ui:define>
</ui:composition>
</div>
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r8272 - /.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2007-09-14 15:01:13 -0400 (Fri, 14 Sep 2007)
New Revision: 8272
Modified:
pom.xml
Log:
small reporting changes
Modified: pom.xml
===================================================================
--- pom.xml 2007-09-14 19:00:29 UTC (rev 8271)
+++ pom.xml 2007-09-14 19:01:13 UTC (rev 8272)
@@ -7,32 +7,40 @@
<name>Jboss Portal</name>
<version>1.0-SNAPSHOT</version>
<url>http://labs.jboss.com/jbossportal</url>
-
+
<dependencies/>
-
+
<repositories>
<repository>
- <id>repository.jboss.org</id>
- <url>http://repository.jboss.com/maven2/</url>
- </repository>
+ <id>repository.jboss.org</id>
+ <url>http://repository.jboss.com/maven2/</url>
+ </repository>
</repositories>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jboss-packaging-maven-plugin</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ </plugin>
+
+ </plugins>
+ </pluginManagement>
</build>
-
+
<!--<distributionManagement>
<repository>
Copy the distribution jar file to a local checkout of the maven repository
@@ -46,13 +54,12 @@
<url>dav:https://snapshots.jboss.org/maven2</url>
</snapshotRepository>
</distributionManagement>-->
-
+
<modules>
<module>modules</module>
</modules>
-
-
-
+
+
<issueManagement>
<system>JIRA</system>
<url>http://jira.jboss.com/jira/browse/JBPORTAL</url>
@@ -113,4 +120,36 @@
<url>https://svn.jboss.org/repos/portal/trunk</url>
</scm>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-changes-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <linkXref>true</linkXref>
+ <targetJdk>1.5</targetJdk>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+
</project>
\ No newline at end of file
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r8271 - in branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf: common and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-09-14 15:00:29 -0400 (Fri, 14 Sep 2007)
New Revision: 8271
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml
Log:
- JBPORTAL-1695: added divs for easier styling.
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-14 18:22:35 UTC (rev 8270)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-14 19:00:29 UTC (rev 8271)
@@ -12,27 +12,33 @@
<ui:param name="portalObjectScreen" value="Delete"/>
<ui:define name="content">
- <h3>Delete <h:outputText value="#{portalobjectmgr.selectedObjectType}"/></h3>
+ <div class="portlet-msg">
+ <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div>
+ <div class="portlet-msg-body">
+ <h3>Delete <h:outputText value="#{portalobjectmgr.selectedObjectType}"/></h3>
- <p class="portlet-msg-alert">WARNING! You are about to delete the
- <span class="objectName">#{portalobjectmgr.selectedObject.name}</span>
- #{portalobjectmgr.selectedObject.typeName} from the
- <c:if test="#{not empty portalobjectmgr.selectedObjectParent.name}">
- <span class="objectName">#{portalobjectmgr.selectedObjectParent.name}</span>
- </c:if>
- #{portalobjectmgr.selectedObjectParent.typeName}!
- </p>
+ <p class="portlet-msg-alert">WARNING! You are about to delete the
+ <span class="objectName">#{portalobjectmgr.selectedObject.name}</span>
+ #{portalobjectmgr.selectedObject.typeName} from the
+ <c:if test="#{not empty portalobjectmgr.selectedObjectParent.name}">
+ <span class="objectName">#{portalobjectmgr.selectedObjectParent.name}</span>
+ </c:if>
+ #{portalobjectmgr.selectedObjectParent.typeName}!
+ </p>
- <p class="portlet-class">Are you sure you want to delete this #{portalobjectmgr.selectedObjectType}?</p>
+ <p class="portlet-class">Are you sure you want to delete this #{portalobjectmgr.selectedObjectType}?</p>
- <h:form>
- <h:commandButton value="Delete" action="objects" actionListener="#{portalobjectmgr.destroyObject}"
- styleClass="portlet-form-button">
- <f:attribute name="objectId" value="#{portalobjectmgr.selectedObject.id}"/>
- </h:commandButton>
- <h:commandButton value="Cancel" action="objects" actionListener="#{portalobjectmgr.selectParentObject}"
- styleClass="portlet-form-button"/>
- </h:form>
+ <h:form>
+ <h:commandButton value="Delete" action="objects" actionListener="#{portalobjectmgr.destroyObject}"
+ styleClass="portlet-form-button">
+ <f:attribute name="objectId" value="#{portalobjectmgr.selectedObject.id}"/>
+ </h:commandButton>
+ <h:commandButton value="Cancel" action="objects"
+ actionListener="#{portalobjectmgr.selectParentObject}"
+ styleClass="portlet-form-button"/>
+ </h:form>
+ </div>
+ </div>
</ui:define>
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-14 18:22:35 UTC (rev 8270)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2007-09-14 19:00:29 UTC (rev 8271)
@@ -23,23 +23,28 @@
</h:form>
<br/>
- <h3>Delete <span class="objectName">#{instancemgr.selectedInstance.id}</span></h3>
+ <div class="portlet-msg">
+ <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div>
+ <div class="portlet-msg-body">
+ <h3>Delete <span class="objectName">#{instancemgr.selectedInstance.id}</span></h3>
- <p class="portlet-msg-alert">WARNING! You are about to delete the
- <span class="objectName">#{instancemgr.selectedInstance.id}</span> portlet instance causing windows
- referencing it to not be able to display their content anymore.
- </p>
+ <p class="portlet-msg-alert">WARNING! You are about to delete the
+ <span class="objectName">#{instancemgr.selectedInstance.id}</span> portlet instance causing windows
+ referencing it to not be able to display their content anymore.
+ </p>
- <p class="portlet-class">Are you sure you want to delete this portlet instance?</p>
+ <p class="portlet-class">Are you sure you want to delete this portlet instance?</p>
- <h:form>
- <h:commandButton value="Delete" action="instances" actionListener="#{instancemgr.deleteInstance}"
- styleClass="portlet-form-button">
- <f:attribute name="instanceId" value="#{instancemgr.selectedInstance.id}"/>
- </h:commandButton>
- <h:commandButton value="Cancel" action="instances" actionListener="objects"
- styleClass="portlet-form-button"/>
- </h:form>
+ <h:form>
+ <h:commandButton value="Delete" action="instances" actionListener="#{instancemgr.deleteInstance}"
+ styleClass="portlet-form-button">
+ <f:attribute name="instanceId" value="#{instancemgr.selectedInstance.id}"/>
+ </h:commandButton>
+ <h:commandButton value="Cancel" action="instances" actionListener="objects"
+ styleClass="portlet-form-button"/>
+ </h:form>
+ </div>
+ </div>
</ui:define>
</ui:composition>
</div>
\ No newline at end of file
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r8270 - modules/common/trunk/common.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2007-09-14 14:22:35 -0400 (Fri, 14 Sep 2007)
New Revision: 8270
Modified:
modules/common/trunk/common/pom.xml
Log:
dependency changes and exclude failing test
Modified: modules/common/trunk/common/pom.xml
===================================================================
--- modules/common/trunk/common/pom.xml 2007-09-14 15:43:45 UTC (rev 8269)
+++ modules/common/trunk/common/pom.xml 2007-09-14 18:22:35 UTC (rev 8270)
@@ -13,6 +13,7 @@
<version>1.0-SNAPSHOT</version>
<dependencies>
+
<dependency>
<groupId>apache-log4j</groupId>
<artifactId>log4j</artifactId>
@@ -92,11 +93,9 @@
</dependency>
<dependency>
- <groupId>cargo</groupId>
+ <groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
<version>0.8</version>
- <scope>system</scope>
- <systemPath>${basedir}/../tools/lib/cargo-core-uberjar-0.8.jar</systemPath>
</dependency>
<dependency>
@@ -136,6 +135,7 @@
</resource>
</resources>
<plugins>
+
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -155,6 +155,17 @@
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org/jboss/portal/test/common/BundleNameParserTestCase*.java</exclude>
+ <exclude>org/jboss/portal/test/common/net/URLNavigatorTestCase.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
<!--<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r8269 - in branches/JBoss_Portal_Branch_2_6/core-identity: src/main/org/jboss/portal/core/identity/services/metadata and 9 other directories.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-14 11:43:45 -0400 (Fri, 14 Sep 2007)
New Revision: 8269
Added:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/metadata/
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/metadata/ConfigurationTestCase.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/mock/
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockProfileInfo.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockPropertyInfo.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockUserProfileModule.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/test/
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/test/conf/
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/test/conf/configuration1.xml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/test/conf/schema/
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/test/conf/schema/identity-ui-configuration.xsd
Removed:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/metadata/ConfigurationTestCase.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockProfileInfo.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockPropertyInfo.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockUserProfileModule.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/test/conf/
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/test/conf/configuration1.xml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/test/conf/schema/
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/test/conf/schema/identity-ui-configuration.xsd
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/build.xml
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/ui/admin/UserAdministrationBean.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml
Log:
merge configuration parsing test case
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/build.xml 2007-09-14 15:28:02 UTC (rev 8268)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/build.xml 2007-09-14 15:43:45 UTC (rev 8269)
@@ -84,6 +84,8 @@
<property name="jboss-junit-configuration" value=""/>
<property name="junit.formatter.usefile" value="true"/>
+ <property name="test.reports" value="${module.output}/tests"/>
+
<!-- Configure thirdparty libraries -->
&libraries;
@@ -216,6 +218,7 @@
<copy todir="${build.resources}/portal-identity-war">
<fileset dir="${source.bin}/portal-identity-war"/>
</copy>
+
<!-- portal-identity.sar -->
<copy todir="${build.resources}/portal-identity.sar">
<fileset dir="${build.resources}/portal-identity-sar"/>
@@ -229,7 +232,6 @@
<copy todir="${build.resources}/portal-identity.sar/portal-identity.war">
<fileset dir="${build.resources}/portal-identity-war"/>
</copy>
-
</target>
<target name="output" depends="artifacts">
@@ -293,9 +295,46 @@
<delete file="${jboss.home}/server/${portal.deploy.dir}/portal-identity.sar"/>
</target>
- <target name="package-tests"/>
+ <!--
+ | Tests
+ -->
+
+ <target name="package-tests" depends="init, clean-tests">
-
+ <jar jarfile="${build.lib}/portal-core-identity-test-lib.jar">
+ <fileset dir="${build.classes}" includes="org/jboss/portal/test/**"/>
+ </jar>
+
+ </target>
+
+ <target name="clean-tests" description="cleans the output from the package-test command">
+
+ </target>
+
+ <target name="tests" depends="init, package-tests" description="Runs the core-identity tests">
+ <mkdir dir="${test.reports}"/>
+
+ <execute-tests>
+ <x-test>
+ <test todir="${test.reports}" name="org.jboss.portal.test.core.identity.metadata.ConfigurationTestCase"/>
+ </x-test>
+ <x-classpath>
+ <path refid="junit.junit.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/>
+ <path refid="jbossas/core.libs.classpath"/>
+ <path refid="jboss.portal-jems.classpath"/>
+ <path refid="jboss.portal-identity.classpath"/>
+ <path refid="oswego.concurrent.classpath" />
+ <path refid="apache.xerces.classpath"/>
+ <pathelement location="${build.lib}/portal-core-identity-ui-lib.jar"/>
+ <pathelement location="${build.lib}/portal-core-identity-services-lib.jar"/>
+ <pathelement location="${build.lib}/portal-core-identity-test-lib.jar"/>
+ <pathelement location="${build.resources}/test"/>
+ </x-classpath>
+ </execute-tests>
+
+ </target>
+
<!--
Some convenience build targets to help deployment during development
-->
@@ -305,4 +344,5 @@
<require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
<copy file="${build.lib}/portal-identity.sar" todir="${jboss.home}/server/${portal-ha.deploy.dir}" overwrite="true"/>
</target>
+
</project>
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-14 15:28:02 UTC (rev 8268)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java 2007-09-14 15:43:45 UTC (rev 8269)
@@ -341,7 +341,7 @@
}
catch (Exception e)
{
- throw new CoreIdentityConfigurationException("Could not parse configuration file. If you run JBoss Portal with JBoss AS 4.0.5 or less please check the reference Guide.");
+ throw new CoreIdentityConfigurationException("Could not parse configuration file. If you run JBoss Portal with JBoss AS 4.0.5 or minor please check the wiki.");
}
}
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-14 15:28:02 UTC (rev 8268)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-14 15:43:45 UTC (rev 8269)
@@ -293,7 +293,7 @@
public List getPendingUsers()
{
- if ( this.registrationService != null )
+ if ( this.registrationService != null && this.pendingUsers == null)
this.pendingUsers = this.registrationService.getPendingUsers(displayNode);
return pendingUsers;
}
Property changes on: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity
___________________________________________________________________
Name: svn:ignore
+ validators
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/metadata (from rev 8268, trunk/core-identity/src/main/org/jboss/portal/test/core/identity/metadata)
Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/metadata/ConfigurationTestCase.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/test/core/identity/metadata/ConfigurationTestCase.java 2007-09-14 15:28:02 UTC (rev 8268)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/metadata/ConfigurationTestCase.java 2007-09-14 15:43:45 UTC (rev 8269)
@@ -1,161 +0,0 @@
-/******************************************************************************
- * 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. *
- ******************************************************************************/
-package org.jboss.portal.test.core.identity.metadata;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Map;
-
-import org.jboss.portal.core.identity.services.metadata.IdentityUIConfiguration;
-import org.jboss.portal.core.identity.services.metadata.IdentityUIConfigurationServiceImpl;
-import org.jboss.portal.core.identity.services.metadata.UIComponentConfiguration;
-import org.jboss.portal.test.core.identity.mock.MockPropertyInfo;
-import org.jboss.portal.test.core.identity.mock.MockUserProfileModule;
-
-import junit.framework.TestCase;
-
-/**
- * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-public class ConfigurationTestCase extends TestCase
-{
- /** The (mock) userProfileModule */
- MockUserProfileModule userProfileModule;
-
- protected void setUp()
- {
- this.userProfileModule = new MockUserProfileModule();
-
- // Creating PropertyInfo Objects
- MockPropertyInfo mpi1 = new MockPropertyInfo("user.name.given");
- mpi1.setAccessMode("read-only");
- MockPropertyInfo mpi2 = new MockPropertyInfo("user.name.family");
- mpi2.setUsage("mandatory");
- MockPropertyInfo mpi3 = new MockPropertyInfo("user.business-info.online.email");
- MockPropertyInfo mpi4 = new MockPropertyInfo("portal.user.locale");
- MockPropertyInfo mpi5 = new MockPropertyInfo("portal.user.interests");
-
- // Feed the (mock) userProfileModule with information
- this.userProfileModule.setPropertyInfo(mpi1.getName(), mpi1);
- this.userProfileModule.setPropertyInfo(mpi2.getName(), mpi2);
- this.userProfileModule.setPropertyInfo(mpi3.getName(), mpi3);
- this.userProfileModule.setPropertyInfo(mpi4.getName(), mpi4);
- this.userProfileModule.setPropertyInfo(mpi5.getName(), mpi5);
- }
-
- public void testBasicConfiguration()
- {
- // Create configuration service with conf/configuration1.xml
- IdentityUIConfigurationServiceImpl cfs = new IdentityUIConfigurationServiceImpl(){
- protected InputStream getResource(String path) throws IOException
- {
- path = "conf/configuration1.xml";
- return super.getResource(path);
- }
- };
- assertNotNull(cfs);
-
- // Set MockUserProfileModule
- cfs.setUserProfileModule(this.userProfileModule);
-
- try
- {
- cfs.startService();
- }
- catch(Exception e)
- {
- e.printStackTrace();
- fail("could not start configuration service ... ");
- }
- assertNotNull(cfs);
-
- // Check basic configuration values
- IdentityUIConfiguration cf = cfs.getConfiguration();
- assertNotNull(cf);
- assertEquals("automatic", cf.getSubscriptionMode());
- // admin subscription mode
- assertEquals("automatic", cf.getAdminSubscriptionMode());
- assertEquals(false, cf.isOverwriteWorkflow());
- assertEquals("jboss.org", cf.getEmailDomain());
- assertEquals("do-no-reply(a)jboss.com", cf.getEmailFrom());
- assertEquals("testCharacters", cf.getPasswordGenerationCharacters());
-
- List defaultRoles = cf.getDefaultRoles();
- assertNotNull(defaultRoles);
- assertEquals(2, defaultRoles.size());
- assertEquals("User", defaultRoles.get(0));
- assertEquals("Admin", defaultRoles.get(1));
-
- // Check givenname
- UIComponentConfiguration givenname = (UIComponentConfiguration)cf.getUiComponents().get("givenname");
- assertNotNull(givenname);
- assertEquals("givenname", givenname.getName());
- assertEquals(false, givenname.isRequired());
- // Must be overwritten from the mock property info
- assertEquals(true, givenname.isReadOnly());
- try
- {
- assertEquals(String.class, givenname.getPropertyClass());
- }
- catch (ClassNotFoundException e)
- {
- e.printStackTrace();
- fail();
- }
-
- // Check familyname - converter
- UIComponentConfiguration familyname = (UIComponentConfiguration)cf.getUiComponents().get("familyname");
- assertNotNull(familyname);
- assertEquals("familyname", familyname.getName());
- assertEquals("FamilyNameConverter", familyname.getConverter());
- // Value from the xml must be overwritten from the mock property info
- assertEquals(true, familyname.isRequired());
- assertEquals(false, familyname.isReadOnly());
-
- // Check locale and predefined map values
- UIComponentConfiguration locale = (UIComponentConfiguration)cf.getUiComponents().get("locale");
- assertNotNull(locale);
- assertEquals("locale", locale.getName());
- assertEquals("org.jboss.portal.core.identity.locale", locale.getPredefinedMapValues());
- assertEquals(false, locale.isRequired());
-
- // Check email - required - validator
- UIComponentConfiguration email = (UIComponentConfiguration)cf.getUiComponents().get("email");
- assertNotNull(email);
- assertEquals("email", email.getName());
- assertEquals("EmailValidator", email.getValidator());
- assertEquals("EmailValidator", email.getValidators().get(0));
- assertEquals(true, email.isRequired());
-
- UIComponentConfiguration interests = (UIComponentConfiguration)cf.getUiComponents().get("interests");
- assertNotNull(interests);
- Map values = interests.getValues();
- assertEquals("snowboarding", (String) values.get("board"));
- assertEquals("skiing", (String) values.get("ski"));
- assertEquals("sledging", (String) values.get("sledge"));
-
- }
-
-}
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/metadata/ConfigurationTestCase.java (from rev 8268, trunk/core-identity/src/main/org/jboss/portal/test/core/identity/metadata/ConfigurationTestCase.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/metadata/ConfigurationTestCase.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/metadata/ConfigurationTestCase.java 2007-09-14 15:43:45 UTC (rev 8269)
@@ -0,0 +1,161 @@
+/******************************************************************************
+ * 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. *
+ ******************************************************************************/
+package org.jboss.portal.test.core.identity.metadata;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+
+import org.jboss.portal.core.identity.services.metadata.IdentityUIConfiguration;
+import org.jboss.portal.core.identity.services.metadata.IdentityUIConfigurationServiceImpl;
+import org.jboss.portal.core.identity.services.metadata.UIComponentConfiguration;
+import org.jboss.portal.test.core.identity.mock.MockPropertyInfo;
+import org.jboss.portal.test.core.identity.mock.MockUserProfileModule;
+
+import junit.framework.TestCase;
+
+/**
+ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
+ * @version $Revision$
+ */
+public class ConfigurationTestCase extends TestCase
+{
+ /** The (mock) userProfileModule */
+ MockUserProfileModule userProfileModule;
+
+ protected void setUp()
+ {
+ this.userProfileModule = new MockUserProfileModule();
+
+ // Creating PropertyInfo Objects
+ MockPropertyInfo mpi1 = new MockPropertyInfo("user.name.given");
+ mpi1.setAccessMode("read-only");
+ MockPropertyInfo mpi2 = new MockPropertyInfo("user.name.family");
+ mpi2.setUsage("mandatory");
+ MockPropertyInfo mpi3 = new MockPropertyInfo("user.business-info.online.email");
+ MockPropertyInfo mpi4 = new MockPropertyInfo("portal.user.locale");
+ MockPropertyInfo mpi5 = new MockPropertyInfo("portal.user.interests");
+
+ // Feed the (mock) userProfileModule with information
+ this.userProfileModule.setPropertyInfo(mpi1.getName(), mpi1);
+ this.userProfileModule.setPropertyInfo(mpi2.getName(), mpi2);
+ this.userProfileModule.setPropertyInfo(mpi3.getName(), mpi3);
+ this.userProfileModule.setPropertyInfo(mpi4.getName(), mpi4);
+ this.userProfileModule.setPropertyInfo(mpi5.getName(), mpi5);
+ }
+
+ public void testBasicConfiguration()
+ {
+ // Create configuration service with conf/configuration1.xml
+ IdentityUIConfigurationServiceImpl cfs = new IdentityUIConfigurationServiceImpl(){
+ protected InputStream getResource(String path) throws IOException
+ {
+ path = "conf/configuration1.xml";
+ return super.getResource(path);
+ }
+ };
+ assertNotNull(cfs);
+
+ // Set MockUserProfileModule
+ cfs.setUserProfileModule(this.userProfileModule);
+
+ try
+ {
+ cfs.startService();
+ }
+ catch(Exception e)
+ {
+ e.printStackTrace();
+ fail("could not start configuration service ... ");
+ }
+ assertNotNull(cfs);
+
+ // Check basic configuration values
+ IdentityUIConfiguration cf = cfs.getConfiguration();
+ assertNotNull(cf);
+ assertEquals("automatic", cf.getSubscriptionMode());
+ // admin subscription mode
+ assertEquals("automatic", cf.getAdminSubscriptionMode());
+ assertEquals(false, cf.isOverwriteWorkflow());
+ assertEquals("jboss.org", cf.getEmailDomain());
+ assertEquals("do-no-reply(a)jboss.com", cf.getEmailFrom());
+ assertEquals("testCharacters", cf.getPasswordGenerationCharacters());
+
+ List defaultRoles = cf.getDefaultRoles();
+ assertNotNull(defaultRoles);
+ assertEquals(2, defaultRoles.size());
+ assertEquals("User", defaultRoles.get(0));
+ assertEquals("Admin", defaultRoles.get(1));
+
+ // Check givenname
+ UIComponentConfiguration givenname = (UIComponentConfiguration)cf.getUiComponents().get("givenname");
+ assertNotNull(givenname);
+ assertEquals("givenname", givenname.getName());
+ assertEquals(false, givenname.isRequired());
+ // Must be overwritten from the mock property info
+ assertEquals(true, givenname.isReadOnly());
+ try
+ {
+ assertEquals(String.class, givenname.getPropertyClass());
+ }
+ catch (ClassNotFoundException e)
+ {
+ e.printStackTrace();
+ fail();
+ }
+
+ // Check familyname - converter
+ UIComponentConfiguration familyname = (UIComponentConfiguration)cf.getUiComponents().get("familyname");
+ assertNotNull(familyname);
+ assertEquals("familyname", familyname.getName());
+ assertEquals("FamilyNameConverter", familyname.getConverter());
+ // Value from the xml must be overwritten from the mock property info
+ assertEquals(true, familyname.isRequired());
+ assertEquals(false, familyname.isReadOnly());
+
+ // Check locale and predefined map values
+ UIComponentConfiguration locale = (UIComponentConfiguration)cf.getUiComponents().get("locale");
+ assertNotNull(locale);
+ assertEquals("locale", locale.getName());
+ assertEquals("org.jboss.portal.core.identity.locale", locale.getPredefinedMapValues());
+ assertEquals(false, locale.isRequired());
+
+ // Check email - required - validator
+ UIComponentConfiguration email = (UIComponentConfiguration)cf.getUiComponents().get("email");
+ assertNotNull(email);
+ assertEquals("email", email.getName());
+ assertEquals("EmailValidator", email.getValidator());
+ assertEquals("EmailValidator", email.getValidators().get(0));
+ assertEquals(true, email.isRequired());
+
+ UIComponentConfiguration interests = (UIComponentConfiguration)cf.getUiComponents().get("interests");
+ assertNotNull(interests);
+ Map values = interests.getValues();
+ assertEquals("snowboarding", (String) values.get("board"));
+ assertEquals("skiing", (String) values.get("ski"));
+ assertEquals("sledging", (String) values.get("sledge"));
+
+ }
+
+}
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/mock (from rev 8268, trunk/core-identity/src/main/org/jboss/portal/test/core/identity/mock)
Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockProfileInfo.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockProfileInfo.java 2007-09-14 15:28:02 UTC (rev 8268)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockProfileInfo.java 2007-09-14 15:43:45 UTC (rev 8269)
@@ -1,55 +0,0 @@
-/******************************************************************************
- * 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. *
- ******************************************************************************/
-package org.jboss.portal.test.core.identity.mock;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.jboss.portal.identity.info.ProfileInfo;
-import org.jboss.portal.identity.info.PropertyInfo;
-
-/**
- * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-public class MockProfileInfo implements ProfileInfo
-{
- Map properties = new HashMap();
-
- public Map getPropertiesInfo()
- {
- return properties;
- }
-
- public PropertyInfo getPropertyInfo(String name)
- {
- return (PropertyInfo) properties.get(name);
- }
-
- public void setPropertyInfo(String id, PropertyInfo propertyInfo)
- {
- this.properties.put(id, propertyInfo);
- }
-
-}
-
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockProfileInfo.java (from rev 8268, trunk/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockProfileInfo.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockProfileInfo.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockProfileInfo.java 2007-09-14 15:43:45 UTC (rev 8269)
@@ -0,0 +1,55 @@
+/******************************************************************************
+ * 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. *
+ ******************************************************************************/
+package org.jboss.portal.test.core.identity.mock;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.portal.identity.info.ProfileInfo;
+import org.jboss.portal.identity.info.PropertyInfo;
+
+/**
+ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
+ * @version $Revision$
+ */
+public class MockProfileInfo implements ProfileInfo
+{
+ Map properties = new HashMap();
+
+ public Map getPropertiesInfo()
+ {
+ return properties;
+ }
+
+ public PropertyInfo getPropertyInfo(String name)
+ {
+ return (PropertyInfo) properties.get(name);
+ }
+
+ public void setPropertyInfo(String id, PropertyInfo propertyInfo)
+ {
+ this.properties.put(id, propertyInfo);
+ }
+
+}
+
Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockPropertyInfo.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockPropertyInfo.java 2007-09-14 15:28:02 UTC (rev 8268)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockPropertyInfo.java 2007-09-14 15:43:45 UTC (rev 8269)
@@ -1,147 +0,0 @@
-/******************************************************************************
- * 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. *
- ******************************************************************************/
-package org.jboss.portal.test.core.identity.mock;
-
-import org.jboss.portal.common.i18n.LocalizedString;
-import org.jboss.portal.identity.info.PropertyInfo;
-
-/**
- * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-public class MockPropertyInfo implements PropertyInfo
-{
- /** The name */
- private String name;
-
- /** The type - default a String */
- private String type = "java.lang.String";
-
- /** The accessMode - default read-write */
- private String accessMode = "read-write";
-
- /** The usage - default optional */
- private String usage = "optional";
-
- /** The displayName - not used */
- private LocalizedString displayName;
-
- /** The description - not used */
- private LocalizedString description;
-
- /** The mappingDBType - not used */
- private String mappingDBType;
-
- /** The mappingDBValue - not used */
- private String mappingDBValue;
-
- /** The mappingLDAPValue - not used */
- private String mappingLDAPValue;
-
- /** The mappedLDAP - not used */
- private boolean mappedLDAP;
-
- /** The mappedDB - not used */
- private boolean mappedDB;
-
- public MockPropertyInfo(String name)
- {
- this.name = name;
- }
-
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- public String getType()
- {
- return type;
- }
-
- public void setType(String type)
- {
- this.type = type;
- }
-
- public String getAccessMode()
- {
- return accessMode;
- }
-
- public void setAccessMode(String accessMode)
- {
- this.accessMode = accessMode;
- }
-
- public String getUsage()
- {
- return usage;
- }
-
- public void setUsage(String usage)
- {
- this.usage = usage;
- }
-
- public LocalizedString getDisplayName()
- {
- return displayName;
- }
-
- public LocalizedString getDescription()
- {
- return description;
- }
-
- public String getMappingDBType()
- {
- return mappingDBType;
- }
-
- public String getMappingDBValue()
- {
- return mappingDBValue;
- }
-
- public String getMappingLDAPValue()
- {
- return mappingLDAPValue;
- }
-
- public boolean isMappedLDAP()
- {
- return mappedLDAP;
- }
-
- public boolean isMappedDB()
- {
- return mappedDB;
- }
-
-}
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockPropertyInfo.java (from rev 8268, trunk/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockPropertyInfo.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockPropertyInfo.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockPropertyInfo.java 2007-09-14 15:43:45 UTC (rev 8269)
@@ -0,0 +1,147 @@
+/******************************************************************************
+ * 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. *
+ ******************************************************************************/
+package org.jboss.portal.test.core.identity.mock;
+
+import org.jboss.portal.common.i18n.LocalizedString;
+import org.jboss.portal.identity.info.PropertyInfo;
+
+/**
+ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
+ * @version $Revision$
+ */
+public class MockPropertyInfo implements PropertyInfo
+{
+ /** The name */
+ private String name;
+
+ /** The type - default a String */
+ private String type = "java.lang.String";
+
+ /** The accessMode - default read-write */
+ private String accessMode = "read-write";
+
+ /** The usage - default optional */
+ private String usage = "optional";
+
+ /** The displayName - not used */
+ private LocalizedString displayName;
+
+ /** The description - not used */
+ private LocalizedString description;
+
+ /** The mappingDBType - not used */
+ private String mappingDBType;
+
+ /** The mappingDBValue - not used */
+ private String mappingDBValue;
+
+ /** The mappingLDAPValue - not used */
+ private String mappingLDAPValue;
+
+ /** The mappedLDAP - not used */
+ private boolean mappedLDAP;
+
+ /** The mappedDB - not used */
+ private boolean mappedDB;
+
+ public MockPropertyInfo(String name)
+ {
+ this.name = name;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public String getType()
+ {
+ return type;
+ }
+
+ public void setType(String type)
+ {
+ this.type = type;
+ }
+
+ public String getAccessMode()
+ {
+ return accessMode;
+ }
+
+ public void setAccessMode(String accessMode)
+ {
+ this.accessMode = accessMode;
+ }
+
+ public String getUsage()
+ {
+ return usage;
+ }
+
+ public void setUsage(String usage)
+ {
+ this.usage = usage;
+ }
+
+ public LocalizedString getDisplayName()
+ {
+ return displayName;
+ }
+
+ public LocalizedString getDescription()
+ {
+ return description;
+ }
+
+ public String getMappingDBType()
+ {
+ return mappingDBType;
+ }
+
+ public String getMappingDBValue()
+ {
+ return mappingDBValue;
+ }
+
+ public String getMappingLDAPValue()
+ {
+ return mappingLDAPValue;
+ }
+
+ public boolean isMappedLDAP()
+ {
+ return mappedLDAP;
+ }
+
+ public boolean isMappedDB()
+ {
+ return mappedDB;
+ }
+
+}
Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockUserProfileModule.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockUserProfileModule.java 2007-09-14 15:28:02 UTC (rev 8268)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockUserProfileModule.java 2007-09-14 15:43:45 UTC (rev 8269)
@@ -1,79 +0,0 @@
-/******************************************************************************
- * 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. *
- ******************************************************************************/
-package org.jboss.portal.test.core.identity.mock;
-
-import java.util.Map;
-
-import org.jboss.portal.identity.IdentityException;
-import org.jboss.portal.identity.User;
-import org.jboss.portal.identity.UserProfileModule;
-import org.jboss.portal.identity.info.ProfileInfo;
-import org.jboss.portal.identity.info.PropertyInfo;
-
-/**
- * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-public class MockUserProfileModule implements UserProfileModule
-{
-
- MockProfileInfo profileInfo = new MockProfileInfo();
-
- /**
- *
- * Used to set a MockPropertyInfo directly
- *
- * @param propertyInfo.getName()
- * @param propertyInfo
- */
- public void setPropertyInfo(String id, PropertyInfo propertyInfo)
- {
- this.profileInfo.setPropertyInfo(id, propertyInfo);
- }
-
- public ProfileInfo getProfileInfo() throws IdentityException
- {
- return profileInfo;
- }
-
- /**
- * Not implemented Methods
- */
-
- public Map getProperties(User user) throws IdentityException, IllegalArgumentException
- {
- throw new IllegalArgumentException("Mock method not yet implemented");
- }
-
- public Object getProperty(User user, String propertyName) throws IdentityException, IllegalArgumentException
- {
- throw new IllegalArgumentException("Mock method not yet implemented");
- }
-
- public void setProperty(User user, String name, Object property) throws IdentityException, IllegalArgumentException
- {
- throw new IllegalArgumentException("Mock method not yet implemented");
- }
-
-}
-
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockUserProfileModule.java (from rev 8268, trunk/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockUserProfileModule.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockUserProfileModule.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockUserProfileModule.java 2007-09-14 15:43:45 UTC (rev 8269)
@@ -0,0 +1,79 @@
+/******************************************************************************
+ * 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. *
+ ******************************************************************************/
+package org.jboss.portal.test.core.identity.mock;
+
+import java.util.Map;
+
+import org.jboss.portal.identity.IdentityException;
+import org.jboss.portal.identity.User;
+import org.jboss.portal.identity.UserProfileModule;
+import org.jboss.portal.identity.info.ProfileInfo;
+import org.jboss.portal.identity.info.PropertyInfo;
+
+/**
+ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
+ * @version $Revision$
+ */
+public class MockUserProfileModule implements UserProfileModule
+{
+
+ MockProfileInfo profileInfo = new MockProfileInfo();
+
+ /**
+ *
+ * Used to set a MockPropertyInfo directly
+ *
+ * @param propertyInfo.getName()
+ * @param propertyInfo
+ */
+ public void setPropertyInfo(String id, PropertyInfo propertyInfo)
+ {
+ this.profileInfo.setPropertyInfo(id, propertyInfo);
+ }
+
+ public ProfileInfo getProfileInfo() throws IdentityException
+ {
+ return profileInfo;
+ }
+
+ /**
+ * Not implemented Methods
+ */
+
+ public Map getProperties(User user) throws IdentityException, IllegalArgumentException
+ {
+ throw new IllegalArgumentException("Mock method not yet implemented");
+ }
+
+ public Object getProperty(User user, String propertyName) throws IdentityException, IllegalArgumentException
+ {
+ throw new IllegalArgumentException("Mock method not yet implemented");
+ }
+
+ public void setProperty(User user, String name, Object property) throws IdentityException, IllegalArgumentException
+ {
+ throw new IllegalArgumentException("Mock method not yet implemented");
+ }
+
+}
+
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-14 15:28:02 UTC (rev 8268)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-14 15:43:45 UTC (rev 8269)
@@ -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
-->
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/test (from rev 8268, trunk/core-identity/src/resources/test)
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/test/conf (from rev 8268, trunk/core-identity/src/resources/test/conf)
Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/test/conf/configuration1.xml
===================================================================
--- trunk/core-identity/src/resources/test/conf/configuration1.xml 2007-09-14 15:28:02 UTC (rev 8268)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/test/conf/configuration1.xml 2007-09-14 15:43:45 UTC (rev 8269)
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
- ~ contributors as indicated by the @authors tag. See the ~
- ~ copyright.txt in the distribution for a full listing of ~
- ~ individual contributors. ~
- ~ ~
- ~ This is free software; you can redistribute it and/or modify it ~
- ~ under the terms of the GNU Lesser General Public License as ~
- ~ published by the Free Software Foundation; either version 2.1 of ~
- ~ the License, or (at your option) any later version. ~
- ~ ~
- ~ This software is distributed in the hope that it will be useful, ~
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
- ~ Lesser General Public License for more details. ~
- ~ ~
- ~ You should have received a copy of the GNU Lesser General Public ~
- ~ License along with this software; if not, write to the Free ~
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<identity-ui-configuration>
- <subscription-mode>automatic</subscription-mode>
- <overwrite-workflow>false</overwrite-workflow>
- <email-domain>jboss.org</email-domain>
- <email-from>do-no-reply(a)jboss.com</email-from>
- <password-generation-characters>testCharacters</password-generation-characters>
- <default-roles>
- <role>User</role>
- <role>Admin</role>
- </default-roles>
-
- <ui-components>
- <ui-component name="givenname">
- <property-ref>user.name.given</property-ref>
- </ui-component>
- <ui-component name="familyname">
- <property-ref>user.name.family</property-ref>
- <converter>FamilyNameConverter</converter>
- <required>false</required>
- </ui-component>
- <ui-component name="email">
- <property-ref>user.business-info.online.email</property-ref>
- <required>true</required>
- <validators>
- <validator>EmailValidator</validator>
- </validators>
- </ui-component>
- <ui-component name="locale">
- <property-ref>portal.user.locale</property-ref>
- <values>
- <value key="org.jboss.portal.core.identity.locale" />
- </values>
- </ui-component>
- <ui-component name="interests">
- <property-ref>portal.user.interests</property-ref>
- <values>
- <value key="board">snowboarding</value>
- <value key="ski">skiing</value>
- <value key="sledge">sledging</value>
- </values>
- </ui-component>
- </ui-components>
-</identity-ui-configuration>
\ No newline at end of file
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/test/conf/configuration1.xml (from rev 8268, trunk/core-identity/src/resources/test/conf/configuration1.xml)
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/test/conf/configuration1.xml (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/test/conf/configuration1.xml 2007-09-14 15:43:45 UTC (rev 8269)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<identity-ui-configuration>
+ <subscription-mode>automatic</subscription-mode>
+ <overwrite-workflow>false</overwrite-workflow>
+ <email-domain>jboss.org</email-domain>
+ <email-from>do-no-reply(a)jboss.com</email-from>
+ <password-generation-characters>testCharacters</password-generation-characters>
+ <default-roles>
+ <role>User</role>
+ <role>Admin</role>
+ </default-roles>
+
+ <ui-components>
+ <ui-component name="givenname">
+ <property-ref>user.name.given</property-ref>
+ </ui-component>
+ <ui-component name="familyname">
+ <property-ref>user.name.family</property-ref>
+ <converter>FamilyNameConverter</converter>
+ <required>false</required>
+ </ui-component>
+ <ui-component name="email">
+ <property-ref>user.business-info.online.email</property-ref>
+ <required>true</required>
+ <validators>
+ <validator>EmailValidator</validator>
+ </validators>
+ </ui-component>
+ <ui-component name="locale">
+ <property-ref>portal.user.locale</property-ref>
+ <values>
+ <value key="org.jboss.portal.core.identity.locale" />
+ </values>
+ </ui-component>
+ <ui-component name="interests">
+ <property-ref>portal.user.interests</property-ref>
+ <values>
+ <value key="board">snowboarding</value>
+ <value key="ski">skiing</value>
+ <value key="sledge">sledging</value>
+ </values>
+ </ui-component>
+ </ui-components>
+</identity-ui-configuration>
\ No newline at end of file
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/test/conf/schema (from rev 8268, trunk/core-identity/src/resources/test/conf/schema)
Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/test/conf/schema/identity-ui-configuration.xsd
===================================================================
--- trunk/core-identity/src/resources/test/conf/schema/identity-ui-configuration.xsd 2007-09-14 15:28:02 UTC (rev 8268)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/test/conf/schema/identity-ui-configuration.xsd 2007-09-14 15:43:45 UTC (rev 8269)
@@ -1,146 +0,0 @@
-<?xml version="1.0"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:jbxb="http://www.jboss.org/xml/ns/jbxb"
- elementFormDefault="qualified">
-
-<xsd:element name="identity-ui-configuration">
- <xsd:complexType>
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:class impl="org.jboss.portal.core.identity.services.metadata.IdentityUIConfiguration"/>
- </xsd:appinfo>
- </xsd:annotation>
-
- <xsd:choice>
- <!-- User portlet and user management portlet preferences -->
- <xsd:element name="subscription-mode" type="subscriptionMode" default="jbp_identity_validation_workflow"/>
- <xsd:element name="admin-subscription-mode" type="subscriptionMode" default="automatic"/>
- <xsd:element name="overwrite-workflow" type="xsd:boolean" default="false"/>
- <xsd:element name="email-domain" minOccurs="1" maxOccurs="1" type="xsd:string" default="example.com" />
- <xsd:element name="email-from" minOccurs="1" maxOccurs="1" type="xsd:string" default="no-reply(a)example.com" />
- <xsd:element name="password-generation-characters" minOccurs="1" maxOccurs="1" type="xsd:string"/>
- <xsd:element name="default-roles" type="defaultRoles" minOccurs="1" maxOccurs="1"/>
-
- <!-- user interface components -->
- <xsd:element name="ui-components">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:class impl="java.util.HashMap"/>
- </xsd:appinfo>
- </xsd:annotation>
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="ui-component" minOccurs="1" maxOccurs="unbounded" type="UIComponent" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <!-- end: user interface components -->
- </xsd:choice>
- </xsd:complexType>
-</xsd:element>
-
-<!-- restictions for subscription-modes -->
-
-<xsd:simpleType name="subscriptionMode">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="custom" />
- <xsd:enumeration value="automatic" />
- <xsd:enumeration value="jbp_identity_validation_workflow" />
- <xsd:enumeration value="jbp_identity_validation_approval_workflow" />
- </xsd:restriction>
-</xsd:simpleType>
-
-<xsd:complexType name="defaultRoles">
- <xsd:sequence>
- <xsd:element name="role" minOccurs="1" type="xsd:string" maxOccurs="unbounded"/>
- </xsd:sequence>
-</xsd:complexType>
-
-<xsd:complexType name="validators">
- <xsd:sequence>
- <xsd:element name="validator" minOccurs="1" type="xsd:string" maxOccurs="unbounded"/>
- </xsd:sequence>
-</xsd:complexType>
-
-<xsd:complexType name="componentValues">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:mapEntry nonNullValue="true"/>
- </xsd:appinfo>
- </xsd:annotation>
- <xsd:choice minOccurs="1" maxOccurs="1">
- <xsd:element name="value" maxOccurs="unbounded">
- <xsd:complexType>
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:mapEntry/>
- <jbxb:characters>
- <jbxb:mapEntryValue/>
- </jbxb:characters>
- </xsd:appinfo>
- </xsd:annotation>
- <xsd:simpleContent>
- <xsd:extension base="xsd:string">
- <xsd:attribute name="key" type="xsd:string">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:mapEntryKey/>
- </xsd:appinfo>
- </xsd:annotation>
- </xsd:attribute>
- </xsd:extension>
- </xsd:simpleContent>
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
-</xsd:complexType>
-
-<xsd:complexType name="UIComponent">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:mapEntry impl="org.jboss.portal.core.identity.services.metadata.UIComponentConfiguration" getKeyMethod="getName" setKeyMethod="setName" />
- </xsd:appinfo>
- </xsd:annotation>
- <xsd:choice>
- <xsd:element name="property-ref" maxOccurs="1" minOccurs="1" type="xsd:string" />
- <xsd:element name="localization-bundle" type="xsd:string" minOccurs="1" maxOccurs="1"/>
- <xsd:element name="validators" type="validators" />
- <xsd:element name="converter" type="xsd:string" />
- <xsd:element name="required" type="xsd:boolean" default="false"/>
- <xsd:element name="read-only" type="xsd:boolean" default="false" />
- <xsd:element name="values" type="componentValues">
- <xsd:annotation>
- <xsd:appinfo>
- <jbxb:class impl="java.util.HashMap"/>
- </xsd:appinfo>
- </xsd:annotation>
- </xsd:element>
- </xsd:choice>
- <!-- attribute name -->
- <xsd:attribute name="name" type="xsd:string" use="required" />
-</xsd:complexType>
-
-</xsd:schema>
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/test/conf/schema/identity-ui-configuration.xsd (from rev 8268, trunk/core-identity/src/resources/test/conf/schema/identity-ui-configuration.xsd)
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/test/conf/schema/identity-ui-configuration.xsd (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/test/conf/schema/identity-ui-configuration.xsd 2007-09-14 15:43:45 UTC (rev 8269)
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:jbxb="http://www.jboss.org/xml/ns/jbxb"
+ elementFormDefault="qualified">
+
+<xsd:element name="identity-ui-configuration">
+ <xsd:complexType>
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.portal.core.identity.services.metadata.IdentityUIConfiguration"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+
+ <xsd:choice>
+ <!-- User portlet and user management portlet preferences -->
+ <xsd:element name="subscription-mode" type="subscriptionMode" default="jbp_identity_validation_workflow"/>
+ <xsd:element name="admin-subscription-mode" type="subscriptionMode" default="automatic"/>
+ <xsd:element name="overwrite-workflow" type="xsd:boolean" default="false"/>
+ <xsd:element name="email-domain" minOccurs="1" maxOccurs="1" type="xsd:string" default="example.com" />
+ <xsd:element name="email-from" minOccurs="1" maxOccurs="1" type="xsd:string" default="no-reply(a)example.com" />
+ <xsd:element name="password-generation-characters" minOccurs="1" maxOccurs="1" type="xsd:string"/>
+ <xsd:element name="default-roles" type="defaultRoles" minOccurs="1" maxOccurs="1"/>
+
+ <!-- user interface components -->
+ <xsd:element name="ui-components">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="java.util.HashMap"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="ui-component" minOccurs="1" maxOccurs="unbounded" type="UIComponent" />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <!-- end: user interface components -->
+ </xsd:choice>
+ </xsd:complexType>
+</xsd:element>
+
+<!-- restictions for subscription-modes -->
+
+<xsd:simpleType name="subscriptionMode">
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="custom" />
+ <xsd:enumeration value="automatic" />
+ <xsd:enumeration value="jbp_identity_validation_workflow" />
+ <xsd:enumeration value="jbp_identity_validation_approval_workflow" />
+ </xsd:restriction>
+</xsd:simpleType>
+
+<xsd:complexType name="defaultRoles">
+ <xsd:sequence>
+ <xsd:element name="role" minOccurs="1" type="xsd:string" maxOccurs="unbounded"/>
+ </xsd:sequence>
+</xsd:complexType>
+
+<xsd:complexType name="validators">
+ <xsd:sequence>
+ <xsd:element name="validator" minOccurs="1" type="xsd:string" maxOccurs="unbounded"/>
+ </xsd:sequence>
+</xsd:complexType>
+
+<xsd:complexType name="componentValues">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:mapEntry nonNullValue="true"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:choice minOccurs="1" maxOccurs="1">
+ <xsd:element name="value" maxOccurs="unbounded">
+ <xsd:complexType>
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:mapEntry/>
+ <jbxb:characters>
+ <jbxb:mapEntryValue/>
+ </jbxb:characters>
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:extension base="xsd:string">
+ <xsd:attribute name="key" type="xsd:string">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:mapEntryKey/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:extension>
+ </xsd:simpleContent>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+</xsd:complexType>
+
+<xsd:complexType name="UIComponent">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:mapEntry impl="org.jboss.portal.core.identity.services.metadata.UIComponentConfiguration" getKeyMethod="getName" setKeyMethod="setName" />
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:choice>
+ <xsd:element name="property-ref" maxOccurs="1" minOccurs="1" type="xsd:string" />
+ <xsd:element name="localization-bundle" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+ <xsd:element name="validators" type="validators" />
+ <xsd:element name="converter" type="xsd:string" />
+ <xsd:element name="required" type="xsd:boolean" default="false"/>
+ <xsd:element name="read-only" type="xsd:boolean" default="false" />
+ <xsd:element name="values" type="componentValues">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="java.util.HashMap"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:choice>
+ <!-- attribute name -->
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+</xsd:complexType>
+
+</xsd:schema>
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r8268 - in trunk/core-identity: src/main/org/jboss/portal/core/identity/services/metadata and 9 other directories.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-14 11:28:02 -0400 (Fri, 14 Sep 2007)
New Revision: 8268
Added:
trunk/core-identity/src/main/org/jboss/portal/test/core/identity/metadata/
trunk/core-identity/src/main/org/jboss/portal/test/core/identity/metadata/ConfigurationTestCase.java
trunk/core-identity/src/main/org/jboss/portal/test/core/identity/mock/
trunk/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockProfileInfo.java
trunk/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockPropertyInfo.java
trunk/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockUserProfileModule.java
trunk/core-identity/src/resources/test/
trunk/core-identity/src/resources/test/conf/
trunk/core-identity/src/resources/test/conf/configuration1.xml
trunk/core-identity/src/resources/test/conf/schema/
trunk/core-identity/src/resources/test/conf/schema/identity-ui-configuration.xsd
Modified:
trunk/core-identity/build.xml
trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java
trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java
trunk/core-identity/src/main/org/jboss/portal/test/core/identity/
trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml
Log:
- configuration parsing test case
Modified: trunk/core-identity/build.xml
===================================================================
--- trunk/core-identity/build.xml 2007-09-14 14:37:36 UTC (rev 8267)
+++ trunk/core-identity/build.xml 2007-09-14 15:28:02 UTC (rev 8268)
@@ -84,6 +84,8 @@
<property name="jboss-junit-configuration" value=""/>
<property name="junit.formatter.usefile" value="true"/>
+ <property name="test.reports" value="${module.output}/tests"/>
+
<!-- Configure thirdparty libraries -->
&libraries;
@@ -218,6 +220,7 @@
<copy todir="${build.resources}/portal-identity-war">
<fileset dir="${source.bin}/portal-identity-war"/>
</copy>
+
<!-- portal-identity.sar -->
<copy todir="${build.resources}/portal-identity.sar">
<fileset dir="${build.resources}/portal-identity-sar"/>
@@ -231,7 +234,6 @@
<copy todir="${build.resources}/portal-identity.sar/portal-identity.war">
<fileset dir="${build.resources}/portal-identity-war"/>
</copy>
-
</target>
<target name="output" depends="artifacts">
@@ -295,9 +297,46 @@
<delete file="${jboss.home}/server/${portal.deploy.dir}/portal-identity.sar"/>
</target>
- <target name="package-tests"/>
+ <!--
+ | Tests
+ -->
+
+ <target name="package-tests" depends="init, clean-tests">
-
+ <jar jarfile="${build.lib}/portal-core-identity-test-lib.jar">
+ <fileset dir="${build.classes}" includes="org/jboss/portal/test/**"/>
+ </jar>
+
+ </target>
+
+ <target name="clean-tests" description="cleans the output from the package-test command">
+
+ </target>
+
+ <target name="tests" depends="init, package-tests" description="Runs the core-identity tests">
+ <mkdir dir="${test.reports}"/>
+
+ <execute-tests>
+ <x-test>
+ <test todir="${test.reports}" name="org.jboss.portal.test.core.identity.metadata.ConfigurationTestCase"/>
+ </x-test>
+ <x-classpath>
+ <path refid="junit.junit.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/>
+ <path refid="jbossas/core.libs.classpath"/>
+ <path refid="jboss.portal-jems.classpath"/>
+ <path refid="jboss.portal-identity.classpath"/>
+ <path refid="oswego.concurrent.classpath" />
+ <path refid="apache.xerces.classpath"/>
+ <pathelement location="${build.lib}/portal-core-identity-ui-lib.jar"/>
+ <pathelement location="${build.lib}/portal-core-identity-services-lib.jar"/>
+ <pathelement location="${build.lib}/portal-core-identity-test-lib.jar"/>
+ <pathelement location="${build.resources}/test"/>
+ </x-classpath>
+ </execute-tests>
+
+ </target>
+
<!--
Some convenience build targets to help deployment during development
-->
@@ -307,4 +346,5 @@
<require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
<copy file="${build.lib}/portal-identity.sar" todir="${jboss.home}/server/${portal-ha.deploy.dir}" overwrite="true"/>
</target>
+
</project>
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-14 14:37:36 UTC (rev 8267)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java 2007-09-14 15:28:02 UTC (rev 8268)
@@ -341,7 +341,7 @@
}
catch (Exception e)
{
- throw new CoreIdentityConfigurationException("Could not parse configuration file. If you run JBoss Portal with JBoss AS 4.0.5 or less please check the reference Guide.");
+ throw new CoreIdentityConfigurationException("Could not parse configuration file. If you run JBoss Portal with JBoss AS 4.0.5 or minor please check the wiki.");
}
}
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-14 14:37:36 UTC (rev 8267)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-14 15:28:02 UTC (rev 8268)
@@ -293,7 +293,7 @@
public List getPendingUsers()
{
- if ( this.registrationService != null )
+ if ( this.registrationService != null && this.pendingUsers == null)
this.pendingUsers = this.registrationService.getPendingUsers(displayNode);
return pendingUsers;
}
Property changes on: trunk/core-identity/src/main/org/jboss/portal/test/core/identity
___________________________________________________________________
Name: svn:ignore
+ validators
Added: trunk/core-identity/src/main/org/jboss/portal/test/core/identity/metadata/ConfigurationTestCase.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/test/core/identity/metadata/ConfigurationTestCase.java (rev 0)
+++ trunk/core-identity/src/main/org/jboss/portal/test/core/identity/metadata/ConfigurationTestCase.java 2007-09-14 15:28:02 UTC (rev 8268)
@@ -0,0 +1,161 @@
+/******************************************************************************
+ * 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. *
+ ******************************************************************************/
+package org.jboss.portal.test.core.identity.metadata;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+
+import org.jboss.portal.core.identity.services.metadata.IdentityUIConfiguration;
+import org.jboss.portal.core.identity.services.metadata.IdentityUIConfigurationServiceImpl;
+import org.jboss.portal.core.identity.services.metadata.UIComponentConfiguration;
+import org.jboss.portal.test.core.identity.mock.MockPropertyInfo;
+import org.jboss.portal.test.core.identity.mock.MockUserProfileModule;
+
+import junit.framework.TestCase;
+
+/**
+ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
+ * @version $Revision$
+ */
+public class ConfigurationTestCase extends TestCase
+{
+ /** The (mock) userProfileModule */
+ MockUserProfileModule userProfileModule;
+
+ protected void setUp()
+ {
+ this.userProfileModule = new MockUserProfileModule();
+
+ // Creating PropertyInfo Objects
+ MockPropertyInfo mpi1 = new MockPropertyInfo("user.name.given");
+ mpi1.setAccessMode("read-only");
+ MockPropertyInfo mpi2 = new MockPropertyInfo("user.name.family");
+ mpi2.setUsage("mandatory");
+ MockPropertyInfo mpi3 = new MockPropertyInfo("user.business-info.online.email");
+ MockPropertyInfo mpi4 = new MockPropertyInfo("portal.user.locale");
+ MockPropertyInfo mpi5 = new MockPropertyInfo("portal.user.interests");
+
+ // Feed the (mock) userProfileModule with information
+ this.userProfileModule.setPropertyInfo(mpi1.getName(), mpi1);
+ this.userProfileModule.setPropertyInfo(mpi2.getName(), mpi2);
+ this.userProfileModule.setPropertyInfo(mpi3.getName(), mpi3);
+ this.userProfileModule.setPropertyInfo(mpi4.getName(), mpi4);
+ this.userProfileModule.setPropertyInfo(mpi5.getName(), mpi5);
+ }
+
+ public void testBasicConfiguration()
+ {
+ // Create configuration service with conf/configuration1.xml
+ IdentityUIConfigurationServiceImpl cfs = new IdentityUIConfigurationServiceImpl(){
+ protected InputStream getResource(String path) throws IOException
+ {
+ path = "conf/configuration1.xml";
+ return super.getResource(path);
+ }
+ };
+ assertNotNull(cfs);
+
+ // Set MockUserProfileModule
+ cfs.setUserProfileModule(this.userProfileModule);
+
+ try
+ {
+ cfs.startService();
+ }
+ catch(Exception e)
+ {
+ e.printStackTrace();
+ fail("could not start configuration service ... ");
+ }
+ assertNotNull(cfs);
+
+ // Check basic configuration values
+ IdentityUIConfiguration cf = cfs.getConfiguration();
+ assertNotNull(cf);
+ assertEquals("automatic", cf.getSubscriptionMode());
+ // admin subscription mode
+ assertEquals("automatic", cf.getAdminSubscriptionMode());
+ assertEquals(false, cf.isOverwriteWorkflow());
+ assertEquals("jboss.org", cf.getEmailDomain());
+ assertEquals("do-no-reply(a)jboss.com", cf.getEmailFrom());
+ assertEquals("testCharacters", cf.getPasswordGenerationCharacters());
+
+ List defaultRoles = cf.getDefaultRoles();
+ assertNotNull(defaultRoles);
+ assertEquals(2, defaultRoles.size());
+ assertEquals("User", defaultRoles.get(0));
+ assertEquals("Admin", defaultRoles.get(1));
+
+ // Check givenname
+ UIComponentConfiguration givenname = (UIComponentConfiguration)cf.getUiComponents().get("givenname");
+ assertNotNull(givenname);
+ assertEquals("givenname", givenname.getName());
+ assertEquals(false, givenname.isRequired());
+ // Must be overwritten from the mock property info
+ assertEquals(true, givenname.isReadOnly());
+ try
+ {
+ assertEquals(String.class, givenname.getPropertyClass());
+ }
+ catch (ClassNotFoundException e)
+ {
+ e.printStackTrace();
+ fail();
+ }
+
+ // Check familyname - converter
+ UIComponentConfiguration familyname = (UIComponentConfiguration)cf.getUiComponents().get("familyname");
+ assertNotNull(familyname);
+ assertEquals("familyname", familyname.getName());
+ assertEquals("FamilyNameConverter", familyname.getConverter());
+ // Value from the xml must be overwritten from the mock property info
+ assertEquals(true, familyname.isRequired());
+ assertEquals(false, familyname.isReadOnly());
+
+ // Check locale and predefined map values
+ UIComponentConfiguration locale = (UIComponentConfiguration)cf.getUiComponents().get("locale");
+ assertNotNull(locale);
+ assertEquals("locale", locale.getName());
+ assertEquals("org.jboss.portal.core.identity.locale", locale.getPredefinedMapValues());
+ assertEquals(false, locale.isRequired());
+
+ // Check email - required - validator
+ UIComponentConfiguration email = (UIComponentConfiguration)cf.getUiComponents().get("email");
+ assertNotNull(email);
+ assertEquals("email", email.getName());
+ assertEquals("EmailValidator", email.getValidator());
+ assertEquals("EmailValidator", email.getValidators().get(0));
+ assertEquals(true, email.isRequired());
+
+ UIComponentConfiguration interests = (UIComponentConfiguration)cf.getUiComponents().get("interests");
+ assertNotNull(interests);
+ Map values = interests.getValues();
+ assertEquals("snowboarding", (String) values.get("board"));
+ assertEquals("skiing", (String) values.get("ski"));
+ assertEquals("sledging", (String) values.get("sledge"));
+
+ }
+
+}
Added: trunk/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockProfileInfo.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockProfileInfo.java (rev 0)
+++ trunk/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockProfileInfo.java 2007-09-14 15:28:02 UTC (rev 8268)
@@ -0,0 +1,55 @@
+/******************************************************************************
+ * 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. *
+ ******************************************************************************/
+package org.jboss.portal.test.core.identity.mock;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.portal.identity.info.ProfileInfo;
+import org.jboss.portal.identity.info.PropertyInfo;
+
+/**
+ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
+ * @version $Revision$
+ */
+public class MockProfileInfo implements ProfileInfo
+{
+ Map properties = new HashMap();
+
+ public Map getPropertiesInfo()
+ {
+ return properties;
+ }
+
+ public PropertyInfo getPropertyInfo(String name)
+ {
+ return (PropertyInfo) properties.get(name);
+ }
+
+ public void setPropertyInfo(String id, PropertyInfo propertyInfo)
+ {
+ this.properties.put(id, propertyInfo);
+ }
+
+}
+
Added: trunk/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockPropertyInfo.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockPropertyInfo.java (rev 0)
+++ trunk/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockPropertyInfo.java 2007-09-14 15:28:02 UTC (rev 8268)
@@ -0,0 +1,147 @@
+/******************************************************************************
+ * 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. *
+ ******************************************************************************/
+package org.jboss.portal.test.core.identity.mock;
+
+import org.jboss.portal.common.i18n.LocalizedString;
+import org.jboss.portal.identity.info.PropertyInfo;
+
+/**
+ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
+ * @version $Revision$
+ */
+public class MockPropertyInfo implements PropertyInfo
+{
+ /** The name */
+ private String name;
+
+ /** The type - default a String */
+ private String type = "java.lang.String";
+
+ /** The accessMode - default read-write */
+ private String accessMode = "read-write";
+
+ /** The usage - default optional */
+ private String usage = "optional";
+
+ /** The displayName - not used */
+ private LocalizedString displayName;
+
+ /** The description - not used */
+ private LocalizedString description;
+
+ /** The mappingDBType - not used */
+ private String mappingDBType;
+
+ /** The mappingDBValue - not used */
+ private String mappingDBValue;
+
+ /** The mappingLDAPValue - not used */
+ private String mappingLDAPValue;
+
+ /** The mappedLDAP - not used */
+ private boolean mappedLDAP;
+
+ /** The mappedDB - not used */
+ private boolean mappedDB;
+
+ public MockPropertyInfo(String name)
+ {
+ this.name = name;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public String getType()
+ {
+ return type;
+ }
+
+ public void setType(String type)
+ {
+ this.type = type;
+ }
+
+ public String getAccessMode()
+ {
+ return accessMode;
+ }
+
+ public void setAccessMode(String accessMode)
+ {
+ this.accessMode = accessMode;
+ }
+
+ public String getUsage()
+ {
+ return usage;
+ }
+
+ public void setUsage(String usage)
+ {
+ this.usage = usage;
+ }
+
+ public LocalizedString getDisplayName()
+ {
+ return displayName;
+ }
+
+ public LocalizedString getDescription()
+ {
+ return description;
+ }
+
+ public String getMappingDBType()
+ {
+ return mappingDBType;
+ }
+
+ public String getMappingDBValue()
+ {
+ return mappingDBValue;
+ }
+
+ public String getMappingLDAPValue()
+ {
+ return mappingLDAPValue;
+ }
+
+ public boolean isMappedLDAP()
+ {
+ return mappedLDAP;
+ }
+
+ public boolean isMappedDB()
+ {
+ return mappedDB;
+ }
+
+}
Added: trunk/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockUserProfileModule.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockUserProfileModule.java (rev 0)
+++ trunk/core-identity/src/main/org/jboss/portal/test/core/identity/mock/MockUserProfileModule.java 2007-09-14 15:28:02 UTC (rev 8268)
@@ -0,0 +1,79 @@
+/******************************************************************************
+ * 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. *
+ ******************************************************************************/
+package org.jboss.portal.test.core.identity.mock;
+
+import java.util.Map;
+
+import org.jboss.portal.identity.IdentityException;
+import org.jboss.portal.identity.User;
+import org.jboss.portal.identity.UserProfileModule;
+import org.jboss.portal.identity.info.ProfileInfo;
+import org.jboss.portal.identity.info.PropertyInfo;
+
+/**
+ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
+ * @version $Revision$
+ */
+public class MockUserProfileModule implements UserProfileModule
+{
+
+ MockProfileInfo profileInfo = new MockProfileInfo();
+
+ /**
+ *
+ * Used to set a MockPropertyInfo directly
+ *
+ * @param propertyInfo.getName()
+ * @param propertyInfo
+ */
+ public void setPropertyInfo(String id, PropertyInfo propertyInfo)
+ {
+ this.profileInfo.setPropertyInfo(id, propertyInfo);
+ }
+
+ public ProfileInfo getProfileInfo() throws IdentityException
+ {
+ return profileInfo;
+ }
+
+ /**
+ * Not implemented Methods
+ */
+
+ public Map getProperties(User user) throws IdentityException, IllegalArgumentException
+ {
+ throw new IllegalArgumentException("Mock method not yet implemented");
+ }
+
+ public Object getProperty(User user, String propertyName) throws IdentityException, IllegalArgumentException
+ {
+ throw new IllegalArgumentException("Mock method not yet implemented");
+ }
+
+ public void setProperty(User user, String name, Object property) throws IdentityException, IllegalArgumentException
+ {
+ throw new IllegalArgumentException("Mock method not yet implemented");
+ }
+
+}
+
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-14 14:37:36 UTC (rev 8267)
+++ trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-14 15:28:02 UTC (rev 8268)
@@ -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
-->
Added: trunk/core-identity/src/resources/test/conf/configuration1.xml
===================================================================
--- trunk/core-identity/src/resources/test/conf/configuration1.xml (rev 0)
+++ trunk/core-identity/src/resources/test/conf/configuration1.xml 2007-09-14 15:28:02 UTC (rev 8268)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<identity-ui-configuration>
+ <subscription-mode>automatic</subscription-mode>
+ <overwrite-workflow>false</overwrite-workflow>
+ <email-domain>jboss.org</email-domain>
+ <email-from>do-no-reply(a)jboss.com</email-from>
+ <password-generation-characters>testCharacters</password-generation-characters>
+ <default-roles>
+ <role>User</role>
+ <role>Admin</role>
+ </default-roles>
+
+ <ui-components>
+ <ui-component name="givenname">
+ <property-ref>user.name.given</property-ref>
+ </ui-component>
+ <ui-component name="familyname">
+ <property-ref>user.name.family</property-ref>
+ <converter>FamilyNameConverter</converter>
+ <required>false</required>
+ </ui-component>
+ <ui-component name="email">
+ <property-ref>user.business-info.online.email</property-ref>
+ <required>true</required>
+ <validators>
+ <validator>EmailValidator</validator>
+ </validators>
+ </ui-component>
+ <ui-component name="locale">
+ <property-ref>portal.user.locale</property-ref>
+ <values>
+ <value key="org.jboss.portal.core.identity.locale" />
+ </values>
+ </ui-component>
+ <ui-component name="interests">
+ <property-ref>portal.user.interests</property-ref>
+ <values>
+ <value key="board">snowboarding</value>
+ <value key="ski">skiing</value>
+ <value key="sledge">sledging</value>
+ </values>
+ </ui-component>
+ </ui-components>
+</identity-ui-configuration>
\ No newline at end of file
Added: trunk/core-identity/src/resources/test/conf/schema/identity-ui-configuration.xsd
===================================================================
--- trunk/core-identity/src/resources/test/conf/schema/identity-ui-configuration.xsd (rev 0)
+++ trunk/core-identity/src/resources/test/conf/schema/identity-ui-configuration.xsd 2007-09-14 15:28:02 UTC (rev 8268)
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:jbxb="http://www.jboss.org/xml/ns/jbxb"
+ elementFormDefault="qualified">
+
+<xsd:element name="identity-ui-configuration">
+ <xsd:complexType>
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="org.jboss.portal.core.identity.services.metadata.IdentityUIConfiguration"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+
+ <xsd:choice>
+ <!-- User portlet and user management portlet preferences -->
+ <xsd:element name="subscription-mode" type="subscriptionMode" default="jbp_identity_validation_workflow"/>
+ <xsd:element name="admin-subscription-mode" type="subscriptionMode" default="automatic"/>
+ <xsd:element name="overwrite-workflow" type="xsd:boolean" default="false"/>
+ <xsd:element name="email-domain" minOccurs="1" maxOccurs="1" type="xsd:string" default="example.com" />
+ <xsd:element name="email-from" minOccurs="1" maxOccurs="1" type="xsd:string" default="no-reply(a)example.com" />
+ <xsd:element name="password-generation-characters" minOccurs="1" maxOccurs="1" type="xsd:string"/>
+ <xsd:element name="default-roles" type="defaultRoles" minOccurs="1" maxOccurs="1"/>
+
+ <!-- user interface components -->
+ <xsd:element name="ui-components">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="java.util.HashMap"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="ui-component" minOccurs="1" maxOccurs="unbounded" type="UIComponent" />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <!-- end: user interface components -->
+ </xsd:choice>
+ </xsd:complexType>
+</xsd:element>
+
+<!-- restictions for subscription-modes -->
+
+<xsd:simpleType name="subscriptionMode">
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="custom" />
+ <xsd:enumeration value="automatic" />
+ <xsd:enumeration value="jbp_identity_validation_workflow" />
+ <xsd:enumeration value="jbp_identity_validation_approval_workflow" />
+ </xsd:restriction>
+</xsd:simpleType>
+
+<xsd:complexType name="defaultRoles">
+ <xsd:sequence>
+ <xsd:element name="role" minOccurs="1" type="xsd:string" maxOccurs="unbounded"/>
+ </xsd:sequence>
+</xsd:complexType>
+
+<xsd:complexType name="validators">
+ <xsd:sequence>
+ <xsd:element name="validator" minOccurs="1" type="xsd:string" maxOccurs="unbounded"/>
+ </xsd:sequence>
+</xsd:complexType>
+
+<xsd:complexType name="componentValues">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:mapEntry nonNullValue="true"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:choice minOccurs="1" maxOccurs="1">
+ <xsd:element name="value" maxOccurs="unbounded">
+ <xsd:complexType>
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:mapEntry/>
+ <jbxb:characters>
+ <jbxb:mapEntryValue/>
+ </jbxb:characters>
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:extension base="xsd:string">
+ <xsd:attribute name="key" type="xsd:string">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:mapEntryKey/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:extension>
+ </xsd:simpleContent>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+</xsd:complexType>
+
+<xsd:complexType name="UIComponent">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:mapEntry impl="org.jboss.portal.core.identity.services.metadata.UIComponentConfiguration" getKeyMethod="getName" setKeyMethod="setName" />
+ </xsd:appinfo>
+ </xsd:annotation>
+ <xsd:choice>
+ <xsd:element name="property-ref" maxOccurs="1" minOccurs="1" type="xsd:string" />
+ <xsd:element name="localization-bundle" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+ <xsd:element name="validators" type="validators" />
+ <xsd:element name="converter" type="xsd:string" />
+ <xsd:element name="required" type="xsd:boolean" default="false"/>
+ <xsd:element name="read-only" type="xsd:boolean" default="false" />
+ <xsd:element name="values" type="componentValues">
+ <xsd:annotation>
+ <xsd:appinfo>
+ <jbxb:class impl="java.util.HashMap"/>
+ </xsd:appinfo>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:choice>
+ <!-- attribute name -->
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+</xsd:complexType>
+
+</xsd:schema>
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r8267 - in branches/JBoss_Portal_Branch_2_6/core-identity/src: main/org/jboss/portal/core/identity/services and 19 other directories.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-14 10:37:36 -0400 (Fri, 14 Sep 2007)
New Revision: 8267
Added:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/CoreIdentityConfigurationException.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml
Removed:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/test/validators/
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity/
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/register.xhtml
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/IdentityConstants.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/RegistrationService.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/UserContainer.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/ui/DynamicUserAttribute.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.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/bundles/Identity.properties
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/faces-config.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/editProfile.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/deleteRole.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/roles/roleTemplate.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/createUser.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.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/admin/user/searchUsers.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.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/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/editProfileTemplate.xhtml
Log:
merge with trunk
- ui improvements
- localization for dynamic values
- added configuration exception
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/IdentityConstants.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/IdentityConstants.java 2007-09-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/IdentityConstants.java 2007-09-14 14:37:36 UTC (rev 8267)
@@ -84,7 +84,7 @@
public static final String DEFAULT_ROLE = "User";
/** Bundle prefix for dynamic value localization */
- public static final String DYNAMIC_VALUE_PREFIX = "IDENTIY_DYNAMIC_VALUE_";
+ public static final String DYNAMIC_VALUE_PREFIX = "IDENTITY_DYNAMIC_VALUE_";
}
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/CoreIdentityConfigurationException.java (from rev 8266, trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/CoreIdentityConfigurationException.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/CoreIdentityConfigurationException.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/CoreIdentityConfigurationException.java 2007-09-14 14:37:36 UTC (rev 8267)
@@ -0,0 +1,52 @@
+/******************************************************************************
+ * 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. *
+ ******************************************************************************/
+package org.jboss.portal.core.identity.services.metadata;
+
+/**
+ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
+ * @version $Revision$
+ */
+public class CoreIdentityConfigurationException extends Exception
+{
+
+ public CoreIdentityConfigurationException()
+ {
+ super();
+ }
+
+ public CoreIdentityConfigurationException(Throwable cause)
+ {
+ super(cause);
+ }
+
+ public CoreIdentityConfigurationException(String message)
+ {
+ super(message);
+ }
+
+ public CoreIdentityConfigurationException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+}
+
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-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java 2007-09-14 14:37:36 UTC (rev 8267)
@@ -28,7 +28,6 @@
import java.util.Map;
import javax.naming.InitialContext;
-import javax.naming.NamingException;
import org.jboss.portal.common.io.IOTools;
import org.jboss.portal.core.identity.services.IdentityConstants;
@@ -110,11 +109,11 @@
this.createJBPMContext(subscriptionMode);
this.createJBPMContext(adminSubscriptionMode);
- log.info("jBPM worfklow started ...");
+ log.info("jBPM workflow started ...");
}
else
{
- throw new RuntimeException("processName cannot be null.");
+ throw new CoreIdentityConfigurationException("WorkflowService or processName must not be null.");
}
}
else
@@ -124,8 +123,9 @@
}
catch (Exception e)
{
- log.error("Error while starting core identity services ...", e);
+ log.error("Error while starting core identity services ...");
super.stopService();
+ throw new CoreIdentityConfigurationException(e);
}
if (this.jndiName != null)
@@ -214,117 +214,150 @@
return workflowService;
}
- private void createJBPMContext(String processName) throws NamingException
+ private void createJBPMContext(String processName) throws CoreIdentityConfigurationException
{
if (!IdentityConstants.SUBSCRIPTION_MODE_AUTOMATIC.equals(processName))
{
String fileName = "conf/processes/" + processName + ".xml";
+ JbpmContext jbpmContext = null;
+
+ try
+ {
+ jbpmContext = this.getWorkflowService().getJbpmConfiguration().createJbpmContext();
- JbpmContext jbpmContext = this.getWorkflowService().getJbpmConfiguration().createJbpmContext();
-
- ProcessDefinition processDefinition = jbpmContext.getGraphSession().findLatestProcessDefinition(processName);
- if (processDefinition == null)
+ ProcessDefinition processDefinition = jbpmContext.getGraphSession().findLatestProcessDefinition(processName);
+ if (processDefinition == null)
+ {
+ processDefinition = ProcessDefinition.parseXmlResource(fileName);
+ jbpmContext.deployProcessDefinition(processDefinition);
+ log.debug("deloying process definition: " + processName);
+ }
+ else
+ {
+ if (this.configuration.isOverwriteWorkflow())
+ {
+ ProcessDefinition fromConfig = ProcessDefinition.parseXmlResource(fileName);
+ jbpmContext.deployProcessDefinition(fromConfig);
+ log.debug("overwriting process definition: " + processName);
+ }
+ }
+ }
+ catch(Exception e)
{
- processDefinition = ProcessDefinition.parseXmlResource(fileName);
- jbpmContext.deployProcessDefinition(processDefinition);
+ throw new CoreIdentityConfigurationException("I don't like your subscription mode! Please make sure that the file and the process name match - also check the syntax.");
}
- else
+ finally
{
- if (this.configuration.isOverwriteWorkflow())
- {
- ProcessDefinition fromConfig = ProcessDefinition.parseXmlResource(fileName);
- jbpmContext.deployProcessDefinition(fromConfig);
- }
+ // Closing JbpmContext
+ IOTools.safeClose(jbpmContext);
}
- // Closing JbpmContext
- IOTools.safeClose(jbpmContext);
}
}
- private IdentityUIConfiguration createConfiguration() throws IOException, JBossXBException
+ private IdentityUIConfiguration createConfiguration() throws CoreIdentityConfigurationException
{
- SchemaBinding schema = XsdBinder.bind(getURL(schemaLocation).toString());
- schema.setIgnoreUnresolvedFieldOrClass(false);
-
- TermBeforeSetParentCallback componentCallback = new TermBeforeSetParentCallback()
+ try
{
- public Object beforeSetParent(Object o, UnmarshallingContext ctx)
+ SchemaBinding schema = XsdBinder.bind(getURL(schemaLocation).toString());
+ schema.setIgnoreUnresolvedFieldOrClass(false);
+
+ TermBeforeSetParentCallback componentCallback = new TermBeforeSetParentCallback()
{
- UIComponentConfiguration uiComponent = null;
- ElementBinding eb = (ElementBinding) ctx.getParticle().getTerm();
- String localPart = eb.getQName().getLocalPart();
- if ("ui-component".equals(localPart))
+ public Object beforeSetParent(Object o, UnmarshallingContext ctx)
{
- uiComponent = (UIComponentConfiguration) o;
- try
+ UIComponentConfiguration uiComponent = null;
+ ElementBinding eb = (ElementBinding) ctx.getParticle().getTerm();
+ String localPart = eb.getQName().getLocalPart();
+ if ("ui-component".equals(localPart))
{
- // Getting property reference
- PropertyInfo propertyInfo = getUserProfileModule().getProfileInfo().getPropertyInfo(
- uiComponent.getPropertyRef());
- uiComponent.setPropertyInfo(propertyInfo);
+ uiComponent = (UIComponentConfiguration) o;
+ try
+ {
+ // Getting property reference
+ PropertyInfo propertyInfo = getUserProfileModule().getProfileInfo().getPropertyInfo(
+ uiComponent.getPropertyRef());
+ uiComponent.setPropertyInfo(propertyInfo);
+ }
+ catch (IdentityException e)
+ {
+ uiComponent = null;
+ throw new IllegalArgumentException("cannot resolve property: " + uiComponent.getPropertyRef());
+ }
}
- catch (IdentityException e)
- {
- uiComponent = null;
- throw new RuntimeException("cannot resolve property: " + uiComponent.getPropertyRef(), e);
- }
+ return uiComponent;
}
- return uiComponent;
- }
- };
-
- // Adding callback for ui-components
- TypeBinding cb = schema.getType(new javax.xml.namespace.QName("UIComponent"));
- cb.setBeforeSetParentCallback(componentCallback);
-
- TermBeforeSetParentCallback valueCallback = new TermBeforeSetParentCallback()
- {
- public Object beforeSetParent(Object o, UnmarshallingContext ctx)
+ };
+
+ // Adding callback for ui-components
+ TypeBinding cb = schema.getType(new javax.xml.namespace.QName("UIComponent"));
+ cb.setBeforeSetParentCallback(componentCallback);
+
+ TermBeforeSetParentCallback valueCallback = new TermBeforeSetParentCallback()
{
-
- ElementBinding eb = (ElementBinding) ctx.getParticle().getTerm();
- String localPart = eb.getQName().getLocalPart();
- Map m = (Map) o;
- if ("values".equals(localPart))
+ public Object beforeSetParent(Object o, UnmarshallingContext ctx)
{
- UIComponentConfiguration uiComponent = (UIComponentConfiguration) ctx.getParentValue();
- if ( m.containsKey(IdentityConstants.COMPONENT_VALUE_LOCALE) )
+
+ ElementBinding eb = (ElementBinding) ctx.getParticle().getTerm();
+ String localPart = eb.getQName().getLocalPart();
+ Map m = (Map) o;
+ if ("values".equals(localPart))
{
- uiComponent.setPredefinedMapValues(IdentityConstants.COMPONENT_VALUE_LOCALE);
- m.remove(IdentityConstants.COMPONENT_VALUE_LOCALE);
+ UIComponentConfiguration uiComponent = (UIComponentConfiguration) ctx.getParentValue();
+ if ( m.containsKey(IdentityConstants.COMPONENT_VALUE_LOCALE) )
+ {
+ uiComponent.setPredefinedMapValues(IdentityConstants.COMPONENT_VALUE_LOCALE);
+ m.remove(IdentityConstants.COMPONENT_VALUE_LOCALE);
+ }
+ else if ( m.containsKey(IdentityConstants.COMPONENT_VALUE_THEME))
+ {
+ uiComponent.setPredefinedMapValues(IdentityConstants.COMPONENT_VALUE_THEME);
+ m.remove(IdentityConstants.COMPONENT_VALUE_THEME);
+ }
+ else if ( m.containsKey(IdentityConstants.COMPONENT_VALUE_TIMEZONE))
+ {
+ uiComponent.setPredefinedMapValues(IdentityConstants.COMPONENT_VALUE_TIMEZONE);
+ m.remove(IdentityConstants.COMPONENT_VALUE_TIMEZONE);
+ }
}
- else if ( m.containsKey(IdentityConstants.COMPONENT_VALUE_THEME))
- {
- uiComponent.setPredefinedMapValues(IdentityConstants.COMPONENT_VALUE_THEME);
- m.remove(IdentityConstants.COMPONENT_VALUE_THEME);
- }
- else if ( m.containsKey(IdentityConstants.COMPONENT_VALUE_TIMEZONE))
- {
- uiComponent.setPredefinedMapValues(IdentityConstants.COMPONENT_VALUE_TIMEZONE);
- m.remove(IdentityConstants.COMPONENT_VALUE_TIMEZONE);
- }
+ return m;
}
- return m;
- }
- };
-
- // Adding callback for ui-component values
- TypeBinding vb = schema.getType(new javax.xml.namespace.QName("componentValues"));
- vb.setBeforeSetParentCallback(valueCallback);
-
- // Unmarshalling && creating configuration
- Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
- return (IdentityUIConfiguration) unmarshaller.unmarshal(getResource(xmlLocation), schema);
+ };
+
+ // Adding callback for ui-component values
+ TypeBinding vb = schema.getType(new javax.xml.namespace.QName("componentValues"));
+ vb.setBeforeSetParentCallback(valueCallback);
+
+ // Unmarshalling && creating configuration
+ Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
+ return (IdentityUIConfiguration) unmarshaller.unmarshal(getResource(xmlLocation), schema);
+ }
+ catch (IOException e)
+ {
+ throw new CoreIdentityConfigurationException("Could not find configuration file or schema.");
+ }
+ catch (JBossXBException e)
+ {
+ throw new CoreIdentityConfigurationException("Could not parse configuration file.");
+ }
+ catch (Exception e)
+ {
+ throw new CoreIdentityConfigurationException("Could not parse configuration file. If you run JBoss Portal with JBoss AS 4.0.5 or less please check the reference Guide.");
+ }
}
- private InputStream getResource(String path) throws IOException
+ protected InputStream getResource(String path) throws IOException
{
URL url = Thread.currentThread().getContextClassLoader().getResource(path);
+ if (url == null)
+ throw new IOException();
return url.openStream();
}
private URL getURL(String path) throws IOException
{
- return Thread.currentThread().getContextClassLoader().getResource(path);
+ URL url = Thread.currentThread().getContextClassLoader().getResource(path);
+ if (url == null)
+ throw new IOException();
+ return url;
}
}
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/RegistrationService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/RegistrationService.java 2007-09-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/RegistrationService.java 2007-09-14 14:37:36 UTC (rev 8267)
@@ -33,14 +33,50 @@
public interface RegistrationService
{
+ /**
+ * Start the registration process for a new user
+ *
+ * @param portalURL
+ * @param username
+ * @param password
+ * @param profileMap
+ * @param roles
+ * @param locale
+ * @param adminFlag
+ * @return
+ */
String registerUser(String portalURL, String username, String password, Map profileMap, List roles, Locale locale, boolean adminFlag);
+ /**
+ * Approve or reject a registration
+ *
+ * @param id
+ * @param approve
+ * @return
+ */
String approve(String id, boolean approve);
+ /**
+ * Get pending users
+ *
+ * @param nodeName
+ * @return
+ */
List getPendingUsers(String nodeName);
+ /**
+ * Check for a existing username in the jBPM context
+ *
+ * @param username
+ * @return
+ */
boolean checkUsername(String username);
+ /**
+ * Get pending users count
+ *
+ * @return
+ */
int getPendingCount();
}
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/UserContainer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/UserContainer.java 2007-09-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/UserContainer.java 2007-09-14 14:37:36 UTC (rev 8267)
@@ -51,6 +51,9 @@
/** The assigned roles */
private List roles;
+
+ /** Is selected */
+ private boolean selected = false;
/** The current node */
private String currentNode;
@@ -117,7 +120,17 @@
{
this.roles = roles;
}
-
+
+ public boolean isSelected()
+ {
+ return selected;
+ }
+
+ public void setSelected(boolean selected)
+ {
+ this.selected = selected;
+ }
+
public String getCurrentNode()
{
return currentNode;
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-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java 2007-09-14 14:37:36 UTC (rev 8267)
@@ -290,16 +290,20 @@
count = !instance.hasEnded() ? count + 1 : count;
}
}
- List adminProcessInstances = this.getProcessInstances(jbpmContext, this.adminSubscriptionMode);
- if (adminProcessInstances != null && adminProcessInstances.size() > 0)
+ if (! this.adminSubscriptionMode.equals(this.subscriptionMode)
+ && ! this.adminSubscriptionMode.equals(IdentityConstants.SUBSCRIPTION_MODE_AUTOMATIC))
{
- Iterator i = adminProcessInstances.iterator();
- while (i.hasNext())
+ List adminProcessInstances = this.getProcessInstances(jbpmContext, this.adminSubscriptionMode);
+ if (adminProcessInstances != null && adminProcessInstances.size() > 0)
{
- ProcessInstance instance = (ProcessInstance) i.next();
- Node node = instance.getRootToken().getNode();
- if (IdentityConstants.JBPM_NODE_APPROVAL.equals(node.getName()))
- count = !instance.hasEnded() ? count + 1 : count;
+ Iterator i = adminProcessInstances.iterator();
+ while (i.hasNext())
+ {
+ ProcessInstance instance = (ProcessInstance) i.next();
+ Node node = instance.getRootToken().getNode();
+ if (IdentityConstants.JBPM_NODE_APPROVAL.equals(node.getName()))
+ count = !instance.hasEnded() ? count + 1 : count;
+ }
}
}
}
@@ -326,10 +330,14 @@
queue.addAll(this.getPendingUser(userProcessInstances, nodeName));
}
- List adminProcessInstances = this.getProcessInstances(jbpmContext, this.adminSubscriptionMode);
- if (adminProcessInstances != null && adminProcessInstances.size() > 0)
+ if (! this.adminSubscriptionMode.equals(this.subscriptionMode)
+ && ! this.adminSubscriptionMode.equals(IdentityConstants.SUBSCRIPTION_MODE_AUTOMATIC))
{
- queue.addAll(this.getPendingUser(adminProcessInstances, nodeName));
+ List adminProcessInstances = this.getProcessInstances(jbpmContext, this.adminSubscriptionMode);
+ if (adminProcessInstances != null && adminProcessInstances.size() > 0)
+ {
+ queue.addAll(this.getPendingUser(adminProcessInstances, nodeName));
+ }
}
}
catch (NamingException e)
@@ -392,18 +400,21 @@
try
{
List userProcessInstances = this.getProcessInstances(jbpmContext, this.subscriptionMode);
- List adminProcessInstances = this.getProcessInstances(jbpmContext, this.adminSubscriptionMode);
-
if (userProcessInstances != null && userProcessInstances.size() > 0)
{
if (this.checkUsername(userProcessInstances, username))
return true;
}
-
- if (adminProcessInstances != null && adminProcessInstances.size() > 0)
+
+ if (! this.adminSubscriptionMode.equals(this.subscriptionMode)
+ && ! this.adminSubscriptionMode.equals(IdentityConstants.SUBSCRIPTION_MODE_AUTOMATIC))
{
- if (this.checkUsername(adminProcessInstances, username))
- return true;
+ List adminProcessInstances = this.getProcessInstances(jbpmContext, this.adminSubscriptionMode);
+ if (adminProcessInstances != null && adminProcessInstances.size() > 0)
+ {
+ if (this.checkUsername(adminProcessInstances, username))
+ return true;
+ }
}
}
catch (NamingException e)
@@ -454,7 +465,8 @@
}
GraphSession graphSession = jbpmContext.getGraphSession();
ProcessDefinition processDefinition = graphSession.findLatestProcessDefinition(processName);
- processInstances = graphSession.findProcessInstances(processDefinition.getId());
+ if ( processDefinition != null )
+ processInstances = graphSession.findProcessInstances(processDefinition.getId());
}
return processInstances;
}
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/DynamicUserAttribute.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/DynamicUserAttribute.java 2007-09-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/DynamicUserAttribute.java 2007-09-14 14:37:36 UTC (rev 8267)
@@ -92,7 +92,8 @@
// ok on user register
}
}
- return new PropertyValue(propertyValue);
+
+ return new PropertyValue(identityUserBean.getLocalizedValue((String)propertyName, propertyValue));
}
public boolean setValue(Object propertyName, Object value) throws IllegalArgumentException
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-14 14:37:36 UTC (rev 8267)
@@ -24,6 +24,7 @@
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -31,10 +32,12 @@
import javax.faces.context.FacesContext;
import javax.faces.model.DataModel;
import javax.faces.model.ListDataModel;
+import javax.portlet.PortletException;
import org.jboss.logging.Logger;
import org.jboss.portal.core.identity.services.IdentityConstants;
import org.jboss.portal.core.identity.services.workflow.RegistrationService;
+import org.jboss.portal.core.identity.services.workflow.UserContainer;
import org.jboss.portal.core.identity.ui.IdentityUIUser;
import org.jboss.portal.core.identity.ui.common.IdentityRoleBean;
import org.jboss.portal.core.identity.ui.common.IdentityUserBean;
@@ -69,12 +72,21 @@
/** . */
private String displayNode = IdentityConstants.JBPM_NODE_APPROVAL;
+
+ /** . */
+ private List pendingUsers = null;
+
+ /** . */
+ private List pendingActionList = null;
+
+ /** . */
+ private String pendingUserAction = null;
/** . */
private IdentityUIUser uiUser;
/** . */
- private String searchString = null;
+ private String searchString = "";
/** . */
private IdentityUserBean identityUserBean;
@@ -153,14 +165,14 @@
return identityUserBean;
}
- public String getDisplayNode()
+ public String getPendingUserAction()
{
- return displayNode;
+ return pendingUserAction;
}
-
- public void setDisplayNode(String displayNode)
+
+ public List getPendingActionList()
{
- this.displayNode = displayNode;
+ return pendingActionList;
}
public void setIdentityUserBean(IdentityUserBean identityUserBean)
@@ -281,10 +293,9 @@
public List getPendingUsers()
{
- List list = new ArrayList();
- if ( this.registrationService != null)
- list = this.registrationService.getPendingUsers(displayNode);
- return list;
+ if ( this.registrationService != null )
+ this.pendingUsers = this.registrationService.getPendingUsers(displayNode);
+ return pendingUsers;
}
public String deleteUser()
@@ -347,7 +358,64 @@
this.registrationService.approve(processId, false);
}
}
+ this.pendingUsers = null;
return "pendingUsers";
}
-
+
+ public String approveList()
+ {
+ this.pendingUserAction = "approve";
+ this.pendingActionList = new ArrayList();
+ for(Iterator i = pendingUsers.iterator(); i.hasNext(); )
+ {
+ UserContainer user = (UserContainer) i.next();
+ if ( user.isSelected() )
+ {
+ this.pendingActionList.add(user);
+ }
+ }
+ if (this.pendingActionList.size() >0)
+ {
+ return "confirmPendingAction";
+ }
+ return "pendingUsers";
+ }
+
+ public String rejectList()
+ {
+ this.pendingUserAction = "reject";
+ this.pendingActionList = new ArrayList();
+ for(Iterator i = pendingUsers.iterator(); i.hasNext(); )
+ {
+ UserContainer user = (UserContainer) i.next();
+ if ( user.isSelected() )
+ {
+ this.pendingActionList.add(user);
+ }
+ }
+ if (this.pendingActionList.size() > 0)
+ {
+ return "confirmPendingAction";
+ }
+ return "pendingUsers";
+ }
+
+ public String confirmPendingAction()
+ {
+ for(Iterator i = pendingActionList.iterator(); i.hasNext(); )
+ {
+ UserContainer user = (UserContainer) i.next();
+ if (this.pendingUserAction.equals("approve"))
+ {
+ this.registrationService.approve(user.getProcessId(), true);
+ }
+ else if (this.pendingUserAction.equals("reject"))
+ {
+ this.registrationService.approve(user.getProcessId(), false);
+ }
+ }
+ this.pendingActionList = null;
+ this.pendingUsers = null;
+ return "success";
+ }
}
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java 2007-09-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java 2007-09-14 14:37:36 UTC (rev 8267)
@@ -28,9 +28,13 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.ResourceBundle;
import java.util.Set;
+import javax.faces.context.FacesContext;
+
import org.jboss.logging.Logger;
+import org.jboss.portal.core.identity.services.IdentityConstants;
import org.jboss.portal.core.identity.services.metadata.UIComponentConfiguration;
import org.jboss.portal.core.identity.ui.IdentityUIUser;
import org.jboss.portal.identity.IdentityException;
@@ -161,6 +165,26 @@
user.updatePassword(password);
}
+ public Object getLocalizedValue(String propertyName, Object value)
+ {
+ UIComponentConfiguration uiComponent = (UIComponentConfiguration) this.metaDataService.getValue(propertyName).getObject();
+ if( uiComponent.getValues() != null
+ && value instanceof String
+ && uiComponent.getValues().size() > 0)
+ {
+ try
+ {
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale());
+ return bundle.getString(IdentityConstants.DYNAMIC_VALUE_PREFIX + ((String)value).toUpperCase());
+ }
+ catch (Exception e)
+ {
+ return value;
+ }
+ }
+ return value;
+ }
+
public Class getPropertyType(String propertyName) throws IdentityException, ClassNotFoundException
{
UIComponentConfiguration uiComponent = (UIComponentConfiguration) this.metaDataService.getValue(propertyName).getObject();
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java 2007-09-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java 2007-09-14 14:37:36 UTC (rev 8267)
@@ -28,6 +28,8 @@
import javax.faces.context.FacesContext;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import javax.portlet.PortletException;
+import javax.portlet.UnavailableException;
import org.jboss.portal.core.identity.services.metadata.IdentityUIConfiguration;
import org.jboss.portal.core.identity.services.metadata.IdentityUIConfigurationService;
@@ -49,7 +51,7 @@
/** . */
private IdentityUIConfigurationService identityUIConfigurationService;
- public MetaDataServiceBean()
+ public MetaDataServiceBean() throws UnavailableException
{
try
{
@@ -57,9 +59,9 @@
IdentityUIConfiguration cf = identityUIConfigurationService.getConfiguration();
this.map = cf.getUiComponents();
}
- catch (NamingException e)
+ catch (Exception e)
{
- throw new RuntimeException(e);
+ throw new UnavailableException("Configuration service not available. Please check your configuration files and the logs.");
}
}
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test (from rev 8266, trunk/core-identity/src/main/org/jboss/portal/test)
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core (from rev 8266, trunk/core-identity/src/main/org/jboss/portal/test/core)
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/test/core/identity (from rev 8266, trunk/core-identity/src/main/org/jboss/portal/test/core/identity)
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-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -58,6 +58,7 @@
<depends optional-attribute-name="IdentityServiceController" proxy-type="attribute">
portal:service=Module,type=IdentityServiceController
</depends>
+ <depends>portal:service=Workflow,type=WorkflowService</depends>
<attribute name="JNDIName">java:portal/IdentityUIConfigurationService</attribute>
</mbean>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-14 14:37:36 UTC (rev 8267)
@@ -118,6 +118,10 @@
IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER=Assign roles to user:
IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=Pending users
IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=Registered users
+IDENTITY_MANAGEMENT_APPROVE_ALL=Approve selected
+IDENTITY_MANAGEMENT_REJECT_ALL=Reject selected
+IDENTITY_MANAGEMENT_SELECT_ALL=select all
+IDENTITY_MANAGEMENT_UNSELECT_ALL=unselect all
IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS=Pending registrations
IDENTITY_MANAGEMENT_PENDING_BPM_ID=Id
@@ -125,7 +129,7 @@
IDENTITY_MANAGEMENT_PENDING_REJECT=reject
IDENTITY_REGISTER_VERIFY_CAPTCHA=Verify captcha
-IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirmation: Delete Object
+IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirmation: Delete
IDENTITY_REGISTER_CONFIRMATIONEMAIL=Confirm your subscription
IDENTITY_MAIL_SUBJECT_LOST_PASSWORD=Reset your password
@@ -150,5 +154,5 @@
IDENTITY_VALIDATION_ERROR_CAPTCHA_INCORRECT=Captcha incorrect
# Example usage for dynamic values
-#IDENTIY_DYNAMIC_VALUE_TEST=test label
-#IDENTIY_DYNAMIC_VALUE_TEST2=test label2
\ No newline at end of file
+IDENTITY_DYNAMIC_VALUE_TEST=test label
+IDENTITY_DYNAMIC_VALUE_TEST2=test label2
\ No newline at end of file
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-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -76,6 +76,10 @@
</ui-component>
<ui-component name="interests">
<property-ref>portal.user.interests</property-ref>
+ <values>
+ <value key="test">testing</value>
+ <value key="test2">testing2</value>
+ </values>
</ui-component>
<ui-component name="icq">
<property-ref>portal.user.im.icq</property-ref>
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-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -319,6 +319,28 @@
</navigation-case>
</navigation-rule>
<navigation-rule>
+ <from-view-id>/WEB-INF/jsf/admin/user/pendingUsers.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>confirmPendingAction</from-outcome>
+ <to-view-id>/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>cancel</from-outcome>
+ <to-view-id>/WEB-INF/jsf/admin/index.xthml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+ <navigation-rule>
+ <from-view-id>/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>revise</from-outcome>
+ <to-view-id>/WEB-INF/jsf/admin/user/pendingUsers.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>success</from-outcome>
+ <to-view-id>/WEB-INF/jsf/admin/index.xthml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+ <navigation-rule>
<from-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</from-view-id>
<navigation-case>
<from-outcome>deleteUser</from-outcome>
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-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -9,8 +9,17 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" />
- <h:outputText value="#{assignrolemgr.uiUser.username}" />
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" />
+ <h:outputText value="#{assignrolemgr.uiUser.username}" />
+ </li>
+ </ul>
+</h:form>
</ui:define>
<ui:define name="content">
@@ -19,9 +28,10 @@
<f:selectItems value="#{identityrolemgr.roleSelectItems}" />
</h:selectManyCheckbox>
<hr/>
+ <p style="text-align: right;">
<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"/>
-
+ </p>
</h:form>
</ui:define>
</ui:composition>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -8,7 +8,21 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
-<ui:define name="title" />
+<ui:define name="title">
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:commandLink action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/>
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" />
+ </li>
+ </ul>
+</h:form>
+</ui:define>
<ui:define name="content">
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-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -8,7 +8,11 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ <ul class="objectpath">
+ <li>
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ </ul>
</ui:define>
<ui:define name="content">
Deleted: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/register.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/register.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/register.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -1,25 +0,0 @@
-<div
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:c="http://java.sun.com/jstl/core"
- class="identity-ui">
-
-<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
-
-<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE}" />
-</ui:define>
-
-<ui:define name="content">
-
- <ui:decorate template="/WEB-INF/jsf/common/register.xhtml">
- <ui:param name="manager" value="#{userregistermgr}"/>
- <ui:param name="showCaptcha" value="false" />
- </ui:decorate>
-
-</ui:define>
-
-</ui:composition>
-</div>
\ No newline at end of file
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-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -9,7 +9,16 @@
<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}"/>
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}"/>
+ </li>
+ </ul>
+</h:form>
</ui:define>
<ui:define name="content">
@@ -22,8 +31,10 @@
<h:inputText id="roledisplayname" value="#{createrolemgr.uiRole.displayName}"/>
</h:panelGrid>
<hr/>
+ <p style="text-align: right;">
<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:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{createrolemgr.createRole}" styleClass="portlet-form-button"/>
+ </p>
</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/deleteRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -10,7 +10,17 @@
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" />
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" />
+ <h:outputText value="#{rolemanagementbean.uiRole.name}"/>
+ </li>
+ </ul>
+</h:form>
</ui:define>
<ui:define name="content">
@@ -24,8 +34,10 @@
</h:panelGrid>
<h:messages />
<hr/>
+ <p style="text-align: right;">
<h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="roleAdmin" styleClass="portlet-form-button"/>
<h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{rolemanagementbean.confirmedDelete}" styleClass="portlet-form-button"/>
+ </p>
</h:form>
</ui:define>
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-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -9,7 +9,16 @@
<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}"/>
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}"/>
+ </li>
+ </ul>
+</h:form>
</ui:define>
<ui:define name="content">
@@ -22,8 +31,10 @@
<h:inputText value="#{editrolemgr.uiRole.displayName}"/>
</h:panelGrid>
<hr/>
+ <p style="text-align: right;">
<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"/>
+ </p>
</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-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -9,7 +9,16 @@
<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MEMBERS}"/>: <h:outputText value="#{rolemanagementbean.uiRole.name}"/>
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MEMBERS}"/>: <h:outputText value="#{rolemanagementbean.uiRole.name}"/>
+ </li>
+ </ul>
+</h:form>
</ui:define>
<ui:define name="content">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -13,7 +13,7 @@
<li>
<h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/>
</li>
- <li id="currentTab"><h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}"/></li>
+ <li id="currentTab"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}"/></li>
</ul>
</h:form>
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-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -8,7 +8,11 @@
<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ <ul class="objectpath">
+ <li>
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ </li>
+ </ul>
</ui:define>
<ui:define name="content">
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-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -10,8 +10,17 @@
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD_FOR_USER}" />
- <h:outputText value="#{editprofilemgr.currentUser}" />
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD_FOR_USER}" />
+ <h:outputText value="#{editprofilemgr.currentUser}" />
+ </li>
+ </ul>
+</h:form>
</ui:define>
<ui:define name="content">
@@ -32,8 +41,10 @@
</h:panelGrid>
<hr/>
+ <p style="text-align: right;">
<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"/>
+ </p>
</h:form>
</ui:define>
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml (from rev 8266, trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml)
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -0,0 +1,66 @@
+<div
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core"
+ class="identity-ui">
+
+<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
+
+<ui:define name="title">
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:commandLink action="revise" value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" />
+ > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'approve'}" />
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'reject'}" />
+ </li>
+ </ul>
+</h:form>
+</ui:define>
+<ui:define name="content">
+<h:form>
+<h:dataTable value="#{useradministrationbean.pendingActionList}" var="user" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" width="100%">
+ <h:column>
+ <h:selectBooleanCheckbox value="#{user.selected}" disabled="true" />
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_BPM_ID}"/>
+ </f:facet>
+ <h:outputText value="#{user.processId}" />
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{bundle.IDENTITY_USERNAME}"/>
+ </f:facet>
+ <h:outputText value="#{user.username}"/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{bundle.IDENTITY_EMAIL}"/>
+ </f:facet>
+ <h:outputText value="#{user.email}"/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{bundle.IDENTITY_REIGSTRATION_DATE}"/>
+ </f:facet>
+ <h:outputText value="#{user.registrationDate}">
+ <f:convertDateTime dateStyle="medium" type="both" />
+ </h:outputText>
+ </h:column>
+</h:dataTable>
+ <p style="text-align: right;">
+ <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="revise" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" action="#{useradministrationbean.confirmPendingAction}" styleClass="portlet-form-button" rendered="#{useradministrationbean.pendingUserAction == 'approve'}" />
+ <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" action="#{useradministrationbean.confirmPendingAction}" styleClass="portlet-form-button" rendered="#{useradministrationbean.pendingUserAction == 'reject'}" />
+ </p>
+</h:form>
+</ui:define>
+</ui:composition>
+</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -9,7 +9,16 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE}" />
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE}" />
+ </li>
+ </ul>
+</h:form>
</ui:define>
<ui:define name="content">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -10,7 +10,17 @@
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" />
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" />
+ <h:outputText value="#{useradministrationbean.uiUser.username}"/>
+ </li>
+ </ul>
+</h:form>
</ui:define>
<ui:define name="content">
@@ -24,8 +34,10 @@
</h:panelGrid>
<h:messages />
<hr/>
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="userAdmin" styleClass="portlet-form-button"/>
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{useradministrationbean.confirmedDelete}" styleClass="portlet-form-button"/>
+ <p style="text-align: right;">
+ <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="userAdmin" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{useradministrationbean.confirmedDelete}" styleClass="portlet-form-button"/>
+ </p>
</h:form>
</ui:define>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -9,16 +9,49 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" />
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" />
+ </li>
+ </ul>
+</h:form>
</ui:define>
+
<ui:define name="content">
-<h:form>
+<f:verbatim>
+<script>
+// <![CDATA[
+function selectAll() {
+ var form=$('pending');
+ var i=form.getElements('checkbox');
+ i.each(function(item) {
+ item.checked=true
+ });
+}
+function unSelectAll() {
+ var form=$('pending');
+ var i=form.getElements('checkbox');
+ i.each(function(item) {
+ item.checked=false
+ });
+}
+// ]]>
+</script>
+</f:verbatim>
+<h:form id="pending">
<h:dataTable value="#{useradministrationbean.pendingUsers}" var="user" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" width="100%">
<h:column>
+ <h:selectBooleanCheckbox id="selected" value="#{user.selected}" />
+ </h:column>
+ <h:column>
<f:facet name="header">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_BPM_ID}"/>
</f:facet>
- <h:outputText value="#{user.processId}"/>
+ <h:outputText value="#{user.processId}" />
</h:column>
<h:column>
<f:facet name="header">
@@ -58,6 +91,19 @@
</h:commandLink>
</h:column>
</h:dataTable>
+<table border="0" cellspacing="3" style="width: 100%;" >
+ <tr>
+ <td style="text-align: left;" >
+ <a href="#" onClick="selectAll()"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SELECT_ALL}" /></a> |
+ <a href="#" onClick="unSelectAll()"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_UNSELECT_ALL}" /></a>
+ </td>
+ <td style="text-align: right;">
+ <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="userAdmin" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" action="#{useradministrationbean.approveList}" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" action="#{useradministrationbean.rejectList}" styleClass="portlet-form-button"/>
+ </td>
+ </tr>
+</table>
</h:form>
</ui:define>
</ui:composition>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -10,7 +10,16 @@
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM}" />
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM}" />
+ </li>
+ </ul>
+</h:form>
</ui:define>
<ui:define name="content">
<ui:decorate template="/WEB-INF/jsf/common/confirm.xhtml">
@@ -18,9 +27,6 @@
<ui:param name="show_roles" value="true"/>
<ui:param name="subscriptionMode" value="admin" />
</ui:decorate>
-
-
-
</ui:define>
</ui:composition>
</div>
\ No newline at end of file
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-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -9,8 +9,17 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" />
- <h:outputText value="#{userregistermgr.uiUser.username}" />
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" />
+ <h:outputText value="#{userregistermgr.uiUser.username}" />
+ </li>
+ </ul>
+</h:form>
</ui:define>
<ui:define name="content">
@@ -19,9 +28,10 @@
<f:selectItems value="#{identityrolemgr.roleSelectItems}" />
</h:selectManyCheckbox>
<hr/>
+ <p style="text-align: right;">
<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"/>
-
+ </p>
</h:form>
</ui:define>
</ui:composition>
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-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -9,8 +9,17 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER} " />
- <h:outoutText value="#{editprofilemgr.uiUser.username}" />
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER} " />
+ <h:outoutText value="#{editprofilemgr.uiUser.username}" />
+ </li>
+ </ul>
+</h:form>
</ui:define>
<ui:define name="content">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -9,7 +9,16 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/>
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/>
+ </li>
+ </ul>
+</h:form>
</ui:define>
<ui:define name="content">
<h:form>
@@ -84,9 +93,10 @@
</h:commandLink>
</h:column>
</h:dataTable>
-
+ <p style="text-align: right;">
<h:commandLink value=" < " action="#{useradministrationbean.prevPage}" rendered="#{useradministrationbean.page > 1}" styleClass="portlet-form-button"/>
<h:commandLink value=" > " action="#{useradministrationbean.nextPage}" rendered="#{useradministrationbean.userList.rowCount > useradministrationbean.limit}" styleClass="portlet-form-button"/>
+ </p>
</h:form>
<br/>
</ui:define>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -10,7 +10,7 @@
<h:form>
<ul class="topnav">
- <li id="currentTab"><h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/></li>
+ <li id="currentTab"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/></li>
<li>
<h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}"/>
</li>
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-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -29,9 +29,11 @@
</c:if>
<h:messages />
<hr/>
+<p style="text-align: right;">
<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"/>
+</p>
</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/profile.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -148,7 +148,9 @@
</h:panelGrid>
<hr/>
+<p style="text-align: right;">
<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"/>
+</p>
</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-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -42,7 +42,9 @@
<ui:include src="/WEB-INF/jsf/common/captcha.xhtml" />
<hr/>
+ <p style="text-align: right;">
<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"/>
+</p>
</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-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -25,8 +25,10 @@
<ui:include src="/WEB-INF/jsf/common/captcha.xhtml" />
<hr/>
+ <p style="text-align: right;">
<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"/>
+ </p>
</h:form>
</ui:define>
</ui:composition>
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-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -30,8 +30,10 @@
<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"/>
+ <p style="text-align: right;">
+ <h:commandButton id="cancel" action="editProfile" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
<h:commandButton value="Submit" action="#{editprofilemgr.changeEmail}" styleClass="portlet-form-button"/>
+ </p>
</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-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -38,8 +38,10 @@
</h:panelGrid>
<hr/>
- <h:commandButton id="cancel" action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
+ <p style="text-align: right;">
+ <h:commandButton id="cancel" action="editProfile" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
<h:commandButton value="Submit" action="#{editprofilemgr.changePassword}" styleClass="portlet-form-button"/>
+ </p>
</h:form>
</ui:define>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2007-09-14 14:37:36 UTC (rev 8267)
@@ -11,7 +11,7 @@
<h:form>
<ul class="topnav">
<li>
- <h:commandLink value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" action="#{editprofilemgr.viewStart}"/>
+ <h:commandLink value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" action="start"/>
</li>
<li id="currentTab"><h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" /></li>
</ul>
18 years, 7 months
- 1
- 0
JBoss Portal SVN: r8266 - in trunk/core-identity/src: main/org/jboss/portal/core/identity/services and 19 other directories.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-14 10:32:40 -0400 (Fri, 14 Sep 2007)
New Revision: 8266
Added:
trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/CoreIdentityConfigurationException.java
trunk/core-identity/src/main/org/jboss/portal/test/
trunk/core-identity/src/main/org/jboss/portal/test/core/
trunk/core-identity/src/main/org/jboss/portal/test/core/identity/
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml
Removed:
trunk/core-identity/src/main/org/jboss/portal/core/identity/test/validators/
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/register.xhtml
Modified:
trunk/core-identity/src/main/org/jboss/portal/core/identity/services/IdentityConstants.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/RegistrationService.java
trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/UserContainer.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/ui/DynamicUserAttribute.java
trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java
trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java
trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java
trunk/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml
trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml
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/lostPassword/lost.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml
trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml
Log:
- ui improvements
- localization for dynamic values
- added configuration exception
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/IdentityConstants.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/IdentityConstants.java 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/IdentityConstants.java 2007-09-14 14:32:40 UTC (rev 8266)
@@ -84,7 +84,7 @@
public static final String DEFAULT_ROLE = "User";
/** Bundle prefix for dynamic value localization */
- public static final String DYNAMIC_VALUE_PREFIX = "IDENTIY_DYNAMIC_VALUE_";
+ public static final String DYNAMIC_VALUE_PREFIX = "IDENTITY_DYNAMIC_VALUE_";
}
Added: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/CoreIdentityConfigurationException.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/CoreIdentityConfigurationException.java (rev 0)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/CoreIdentityConfigurationException.java 2007-09-14 14:32:40 UTC (rev 8266)
@@ -0,0 +1,52 @@
+/******************************************************************************
+ * 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. *
+ ******************************************************************************/
+package org.jboss.portal.core.identity.services.metadata;
+
+/**
+ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
+ * @version $Revision$
+ */
+public class CoreIdentityConfigurationException extends Exception
+{
+
+ public CoreIdentityConfigurationException()
+ {
+ super();
+ }
+
+ public CoreIdentityConfigurationException(Throwable cause)
+ {
+ super(cause);
+ }
+
+ public CoreIdentityConfigurationException(String message)
+ {
+ super(message);
+ }
+
+ public CoreIdentityConfigurationException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+}
+
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-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/metadata/IdentityUIConfigurationServiceImpl.java 2007-09-14 14:32:40 UTC (rev 8266)
@@ -28,7 +28,6 @@
import java.util.Map;
import javax.naming.InitialContext;
-import javax.naming.NamingException;
import org.jboss.portal.common.io.IOTools;
import org.jboss.portal.core.identity.services.IdentityConstants;
@@ -110,11 +109,11 @@
this.createJBPMContext(subscriptionMode);
this.createJBPMContext(adminSubscriptionMode);
- log.info("jBPM worfklow started ...");
+ log.info("jBPM workflow started ...");
}
else
{
- throw new RuntimeException("processName cannot be null.");
+ throw new CoreIdentityConfigurationException("WorkflowService or processName must not be null.");
}
}
else
@@ -124,8 +123,9 @@
}
catch (Exception e)
{
- log.error("Error while starting core identity services ...", e);
+ log.error("Error while starting core identity services ...");
super.stopService();
+ throw new CoreIdentityConfigurationException(e);
}
if (this.jndiName != null)
@@ -214,117 +214,150 @@
return workflowService;
}
- private void createJBPMContext(String processName) throws NamingException
+ private void createJBPMContext(String processName) throws CoreIdentityConfigurationException
{
if (!IdentityConstants.SUBSCRIPTION_MODE_AUTOMATIC.equals(processName))
{
String fileName = "conf/processes/" + processName + ".xml";
+ JbpmContext jbpmContext = null;
+
+ try
+ {
+ jbpmContext = this.getWorkflowService().getJbpmConfiguration().createJbpmContext();
- JbpmContext jbpmContext = this.getWorkflowService().getJbpmConfiguration().createJbpmContext();
-
- ProcessDefinition processDefinition = jbpmContext.getGraphSession().findLatestProcessDefinition(processName);
- if (processDefinition == null)
+ ProcessDefinition processDefinition = jbpmContext.getGraphSession().findLatestProcessDefinition(processName);
+ if (processDefinition == null)
+ {
+ processDefinition = ProcessDefinition.parseXmlResource(fileName);
+ jbpmContext.deployProcessDefinition(processDefinition);
+ log.debug("deloying process definition: " + processName);
+ }
+ else
+ {
+ if (this.configuration.isOverwriteWorkflow())
+ {
+ ProcessDefinition fromConfig = ProcessDefinition.parseXmlResource(fileName);
+ jbpmContext.deployProcessDefinition(fromConfig);
+ log.debug("overwriting process definition: " + processName);
+ }
+ }
+ }
+ catch(Exception e)
{
- processDefinition = ProcessDefinition.parseXmlResource(fileName);
- jbpmContext.deployProcessDefinition(processDefinition);
+ throw new CoreIdentityConfigurationException("I don't like your subscription mode! Please make sure that the file and the process name match - also check the syntax.");
}
- else
+ finally
{
- if (this.configuration.isOverwriteWorkflow())
- {
- ProcessDefinition fromConfig = ProcessDefinition.parseXmlResource(fileName);
- jbpmContext.deployProcessDefinition(fromConfig);
- }
+ // Closing JbpmContext
+ IOTools.safeClose(jbpmContext);
}
- // Closing JbpmContext
- IOTools.safeClose(jbpmContext);
}
}
- private IdentityUIConfiguration createConfiguration() throws IOException, JBossXBException
+ private IdentityUIConfiguration createConfiguration() throws CoreIdentityConfigurationException
{
- SchemaBinding schema = XsdBinder.bind(getURL(schemaLocation).toString());
- schema.setIgnoreUnresolvedFieldOrClass(false);
-
- TermBeforeSetParentCallback componentCallback = new TermBeforeSetParentCallback()
+ try
{
- public Object beforeSetParent(Object o, UnmarshallingContext ctx)
+ SchemaBinding schema = XsdBinder.bind(getURL(schemaLocation).toString());
+ schema.setIgnoreUnresolvedFieldOrClass(false);
+
+ TermBeforeSetParentCallback componentCallback = new TermBeforeSetParentCallback()
{
- UIComponentConfiguration uiComponent = null;
- ElementBinding eb = (ElementBinding) ctx.getParticle().getTerm();
- String localPart = eb.getQName().getLocalPart();
- if ("ui-component".equals(localPart))
+ public Object beforeSetParent(Object o, UnmarshallingContext ctx)
{
- uiComponent = (UIComponentConfiguration) o;
- try
+ UIComponentConfiguration uiComponent = null;
+ ElementBinding eb = (ElementBinding) ctx.getParticle().getTerm();
+ String localPart = eb.getQName().getLocalPart();
+ if ("ui-component".equals(localPart))
{
- // Getting property reference
- PropertyInfo propertyInfo = getUserProfileModule().getProfileInfo().getPropertyInfo(
- uiComponent.getPropertyRef());
- uiComponent.setPropertyInfo(propertyInfo);
+ uiComponent = (UIComponentConfiguration) o;
+ try
+ {
+ // Getting property reference
+ PropertyInfo propertyInfo = getUserProfileModule().getProfileInfo().getPropertyInfo(
+ uiComponent.getPropertyRef());
+ uiComponent.setPropertyInfo(propertyInfo);
+ }
+ catch (IdentityException e)
+ {
+ uiComponent = null;
+ throw new IllegalArgumentException("cannot resolve property: " + uiComponent.getPropertyRef());
+ }
}
- catch (IdentityException e)
- {
- uiComponent = null;
- throw new RuntimeException("cannot resolve property: " + uiComponent.getPropertyRef(), e);
- }
+ return uiComponent;
}
- return uiComponent;
- }
- };
-
- // Adding callback for ui-components
- TypeBinding cb = schema.getType(new javax.xml.namespace.QName("UIComponent"));
- cb.setBeforeSetParentCallback(componentCallback);
-
- TermBeforeSetParentCallback valueCallback = new TermBeforeSetParentCallback()
- {
- public Object beforeSetParent(Object o, UnmarshallingContext ctx)
+ };
+
+ // Adding callback for ui-components
+ TypeBinding cb = schema.getType(new javax.xml.namespace.QName("UIComponent"));
+ cb.setBeforeSetParentCallback(componentCallback);
+
+ TermBeforeSetParentCallback valueCallback = new TermBeforeSetParentCallback()
{
-
- ElementBinding eb = (ElementBinding) ctx.getParticle().getTerm();
- String localPart = eb.getQName().getLocalPart();
- Map m = (Map) o;
- if ("values".equals(localPart))
+ public Object beforeSetParent(Object o, UnmarshallingContext ctx)
{
- UIComponentConfiguration uiComponent = (UIComponentConfiguration) ctx.getParentValue();
- if ( m.containsKey(IdentityConstants.COMPONENT_VALUE_LOCALE) )
+
+ ElementBinding eb = (ElementBinding) ctx.getParticle().getTerm();
+ String localPart = eb.getQName().getLocalPart();
+ Map m = (Map) o;
+ if ("values".equals(localPart))
{
- uiComponent.setPredefinedMapValues(IdentityConstants.COMPONENT_VALUE_LOCALE);
- m.remove(IdentityConstants.COMPONENT_VALUE_LOCALE);
+ UIComponentConfiguration uiComponent = (UIComponentConfiguration) ctx.getParentValue();
+ if ( m.containsKey(IdentityConstants.COMPONENT_VALUE_LOCALE) )
+ {
+ uiComponent.setPredefinedMapValues(IdentityConstants.COMPONENT_VALUE_LOCALE);
+ m.remove(IdentityConstants.COMPONENT_VALUE_LOCALE);
+ }
+ else if ( m.containsKey(IdentityConstants.COMPONENT_VALUE_THEME))
+ {
+ uiComponent.setPredefinedMapValues(IdentityConstants.COMPONENT_VALUE_THEME);
+ m.remove(IdentityConstants.COMPONENT_VALUE_THEME);
+ }
+ else if ( m.containsKey(IdentityConstants.COMPONENT_VALUE_TIMEZONE))
+ {
+ uiComponent.setPredefinedMapValues(IdentityConstants.COMPONENT_VALUE_TIMEZONE);
+ m.remove(IdentityConstants.COMPONENT_VALUE_TIMEZONE);
+ }
}
- else if ( m.containsKey(IdentityConstants.COMPONENT_VALUE_THEME))
- {
- uiComponent.setPredefinedMapValues(IdentityConstants.COMPONENT_VALUE_THEME);
- m.remove(IdentityConstants.COMPONENT_VALUE_THEME);
- }
- else if ( m.containsKey(IdentityConstants.COMPONENT_VALUE_TIMEZONE))
- {
- uiComponent.setPredefinedMapValues(IdentityConstants.COMPONENT_VALUE_TIMEZONE);
- m.remove(IdentityConstants.COMPONENT_VALUE_TIMEZONE);
- }
+ return m;
}
- return m;
- }
- };
-
- // Adding callback for ui-component values
- TypeBinding vb = schema.getType(new javax.xml.namespace.QName("componentValues"));
- vb.setBeforeSetParentCallback(valueCallback);
-
- // Unmarshalling && creating configuration
- Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
- return (IdentityUIConfiguration) unmarshaller.unmarshal(getResource(xmlLocation), schema);
+ };
+
+ // Adding callback for ui-component values
+ TypeBinding vb = schema.getType(new javax.xml.namespace.QName("componentValues"));
+ vb.setBeforeSetParentCallback(valueCallback);
+
+ // Unmarshalling && creating configuration
+ Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
+ return (IdentityUIConfiguration) unmarshaller.unmarshal(getResource(xmlLocation), schema);
+ }
+ catch (IOException e)
+ {
+ throw new CoreIdentityConfigurationException("Could not find configuration file or schema.");
+ }
+ catch (JBossXBException e)
+ {
+ throw new CoreIdentityConfigurationException("Could not parse configuration file.");
+ }
+ catch (Exception e)
+ {
+ throw new CoreIdentityConfigurationException("Could not parse configuration file. If you run JBoss Portal with JBoss AS 4.0.5 or less please check the reference Guide.");
+ }
}
- private InputStream getResource(String path) throws IOException
+ protected InputStream getResource(String path) throws IOException
{
URL url = Thread.currentThread().getContextClassLoader().getResource(path);
+ if (url == null)
+ throw new IOException();
return url.openStream();
}
private URL getURL(String path) throws IOException
{
- return Thread.currentThread().getContextClassLoader().getResource(path);
+ URL url = Thread.currentThread().getContextClassLoader().getResource(path);
+ if (url == null)
+ throw new IOException();
+ return url;
}
}
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/RegistrationService.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/RegistrationService.java 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/RegistrationService.java 2007-09-14 14:32:40 UTC (rev 8266)
@@ -33,14 +33,50 @@
public interface RegistrationService
{
+ /**
+ * Start the registration process for a new user
+ *
+ * @param portalURL
+ * @param username
+ * @param password
+ * @param profileMap
+ * @param roles
+ * @param locale
+ * @param adminFlag
+ * @return
+ */
String registerUser(String portalURL, String username, String password, Map profileMap, List roles, Locale locale, boolean adminFlag);
+ /**
+ * Approve or reject a registration
+ *
+ * @param id
+ * @param approve
+ * @return
+ */
String approve(String id, boolean approve);
+ /**
+ * Get pending users
+ *
+ * @param nodeName
+ * @return
+ */
List getPendingUsers(String nodeName);
+ /**
+ * Check for a existing username in the jBPM context
+ *
+ * @param username
+ * @return
+ */
boolean checkUsername(String username);
+ /**
+ * Get pending users count
+ *
+ * @return
+ */
int getPendingCount();
}
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/UserContainer.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/UserContainer.java 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/UserContainer.java 2007-09-14 14:32:40 UTC (rev 8266)
@@ -51,6 +51,9 @@
/** The assigned roles */
private List roles;
+
+ /** Is selected */
+ private boolean selected = false;
/** The current node */
private String currentNode;
@@ -117,7 +120,17 @@
{
this.roles = roles;
}
-
+
+ public boolean isSelected()
+ {
+ return selected;
+ }
+
+ public void setSelected(boolean selected)
+ {
+ this.selected = selected;
+ }
+
public String getCurrentNode()
{
return currentNode;
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-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/services/workflow/impl/RegistrationServiceImpl.java 2007-09-14 14:32:40 UTC (rev 8266)
@@ -290,16 +290,20 @@
count = !instance.hasEnded() ? count + 1 : count;
}
}
- List adminProcessInstances = this.getProcessInstances(jbpmContext, this.adminSubscriptionMode);
- if (adminProcessInstances != null && adminProcessInstances.size() > 0)
+ if (! this.adminSubscriptionMode.equals(this.subscriptionMode)
+ && ! this.adminSubscriptionMode.equals(IdentityConstants.SUBSCRIPTION_MODE_AUTOMATIC))
{
- Iterator i = adminProcessInstances.iterator();
- while (i.hasNext())
+ List adminProcessInstances = this.getProcessInstances(jbpmContext, this.adminSubscriptionMode);
+ if (adminProcessInstances != null && adminProcessInstances.size() > 0)
{
- ProcessInstance instance = (ProcessInstance) i.next();
- Node node = instance.getRootToken().getNode();
- if (IdentityConstants.JBPM_NODE_APPROVAL.equals(node.getName()))
- count = !instance.hasEnded() ? count + 1 : count;
+ Iterator i = adminProcessInstances.iterator();
+ while (i.hasNext())
+ {
+ ProcessInstance instance = (ProcessInstance) i.next();
+ Node node = instance.getRootToken().getNode();
+ if (IdentityConstants.JBPM_NODE_APPROVAL.equals(node.getName()))
+ count = !instance.hasEnded() ? count + 1 : count;
+ }
}
}
}
@@ -326,10 +330,14 @@
queue.addAll(this.getPendingUser(userProcessInstances, nodeName));
}
- List adminProcessInstances = this.getProcessInstances(jbpmContext, this.adminSubscriptionMode);
- if (adminProcessInstances != null && adminProcessInstances.size() > 0)
+ if (! this.adminSubscriptionMode.equals(this.subscriptionMode)
+ && ! this.adminSubscriptionMode.equals(IdentityConstants.SUBSCRIPTION_MODE_AUTOMATIC))
{
- queue.addAll(this.getPendingUser(adminProcessInstances, nodeName));
+ List adminProcessInstances = this.getProcessInstances(jbpmContext, this.adminSubscriptionMode);
+ if (adminProcessInstances != null && adminProcessInstances.size() > 0)
+ {
+ queue.addAll(this.getPendingUser(adminProcessInstances, nodeName));
+ }
}
}
catch (NamingException e)
@@ -392,18 +400,21 @@
try
{
List userProcessInstances = this.getProcessInstances(jbpmContext, this.subscriptionMode);
- List adminProcessInstances = this.getProcessInstances(jbpmContext, this.adminSubscriptionMode);
-
if (userProcessInstances != null && userProcessInstances.size() > 0)
{
if (this.checkUsername(userProcessInstances, username))
return true;
}
-
- if (adminProcessInstances != null && adminProcessInstances.size() > 0)
+
+ if (! this.adminSubscriptionMode.equals(this.subscriptionMode)
+ && ! this.adminSubscriptionMode.equals(IdentityConstants.SUBSCRIPTION_MODE_AUTOMATIC))
{
- if (this.checkUsername(adminProcessInstances, username))
- return true;
+ List adminProcessInstances = this.getProcessInstances(jbpmContext, this.adminSubscriptionMode);
+ if (adminProcessInstances != null && adminProcessInstances.size() > 0)
+ {
+ if (this.checkUsername(adminProcessInstances, username))
+ return true;
+ }
}
}
catch (NamingException e)
@@ -454,7 +465,8 @@
}
GraphSession graphSession = jbpmContext.getGraphSession();
ProcessDefinition processDefinition = graphSession.findLatestProcessDefinition(processName);
- processInstances = graphSession.findProcessInstances(processDefinition.getId());
+ if ( processDefinition != null )
+ processInstances = graphSession.findProcessInstances(processDefinition.getId());
}
return processInstances;
}
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/DynamicUserAttribute.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/DynamicUserAttribute.java 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/DynamicUserAttribute.java 2007-09-14 14:32:40 UTC (rev 8266)
@@ -92,7 +92,8 @@
// ok on user register
}
}
- return new PropertyValue(propertyValue);
+
+ return new PropertyValue(identityUserBean.getLocalizedValue((String)propertyName, propertyValue));
}
public boolean setValue(Object propertyName, Object value) throws IllegalArgumentException
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-09-14 14:32:40 UTC (rev 8266)
@@ -24,6 +24,7 @@
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -31,10 +32,12 @@
import javax.faces.context.FacesContext;
import javax.faces.model.DataModel;
import javax.faces.model.ListDataModel;
+import javax.portlet.PortletException;
import org.jboss.logging.Logger;
import org.jboss.portal.core.identity.services.IdentityConstants;
import org.jboss.portal.core.identity.services.workflow.RegistrationService;
+import org.jboss.portal.core.identity.services.workflow.UserContainer;
import org.jboss.portal.core.identity.ui.IdentityUIUser;
import org.jboss.portal.core.identity.ui.common.IdentityRoleBean;
import org.jboss.portal.core.identity.ui.common.IdentityUserBean;
@@ -69,12 +72,21 @@
/** . */
private String displayNode = IdentityConstants.JBPM_NODE_APPROVAL;
+
+ /** . */
+ private List pendingUsers = null;
+
+ /** . */
+ private List pendingActionList = null;
+
+ /** . */
+ private String pendingUserAction = null;
/** . */
private IdentityUIUser uiUser;
/** . */
- private String searchString = null;
+ private String searchString = "";
/** . */
private IdentityUserBean identityUserBean;
@@ -153,14 +165,14 @@
return identityUserBean;
}
- public String getDisplayNode()
+ public String getPendingUserAction()
{
- return displayNode;
+ return pendingUserAction;
}
-
- public void setDisplayNode(String displayNode)
+
+ public List getPendingActionList()
{
- this.displayNode = displayNode;
+ return pendingActionList;
}
public void setIdentityUserBean(IdentityUserBean identityUserBean)
@@ -281,10 +293,9 @@
public List getPendingUsers()
{
- List list = new ArrayList();
- if ( this.registrationService != null)
- list = this.registrationService.getPendingUsers(displayNode);
- return list;
+ if ( this.registrationService != null )
+ this.pendingUsers = this.registrationService.getPendingUsers(displayNode);
+ return pendingUsers;
}
public String deleteUser()
@@ -347,7 +358,64 @@
this.registrationService.approve(processId, false);
}
}
+ this.pendingUsers = null;
return "pendingUsers";
}
-
+
+ public String approveList()
+ {
+ this.pendingUserAction = "approve";
+ this.pendingActionList = new ArrayList();
+ for(Iterator i = pendingUsers.iterator(); i.hasNext(); )
+ {
+ UserContainer user = (UserContainer) i.next();
+ if ( user.isSelected() )
+ {
+ this.pendingActionList.add(user);
+ }
+ }
+ if (this.pendingActionList.size() >0)
+ {
+ return "confirmPendingAction";
+ }
+ return "pendingUsers";
+ }
+
+ public String rejectList()
+ {
+ this.pendingUserAction = "reject";
+ this.pendingActionList = new ArrayList();
+ for(Iterator i = pendingUsers.iterator(); i.hasNext(); )
+ {
+ UserContainer user = (UserContainer) i.next();
+ if ( user.isSelected() )
+ {
+ this.pendingActionList.add(user);
+ }
+ }
+ if (this.pendingActionList.size() > 0)
+ {
+ return "confirmPendingAction";
+ }
+ return "pendingUsers";
+ }
+
+ public String confirmPendingAction()
+ {
+ for(Iterator i = pendingActionList.iterator(); i.hasNext(); )
+ {
+ UserContainer user = (UserContainer) i.next();
+ if (this.pendingUserAction.equals("approve"))
+ {
+ this.registrationService.approve(user.getProcessId(), true);
+ }
+ else if (this.pendingUserAction.equals("reject"))
+ {
+ this.registrationService.approve(user.getProcessId(), false);
+ }
+ }
+ this.pendingActionList = null;
+ this.pendingUsers = null;
+ return "success";
+ }
}
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java 2007-09-14 14:32:40 UTC (rev 8266)
@@ -28,9 +28,13 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.ResourceBundle;
import java.util.Set;
+import javax.faces.context.FacesContext;
+
import org.jboss.logging.Logger;
+import org.jboss.portal.core.identity.services.IdentityConstants;
import org.jboss.portal.core.identity.services.metadata.UIComponentConfiguration;
import org.jboss.portal.core.identity.ui.IdentityUIUser;
import org.jboss.portal.identity.IdentityException;
@@ -161,6 +165,26 @@
user.updatePassword(password);
}
+ public Object getLocalizedValue(String propertyName, Object value)
+ {
+ UIComponentConfiguration uiComponent = (UIComponentConfiguration) this.metaDataService.getValue(propertyName).getObject();
+ if( uiComponent.getValues() != null
+ && value instanceof String
+ && uiComponent.getValues().size() > 0)
+ {
+ try
+ {
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale());
+ return bundle.getString(IdentityConstants.DYNAMIC_VALUE_PREFIX + ((String)value).toUpperCase());
+ }
+ catch (Exception e)
+ {
+ return value;
+ }
+ }
+ return value;
+ }
+
public Class getPropertyType(String propertyName) throws IdentityException, ClassNotFoundException
{
UIComponentConfiguration uiComponent = (UIComponentConfiguration) this.metaDataService.getValue(propertyName).getObject();
Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java
===================================================================
--- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/MetaDataServiceBean.java 2007-09-14 14:32:40 UTC (rev 8266)
@@ -28,6 +28,8 @@
import javax.faces.context.FacesContext;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import javax.portlet.PortletException;
+import javax.portlet.UnavailableException;
import org.jboss.portal.core.identity.services.metadata.IdentityUIConfiguration;
import org.jboss.portal.core.identity.services.metadata.IdentityUIConfigurationService;
@@ -49,7 +51,7 @@
/** . */
private IdentityUIConfigurationService identityUIConfigurationService;
- public MetaDataServiceBean()
+ public MetaDataServiceBean() throws UnavailableException
{
try
{
@@ -57,9 +59,9 @@
IdentityUIConfiguration cf = identityUIConfigurationService.getConfiguration();
this.map = cf.getUiComponents();
}
- catch (NamingException e)
+ catch (Exception e)
{
- throw new RuntimeException(e);
+ throw new UnavailableException("Configuration service not available. Please check your configuration files and the logs.");
}
}
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-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-sar/META-INF/jboss-service.xml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -58,6 +58,7 @@
<depends optional-attribute-name="IdentityServiceController" proxy-type="attribute">
portal:service=Module,type=IdentityServiceController
</depends>
+ <depends>portal:service=Workflow,type=WorkflowService</depends>
<attribute name="JNDIName">java:portal/IdentityUIConfigurationService</attribute>
</mbean>
Modified: trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
--- trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2007-09-14 14:32:40 UTC (rev 8266)
@@ -118,6 +118,10 @@
IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER=Assign roles to user:
IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=Pending users
IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=Registered users
+IDENTITY_MANAGEMENT_APPROVE_ALL=Approve selected
+IDENTITY_MANAGEMENT_REJECT_ALL=Reject selected
+IDENTITY_MANAGEMENT_SELECT_ALL=select all
+IDENTITY_MANAGEMENT_UNSELECT_ALL=unselect all
IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS=Pending registrations
IDENTITY_MANAGEMENT_PENDING_BPM_ID=Id
@@ -125,7 +129,7 @@
IDENTITY_MANAGEMENT_PENDING_REJECT=reject
IDENTITY_REGISTER_VERIFY_CAPTCHA=Verify captcha
-IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirmation: Delete Object
+IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirmation: Delete
IDENTITY_REGISTER_CONFIRMATIONEMAIL=Confirm your subscription
IDENTITY_MAIL_SUBJECT_LOST_PASSWORD=Reset your password
@@ -150,5 +154,5 @@
IDENTITY_VALIDATION_ERROR_CAPTCHA_INCORRECT=Captcha incorrect
# Example usage for dynamic values
-#IDENTIY_DYNAMIC_VALUE_TEST=test label
-#IDENTIY_DYNAMIC_VALUE_TEST2=test label2
\ No newline at end of file
+IDENTITY_DYNAMIC_VALUE_TEST=test label
+IDENTITY_DYNAMIC_VALUE_TEST2=test label2
\ No newline at end of file
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-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -76,6 +76,10 @@
</ui-component>
<ui-component name="interests">
<property-ref>portal.user.interests</property-ref>
+ <values>
+ <value key="test">testing</value>
+ <value key="test2">testing2</value>
+ </values>
</ui-component>
<ui-component name="icq">
<property-ref>portal.user.im.icq</property-ref>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -319,6 +319,28 @@
</navigation-case>
</navigation-rule>
<navigation-rule>
+ <from-view-id>/WEB-INF/jsf/admin/user/pendingUsers.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>confirmPendingAction</from-outcome>
+ <to-view-id>/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>cancel</from-outcome>
+ <to-view-id>/WEB-INF/jsf/admin/index.xthml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+ <navigation-rule>
+ <from-view-id>/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>revise</from-outcome>
+ <to-view-id>/WEB-INF/jsf/admin/user/pendingUsers.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>success</from-outcome>
+ <to-view-id>/WEB-INF/jsf/admin/index.xthml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+ <navigation-rule>
<from-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</from-view-id>
<navigation-case>
<from-outcome>deleteUser</from-outcome>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -9,8 +9,17 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" />
- <h:outputText value="#{assignrolemgr.uiUser.username}" />
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" />
+ <h:outputText value="#{assignrolemgr.uiUser.username}" />
+ </li>
+ </ul>
+</h:form>
</ui:define>
<ui:define name="content">
@@ -19,9 +28,10 @@
<f:selectItems value="#{identityrolemgr.roleSelectItems}" />
</h:selectManyCheckbox>
<hr/>
+ <p style="text-align: right;">
<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"/>
-
+ </p>
</h:form>
</ui:define>
</ui:composition>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -8,7 +8,21 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
-<ui:define name="title" />
+<ui:define name="title">
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:commandLink action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/>
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" />
+ </li>
+ </ul>
+</h:form>
+</ui:define>
<ui:define name="content">
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -8,7 +8,11 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ <ul class="objectpath">
+ <li>
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ </ul>
</ui:define>
<ui:define name="content">
Deleted: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/register.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/register.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/register.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -1,25 +0,0 @@
-<div
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:c="http://java.sun.com/jstl/core"
- class="identity-ui">
-
-<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
-
-<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE}" />
-</ui:define>
-
-<ui:define name="content">
-
- <ui:decorate template="/WEB-INF/jsf/common/register.xhtml">
- <ui:param name="manager" value="#{userregistermgr}"/>
- <ui:param name="showCaptcha" value="false" />
- </ui:decorate>
-
-</ui:define>
-
-</ui:composition>
-</div>
\ No newline at end of file
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -9,7 +9,16 @@
<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}"/>
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}"/>
+ </li>
+ </ul>
+</h:form>
</ui:define>
<ui:define name="content">
@@ -22,8 +31,10 @@
<h:inputText id="roledisplayname" value="#{createrolemgr.uiRole.displayName}"/>
</h:panelGrid>
<hr/>
+ <p style="text-align: right;">
<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:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{createrolemgr.createRole}" styleClass="portlet-form-button"/>
+ </p>
</h:form>
</ui:define>
</ui:composition>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/deleteRole.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -10,7 +10,17 @@
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" />
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" />
+ <h:outputText value="#{rolemanagementbean.uiRole.name}"/>
+ </li>
+ </ul>
+</h:form>
</ui:define>
<ui:define name="content">
@@ -24,8 +34,10 @@
</h:panelGrid>
<h:messages />
<hr/>
+ <p style="text-align: right;">
<h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="roleAdmin" styleClass="portlet-form-button"/>
<h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{rolemanagementbean.confirmedDelete}" styleClass="portlet-form-button"/>
+ </p>
</h:form>
</ui:define>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -9,7 +9,16 @@
<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}"/>
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}"/>
+ </li>
+ </ul>
+</h:form>
</ui:define>
<ui:define name="content">
@@ -22,8 +31,10 @@
<h:inputText value="#{editrolemgr.uiRole.displayName}"/>
</h:panelGrid>
<hr/>
+ <p style="text-align: right;">
<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"/>
+ </p>
</h:form>
</ui:define>
</ui:composition>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -9,7 +9,16 @@
<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MEMBERS}"/>: <h:outputText value="#{rolemanagementbean.uiRole.name}"/>
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MEMBERS}"/>: <h:outputText value="#{rolemanagementbean.uiRole.name}"/>
+ </li>
+ </ul>
+</h:form>
</ui:define>
<ui:define name="content">
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -13,7 +13,7 @@
<li>
<h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/>
</li>
- <li id="currentTab"><h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}"/></li>
+ <li id="currentTab"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}"/></li>
</ul>
</h:form>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -8,7 +8,11 @@
<ui:composition template="/WEB-INF/jsf/admin/roles/roleTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ <ul class="objectpath">
+ <li>
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" />
+ </li>
+ </ul>
</ui:define>
<ui:define name="content">
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -10,8 +10,17 @@
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD_FOR_USER}" />
- <h:outputText value="#{editprofilemgr.currentUser}" />
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD_FOR_USER}" />
+ <h:outputText value="#{editprofilemgr.currentUser}" />
+ </li>
+ </ul>
+</h:form>
</ui:define>
<ui:define name="content">
@@ -32,8 +41,10 @@
</h:panelGrid>
<hr/>
+ <p style="text-align: right;">
<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"/>
+ </p>
</h:form>
</ui:define>
Added: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml (rev 0)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -0,0 +1,66 @@
+<div
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core"
+ class="identity-ui">
+
+<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
+
+<ui:define name="title">
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:commandLink action="revise" value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" />
+ > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'approve'}" />
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'reject'}" />
+ </li>
+ </ul>
+</h:form>
+</ui:define>
+<ui:define name="content">
+<h:form>
+<h:dataTable value="#{useradministrationbean.pendingActionList}" var="user" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" width="100%">
+ <h:column>
+ <h:selectBooleanCheckbox value="#{user.selected}" disabled="true" />
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_BPM_ID}"/>
+ </f:facet>
+ <h:outputText value="#{user.processId}" />
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{bundle.IDENTITY_USERNAME}"/>
+ </f:facet>
+ <h:outputText value="#{user.username}"/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{bundle.IDENTITY_EMAIL}"/>
+ </f:facet>
+ <h:outputText value="#{user.email}"/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="#{bundle.IDENTITY_REIGSTRATION_DATE}"/>
+ </f:facet>
+ <h:outputText value="#{user.registrationDate}">
+ <f:convertDateTime dateStyle="medium" type="both" />
+ </h:outputText>
+ </h:column>
+</h:dataTable>
+ <p style="text-align: right;">
+ <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="revise" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" action="#{useradministrationbean.confirmPendingAction}" styleClass="portlet-form-button" rendered="#{useradministrationbean.pendingUserAction == 'approve'}" />
+ <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" action="#{useradministrationbean.confirmPendingAction}" styleClass="portlet-form-button" rendered="#{useradministrationbean.pendingUserAction == 'reject'}" />
+ </p>
+</h:form>
+</ui:define>
+</ui:composition>
+</div>
\ No newline at end of file
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -9,7 +9,16 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE}" />
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE}" />
+ </li>
+ </ul>
+</h:form>
</ui:define>
<ui:define name="content">
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/deleteUser.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -10,7 +10,17 @@
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" />
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM_DELETE}" />
+ <h:outputText value="#{useradministrationbean.uiUser.username}"/>
+ </li>
+ </ul>
+</h:form>
</ui:define>
<ui:define name="content">
@@ -24,8 +34,10 @@
</h:panelGrid>
<h:messages />
<hr/>
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="userAdmin" styleClass="portlet-form-button"/>
- <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{useradministrationbean.confirmedDelete}" styleClass="portlet-form-button"/>
+ <p style="text-align: right;">
+ <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="userAdmin" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.IDENTITY_BUTTON_SUBMIT}" action="#{useradministrationbean.confirmedDelete}" styleClass="portlet-form-button"/>
+ </p>
</h:form>
</ui:define>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -9,16 +9,49 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" />
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" />
+ </li>
+ </ul>
+</h:form>
</ui:define>
+
<ui:define name="content">
-<h:form>
+<f:verbatim>
+<script>
+// <![CDATA[
+function selectAll() {
+ var form=$('pending');
+ var i=form.getElements('checkbox');
+ i.each(function(item) {
+ item.checked=true
+ });
+}
+function unSelectAll() {
+ var form=$('pending');
+ var i=form.getElements('checkbox');
+ i.each(function(item) {
+ item.checked=false
+ });
+}
+// ]]>
+</script>
+</f:verbatim>
+<h:form id="pending">
<h:dataTable value="#{useradministrationbean.pendingUsers}" var="user" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" width="100%">
<h:column>
+ <h:selectBooleanCheckbox id="selected" value="#{user.selected}" />
+ </h:column>
+ <h:column>
<f:facet name="header">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_BPM_ID}"/>
</f:facet>
- <h:outputText value="#{user.processId}"/>
+ <h:outputText value="#{user.processId}" />
</h:column>
<h:column>
<f:facet name="header">
@@ -58,6 +91,19 @@
</h:commandLink>
</h:column>
</h:dataTable>
+<table border="0" cellspacing="3" style="width: 100%;" >
+ <tr>
+ <td style="text-align: left;" >
+ <a href="#" onClick="selectAll()"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SELECT_ALL}" /></a> |
+ <a href="#" onClick="unSelectAll()"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_UNSELECT_ALL}" /></a>
+ </td>
+ <td style="text-align: right;">
+ <h:commandButton value="#{bundle.IDENTITY_BUTTON_CANCEL}" action="userAdmin" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" action="#{useradministrationbean.approveList}" styleClass="portlet-form-button"/>
+ <h:commandButton value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" action="#{useradministrationbean.rejectList}" styleClass="portlet-form-button"/>
+ </td>
+ </tr>
+</table>
</h:form>
</ui:define>
</ui:composition>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -10,7 +10,16 @@
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM}" />
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM}" />
+ </li>
+ </ul>
+</h:form>
</ui:define>
<ui:define name="content">
<ui:decorate template="/WEB-INF/jsf/common/confirm.xhtml">
@@ -18,9 +27,6 @@
<ui:param name="show_roles" value="true"/>
<ui:param name="subscriptionMode" value="admin" />
</ui:decorate>
-
-
-
</ui:define>
</ui:composition>
</div>
\ No newline at end of file
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -9,8 +9,17 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" />
- <h:outputText value="#{userregistermgr.uiUser.username}" />
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" />
+ <h:outputText value="#{userregistermgr.uiUser.username}" />
+ </li>
+ </ul>
+</h:form>
</ui:define>
<ui:define name="content">
@@ -19,9 +28,10 @@
<f:selectItems value="#{identityrolemgr.roleSelectItems}" />
</h:selectManyCheckbox>
<hr/>
+ <p style="text-align: right;">
<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"/>
-
+ </p>
</h:form>
</ui:define>
</ui:composition>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -9,8 +9,17 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER} " />
- <h:outoutText value="#{editprofilemgr.uiUser.username}" />
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER} " />
+ <h:outoutText value="#{editprofilemgr.uiUser.username}" />
+ </li>
+ </ul>
+</h:form>
</ui:define>
<ui:define name="content">
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -9,7 +9,16 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/>
+<h:form>
+ <ul class="objectpath">
+ <li>
+ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
+ <li>
+ > <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/>
+ </li>
+ </ul>
+</h:form>
</ui:define>
<ui:define name="content">
<h:form>
@@ -84,9 +93,10 @@
</h:commandLink>
</h:column>
</h:dataTable>
-
+ <p style="text-align: right;">
<h:commandLink value=" < " action="#{useradministrationbean.prevPage}" rendered="#{useradministrationbean.page > 1}" styleClass="portlet-form-button"/>
<h:commandLink value=" > " action="#{useradministrationbean.nextPage}" rendered="#{useradministrationbean.userList.rowCount > useradministrationbean.limit}" styleClass="portlet-form-button"/>
+ </p>
</h:form>
<br/>
</ui:define>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -10,7 +10,7 @@
<h:form>
<ul class="topnav">
- <li id="currentTab"><h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/></li>
+ <li id="currentTab"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/></li>
<li>
<h:commandLink action="roleAdmin" value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}"/>
</li>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -29,9 +29,11 @@
</c:if>
<h:messages />
<hr/>
+<p style="text-align: right;">
<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"/>
+</p>
</h:form>
</div>
\ No newline at end of file
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/profile.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -148,7 +148,9 @@
</h:panelGrid>
<hr/>
+<p style="text-align: right;">
<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"/>
+</p>
</h:form>
</div>
\ No newline at end of file
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-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/register.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -42,7 +42,9 @@
<ui:include src="/WEB-INF/jsf/common/captcha.xhtml" />
<hr/>
+ <p style="text-align: right;">
<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"/>
+</p>
</h:form>
</div>
\ No newline at end of file
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lost.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -25,8 +25,10 @@
<ui:include src="/WEB-INF/jsf/common/captcha.xhtml" />
<hr/>
+ <p style="text-align: right;">
<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"/>
+ </p>
</h:form>
</ui:define>
</ui:composition>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changeEmail.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -30,8 +30,10 @@
<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"/>
+ <p style="text-align: right;">
+ <h:commandButton id="cancel" action="editProfile" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
<h:commandButton value="Submit" action="#{editprofilemgr.changeEmail}" styleClass="portlet-form-button"/>
+ </p>
</h:form>
</ui:define>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/changePassword.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -38,8 +38,10 @@
</h:panelGrid>
<hr/>
- <h:commandButton id="cancel" action="#{editprofilemgr.viewStart}" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
+ <p style="text-align: right;">
+ <h:commandButton id="cancel" action="editProfile" value="#{bundle.IDENTITY_BUTTON_CANCEL}" immediate="true" styleClass="portlet-form-button"/>
<h:commandButton value="Submit" action="#{editprofilemgr.changePassword}" styleClass="portlet-form-button"/>
+ </p>
</h:form>
</ui:define>
Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml
===================================================================
--- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2007-09-14 13:06:36 UTC (rev 8265)
+++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2007-09-14 14:32:40 UTC (rev 8266)
@@ -11,7 +11,7 @@
<h:form>
<ul class="topnav">
<li>
- <h:commandLink value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" action="#{editprofilemgr.viewStart}"/>
+ <h:commandLink value="#{bundle.IDENTITY_VIEW_PROFILE_TITLE}" action="start"/>
</li>
<li id="currentTab"><h:outputText value="#{bundle.IDENTITY_EDIT_PROFILE_TITLE}" /></li>
</ul>
18 years, 7 months
- 1
- 0