[Jellyfish-cvs] jellyfish-auth/src/conf jellyfish.xconf,1.5,1.6

[<rau...@us...>]

Update of /cvsroot/jellyfish/jellyfish-auth/src/conf
In directory sc8-pr-cvs1:/tmp/cvs-serv4682/src/conf

Modified Files:
	jellyfish.xconf 
Log Message:
cleaning up config

Index: jellyfish.xconf
===================================================================
RCS file: /cvsroot/jellyfish/jellyfish-auth/src/conf/jellyfish.xconf,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** jellyfish.xconf	17 Aug 2003 04:45:58 -0000	1.5
--- jellyfish.xconf	17 Aug 2003 23:06:18 -0000	1.6
***************
*** 3,8 ****
  <jellyfish>
  	<configuration-manager id="configuration-manager">
! 		<!--	USE THESE SETTINGS FOR A REAL LDAP SERVER -->
! 		<!--
  		<connection-url>ldap://localhost:1396</connection-url>
  		<connection-dn>cn=admin,dc=jellyfish,dc=org</connection-dn>
--- 3,7 ----
  <jellyfish>
  	<configuration-manager id="configuration-manager">
! 		<!--	USE THESE SETTINGS FOR A REAL LDAP SERVER 
  		<connection-url>ldap://localhost:1396</connection-url>
  		<connection-dn>cn=admin,dc=jellyfish,dc=org</connection-dn>
***************
*** 11,28 ****
  		-->
  
! 		<!--	USE THESE SETTINGS FOR THE JELLYFISH FILESYSTEM DIRECTORY PROVIDER -->
  		<connection-url>/tmp/jndi</connection-url>
  		<connection-dn></connection-dn>
  		<connection-password></connection-password>
  		<context-factory>org.jellyfish.provider.FileSystemDirectoryContextFactory</context-factory>
  		
! 		<base-dn>ou=jellyfish,dc=jellyfish,dc=org</base-dn>
  		
  		<object-mapping>
  			<java-name>org.jellyfish.auth.model.LoginModuleConfiguration</java-name>
  			<ldap-name>loginModuleConfiguration</ldap-name>
! 			<dn>cn=${loginModuleName},cn=${applicationName},ou=loginConfiguration</dn>
  			<attribute-mapping>
- 			<!-- does this mapping need to be here? the attribute is stored in the dn -->
  				<java-name>applicationName</java-name>
  				<ldap-name>applicationName</ldap-name>
--- 10,27 ----
  		-->
  
! 		<!--	USE THESE SETTINGS FOR THE JELLYFISH FILESYSTEM DIRECTORY PROVIDER 		-->
  		<connection-url>/tmp/jndi</connection-url>
  		<connection-dn></connection-dn>
  		<connection-password></connection-password>
  		<context-factory>org.jellyfish.provider.FileSystemDirectoryContextFactory</context-factory>
+ 
  		
! 		<base-dn>dc=jellyfish,dc=org</base-dn>
  		
  		<object-mapping>
  			<java-name>org.jellyfish.auth.model.LoginModuleConfiguration</java-name>
  			<ldap-name>loginModuleConfiguration</ldap-name>
! 			<dn>cn=${loginModuleName},ou=${applicationName},ou=loginconfiguration</dn>
  			<attribute-mapping>
  				<java-name>applicationName</java-name>
  				<ldap-name>applicationName</ldap-name>
***************
*** 41,45 ****
  			<java-name>org.jellyfish.model.InetOrgPerson</java-name>
  			<ldap-name>person</ldap-name>
! 			<dn>cn=${firstName},ou=people</dn>
  			<attribute-mapping>
  				<java-name>firstName</java-name>
--- 40,44 ----
  			<java-name>org.jellyfish.model.InetOrgPerson</java-name>
  			<ldap-name>person</ldap-name>
! 			<dn>cn=${userId},ou=people</dn>
  			<attribute-mapping>
  				<java-name>firstName</java-name>