You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2004/09/10 17:08:18 UTC
svn commit: rev 43675 - in incubator/lenya/trunk/src/webapp/lenya: content/admin/users pubs/default/config/ac resources/i18n xslt/admin/users
Author: andreas
Date: Fri Sep 10 08:08:17 2004
New Revision: 43675
Modified:
incubator/lenya/trunk/src/webapp/lenya/content/admin/users/users.xsp
incubator/lenya/trunk/src/webapp/lenya/pubs/default/config/ac/ac.xconf
incubator/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml
incubator/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml
incubator/lenya/trunk/src/webapp/lenya/xslt/admin/users/profile.xsl
incubator/lenya/trunk/src/webapp/lenya/xslt/admin/users/users.xsl
Log:
merged BRANCH_1_2_X into trunk
Modified: incubator/lenya/trunk/src/webapp/lenya/content/admin/users/users.xsp
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/content/admin/users/users.xsp (original)
+++ incubator/lenya/trunk/src/webapp/lenya/content/admin/users/users.xsp Fri Sep 10 08:08:17 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: users.xsp,v 1.7 2004/04/30 16:34:23 andreas Exp $ -->
+<!-- $Id$ -->
<xsp:page
language="java"
@@ -27,6 +27,7 @@
<xsp:structure>
<xsp:include>org.apache.lenya.ac.UserManager</xsp:include>
<xsp:include>org.apache.lenya.ac.User</xsp:include>
+ <xsp:include>org.apache.lenya.ac.UserType</xsp:include>
<xsp:include>org.apache.lenya.ac.Group</xsp:include>
<xsp:include>java.io.File</xsp:include>
<xsp:include>java.util.Iterator</xsp:include>
@@ -73,6 +74,22 @@
<xsp:logic>
}
</xsp:logic>
+
+ <types>
+ <xsp:logic>
+ UserType[] types = userManager.getUserTypes();
+ for (int i = 0; i < types.length; i++) {
+ <xsp:content>
+ <type>
+ <xsp:attribute name="class-name"><xsp:expr>types[i].getClassName()</xsp:expr></xsp:attribute>
+ <xsp:attribute name="create-use-case"><xsp:expr>types[i].getCreateUseCase()</xsp:expr></xsp:attribute>
+ <xsp:expr>types[i].getKey()</xsp:expr>
+ </type>
+ </xsp:content>
+ }
+ </xsp:logic>
+ </types>
+
</users>
</page>
Modified: incubator/lenya/trunk/src/webapp/lenya/pubs/default/config/ac/ac.xconf
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/pubs/default/config/ac/ac.xconf (original)
+++ incubator/lenya/trunk/src/webapp/lenya/pubs/default/config/ac/ac.xconf Fri Sep 10 08:08:17 2004
@@ -15,12 +15,18 @@
limitations under the License.
-->
-<!-- $Id: ac.xconf,v 1.5 2004/03/13 12:34:17 gregor Exp $ -->
+<!-- $Id$ -->
<access-controller type="bypassable">
<accreditable-manager type="file">
<parameter name="directory" value="context:///lenya/pubs/default/config/ac/passwd"/>
+
+ <user-manager>
+ <user-type class="org.apache.lenya.ac.file.FileUser" create-use-case="userAddUser">Local User</user-type>
+ <!-- uncomment the following line if you want LDAP support -->
+ <!-- <user-type class="org.apache.lenya.ac.file.LDAPUser" create-use-case="userAddUserLdap">LDAP User</user-type> -->
+ </user-manager>
</accreditable-manager>
<policy-manager type="document">
Modified: incubator/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml (original)
+++ incubator/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui.xml Fri Sep 10 08:08:17 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: cmsui.xml,v 1.62 2004/05/23 20:34:29 roku Exp $ -->
+<!-- $Id$ -->
<catalogue xml:lang="en">
@@ -182,6 +182,10 @@
<message key="Group Affiliation">Group Affiliation</message>
<message key="Change Password">Change Password</message>
<message key="Edit Group Affiliation">Edit Group Affiliation</message>
+
+ <!-- User Types -->
+ <message key="LDAP User">LDAP User</message>
+ <message key="Local User">CMS User</message>
<!-- IP Range Administration -->
<message key="IP Range">IP Range</message>
Modified: incubator/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml (original)
+++ incubator/lenya/trunk/src/webapp/lenya/resources/i18n/cmsui_de.xml Fri Sep 10 08:08:17 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: cmsui_de.xml,v 1.65 2004/05/23 20:34:29 roku Exp $ -->
+<!-- $Id$ -->
<catalogue xml:lang="de">
@@ -183,7 +183,7 @@
<message key="Change Password">Passwort ändern</message>
<message key="Edit Group Affiliation">Mitgliedschaften ändern</message>
- <!-- IP Range Administration -->
+ <!-- IP Range Administration -->
<message key="IP Range">IP Bereich</message>
<message key="IP Range ID">IP Bereichs-ID</message>
<message key="Network Address">IP Adresse</message>
@@ -191,6 +191,10 @@
<message key="IP Range Administration">IP Administration</message>
<message key="Add IP Range">IP Bereich hinzufügen</message>
<message key="IP Range Profile">IP Bereichsprofil</message>
+
+ <!-- User Types -->
+ <message key="LDAP User">LDAP User</message>
+ <message key="Local User">CMS User</message>
<!-- Site tab (info screens) -->
<message key="Available Languages">Verfügbare Sprachen</message>
Modified: incubator/lenya/trunk/src/webapp/lenya/xslt/admin/users/profile.xsl
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/xslt/admin/users/profile.xsl (original)
+++ incubator/lenya/trunk/src/webapp/lenya/xslt/admin/users/profile.xsl Fri Sep 10 08:08:17 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: profile.xsl,v 1.16 2004/04/28 15:00:05 andreas Exp $ -->
+<!-- $Id$ -->
<xsl:stylesheet
version="1.0"
@@ -118,7 +118,7 @@
<tr>
<td class="lenya-entry-caption"><i18n:text>LDAP ID</i18n:text> <span class="lenya-admin-required">*</span></td>
<td>
- <input class="lenya-form-element" name="fullname" type="text" value="{normalize-space(.)}"/>
+ <input class="lenya-form-element" name="ldapid" type="text" value="{normalize-space(.)}"/>
</td>
</tr>
</xsl:template>
Modified: incubator/lenya/trunk/src/webapp/lenya/xslt/admin/users/users.xsl
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/xslt/admin/users/users.xsl (original)
+++ incubator/lenya/trunk/src/webapp/lenya/xslt/admin/users/users.xsl Fri Sep 10 08:08:17 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: users.xsl,v 1.11 2004/06/01 14:29:23 andreas Exp $ -->
+<!-- $Id$ -->
<xsl:stylesheet
version="1.0"
@@ -101,10 +101,27 @@
<xsl:template name="add-user">
- <form method="GET">
- <input type="hidden" name="lenya.usecase" value="userAddUser"/>
- <input i18n:attr="value" type="submit" value="Add User"/>
- </form>
+ <table class="lenya-table-noborder">
+ <tr>
+ <td>
+ <i18n:text>Add User</i18n:text>: 
+ </td>
+ <xsl:for-each select="types/type">
+ <td>
+ <form method="GET">
+ <input type="hidden" name="lenya.usecase">
+ <xsl:attribute name="value"><xsl:value-of
+ select="@create-use-case"/></xsl:attribute>
+ </input>
+ <input i18n:attr="value" type="submit">
+ <xsl:attribute name="value"><xsl:value-of
+ select="normalize-space(.)"/></xsl:attribute>
+ </input>
+ </form>
+ </td>
+ </xsl:for-each>
+ </tr>
+ </table>
</xsl:template>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org