directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r686728 - in /directory/studio/trunk: ./ jars/META-INF/ ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ schemaeditor/META-INF/ studio-dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/request/ st...
Date Mon, 18 Aug 2008 11:36:44 GMT
Author: seelmann
Date: Mon Aug 18 04:36:43 2008
New Revision: 686728

URL: http://svn.apache.org/viewvc?rev=686728&view=rev
Log:
Bumped up to shared-0.9.12-SNAPSHOT; Replaced ScopeEnum by SearchScope;

Modified:
    directory/studio/trunk/jars/META-INF/MANIFEST.MF
    directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlJob.java
    directory/studio/trunk/pom.xml
    directory/studio/trunk/schemaeditor/META-INF/MANIFEST.MF
    directory/studio/trunk/studio-dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/request/Dsmlv2Grammar.java
    directory/studio/trunk/studio-dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/request/SearchRequestDsml.java
    directory/studio/trunk/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchRequest/SearchRequestTest.java
    directory/studio/trunk/test-integration-core/META-INF/MANIFEST.MF
    directory/studio/trunk/test-integration-ui/META-INF/MANIFEST.MF

Modified: directory/studio/trunk/jars/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/trunk/jars/META-INF/MANIFEST.MF?rev=686728&r1=686727&r2=686728&view=diff
==============================================================================
--- directory/studio/trunk/jars/META-INF/MANIFEST.MF (original)
+++ directory/studio/trunk/jars/META-INF/MANIFEST.MF Mon Aug 18 04:36:43 2008
@@ -143,8 +143,8 @@
  lib/commons-lang-2.3.jar,
  lib/dom4j-1.6.1.jar,
  lib/nlog4j-1.2.25.jar,
- lib/shared-asn1-0.9.11.jar,
- lib/shared-ldap-0.9.11.jar,
- lib/shared-ldap-constants-0.9.11.jar,
+ lib/shared-asn1-0.9.12-SNAPSHOT.jar,
+ lib/shared-ldap-0.9.12-SNAPSHOT.jar,
+ lib/shared-ldap-constants-0.9.12-SNAPSHOT.jar,
  lib/studio-dsml-parser-0.4.2.jar,
  lib/xpp3-1.1.3.4.O.jar

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=686728&r1=686727&r2=686728&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
Mon Aug 18 04:36:43 2008
@@ -55,7 +55,6 @@
 import org.apache.directory.shared.ldap.filter.PresenceNode;
 import org.apache.directory.shared.ldap.filter.SimpleNode;
 import org.apache.directory.shared.ldap.filter.SubstringNode;
-import org.apache.directory.shared.ldap.message.ScopeEnum;
 import org.apache.directory.studio.connection.core.Connection;
 import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
 import org.apache.directory.studio.dsmlv2.engine.Dsmlv2Engine;
@@ -150,15 +149,15 @@
             SearchScope scope = searchParameter.getScope();
             if ( scope == SearchScope.OBJECT )
             {
-                searchRequest.setScope( ScopeEnum.BASE_OBJECT );
+                searchRequest.setScope( org.apache.directory.shared.ldap.filter.SearchScope.OBJECT
);
             }
             else if ( scope == SearchScope.ONELEVEL )
             {
-                searchRequest.setScope( ScopeEnum.SINGLE_LEVEL );
+                searchRequest.setScope( org.apache.directory.shared.ldap.filter.SearchScope.ONELEVEL
);
             }
             else if ( scope == SearchScope.SUBTREE )
             {
-                searchRequest.setScope( ScopeEnum.WHOLE_SUBTREE );
+                searchRequest.setScope( org.apache.directory.shared.ldap.filter.SearchScope.SUBTREE
);
             }
 
             // DerefAliases

Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=686728&r1=686727&r2=686728&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Mon Aug 18 04:36:43 2008
@@ -1977,17 +1977,17 @@
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
         <artifactId>shared-ldap</artifactId>
-        <version>0.9.11</version>
+        <version>0.9.12-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
         <artifactId>shared-asn1</artifactId>
-        <version>0.9.11</version>
+        <version>0.9.12-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
         <artifactId>shared-converter</artifactId>
-        <version>0.9.11</version>
+        <version>0.9.12-SNAPSHOT</version>
       </dependency>
 
       <!-- Other dependencies -->

Modified: directory/studio/trunk/schemaeditor/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/META-INF/MANIFEST.MF?rev=686728&r1=686727&r2=686728&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/META-INF/MANIFEST.MF (original)
+++ directory/studio/trunk/schemaeditor/META-INF/MANIFEST.MF Mon Aug 18 04:36:43 2008
@@ -18,4 +18,4 @@
 Export-Package: org.apache.directory.studio.schemaeditor.model,
  org.apache.directory.studio.schemaeditor.model.io
 Bundle-ClassPath: .,
- lib/shared-converter-0.9.11.jar
+ lib/shared-converter-0.9.12-SNAPSHOT.jar

Modified: directory/studio/trunk/studio-dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/request/Dsmlv2Grammar.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/request/Dsmlv2Grammar.java?rev=686728&r1=686727&r2=686728&view=diff
==============================================================================
--- directory/studio/trunk/studio-dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/request/Dsmlv2Grammar.java
(original)
+++ directory/studio/trunk/studio-dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/request/Dsmlv2Grammar.java
Mon Aug 18 04:36:43 2008
@@ -54,7 +54,7 @@
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.entry.client.ClientBinaryValue;
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
-import org.apache.directory.shared.ldap.message.ScopeEnum;
+import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.util.Base64;
@@ -1874,15 +1874,15 @@
             {
                 if ( "baseObject".equals( attributeValue ) )
                 {
-                    searchRequest.setScope( ScopeEnum.BASE_OBJECT );
+                    searchRequest.setScope( SearchScope.OBJECT );
                 }
                 else if ( "singleLevel".equals( attributeValue ) )
                 {
-                    searchRequest.setScope( ScopeEnum.SINGLE_LEVEL );
+                    searchRequest.setScope( SearchScope.ONELEVEL );
                 }
                 else if ( "wholeSubtree".equals( attributeValue ) )
                 {
-                    searchRequest.setScope( ScopeEnum.WHOLE_SUBTREE );
+                    searchRequest.setScope( SearchScope.SUBTREE );
                 }
                 else
                 {

Modified: directory/studio/trunk/studio-dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/request/SearchRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/request/SearchRequestDsml.java?rev=686728&r1=686727&r2=686728&view=diff
==============================================================================
--- directory/studio/trunk/studio-dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/request/SearchRequestDsml.java
(original)
+++ directory/studio/trunk/studio-dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/request/SearchRequestDsml.java
Mon Aug 18 04:36:43 2008
@@ -36,7 +36,7 @@
 import org.apache.directory.shared.ldap.codec.search.PresentFilter;
 import org.apache.directory.shared.ldap.codec.search.SearchRequest;
 import org.apache.directory.shared.ldap.codec.search.SubstringFilter;
-import org.apache.directory.shared.ldap.message.ScopeEnum;
+import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.studio.dsmlv2.ParserUtils;
 import org.dom4j.Element;
 import org.dom4j.Namespace;
@@ -100,18 +100,18 @@
         }
 
         // Scope
-        ScopeEnum scope = request.getScope();
+        SearchScope scope = request.getScope();
         if ( scope != null )
         {
-            if ( scope == ScopeEnum.BASE_OBJECT )
+            if ( scope == SearchScope.OBJECT )
             {
                 element.addAttribute( "scope", "baseObject" );
             }
-            else if ( scope == ScopeEnum.SINGLE_LEVEL )
+            else if ( scope == SearchScope.ONELEVEL )
             {
                 element.addAttribute( "scope", "singleLevel" );
             }
-            else if ( scope == ScopeEnum.WHOLE_SUBTREE )
+            else if ( scope == SearchScope.SUBTREE )
             {
                 element.addAttribute( "scope", "wholeSubtree" );
             }

Modified: directory/studio/trunk/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchRequest/SearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchRequest/SearchRequestTest.java?rev=686728&r1=686727&r2=686728&view=diff
==============================================================================
--- directory/studio/trunk/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchRequest/SearchRequestTest.java
(original)
+++ directory/studio/trunk/studio-dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchRequest/SearchRequestTest.java
Mon Aug 18 04:36:43 2008
@@ -40,7 +40,7 @@
 import org.apache.directory.shared.ldap.codec.search.PresentFilter;
 import org.apache.directory.shared.ldap.codec.search.SearchRequest;
 import org.apache.directory.shared.ldap.codec.search.SubstringFilter;
-import org.apache.directory.shared.ldap.message.ScopeEnum;
+import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.apache.directory.studio.dsmlv2.AbstractTest;
 import org.apache.directory.studio.dsmlv2.Dsmlv2Parser;
@@ -314,7 +314,7 @@
 
         SearchRequest searchRequest = ( SearchRequest ) parser.getBatchRequest().getCurrentRequest();
 
-        assertEquals( ScopeEnum.BASE_OBJECT, searchRequest.getScope() );
+        assertEquals( SearchScope.OBJECT, searchRequest.getScope() );
     }
 
 
@@ -341,7 +341,7 @@
 
         SearchRequest searchRequest = ( SearchRequest ) parser.getBatchRequest().getCurrentRequest();
 
-        assertEquals( ScopeEnum.SINGLE_LEVEL, searchRequest.getScope() );
+        assertEquals( SearchScope.ONELEVEL, searchRequest.getScope() );
     }
 
 
@@ -368,7 +368,7 @@
 
         SearchRequest searchRequest = ( SearchRequest ) parser.getBatchRequest().getCurrentRequest();
 
-        assertEquals( ScopeEnum.WHOLE_SUBTREE, searchRequest.getScope() );
+        assertEquals( SearchScope.SUBTREE, searchRequest.getScope() );
     }
 
 

Modified: directory/studio/trunk/test-integration-core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-core/META-INF/MANIFEST.MF?rev=686728&r1=686727&r2=686728&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-core/META-INF/MANIFEST.MF (original)
+++ directory/studio/trunk/test-integration-core/META-INF/MANIFEST.MF Mon Aug 18 04:36:43
2008
@@ -38,9 +38,9 @@
  lib/mina-core-1.1.6.jar,
  lib/mina-filter-ssl-1.1.6.jar,
  lib/nlog4j-1.2.25.jar,
- lib/shared-asn1-0.9.11.jar,
+ lib/shared-asn1-0.9.12-SNAPSHOT.jar,
  lib/shared-asn1-codec-0.9.11.jar,
  lib/shared-bouncycastle-reduced-0.9.11.jar,
- lib/shared-ldap-0.9.11.jar,
- lib/shared-ldap-constants-0.9.11.jar,
+ lib/shared-ldap-0.9.12-SNAPSHOT.jar,
+ lib/shared-ldap-constants-0.9.12-SNAPSHOT.jar,
  lib/slf4j-api-1.4.3.jar

Modified: directory/studio/trunk/test-integration-ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/META-INF/MANIFEST.MF?rev=686728&r1=686727&r2=686728&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/META-INF/MANIFEST.MF (original)
+++ directory/studio/trunk/test-integration-ui/META-INF/MANIFEST.MF Mon Aug 18 04:36:43 2008
@@ -45,9 +45,9 @@
  lib/mina-core-1.1.6.jar,
  lib/mina-filter-ssl-1.1.6.jar,
  lib/nlog4j-1.2.25.jar,
- lib/shared-asn1-0.9.11.jar,
+ lib/shared-asn1-0.9.12-SNAPSHOT.jar,
  lib/shared-asn1-codec-0.9.11.jar,
  lib/shared-bouncycastle-reduced-0.9.11.jar,
- lib/shared-ldap-0.9.11.jar,
- lib/shared-ldap-constants-0.9.11.jar,
+ lib/shared-ldap-0.9.12-SNAPSHOT.jar,
+ lib/shared-ldap-constants-0.9.12-SNAPSHOT.jar,
  lib/slf4j-api-1.4.3.jar



Mime
View raw message