[CalendarServer-changes] [768] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Dec 8 11:42:49 PST 2006
Revision: 768
http://trac.macosforge.org/projects/calendarserver/changeset/768
Author: wsanchez at apple.com
Date: 2006-12-08 11:42:49 -0800 (Fri, 08 Dec 2006)
Log Message:
-----------
Use English, especially for user-facing strings like configuration.
Modified Paths:
--------------
CalendarServer/trunk/conf/accounts-test.xml
CalendarServer/trunk/conf/accounts.dtd
CalendarServer/trunk/conf/accounts.xml
CalendarServer/trunk/twistedcaldav/directory/test/accounts.xml
CalendarServer/trunk/twistedcaldav/directory/test/test_xmlfile.py
CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py
Modified: CalendarServer/trunk/conf/accounts-test.xml
===================================================================
--- CalendarServer/trunk/conf/accounts-test.xml 2006-12-08 19:37:43 UTC (rev 767)
+++ CalendarServer/trunk/conf/accounts-test.xml 2006-12-08 19:42:49 UTC (rev 768)
@@ -21,30 +21,30 @@
<accounts realm="Test Realm">
<user>
<uid>admin</uid>
- <pswd>admin</pswd>
+ <password>admin</password>
<name>Super User</name>
</user>
<user>
<uid>proxy</uid>
- <pswd>proxy</pswd>
+ <password>proxy</password>
<name>User who can authorize as someone else</name>
<canproxy/> <!-- FIXME: Is the directory the right place to configure this bit? -->
</user>
<user repeat="99">
<uid>user%02d</uid>
- <pswd>user%02d</pswd>
+ <password>user%02d</password>
<name>User %02d</name>
<cuaddr>mailto:user%02d at example.com</cuaddr>
</user>
<user repeat="10">
<uid>public%02d</uid>
- <pswd>public%02d</pswd>
+ <password>public%02d</password>
<name>Public %02d</name>
<cuaddr>mailto:public%02d at example.com</cuaddr>
</user>
<resource repeat="10">
<uid>resource%02d</uid>
- <pswd>resource%02d</pswd>
+ <password>resource%02d</password>
<name>Room %02d</name>
</resource>
</accounts>
Modified: CalendarServer/trunk/conf/accounts.dtd
===================================================================
--- CalendarServer/trunk/conf/accounts.dtd 2006-12-08 19:37:43 UTC (rev 767)
+++ CalendarServer/trunk/conf/accounts.dtd 2006-12-08 19:42:49 UTC (rev 768)
@@ -19,17 +19,17 @@
<!ELEMENT accounts (user*, group*, resource*) >
<!ATTLIST accounts realm CDATA "">
- <!ELEMENT user (uid, pswd, name, cuaddr*, calendar*, quota?, autorespond?, canproxy?)>
+ <!ELEMENT user (uid, password, name, cuaddr*, calendar*, quota?, autorespond?, canproxy?)>
<!ATTLIST user repeat CDATA "1">
- <!ELEMENT group (uid, pswd, name, members, cuaddr*, calendar*, quota?)>
+ <!ELEMENT group (uid, password, name, members, cuaddr*, calendar*, quota?)>
<!ATTLIST group repeat CDATA "1">
- <!ELEMENT resource (uid, pswd, name, cuaddr*, calendar*, quota?, autorespond?, canproxy?)>
+ <!ELEMENT resource (uid, password, name, cuaddr*, calendar*, quota?, autorespond?, canproxy?)>
<!ATTLIST resource repeat CDATA "1">
<!ELEMENT uid (#PCDATA)>
- <!ELEMENT pswd (#PCDATA)>
+ <!ELEMENT password (#PCDATA)>
<!ELEMENT name (#PCDATA)>
<!ELEMENT cuaddr (#PCDATA)>
<!ELEMENT calendar (#PCDATA)>
@@ -37,4 +37,4 @@
<!ELEMENT autorespond EMPTY>
<!ELEMENT canproxy EMPTY>
<!ELEMENT members (uid*)>
-
\ No newline at end of file
+
Modified: CalendarServer/trunk/conf/accounts.xml
===================================================================
--- CalendarServer/trunk/conf/accounts.xml 2006-12-08 19:37:43 UTC (rev 767)
+++ CalendarServer/trunk/conf/accounts.xml 2006-12-08 19:42:49 UTC (rev 768)
@@ -21,24 +21,24 @@
<accounts realm="Test Realm">
<user>
<uid>admin</uid>
- <pswd>admin</pswd>
+ <password>admin</password>
<name>Super User</name>
</user>
<user>
<uid>proxy</uid>
- <pswd>proxy</pswd>
+ <password>proxy</password>
<name>User who can authorize as someone else</name>
<canproxy/> <!-- FIXME: Is the directory the right place to configure this bit? -->
</user>
<user>
<uid>test</uid>
- <pswd>test</pswd>
+ <password>test</password>
<name>Test User</name>
<cuaddr>mailto:testuser at example.com</cuaddr>
</user>
<group>
<uid>users</uid>
- <pswd>users</pswd>
+ <password>users</password>
<name>Users Group</name>
<members>
<uid>test</uid>
@@ -46,7 +46,7 @@
</group>
<resource>
<uid>mercury</uid>
- <pswd>mercury</pswd>
+ <password>mercury</password>
<name>Mecury Conference Room, Building 1, 2nd Floor</name>
</resource>
</accounts>
Modified: CalendarServer/trunk/twistedcaldav/directory/test/accounts.xml
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/accounts.xml 2006-12-08 19:37:43 UTC (rev 767)
+++ CalendarServer/trunk/twistedcaldav/directory/test/accounts.xml 2006-12-08 19:42:49 UTC (rev 768)
@@ -21,47 +21,47 @@
<accounts realm="Test Realm">
<user>
<uid>admin</uid>
- <pswd>nimda</pswd>
+ <password>nimda</password>
<name>Super User</name>
</user>
<user>
<uid>proxy</uid>
- <pswd>yxorp</pswd>
+ <password>yxorp</password>
<name>User who can authorize as someone else</name>
<canproxy/> <!-- FIXME: Is the directory the right place to configure this bit? -->
</user>
<user>
<uid>wsanchez</uid>
- <pswd>zehcnasw</pswd>
+ <password>zehcnasw</password>
<name>Wilfredo Sanchez</name>
<cuaddr>mailto:wsanchez at example.com</cuaddr>
</user>
<user>
<uid>cdaboo</uid>
- <pswd>oobadc</pswd>
+ <password>oobadc</password>
<name>Cyrus Daboo</name>
<cuaddr>mailto:cdaboo at example.com</cuaddr>
</user>
<user>
<uid>lecroy</uid>
- <pswd>yorcel</pswd>
+ <password>yorcel</password>
<name>Chris Lecroy</name>
<cuaddr>mailto:lecroy at example.com</cuaddr>
</user>
<user>
<uid>dreid</uid>
- <pswd>dierd</pswd>
+ <password>dierd</password>
<name>David Reid</name>
<cuaddr>mailto:dreid at example.com</cuaddr>
</user>
<user repeat="2">
<uid>user%02d</uid>
- <pswd>%02duser</pswd>
+ <password>%02duser</password>
<name>User %02d</name>
</user>
<group>
<uid>managers</uid>
- <pswd>managers</pswd>
+ <password>managers</password>
<name>Managers</name>
<members>
<uid>lecroy</uid>
@@ -69,7 +69,7 @@
</group>
<group>
<uid>grunts</uid>
- <pswd>grunts</pswd>
+ <password>grunts</password>
<name>We do all the work</name>
<members>
<uid>wsanchez</uid>
@@ -79,7 +79,7 @@
</group>
<group>
<uid>right_coast</uid>
- <pswd>right_coast</pswd>
+ <password>right_coast</password>
<name>East Coast</name>
<members>
<uid>cdaboo</uid>
@@ -87,7 +87,7 @@
</group>
<group>
<uid>left_coast</uid>
- <pswd>left_coast</pswd>
+ <password>left_coast</password>
<name>West Coast</name>
<members>
<uid>wsanchez</uid>
@@ -97,19 +97,19 @@
</group>
<resource>
<uid>mercury</uid>
- <pswd>mercury</pswd>
+ <password>mercury</password>
<name>Mecury Seven</name>
<cuaddr>mailto:mercury at example.com</cuaddr>
</resource>
<resource>
<uid>gemini</uid>
- <pswd>gemini</pswd>
+ <password>gemini</password>
<name>Gemini Twelve</name>
<cuaddr>mailto:gemini at example.com</cuaddr>
</resource>
<resource>
<uid>apollo</uid>
- <pswd>apollo</pswd>
+ <password>apollo</password>
<name>Apollo Eleven</name>
<cuaddr>mailto:apollo at example.com</cuaddr>
</resource>
Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_xmlfile.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_xmlfile.py 2006-12-08 19:37:43 UTC (rev 767)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_xmlfile.py 2006-12-08 19:42:49 UTC (rev 768)
@@ -78,7 +78,7 @@
<accounts realm="Test Realm">
<user>
<uid>admin</uid>
- <pswd>nimda</pswd>
+ <password>nimda</password>
<name>Super User</name>
</user>
</accounts>
Modified: CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py 2006-12-08 19:37:43 UTC (rev 767)
+++ CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py 2006-12-08 19:42:49 UTC (rev 768)
@@ -37,7 +37,7 @@
ELEMENT_RESOURCE = "resource"
ELEMENT_USERID = "uid"
-ELEMENT_PASSWORD = "pswd"
+ELEMENT_PASSWORD = "password"
ELEMENT_NAME = "name"
ELEMENT_MEMBERS = "members"
ELEMENT_CUADDR = "cuaddr"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061208/91e727c8/attachment.html
More information about the calendarserver-changes
mailing list