You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/09/18 02:51:41 UTC
svn commit: r998381 - in /directory: apacheds/trunk/
apacheds/trunk/osgi/src/main/filtered-resources/
daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/
shared/trunk/ shared/trunk/all/ shared/trunk/ldap-convert/ s...
Author: elecharny
Date: Sat Sep 18 00:51:40 2010
New Revision: 998381
URL: http://svn.apache.org/viewvc?rev=998381&view=rev
Log:
Merged ldap-converter into shared-ldap
Added:
directory/shared/trunk/ldap/src/main/antlr/schemaConverter.g
- copied, changed from r998099, directory/shared/trunk/ldap-convert/src/main/antlr/schema.g
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/converter/
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/converter/schema/
- copied from r998099, directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/converter/
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/converter/schema/
- copied from r998099, directory/shared/trunk/ldap-convert/src/test/java/org/apache/directory/shared/converter/schema/
directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/converter/
directory/shared/trunk/ldap/src/test/resources/org/apache/directory/shared/converter/schema/
- copied from r998099, directory/shared/trunk/ldap-convert/src/test/resources/org/apache/directory/shared/converter/schema/
Removed:
directory/shared/trunk/ldap-convert/pom.xml
directory/shared/trunk/ldap-convert/src/
Modified:
directory/apacheds/trunk/osgi/src/main/filtered-resources/features.xml
directory/apacheds/trunk/pom.xml
directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype
directory/shared/trunk/all/pom.xml
directory/shared/trunk/ldap/pom.xml
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/converter/schema/SchemaParser.java
directory/shared/trunk/pom.xml
Modified: directory/apacheds/trunk/osgi/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/osgi/src/main/filtered-resources/features.xml?rev=998381&r1=998380&r2=998381&view=diff
==============================================================================
--- directory/apacheds/trunk/osgi/src/main/filtered-resources/features.xml (original)
+++ directory/apacheds/trunk/osgi/src/main/filtered-resources/features.xml Sat Sep 18 00:51:40 2010
@@ -31,7 +31,7 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/2.4_2-SNAPSHOT</bundle>
<bundle>mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/3.0.1_2-SNAPSHOT</bundle>
- <bundle>mvn:org.apache.mina/mina-core/2.0.0-RC1-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.mina/mina-core/2.0.0-RC1</bundle>
<bundle>mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
<bundle>mvn:org.apache.directory.server/apacheds-osgi/${apache.directory.version}</bundle>
</feature>
Modified: directory/apacheds/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/pom.xml?rev=998381&r1=998380&r2=998381&view=diff
==============================================================================
--- directory/apacheds/trunk/pom.xml (original)
+++ directory/apacheds/trunk/pom.xml Sat Sep 18 00:51:40 2010
@@ -442,12 +442,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-converter</artifactId>
- <version>${org.apache.directory.shared.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-jndi</artifactId>
<version>${org.apache.directory.shared.version}</version>
</dependency>
Modified: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype?rev=998381&r1=998380&r2=998381&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype (original)
+++ directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/Prototype Sat Sep 18 00:51:40 2010
@@ -66,7 +66,6 @@ f none /opt/apacheds/lib/shared-cursor-0
f none /opt/apacheds/lib/shared-dsml-parser-0.9.19-SNAPSHOT.jar 0644 apacheds apacheds
f none /opt/apacheds/lib/shared-i18n-0.9.19-SNAPSHOT.jar 0644 apacheds apacheds
f none /opt/apacheds/lib/shared-ldap-0.9.19-SNAPSHOT.jar 0644 apacheds apacheds
-f none /opt/apacheds/lib/shared-ldap-converter-0.9.19-SNAPSHOT.jar 0644 apacheds apacheds
f none /opt/apacheds/lib/shared-ldap-jndi-0.9.19-SNAPSHOT.jar 0644 apacheds apacheds
f none /opt/apacheds/lib/shared-ldap-schema-0.9.19-SNAPSHOT.jar 0644 apacheds apacheds
f none /opt/apacheds/lib/slf4j-api-1.5.11.jar 0644 apacheds apacheds
Modified: directory/shared/trunk/all/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/all/pom.xml?rev=998381&r1=998380&r2=998381&view=diff
==============================================================================
--- directory/shared/trunk/all/pom.xml (original)
+++ directory/shared/trunk/all/pom.xml Sat Sep 18 00:51:40 2010
@@ -56,11 +56,6 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>shared-ldap-converter</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>shared-ldap-jndi</artifactId>
</dependency>
Modified: directory/shared/trunk/ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/pom.xml?rev=998381&r1=998380&r2=998381&view=diff
==============================================================================
--- directory/shared/trunk/ldap/pom.xml (original)
+++ directory/shared/trunk/ldap/pom.xml Sat Sep 18 00:51:40 2010
@@ -82,7 +82,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antlr-plugin</artifactId>
<configuration>
- <grammars>schema-extension.g schema-qdstring.g schema-value.g schema.g TriggerSpecification.g distinguishedName.g ACIItem.g ACIItemChecker.g subtree-specification.g SubtreeSpecificationChecker.g</grammars>
+ <grammars>schema-extension.g schema-qdstring.g schema-value.g schema.g schemaConverter.g TriggerSpecification.g distinguishedName.g ACIItem.g ACIItemChecker.g subtree-specification.g SubtreeSpecificationChecker.g</grammars>
</configuration>
<executions>
<execution>
Copied: directory/shared/trunk/ldap/src/main/antlr/schemaConverter.g (from r998099, directory/shared/trunk/ldap-convert/src/main/antlr/schema.g)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/schemaConverter.g?p2=directory/shared/trunk/ldap/src/main/antlr/schemaConverter.g&p1=directory/shared/trunk/ldap-convert/src/main/antlr/schema.g&r1=998099&r2=998381&rev=998381&view=diff
==============================================================================
--- directory/shared/trunk/ldap-convert/src/main/antlr/schema.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/schemaConverter.g Sat Sep 18 00:51:40 2010
@@ -45,7 +45,7 @@ import org.apache.directory.shared.ldap.
}
-class antlrSchemaLexer extends Lexer ;
+class antlrSchemaConverterLexer extends Lexer ;
options {
k = 7 ;
@@ -109,7 +109,7 @@ SYNTAX
"syntax" WS NUMERICOID ( OPEN_BRACKET ( DIGIT )+ CLOSE_BRACKET )?
;
-class antlrSchemaParser extends Parser ;
+class antlrSchemaConverterParser extends Parser ;
options {
k = 5 ;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/converter/schema/SchemaParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/converter/schema/SchemaParser.java?rev=998381&r1=998099&r2=998381&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/converter/schema/SchemaParser.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/converter/schema/SchemaParser.java Sat Sep 18 00:51:40 2010
@@ -45,7 +45,7 @@ import antlr.TokenStreamException;
public class SchemaParser
{
/** The antlr generated parser */
- private antlrSchemaParser parser = null;
+ private antlrSchemaConverterParser parser = null;
/** A pipe into the parser */
private PipedOutputStream parserIn = null;
@@ -81,8 +81,8 @@ public class SchemaParser
parserIn = new PipedOutputStream();
PipedInputStream in = new PipedInputStream();
parserIn.connect( in );
- antlrSchemaLexer lexer = new antlrSchemaLexer( in );
- parser = new antlrSchemaParser( lexer );
+ antlrSchemaConverterLexer lexer = new antlrSchemaConverterLexer( in );
+ parser = new antlrSchemaConverterParser( lexer );
}
Modified: directory/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/pom.xml?rev=998381&r1=998380&r2=998381&view=diff
==============================================================================
--- directory/shared/trunk/pom.xml (original)
+++ directory/shared/trunk/pom.xml Sat Sep 18 00:51:40 2010
@@ -77,7 +77,6 @@
<module>ldap-jndi</module>
<module>ldap-schema</module>
<module>asn1-codec</module>
- <module>ldap-convert</module>
<module>cursor</module>
<module>ldap-client-api</module>
<module>dsml-parser</module>
@@ -140,12 +139,6 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>shared-ldap-converter</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>shared-ldap-jndi</artifactId>
<version>${project.version}</version>
</dependency>