You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by dl...@apache.org on 2005/11/06 04:44:15 UTC
svn commit: r331074 - in /portals/jetspeed-2/trunk: components/statistics/
etc/apacheds/ jetspeed-api/src/java/org/apache/jetspeed/security/
Author: dlestrat
Date: Sat Nov 5 19:44:11 2005
New Revision: 331074
URL: http://svn.apache.org/viewcvs?rev=331074&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-188#action_12356329
Revisited the LDAP implementation. Integrate Apache DS with J2.
All unit tests for LDAP are passing on Apache DS. Leave them excluded for now.
Various quick fixes for serializable objects. Add serialUID.
Documentation to come in the next few days.
Added:
portals/jetspeed-2/trunk/components/statistics/.cvsignore
portals/jetspeed-2/trunk/etc/apacheds/apacheds-server.xml
portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/InvalidDnException.java
portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/InvalidUidException.java
Added: portals/jetspeed-2/trunk/components/statistics/.cvsignore
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/statistics/.cvsignore?rev=331074&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/.cvsignore (added)
+++ portals/jetspeed-2/trunk/components/statistics/.cvsignore Sat Nov 5 19:44:11 2005
@@ -0,0 +1 @@
+target
Added: portals/jetspeed-2/trunk/etc/apacheds/apacheds-server.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/apacheds/apacheds-server.xml?rev=331074&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/etc/apacheds/apacheds-server.xml (added)
+++ portals/jetspeed-2/trunk/etc/apacheds/apacheds-server.xml Sat Nov 5 19:44:11 2005
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
+ "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans>
+ <bean id="environment" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+ <property name="properties">
+ <props>
+ <prop key="asn.1.berlib.provider">org.apache.ldap.common.berlib.asn1.SnickersProvider</prop>
+ <!--prop key="asn.1.berlib.provider">org.apache.asn1new.ldap.TwixProvider</prop-->
+ <prop key="java.naming.security.authentication">simple</prop>
+ <prop key="java.naming.security.principal">uid=admin,ou=system</prop>
+ <prop key="java.naming.security.credentials">secret</prop>
+ <prop key="java.naming.ldap.attributes.binary">photo personalSignature audio jpegPhoto javaSerializedData userPassword userCertificate cACertificate authorityRevocationList certificateRevocationList crossCertificatePair x500UniqueIdentifier krb5Key</prop>
+ <!--<prop key="kdc.entryBaseDn">ou=users,dc=example,dc=com</prop>-->
+ <!--<prop key="kdc.java.naming.security.credentials">secret</prop>-->
+ <!--<prop key="changepw.entryBaseDn">ou=users,dc=example,dc=com</prop>-->
+ <!--<prop key="changepw.java.naming.security.credentials">secret</prop>-->
+ </props>
+ </property>
+ </bean>
+
+ <bean id="configuration" class="org.apache.ldap.server.configuration.MutableServerStartupConfiguration">
+ <property name="workingDirectory"><value>target/apacheds/example.com</value></property>
+
+ <!-- Uncomment below to have the server load entries on startup! -->
+ <!-- ldifDirectory property can point to a relative file, directory or -->
+ <!-- can point to an absolute path to either using the URL path -->
+ <!-- notation: i.e. file:///Users/jack/apacheds/ldifs -->
+
+ <!-- Entries will optionally be filtered using LdifLoadFilters in the -->
+ <!-- order specified. The included Krb5KdcEntryFilter will filter -->
+ <!-- kerberos principals creating keys for them using their -->
+ <!-- userPassword attribute if present. -->
+
+ <!--<property name="ldifDirectory">
+ <value>example.ldif</value>
+ </property>
+ <property name="ldifFilters">
+ <list>
+ <bean class="org.apache.protocol.common.store.Krb5KdcEntryFilter"/>
+ </list>
+ </property>-->
+
+ <property name="allowAnonymousAccess"><value>false</value></property>
+ <property name="accessControlEnabled"><value>false</value></property>
+ <property name="enableNtp"><value>false</value></property>
+ <property name="enableKerberos"><value>false</value></property>
+ <property name="enableChangePassword"><value>false</value></property>
+ <property name="ldapPort"><value>10389</value></property>
+ <property name="contextPartitionConfigurations">
+ <set>
+ <ref bean="examplePartitionConfiguration"/>
+ </set>
+ </property>
+ <property name="bootstrapSchemas">
+ <set>
+ <bean class="org.apache.ldap.server.schema.bootstrap.AutofsSchema"/>
+ <bean class="org.apache.ldap.server.schema.bootstrap.CorbaSchema"/>
+ <bean class="org.apache.ldap.server.schema.bootstrap.CoreSchema"/>
+ <bean class="org.apache.ldap.server.schema.bootstrap.CosineSchema"/>
+ <bean class="org.apache.ldap.server.schema.bootstrap.ApacheSchema"/>
+ <bean class="org.apache.ldap.server.schema.bootstrap.CollectiveSchema"/>
+ <bean class="org.apache.ldap.server.schema.bootstrap.InetorgpersonSchema"/>
+ <bean class="org.apache.ldap.server.schema.bootstrap.JavaSchema"/>
+ <bean class="org.apache.ldap.server.schema.bootstrap.Krb5kdcSchema"/>
+ <bean class="org.apache.ldap.server.schema.bootstrap.NisSchema"/>
+ <bean class="org.apache.ldap.server.schema.bootstrap.SystemSchema"/>
+ <bean class="org.apache.ldap.server.schema.bootstrap.ApachednsSchema"/>
+ <bean class="org.apache.jetspeed.security.ldap.JetspeedSchema"/>
+ </set>
+ </property>
+
+ <property name="interceptorConfigurations">
+ <list>
+ <bean class="org.apache.ldap.server.configuration.MutableInterceptorConfiguration">
+ <property name="name"><value>normalizationService</value></property>
+ <property name="interceptor">
+ <bean class="org.apache.ldap.server.normalization.NormalizationService" />
+ </property>
+ </bean>
+ <bean class="org.apache.ldap.server.configuration.MutableInterceptorConfiguration">
+ <property name="name"><value>authenticationService</value></property>
+ <property name="interceptor">
+ <bean class="org.apache.ldap.server.authn.AuthenticationService" />
+ </property>
+ </bean>
+ <bean class="org.apache.ldap.server.configuration.MutableInterceptorConfiguration">
+ <property name="name"><value>authorizationService</value></property>
+ <property name="interceptor">
+ <bean class="org.apache.ldap.server.authz.AuthorizationService" />
+ </property>
+ </bean>
+ <bean class="org.apache.ldap.server.configuration.MutableInterceptorConfiguration">
+ <property name="name"><value>oldAuthorizationService</value></property>
+ <property name="interceptor">
+ <bean class="org.apache.ldap.server.authz.OldAuthorizationService" />
+ </property>
+ </bean>
+ <bean class="org.apache.ldap.server.configuration.MutableInterceptorConfiguration">
+ <property name="name"><value>exceptionService</value></property>
+ <property name="interceptor">
+ <bean class="org.apache.ldap.server.exception.ExceptionService" />
+ </property>
+ </bean>
+ <bean class="org.apache.ldap.server.configuration.MutableInterceptorConfiguration">
+ <property name="name"><value>schemaService</value></property>
+ <property name="interceptor">
+ <bean class="org.apache.ldap.server.schema.SchemaService" />
+ </property>
+ </bean>
+ <bean class="org.apache.ldap.server.configuration.MutableInterceptorConfiguration">
+ <property name="name"><value>subentryService</value></property>
+ <property name="interceptor">
+ <bean class="org.apache.ldap.server.subtree.SubentryService" />
+ </property>
+ </bean>
+ <bean class="org.apache.ldap.server.configuration.MutableInterceptorConfiguration">
+ <property name="name"><value>operationalAttributeService</value></property>
+ <property name="interceptor">
+ <bean class="org.apache.ldap.server.operational.OperationalAttributeService" />
+ </property>
+ </bean>
+ <bean class="org.apache.ldap.server.configuration.MutableInterceptorConfiguration">
+ <property name="name"><value>collectiveAttributeService</value></property>
+ <property name="interceptor">
+ <bean class="org.apache.ldap.server.collective.CollectiveAttributeService" />
+ </property>
+ </bean>
+ <bean class="org.apache.ldap.server.configuration.MutableInterceptorConfiguration">
+ <property name="name"><value>eventService</value></property>
+ <property name="interceptor">
+ <bean class="org.apache.ldap.server.event.EventService" />
+ </property>
+ </bean>
+ </list>
+ </property>
+ </bean>
+
+ <bean id="examplePartitionConfiguration" class="org.apache.ldap.server.configuration.MutableDirectoryPartitionConfiguration">
+ <property name="name"><value>example</value></property>
+ <property name="suffix"><value>o=sevenSeas</value></property>
+ <property name="indexedAttributes">
+ <set>
+ <value>dc</value>
+ <value>ou</value>
+ <value>objectClass</value>
+ <value>krb5PrincipalName</value>
+ <value>uid</value>
+ </set>
+ </property>
+ <property name="contextEntry">
+ <value>
+ objectClass: top
+ objectClass: domain
+ objectClass: extensibleObject
+ dc: example
+ </value>
+ </property>
+ </bean>
+
+ <bean class="org.springframework.beans.factory.config.CustomEditorConfigurer">
+ <property name="customEditors">
+ <map>
+ <entry key="javax.naming.directory.Attributes">
+ <bean class="org.apache.ldap.server.configuration.AttributesPropertyEditor"/>
+ </entry>
+ </map>
+ </property>
+ </bean>
+</beans>
Added: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/InvalidDnException.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/InvalidDnException.java?rev=331074&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/InvalidDnException.java (added)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/InvalidDnException.java Sat Nov 5 19:44:11 2005
@@ -0,0 +1,31 @@
+/* Copyright 2004 Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+package org.apache.jetspeed.security;
+
+/**
+ * Exception thrown when the distinguished name is invalid.
+ *
+ * @author <a href="mailto:dlestrat@apache.org">David Le Strat</a>
+ */
+public class InvalidDnException extends SecurityException
+{
+ /** The serial version uid. */
+ private static final long serialVersionUID = -2643327886955569635L;
+
+ public InvalidDnException()
+ {
+ super(INVALID_DN);
+ }
+}
Added: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/InvalidUidException.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/InvalidUidException.java?rev=331074&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/InvalidUidException.java (added)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/InvalidUidException.java Sat Nov 5 19:44:11 2005
@@ -0,0 +1,31 @@
+/* Copyright 2004 Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+package org.apache.jetspeed.security;
+
+/**
+ * Exception thrown when the uid is invalid.
+ *
+ * @author <a href="mailto:dlestrat@apache.org">David Le Strat</a>
+ */
+public class InvalidUidException extends SecurityException
+{
+ /** The serial version uid. */
+ private static final long serialVersionUID = 8603304762095029084L;
+
+ public InvalidUidException()
+ {
+ super(INVALID_UID);
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org