directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1070860 - in /directory/studio/branches/m1: ./ plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/ plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/
Date Tue, 15 Feb 2011 12:14:15 GMT
Author: pamarcelot
Date: Tue Feb 15 12:14:14 2011
New Revision: 1070860

URL: http://svn.apache.org/viewvc?rev=1070860&view=rev
Log:
Merged lastest modification from trunk into the m1 branch.

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/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java
    directory/studio/branches/m1/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/messages.properties
    directory/studio/branches/m1/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/messages_de.properties
    directory/studio/branches/m1/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/messages_fr.properties
    directory/studio/branches/m1/pom.xml

Propchange: directory/studio/branches/m1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 12:14:14 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-1068236
+/directory/studio/trunk:1066125-1067996,1068027-1070841

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=1070860&r1=1070859&r2=1070860&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
Tue Feb 15 12:14:14 2011
@@ -143,7 +143,7 @@ public class DirectoryApiConnectionWrapp
         if ( ( connection.getEncryptionMethod() == EncryptionMethod.LDAPS )
             || ( connection.getEncryptionMethod() == EncryptionMethod.START_TLS ) )
         {
-            ldapConnectionConfig.setUseSsl( true );
+            ldapConnectionConfig.setUseSsl( connection.getEncryptionMethod() == EncryptionMethod.LDAPS
);
 
             try
             {
@@ -326,7 +326,7 @@ public class DirectoryApiConnectionWrapp
                         else if ( connection.getConnectionParameter().getAuthMethod() ==
ConnectionParameter.AuthenticationMethod.SASL_GSSAPI )
                         {
                             bindResponse = ldapConnection.bindGssApi( bindPrincipal, bindPassword,
-                                connection.getConnectionParameter().getSaslRealm(),
+                                connection.getConnectionParameter().getKrb5Realm(),
                                 connection.getConnectionParameter().getKrb5KdcHost(),
                                 connection.getConnectionParameter().getKrb5KdcPort() );
                         }
@@ -513,16 +513,16 @@ public class DirectoryApiConnectionWrapp
     {
         if ( controls != null )
         {
-            org.apache.directory.shared.ldap.model.message.Control[] returningControls =

+            org.apache.directory.shared.ldap.model.message.Control[] returningControls =
                 new org.apache.directory.shared.ldap.model.message.Control[controls.length];
 
             for ( int i = 0; i < controls.length; i++ )
             {
                 Control control = controls[i];
-                
+
                 org.apache.directory.shared.ldap.model.message.Control returningControl;
-                    returningControl = ldapConnection.getCodecService().fromJndiControl(
control );
-                
+                returningControl = ldapConnection.getCodecService().fromJndiControl( control
);
+
                 returningControls[i] = returningControl;
             }
 
@@ -653,7 +653,7 @@ public class DirectoryApiConnectionWrapp
             for ( ModificationItem modificationItem : modificationItems )
             {
                 Modification modification = new DefaultModification();
-                modification.setAttribute( AttributeUtils.toClientAttribute(modificationItem.getAttribute())
);
+                modification.setAttribute( AttributeUtils.toClientAttribute( modificationItem.getAttribute()
) );
                 modification.setOperation( convertModificationOperation( modificationItem.getModificationOp()
) );
                 modifications.add( modification );
             }

Modified: directory/studio/branches/m1/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java?rev=1070860&r1=1070859&r2=1070860&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java
(original)
+++ directory/studio/branches/m1/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java
Tue Feb 15 12:14:14 2011
@@ -257,7 +257,7 @@ public class DnBuilderWidget extends Bro
         // draw Rdn group
         if ( showRDN )
         {
-            rdnLabel = BaseWidgetUtils.createLabel( composite, Messages.getString( "DnBuilderWidget.Rdn"
), 1 ); //$NON-NLS-1$
+            rdnLabel = BaseWidgetUtils.createLabel( composite, Messages.getString( "DnBuilderWidget.RDN"
), 1 ); //$NON-NLS-1$
             rdnComposite = BaseWidgetUtils.createColumnContainer( composite, 5, 2 );
             rdnLineList = new ArrayList<RdnLine>();
             BaseWidgetUtils.createSpacer( composite, 3 );
@@ -267,7 +267,7 @@ public class DnBuilderWidget extends Bro
         if ( showRDN )
         {
             previewLabel = BaseWidgetUtils.createLabel( composite, showParent ? Messages
-                .getString( "DnBuilderWidget.DNPreview" ) : Messages.getString( "DnBuilderWidget.RDNPrevei"
), 1 ); //$NON-NLS-1$ //$NON-NLS-2$
+                .getString( "DnBuilderWidget.DNPreview" ) : Messages.getString( "DnBuilderWidget.RDNPreview"
), 1 ); //$NON-NLS-1$ //$NON-NLS-2$
             previewText = BaseWidgetUtils.createReadonlyText( composite, "", 2 ); //$NON-NLS-1$
             BaseWidgetUtils.createSpacer( composite, 3 );
         }

Modified: directory/studio/branches/m1/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/messages.properties?rev=1070860&r1=1070859&r2=1070860&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/messages.properties
(original)
+++ directory/studio/branches/m1/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/messages.properties
Tue Feb 15 12:14:14 2011
@@ -21,7 +21,7 @@ DnBuilderWidget.ErrorInParentDN=Error in
 DnBuilderWidget.ErrorInRDN=Error in RDN 
 DnBuilderWidget.Parent=Parent:
 DnBuilderWidget.RDN=RDN:
-DnBuilderWidget.RDNPrevei=RDN Preview: 
+DnBuilderWidget.RDNPreview=RDN Preview: 
 FileBrowserWidget.BrowseButton=Bro&wse...
 FileEncodingInput.FileEncoding=File Encoding
 LineSeparatorInput.LineSeparator=Line Separator

Modified: directory/studio/branches/m1/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/messages_de.properties?rev=1070860&r1=1070859&r2=1070860&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/messages_de.properties
(original)
+++ directory/studio/branches/m1/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/messages_de.properties
Tue Feb 15 12:14:14 2011
@@ -21,7 +21,7 @@ DnBuilderWidget.ErrorInParentDN=Fehler i
 DnBuilderWidget.ErrorInRDN=Fehler im RDN 
 DnBuilderWidget.Parent=Eltern-DN:
 DnBuilderWidget.RDN=RDN:
-DnBuilderWidget.RDNPrevei=RDN Vorschau: 
+DnBuilderWidget.RDNPreview=RDN Vorschau: 
 FileBrowserWidget.BrowseButton=Bro&wsen...
 FileEncodingInput.FileEncoding=Datei Codierung
 LineSeparatorInput.LineSeparator=Zeilenumbruch

Modified: directory/studio/branches/m1/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/messages_fr.properties?rev=1070860&r1=1070859&r2=1070860&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/messages_fr.properties
(original)
+++ directory/studio/branches/m1/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/messages_fr.properties
Tue Feb 15 12:14:14 2011
@@ -21,7 +21,7 @@ DnBuilderWidget.ErrorInParentDN=Erreur d
 DnBuilderWidget.ErrorInRDN=Erreur dans le RDN 
 DnBuilderWidget.Parent=Parent:
 DnBuilderWidget.RDN=RDN:
-DnBuilderWidget.RDNPrevei=Aper\u00E7u du RDN: 
+DnBuilderWidget.RDNPreview=Aper\u00E7u du RDN: 
 FileBrowserWidget.BrowseButton=Parco&urir...
 FileEncodingInput.FileEncoding=Encodage du fichier
 LineSeparatorInput.LineSeparator=S\u00E9parateur de ligne

Modified: directory/studio/branches/m1/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/pom.xml?rev=1070860&r1=1070859&r2=1070860&view=diff
==============================================================================
--- directory/studio/branches/m1/pom.xml (original)
+++ directory/studio/branches/m1/pom.xml Tue Feb 15 12:14:14 2011
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.project</groupId>
     <artifactId>project</artifactId>
-    <version>19</version>
+    <version>20</version>
   </parent>
   
 
@@ -77,8 +77,8 @@
     <org.apache.commons.pool.version>1.5.5</org.apache.commons.pool.version>
     <org.apache.logging.log4j.version>1.2.14</org.apache.logging.log4j.version>
     <org.apache.httpcomponents.version>4.0</org.apache.httpcomponents.version>
-    <org.apache.directory.shared.version>0.9.20-SNAPSHOT</org.apache.directory.shared.version>
-    <org.apache.directory.shared.validversion>0.9.20.SNAPSHOT</org.apache.directory.shared.validversion>
+    <org.apache.directory.shared.version>1.0.0-M1-SNAPSHOT</org.apache.directory.shared.version>
+    <org.apache.directory.shared.validversion>1.0.0.M1-SNAPSHOT</org.apache.directory.shared.validversion>
     <org.apache.directory.server.version>1.5.8-SNAPSHOT</org.apache.directory.server.version>
     <org.apache.directory.server.validversion>1.5.8.SNAPSHOT</org.apache.directory.server.validversion>
     <org.apache.felix.version>3.0.8</org.apache.felix.version>



Mime
View raw message