directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r817673 [2/2] - in /directory/studio/trunk: ./ apacheds-launcher/ apacheds-launcher/src/main/java/org/apache/directory/studio/apacheds/ apacheds/ apacheds/resources/conf/ apacheds/src/main/java/org/apache/directory/studio/apacheds/ apacheds...
Date Tue, 22 Sep 2009 14:25:42 GMT
Modified: directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerJob.java?rev=817673&r1=817672&r2=817673&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerJob.java
(original)
+++ directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/jobs/LaunchServerJob.java
Tue Sep 22 14:25:41 2009
@@ -33,6 +33,7 @@
 import org.apache.directory.studio.apacheds.configuration.model.ServerConfiguration;
 import org.apache.directory.studio.apacheds.configuration.model.v153.ServerConfigurationV153;
 import org.apache.directory.studio.apacheds.configuration.model.v154.ServerConfigurationV154;
+import org.apache.directory.studio.apacheds.configuration.model.v155.ServerConfigurationV155;
 import org.apache.directory.studio.apacheds.model.Server;
 import org.apache.directory.studio.apacheds.model.ServerStateEnum;
 import org.apache.log4j.net.SocketServer;
@@ -233,7 +234,11 @@
              */
             private int getTestingPort( ServerConfiguration configuration )
             {
-                if ( configuration instanceof ServerConfigurationV154 )
+                if ( configuration instanceof ServerConfigurationV155 )
+                {
+                    return getTestingPortVersion155( ( ServerConfigurationV155 ) configuration
);
+                }
+                else if ( configuration instanceof ServerConfigurationV154 )
                 {
                     return getTestingPortVersion154( ( ServerConfigurationV154 ) configuration
);
                 }
@@ -340,6 +345,53 @@
                     return 0;
                 }
             }
+
+
+            /**
+             * Gets the testing port.
+             *
+             * @param configuration
+             *      the 1.5.5 server configuration
+             * @return
+             *      the testing port
+             */
+            private int getTestingPortVersion155( ServerConfigurationV155 configuration )
+            {
+                // LDAP
+                if ( configuration.isEnableLdap() )
+                {
+                    return configuration.getLdapPort();
+                }
+                // LDAPS
+                else if ( configuration.isEnableLdaps() )
+                {
+                    return configuration.getLdapsPort();
+                }
+                // Kerberos
+                else if ( configuration.isEnableKerberos() )
+                {
+                    return configuration.getKerberosPort();
+                }
+                // DNS
+                else if ( configuration.isEnableDns() )
+                {
+                    return configuration.getDnsPort();
+                }
+                // NTP
+                else if ( configuration.isEnableNtp() )
+                {
+                    return configuration.getNtpPort();
+                }
+                // ChangePassword
+                else if ( configuration.isEnableChangePassword() )
+                {
+                    return configuration.getChangePasswordPort();
+                }
+                else
+                {
+                    return 0;
+                }
+            }
         };
 
         // Starting the thread

Modified: directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/Server.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/Server.java?rev=817673&r1=817672&r2=817673&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/Server.java
(original)
+++ directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/Server.java
Tue Sep 22 14:25:41 2009
@@ -43,7 +43,7 @@
     private String id;
 
     /** The version of the server */
-    private ServerVersion version = ServerVersion.VERSION_1_5_4;
+    private ServerVersion version = ServerVersion.VERSION_1_5_5;
 
     /** The state of the server */
     private ServerStateEnum state = ServerStateEnum.STOPPED;

Modified: directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServerVersion.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServerVersion.java?rev=817673&r1=817672&r2=817673&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServerVersion.java
(original)
+++ directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServerVersion.java
Tue Sep 22 14:25:41 2009
@@ -28,6 +28,17 @@
  */
 public enum ServerVersion
 {
+    /** Version 1.5.5 */
+    VERSION_1_5_5
+    {
+        /* (non-Javadoc)
+         * @see java.lang.Enum#toString()
+         */
+        public String toString()
+        {
+            return "1.5.5"; //$NON-NLS-1$
+        }
+    },
     /** Version 1.5.4 */
     VERSION_1_5_4
     {

Modified: directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerIO.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerIO.java?rev=817673&r1=817672&r2=817673&view=diff
==============================================================================
--- directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerIO.java
(original)
+++ directory/studio/trunk/apacheds/src/main/java/org/apache/directory/studio/apacheds/model/ServersHandlerIO.java
Tue Sep 22 14:25:41 2009
@@ -123,7 +123,11 @@
         Attribute versionAttribute = element.attribute( SERVER_VERSION_ATTRIBUTE );
         if ( versionAttribute != null )
         {
-            if ( versionAttribute.getValue().equalsIgnoreCase( "1.5.4" ) ) //$NON-NLS-1$
+            if ( versionAttribute.getValue().equalsIgnoreCase( "1.5.5" ) ) //$NON-NLS-1$
+            {
+                server.setVersion( ServerVersion.VERSION_1_5_5 );
+            }
+            else if ( versionAttribute.getValue().equalsIgnoreCase( "1.5.4" ) ) //$NON-NLS-1$
             {
                 server.setVersion( ServerVersion.VERSION_1_5_4 );
             }

Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=817673&r1=817672&r2=817673&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Tue Sep 22 14:25:41 2009
@@ -66,7 +66,7 @@
     <distMgmtSiteUrl>scpexe://vm094.oxylos.org/var/www/html/projects/studio/</distMgmtSiteUrl>
     <!-- Set versions for subprojects -->
     <aciitemeditor.version>1.5.0-SNAPSHOT</aciitemeditor.version>
-    <apacheds.launcher.version>1.5.0-SNAPSHOT</apacheds.launcher.version>
+    <apacheds.launcher.version>1.5.0</apacheds.launcher.version>
     <apacheds.version>1.5.0-SNAPSHOT</apacheds.version>
     <apacheds.feature.version>1.5.0-SNAPSHOT</apacheds.feature.version>
     <apacheds.help.version>1.5.0-SNAPSHOT</apacheds.help.version>



Mime
View raw message