[portal-commits] JBoss Portal SVN: r12975 - in branches/JBoss_Portal_AS5_Deployer/core-identity: src/main/org/jboss/portal/core/identity/ui/admin and 6 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Fri Mar 6 18:21:50 EST 2009
Author: mwringe
Date: 2009-03-06 18:21:50 -0500 (Fri, 06 Mar 2009)
New Revision: 12975
Added:
branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ja.properties
branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties
Modified:
branches/JBoss_Portal_AS5_Deployer/core-identity/.classpath
branches/JBoss_Portal_AS5_Deployer/core-identity/build.xml
branches/JBoss_Portal_AS5_Deployer/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java
branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties
branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties
branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties
branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml
branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml
branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/admin/roles.xhtml
branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/admin/user/confirmPendingAction.xhtml
branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/admin/user/pendingUsers.xhtml
branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/common/profile.xhtml
branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/common/register.xhtml
branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/common/userInfo.xhtml
branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfile.xhtml
Log:
Merge JBoss_Portal_Branch_2_7 changes (rev range 12254:12964) into JBoss_Portal_AS5_Deployer branch
Modified: branches/JBoss_Portal_AS5_Deployer/core-identity/.classpath
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-identity/.classpath 2009-03-06 23:21:42 UTC (rev 12974)
+++ branches/JBoss_Portal_AS5_Deployer/core-identity/.classpath 2009-03-06 23:21:50 UTC (rev 12975)
@@ -42,9 +42,7 @@
<classpathentry combineaccessrules="false" kind="src" path="/theme"/>
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar"/>
<classpathentry kind="lib" path="/thirdparty/portlet/lib/portlet-api.jar"/>
- <classpathentry kind="lib" path="/thirdparty/sun-jsf/lib/jsf-api.jar"/>
- <classpathentry kind="lib" path="/thirdparty/sun-jsf/lib/jsf-impl.jar" sourcepath="/jsf-1.2.08"/>
- <classpathentry kind="lib" path="/thirdparty/sun-jstl/lib/jstl.jar"/>
<classpathentry kind="lib" path="/thirdparty/jbpm/jpdl/lib/jbpm-jpdl.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/glassfish/jsf/lib/jsf-api.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: branches/JBoss_Portal_AS5_Deployer/core-identity/build.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-identity/build.xml 2009-03-06 23:21:42 UTC (rev 12974)
+++ branches/JBoss_Portal_AS5_Deployer/core-identity/build.xml 2009-03-06 23:21:50 UTC (rev 12975)
@@ -66,8 +66,8 @@
| Initialize the build system. Must depend on '_buildmagic:init'.
| Other targets should depend on 'init' or things will mysteriously fail.
-->
- <import file="../testsuite/imports/server-config.xml"/>
-
+ <import file="../testsuite/imports/server-config.xml"/>
+
<target name="init" unless="init.disable" depends="_buildmagic:init">
</target>
@@ -84,8 +84,8 @@
<property name="jboss-junit-configuration" value=""/>
<property name="junit.formatter.usefile" value="true"/>
- <property name="test.reports" value="${module.output}/tests"/>
-
+ <property name="test.reports" value="${module.output}/tests"/>
+
<!-- Configure thirdparty libraries -->
&libraries;
@@ -102,13 +102,12 @@
<path refid="hibernate.hibernate.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="sun.servlet.classpath"/>
- <path refid="jcaptcha.jcaptcha.classpath"/>
- <path refid="jakarta.cactus.classpath"/>
- <path refid="junit.junit.classpath"/>
- <path refid="jbpm.jpdl.classpath"/>
- <path refid="sun.jsf.classpath"/>
+ <path refid="jcaptcha.jcaptcha.classpath"/>
+ <path refid="jakarta.cactus.classpath"/>
+ <path refid="junit.junit.classpath"/>
+ <path refid="jbpm.jpdl.classpath"/>
+ <path refid="glassfish.jsf.classpath"/>
<path refid="el.el.classpath"/>
- <path refid="richfaces.richfaces.classpath"/>
<path refid="facelets.facelets.classpath"/>
<path refid="portlet.portlet.classpath"/>
<path refid="jboss/portlet.bridge.classpath"/>
@@ -126,7 +125,7 @@
<path refid="jboss.portal-theme.classpath"/>
<path refid="jboss.portal-security.classpath"/>
<path refid="jboss.portal-core.classpath"/>
- <path refid="jboss.portal-workflow.classpath"/>
+ <path refid="jboss.portal-workflow.classpath"/>
</path>
<!--+=======================================+-->
@@ -152,16 +151,16 @@
classpathref="explode.task.classpath"/>
</target>
-
+
<target name="configure-explode">
<path id="explode.task.classpath">
<pathelement location="${project.tools}/lib/explode.jar"/>
<path refid="apache.ant.classpath"/>
</path>
- <taskdef
- name="explode"
- classname="org.jboss.portal.common.ant.Explode"
- classpathref="explode.task.classpath"/>
+ <taskdef
+ name="explode"
+ classname="org.jboss.portal.common.ant.Explode"
+ classpathref="explode.task.classpath"/>
</target>
<!--+====================================================================+-->
@@ -196,55 +195,52 @@
<!-- portal-core-identity-ui-lib.jar -->
<jar jarfile="${build.lib}/portal-core-identity-ui-lib.jar">
- <fileset dir="${build.classes}" includes="org/jboss/portal/core/identity/ui/**" />
+ <fileset dir="${build.classes}" includes="org/jboss/portal/core/identity/ui/**"/>
</jar>
-
- <!-- portal-core-identity-services-lib.jar -->
- <jar jarfile="${build.lib}/portal-core-identity-services-lib.jar">
- <fileset dir="${build.classes}" includes="org/jboss/portal/core/identity/services/**" />
- </jar>
- <!-- portal-identity.war -->
- <copy todir="${build.resources}/portal-identity-war/WEB-INF/lib">
- <fileset dir="${build.lib}" includes="portal-core-identity-ui-lib.jar"/>
- <fileset dir="${sun.jstl.lib}" includes="jstl.jar"/>
+ <!-- portal-core-identity-services-lib.jar -->
+ <jar jarfile="${build.lib}/portal-core-identity-services-lib.jar">
+ <fileset dir="${build.classes}" includes="org/jboss/portal/core/identity/services/**"/>
+ </jar>
+
+ <!-- portal-identity.war -->
+ <copy todir="${build.resources}/portal-identity-war/WEB-INF/lib">
+ <fileset dir="${build.lib}" includes="portal-core-identity-ui-lib.jar"/>
+ <fileset dir="${glassfish.jstl.lib}" includes="jstl.jar"/>
<fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/>
<fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-api.jar"/>
<fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-impl.jar"/>
- <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-api.jar"/>
- <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-impl.jar"/>
- <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-ui.jar"/>
- <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/>
- <fileset dir="${apache.beanutils.lib}" includes="commons-beanutils.jar"/>
+ <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/>
+ <fileset dir="${apache.beanutils.lib}" includes="commons-beanutils.jar"/>
<fileset dir="${apache.lang.lib}" includes="commons-lang.jar"/>
<fileset dir="${apache.digester.lib}" includes="commons-digester.jar"/>
- </copy>
- <copy todir="${build.resources}/portal-identity-war">
- <fileset dir="${source.bin}/portal-identity-war"/>
- </copy>
-
+ </copy>
+ <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"/>
</copy>
<copy todir="${build.resources}/portal-identity.sar/lib">
- <fileset dir="${build.lib}" includes="portal-core-identity-services-lib.jar" />
- <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-loader-lib.jar"/>
- <fileset dir="${jcaptcha.jcaptcha.root}/lib" includes="jcaptcha.jar"/>
+ <fileset dir="${build.lib}" includes="portal-core-identity-services-lib.jar"/>
+ <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-loader-lib.jar"/>
+ <fileset dir="${jcaptcha.jcaptcha.root}/lib" includes="jcaptcha.jar"/>
</copy>
<copy todir="${build.resources}/portal-identity.sar/portal-identity.war">
<fileset dir="${build.resources}/portal-identity-war"/>
</copy>
</target>
-
+
<target name="output" depends="artifacts">
<implode
dir="${build.resources}/portal-identity.sar"
tofile="${build.lib}/portal-identity.sar"/>
- </target>
+ </target>
<!-- ================================================================== -->
<!-- Cleaning -->
@@ -288,10 +284,10 @@
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
<copy file="${build.lib}/portal-identity.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
</target>
-
+
<!--
- | Undeploy the application
- -->
+ | Undeploy the application
+ -->
<target name="undeploy"
description="Undeploy."
depends="init">
@@ -304,53 +300,54 @@
-->
<target name="package-tests" depends="init, clean-tests">
-
- <jar jarfile="${build.lib}/portal-core-identity-test-lib.jar">
+
+ <jar jarfile="${build.lib}/portal-core-identity-test-lib.jar">
<fileset dir="${build.classes}" includes="org/jboss/portal/test/**"/>
- </jar>
-
- </target>
-
+ </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}"/>
-
+ <mkdir dir="${test.reports}"/>
+
<execute-tests>
<x-test>
- <test todir="${test.reports}" name="org.jboss.portal.test.core.identity.metadata.ConfigurationTestCase"/>
+ <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-common.classpath"/>
- <path refid="jboss.portal-portlet.classpath"/>
- <path refid="jboss.portal-identity.classpath"/>
- <path refid="jboss.portal-jems.classpath"/>
- <path refid="jboss.portal-identity.classpath"/>
- <path refid="jboss.portal-test.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"/>
+ <path refid="junit.junit.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/>
+ <path refid="jbossas/core.libs.classpath"/>
+ <path refid="jboss.portal-common.classpath"/>
+ <path refid="jboss.portal-portlet.classpath"/>
+ <path refid="jboss.portal-identity.classpath"/>
+ <path refid="jboss.portal-jems.classpath"/>
+ <path refid="jboss.portal-identity.classpath"/>
+ <path refid="jboss.portal-test.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
+ Some convenience build targets to help deployment during development
-->
- <target name="deploy-ha"
- description="Deploy."
- depends="output">
- <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>
-
+ <target name="deploy-ha"
+ description="Deploy."
+ depends="output">
+ <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_AS5_Deployer/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2009-03-06 23:21:42 UTC (rev 12974)
+++ branches/JBoss_Portal_AS5_Deployer/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2009-03-06 23:21:50 UTC (rev 12975)
@@ -69,22 +69,22 @@
/** The roles */
private List<String> roles = new ArrayList<String>();
-
+
/** The node which should be displayed. */
private String displayNode = IdentityConstants.JBPM_NODE_APPROVAL;
-
+
/** The subscription mode. */
private String subscriptionMode;
-
+
/** The admin subscription mode. */
private String adminSubscriptionMode;
-
+
/** The pending users. */
private List<UserContainer> pendingUsers = null;
-
+
/** The pending list selected for approval or reject. */
private List<UserContainer> pendingActionList = null;
-
+
/** The pending user action. */
private String pendingUserAction = null;
@@ -99,16 +99,18 @@
/** The idenetity role bean. */
private IdentityRoleBean identityRoleBean;
-
+
/** The registration service. */
private RegistrationService registrationService;
/** The logger. */
private static final Logger log = Logger.getLogger(UserAdministrationBean.class);
-
+
/** The decoder. */
private static final FastURLDecoder decoder = FastURLDecoder.getUTF8Instance();
+ private boolean isNewSearch=true;
+
public UserAdministrationBean()
{
// this.userList = new ListDataModel();
@@ -172,27 +174,27 @@
{
this.uiUser = uiUser;
}
-
+
public String getSubscriptionMode()
{
return subscriptionMode;
}
-
+
public void setSubscriptionMode(String subscriptionMode)
{
this.subscriptionMode = subscriptionMode;
}
-
+
public String getAdminSubscriptionMode()
{
return adminSubscriptionMode;
}
-
+
public void setAdminSubscriptionMode(String adminSubscriptionMode)
{
this.adminSubscriptionMode = adminSubscriptionMode;
}
-
+
public IdentityUserBean getIdentityUserBean()
{
return identityUserBean;
@@ -202,7 +204,7 @@
{
return pendingUserAction;
}
-
+
public List<UserContainer> getPendingActionList()
{
return pendingActionList;
@@ -239,9 +241,22 @@
{
try
{
- int intLimit = Integer.valueOf(limit).intValue();
- int offset = page > 0 ? ((page - 1) * intLimit) : 0;
- int limit1 = intLimit + 1;
+
+ int initLimit = Integer.valueOf(limit).intValue();
+ int offset = 0;
+ if(!isNewSearch)
+ {
+ offset = page > 0 ? ((page - 1) * initLimit) : 0;
+ isNewSearch = true;
+ }
+
+ else
+ {
+ page = 1;
+ }
+
+
+ int limit1 = initLimit + 1;
this.userList = new ListDataModel(identityUserBean.findUsersFilteredByUserName(searchString, offset, limit1));
}
catch (Exception e)
@@ -262,7 +277,7 @@
String action = (String) params.get("enableAction");
ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", ctx.getViewRoot().getLocale());
this.currentUser = params.get("currentUser") != null ? decoder.encode((String) params.get("currentUser")) : null;
-
+
if (this.currentUser != null && action != null)
{
Map<String, Object> profileMap = new HashMap<String, Object>();
@@ -290,7 +305,7 @@
return "userAdmin";
}
// Updating search
- if (action.equals("enable"))
+ if (action.equals("enable"))
{
ctx.addMessage("status", new FacesMessage(bundle.getString("IDENTITY_MANAGEMENT_ENABLE_USER_ENABLED")));
}
@@ -303,7 +318,7 @@
}
return "searchUsers";
}
-
+
public int getPendingCount()
{
try
@@ -316,7 +331,7 @@
return -1;
}
}
-
+
public int getUserCount()
{
if (userCount == 0)
@@ -334,13 +349,13 @@
}
return userCount;
}
-
+
public List<UserContainer> getPendingUsers()
{
try
{
if ( this.registrationService != null && this.pendingUsers == null)
- this.pendingUsers = this.registrationService.getPendingUsers(displayNode);
+ this.pendingUsers = this.registrationService.getPendingUsers(displayNode);
}
catch (CoreIdentityConfigurationException e)
{
@@ -355,7 +370,7 @@
ExternalContext ectx = ctx.getExternalContext();
Map params = ectx.getRequestParameterMap();
this.currentUser = params.get("currentUser") != null ? decoder.encode((String) params.get("currentUser")) : null;
-
+
if (this.currentUser != null)
{
this.uiUser = new IdentityUIUser(this.currentUser);
@@ -383,21 +398,23 @@
}
return "userAdmin";
}
-
+
public String nextPage()
{
+ isNewSearch = false;
this.page++;
this.searchUsers();
return "searchUsers";
}
-
+
public String prevPage()
{
+ isNewSearch = false;
this.page--;
this.searchUsers();
return "searchUsers";
}
-
+
public String approveRegistration()
{
ExternalContext ectx = FacesContext.getCurrentInstance().getExternalContext();
@@ -430,7 +447,7 @@
else
return "userAdmin";
}
-
+
public String approveList()
{
this.pendingUserAction = "approve";
@@ -448,7 +465,7 @@
}
return "pendingUsers";
}
-
+
public String rejectList()
{
this.pendingUserAction = "reject";
@@ -466,7 +483,7 @@
}
return "pendingUsers";
}
-
+
public String confirmPendingAction()
{
try
Modified: branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2009-03-06 23:21:42 UTC (rev 12974)
+++ branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2009-03-06 23:21:50 UTC (rev 12975)
@@ -21,7 +21,7 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
-IDENTITY_APPLICATION_NOT_AVAILABLE=Porlet not available. Please check your configuration and the error log for further information.
+IDENTITY_APPLICATION_NOT_AVAILABLE=Portlet not available. Please check your configuration and the error log for further information.
IDENTITY_WELCOME=Welcome
IDENTITY_REGISTER=Register
@@ -87,7 +87,7 @@
IDENTITY_SECURITY_QUESTION=Security Question
IDENTITY_SECURITY_ANSWER=Security Answer
IDENTITY_LAST_LOGIN=Last login
-IDENTITY_REIGSTRATION_DATE=Registration Date
+IDENTITY_REGISTRATION_DATE=Registration Date
IDENTITY_ENABLED=Enabled
IDENTITY_CATEGORY_GENERAL=General Preferences
Modified: branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2009-03-06 23:21:42 UTC (rev 12974)
+++ branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2009-03-06 23:21:50 UTC (rev 12975)
@@ -233,7 +233,7 @@
IDENTITY_REGISTER_VERIFY_CAPTCHA = V\u00E9rification visuelle
-IDENTITY_REIGSTRATION_DATE = Enregistr\u00E9 le
+IDENTITY_REGISTRATION_DATE = Enregistr\u00E9 le
IDENTITY_SECURITY_ANSWER = R\u00E9ponse \u00E0 votre question de s\u00E9curit\u00E9
Modified: branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties 2009-03-06 23:21:42 UTC (rev 12974)
+++ branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties 2009-03-06 23:21:50 UTC (rev 12975)
@@ -90,7 +90,7 @@
IDENTITY_SECURITY_QUESTION=Domanda di sicurezza
IDENTITY_SECURITY_ANSWER=Risposta di sicurezza
IDENTITY_LAST_LOGIN=Ultimo login
-IDENTITY_REIGSTRATION_DATE=Data di registrazione
+IDENTITY_REGISTRATION_DATE=Data di registrazione
IDENTITY_ENABLED=Attivo
IDENTITY_CATEGORY_GENERAL=Preferenze generali
Copied: branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ja.properties (from rev 12964, branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ja.properties)
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ja.properties (rev 0)
+++ branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ja.properties 2009-03-06 23:21:50 UTC (rev 12975)
@@ -0,0 +1,187 @@
+################################################################################
+# 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_APPLICATION_NOT_AVAILABLE=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u8a2d\u5b9a\u3068\u30a8\u30e9\u30fc\u30ed\u30b0\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+
+IDENTITY_WELCOME=\u3088\u3046\u3053\u305d
+IDENTITY_REGISTER=\u767b\u9332
+IDENTITY_LOST_PASSWORD=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5fd8\u308c\u305f\u5834\u5408
+IDENTITY_NOT_LOGGED_IN=\u3042\u306a\u305f\u306f\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u3044\u307e\u305b\u3093\u3002
+IDENTITY_CREATE_ACCOUNT=\u3042\u306a\u305f\u306f\u30a2\u30ab\u30a6\u30f3\u30c8\u3092\u4f5c\u6210\u3067\u304d\u307e\u3059\u3002
+IDENTITY_BUTTON_SUBMIT=\u9001\u4fe1
+IDENTITY_BUTTON_EDIT=\u7de8\u96c6
+IDENTITY_BUTTON_CANCEL=\u30ad\u30e3\u30f3\u30bb\u30eb
+
+IDENTITY_REGISTER_TITLE=\u57fa\u672c\u30e6\u30fc\u30b6\u60c5\u5831
+IDENTITY_REGISTER_TITLE_CONFIRM=\u78ba\u8a8d
+IDENTITY_REGISTER_PASSWORD_CONFIRM=\u30d1\u30b9\u30ef\u30fc\u30c9\u78ba\u8a8d
+IDENTITY_REGISTER_STATUS_TITLE=\u767b\u9332\u30b9\u30c6\u30fc\u30bf\u30b9
+IDENTITY_REGISTER_SUCCESS_TITLE=\u3042\u306a\u305f\u306e\u30a2\u30ab\u30a6\u30f3\u30c8\u304c\u4f5c\u6210\u3055\u308c\u307e\u3057\u305f\u3002\u3042\u306a\u305f\u306f\u30ed\u30b0\u30a4\u30f3\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002
+IDENTITY_REGISTER_PENDING_TITLE=\u3042\u306a\u305f\u306e\u767b\u9332\u3092\u78ba\u8a8d\u3059\u308b\u305f\u3081\u306b\u3042\u306a\u305f\u306e\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u306b\u9001\u4fe1\u3055\u308c\u307e\u3057\u305f\u3002
+IDENTITY_REGISTER_REQUIRED_INFORMATION=\u5fc5\u9808\u306e\u30d5\u30a3\u30fc\u30eb\u30c9\u3092\u793a\u3057\u307e\u3059\u3002
+
+IDENTITY_LOST_PASSWORD_TITLE=\u3042\u306a\u305f\u306e\u30ed\u30b0\u30a4\u30f3\u60c5\u5831\u3092\u308f\u3059\u308c\u307e\u3057\u305f\u304b?
+IDENTITY_LOST_PASSWORD_DESCRIPTION=\u3042\u306a\u305f\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u30ea\u30bb\u30c3\u30c8\u3059\u308b\u305f\u3081\u306b\u3001\u3042\u306a\u305f\u306e\u30e6\u30fc\u30b6\u540d\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+IDENTITY_LOST_PASSWORD_ERROR=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u30ea\u30bb\u30c3\u30c8\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+IDENTITY_LOST_PASSWORD_STATUS_SUCCESSFUL=\u3042\u306a\u305f\u306f\u65b0\u3057\u3044\u30d1\u30b9\u30ef\u30fc\u30c9\u3092E\u30e1\u30fc\u30eb\u3067\u53d7\u3051\u53d6\u308a\u307e\u3059\u3002
+IDENTITY_LOST_PASSWORD_STATUS_404=\u307f\u3064\u304b\u308a\u307e\u305b\u3093\u3002
+IDENTITY_LOST_PASSWORD_STATUS_TITLE=Lost password
+
+IDENTITY_EDIT_PROFILE_ERROR=\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u306e\u30a8\u30e9\u30fc
+IDENTITY_EDIT_PASSWORD_TITLE=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u5909\u66f4
+IDENTITY_EDIT_PASSWORD_CURRENT=\u73fe\u5728\u306e\u30d1\u30b9\u30ef\u30fc\u30c9
+IDENTITY_EDIT_CHANGE_PASSWORD=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u5909\u66f4
+IDENTITY_EDIT_CHANGE_PASSWORD_ERROR=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5909\u66f4\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+IDENTITY_EDIT_CHANGE_PASSWOR_STATUS=\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u66f4\u65b0\u3055\u308c\u307e\u3057\u305f\u3002
+
+IDENTITY_EDIT_EMAIL_TITLE=E\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u306e\u5909\u66f4
+IDENTITY_EDIT_EMAIL_NEW=\u65b0\u3057\u3044E\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9
+IDENTITY_EDIT_CHANGE_EMAIL=E\u30e1\u30fc\u30eb\u306e\u5909\u66f4
+IDENTITY_EDIT_CHANGE_EMAIL_ERROR=E\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3092\u5909\u66f4\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+IDENTITY_EDIT_CHANGE_EMAIL_STATUS_PENDING=\u78ba\u8a8d\u306e\u305f\u3081\u306eE\u30e1\u30fc\u30eb\u304c\u3001\u3042\u306a\u305f\u306e\u30a2\u30c9\u30ec\u30b9\u306b\u9001\u3089\u308c\u307e\u3057\u305f\u3002
+IDENTITY_EDIT_CHANGE_EMAIL_STATUS_CHANGED=\u3042\u306a\u305f\u306eE\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u304c\u5909\u66f4\u3055\u308c\u307e\u3057\u305f\u3002
+
+IDENTITY_EDIT_PROFILE_TITLE=\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u306e\u7de8\u96c6
+IDENTITY_VIEW_PROFILE_TITLE=\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u306e\u89b3\u89a7
+
+IDENTITY_USERNAME=\u30e6\u30fc\u30b6\u540d
+IDENTITY_PASSWORD=\u30d1\u30b9\u30ef\u30fc\u30c9
+IDENTITY_EMAIL=E\u30e1\u30fc\u30eb
+IDENTITY_GIVENNAME=\u540d\u524d
+IDENTITY_FAMILYNAME=\u540d\u5b57
+IDENTITY_SKYPE=Skype ID
+IDENTITY_LOCATION=\u52e4\u52d9\u5730
+IDENTITY_OCCUPATION=\u696d\u52d9
+IDENTITY_EXTRA=Extra
+IDENTITY_SIGNATURE=Signature
+IDENTITY_INTERESTS=Interests
+IDENTITY_LOCALE=LOCALE
+IDENTITY_ICQ=Icq ID
+IDENTITY_AIM=Aim ID
+IDENTITY_MSNM= MSN messenger ID
+IDENTITY_YIM=Yahoo ID
+IDENTITY_XMMP=Xmmp ID
+IDENTITY_HOMEPAGE=\u30db\u30fc\u30e0\u30da\u30fc\u30b8
+IDENTITY_TIMEZONE=\u30bf\u30a4\u30e0\u30be\u30fc\u30f3\u30aa\u30d5\u30bb\u30c3\u30c8
+IDENTITY_THEME=\u30c6\u30fc\u30de
+IDENTITY_SECURITY_QUESTION=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u8cea\u554f
+IDENTITY_SECURITY_ANSWER=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u56de\u7b54
+IDENTITY_LAST_LOGIN=\u6700\u7d42\u30ed\u30b0\u30a4\u30f3
+IDENTITY_REIGSTRATION_DATE=\u767b\u9332\u65e5
+IDENTITY_ENABLED=\u6a29\u9650
+
+IDENTITY_CATEGORY_GENERAL=\u5168\u822c\u306e\u8a2d\u5b9a
+IDENTITY_CATEGORY_PERSONAL=\u500b\u4eba\u60c5\u5831
+IDENTITY_CATEGORY_INSTANT=\u30a4\u30f3\u30b9\u30bf\u30f3\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8\u30a2\u30a4\u30c7\u30f3\u30c6\u30a3\u30c6\u30a3
+IDENTITY_CATEGORY_ADDITIONAL=\u8ffd\u52a0\u60c5\u5831
+
+IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE=(\u6700\u5927 255 \u6587\u5b57\u306e\u7f72\u540d)
+IDENTITY_CATEGORY_ADDITIONAL_EXTRA=(\u6700\u5927 255 \u6587\u5b57)
+
+IDENTITY_MANAGEMENT_ACTION=\u30a2\u30af\u30b7\u30e7\u30f3
+IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE=\u30e6\u30fc\u30b6\u306e\u7de8\u96c6
+IDENTITY_MANAGEMENT_ACTION_ROLES=\u30ed\u30fc\u30eb
+IDENTITY_MANAGEMENT_ACTION_DELETE=\u524a\u9664
+IDENTITY_MANAGEMENT_USER_MANAGEMENT=\u30e6\u30fc\u30b6\u7ba1\u7406
+IDENTITY_MANAGEMENT_ROLE_MANAGEMENT=\u30ed\u30fc\u30eb\u7ba1\u7406
+IDENTITY_MANAGEMENT_SEARCH_USER=\u30e6\u30fc\u30b6\u691c\u7d22
+IDENTITY_MANAGEMENT_CREATE_USER=\u65b0\u3057\u3044\u30e6\u30fc\u30b6\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u4f5c\u6210
+IDENTITY_MANAGEMENT_CREATE_USER_CREATED=\u30e6\u30fc\u30b6\u304c\u4f5c\u6210\u3055\u308c\u307e\u3057\u305f\u3002
+IDENTITY_MANAGEMENT_USER_DELETED=\u524a\u9664\u3055\u308c\u305f\u30e6\u30fc\u30b6
+IDENTITY_MANAGEMENT_ROLE=\u30ed\u30fc\u30eb
+IDENTITY_MANAGEMENT_ROLE_DISPLAY=\u8868\u793a\u540d
+IDENTITY_MANAGEMENT_ROLE_MEMBERS=\u30e1\u30f3\u30d0\u30fc
+IDENTITY_MANAGEMENT_ROLE_ASSIGNED=\u30a2\u30b5\u30a4\u30f3\u30ed\u30fc\u30eb
+IDENTITY_MANAGEMENT_CREATE_ROLE=\u65b0\u3057\u3044\u30ed\u30fc\u30eb\u306e\u4f5c\u6210
+IDENTITY_MANAGEMENT_EDIT_ROLE=\u30ed\u30fc\u30eb\u306e\u7de8\u96c6
+IDENTITY_MANAGEMENT_CREATE_ROLE=\u30ed\u30fc\u30eb\u306e\u4f5c\u6210
+IDENTITY_MANAGEMENT_DISABLE=\u7121\u52b9
+IDENTITY_MANAGEMENT_DISABLE_USER_DISABLED=\u7121\u52b9\u306b\u306a\u3063\u305f\u30e6\u30fc\u30b6
+IDENTITY_MANAGEMENT_ENABLE=\u6709\u52b9
+IDENTITY_MANAGEMENT_ENABLE_USER_ENABLED=\u6709\u52b9\u306b\u306a\u3063\u305f\u30e6\u30fc\u30b6
+IDENTITY_MANAGEMENT_RESET_PASSWORD=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u30ea\u30bb\u30c3\u30c8
+IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=\u30e6\u30fc\u30b6\u306e\u305f\u3081\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u30ea\u30bb\u30c3\u30c8
+IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=\u30e9\u30f3\u30c0\u30e0\u306a\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u30e6\u30fc\u30b6\u306eE\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u306b\u9001\u4fe1\u3057\u307e\u3059\u3002
+IDENTITY_MANAGEMENT_ASSIGN_ROLES=\u30a2\u30b5\u30a4\u30f3\u30ed\u30fc\u30eb
+IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=\u30da\u30f3\u30c7\u30a3\u30f3\u30b0\u4e2d\u306e\u30e6\u30fc\u30b6
+IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=\u767b\u9332\u3055\u308c\u305f\u30e6\u30fc\u30b6
+IDENTITY_MANAGEMENT_APPROVE_ALL=\u9078\u629e\u3055\u308c\u305f\u627f\u8a8d
+IDENTITY_MANAGEMENT_REJECT_ALL=\u9078\u629e\u3055\u308c\u305f\u5426\u8a8d
+IDENTITY_MANAGEMENT_SELECT_ALL=\u3059\u3079\u3066\u9078\u629e
+IDENTITY_MANAGEMENT_UNSELECT_ALL=\u3059\u3079\u3066\u672a\u9078\u629e
+IDENTITY_MANAGEMENT_MATRIX=\u30de\u30c8\u30ea\u30c3\u30af\u30b9
+IDENTITY_MANAGEMENT_SUBSCRIPTION_MODES=\u8cfc\u8aad\u30e2\u30fc\u30c9
+
+IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS=\u30da\u30f3\u30c7\u30a3\u30f3\u30b0\u4e2d\u306e\u767b\u9332
+IDENTITY_MANAGEMENT_PENDING_BPM_ID=Id
+IDENTITY_MANAGEMENT_PENDING_APPROVE=\u627f\u8a8d
+IDENTITY_MANAGEMENT_PENDING_REJECT=\u5426\u8a8d
+
+IDENTITY_MANAGEMENT_SUBSCRIPTION_MODE=\u8cfc\u8aad\u30e2\u30fc\u30c9
+IDENTITY_MANAGEMENT_SUBSCRIPTION_ADMIN_MODE=\u7ba1\u7406\u8cfc\u8aad\u30e2\u30fc\u30c9
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM=\u30ab\u30b9\u30bf\u30e0\u8cfc\u8aad\u30e2\u30fc\u30c9
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC=\u81ea\u52d5 - \u30e1\u30fc\u30eb\u78ba\u8a8d\u306a\u3057\u3001\u7ba1\u7406\u8005\u627f\u8a8d\u306a\u3057.
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL=\u30e1\u30fc\u30eb\u78ba\u8a8d\u3042\u308a\u3001\u7ba1\u7406\u8005\u627f\u8a8d\u306a\u3057.
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN=\u30e1\u30fc\u30eb\u78ba\u8a8d\u3042\u308a\u3001\u7ba1\u7406\u8005\u627f\u8a8d\u3042\u308a.
+
+IDENTITY_REGISTER_VERIFY_CAPTCHA=captcha \u306e\u78ba\u8a8d
+IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=\u78ba\u8a8d: \u524a\u9664
+IDENTITY_WARNING_CONFIRM_DELETE_USER=\u8b66\u544a! \u3042\u306a\u305f\u306f\u3053\u306e\u30e6\u30fc\u30b6\u3092\u524a\u9664\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307e\u3059
+IDENTITY_WARNING_CONFIRM_DELETE_ROLE=\u8b66\u544a! \u3042\u306a\u305f\u306f\u3053\u306e\u30ed\u30fc\u30eb\u3092\u524a\u9664\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307e\u3059
+IDENTITY_REGISTER_CONFIRMATIONEMAIL=\u8cfc\u8aad\u306e\u78ba\u8a8d
+
+IDENTITY_MAIL_SUBJECT_LOST_PASSWORD=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u30ea\u30bb\u30c3\u30c8\u3057\u307e\u3059\u3002
+IDENTITY_MAIL_SUBJECT_REGISTER=\u767b\u9332\u78ba\u8a8d
+IDENTITY_MAIL_SUBJECT_CHANGE_EMAIL=E\u30e1\u30fc\u30eb\u78ba\u8a8d
+
+IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE=\u30ed\u30fc\u30eb\u306b\u5bfe\u3057\u3066\u30a2\u30af\u30b7\u30e7\u30f3\u3092\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u8a73\u3057\u304f\u306f\u30ed\u30b0\u30d5\u30a1\u30a4\u30eb\u3092\u3054\u89a7\u304f\u3060\u3055\u3044\u3002
+IDENTITY_MANAGEMENT_ERROR_ACTION_USER=\u30e6\u30fc\u30b6\u306b\u5bfe\u3057\u3066\u30a2\u30af\u30b7\u30e7\u30f3\u3092\u5b9f\u884c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u8a73\u3057\u304f\u306f\u30ed\u30b0\u30d5\u30a1\u30a4\u30eb\u3092\u3054\u89a7\u304f\u3060\u3055\u3044\u3002
+
+IDENTITY_VERIFICATION_RETURN=\u30dd\u30fc\u30bf\u30eb\u306b\u623b\u308b
+IDENTITY_VERIFICATION_LOGIN=\u30ed\u30b0\u30a4\u30f3
+IDENTITY_VERIFICATION_STATUS_EROOR=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u306e\u30a8\u30e9\u30fc\u3002
+IDENTITY_VERIFICATION_STATUS_FAILED=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3092\u691c\u8a3c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+IDENTITY_VERIFICATION_STATUS_VALIDATED=\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u306f\u691c\u8a3c\u3055\u308c\u307e\u3057\u305f\u3002
+IDENTITY_VERIFICATION_STATUS_REGISTER_SUCCESS=\u3042\u306a\u305f\u306e\u30a2\u30ab\u30a6\u30f3\u30c8\u306f\u30a2\u30af\u30c6\u30a3\u30d9\u30fc\u30c8\u3055\u308c\u3001\u30ed\u30b0\u30a4\u30f3\u53ef\u80fd\u306b\u306a\u308a\u307e\u3057\u305f\u3002
+IDENTITY_VERIFICATION_STATUS_REGISTER_APPROVAL=\u3042\u306a\u305f\u306e\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u306f\u691c\u8a3c\u3055\u308c\u307e\u3057\u305f\u3001\u73fe\u5728\u7ba1\u7406\u8005\u306e\u627f\u8a8d\u5f85\u3061\u3067\u3059\u3002
+IDENTITY_VERIFICATION_STATUS_REGISTER_CUSTOM=\u3042\u306a\u305f\u306e\u30a2\u30ab\u30a6\u30f3\u30c8\u306f\u30a2\u30af\u30c6\u30a3\u30d9\u30fc\u30c8\u3055\u308c\u3001\u30ed\u30b0\u30a4\u30f3\u53ef\u80fd\u306b\u306a\u308a\u307e\u3057\u305f\u3002
+
+IDENTITY_VALIDATION_ERROR_REGISTRATION=\u30e6\u30fc\u30b6\u306e\u767b\u9332\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN=\u3053\u306e\u30e6\u30fc\u30b6\u540d\u306f\u65e2\u306b\u4f7f\u308f\u308c\u3066\u3044\u307e\u3059\u3002
+IDENTITY_VALIDATION_ERROR_USERNAME_ERROR=\u30e6\u30fc\u30b6\u540d\u306e\u30a8\u30e9\u30fc\u3002
+IDENTITY_VALIDATION_ERROR_ROLENAME_TAKEN=\u3053\u306e\u30ed\u30fc\u30eb\u540d\u306f\u65e2\u306b\u4f7f\u308f\u308c\u3066\u3044\u307e\u3059.
+IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR=\u30ed\u30fc\u30eb\u59ea\u306e\u30a8\u30e9\u30fc\u3002
+IDENTITY_VALIDATION_ERROR_PASSWORD_DOESNT_MATCH=\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002
+IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u30a8\u30e9\u30fc\u3002
+IDENTITY_VALIDATION_ERROR_INVALID_EMAIL=\u7121\u52b9\u306aE\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3067\u3059\u3002
+IDENTITY_VALIDATION_ERROR_INVALID_PASSWORD=\u7121\u52b9\u306a\u30d1\u30b9\u30ef\u30fc\u30c9\u3067\u3059\u3002
+IDENTITY_VALIDATION_ERROR_CAPTCHA_INCORRECT=Captcha \u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002
+
+# Example usage for dynamic values
+IDENTITY_DYNAMIC_VALUE_TEST=\u30c6\u30b9\u30c8\u30e9\u30d9\u30eb
+IDENTITY_DYNAMIC_VALUE_TEST2=\u30c6\u30b9\u30c8\u30e9\u30d9\u30eb\uff12
+
+javax.portlet.title=\u30e6\u30fc\u30b6\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb
+javax.portlet.keywords=\u7ba1\u7406,\u30e6\u30fc\u30b6
+
+javax.faces.component.UIInput.REQUIRED=\u5fc5\u9808\u5024\u3067\u3059
Copied: branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties (from rev 12964, branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties)
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties (rev 0)
+++ branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties 2009-03-06 23:21:50 UTC (rev 12975)
@@ -0,0 +1,187 @@
+################################################################################
+# 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_APPLICATION_NOT_AVAILABLE=Porlet n\u00e3o dispon\u00edvel. Verifique sua configura\u00e7\u00e3o e log de erro para mais informa\u00e7\u00f5es.
+
+IDENTITY_WELCOME=Bem-vindo
+IDENTITY_REGISTER=Registrar
+IDENTITY_LOST_PASSWORD=Esqueceu Senha
+IDENTITY_NOT_LOGGED_IN=Voc\u00ea n\u00e3o est\u00e1 autenticado no portal.
+IDENTITY_CREATE_ACCOUNT=Voc\u00ea pode criar uma conta.
+IDENTITY_BUTTON_SUBMIT=Enviar
+IDENTITY_BUTTON_EDIT=Editar
+IDENTITY_BUTTON_CANCEL=Cancelar
+
+IDENTITY_REGISTER_TITLE=Informa\u00e7\u00f5es b\u00e1sicas do usu\u00e1rio
+IDENTITY_REGISTER_TITLE_CONFIRM=Confirma\u00e7\u00e3o
+IDENTITY_REGISTER_PASSWORD_CONFIRM=Confirme a Senha
+IDENTITY_REGISTER_STATUS_TITLE=Status do registro
+IDENTITY_REGISTER_SUCCESS_TITLE=Sua conta foi criada com \u00eaxito. Voc\u00ea pode autenticar-se agora.
+IDENTITY_REGISTER_PENDING_TITLE=Um e-mail foi enviado ao seu endere\u00e7o de e-mail para confirmar o seu registro.
+IDENTITY_REGISTER_REQUIRED_INFORMATION=indica um campo obrigat\u00f3rio.
+
+IDENTITY_LOST_PASSWORD_TITLE=Esqueceu seu dados de login?
+IDENTITY_LOST_PASSWORD_DESCRIPTION=Digite seu nome de usu\u00e1rio para redefinir sua senha.
+IDENTITY_LOST_PASSWORD_ERROR=Falha na redefini\u00e7\u00e3o de senha.
+IDENTITY_LOST_PASSWORD_STATUS_SUCCESSFUL=Voc\u00ea receber\u00e1 um e-mail com sua nova senha.
+IDENTITY_LOST_PASSWORD_STATUS_404=Nenhuma conta encontrada.
+IDENTITY_LOST_PASSWORD_STATUS_TITLE=Esqueceu senha
+
+IDENTITY_EDIT_PROFILE_ERROR=Erro ao atualizar o perfil.
+IDENTITY_EDIT_PASSWORD_TITLE=Altere a sua senha
+IDENTITY_EDIT_PASSWORD_CURRENT=Senha atual
+IDENTITY_EDIT_CHANGE_PASSWORD=Alterar senha
+IDENTITY_EDIT_CHANGE_PASSWORD_ERROR=N\u00e3o foi poss\u00edvel alterar a senha.
+IDENTITY_EDIT_CHANGE_PASSWOR_STATUS=A senha foi atualizada.
+
+IDENTITY_EDIT_EMAIL_TITLE=Alterar o seu endere\u00e7o de e-mail
+IDENTITY_EDIT_EMAIL_NEW=Novo endere\u00e7o de e-mail
+IDENTITY_EDIT_CHANGE_EMAIL=Mudar e-mail
+IDENTITY_EDIT_CHANGE_EMAIL_ERROR=N\u00e3o foi poss\u00edvel mudar o endere\u00e7o de e-mail
+IDENTITY_EDIT_CHANGE_EMAIL_STATUS_PENDING=Uma valida\u00e7\u00e3o de e-mail foi enviada ao seu endere\u00e7o.
+IDENTITY_EDIT_CHANGE_EMAIL_STATUS_CHANGED=Seu endere\u00e7o de e-mail foi alterado.
+
+IDENTITY_EDIT_PROFILE_TITLE=Editar o perfil
+IDENTITY_VIEW_PROFILE_TITLE=Ver perfil
+
+IDENTITY_USERNAME=Nome de usu\u00e1rio
+IDENTITY_PASSWORD=Senha
+IDENTITY_EMAIL=E-Mail
+IDENTITY_GIVENNAME=Primeiro Nome
+IDENTITY_FAMILYNAME=\u00daltimo Nome
+IDENTITY_SKYPE=Identificador Skype
+IDENTITY_LOCATION=Local
+IDENTITY_OCCUPATION=Ocupa\u00e7\u00e3o
+IDENTITY_EXTRA=Adicional
+IDENTITY_SIGNATURE=Assinatura
+IDENTITY_INTERESTS=Interesses
+IDENTITY_LOCALE=Localidade
+IDENTITY_ICQ=Identificador Icq
+IDENTITY_AIM=Identificador Aim
+IDENTITY_MSNM=Identificador MSN messenger
+IDENTITY_YIM=Identificador Yahoo
+IDENTITY_XMMP=Identificador Xmmp
+IDENTITY_HOMEPAGE=P\u00e1gina inicial
+IDENTITY_TIMEZONE=Fuso hor\u00e1rio
+IDENTITY_THEME=Tema
+IDENTITY_SECURITY_QUESTION=Pergunta de seguran\u00e7a
+IDENTITY_SECURITY_ANSWER=Resposta de seguran\u00e7a
+IDENTITY_LAST_LOGIN=\u00daltimo acesso
+IDENTITY_REIGSTRATION_DATE=Data de Registro
+IDENTITY_ENABLED=Ativado
+
+IDENTITY_CATEGORY_GENERAL=Prefer\u00eancias Gerais
+IDENTITY_CATEGORY_PERSONAL=Informa\u00e7\u00f5es Pessoais
+IDENTITY_CATEGORY_INSTANT=Identidades de Mensagens Instant\u00e2neas
+IDENTITY_CATEGORY_ADDITIONAL=Informa\u00e7\u00f5es Adicionais
+
+IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE=(Assinatura de ,no m\u00e1ximo, 255 caracteres)
+IDENTITY_CATEGORY_ADDITIONAL_EXTRA=(m\u00e1ximo de 255 caracteres)
+
+IDENTITY_MANAGEMENT_ACTION=A\u00e7\u00f5es
+IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE=Editar usu\u00e1rio
+IDENTITY_MANAGEMENT_ACTION_ROLES=Perfis
+IDENTITY_MANAGEMENT_ACTION_DELETE=Excluir
+IDENTITY_MANAGEMENT_USER_MANAGEMENT=Gerenciamento de usu\u00e1rios
+IDENTITY_MANAGEMENT_ROLE_MANAGEMENT=Gerenciamento de perfis
+IDENTITY_MANAGEMENT_SEARCH_USER=Pesquisar usu\u00e1rios
+IDENTITY_MANAGEMENT_CREATE_USER=Criar uma nova conta de usu\u00e1rio
+IDENTITY_MANAGEMENT_CREATE_USER_CREATED=Usu\u00e1rio criado
+IDENTITY_MANAGEMENT_USER_DELETED=Usu\u00e1rio exclu\u00eddo
+IDENTITY_MANAGEMENT_ROLE=Perfil
+IDENTITY_MANAGEMENT_ROLE_DISPLAY=Nome de exibi\u00e7\u00e3o
+IDENTITY_MANAGEMENT_ROLE_MEMBERS=Usu\u00e1rios
+IDENTITY_MANAGEMENT_ROLE_ASSIGNED=Perfis atribu\u00eddos
+IDENTITY_MANAGEMENT_CREATE_ROLE=Criar novo perfil
+IDENTITY_MANAGEMENT_EDIT_ROLE=Editar perfil
+IDENTITY_MANAGEMENT_CREATE_ROLE=Criar perfil
+IDENTITY_MANAGEMENT_DISABLE=Desabilitar
+IDENTITY_MANAGEMENT_DISABLE_USER_DISABLED=Usua\u0155io desabilitado
+IDENTITY_MANAGEMENT_ENABLE=Habilitar
+IDENTITY_MANAGEMENT_ENABLE_USER_ENABLED=Usu\u00e1rio habilitado
+IDENTITY_MANAGEMENT_RESET_PASSWORD=Redefinir senha
+IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=Redefinir senha para o usu\u00e1rio
+IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=O usu\u00e1rio receber\u00e1 uma senha aleat\u00f3ria enviada ao seu endere\u00e7o de e-mail.
+IDENTITY_MANAGEMENT_ASSIGN_ROLES=Atribuir perfis
+IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=Usu\u00e1rios pendentes
+IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=Usu\u00e1rios registrados
+IDENTITY_MANAGEMENT_APPROVE_ALL=Aprovar selecionados
+IDENTITY_MANAGEMENT_REJECT_ALL=Rejeitar selecionados
+IDENTITY_MANAGEMENT_SELECT_ALL=Selecionar todos
+IDENTITY_MANAGEMENT_UNSELECT_ALL=Deselecionar todos
+IDENTITY_MANAGEMENT_MATRIX=Matrix
+IDENTITY_MANAGEMENT_SUBSCRIPTION_MODES=Modos de Assinatura
+
+IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS=Registros pendentes
+IDENTITY_MANAGEMENT_PENDING_BPM_ID=Id
+IDENTITY_MANAGEMENT_PENDING_APPROVE=Aprovar
+IDENTITY_MANAGEMENT_PENDING_REJECT=Rejeitar
+
+IDENTITY_MANAGEMENT_SUBSCRIPTION_MODE=Modo de assinatura
+IDENTITY_MANAGEMENT_SUBSCRIPTION_ADMIN_MODE=Administrador Modo de assinatura
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM=Modo de assinatura personalizado.
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC=Autom\u00e1tica - nenhuma valida\u00e7\u00e3o de e-mail, nenhuma aprova\u00e7\u00e3o do administrador.
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL=Valida\u00e7\u00e3o de E-Mail, nenhuma aprova\u00e7\u00e3o do administrador.
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN=Valida\u00e7\u00e3o de E-Mail, e aprova\u00e7\u00e3o do administrador.
+
+IDENTITY_REGISTER_VERIFY_CAPTCHA=Verifique a imagem de seguran\u00e7a
+IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirma\u00e7\u00e3o: Excluir
+IDENTITY_WARNING_CONFIRM_DELETE_USER=Aten\u00e7\u00e3o! Deseja excluir usu\u00e1rio
+IDENTITY_WARNING_CONFIRM_DELETE_ROLE=Aten\u00e7\u00e3o! Deseja excluir perfil
+IDENTITY_REGISTER_CONFIRMATIONEMAIL=Confirme a sua inscri\u00e7\u00e3o
+
+IDENTITY_MAIL_SUBJECT_LOST_PASSWORD=Redefinir a sua senha
+IDENTITY_MAIL_SUBJECT_REGISTER=Confirmar inscri\u00e7\u00e3o
+IDENTITY_MAIL_SUBJECT_CHANGE_EMAIL=Confirmar endere\u00e7o de e-mail
+
+IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE=N\u00e3o foi poss\u00edvel executar nesse perfil. Por favor, d\u00ea uma olhada no arquivo de log para mais informa\u00e7\u00f5es.
+IDENTITY_MANAGEMENT_ERROR_ACTION_USER=N\u00e3o foi poss\u00edvel executar nesse usu\u00e1rio. Por favor, d\u00ea uma olhada no arquivo de log para mais informa\u00e7\u00f5es.
+
+IDENTITY_VERIFICATION_RETURN=Voltar ao portal
+IDENTITY_VERIFICATION_LOGIN=Entrar
+IDENTITY_VERIFICATION_STATUS_EROOR=Erro durante a valida\u00e7\u00e3o de endere\u00e7o de e-mail.
+IDENTITY_VERIFICATION_STATUS_FAILED=N\u00e3o \u00e9 poss\u00edvel validar o endere\u00e7o de e-mail.
+IDENTITY_VERIFICATION_STATUS_VALIDATED=E-mail validado.
+IDENTITY_VERIFICATION_STATUS_REGISTER_SUCCESS=Sua conta foi ativada. Voc\u00ea poder\u00e1 entrar agora.
+IDENTITY_VERIFICATION_STATUS_REGISTER_APPROVAL=Seu endere\u00e7o de e-mail foi validado, mas sua conta precisa ser aprovada pelo administrador.
+IDENTITY_VERIFICATION_STATUS_REGISTER_CUSTOM=Sua conta foi ativada. Voc\u00ea poder\u00e1 entrar agora.
+
+IDENTITY_VALIDATION_ERROR_REGISTRATION=Falha no registro do usu\u00e1rio.
+IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN=Esse nome de usu\u00e1rio j\u00e1 est\u00e1 em uso.
+IDENTITY_VALIDATION_ERROR_USERNAME_ERROR=Erro ao validar o nome de usu\u00e1rio.
+IDENTITY_VALIDATION_ERROR_ROLENAME_TAKEN=Esse nome de perfil j\u00e1 est\u00e1 em uso.
+IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR=Erro ao validar o nome do perfil.
+IDENTITY_VALIDATION_ERROR_PASSWORD_DOESNT_MATCH=As senhas n\u00e3o conferem.
+IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR=Erro durante a valida\u00e7\u00e3o de senha.
+IDENTITY_VALIDATION_ERROR_INVALID_EMAIL=E-mail inv\u00e1lido.
+IDENTITY_VALIDATION_ERROR_INVALID_PASSWORD=Senha inv\u00e1lida
+IDENTITY_VALIDATION_ERROR_CAPTCHA_INCORRECT=Imagem de seguran\u00e7a inv\u00e1lida
+
+# Example usage for dynamic values
+IDENTITY_DYNAMIC_VALUE_TEST=test label
+IDENTITY_DYNAMIC_VALUE_TEST2=test label2
+
+javax.portlet.title=Perfil de Usu\u00e1rio
+javax.portlet.keywords=management,user
+
+javax.faces.component.UIInput.REQUIRED=Value is required
\ No newline at end of file
Modified: branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties 2009-03-06 23:21:42 UTC (rev 12974)
+++ branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties 2009-03-06 23:21:50 UTC (rev 12975)
@@ -87,7 +87,7 @@
IDENTITY_SECURITY_QUESTION=\u0421\u0435\u043a\u0440\u0435\u0442\u043d\u044b\u0439 \u0432\u043e\u043f\u0440\u043e\u0441
IDENTITY_SECURITY_ANSWER=\u041e\u0442\u0432\u0435\u0442 \u043d\u0430 \u0441\u0435\u043a\u0440\u0435\u0442\u043d\u044b\u0439 \u0432\u043e\u043f\u0440\u043e\u0441
IDENTITY_LAST_LOGIN=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0439 \u0432\u0445\u043e\u0434 \u0441 \u0441\u0438\u0441\u0442\u0435\u043c\u0443
-IDENTITY_REIGSTRATION_DATE=\u0414\u0430\u0442\u0430 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438
+IDENTITY_REGISTRATION_DATE=\u0414\u0430\u0442\u0430 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438
IDENTITY_ENABLED=\u0410\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u043d\u043e
IDENTITY_CATEGORY_GENERAL=\u041e\u0441\u043d\u043e\u0432\u043d\u044b\u0435 \u043f\u0440\u0435\u0434\u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438
Modified: branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2009-03-06 23:21:42 UTC (rev 12974)
+++ branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2009-03-06 23:21:50 UTC (rev 12975)
@@ -39,6 +39,9 @@
<default-locale>en</default-locale>
<supported-locale>it</supported-locale>
<supported-locale>ru</supported-locale>
+ <supported-locale>ja</supported-locale>
+ <supported-locale>pt_BR</supported-locale>
+ <supported-locale>fr</supported-locale>
</locale-config>
<message-bundle>conf.bundles.Identity</message-bundle>
</application>
Modified: branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml 2009-03-06 23:21:42 UTC (rev 12974)
+++ branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/WEB-INF/jboss-portlet.xml 2009-03-06 23:21:50 UTC (rev 12975)
@@ -35,9 +35,6 @@
<trans-attribute>Required</trans-attribute>
</transaction>
<header-content>
- <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript"></script>
- <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript"></script>
- <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss"/>
<link rel="stylesheet" type="text/css" href="/style.css" media="screen"/>
</header-content>
<portlet-info>
@@ -56,9 +53,6 @@
<trans-attribute>Required</trans-attribute>
</transaction>
<header-content>
- <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript"></script>
- <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript"></script>
- <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss"/>
<link rel="stylesheet" type="text/css" href="/style.css" media="screen"/>
</header-content>
<portlet-info>
Modified: branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2009-03-06 23:21:42 UTC (rev 12974)
+++ branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2009-03-06 23:21:50 UTC (rev 12975)
@@ -50,6 +50,7 @@
<supported-locale>ru</supported-locale>
<supported-locale>en</supported-locale>
<supported-locale>it</supported-locale>
+ <supported-locale>pt_BR</supported-locale>
<resource-bundle>conf.bundles.Identity</resource-bundle>
<portlet-preferences>
<preference>
@@ -98,6 +99,7 @@
<supported-locale>fr</supported-locale>
<supported-locale>en</supported-locale>
<supported-locale>it</supported-locale>
+ <supported-locale>pt_BR</supported-locale>
<portlet-info>
<title>User management portlet</title>
<keywords>management,admin</keywords>
Modified: branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml 2009-03-06 23:21:42 UTC (rev 12974)
+++ branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml 2009-03-06 23:21:50 UTC (rev 12975)
@@ -1,24 +1,24 @@
<?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 ~
+ ~ Copyright 2009, 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. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
@@ -29,11 +29,6 @@
version="2.4">
<context-param>
- <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
- <param-value>org.jboss.portletbridge.application.FaceletPortletViewHandler</param-value>
- </context-param>
-
- <context-param>
<param-name>javax.portlet.faces.renderPolicy</param-name>
<param-value>ALWAYS_DELEGATE</param-value>
</context-param>
@@ -43,30 +38,10 @@
<param-value>true</param-value>
</context-param>
- <context-param>
- <param-name>org.ajax4jsf.RESOURCE_URI_PREFIX</param-name>
- <param-value>rfRes</param-value>
- </context-param>
-
- <context-param>
- <param-name>org.richfaces.LoadStyleStrategy</param-name>
- <param-value>NONE</param-value>
- </context-param>
-
- <context-param>
- <param-name>org.richfaces.LoadScriptStrategy</param-name>
- <param-value>NONE</param-value>
- </context-param>
-
- <context-param>
- <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name>
- <param-value>false</param-value>
- </context-param>
-
<!-- Facelet configuration -->
<context-param>
<param-name>facelets.DEVELOPMENT</param-name>
- <param-value>true</param-value>
+ <param-value>false</param-value>
</context-param>
<context-param>
<param-name>facelets.SKIP_COMMENTS</param-name>
@@ -87,19 +62,6 @@
<param-value>server</param-value>
</context-param>
- <filter>
- <display-name>Ajax4jsf Filter</display-name>
- <filter-name>ajax4jsf</filter-name>
- <filter-class>org.ajax4jsf.Filter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>ajax4jsf</filter-name>
- <servlet-name>Faces Servlet</servlet-name>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>REQUEST</dispatcher>
- <dispatcher>INCLUDE</dispatcher>
- </filter-mapping>
-
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
@@ -110,15 +72,15 @@
<servlet-name>Faces Servlet</servlet-name>
<url-pattern>/faces/*</url-pattern>
</servlet-mapping>
-
+
<!-- Captcha Servlet and Mapping -->
<servlet>
- <servlet-name>jcaptcha</servlet-name>
- <servlet-class>org.jboss.portal.core.identity.services.captcha.ImageCaptchaServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>jcaptcha</servlet-name>
- <url-pattern>/jcaptcha</url-pattern>
- </servlet-mapping>
+ <servlet-name>jcaptcha</servlet-name>
+ <servlet-class>org.jboss.portal.core.identity.services.captcha.ImageCaptchaServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>jcaptcha</servlet-name>
+ <url-pattern>/jcaptcha</url-pattern>
+ </servlet-mapping>
</web-app>
Modified: branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/admin/roles.xhtml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/admin/roles.xhtml 2009-03-06 23:21:42 UTC (rev 12974)
+++ branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/admin/roles.xhtml 2009-03-06 23:21:50 UTC (rev 12975)
@@ -18,6 +18,12 @@
<h:messages style="list-style:none" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
<br/>
+
+<h:form id="create-role-form">
+ <p style="text-align: ldeft;">
+ <h:commandLink id="create-role-link" value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}" action="createRole" styleClass="actionCreateInstance"/>
+ </p>
+</h:form>
<h:form id="roles-form">
@@ -53,12 +59,8 @@
</h:column>
</h:dataTable>
</h:form>
+ <hr/>
- <hr/>
- <h:form id="create-role-form">
- <p style="text-align: right; padding-right: 5px;">
- <h:commandLink id="create-role-link" value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}" action="createRole" styleClass="actionCreateInstance"/></p>
- </h:form>
</ui:define>
</ui:composition>
</div>
Modified: branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/admin/user/confirmPendingAction.xhtml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/admin/user/confirmPendingAction.xhtml 2009-03-06 23:21:42 UTC (rev 12974)
+++ branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/admin/user/confirmPendingAction.xhtml 2009-03-06 23:21:50 UTC (rev 12975)
@@ -53,7 +53,7 @@
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="#{bundle.IDENTITY_REIGSTRATION_DATE}"/>
+ <h:outputText value="#{bundle.IDENTITY_REGISTRATION_DATE}"/>
</f:facet>
<h:outputText value="#{user.registrationDate}">
<f:convertDateTime dateStyle="medium" type="both" />
Modified: branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/admin/user/pendingUsers.xhtml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/admin/user/pendingUsers.xhtml 2009-03-06 23:21:42 UTC (rev 12974)
+++ branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/admin/user/pendingUsers.xhtml 2009-03-06 23:21:50 UTC (rev 12975)
@@ -67,7 +67,7 @@
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="#{bundle.IDENTITY_REIGSTRATION_DATE}"/>
+ <h:outputText value="#{bundle.IDENTITY_REGISTRATION_DATE}"/>
</f:facet>
<h:outputText value="#{user.registrationDate}">
<f:convertDateTime dateStyle="medium" type="both" />
Modified: branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/common/profile.xhtml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/common/profile.xhtml 2009-03-06 23:21:42 UTC (rev 12974)
+++ branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/common/profile.xhtml 2009-03-06 23:21:50 UTC (rev 12975)
@@ -10,12 +10,10 @@
<ui:include src="/jsf/common/userInfo.xhtml" />
- <ui:define name="content">
<ui:decorate template="/jsf/common/editProfileInfo.xhtml">
<ui:param name="manager" value="#{editprofilemgr}"/>
<ui:param name="adminMode" value="false"/>
</ui:decorate>
- </ui:define>
<hr/>
<p style="text-align: left;">
Modified: branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/common/register.xhtml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/common/register.xhtml 2009-03-06 23:21:42 UTC (rev 12974)
+++ branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/common/register.xhtml 2009-03-06 23:21:50 UTC (rev 12975)
@@ -46,12 +46,10 @@
<c:if test="#{portletPreferenceValue.profileAtRegistration == true}">
- <ui:define name="content">
- <ui:decorate template="/jsf/common/editProfileInfo.xhtml">
- <ui:param name="manager" value="#{userregistermgr}"/>
- <ui:param name="adminMode" value="false"/>
- </ui:decorate>
- </ui:define>
+ <ui:decorate template="/jsf/common/editProfileInfo.xhtml">
+ <ui:param name="manager" value="#{userregistermgr}"/>
+ <ui:param name="adminMode" value="false"/>
+ </ui:decorate>
</c:if>
<hr/>
Modified: branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/common/userInfo.xhtml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/common/userInfo.xhtml 2009-03-06 23:21:42 UTC (rev 12974)
+++ branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/common/userInfo.xhtml 2009-03-06 23:21:50 UTC (rev 12975)
@@ -75,7 +75,7 @@
<h:panelGroup />
<h:panelGroup />
- <h:commandLink id="chnage-email-link" value="#{bundle.IDENTITY_EDIT_CHANGE_EMAIL}" action="changeEmail" />
+ <h:commandLink id="change-email-link" value="#{bundle.IDENTITY_EDIT_CHANGE_EMAIL}" action="changeEmail" />
<h:panelGroup />
<h:outputText value="#{bundle.IDENTITY_PASSWORD}"/>
Modified: branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfile.xhtml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfile.xhtml 2009-03-06 23:21:42 UTC (rev 12974)
+++ branches/JBoss_Portal_AS5_Deployer/core-identity/src/resources/portal-identity-war/jsf/profile/viewProfile.xhtml 2009-03-06 23:21:50 UTC (rev 12975)
@@ -15,11 +15,9 @@
</ui:define>
<ui:define name="content">
- <ui:define name="content">
- <ui:decorate template="/jsf/common/viewProfileInfo.xhtml">
- <ui:param name="manager" value="#{editprofilemgr}"/>
- </ui:decorate>
- </ui:define>
+ <ui:decorate template="/jsf/common/viewProfileInfo.xhtml">
+ <ui:param name="manager" value="#{editprofilemgr}"/>
+ </ui:decorate>
</ui:define>
</ui:composition>
More information about the portal-commits
mailing list