directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1072793 - in /directory/studio/branches/m1: ./ plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/ tests/test.integration.core/ tests/test.integration.ui/ tests/test.integration.ui/src/main/java/org/ap...
Date Sun, 20 Feb 2011 23:01:14 GMT
Author: akarasulu
Date: Sun Feb 20 23:01:13 2011
New Revision: 1072793

URL: http://svn.apache.org/viewvc?rev=1072793&view=rev
Log:
merging in from trunk before swapping out trunk

Modified:
    directory/studio/branches/m1/   (props changed)
    directory/studio/branches/m1/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
    directory/studio/branches/m1/tests/test.integration.core/   (props changed)
    directory/studio/branches/m1/tests/test.integration.core/pom.xml
    directory/studio/branches/m1/tests/test.integration.ui/   (props changed)
    directory/studio/branches/m1/tests/test.integration.ui/pom.xml
    directory/studio/branches/m1/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/NewEntryWizardBot.java

Propchange: directory/studio/branches/m1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 23:01:13 2011
@@ -1,3 +1,3 @@
 /directory/studio/branches/shared-trunk-merge:1004968-1005876
 /directory/studio/branches/studio-connection-refactoring:1022102-1030058
-/directory/studio/trunk:1066125-1067996,1068027-1071140
+/directory/studio/trunk:1066125-1067996,1068027-1072726

Modified: directory/studio/branches/m1/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java?rev=1072793&r1=1072792&r2=1072793&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
(original)
+++ directory/studio/branches/m1/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
Sun Feb 20 23:01:13 2011
@@ -327,11 +327,6 @@ public class DirectoryApiConnectionWrapp
                             CramMd5Request cramMd5Request = new CramMd5Request();
                             cramMd5Request.setUsername( bindPrincipal );
                             cramMd5Request.setCredentials( bindPassword );
-                            cramMd5Request.setQualityOfProtection( connection.getConnectionParameter().getSaslQop()
);
-                            cramMd5Request.setSecurityStrength( connection.getConnectionParameter()
-                                .getSaslSecurityStrength() );
-                            cramMd5Request.setMutualAuthentication( connection.getConnectionParameter()
-                                .isSaslMutualAuthentication() );
 
                             bindResponse = ldapConnection.bind( cramMd5Request );
                         }
@@ -342,11 +337,6 @@ public class DirectoryApiConnectionWrapp
                             digestMd5Request.setUsername( bindPrincipal );
                             digestMd5Request.setCredentials( bindPassword );
                             digestMd5Request.setRealmName( connection.getConnectionParameter().getSaslRealm()
);
-                            digestMd5Request.setQualityOfProtection( connection.getConnectionParameter().getSaslQop()
);
-                            digestMd5Request.setSecurityStrength( connection.getConnectionParameter()
-                                .getSaslSecurityStrength() );
-                            digestMd5Request.setMutualAuthentication( connection.getConnectionParameter()
-                                .isSaslMutualAuthentication() );
 
                             bindResponse = ldapConnection.bind( digestMd5Request );
                         }
@@ -354,37 +344,11 @@ public class DirectoryApiConnectionWrapp
                         else if ( connection.getConnectionParameter().getAuthMethod() ==
ConnectionParameter.AuthenticationMethod.SASL_GSSAPI )
                         {
                             GssApiRequest gssApiRequest = new GssApiRequest();
-
-                            Preferences preferences = ConnectionCorePlugin.getDefault().getPluginPreferences();
-                            boolean useKrb5SystemProperties = preferences
-                                .getBoolean( ConnectionCoreConstants.PREFERENCE_USE_KRB5_SYSTEM_PROPERTIES
);
-                            String krb5LoginModule = preferences
-                                .getString( ConnectionCoreConstants.PREFERENCE_KRB5_LOGIN_MODULE
);
-
-                            if ( !useKrb5SystemProperties )
-                            {
-                                gssApiRequest.setUsername( bindPrincipal );
-                                gssApiRequest.setCredentials( bindPassword );
-                                gssApiRequest.setQualityOfProtection( connection.getConnectionParameter().getSaslQop()
);
-                                gssApiRequest.setSecurityStrength( connection.getConnectionParameter()
-                                    .getSaslSecurityStrength() );
-                                gssApiRequest.setMutualAuthentication( connection.getConnectionParameter()
-                                    .isSaslMutualAuthentication() );
-                                gssApiRequest.setLoginModuleConfiguration( new InnerConfiguration(
krb5LoginModule ) );
-
-                                switch ( connection.getConnectionParameter().getKrb5Configuration()
)
-                                {
-                                    case FILE:
-                                        gssApiRequest.setKrb5ConfFilePath( connection.getConnectionParameter()
-                                            .getKrb5ConfigurationFile() );
-                                        break;
-                                    case MANUAL:
-                                        gssApiRequest.setRealmName( connection.getConnectionParameter().getKrb5Realm()
);
-                                        gssApiRequest.setKdcHost( connection.getConnectionParameter().getKrb5KdcHost()
);
-                                        gssApiRequest.setKdcPort( connection.getConnectionParameter().getKrb5KdcPort()
);
-                                        break;
-                                }
-                            }
+                            gssApiRequest.setUsername( bindPrincipal );
+                            gssApiRequest.setCredentials( bindPassword );
+                            gssApiRequest.setRealmName( connection.getConnectionParameter().getKrb5Realm()
);
+                            gssApiRequest.setKdcHost( connection.getConnectionParameter().getKrb5KdcHost()
);
+                            gssApiRequest.setKdcPort( connection.getConnectionParameter().getKrb5KdcPort()
);
 
                             bindResponse = ldapConnection.bind( gssApiRequest );
                         }

Propchange: directory/studio/branches/m1/tests/test.integration.core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Feb 20 23:01:13 2011
@@ -1,8 +1,4 @@
 target
-maven-eclipse.xml
-lib
-.externalToolBuilders
-felix-cache
 .project
 .classpath
 .settings
@@ -10,5 +6,5 @@ eclipse-classes
 *.log
 *.iml
 *.ipr
-dependency-reduced-pom.xml
 META-INF
+lib

Modified: directory/studio/branches/m1/tests/test.integration.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/tests/test.integration.core/pom.xml?rev=1072793&r1=1072792&r2=1072793&view=diff
==============================================================================
--- directory/studio/branches/m1/tests/test.integration.core/pom.xml (original)
+++ directory/studio/branches/m1/tests/test.integration.core/pom.xml Sun Feb 20 23:01:13 2011
@@ -250,7 +250,7 @@
         <extensions>true</extensions>
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
-          <instructions>
+          <instructions>            
             <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton:=true</Bundle-SymbolicName>
             <Bundle-Localization>plugin</Bundle-Localization>
             <Require-Bundle>org.eclipse.core.runtime,

Propchange: directory/studio/branches/m1/tests/test.integration.ui/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Feb 20 23:01:13 2011
@@ -12,3 +12,4 @@ eclipse-classes
 *.ipr
 dependency-reduced-pom.xml
 META-INF
+lib

Modified: directory/studio/branches/m1/tests/test.integration.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/tests/test.integration.ui/pom.xml?rev=1072793&r1=1072792&r2=1072793&view=diff
==============================================================================
--- directory/studio/branches/m1/tests/test.integration.ui/pom.xml (original)
+++ directory/studio/branches/m1/tests/test.integration.ui/pom.xml Sun Feb 20 23:01:13 2011
@@ -336,6 +336,11 @@
       <artifactId>org.apache.commons.codec</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+      <scope>provided</scope>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.directory.server</groupId>

Modified: directory/studio/branches/m1/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/NewEntryWizardBot.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/NewEntryWizardBot.java?rev=1072793&r1=1072792&r2=1072793&view=diff
==============================================================================
--- directory/studio/branches/m1/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/NewEntryWizardBot.java
(original)
+++ directory/studio/branches/m1/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/NewEntryWizardBot.java
Sun Feb 20 23:01:13 2011
@@ -19,10 +19,11 @@
  */
 package org.apache.directory.studio.test.integration.ui.bots;
 
-
 import org.apache.directory.shared.ldap.model.name.Dn;
 
 
+
+
 public class NewEntryWizardBot extends WizardBot
 {
     private EntryEditorWidgetBot widgetBot;



Mime
View raw message