continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From batkin...@apache.org
Subject svn commit: r1656153 - in /continuum/trunk: continuum-api/src/main/java/org/apache/maven/continuum/installation/ continuum-commons/src/main/java/org/apache/continuum/installation/ continuum-commons/src/test/java/org/apache/continuum/installation/ conti...
Date Sat, 31 Jan 2015 03:33:35 GMT
Author: batkinson
Date: Sat Jan 31 03:33:35 2015
New Revision: 1656153

URL: http://svn.apache.org/r1656153
Log:
Renamed installation service methods to clarify purpose.

Modified:
    continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/installation/InstallationService.java
    continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java
    continuum/trunk/continuum-commons/src/test/java/org/apache/continuum/installation/DefaultInstallationServiceTest.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java

Modified: continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/installation/InstallationService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/installation/InstallationService.java?rev=1656153&r1=1656152&r2=1656153&view=diff
==============================================================================
--- continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/installation/InstallationService.java
(original)
+++ continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/installation/InstallationService.java
Sat Jan 31 03:33:35 2015
@@ -80,14 +80,14 @@ public interface InstallationService
      * @return output of JAVA_HOME/bin/java -version (JAVA_HOME = installation.getVarValue()
      * @throws InstallationException
      */
-    public List<String> getJdkInformations( Installation installation )
+    public List<String> getJavaVersionInfo( Installation installation )
         throws InstallationException;
 
     /**
      * @return output of JAVA_HOME/bin/java -version
      * @throws InstallationException
      */
-    public List<String> getDefaultJdkInformations()
+    public List<String> getDefaultJavaVersionInfo()
         throws InstallationException;
 
     /**
@@ -96,8 +96,8 @@ public interface InstallationService
      * @return the cli output of $path/ec.relativePath.ec.executable ec.versionArgument
      * @throws InstallationException
      */
-    public List<String> getExecutorConfiguratorVersion( String path, ExecutorConfigurator
executorConfigurator,
-                                                        Profile profile )
+    public List<String> getExecutorVersionInfo( String path, ExecutorConfigurator executorConfigurator,
+                                                Profile profile )
         throws InstallationException;
 
 }

Modified: continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java?rev=1656153&r1=1656152&r2=1656153&view=diff
==============================================================================
--- continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java
(original)
+++ continuum/trunk/continuum-commons/src/main/java/org/apache/continuum/installation/DefaultInstallationService.java
Sat Jan 31 03:33:35 2015
@@ -279,11 +279,11 @@ public class DefaultInstallationService
     // -------------------------------------------------------------
 
     /**
-     * TODO replace with calling getExecutorConfiguratorVersion
+     * TODO replace with calling getExecutorVersionInfo
      *
-     * @see org.apache.maven.continuum.installation.InstallationService#getDefaultJdkInformations()
+     * @see org.apache.maven.continuum.installation.InstallationService#getDefaultJavaVersionInfo()
      */
-    public List<String> getDefaultJdkInformations()
+    public List<String> getDefaultJavaVersionInfo()
         throws InstallationException
     {
         try
@@ -294,9 +294,9 @@ public class DefaultInstallationService
             // olamy : JAVA_HOME can not exists with a mac user
             if ( StringUtils.isEmpty( javaHome ) )
             {
-                return getJavaHomeInformations( System.getProperty( "java.home" ) );
+                return getJavaVersionInfo( System.getProperty( "java.home" ) );
             }
-            return getJavaHomeInformations( javaHome );
+            return getJavaVersionInfo( javaHome );
 
         }
         catch ( IOException e )
@@ -310,24 +310,24 @@ public class DefaultInstallationService
     }
 
     /**
-     * TODO replace with calling getExecutorConfiguratorVersion
+     * TODO replace with calling getExecutorVersionInfo
      *
-     * @see org.apache.maven.continuum.installation.InstallationService#getJdkInformations(org.apache.maven.continuum.model.system.Installation)
+     * @see org.apache.maven.continuum.installation.InstallationService#getJavaVersionInfo(org.apache.maven.continuum.model.system.Installation)
      */
-    public List<String> getJdkInformations( Installation installation )
+    public List<String> getJavaVersionInfo( Installation installation )
         throws InstallationException
     {
         if ( installation == null )
         {
-            return getDefaultJdkInformations();
+            return getDefaultJavaVersionInfo();
         }
         if ( StringUtils.isEmpty( installation.getVarValue() ) )
         {
-            return getDefaultJdkInformations();
+            return getDefaultJavaVersionInfo();
         }
         try
         {
-            return getJavaHomeInformations( installation.getVarValue() );
+            return getJavaVersionInfo( installation.getVarValue() );
         }
         catch ( CommandLineException e )
         {
@@ -336,11 +336,11 @@ public class DefaultInstallationService
     }
 
     /**
-     * @param javaHome
+     * @param homePath
      * @return
-     * @throws CommandLineException
+     * @throws Exception
      */
-    private List<String> getJavaHomeInformations( String javaHome )
+    private List<String> getJavaVersionInfo( String homePath )
         throws CommandLineException
     {
         Commandline commandline = new Commandline();
@@ -398,11 +398,11 @@ public class DefaultInstallationService
     }
 
     /**
-     * @see org.apache.maven.continuum.installation.InstallationService#getExecutorConfiguratorVersion(java.lang.String,
org.apache.maven.continuum.execution.ExecutorConfigurator, Profile)
+     * @see org.apache.maven.continuum.installation.InstallationService#getExecutorVersionInfo(java.lang.String,
org.apache.maven.continuum.execution.ExecutorConfigurator, Profile)
      */
     @SuppressWarnings( "unchecked" )
-    public List<String> getExecutorConfiguratorVersion( String path, ExecutorConfigurator
executorConfigurator,
-                                                        Profile profile )
+    public List<String> getExecutorVersionInfo( String path, ExecutorConfigurator executorConfigurator,
+                                                Profile profile )
         throws InstallationException
     {
 

Modified: continuum/trunk/continuum-commons/src/test/java/org/apache/continuum/installation/DefaultInstallationServiceTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-commons/src/test/java/org/apache/continuum/installation/DefaultInstallationServiceTest.java?rev=1656153&r1=1656152&r2=1656153&view=diff
==============================================================================
--- continuum/trunk/continuum-commons/src/test/java/org/apache/continuum/installation/DefaultInstallationServiceTest.java
(original)
+++ continuum/trunk/continuum-commons/src/test/java/org/apache/continuum/installation/DefaultInstallationServiceTest.java
Sat Jan 31 03:33:35 2015
@@ -132,15 +132,15 @@ public class DefaultInstallationServiceT
         assertEquals( "updatedbar", getted.getVarValue() );
     }
 
-    public void testgetDefaultJdkInformations()
+    public void testGetDefaultJavaVersionInfo()
         throws Exception
     {
         InstallationService installationService = (InstallationService) lookup( InstallationService.ROLE,
"default" );
-        List<String> infos = installationService.getDefaultJdkInformations();
+        List<String> infos = installationService.getDefaultJavaVersionInfo();
         assertNotNull( infos );
     }
 
-    public void testgetJdkInformations()
+    public void testGetJavaVersionInfo()
         throws Exception
     {
         InstallationService installationService = (InstallationService) lookup( InstallationService.ROLE,
"default" );
@@ -154,11 +154,11 @@ public class DefaultInstallationServiceT
         installation.setType( InstallationService.JDK_TYPE );
         installation.setVarValue( javaHome );
 
-        List<String> infos = installationService.getJdkInformations( installation );
+        List<String> infos = installationService.getJavaVersionInfo( installation );
         assertNotNull( infos );
     }
 
-    public void testgetJdkInformationsWithCommonMethod()
+    public void testGetJavaVersionInfoWithCommonMethod()
         throws Exception
     {
         InstallationService installationService = (InstallationService) lookup( InstallationService.ROLE,
"default" );
@@ -168,7 +168,7 @@ public class DefaultInstallationServiceT
         {
             javaHome = System.getProperty( "java.home" );
         }
-        List<String> infos = installationService.getExecutorConfiguratorVersion( javaHome,
java, null );
+        List<String> infos = installationService.getExecutorVersionInfo( javaHome,
java, null );
         System.out.println( infos );
         assertNotNull( infos );
     }
@@ -179,7 +179,7 @@ public class DefaultInstallationServiceT
     {
         InstallationService installationService = (InstallationService) lookup( InstallationService.ROLE,
"default" );
         ExecutorConfigurator java = installationService.getExecutorConfigurator( InstallationService.MAVEN2_TYPE
);
-        List<String> infos = installationService.getExecutorConfiguratorVersion( null,
java, null );
+        List<String> infos = installationService.getExecutorVersionInfo( null, java,
null );
         assertNotNull( infos );
     }
 */

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java?rev=1656153&r1=1656152&r2=1656153&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
(original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
Sat Jan 31 03:33:35 2015
@@ -514,14 +514,14 @@ public class MailContinuumNotifier
     {
         if ( buildDefinition == null )
         {
-            return continuum.getInstallationService().getDefaultJdkInformations();
+            return continuum.getInstallationService().getDefaultJavaVersionInfo();
         }
         Profile profile = buildDefinition.getProfile();
         if ( profile == null )
         {
-            return continuum.getInstallationService().getDefaultJdkInformations();
+            return continuum.getInstallationService().getDefaultJavaVersionInfo();
         }
-        return continuum.getInstallationService().getJdkInformations( profile.getJdk() );
+        return continuum.getInstallationService().getJavaVersionInfo( profile.getJdk() );
     }
 
     private List<String> getBuilderVersion( BuildDefinition buildDefinition, Project
project )
@@ -566,7 +566,7 @@ public class MailContinuumNotifier
             }
         }
 
-        return continuum.getInstallationService().getExecutorConfiguratorVersion(
+        return continuum.getInstallationService().getExecutorVersionInfo(
             builder == null ? null : builder.getVarValue(), executorConfigurator, profile
);
     }
 

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java?rev=1656153&r1=1656152&r2=1656153&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java
(original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java
Sat Jan 31 03:33:35 2015
@@ -76,7 +76,7 @@ public class InstallationValidator
                 if ( executorConfigurator.getVersionArgument() != null )
                 {
                     // just try to get version infos to validate path is valid
-                    installationService.getExecutorConfiguratorVersion( varValue, executorConfigurator,
null );
+                    installationService.getExecutorVersionInfo( varValue, executorConfigurator,
null );
                 }
             }
         }



Mime
View raw message