directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r619887 - in /directory/studio/branches/studio-maven: ./ jars/META-INF/ schemaeditor/ schemaeditor/META-INF/ schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ schemaeditor/src/main/java/org/apache/directory/studi...
Date Fri, 08 Feb 2008 13:48:31 GMT
Author: pamarcelot
Date: Fri Feb  8 05:48:29 2008
New Revision: 619887

URL: http://svn.apache.org/viewvc?rev=619887&view=rev
Log:
Updated MANIFEST.MF of the jars project to export the new packages of the lates version of
shared-ldap. Updated the SchemaEditor to use the OpenLDAP schema file parser now in shared-ldap.

Modified:
    directory/studio/branches/studio-maven/jars/META-INF/MANIFEST.MF
    directory/studio/branches/studio-maven/pom.xml
    directory/studio/branches/studio-maven/schemaeditor/META-INF/MANIFEST.MF
    directory/studio/branches/studio-maven/schemaeditor/pom.xml
    directory/studio/branches/studio-maven/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java
    directory/studio/branches/studio-maven/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java
    directory/studio/branches/studio-maven/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java

Modified: directory/studio/branches/studio-maven/jars/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-maven/jars/META-INF/MANIFEST.MF?rev=619887&r1=619886&r2=619887&view=diff
==============================================================================
--- directory/studio/branches/studio-maven/jars/META-INF/MANIFEST.MF (original)
+++ directory/studio/branches/studio-maven/jars/META-INF/MANIFEST.MF Fri Feb  8 05:48:29 2008
@@ -70,7 +70,6 @@
  org.apache.directory.shared.ldap.codec.search.controls,
  org.apache.directory.shared.ldap.codec.unbind,
  org.apache.directory.shared.ldap.codec.util,
- org.apache.directory.shared.ldap.common,
  org.apache.directory.shared.ldap.constants,
  org.apache.directory.shared.ldap.entry,
  org.apache.directory.shared.ldap.entry.client,
@@ -83,6 +82,7 @@
  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,
@@ -136,14 +136,14 @@
  org.xmlpull.v1.wrapper,
  org.xmlpull.v1.wrapper.classic
 Bundle-ClassPath: .,
- lib/shared-ldap-constants-0.9.8-SNAPSHOT.jar,
- lib/studio-dsml-parser-0.4.1.jar,
+ lib/antlr-2.7.7.jar,
  lib/commons-collections-3.2.jar,
+ lib/commons-io-1.3.1.jar,
+ lib/commons-lang-2.3.jar,
  lib/dom4j-1.6.1.jar,
  lib/nlog4j-1.2.25.jar,
  lib/shared-asn1-0.9.8-SNAPSHOT.jar,
- lib/antlr-2.7.7.jar,
- lib/commons-lang-2.1.jar,
- lib/xpp3-1.1.3.4.O.jar,
  lib/shared-ldap-0.9.8-SNAPSHOT.jar,
- lib/commons-io-1.3.1.jar
+ lib/shared-ldap-constants-0.9.8-SNAPSHOT.jar,
+ lib/studio-dsml-parser-0.4.1.jar,
+ lib/xpp3-1.1.3.4.O.jar

Modified: directory/studio/branches/studio-maven/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-maven/pom.xml?rev=619887&r1=619886&r2=619887&view=diff
==============================================================================
--- directory/studio/branches/studio-maven/pom.xml (original)
+++ directory/studio/branches/studio-maven/pom.xml Fri Feb  8 05:48:29 2008
@@ -1707,7 +1707,7 @@
       <dependency>
         <groupId>commons-lang</groupId>
         <artifactId>commons-lang</artifactId>
-        <version>2.1</version>
+        <version>2.3</version>
       </dependency>
       <dependency>
         <groupId>commons-codec</groupId>

Modified: directory/studio/branches/studio-maven/schemaeditor/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-maven/schemaeditor/META-INF/MANIFEST.MF?rev=619887&r1=619886&r2=619887&view=diff
==============================================================================
--- directory/studio/branches/studio-maven/schemaeditor/META-INF/MANIFEST.MF (original)
+++ directory/studio/branches/studio-maven/schemaeditor/META-INF/MANIFEST.MF Fri Feb  8 05:48:29
2008
@@ -18,5 +18,4 @@
 Export-Package: org.apache.directory.studio.schemaeditor.model,
  org.apache.directory.studio.schemaeditor.model.io
 Bundle-ClassPath: .,
- lib/apacheds-core-plugin-1.5.2-SNAPSHOT.jar,
  lib/shared-converter-0.9.8-SNAPSHOT.jar

Modified: directory/studio/branches/studio-maven/schemaeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-maven/schemaeditor/pom.xml?rev=619887&r1=619886&r2=619887&view=diff
==============================================================================
--- directory/studio/branches/studio-maven/schemaeditor/pom.xml (original)
+++ directory/studio/branches/studio-maven/schemaeditor/pom.xml Fri Feb  8 05:48:29 2008
@@ -213,41 +213,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-core-plugin</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.maven</groupId>
-          <artifactId>maven-plugin-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.maven</groupId>
-          <artifactId>maven-project</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>antlr</groupId>
-          <artifactId>antlr</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.directory.server</groupId>
-          <artifactId>apacheds-core-shared</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.velocity</groupId>
-          <artifactId>velocity</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.directory.shared</groupId>
-          <artifactId>shared-ldap</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </exclusion>
-        <exclusion></exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-converter</artifactId>
       <exclusions>

Modified: directory/studio/branches/studio-maven/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-maven/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java?rev=619887&r1=619886&r2=619887&view=diff
==============================================================================
--- directory/studio/branches/studio-maven/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java
(original)
+++ directory/studio/branches/studio-maven/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java
Fri Feb  8 05:48:29 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/branches/studio-maven/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-maven/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java?rev=619887&r1=619886&r2=619887&view=diff
==============================================================================
--- directory/studio/branches/studio-maven/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java
(original)
+++ directory/studio/branches/studio-maven/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java
Fri Feb  8 05:48:29 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/branches/studio-maven/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-maven/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java?rev=619887&r1=619886&r2=619887&view=diff
==============================================================================
--- directory/studio/branches/studio-maven/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java
(original)
+++ directory/studio/branches/studio-maven/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java
Fri Feb  8 05:48:29 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