directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r796636 - in /directory/studio/trunk: ./ jars/ ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/ studio-dsml-parser/
Date Wed, 22 Jul 2009 09:20:35 GMT
Author: pamarcelot
Date: Wed Jul 22 09:20:33 2009
New Revision: 796636

URL: http://svn.apache.org/viewvc?rev=796636&view=rev
Log:
Removed DSML Parser project from Studio (It has been moved to Shared). Updated DSML Parser
dependency to match the new location of the project. Moved Shared dependencies version to
'0.9.15-SNAPSHOT' and updated a few classes due to updates in the Shared classes.

Removed:
    directory/studio/trunk/studio-dsml-parser/
Modified:
    directory/studio/trunk/jars/pom.xml
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlJob.java
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlJob.java
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java
    directory/studio/trunk/pom.xml

Modified: directory/studio/trunk/jars/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/jars/pom.xml?rev=796636&r1=796635&r2=796636&view=diff
==============================================================================
--- directory/studio/trunk/jars/pom.xml (original)
+++ directory/studio/trunk/jars/pom.xml Wed Jul 22 09:20:33 2009
@@ -173,12 +173,6 @@
           <groupId>commons-lang</groupId>
           <artifactId>commons-lang</artifactId>
         </exclusion>
-        <!--
-          <exclusion>
-          <groupId>org.apache.directory.shared</groupId>
-          <artifactId>shared-ldap-constants</artifactId>
-          </exclusion>
-        -->
         <exclusion>
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-api</artifactId>
@@ -186,23 +180,17 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>studio-dsml-parser</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>xpp3</groupId>
-      <artifactId>xpp3</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-dsml-parser</artifactId>
     </dependency>
     <dependency>
       <groupId>bouncycastle</groupId>
       <artifactId>bcprov-jdk15</artifactId>
       <version>140</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-constants</artifactId>
+    </dependency>
   </dependencies>
 </project>

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlJob.java?rev=796636&r1=796635&r2=796636&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlJob.java
(original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlJob.java
Wed Jul 22 09:20:33 2009
@@ -36,8 +36,16 @@
 import javax.naming.directory.SearchResult;
 
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.directory.shared.ldap.codec.LdapResult;
-import org.apache.directory.shared.ldap.codec.search.SearchResultDone;
+import org.apache.directory.shared.dsmlv2.DsmlDecorator;
+import org.apache.directory.shared.dsmlv2.reponse.BatchResponseDsml;
+import org.apache.directory.shared.dsmlv2.reponse.SearchResponseDsml;
+import org.apache.directory.shared.dsmlv2.reponse.SearchResultDoneDsml;
+import org.apache.directory.shared.dsmlv2.reponse.SearchResultEntryDsml;
+import org.apache.directory.shared.dsmlv2.reponse.SearchResultReferenceDsml;
+import org.apache.directory.shared.dsmlv2.request.AddRequestDsml;
+import org.apache.directory.shared.dsmlv2.request.BatchRequestDsml;
+import org.apache.directory.shared.ldap.codec.LdapResultCodec;
+import org.apache.directory.shared.ldap.codec.search.SearchResultDoneCodec;
 import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -50,14 +58,6 @@
 import org.apache.directory.studio.connection.core.Connection;
 import org.apache.directory.studio.connection.core.io.jndi.StudioNamingEnumeration;
 import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
-import org.apache.directory.studio.dsmlv2.DsmlDecorator;
-import org.apache.directory.studio.dsmlv2.reponse.BatchResponseDsml;
-import org.apache.directory.studio.dsmlv2.reponse.SearchResponseDsml;
-import org.apache.directory.studio.dsmlv2.reponse.SearchResultDoneDsml;
-import org.apache.directory.studio.dsmlv2.reponse.SearchResultEntryDsml;
-import org.apache.directory.studio.dsmlv2.reponse.SearchResultReferenceDsml;
-import org.apache.directory.studio.dsmlv2.request.AddRequestDsml;
-import org.apache.directory.studio.dsmlv2.request.BatchRequestDsml;
 import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
 import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
 import org.apache.directory.studio.ldapbrowser.core.model.SearchParameter;
@@ -265,8 +265,8 @@
         }
 
         // Creating and adding a search result done at the end of the results
-        SearchResultDone srd = new SearchResultDone();
-        LdapResult ldapResult = new LdapResult();
+        SearchResultDoneCodec srd = new SearchResultDoneCodec();
+        LdapResultCodec ldapResult = new LdapResultCodec();
         if ( !monitor.errorsReported() )
         {
             ldapResult.setResultCode( ResultCodeEnum.SUCCESS );

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlJob.java?rev=796636&r1=796635&r2=796636&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlJob.java
(original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlJob.java
Wed Jul 22 09:20:33 2009
@@ -33,18 +33,29 @@
 import javax.naming.directory.DirContext;
 import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchControls;
+import javax.naming.ldap.ExtendedRequest;
 
 import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
+import org.apache.directory.shared.dsmlv2.reponse.AddResponseDsml;
+import org.apache.directory.shared.dsmlv2.reponse.AuthResponseDsml;
+import org.apache.directory.shared.dsmlv2.reponse.BatchResponseDsml;
+import org.apache.directory.shared.dsmlv2.reponse.CompareResponseDsml;
+import org.apache.directory.shared.dsmlv2.reponse.DelResponseDsml;
+import org.apache.directory.shared.dsmlv2.reponse.ExtendedResponseDsml;
+import org.apache.directory.shared.dsmlv2.reponse.ModDNResponseDsml;
+import org.apache.directory.shared.dsmlv2.reponse.ModifyResponseDsml;
+import org.apache.directory.shared.dsmlv2.request.BatchRequest;
 import org.apache.directory.shared.ldap.codec.LdapConstants;
-import org.apache.directory.shared.ldap.codec.LdapResult;
-import org.apache.directory.shared.ldap.codec.add.AddRequest;
-import org.apache.directory.shared.ldap.codec.bind.BindRequest;
-import org.apache.directory.shared.ldap.codec.compare.CompareRequest;
-import org.apache.directory.shared.ldap.codec.del.DelRequest;
-import org.apache.directory.shared.ldap.codec.extended.ExtendedRequest;
-import org.apache.directory.shared.ldap.codec.modify.ModifyRequest;
-import org.apache.directory.shared.ldap.codec.modifyDn.ModifyDNRequest;
-import org.apache.directory.shared.ldap.codec.search.SearchRequest;
+import org.apache.directory.shared.ldap.codec.LdapResultCodec;
+import org.apache.directory.shared.ldap.codec.add.AddRequestCodec;
+import org.apache.directory.shared.ldap.codec.bind.BindRequestCodec;
+import org.apache.directory.shared.ldap.codec.compare.CompareRequestCodec;
+import org.apache.directory.shared.ldap.codec.del.DelRequestCodec;
+import org.apache.directory.shared.ldap.codec.extended.ExtendedRequestCodec;
+import org.apache.directory.shared.ldap.codec.modify.ModifyRequestCodec;
+import org.apache.directory.shared.ldap.codec.modifyDn.ModifyDNRequestCodec;
+import org.apache.directory.shared.ldap.codec.search.SearchRequestCodec;
 import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
@@ -60,16 +71,6 @@
 import org.apache.directory.studio.connection.core.Connection.ReferralHandlingMethod;
 import org.apache.directory.studio.connection.core.io.jndi.StudioNamingEnumeration;
 import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
-import org.apache.directory.studio.dsmlv2.Dsmlv2Parser;
-import org.apache.directory.studio.dsmlv2.reponse.AddResponseDsml;
-import org.apache.directory.studio.dsmlv2.reponse.AuthResponseDsml;
-import org.apache.directory.studio.dsmlv2.reponse.BatchResponseDsml;
-import org.apache.directory.studio.dsmlv2.reponse.CompareResponseDsml;
-import org.apache.directory.studio.dsmlv2.reponse.DelResponseDsml;
-import org.apache.directory.studio.dsmlv2.reponse.ExtendedResponseDsml;
-import org.apache.directory.studio.dsmlv2.reponse.ModDNResponseDsml;
-import org.apache.directory.studio.dsmlv2.reponse.ModifyResponseDsml;
-import org.apache.directory.studio.dsmlv2.request.BatchRequest;
 import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
 import org.apache.directory.studio.ldapbrowser.core.events.BulkModificationEvent;
 import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
@@ -244,37 +245,37 @@
     private void processRequest( Object request, BatchResponseDsml batchResponseDsml, StudioProgressMonitor
monitor )
         throws NamingException, LdapURLEncodingException
     {
-        if ( request instanceof BindRequest )
+        if ( request instanceof BindRequestCodec )
         {
-            processBindRequest( ( BindRequest ) request, batchResponseDsml, monitor );
+            processBindRequest( ( BindRequestCodec ) request, batchResponseDsml, monitor
);
         }
-        else if ( request instanceof AddRequest )
+        else if ( request instanceof AddRequestCodec )
         {
-            processAddRequest( ( AddRequest ) request, batchResponseDsml, monitor );
+            processAddRequest( ( AddRequestCodec ) request, batchResponseDsml, monitor );
         }
-        else if ( request instanceof CompareRequest )
+        else if ( request instanceof CompareRequestCodec )
         {
-            processCompareRequest( ( CompareRequest ) request, batchResponseDsml, monitor
);
+            processCompareRequest( ( CompareRequestCodec ) request, batchResponseDsml, monitor
);
         }
-        else if ( request instanceof DelRequest )
+        else if ( request instanceof DelRequestCodec )
         {
-            processDelRequest( ( DelRequest ) request, batchResponseDsml, monitor );
+            processDelRequest( ( DelRequestCodec ) request, batchResponseDsml, monitor );
         }
-        else if ( request instanceof ExtendedRequest )
+        else if ( request instanceof ExtendedRequestCodec )
         {
-            processExtendedRequest( ( ExtendedRequest ) request, batchResponseDsml, monitor
);
+            processExtendedRequest( ( ExtendedRequestCodec ) request, batchResponseDsml,
monitor );
         }
-        else if ( request instanceof ModifyRequest )
+        else if ( request instanceof ModifyRequestCodec )
         {
-            processModifyRequest( ( ModifyRequest ) request, batchResponseDsml, monitor );
+            processModifyRequest( ( ModifyRequestCodec ) request, batchResponseDsml, monitor
);
         }
-        else if ( request instanceof ModifyDNRequest )
+        else if ( request instanceof ModifyDNRequestCodec )
         {
-            processModifyDNRequest( ( ModifyDNRequest ) request, batchResponseDsml, monitor
);
+            processModifyDNRequest( ( ModifyDNRequestCodec ) request, batchResponseDsml,
monitor );
         }
-        else if ( request instanceof SearchRequest )
+        else if ( request instanceof SearchRequestCodec )
         {
-            processSearchRequest( ( SearchRequest ) request, batchResponseDsml, monitor );
+            processSearchRequest( ( SearchRequestCodec ) request, batchResponseDsml, monitor
);
         }
     }
 
@@ -287,7 +288,7 @@
      * @param batchResponseDsml
      *      the DSML batch response (can be <code>null</code>)
      */
-    private void processBindRequest( BindRequest request, BatchResponseDsml batchResponseDsml,
+    private void processBindRequest( BindRequestCodec request, BatchResponseDsml batchResponseDsml,
         StudioProgressMonitor monitor )
     {
         // We can not support extended requests at the moment,
@@ -297,7 +298,7 @@
         if ( batchResponseDsml != null )
         {
             AuthResponseDsml authResponseDsml = new AuthResponseDsml();
-            LdapResult ldapResult = new LdapResult();
+            LdapResultCodec ldapResult = new LdapResultCodec();
             ldapResult.setResultCode( ResultCodeEnum.UNWILLING_TO_PERFORM );
             ldapResult.setErrorMessage( "This kind of request is not yet supported." );
             authResponseDsml.setLdapResult( ldapResult );
@@ -314,7 +315,7 @@
      * @param batchResponseDsml
      *      the DSML batch response (can be <code>null</code>)
      */
-    private void processAddRequest( AddRequest request, BatchResponseDsml batchResponseDsml,
+    private void processAddRequest( AddRequestCodec request, BatchResponseDsml batchResponseDsml,
         StudioProgressMonitor monitor )
     {
         // Executing the add request
@@ -355,7 +356,7 @@
      * @param batchResponseDsml
      *      the DSML batch response (can be <code>null</code>)
      */
-    private void processCompareRequest( CompareRequest request, BatchResponseDsml batchResponseDsml,
+    private void processCompareRequest( CompareRequestCodec request, BatchResponseDsml batchResponseDsml,
         StudioProgressMonitor monitor )
     {
         // We can not support extended requests at the moment,
@@ -365,7 +366,7 @@
         if ( batchResponseDsml != null )
         {
             CompareResponseDsml compareResponseDsml = new CompareResponseDsml();
-            LdapResult ldapResult = new LdapResult();
+            LdapResultCodec ldapResult = new LdapResultCodec();
             ldapResult.setResultCode( ResultCodeEnum.UNWILLING_TO_PERFORM );
             ldapResult.setErrorMessage( "This kind of request is not yet supported." );
             compareResponseDsml.setLdapResult( ldapResult );
@@ -382,7 +383,7 @@
      * @param batchResponseDsml
      *      the DSML batch response (can be <code>null</code>)
      */
-    private void processDelRequest( DelRequest request, BatchResponseDsml batchResponseDsml,
+    private void processDelRequest( DelRequestCodec request, BatchResponseDsml batchResponseDsml,
         StudioProgressMonitor monitor )
     {
         // Executing the del request
@@ -424,7 +425,7 @@
      * @param batchResponseDsml
      *      the DSML batch response (can be <code>null</code>)
      */
-    private void processExtendedRequest( ExtendedRequest request, BatchResponseDsml batchResponseDsml,
+    private void processExtendedRequest( ExtendedRequestCodec request, BatchResponseDsml
batchResponseDsml,
         StudioProgressMonitor monitor )
     {
         // We can not support extended requests at the moment,
@@ -434,7 +435,7 @@
         if ( batchResponseDsml != null )
         {
             ExtendedResponseDsml extendedResponseDsml = new ExtendedResponseDsml();
-            LdapResult ldapResult = new LdapResult();
+            LdapResultCodec ldapResult = new LdapResultCodec();
             ldapResult.setResultCode( ResultCodeEnum.UNWILLING_TO_PERFORM );
             ldapResult.setErrorMessage( "This kind of request is not yet supported." );
             extendedResponseDsml.setLdapResult( ldapResult );
@@ -451,7 +452,7 @@
      * @param batchResponseDsml
      *      the DSML batch response (can be <code>null</code>)
      */
-    private void processModifyRequest( ModifyRequest request, BatchResponseDsml batchResponseDsml,
+    private void processModifyRequest( ModifyRequestCodec request, BatchResponseDsml batchResponseDsml,
         StudioProgressMonitor monitor )
     {
         // Creating the modification items
@@ -516,7 +517,7 @@
      * @param batchResponseDsml
      *      the DSML batch response (can be <code>null</code>)
      */
-    private void processModifyDNRequest( ModifyDNRequest request, BatchResponseDsml batchResponseDsml,
+    private void processModifyDNRequest( ModifyDNRequestCodec request, BatchResponseDsml
batchResponseDsml,
         StudioProgressMonitor monitor )
     {
         // Executing the modify DN request
@@ -570,7 +571,7 @@
      * @throws NamingException 
      * @throws LdapURLEncodingException 
      */
-    private void processSearchRequest( SearchRequest request, BatchResponseDsml batchResponseDsml,
+    private void processSearchRequest( SearchRequestCodec request, BatchResponseDsml batchResponseDsml,
         StudioProgressMonitor monitor ) throws NamingException, LdapURLEncodingException
     {
         // Creating the response
@@ -596,7 +597,7 @@
      * @return
      *      the associated {@link SearchControls} object
      */
-    private SearchControls getSearchControls( SearchRequest request )
+    private SearchControls getSearchControls( SearchRequestCodec request )
     {
         SearchControls controls = new SearchControls();
 
@@ -651,7 +652,7 @@
      * @return
      *      the associated {@link AliasDereferencingMethod} object
      */
-    private AliasDereferencingMethod getAliasDereferencingMethod( SearchRequest request )
+    private AliasDereferencingMethod getAliasDereferencingMethod( SearchRequestCodec request
)
     {
         switch ( request.getDerefAliases() )
         {
@@ -677,9 +678,9 @@
      * @return
      *      the corresponding LDAP Result
      */
-    private LdapResult getLdapResult( StudioProgressMonitor monitor, MessageTypeEnum messageType
)
+    private LdapResultCodec getLdapResult( StudioProgressMonitor monitor, MessageTypeEnum
messageType )
     {
-        LdapResult ldapResult = new LdapResult();
+        LdapResultCodec ldapResult = new LdapResultCodec();
 
         if ( !monitor.errorsReported() )
         {

Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java?rev=796636&r1=796635&r2=796636&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java
(original)
+++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java
Wed Jul 22 09:20:33 2009
@@ -30,6 +30,7 @@
 import java.util.TreeSet;
 
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.directory.server.constants.ApacheSchemaConstants;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum;
 import org.apache.directory.shared.ldap.schema.UsageEnum;
@@ -76,9 +77,9 @@
         OPERATIONAL_ATTRIBUTES_OIDS_AND_NAMES.add( SchemaConstants.GOVERNING_STRUCTURE_RULE_AT.toLowerCase()
);
         OPERATIONAL_ATTRIBUTES_OIDS_AND_NAMES.add( SchemaConstants.GOVERNING_STRUCTURE_RULE_AT_OID.toLowerCase()
);
 
-        OPERATIONAL_ATTRIBUTES_OIDS_AND_NAMES.add( SchemaConstants.ENTRY_UUID_AT.toLowerCase()
);
-        OPERATIONAL_ATTRIBUTES_OIDS_AND_NAMES.add( SchemaConstants.ENTRY_UUID_AT_OID.toLowerCase()
);
-        OPERATIONAL_ATTRIBUTES_OIDS_AND_NAMES.add( SchemaConstants.ENTRY_CSN_AT.toLowerCase()
);
+        OPERATIONAL_ATTRIBUTES_OIDS_AND_NAMES.add( ApacheSchemaConstants.ENTRY_UUID_AT.toLowerCase()
);
+        OPERATIONAL_ATTRIBUTES_OIDS_AND_NAMES.add( ApacheSchemaConstants.ENTRY_UUID_AT_OID.toLowerCase()
);
+        OPERATIONAL_ATTRIBUTES_OIDS_AND_NAMES.add( ApacheSchemaConstants.ENTRY_CSN_AT.toLowerCase()
);
         OPERATIONAL_ATTRIBUTES_OIDS_AND_NAMES.add( SchemaConstants.ENTRY_DN_AT.toLowerCase()
);
         OPERATIONAL_ATTRIBUTES_OIDS_AND_NAMES.add( SchemaConstants.ENTRY_DN_AT_OID.toLowerCase()
);
 
@@ -130,9 +131,9 @@
         OPERATIONAL_ATTRIBUTES_OIDS_AND_NAMES.add( SchemaConstants.GOVERNING_STRUCTURE_RULE_AT.toLowerCase()
);
         OPERATIONAL_ATTRIBUTES_OIDS_AND_NAMES.add( SchemaConstants.GOVERNING_STRUCTURE_RULE_AT_OID.toLowerCase()
);
 
-        OPERATIONAL_ATTRIBUTES_OIDS_AND_NAMES.add( SchemaConstants.ENTRY_UUID_AT.toLowerCase()
);
-        OPERATIONAL_ATTRIBUTES_OIDS_AND_NAMES.add( SchemaConstants.ENTRY_UUID_AT_OID.toLowerCase()
);
-        OPERATIONAL_ATTRIBUTES_OIDS_AND_NAMES.add( SchemaConstants.ENTRY_CSN_AT.toLowerCase()
);
+        OPERATIONAL_ATTRIBUTES_OIDS_AND_NAMES.add( ApacheSchemaConstants.ENTRY_UUID_AT.toLowerCase()
);
+        OPERATIONAL_ATTRIBUTES_OIDS_AND_NAMES.add( ApacheSchemaConstants.ENTRY_UUID_AT_OID.toLowerCase()
);
+        OPERATIONAL_ATTRIBUTES_OIDS_AND_NAMES.add( ApacheSchemaConstants.ENTRY_CSN_AT.toLowerCase()
);
         OPERATIONAL_ATTRIBUTES_OIDS_AND_NAMES.add( SchemaConstants.ENTRY_DN_AT.toLowerCase()
);
         OPERATIONAL_ATTRIBUTES_OIDS_AND_NAMES.add( SchemaConstants.ENTRY_DN_AT_OID.toLowerCase()
);
 

Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=796636&r1=796635&r2=796636&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Wed Jul 22 09:20:33 2009
@@ -92,14 +92,13 @@
     <schemaeditor.version>1.5.0-SNAPSHOT</schemaeditor.version>
     <schemaeditor.feature.version>1.5.0-SNAPSHOT</schemaeditor.feature.version>
     <schemaeditor.help.version>1.5.0-SNAPSHOT</schemaeditor.help.version>
-    <studio.dsml.parser.version>0.4.6-SNAPSHOT</studio.dsml.parser.version>
     <test.integration.core.version>1.5.0-SNAPSHOT</test.integration.core.version>
     <test.integration.ui.version>1.5.0-SNAPSHOT</test.integration.ui.version>
     <updatesite.version>1.5.0-SNAPSHOT</updatesite.version>
     <valueeditors.version>1.5.0-SNAPSHOT</valueeditors.version>
 
     <!-- Set versions for depending projects -->
-    <org.apache.directory.shared.version>0.9.14</org.apache.directory.shared.version>
+    <org.apache.directory.shared.version>0.9.15-SNAPSHOT</org.apache.directory.shared.version>
     <skin.version>1.0.0</skin.version>
   </properties>
 
@@ -195,11 +194,6 @@
       <!-- Apache Directory Studio -->
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
-        <artifactId>studio-dsml-parser</artifactId>
-        <version>${studio.dsml.parser.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.directory.studio</groupId>
         <artifactId>ldapbrowser.core</artifactId>
         <version>${ldapbrowser.core.version}</version>
       </dependency>
@@ -990,6 +984,18 @@
         <artifactId>shared-converter</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.directory.shared</groupId>
+        <artifactId>shared-dsml-parser</artifactId>
+        <version>${org.apache.directory.shared.version}</version>
+      </dependency>
+      
+      <!-- Apache Directory Server -->
+      <dependency>
+        <groupId>org.apache.directory.server</groupId>
+        <artifactId>apacheds-core-constants</artifactId>
+        <version>1.5.5-SNAPSHOT</version>
+      </dependency>
 
       <!-- Other dependencies -->
       <dependency>
@@ -1091,7 +1097,6 @@
     <module>repository</module>
     <module>ldif-parser</module>
     <module>connection-core</module>
-    <module>studio-dsml-parser</module>
     <module>ldapbrowser-core</module>
     <module>connection-ui</module>
     <module>ldapbrowser-common</module>



Mime
View raw message