[jboss-cvs] JBossAS SVN: r87743 - in projects/bootstrap/trunk/impl-as/src: test/java/org/jboss/bootstrap/impl/as/config and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2009-04-23 20:06:41 -0400 (Thu, 23 Apr 2009)
New Revision: 87743

Modified:
   projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/BasicJBossASServerConfig.java
   projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASServerConfig.java
   projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASServerConfigLegacy.java
   projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationValidationTestCase.java
Log:
[JBBOOT-31] Refactoring for accessor/mutator consistency: jboss.server.conf.url

Modified: projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/BasicJBossASServerConfig.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/BasicJBossASServerConfig.java	2009-04-24 00:02:17 UTC (rev 87742)
+++ projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/BasicJBossASServerConfig.java	2009-04-24 00:06:41 UTC (rev 87743)
@@ -489,12 +489,12 @@
    /* (non-Javadoc)
     * @see org.jboss.bootstrap.impl.as.config.JBossASServerConfig#serverConfigLocation(java.lang.String)
     */
-   public JBossASServerConfig serverConfLocation(String serverConfigLocation) throws IllegalArgumentException
+   public JBossASServerConfig serverConfLocation(final String serverConfigLocation) throws IllegalArgumentException
    {
       // If null, just pass along
       if (serverConfigLocation == null)
       {
-         return this.serverConfigLocation((URL) null);
+         return this.serverConfLocation((URL) null);
       }
 
       // Convert this String into a URL via File
@@ -510,13 +510,13 @@
       }
 
       // Return
-      return this.serverConfigLocation(url);
+      return this.serverConfLocation(url);
    }
 
    /* (non-Javadoc)
     * @see org.jboss.bootstrap.impl.as.config.JBossASServerConfig#serverConfigLocation(java.net.URL)
     */
-   public JBossASServerConfig serverConfigLocation(URL serverConfigLocation)
+   public JBossASServerConfig serverConfLocation(final URL serverConfigLocation)
    {
       // Set
       this.serverConfigLocation = serverConfigLocation;

Modified: projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASServerConfig.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASServerConfig.java	2009-04-24 00:02:17 UTC (rev 87742)
+++ projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASServerConfig.java	2009-04-24 00:06:41 UTC (rev 87743)
@@ -337,18 +337,18 @@
    /**
     * Sets the location in which the server configuration resides
     * 
-    * @param serverConfigLocation
+    * @param serverConfLocation
     * @return
     */
-   JBossASServerConfig serverConfigLocation(URL serverConfigLocation);
+   JBossASServerConfig serverConfLocation(URL serverConfLocation);
 
    /**
     * Sets the location in which the server configuration resides
     * 
-    * @param serverConfigLocation
+    * @param serverConfLocation
     * @return
     * @throws IllegalArgumentException If the specified argument 
     *    is non-null and cannot be constructed into a URL
     */
-   JBossASServerConfig serverConfLocation(String serverConfigLocation) throws IllegalArgumentException;
+   JBossASServerConfig serverConfLocation(String serverConfLocation) throws IllegalArgumentException;
 }

Modified: projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASServerConfigLegacy.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASServerConfigLegacy.java	2009-04-24 00:02:17 UTC (rev 87742)
+++ projects/bootstrap/trunk/impl-as/src/main/java/org/jboss/bootstrap/impl/as/config/JBossASServerConfigLegacy.java	2009-04-24 00:06:41 UTC (rev 87743)
@@ -99,8 +99,6 @@
     * Constant that holds the name of the environment property
     * for specifying the URL where JBoss will read server specific
     * library files from.
-    *
-    * <p>Defaults to <tt><em>SERVER_HOME_URL</em>/lib</tt>/
     */
    String PROP_KEY_JBOSSAS_SERVER_LIBRARY_URL = "jboss.server.lib.url";
 

Modified: projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationValidationTestCase.java
===================================================================
--- projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationValidationTestCase.java	2009-04-24 00:02:17 UTC (rev 87742)
+++ projects/bootstrap/trunk/impl-as/src/test/java/org/jboss/bootstrap/impl/as/config/JBossASConfigurationValidationTestCase.java	2009-04-24 00:06:41 UTC (rev 87743)
@@ -326,7 +326,7 @@
 
       // Get config and clear out
       final JBossASServerConfig config = this.config;
-      config.serverConfigLocation((URL) null);
+      config.serverConfLocation((URL) null);
 
       // Test
       this.assertMissingValueFails(config, "server config location");