You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/03/08 01:15:48 UTC
svn commit: r1079045 [2/2] - in /directory/apacheds/branches/milestones: ./
all/ core-annotations/ core-api/
core-api/src/main/java/org/apache/directory/server/core/
core-api/src/main/java/org/apache/directory/server/core/changelog/
core-api/src/main/j...
Propchange: directory/apacheds/branches/milestones/kerberos-codec/src/test/java/org/apache/directory/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:15:46 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/test/java/org/apache/directory/server:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server:1040956-1043765
/directory/apacheds/branches/milestones/kerberos-codec/src/test/java/org/apache/directory/server:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
/directory/studio/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1067786-1067997
Propchange: directory/apacheds/branches/milestones/kerberos-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:15:46 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-test:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-test:1040956-1043765
/directory/apacheds/branches/milestones/kerberos-test:1072812-1075328
-/directory/apacheds/trunk/kerberos-test:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/kerberos-test:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
/directory/studio/trunk/kerberos-test:1067786-1067997
Modified: directory/apacheds/branches/milestones/kerberos-test/src/test/resources/krb5.conf
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/kerberos-test/src/test/resources/krb5.conf?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/kerberos-test/src/test/resources/krb5.conf (original)
+++ directory/apacheds/branches/milestones/kerberos-test/src/test/resources/krb5.conf Tue Mar 8 00:15:46 2011
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
[libdefaults]
default_realm = EXAMPLE.COM
Propchange: directory/apacheds/branches/milestones/ldif-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:15:46 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/ldif-partition:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/ldif-partition:1040956-1043765
/directory/apacheds/branches/milestones/ldif-partition:1072812-1075328
-/directory/apacheds/trunk/ldif-partition:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/ldif-partition:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
/directory/studio/trunk/ldif-partition:1067786-1067997
Modified: directory/apacheds/branches/milestones/osgi/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/osgi/src/main/filtered-resources/features.xml?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/osgi/src/main/filtered-resources/features.xml (original)
+++ directory/apacheds/branches/milestones/osgi/src/main/filtered-resources/features.xml Tue Mar 8 00:15:46 2011
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You 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.
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
-->
-
<!--
Install with:
features/addUrl mvn:org.apache.directory.server/apacheds-osgi/${apache.directory.version}/xml/features
Modified: directory/apacheds/branches/milestones/osgi/src/main/resources/apacheds.xsd
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/osgi/src/main/resources/apacheds.xsd?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/osgi/src/main/resources/apacheds.xsd (original)
+++ directory/apacheds/branches/milestones/osgi/src/main/resources/apacheds.xsd Tue Mar 8 00:15:46 2011
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+-->
<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema' elementFormDefault='qualified'
targetNamespace='http://apacheds.org/config/core'
xmlns:directory='http://apacheds.org/config/core'
Modified: directory/apacheds/branches/milestones/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/pom.xml?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/pom.xml (original)
+++ directory/apacheds/branches/milestones/pom.xml Tue Mar 8 00:15:46 2011
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.directory.project</groupId>
<artifactId>project</artifactId>
- <version>20</version>
+ <version>21</version>
</parent>
<groupId>org.apache.directory.server</groupId>
@@ -62,8 +62,8 @@
<commons.net.version>2.2</commons.net.version>
<commons.pool.version>1.5.5</commons.pool.version>
<derby.version>10.7.1.1</derby.version>
- <dnsjava.version>2.1.0</dnsjava.version>
- <ehcache.version>2.3.2</ehcache.version>
+ <dnsjava.version>2.1.1</dnsjava.version>
+ <ehcache.version>2.4.0</ehcache.version>
<jetty.version>6.1.14</jetty.version>
<jug.asl.version>2.0.0.RC1</jug.asl.version>
<junit.version>4.8.2</junit.version>
@@ -156,6 +156,51 @@
</profiles>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <!-- MAVEN_DEFAULT_EXCLUDES -->
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <!-- ECLIPSE_DEFAULT_EXCLUDES -->
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <!-- IDEA_DEFAULT_EXCLUDES -->
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <!-- MANIFEST_MF_EXCLUDES -->
+ <exclude>**/MANIFEST.MF</exclude>
+ <!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48 -->
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <!-- LDIF_FILES_EXCLUDES -->
+ <exclude>**/*.ldif</exclude>
+ <!-- PDU_FILES_EXCLUDES -->
+ <exclude>**/*.pdu</exclude>
+ <!-- JDBM_FILES_EXCLUDES -->
+ <exclude>jdbm/**/*</exclude>
+ <!-- INSTALLERS_FILES_EXCLUDES -->
+ <exclude>installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/deb/control</exclude>
+ <exclude>installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/macosxpkg/License.rtf</exclude>
+ <exclude>installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/solarispkg/pkginfo</exclude>
+ <exclude>installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/solarispkg/Prototype</exclude>
+ <!-- OSGI_FILES_EXCLUDES -->
+ <exclude>osgi/src/main/resources/META-INF/spring.handlers</exclude>
+ <exclude>osgi/src/main/resources/META-INF/spring.schemas</exclude>
+ <!-- LOG_FILES_EXCLUDES -->
+ <exclude>**/*.log</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -223,28 +268,6 @@
</reportSets>
</plugin>
<plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludeSubProjects>false</excludeSubProjects>
- <excludes>
- <!-- MAVEN_DEFAULT_EXCLUDES -->
- <exclude>**/target/**/*</exclude>
- <exclude>**/cobertura.ser</exclude>
- <!-- ECLIPSE_DEFAULT_EXCLUDES -->
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.settings/**/*</exclude>
- <!-- IDEA_DEFAULT_EXCLUDES -->
- <exclude>**/*.iml</exclude>
- <exclude>**/*.ipr</exclude>
- <exclude>**/*.iws</exclude>
- <!-- MANIFEST_MF_EXCLUDES -->
- <exclude>**/MANIFEST.MF</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<reportSets>
Propchange: directory/apacheds/branches/milestones/protocol-changepw/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:15:46 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-changepw:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw:1040956-1043765
/directory/apacheds/branches/milestones/protocol-changepw:1072812-1075328
-/directory/apacheds/trunk/protocol-changepw:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/protocol-changepw:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
/directory/studio/trunk/protocol-changepw:1067786-1067997
Propchange: directory/apacheds/branches/milestones/protocol-dhcp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:15:46 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-dhcp:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-dhcp:1040956-1043765
/directory/apacheds/branches/milestones/protocol-dhcp:1072812-1075328
-/directory/apacheds/trunk/protocol-dhcp:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/protocol-dhcp:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
/directory/studio/trunk/protocol-dhcp:1067786-1067997
Propchange: directory/apacheds/branches/milestones/protocol-dns/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:15:46 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-dns:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-dns:1040956-1043765
/directory/apacheds/branches/milestones/protocol-dns:1072812-1075328
-/directory/apacheds/trunk/protocol-dns:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/protocol-dns:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
/directory/studio/trunk/protocol-dns:1067786-1067997
Propchange: directory/apacheds/branches/milestones/protocol-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:15:46 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-kerberos:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos:1040956-1043765
/directory/apacheds/branches/milestones/protocol-kerberos:1072812-1075328
-/directory/apacheds/trunk/protocol-kerberos:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/protocol-kerberos:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
/directory/studio/trunk/protocol-kerberos:1067786-1067997
Modified: directory/apacheds/branches/milestones/protocol-kerberos/src/test/resources/org/apache/directory/server/kerberos/kdc/krb5.conf
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/protocol-kerberos/src/test/resources/org/apache/directory/server/kerberos/kdc/krb5.conf?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/protocol-kerberos/src/test/resources/org/apache/directory/server/kerberos/kdc/krb5.conf (original)
+++ directory/apacheds/branches/milestones/protocol-kerberos/src/test/resources/org/apache/directory/server/kerberos/kdc/krb5.conf Tue Mar 8 00:15:46 2011
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
[libdefaults]
default_realm = EXAMPLE.COM
Propchange: directory/apacheds/branches/milestones/protocol-ldap/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:15:46 2011
@@ -4,5 +4,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-ldap:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-ldap:1040956-1043765
/directory/apacheds/branches/milestones/protocol-ldap:1072812-1075328
-/directory/apacheds/trunk/protocol-ldap:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/protocol-ldap:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
/directory/studio/trunk/protocol-ldap:1067786-1067997
Modified: directory/apacheds/branches/milestones/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java (original)
+++ directory/apacheds/branches/milestones/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java Tue Mar 8 00:15:46 2011
@@ -186,7 +186,7 @@ public class LdapServer extends Director
private LdapRequestHandler<BindRequest> bindHandler;
private LdapRequestHandler<CompareRequest> compareHandler;
private LdapRequestHandler<DeleteRequest> deleteHandler;
- private ExtendedHandler<ExtendedRequest<ExtendedResponse>, ExtendedResponse> extendedHandler;
+ private ExtendedHandler extendedHandler;
private LdapRequestHandler<ModifyRequest> modifyHandler;
private LdapRequestHandler<ModifyDnRequest> modifyDnHandler;
private LdapRequestHandler<SearchRequest> searchHandler;
@@ -285,7 +285,7 @@ public class LdapServer extends Director
if ( getExtendedHandler() == null )
{
- setExtendedHandler( new ExtendedHandler<ExtendedRequest<ExtendedResponse>, ExtendedResponse>() );
+ setExtendedHandler( new ExtendedHandler() );
}
if ( getModifyHandler() == null )
@@ -771,7 +771,7 @@ public class LdapServer extends Director
* request handler
* @return the exnteded operation handler
*/
- public ExtendedOperationHandler<? extends ExtendedRequest<? extends ExtendedResponse>,? extends ExtendedResponse>
+ public ExtendedOperationHandler<ExtendedRequest<ExtendedResponse>,ExtendedResponse>
getExtendedOperationHandler( String oid )
{
for ( ExtendedOperationHandler<ExtendedRequest<ExtendedResponse>, ExtendedResponse> h : extendedOperationHandlers )
@@ -1136,7 +1136,7 @@ public class LdapServer extends Director
* @param extendedHandler The ExtendedRequest handler
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
- public void setExtendedHandler( ExtendedHandler<ExtendedRequest<ExtendedResponse>, ExtendedResponse> extendedHandler )
+ public void setExtendedHandler( ExtendedHandler extendedHandler )
{
this.handler.removeReceivedMessageHandler( ExtendedRequest.class );
this.extendedHandler = extendedHandler;
Modified: directory/apacheds/branches/milestones/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java (original)
+++ directory/apacheds/branches/milestones/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java Tue Mar 8 00:15:46 2011
@@ -310,7 +310,7 @@ public class BindHandler extends LdapReq
{
DirectoryService ds = ldapSession.getLdapServer().getDirectoryService();
String saslMechanism = bindRequest.getSaslMechanism();
- CoreSession userSession = ds.getSession( ldapPrincipal.getDN(), ldapPrincipal.getUserPassword(),
+ CoreSession userSession = ds.getSession( ldapPrincipal.getDn(), ldapPrincipal.getUserPassword(),
saslMechanism, null );
// Set the user session into the ldap session
Modified: directory/apacheds/branches/milestones/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java (original)
+++ directory/apacheds/branches/milestones/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java Tue Mar 8 00:15:46 2011
@@ -34,13 +34,11 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ExtendedHandler<Q extends ExtendedRequest<R>, R extends ExtendedResponse> extends LdapRequestHandler<Q>
+public class ExtendedHandler extends LdapRequestHandler<ExtendedRequest<ExtendedResponse>>
{
- public void handle( LdapSession session, Q req ) throws Exception
+ public void handle( LdapSession session, ExtendedRequest<ExtendedResponse> req ) throws Exception
{
- @SuppressWarnings("unchecked")
- ExtendedOperationHandler<Q, R> handler =
- ( ExtendedOperationHandler<Q, R> ) getLdapServer().getExtendedOperationHandler( req.getRequestName() );
+ ExtendedOperationHandler<ExtendedRequest<ExtendedResponse>, ExtendedResponse> handler = getLdapServer().getExtendedOperationHandler( req.getRequestName() );
if ( handler == null )
{
Propchange: directory/apacheds/branches/milestones/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:15:46 2011
@@ -8,5 +8,5 @@
/directory/apacheds/branches/apacheds-subtree/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:965203-965686
/directory/apacheds/branches/milestones/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:945827-946347
-/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:498338-580500,1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:498338-580500,1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
/directory/studio/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:1067786-1067997
Propchange: directory/apacheds/branches/milestones/protocol-ntp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:15:46 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-ntp:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-ntp:1040956-1043765
/directory/apacheds/branches/milestones/protocol-ntp:1072812-1075328
-/directory/apacheds/trunk/protocol-ntp:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/protocol-ntp:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
/directory/studio/trunk/protocol-ntp:1067786-1067997
Propchange: directory/apacheds/branches/milestones/protocol-shared/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:15:46 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-shared:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-shared:1040956-1043765
/directory/apacheds/branches/milestones/protocol-shared:1072812-1075328
-/directory/apacheds/trunk/protocol-shared:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/protocol-shared:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
/directory/studio/trunk/protocol-shared:1067786-1067997
Propchange: directory/apacheds/branches/milestones/server-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:15:46 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-annotations:980138-980937
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-annotations:1040956-1043765
/directory/apacheds/branches/milestones/server-annotations:1072812-1075328
-/directory/apacheds/trunk/server-annotations:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/server-annotations:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
/directory/studio/trunk/server-annotations:1067786-1067997
Propchange: directory/apacheds/branches/milestones/server-config/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:15:46 2011
@@ -5,5 +5,5 @@
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-config:1040956-1043765
/directory/apacheds/branches/milestones/server-config:1072812-1075328
/directory/apacheds/branches/server-config-annotations/server-config:1042727-1043868
-/directory/apacheds/trunk/server-config:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/server-config:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
/directory/studio/trunk/server-config:1067786-1067997
Propchange: directory/apacheds/branches/milestones/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:15:46 2011
@@ -9,5 +9,5 @@
/directory/apacheds/branches/milestones/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1072812-1075328
/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1042727-1043868
/directory/apacheds/branches/xdbm-refactoring/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:945827-946347
-/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
/directory/studio/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1067786-1067997
Propchange: directory/apacheds/branches/milestones/server-config/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:15:46 2011
@@ -12,5 +12,5 @@
/directory/apacheds/branches/milestones/server-config/src/main/resources:1072812-1075328
/directory/apacheds/branches/server-config-annotations/server-config/src/main/resources:1042727-1043868
/directory/apacheds/branches/xdbm-refactoring/default-config/src/main/resources:945827-946347
-/directory/apacheds/trunk/server-config/src/main/resources:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/server-config/src/main/resources:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
/directory/studio/trunk/server-config/src/main/resources:1067786-1067997
Propchange: directory/apacheds/branches/milestones/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:15:46 2011
@@ -11,5 +11,5 @@
/directory/apacheds/branches/milestones/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1072812-1075328
/directory/apacheds/branches/server-config-annotations/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1042727-1043868
/directory/apacheds/branches/xdbm-refactoring/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:945827-946347
-/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
/directory/studio/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1067786-1067997
Propchange: directory/apacheds/branches/milestones/server-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:15:46 2011
@@ -4,5 +4,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-integ:980138-980937
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-integ:1040956-1043765
/directory/apacheds/branches/milestones/server-integ:1072812-1075328
-/directory/apacheds/trunk/server-integ:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/server-integ:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
/directory/studio/trunk/server-integ:1067786-1067997
Propchange: directory/apacheds/branches/milestones/server-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:15:46 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-jndi:980138-980937
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-jndi:1040956-1043765
/directory/apacheds/branches/milestones/server-jndi:1072812-1075328
-/directory/apacheds/trunk/server-jndi:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/server-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
/directory/studio/trunk/server-jndi:1067786-1067997
Propchange: directory/apacheds/branches/milestones/server-replication/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:15:46 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-replication:980138-980937
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-replication:1040956-1043765
/directory/apacheds/branches/milestones/server-replication:1072812-1075328
-/directory/apacheds/trunk/server-replication:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/server-replication:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
/directory/studio/trunk/server-replication:1067786-1067997
Propchange: directory/apacheds/branches/milestones/server-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:15:46 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-tools:980138-980937
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-tools:1040956-1043765
/directory/apacheds/branches/milestones/server-tools:1072812-1075328
-/directory/apacheds/trunk/server-tools:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/server-tools:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
/directory/studio/trunk/server-tools:1067786-1067997
Propchange: directory/apacheds/branches/milestones/service-builder/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:15:46 2011
@@ -1,4 +1,4 @@
/directory/apacheds/branches/antoine/service-builder:1038305-1044163
/directory/apacheds/branches/milestones/service-builder:1072812-1075328
-/directory/apacheds/trunk/service-builder:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/service-builder:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
/directory/studio/trunk/service-builder:1067786-1067997
Modified: directory/apacheds/branches/milestones/service/ApacheDS.launch
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/service/ApacheDS.launch?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/service/ApacheDS.launch (original)
+++ directory/apacheds/branches/milestones/service/ApacheDS.launch Tue Mar 8 00:15:46 2011
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+-->
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/apacheds-service/src/main/java/org/apache/directory/server/UberjarMain.java"/>
Propchange: directory/apacheds/branches/milestones/test-framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:15:46 2011
@@ -9,5 +9,5 @@
/directory/apacheds/branches/apacheds-subtree/test-framework:965203-965686
/directory/apacheds/branches/milestones/test-framework:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/test-framework:945827-946347
-/directory/apacheds/trunk/test-framework:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/test-framework:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
/directory/studio/trunk/test-framework:1067786-1067997
Modified: directory/apacheds/branches/milestones/test-framework/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/test-framework/pom.xml?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/test-framework/pom.xml (original)
+++ directory/apacheds/branches/milestones/test-framework/pom.xml Tue Mar 8 00:15:46 2011
@@ -1,3 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
Propchange: directory/apacheds/branches/milestones/xdbm-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:15:46 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/xdbm-partition:980138-980938
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/xdbm-partition:1040956-1043765
/directory/apacheds/branches/milestones/xdbm-partition:1072812-1075328
-/directory/apacheds/trunk/xdbm-partition:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/xdbm-partition:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
/directory/studio/trunk/xdbm-partition:1067786-1067997
Modified: directory/apacheds/branches/milestones/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java (original)
+++ directory/apacheds/branches/milestones/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java Tue Mar 8 00:15:46 2011
@@ -28,6 +28,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.directory.server.constants.ApacheSchemaConstants;
import org.apache.directory.server.core.entry.ClonedServerEntry;
@@ -83,7 +84,7 @@ public abstract class AbstractStore<E, I
protected URI partitionPath;
/** true if we sync disks on every write operation */
- protected boolean isSyncOnWrite = true;
+ protected AtomicBoolean isSyncOnWrite = new AtomicBoolean( true );
/** The store cache size */
protected int cacheSize = DEFAULT_CACHE_SIZE;
@@ -187,13 +188,13 @@ public abstract class AbstractStore<E, I
public void setSyncOnWrite( boolean isSyncOnWrite )
{
protect( "syncOnWrite" );
- this.isSyncOnWrite = isSyncOnWrite;
+ this.isSyncOnWrite.set( isSyncOnWrite );
}
public boolean isSyncOnWrite()
{
- return isSyncOnWrite;
+ return isSyncOnWrite.get();
}
@@ -1012,7 +1013,7 @@ public abstract class AbstractStore<E, I
master.put( id, entry );
- if ( isSyncOnWrite )
+ if ( isSyncOnWrite.get() )
{
sync();
}
@@ -1059,7 +1060,7 @@ public abstract class AbstractStore<E, I
updateCsnIndex( entry, id );
master.put( id, entry );
- if ( isSyncOnWrite )
+ if ( isSyncOnWrite.get() )
{
sync();
}
@@ -1100,7 +1101,7 @@ public abstract class AbstractStore<E, I
updateCsnIndex( entry, id );
master.put( id, entry );
- if ( isSyncOnWrite )
+ if ( isSyncOnWrite.get() )
{
sync();
}
@@ -1156,7 +1157,7 @@ public abstract class AbstractStore<E, I
master.delete( id );
- if ( isSyncOnWrite )
+ if ( isSyncOnWrite.get() )
{
sync();
}
@@ -1287,7 +1288,7 @@ public abstract class AbstractStore<E, I
master.put( id, entry );
- if ( isSyncOnWrite )
+ if ( isSyncOnWrite.get() )
{
sync();
}
@@ -1347,7 +1348,7 @@ public abstract class AbstractStore<E, I
rename( oldDn, newRdn, deleteOldRdn, modifiedEntry );
moveAndRename( oldDn, oldId, newSuperiorDn, newRdn, modifiedEntry );
- if ( isSyncOnWrite )
+ if ( isSyncOnWrite.get() )
{
sync();
}
@@ -1447,7 +1448,7 @@ public abstract class AbstractStore<E, I
master.put( entryId, modifiedEntry );
}
- if ( isSyncOnWrite )
+ if ( isSyncOnWrite.get() )
{
sync();
}
Modified: directory/apacheds/branches/milestones/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/milestones/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java?rev=1079045&r1=1079044&r2=1079045&view=diff
==============================================================================
--- directory/apacheds/branches/milestones/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java (original)
+++ directory/apacheds/branches/milestones/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java Tue Mar 8 00:15:46 2011
@@ -27,7 +27,9 @@ import java.io.ObjectOutput;
import java.util.Arrays;
import java.util.List;
+import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
import org.apache.directory.shared.ldap.model.name.Rdn;
+import org.apache.directory.shared.ldap.model.name.RdnSerializer;
/**
@@ -189,7 +191,7 @@ public class ParentIdAndRdn<ID extends C
for ( Rdn rdn : rdns )
{
- rdn.writeExternal( out );
+ RdnSerializer.serialize( rdn, out );
}
}
@@ -203,9 +205,14 @@ public class ParentIdAndRdn<ID extends C
for ( int i = 0; i < size; i++ )
{
- Rdn rdn = new Rdn();
- rdn.readExternal( in );
- rdns[i] = rdn;
+ try
+ {
+ rdns[i] = RdnSerializer.deserialize( null, in );
+ }
+ catch ( LdapInvalidDnException lide )
+ {
+ throw new IOException( lide.getMessage() );
+ }
}
}
Propchange: directory/apacheds/branches/milestones/xdbm-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:15:46 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/xdbm-tools:980138-980938
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/xdbm-tools:1040956-1043765
/directory/apacheds/branches/milestones/xdbm-tools:1072812-1075328
-/directory/apacheds/trunk/xdbm-tools:1066126-1067785,1068026-1072718,1072800-1075329
+/directory/apacheds/trunk/xdbm-tools:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
/directory/studio/trunk/xdbm-tools:1067786-1067997