directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r619884 - in /directory/studio/trunk: dependencies/externals/org/apache/directory/shared/shared-asn1/0.9.8-SNAPSHOT/ dependencies/externals/org/apache/directory/shared/shared-ldap-constants/0.9.8-SNAPSHOT/ dependencies/externals/org/apache/...
Date Fri, 08 Feb 2008 13:41:53 GMT
Author: pamarcelot
Date: Fri Feb  8 05:41:48 2008
New Revision: 619884

URL: http://svn.apache.org/viewvc?rev=619884&view=rev
Log:
Updated shared-ldap to the latest version of the trunk. Updated the SchemaEditor to use the
OpenLDAP schema file parser now in shared-ldap. Moved common-lang depdency to version 2.3.
Please, make sure to remove your Ivy repository before building.

Modified:
    directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-asn1/0.9.8-SNAPSHOT/ivy.xml
    directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-asn1/0.9.8-SNAPSHOT/shared-asn1-0.9.8-SNAPSHOT.jar
    directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-ldap-constants/0.9.8-SNAPSHOT/ivy.xml
    directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-ldap-constants/0.9.8-SNAPSHOT/shared-ldap-constants-0.9.8-SNAPSHOT.jar
    directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-ldap/0.9.8-SNAPSHOT/ivy.xml
    directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-ldap/0.9.8-SNAPSHOT/shared-ldap-0.9.8-SNAPSHOT.jar
    directory/studio/trunk/studio-jars/.classpath
    directory/studio/trunk/studio-jars/META-INF/MANIFEST.MF
    directory/studio/trunk/studio-jars/ivy.xml
    directory/studio/trunk/studio-schemaeditor/.classpath
    directory/studio/trunk/studio-schemaeditor/ivy.xml
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java
    directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java

Modified: directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-asn1/0.9.8-SNAPSHOT/ivy.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-asn1/0.9.8-SNAPSHOT/ivy.xml?rev=619884&r1=619883&r2=619884&view=diff
==============================================================================
--- directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-asn1/0.9.8-SNAPSHOT/ivy.xml
(original)
+++ directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-asn1/0.9.8-SNAPSHOT/ivy.xml
Fri Feb  8 05:41:48 2008
@@ -3,7 +3,7 @@
 		module="shared-asn1"
 		revision="0.9.8-SNAPSHOT"
 		status="release"
-		publication="20071101140800"
+		publication="20080208115800"
 	/>
 	<configurations>
 		<conf name="default" visibility="public"/>

Modified: directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-asn1/0.9.8-SNAPSHOT/shared-asn1-0.9.8-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-asn1/0.9.8-SNAPSHOT/shared-asn1-0.9.8-SNAPSHOT.jar?rev=619884&r1=619883&r2=619884&view=diff
==============================================================================
Binary files - no diff available.

Modified: directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-ldap-constants/0.9.8-SNAPSHOT/ivy.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-ldap-constants/0.9.8-SNAPSHOT/ivy.xml?rev=619884&r1=619883&r2=619884&view=diff
==============================================================================
--- directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-ldap-constants/0.9.8-SNAPSHOT/ivy.xml
(original)
+++ directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-ldap-constants/0.9.8-SNAPSHOT/ivy.xml
Fri Feb  8 05:41:48 2008
@@ -3,14 +3,14 @@
 		module="shared-ldap-constants"
 		revision="0.9.8-SNAPSHOT"
 		status="release"
-		publication="20071110140800"
+		publication="20080208115800"
 	/>
 	<configurations>
 		<conf name="default" visibility="public"/>
 	</configurations>
 	<publications>
 		<artifact name="shared-ldap-constants" type="jar" ext="jar" conf="default"/>
-	</publications>
-        <dependencies>
-        </dependencies>
-</ivy-module>
+	</publications>
+        <dependencies>
+        </dependencies>
+</ivy-module>

Modified: directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-ldap-constants/0.9.8-SNAPSHOT/shared-ldap-constants-0.9.8-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-ldap-constants/0.9.8-SNAPSHOT/shared-ldap-constants-0.9.8-SNAPSHOT.jar?rev=619884&r1=619883&r2=619884&view=diff
==============================================================================
Binary files - no diff available.

Modified: directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-ldap/0.9.8-SNAPSHOT/ivy.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-ldap/0.9.8-SNAPSHOT/ivy.xml?rev=619884&r1=619883&r2=619884&view=diff
==============================================================================
--- directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-ldap/0.9.8-SNAPSHOT/ivy.xml
(original)
+++ directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-ldap/0.9.8-SNAPSHOT/ivy.xml
Fri Feb  8 05:41:48 2008
@@ -3,18 +3,19 @@
 		module="shared-ldap"
 		revision="0.9.8-SNAPSHOT"
 		status="release"
-		publication="20071110140800"
+		publication="20080208115800"
 	/>
 	<configurations>
 		<conf name="default" visibility="public"/>
 	</configurations>
 	<publications>
 		<artifact name="shared-ldap" type="jar" ext="jar" conf="default"/>
-	</publications>
-	<dependencies>
-		<dependency org="org.apache.directory.shared" name="shared-asn1" rev="0.9.8-SNAPSHOT"
conf="default"/>
-		<dependency org="org.slf4j" name="nlog4j" rev="1.2.25" conf="default"/>
-		<dependency org="commons-collections" name="commons-collections" rev="3.2" conf="default"/>
-		<dependency org="antlr" name="antlr" rev="2.7.6" conf="default"/>
+	</publications>
+	<dependencies>
+		<dependency org="org.apache.directory.shared" name="shared-asn1" rev="0.9.8-SNAPSHOT"
conf="default"/>
+		<dependency org="org.slf4j" name="nlog4j" rev="1.2.25" conf="default"/>
+		<dependency org="commons-collections" name="commons-collections" rev="3.2" conf="default"/>
+		<dependency org="commons-lang" name="commons-lang" rev="2.3" conf="default"/>
+		<dependency org="antlr" name="antlr" rev="2.7.6" conf="default"/>
 	</dependencies>
 </ivy-module>

Modified: directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-ldap/0.9.8-SNAPSHOT/shared-ldap-0.9.8-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/directory/studio/trunk/dependencies/externals/org/apache/directory/shared/shared-ldap/0.9.8-SNAPSHOT/shared-ldap-0.9.8-SNAPSHOT.jar?rev=619884&r1=619883&r2=619884&view=diff
==============================================================================
Binary files - no diff available.

Modified: directory/studio/trunk/studio-jars/.classpath
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-jars/.classpath?rev=619884&r1=619883&r2=619884&view=diff
==============================================================================
--- directory/studio/trunk/studio-jars/.classpath (original)
+++ directory/studio/trunk/studio-jars/.classpath Fri Feb  8 05:41:48 2008
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/commons-lang-2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/studio-dsml-parser-0.4.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/shared-asn1-0.9.8-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/shared-ldap-0.9.8-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/shared-ldap-constants-0.9.8-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-io-1.3.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="lib/xpp3-1.1.3_8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/nlog4j-1.2.25.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.6.jar"/>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="lib" exported="true" path="lib/antlr-2.7.6.jar"/>
+	<classpathentry kind="lib" exported="true" path="lib/commons-collections-3.2.jar"/>
+	<classpathentry kind="lib" exported="true" path="lib/commons-io-1.3.1.jar"/>
+	<classpathentry kind="lib" exported="true" path="lib/commons-lang-2.3.jar"/>
+	<classpathentry kind="lib" exported="true" path="lib/dom4j-1.6.1.jar"/>
+	<classpathentry kind="lib" exported="true" path="lib/nlog4j-1.2.25.jar"/>
+	<classpathentry kind="lib" exported="true" path="lib/shared-asn1-0.9.8-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" exported="true" path="lib/shared-ldap-0.9.8-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" exported="true" path="lib/shared-ldap-constants-0.9.8-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" exported="true" path="lib/studio-dsml-parser-0.4.1.jar"/>
+	<classpathentry kind="lib" exported="true" path="lib/xpp3-1.1.3_8.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: directory/studio/trunk/studio-jars/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-jars/META-INF/MANIFEST.MF?rev=619884&r1=619883&r2=619884&view=diff
==============================================================================
--- directory/studio/trunk/studio-jars/META-INF/MANIFEST.MF (original)
+++ directory/studio/trunk/studio-jars/META-INF/MANIFEST.MF Fri Feb  8 05:41:48 2008
@@ -52,6 +52,7 @@
  org.apache.commons.lang.exception,
  org.apache.commons.lang.math,
  org.apache.commons.lang.mutable,
+ org.apache.commons.lang.text,
  org.apache.commons.lang.time,
  org.apache.directory.shared.asn1,
  org.apache.directory.shared.asn1.ber,
@@ -95,12 +96,12 @@
  org.apache.directory.shared.ldap.name,
  org.apache.directory.shared.ldap.schema,
  org.apache.directory.shared.ldap.schema.comparator,
+ org.apache.directory.shared.ldap.schema.parser,
  org.apache.directory.shared.ldap.schema.syntax,
  org.apache.directory.shared.ldap.schema.syntax.parser,
  org.apache.directory.shared.ldap.sp,
  org.apache.directory.shared.ldap.subtree,
  org.apache.directory.shared.ldap.trigger,
- org.apache.directory.shared.ldap.url,
  org.apache.directory.shared.ldap.util,
  org.apache.directory.shared.ldap.util.unicode,
  org.apache.directory.studio.dsmlv2,

Modified: directory/studio/trunk/studio-jars/ivy.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-jars/ivy.xml?rev=619884&r1=619883&r2=619884&view=diff
==============================================================================
--- directory/studio/trunk/studio-jars/ivy.xml (original)
+++ directory/studio/trunk/studio-jars/ivy.xml Fri Feb  8 05:41:48 2008
@@ -21,7 +21,6 @@
 	<dependencies>
 		<dependency org="antlr" name="antlr" rev="2.7.6"/>
     	<dependency org="org.apache.directory.studio" name="studio-dsml-parser" rev="0.4.1"/>
-    	<dependency org="commons-lang" name="commons-lang" rev="2.1"/>
     	<dependency org="commons-io" name="commons-io" rev="1.3.1"/>
     </dependencies>
 </ivy-module>

Modified: directory/studio/trunk/studio-schemaeditor/.classpath
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/.classpath?rev=619884&r1=619883&r2=619884&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/.classpath (original)
+++ directory/studio/trunk/studio-schemaeditor/.classpath Fri Feb  8 05:41:48 2008
@@ -6,7 +6,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="lib" path="lib/junit-3.8.2.jar"/>
-	<classpathentry kind="lib" path="lib/apacheds-core-plugin-1.5.1-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="lib/shared-converter-0.9.7-SNAPSHOT.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: directory/studio/trunk/studio-schemaeditor/ivy.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/ivy.xml?rev=619884&r1=619883&r2=619884&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/ivy.xml (original)
+++ directory/studio/trunk/studio-schemaeditor/ivy.xml Fri Feb  8 05:41:48 2008
@@ -22,9 +22,6 @@
 		<dependency org="junit" 
 					name="junit" 
 					rev="3.8.2"/>
-		<dependency org="org.apache.directory.server" 
-					name="apacheds-core-plugin" 
-					rev="1.5.1-SNAPSHOT"/>
 		<dependency org="org.apache.directory.shared" 
 					name="shared-converter" 
 					rev="0.9.7-SNAPSHOT"/>

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java?rev=619884&r1=619883&r2=619884&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java
Fri Feb  8 05:41:48 2008
@@ -29,9 +29,9 @@
 import java.util.Scanner;
 import java.util.regex.MatchResult;
 
-import org.apache.directory.server.core.tools.schema.AttributeTypeLiteral;
-import org.apache.directory.server.core.tools.schema.ObjectClassLiteral;
-import org.apache.directory.server.core.tools.schema.OpenLdapSchemaParser;
+import org.apache.directory.shared.ldap.schema.parser.AttributeTypeLiteral;
+import org.apache.directory.shared.ldap.schema.parser.ObjectClassLiteral;
+import org.apache.directory.shared.ldap.schema.parser.OpenLdapSchemaParser;
 import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
 import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
 import org.apache.directory.studio.schemaeditor.model.Schema;

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java?rev=619884&r1=619883&r2=619884&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java
Fri Feb  8 05:41:48 2008
@@ -25,8 +25,8 @@
 import java.text.ParseException;
 import java.util.List;
 
-import org.apache.directory.server.core.tools.schema.AttributeTypeLiteral;
-import org.apache.directory.server.core.tools.schema.OpenLdapSchemaParser;
+import org.apache.directory.shared.ldap.schema.parser.AttributeTypeLiteral;
+import org.apache.directory.shared.ldap.schema.parser.OpenLdapSchemaParser;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
 import org.apache.directory.studio.schemaeditor.model.io.OpenLdapSchemaFileExporter;

Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java?rev=619884&r1=619883&r2=619884&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java
(original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java
Fri Feb  8 05:41:48 2008
@@ -25,8 +25,8 @@
 import java.text.ParseException;
 import java.util.List;
 
-import org.apache.directory.server.core.tools.schema.ObjectClassLiteral;
-import org.apache.directory.server.core.tools.schema.OpenLdapSchemaParser;
+import org.apache.directory.shared.ldap.schema.parser.ObjectClassLiteral;
+import org.apache.directory.shared.ldap.schema.parser.OpenLdapSchemaParser;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
 import org.apache.directory.studio.schemaeditor.model.io.OpenLdapSchemaFileExporter;



Mime
View raw message