Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 78790 invoked from network); 25 Dec 2009 09:26:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 25 Dec 2009 09:26:42 -0000 Received: (qmail 22754 invoked by uid 500); 25 Dec 2009 09:26:42 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 22685 invoked by uid 500); 25 Dec 2009 09:26:41 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 22676 invoked by uid 99); 25 Dec 2009 09:26:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Dec 2009 09:26:41 +0000 X-ASF-Spam-Status: No, hits=-3.5 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Dec 2009 09:26:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 84B572388A32; Fri, 25 Dec 2009 09:26:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r893847 - in /directory: apacheds/branches/apacheds-schema/core-builder/src/main/java/org/apache/directory/server/core/builder/ shared/branches/shared-schema/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/i... Date: Fri, 25 Dec 2009 09:26:14 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091225092614.84B572388A32@eris.apache.org> Author: elecharny Date: Fri Dec 25 09:26:12 2009 New Revision: 893847 URL: http://svn.apache.org/viewvc?rev=893847&view=rev Log: o Fixed some compilation errors : you can't @override when the super class does not exist o Fixed other compilation errors Modified: directory/apacheds/branches/apacheds-schema/core-builder/src/main/java/org/apache/directory/server/core/builder/DirectoryServiceBuilder.java directory/shared/branches/shared-schema/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/DefaultSchemaLdifExtractor.java Modified: directory/apacheds/branches/apacheds-schema/core-builder/src/main/java/org/apache/directory/server/core/builder/DirectoryServiceBuilder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-builder/src/main/java/org/apache/directory/server/core/builder/DirectoryServiceBuilder.java?rev=893847&r1=893846&r2=893847&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-builder/src/main/java/org/apache/directory/server/core/builder/DirectoryServiceBuilder.java (original) +++ directory/apacheds/branches/apacheds-schema/core-builder/src/main/java/org/apache/directory/server/core/builder/DirectoryServiceBuilder.java Fri Dec 25 09:26:12 2009 @@ -38,6 +38,7 @@ import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.schema.SchemaManager; import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; +import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.registries.SchemaLoader; import org.apache.directory.shared.ldap.util.ExceptionUtils; import org.apache.directory.shared.schema.DefaultSchemaManager; @@ -96,7 +97,7 @@ // Extract the schema on disk (a brand new one) and load the registries File schemaRepository = new File( workingDirectory, "schema" ); - SchemaLdifExtractor extractor = new SchemaLdifExtractor( new File( workingDirectory ) ); + SchemaLdifExtractor extractor = new DefaultSchemaLdifExtractor( new File( workingDirectory ) ); extractor.extractOrCopy(); schemaPartition.setWrappedPartition( ldifPartition ); Modified: directory/shared/branches/shared-schema/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/DefaultSchemaLdifExtractor.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/DefaultSchemaLdifExtractor.java?rev=893847&r1=893846&r2=893847&view=diff ============================================================================== --- directory/shared/branches/shared-schema/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/DefaultSchemaLdifExtractor.java (original) +++ directory/shared/branches/shared-schema/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/DefaultSchemaLdifExtractor.java Fri Dec 25 09:26:12 2009 @@ -35,7 +35,6 @@ import java.util.Map.Entry; import java.util.regex.Pattern; -import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.ResourceMap; import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor; import org.apache.directory.shared.ldap.schema.ldif.extractor.UniqueResourceException; import org.slf4j.Logger; @@ -118,7 +117,6 @@ * @param overwrite over write extracted structure if true, false otherwise * @throws IOException if schema already extracted and on IO errors */ - @Override public void extractOrCopy( boolean overwrite ) throws IOException { if ( ! outputDirectory.exists() ) @@ -163,7 +161,6 @@ * * @throws IOException if schema already extracted and on IO errors */ - @Override public void extractOrCopy() throws IOException { extractOrCopy( false );