directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1403809 - in /directory/studio/trunk/plugins: connection.core/src/main/java/org/apache/directory/studio/connection/core/ ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/
Date Tue, 30 Oct 2012 18:15:21 GMT
Author: pamarcelot
Date: Tue Oct 30 18:15:21 2012
New Revision: 1403809

URL: http://svn.apache.org/viewvc?rev=1403809&view=rev
Log:
Fix for DIRSTUDIO-841 (When creating a connection from an existing ApacheDS 2.0 server, the
"Open Configuration" item is not available)

Modified:
    directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DetectedConnectionProperties.java
    directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/CreateConnectionAction.java

Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DetectedConnectionProperties.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DetectedConnectionProperties.java?rev=1403809&r1=1403808&r2=1403809&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DetectedConnectionProperties.java
(original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DetectedConnectionProperties.java
Tue Oct 30 18:15:21 2012
@@ -33,31 +33,31 @@ import java.util.List;
 public class DetectedConnectionProperties
 {
     /** The key for the connection parameter "Vendor name" */
-    private static final String CONNECTION_PARAMETER_VENDOR_NAME = "detectedProperties.vendorName";
//$NON-NLS-1$
+    public static final String CONNECTION_PARAMETER_VENDOR_NAME = "detectedProperties.vendorName";
//$NON-NLS-1$
 
     /** The key for the connection parameter "Vendor version" */
-    private static final String CONNECTION_PARAMETER_VENDOR_VERSION = "detectedProperties.vendorVersion";
//$NON-NLS-1$
+    public static final String CONNECTION_PARAMETER_VENDOR_VERSION = "detectedProperties.vendorVersion";
//$NON-NLS-1$
 
     /** The key for the connection parameter "Server type" */
-    private static final String CONNECTION_PARAMETER_SERVER_TYPE = "detectedProperties.serverType";
//$NON-NLS-1$
+    public static final String CONNECTION_PARAMETER_SERVER_TYPE = "detectedProperties.serverType";
//$NON-NLS-1$
 
     /** The key for the connection parameter "Supported LDAP versions" */
-    private static final String CONNECTION_PARAMETER_SUPPORTED_LDAP_VERSIONS = "detectedProperties.supportedLdapVersions";
//$NON-NLS-1$
+    public static final String CONNECTION_PARAMETER_SUPPORTED_LDAP_VERSIONS = "detectedProperties.supportedLdapVersions";
//$NON-NLS-1$
 
     /** The key for the connection parameter "Supported SASL mechanisms" */
-    private static final String CONNECTION_PARAMETER_SUPPORTED_SASL_MECHANISMS = "detectedProperties.supportedSaslMechanisms";
//$NON-NLS-1$
+    public static final String CONNECTION_PARAMETER_SUPPORTED_SASL_MECHANISMS = "detectedProperties.supportedSaslMechanisms";
//$NON-NLS-1$
 
     /** The key for the connection parameter "Supported controls" */
-    private static final String CONNECTION_PARAMETER_SUPPORTED_CONTROLS = "detectedProperties.supportedControls";
//$NON-NLS-1$
+    public static final String CONNECTION_PARAMETER_SUPPORTED_CONTROLS = "detectedProperties.supportedControls";
//$NON-NLS-1$
 
     /** The key for the connection parameter "Supported extensions" */
-    private static final String CONNECTION_PARAMETER_SUPPORTED_EXTENSIONS = "detectedProperties.supportedExtensions";
//$NON-NLS-1$
+    public static final String CONNECTION_PARAMETER_SUPPORTED_EXTENSIONS = "detectedProperties.supportedExtensions";
//$NON-NLS-1$
 
     /** The key for the connection parameter "Supported features" */
-    private static final String CONNECTION_PARAMETER_SUPPORTED_FEATURES = "detectedProperties.supportedFeatures";
//$NON-NLS-1$
+    public static final String CONNECTION_PARAMETER_SUPPORTED_FEATURES = "detectedProperties.supportedFeatures";
//$NON-NLS-1$
 
     /** The connection */
-    private Connection connection;
+    public Connection connection;
 
 
     /**

Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/CreateConnectionAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/CreateConnectionAction.java?rev=1403809&r1=1403808&r2=1403809&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/CreateConnectionAction.java
(original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/CreateConnectionAction.java
Tue Oct 30 18:15:21 2012
@@ -27,7 +27,8 @@ import org.apache.directory.studio.conne
 import org.apache.directory.studio.connection.core.ConnectionParameter;
 import org.apache.directory.studio.connection.core.ConnectionParameter.AuthenticationMethod;
 import org.apache.directory.studio.connection.core.ConnectionParameter.EncryptionMethod;
-import org.apache.directory.studio.connection.core.ConnectionParameter.NetworkProvider;
+import org.apache.directory.studio.connection.core.ConnectionServerType;
+import org.apache.directory.studio.connection.core.DetectedConnectionProperties;
 import org.apache.directory.studio.ldapservers.actions.CreateConnectionActionHelper;
 import org.apache.directory.studio.ldapservers.model.LdapServer;
 import org.apache.directory.studio.ldapservers.views.ServersView;
@@ -179,6 +180,14 @@ public class CreateConnectionAction impl
         // Network Provider
         connectionParameter.setNetworkProvider( ConnectionCorePlugin.getDefault().getDefaultNetworkProvider()
);
 
+        // Extended Properties
+        connectionParameter.setExtendedProperty( DetectedConnectionProperties.CONNECTION_PARAMETER_SERVER_TYPE,
+            ConnectionServerType.APACHEDS.toString() );
+        connectionParameter.setExtendedProperty( DetectedConnectionProperties.CONNECTION_PARAMETER_VENDOR_NAME,
+            "Apache Software Foundation" ); //$NON-NLS-1$
+        connectionParameter.setExtendedProperty( DetectedConnectionProperties.CONNECTION_PARAMETER_VENDOR_VERSION,
+            "2.0.0" ); //$NON-NLS-1$
+
         // Creating the connection
         CreateConnectionActionHelper.createLdapBrowserConnection( server, new Connection(
connectionParameter ) );
     }



Mime
View raw message