directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1174923 - in /directory/studio/trunk/plugins: ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/ ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/ lda...
Date Fri, 23 Sep 2011 17:52:45 GMT
Author: pamarcelot
Date: Fri Sep 23 17:52:45 2011
New Revision: 1174923

URL: http://svn.apache.org/viewvc?rev=1174923&view=rev
Log:
Used static field instead string.

Modified:
    directory/studio/trunk/plugins/ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/ApacheDS153LdapServerAdapter.java
    directory/studio/trunk/plugins/ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/ApacheDS154LdapServerAdapter.java
    directory/studio/trunk/plugins/ldapservers.apacheds.v155/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v155/ApacheDS155LdapServerAdapter.java
    directory/studio/trunk/plugins/ldapservers.apacheds.v156/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v156/ApacheDS156LdapServerAdapter.java
    directory/studio/trunk/plugins/ldapservers.apacheds.v157/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v157/ApacheDS157LdapServerAdapter.java

Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/ApacheDS153LdapServerAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/ApacheDS153LdapServerAdapter.java?rev=1174923&r1=1174922&r2=1174923&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/ApacheDS153LdapServerAdapter.java
(original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v153/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v153/ApacheDS153LdapServerAdapter.java
Fri Sep 23 17:52:45 2011
@@ -96,7 +96,7 @@ public class ApacheDS153LdapServerAdapte
         // Creating server folder structure
         monitor.subTask( "creating server folder structure" );
         File serverFolder = LdapServersManager.getServerFolder( server ).toFile();
-        File confFolder = new File( serverFolder, "conf" );
+        File confFolder = new File( serverFolder, CONF );
         confFolder.mkdir();
         File ldifFolder = new File( serverFolder, "ldif" );
         ldifFolder.mkdir();
@@ -141,7 +141,7 @@ public class ApacheDS153LdapServerAdapte
                 try
                 {
                     PathEditorInput input = new PathEditorInput( LdapServersManager.getServerFolder(
server )
-                        .append( "conf" ).append( "server.xml" ) ); //$NON-NLS-1$ //$NON-NLS-2$
+                        .append( CONF ).append( SERVER_XML ) );
                     PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
                         .openEditor( input, ServerConfigurationEditor.ID );
                 }
@@ -211,8 +211,8 @@ public class ApacheDS153LdapServerAdapte
     public static ServerConfigurationV153 getServerConfiguration( LdapServer server ) throws
ServerXmlIOException,
         FileNotFoundException
     {
-        InputStream fis = new FileInputStream( LdapServersManager.getServerFolder( server
).append( "conf" )
-            .append( "server.xml" ).toFile() );
+        InputStream fis = new FileInputStream( LdapServersManager.getServerFolder( server
).append( CONF )
+            .append( SERVER_XML ).toFile() );
 
         ServerXmlIOV153 serverXmlIOV153 = new ServerXmlIOV153();
         return ( ServerConfigurationV153 ) serverXmlIOV153.parse( fis );

Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/ApacheDS154LdapServerAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/ApacheDS154LdapServerAdapter.java?rev=1174923&r1=1174922&r2=1174923&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/ApacheDS154LdapServerAdapter.java
(original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v154/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v154/ApacheDS154LdapServerAdapter.java
Fri Sep 23 17:52:45 2011
@@ -98,7 +98,7 @@ public class ApacheDS154LdapServerAdapte
         // Creating server folder structure
         monitor.subTask( "creating server folder structure" );
         File serverFolder = LdapServersManager.getServerFolder( server ).toFile();
-        File confFolder = new File( serverFolder, "conf" );
+        File confFolder = new File( serverFolder, CONF );
         confFolder.mkdir();
         File ldifFolder = new File( serverFolder, "ldif" );
         ldifFolder.mkdir();
@@ -143,7 +143,7 @@ public class ApacheDS154LdapServerAdapte
                 try
                 {
                     PathEditorInput input = new PathEditorInput( LdapServersManager.getServerFolder(
server )
-                        .append( "conf" ).append( "server.xml" ) ); //$NON-NLS-1$ //$NON-NLS-2$
+                        .append( CONF ).append( SERVER_XML ) );
                     PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
                         .openEditor( input, ServerConfigurationEditor.ID );
                 }
@@ -213,8 +213,8 @@ public class ApacheDS154LdapServerAdapte
     public static ServerConfigurationV154 getServerConfiguration( LdapServer server ) throws
ServerXmlIOException,
         FileNotFoundException
     {
-        InputStream fis = new FileInputStream( LdapServersManager.getServerFolder( server
).append( "conf" )
-            .append( "server.xml" ).toFile() );
+        InputStream fis = new FileInputStream( LdapServersManager.getServerFolder( server
).append( CONF )
+            .append( SERVER_XML ).toFile() );
 
         ServerXmlIOV154 serverXmlIOV154 = new ServerXmlIOV154();
         return ( ServerConfigurationV154 ) serverXmlIOV154.parse( fis );

Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v155/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v155/ApacheDS155LdapServerAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v155/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v155/ApacheDS155LdapServerAdapter.java?rev=1174923&r1=1174922&r2=1174923&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v155/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v155/ApacheDS155LdapServerAdapter.java
(original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v155/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v155/ApacheDS155LdapServerAdapter.java
Fri Sep 23 17:52:45 2011
@@ -98,7 +98,7 @@ public class ApacheDS155LdapServerAdapte
         // Creating server folder structure
         monitor.subTask( "creating server folder structure" );
         File serverFolder = LdapServersManager.getServerFolder( server ).toFile();
-        File confFolder = new File( serverFolder, "conf" );
+        File confFolder = new File( serverFolder, CONF );
         confFolder.mkdir();
         File ldifFolder = new File( serverFolder, "ldif" );
         ldifFolder.mkdir();
@@ -143,7 +143,7 @@ public class ApacheDS155LdapServerAdapte
                 try
                 {
                     PathEditorInput input = new PathEditorInput( LdapServersManager.getServerFolder(
server )
-                        .append( "conf" ).append( "server.xml" ) ); //$NON-NLS-1$ //$NON-NLS-2$
+                        .append( CONF ).append( SERVER_XML ) );
                     PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
                         .openEditor( input, ServerConfigurationEditor.ID );
                 }
@@ -213,8 +213,8 @@ public class ApacheDS155LdapServerAdapte
     public static ServerConfigurationV155 getServerConfiguration( LdapServer server ) throws
ServerXmlIOException,
         FileNotFoundException
     {
-        InputStream fis = new FileInputStream( LdapServersManager.getServerFolder( server
).append( "conf" )
-            .append( "server.xml" ).toFile() );
+        InputStream fis = new FileInputStream( LdapServersManager.getServerFolder( server
).append( CONF )
+            .append( SERVER_XML ).toFile() );
 
         ServerXmlIOV155 serverXmlIOV155 = new ServerXmlIOV155();
         return ( ServerConfigurationV155 ) serverXmlIOV155.parse( fis );

Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v156/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v156/ApacheDS156LdapServerAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v156/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v156/ApacheDS156LdapServerAdapter.java?rev=1174923&r1=1174922&r2=1174923&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v156/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v156/ApacheDS156LdapServerAdapter.java
(original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v156/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v156/ApacheDS156LdapServerAdapter.java
Fri Sep 23 17:52:45 2011
@@ -103,7 +103,7 @@ public class ApacheDS156LdapServerAdapte
         // Creating server folder structure
         monitor.subTask( "creating server folder structure" );
         File serverFolder = LdapServersManager.getServerFolder( server ).toFile();
-        File confFolder = new File( serverFolder, "conf" );
+        File confFolder = new File( serverFolder, CONF );
         confFolder.mkdir();
         File ldifFolder = new File( serverFolder, "ldif" );
         ldifFolder.mkdir();
@@ -148,7 +148,7 @@ public class ApacheDS156LdapServerAdapte
                 try
                 {
                     PathEditorInput input = new PathEditorInput( LdapServersManager.getServerFolder(
server )
-                        .append( "conf" ).append( "server.xml" ) ); //$NON-NLS-1$ //$NON-NLS-2$
+                        .append( CONF ).append( SERVER_XML ) );
                     PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
                         .openEditor( input, ServerConfigurationEditor.ID );
                 }
@@ -218,8 +218,8 @@ public class ApacheDS156LdapServerAdapte
     public static ServerConfigurationV156 getServerConfiguration( LdapServer server ) throws
ServerXmlIOException,
         FileNotFoundException
     {
-        InputStream fis = new FileInputStream( LdapServersManager.getServerFolder( server
).append( "conf" )
-            .append( "server.xml" ).toFile() );
+        InputStream fis = new FileInputStream( LdapServersManager.getServerFolder( server
).append( CONF )
+            .append( SERVER_XML ).toFile() );
 
         ServerXmlIOV156 serverXmlIOV156 = new ServerXmlIOV156();
         return ( ServerConfigurationV156 ) serverXmlIOV156.parse( fis );

Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v157/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v157/ApacheDS157LdapServerAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v157/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v157/ApacheDS157LdapServerAdapter.java?rev=1174923&r1=1174922&r2=1174923&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v157/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v157/ApacheDS157LdapServerAdapter.java
(original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v157/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v157/ApacheDS157LdapServerAdapter.java
Fri Sep 23 17:52:45 2011
@@ -103,7 +103,7 @@ public class ApacheDS157LdapServerAdapte
         // Creating server folder structure
         monitor.subTask( "creating server folder structure" );
         File serverFolder = LdapServersManager.getServerFolder( server ).toFile();
-        File confFolder = new File( serverFolder, "conf" );
+        File confFolder = new File( serverFolder, CONF );
         confFolder.mkdir();
         File ldifFolder = new File( serverFolder, "ldif" );
         ldifFolder.mkdir();
@@ -148,7 +148,7 @@ public class ApacheDS157LdapServerAdapte
                 try
                 {
                     PathEditorInput input = new PathEditorInput( LdapServersManager.getServerFolder(
server )
-                        .append( "conf" ).append( "server.xml" ) ); //$NON-NLS-1$ //$NON-NLS-2$
+                        .append( CONF ).append( SERVER_XML ) );
                     PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
                         .openEditor( input, ServerConfigurationEditor.ID );
                 }
@@ -218,8 +218,8 @@ public class ApacheDS157LdapServerAdapte
     public static ServerConfigurationV157 getServerConfiguration( LdapServer server ) throws
ServerXmlIOException,
         FileNotFoundException
     {
-        InputStream fis = new FileInputStream( LdapServersManager.getServerFolder( server
).append( "conf" )
-            .append( "server.xml" ).toFile() );
+        InputStream fis = new FileInputStream( LdapServersManager.getServerFolder( server
).append( CONF )
+            .append( SERVER_XML ).toFile() );
 
         ServerXmlIOV157 serverXmlIOV157 = new ServerXmlIOV157();
         return ( ServerConfigurationV157 ) serverXmlIOV157.parse( fis );
@@ -230,7 +230,7 @@ public class ApacheDS157LdapServerAdapte
      * Gets the testing port.
      *
      * @param configuration
-     *      the 1.5.6 server configuration
+     *      the 1.5.7 server configuration
      * @return
      *      the testing port
      * @throws IOException 



Mime
View raw message