Author: trustin
Date: Thu Mar 17 16:26:03 2005
New Revision: 157997
URL: http://svn.apache.org/viewcvs?view=rev&rev=157997
Log:
* Fixed apacheds-plugin to generate proper eclipse project files.
* Optimized imports.
Modified:
directory/apacheds/trunk/plugin/maven.xml
directory/apacheds/trunk/plugin/project.properties
directory/apacheds/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolTask.java
directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/AbstractTestCase.java
directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/AttributeTypesTemplateTest.java
directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/DirectorySchemaToolTest.java
directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/ObjectClassesTemplateTest.java
directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/OpenLdapSchemaParserTest.java
Modified: directory/apacheds/trunk/plugin/maven.xml
URL:
http://svn.apache.org/viewcvs/directory/apacheds/trunk/plugin/maven.xml?view=diff&r1=157996&r2=157997
==============================================================================
--- directory/apacheds/trunk/plugin/maven.xml (original)
+++ directory/apacheds/trunk/plugin/maven.xml Thu Mar 17 16:26:03 2005
@@ -8,4 +8,8 @@
<!-- Can be removed if multiproject-1.6 is required -->
<attainGoal name="plugin:repository-deploy"/>
</goal>
+
+ <preGoal name="eclipse">
+ <attainGoal name="antlr:generate" />
+ </preGoal>
</project>
Modified: directory/apacheds/trunk/plugin/project.properties
URL:
http://svn.apache.org/viewcvs/directory/apacheds/trunk/plugin/project.properties?view=diff&r1=157996&r2=157997
==============================================================================
--- directory/apacheds/trunk/plugin/project.properties (original)
+++ directory/apacheds/trunk/plugin/project.properties Thu Mar 17 16:26:03 2005
@@ -37,3 +37,6 @@
maven.multiproject.type=plugin
maven.xdoc.includeProjectDocumentation=yes
maven.license.licenseFile=${basedir}/../LICENSE.txt
+
+maven.eclipse.classpath.include=${basedir}/target/antlr
+
Modified:
directory/apacheds/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolTask.java
URL:
http://svn.apache.org/viewcvs/directory/apacheds/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolTask.java?view=diff&r1=157996&r2=157997
==============================================================================
---
directory/apacheds/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolTask.java
(original)
+++
directory/apacheds/trunk/plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolTask.java
Thu Mar 17 16:26:03 2005
@@ -17,10 +17,8 @@
package org.apache.ldap.server.tools.schema;
-import org.apache.tools.ant.BuildException;
-import org.apache.ldap.server.schema.bootstrap.AbstractBootstrapSchema;
import org.apache.ldap.server.schema.bootstrap.AbstractBootstrapSchema;
-import org.apache.ldap.server.tools.schema.DirectorySchemaTool;
+import org.apache.tools.ant.BuildException;
/**
Modified:
directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/AbstractTestCase.java
URL:
http://svn.apache.org/viewcvs/directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/AbstractTestCase.java?view=diff&r1=157996&r2=157997
==============================================================================
---
directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/AbstractTestCase.java
(original)
+++
directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/AbstractTestCase.java
Thu Mar 17 16:26:03 2005
@@ -17,19 +17,17 @@
package org.apache.ldap.server.tools.schema;
-import junit.framework.TestCase;
-
-import java.io.InputStream;
+import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
-import java.io.File;
+import java.io.InputStream;
+
+import junit.framework.TestCase;
import org.apache.ldap.server.schema.bootstrap.BootstrapSchema;
import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
-import org.apache.ldap.server.schema.bootstrap.BootstrapSchema;
-import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum;
/**
Modified:
directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/AttributeTypesTemplateTest.java
URL:
http://svn.apache.org/viewcvs/directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/AttributeTypesTemplateTest.java?view=diff&r1=157996&r2=157997
==============================================================================
---
directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/AttributeTypesTemplateTest.java
(original)
+++
directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/AttributeTypesTemplateTest.java
Thu Mar 17 16:26:03 2005
@@ -18,8 +18,6 @@
import org.apache.ldap.server.schema.bootstrap.AbstractBootstrapSchema;
-import org.apache.ldap.server.schema.bootstrap.AbstractBootstrapSchema;
-import org.apache.ldap.server.tools.schema.AbstractTestCase;
/**
Modified:
directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/DirectorySchemaToolTest.java
URL:
http://svn.apache.org/viewcvs/directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/DirectorySchemaToolTest.java?view=diff&r1=157996&r2=157997
==============================================================================
---
directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/DirectorySchemaToolTest.java
(original)
+++
directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/DirectorySchemaToolTest.java
Thu Mar 17 16:26:03 2005
@@ -17,12 +17,9 @@
package org.apache.ldap.server.tools.schema;
-import java.io.IOException;
-
import junit.framework.TestCase;
+
import org.apache.ldap.server.schema.bootstrap.AbstractBootstrapSchema;
-import org.apache.ldap.server.schema.bootstrap.AbstractBootstrapSchema;
-import org.apache.ldap.server.tools.schema.DirectorySchemaTool;
/**
Modified:
directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/ObjectClassesTemplateTest.java
URL:
http://svn.apache.org/viewcvs/directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/ObjectClassesTemplateTest.java?view=diff&r1=157996&r2=157997
==============================================================================
---
directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/ObjectClassesTemplateTest.java
(original)
+++
directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/ObjectClassesTemplateTest.java
Thu Mar 17 16:26:03 2005
@@ -18,8 +18,6 @@
import org.apache.ldap.server.schema.bootstrap.AbstractBootstrapSchema;
-import org.apache.ldap.server.schema.bootstrap.AbstractBootstrapSchema;
-import org.apache.ldap.server.tools.schema.AbstractTestCase;
/**
Modified:
directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/OpenLdapSchemaParserTest.java
URL:
http://svn.apache.org/viewcvs/directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/OpenLdapSchemaParserTest.java?view=diff&r1=157996&r2=157997
==============================================================================
---
directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/OpenLdapSchemaParserTest.java
(original)
+++
directory/apacheds/trunk/plugin/src/test/org/apache/ldap/server/tools/schema/OpenLdapSchemaParserTest.java
Thu Mar 17 16:26:03 2005
@@ -17,15 +17,12 @@
package org.apache.ldap.server.tools.schema;
-import java.util.Map;
import java.io.InputStream;
+import java.util.Map;
import junit.framework.TestCase;
+
import org.apache.ldap.common.schema.ObjectClassTypeEnum;
-import org.apache.ldap.server.tools.schema.AttributeTypeLiteral;
-import org.apache.ldap.server.tools.schema.ConsoleParserMonitor;
-import org.apache.ldap.server.tools.schema.ObjectClassLiteral;
-import org.apache.ldap.server.tools.schema.OpenLdapSchemaParser;
/**
