directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r893872 - in /directory/shared/branches/shared-schema/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor: UniqueResourceException.java impl/DefaultSchemaLdifExtractor.java impl/UniqueResourceException.java
Date Fri, 25 Dec 2009 15:39:27 GMT
Author: akarasulu
Date: Fri Dec 25 15:39:27 2009
New Revision: 893872

URL: http://svn.apache.org/viewvc?rev=893872&view=rev
Log:
until this bundle plugin issue is resolved we will keep this as a jar

Added:
    directory/shared/branches/shared-schema/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/UniqueResourceException.java
      - copied, changed from r893561, directory/shared/branches/shared-schema/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/UniqueResourceException.java
Removed:
    directory/shared/branches/shared-schema/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/UniqueResourceException.java
Modified:
    directory/shared/branches/shared-schema/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/DefaultSchemaLdifExtractor.java

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=893872&r1=893871&r2=893872&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 15:39:27 2009
@@ -36,7 +36,6 @@
 import java.util.regex.Pattern;
 
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
-import org.apache.directory.shared.ldap.schema.ldif.extractor.UniqueResourceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -119,13 +118,6 @@
      */
     public void extractOrCopy( boolean overwrite ) throws IOException
     {
-        if ( ! outputDirectory.exists() )
-        {
-            outputDirectory.mkdir();
-        }
-
-        File schemaDirectory = new File( outputDirectory, SCHEMA_SUBDIR );
-
         if ( ! schemaDirectory.exists() )
         {
             schemaDirectory.mkdir();
@@ -260,23 +252,6 @@
             parent = parent.getParentFile();
         }
 
-        /*
-
-           this seems retarded so I replaced it for now with what is below it
-           will not break from loop above unless parent == null so the if is
-           never executed - just the else is executed every time
-
-        if ( parent != null )
-        {
-            return assembleDestinationFile( fileComponentStack );
-        }
-        else
-        {
-            throw new IllegalStateException( "parent cannot be null" );
-        }
-        
-        */
-
         throw new IllegalStateException( "parent cannot be null" );
     }
     

Copied: directory/shared/branches/shared-schema/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/UniqueResourceException.java
(from r893561, directory/shared/branches/shared-schema/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/UniqueResourceException.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/UniqueResourceException.java?p2=directory/shared/branches/shared-schema/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/UniqueResourceException.java&p1=directory/shared/branches/shared-schema/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/UniqueResourceException.java&r1=893561&r2=893872&rev=893872&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/UniqueResourceException.java
(original)
+++ directory/shared/branches/shared-schema/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/UniqueResourceException.java
Fri Dec 25 15:39:27 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.directory.shared.ldap.schema.ldif.extractor;
+package org.apache.directory.shared.ldap.schema.ldif.extractor.impl;
 
 
 import java.net.URL;



Mime
View raw message