r4580 - trunk/lib

[daigle at ecoinformatics.org]

Author: daigle
Date: 2008-11-19 15:05:41 -0800 (Wed, 19 Nov 2008)
New Revision: 4580

Added:
   trunk/lib/auth.properties.metadata.xml
Removed:
   trunk/lib/ldap.properties.metadata.xml
Log:
move ldap.properties.metadata.xml to auth.properties.metadata.xml

Copied: trunk/lib/auth.properties.metadata.xml (from rev 4543, trunk/lib/ldap.properties.metadata.xml)
===================================================================
--- trunk/lib/auth.properties.metadata.xml	                        (rev 0)
+++ trunk/lib/auth.properties.metadata.xml	2008-11-19 23:05:41 UTC (rev 4580)
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+
+<metadataConfig>
+	<group>
+		<index>1</index>
+		<name>Authentication Configuration Values</name>
+		<comment>
+			Authentication Setup
+		</comment>
+		<description>Authentication Configuration Values.</description>
+	</group>
+
+	<config>
+		<key>auth.class</key>
+		<label>Authentication Class</label>
+		<group>1</group>
+		<index>1</index>
+		<description>Authentication Class.</description>
+		<helpFile>properties.html#auth.class</helpFile>
+	</config>
+	
+	<config>
+		<key>auth.url</key>
+		<label>Authentication URL</label>
+		<group>1</group>
+		<index>2</index>
+		<description>Authentication Server URL.</description>
+		<helpFile>properties.html#auth.url</helpFile>
+	</config>
+
+	<config>
+		<key>auth.surl</key>
+		<label>Authentication Secure URL</label>
+		<group>1</group>
+		<index>3</index>
+		<description>Authentication Secure Server URL.</description>
+		<helpFile>properties.html#auth.surl</helpFile>
+	</config>
+
+	<config>
+		<key>auth.administrators</key>
+		<label>MetaCat Administrators</label>
+		<group>1</group>
+		<index>4</index>
+		<description>Authentication users or groups for Metacat administration. 
+			Typically, this holds LDAP credentials.
+			&lt;font color="red"&gt; Note: this must be set to a username or
+			group that you belong to in order to continue with 
+			configuration&lt;/font&gt;.</description>
+		<helpFile>properties.html#auth.administrators</helpFile>
+		<isRequired>true</isRequired>
+	</config>
+
+</metadataConfig>
\ No newline at end of file


Property changes on: trunk/lib/auth.properties.metadata.xml
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:mergeinfo
   + 
Name: svn:eol-style
   + native

Deleted: trunk/lib/ldap.properties.metadata.xml
===================================================================
--- trunk/lib/ldap.properties.metadata.xml	2008-11-19 23:04:52 UTC (rev 4579)
+++ trunk/lib/ldap.properties.metadata.xml	2008-11-19 23:05:41 UTC (rev 4580)
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-
-<metadataConfig>
-	<group>
-		<index>1</index>
-		<name>LDAP Configuration Values</name>
-		<comment>
-			LDAP Setup
-		</comment>
-		<description>LDAP Configuration Values.</description>
-	</group>
-	
-	<config>
-		<key>ldap.url</key>
-		<label>LDAP URL</label>
-		<group>1</group>
-		<index>1</index>
-		<description>LDAP Server URL.</description>
-		<helpFile>properties.html#ldap.url</helpFile>
-	</config>
-
-	<config>
-		<key>ldap.surl</key>
-		<label>LDAP Secure URL</label>
-		<group>1</group>
-		<index>2</index>
-		<description>LDAP Secure Server URL.</description>
-		<helpFile>properties.html#ldap.surl</helpFile>
-	</config>
-
-	<config>
-		<key>ldap.administrators</key>
-		<label>MetaCat Administrators</label>
-		<group>1</group>
-		<index>3</index>
-		<description>LDAP users or groups for Metacat administration. 
-			&lt;font color="red"&gt; Note: this must be set to a username or
-			group that you belong to in order to continue with 
-			configuration&lt;/font&gt;.</description>
-		<helpFile>properties.html#ldap.administrators</helpFile>
-		<isRequired>true</isRequired>
-	</config>
-
-</metadataConfig>
\ No newline at end of file