Refactored class names to refer to Jenkins not Hudson

jenkinsci · Jun 9, 2012 · aed1e3e · aed1e3e
1 parent f770e87
commit aed1e3e
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,29 @@ httpclient.log
 atlassian-ide-plugin.xml
 
 lightweight.log
+
+sauce_connect.log
+
+sauce_connect.log.8
+
+settings.xml
+
+jenkins.bmml
+
+lightweight.log.zip
+
+sauce_connect.log.1
+
+sauce_connect.log.2
+
+sauce_connect.log.3
+
+sauce_connect.log.4
+
+sauce_connect.log.5
+
+sauce_connect.log.6
+
+sauce_connect.log.7
+
+test.log
diff --git a/README b/README
@@ -6,4 +6,4 @@ To build and unit test the plugin, execute:
 
 To deploy a built version, execute
 
-	mvn release:prepare release:perform
+	mvn release:prepare release:perform
diff --git a/...abs/hudson/HudsonSauceConnectManager.java → ...bs/hudson/JenkinsSauceConnectManager.java b/...abs/hudson/HudsonSauceConnectManager.java → ...bs/hudson/JenkinsSauceConnectManager.java
@@ -7,7 +7,7 @@
 /**
  * @author Ross Rowe
  */
-public class HudsonSauceConnectManager extends SauceConnectTwoManager {
+public class JenkinsSauceConnectManager extends SauceConnectTwoManager {
 
     @Override
     public String getSauceConnectWorkingDirectory() {

diff --git a/...abs/hudson/HudsonSauceLibraryManager.java → ...bs/hudson/JenkinsSauceLibraryManager.java b/...abs/hudson/HudsonSauceLibraryManager.java → ...bs/hudson/JenkinsSauceLibraryManager.java
@@ -16,7 +16,7 @@
 /**
  * @author Ross Rowe
  */
-public class HudsonSauceLibraryManager extends SauceLibraryManager {
+public class JenkinsSauceLibraryManager extends SauceLibraryManager {
     /**
      * 
      * @param jarFile

diff --git a/...abs/hudson/HudsonSauceManagerFactory.java → ...bs/hudson/JenkinsSauceManagerFactory.java b/...abs/hudson/HudsonSauceManagerFactory.java → ...bs/hudson/JenkinsSauceManagerFactory.java
@@ -13,19 +13,19 @@
 /**
  * @author Ross Rowe
  */
-public class HudsonSauceManagerFactory {
+public class JenkinsSauceManagerFactory {
 
-    private static final HudsonSauceManagerFactory INSTANCE = new HudsonSauceManagerFactory();
+    private static final JenkinsSauceManagerFactory INSTANCE = new JenkinsSauceManagerFactory();
 
     private PlexusContainer plexus = null;
 
     private Lock accessLock = new ReentrantLock();
 
-    public static HudsonSauceManagerFactory getInstance() {
+    public static JenkinsSauceManagerFactory getInstance() {
         return INSTANCE;
     }
 
-    private HudsonSauceManagerFactory() {
+    private JenkinsSauceManagerFactory() {
     }
 
     public SauceConnectTwoManager createSauceConnectManager() throws ComponentLookupException {

diff --git a/src/main/java/hudson/plugins/sauce_ondemand/PluginImpl.java b/src/main/java/hudson/plugins/sauce_ondemand/PluginImpl.java
@@ -24,8 +24,8 @@
 package hudson.plugins.sauce_ondemand;
 
 import com.saucelabs.ci.SauceLibraryManager;
-import com.saucelabs.hudson.HudsonSauceLibraryManager;
-import com.saucelabs.hudson.HudsonSauceManagerFactory;
+import com.saucelabs.hudson.JenkinsSauceLibraryManager;
+import com.saucelabs.hudson.JenkinsSauceManagerFactory;
 import com.saucelabs.rest.Credential;
 import com.saucelabs.rest.SauceTunnelFactory;
 import hudson.Extension;
@@ -55,7 +55,7 @@ public class PluginImpl extends Plugin implements Describable<PluginImpl> {
 
     private static final Logger logger = Logger.getLogger(PluginImpl.class);
 
-    private SauceLibraryManager libraryManager = new HudsonSauceLibraryManager();
+    private SauceLibraryManager libraryManager = new JenkinsSauceLibraryManager();
     /**
      * User name to access Sauce OnDemand.
      */
@@ -86,7 +86,7 @@ public void start() throws Exception {
         Items.XSTREAM.alias("hudson.plugins.sauce_ondemand.SauceOnDemandBuildWrapper", SauceOnDemandBuildWrapper.class);
 
         load();
-        HudsonSauceManagerFactory.getInstance().start();
+        JenkinsSauceManagerFactory.getInstance().start();
     }
 
     public void setCredential(String username, String apiKey) throws IOException {

diff --git a/src/main/java/hudson/plugins/sauce_ondemand/SauceOnDemandBuildWrapper.java b/src/main/java/hudson/plugins/sauce_ondemand/SauceOnDemandBuildWrapper.java
@@ -28,7 +28,7 @@
 import com.saucelabs.ci.BrowserFactory;
 import com.saucelabs.ci.sauceconnect.SauceConnectUtils;
 import com.saucelabs.ci.sauceconnect.SauceTunnelManager;
-import com.saucelabs.hudson.HudsonSauceManagerFactory;
+import com.saucelabs.hudson.JenkinsSauceManagerFactory;
 import hudson.Extension;
 import hudson.FilePath;
 import hudson.Launcher;
@@ -50,6 +50,7 @@
 import java.net.InetAddress;
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
+import java.text.DecimalFormat;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -86,7 +87,7 @@ public class SauceOnDemandBuildWrapper extends BuildWrapper implements Serializa
      * TODO provide mechanism to set launchOnSlave via UI
      */
     private boolean launchSauceConnectOnSlave = false;
-    public static final Pattern ENVIRONMENT_VARIABLE_PATTERN = Pattern.compile("[$|%]([A-Z]+)");
+    public static final Pattern ENVIRONMENT_VARIABLE_PATTERN = Pattern.compile("[$|%]([a-zA-Z_][a-zA-Z0-9_]+)");
 
     @DataBoundConstructor
     public SauceOnDemandBuildWrapper(Credentials
@@ -149,7 +150,8 @@ public void buildEnvVars(Map<String, String> env) {
                     env.put(SAUCE_ONDEMAND_BROWSERS, StringEscapeUtils.escapeJava(browsersJSON.toString()));
                 }
                 env.put(SELENIUM_HOST, getHostName());
-                env.put(SELENIUM_PORT, Integer.toString(getPort()));
+                DecimalFormat myFormatter = new DecimalFormat("###");
+                env.put(SELENIUM_PORT, myFormatter.format(getPort()));
                 if (getStartingURL() != null) {
                     env.put(SELENIUM_STARTING_URL, getStartingURL());
                 }
@@ -310,7 +312,7 @@ public TunnelHolder(String username) {
 
         public void close(TaskListener listener) {
             try {
-                HudsonSauceManagerFactory.getInstance().createSauceConnectManager().closeTunnelsForPlan(username, listener.getLogger());
+                JenkinsSauceManagerFactory.getInstance().createSauceConnectManager().closeTunnelsForPlan(username, listener.getLogger());
             } catch (ComponentLookupException e) {
                 //shouldn't happen
                 logger.log(Level.SEVERE, "Unable to close tunnel", e);
@@ -375,7 +377,7 @@ public ITunnelHolder call() throws IOException {
             TunnelHolder tunnelHolder = new TunnelHolder(username);
             SauceTunnelManager sauceManager = null;
             try {
-                sauceManager = HudsonSauceManagerFactory.getInstance().createSauceConnectManager();
+                sauceManager = JenkinsSauceManagerFactory.getInstance().createSauceConnectManager();
                 Process process = sauceManager.openConnection(username, key, port, sauceConnectJar, listener.getLogger());
                 return tunnelHolder;
             } catch (ComponentLookupException e) {

diff --git a/src/main/java/hudson/plugins/sauce_ondemand/SauceOnDemandReport.java b/src/main/java/hudson/plugins/sauce_ondemand/SauceOnDemandReport.java
@@ -57,7 +57,6 @@ public class SauceOnDemandReport extends TestAction {
      */
     private final boolean matchingJobNames;
     private static final String HMAC_KEY = "HMACMD5";
-    ;
 
     public SauceOnDemandReport(CaseResult parent, List<String> ids, boolean matchingJobNames) {
         this.parent = parent;
@@ -93,7 +92,7 @@ public String getDisplayName() {
         return "Sauce OnDemand report";
     }
 
-    public String getUrlName() {
+     public String getUrlName() {
         return "sauce-ondemand-report";
     }
 

diff --git a/src/main/resources/META-INF/plexus/components.xml b/src/main/resources/META-INF/plexus/components.xml
@@ -20,7 +20,7 @@ under the License.
     <components>
         <component>
             <role>com.saucelabs.ci.sauceconnect.SauceTunnelManager</role>
-            <implementation>com.saucelabs.hudson.HudsonSauceConnectManager</implementation>
+            <implementation>com.saucelabs.hudson.JenkinsSauceConnectManager</implementation>
         </component>
     </components>
 </component-set>
diff --git a/.../resources/hudson/plugins/sauce_ondemand/SauceOnDemandBuildWrapper/help-seleniumPort.html b/.../resources/hudson/plugins/sauce_ondemand/SauceOnDemandBuildWrapper/help-seleniumPort.html
@@ -1,3 +1,3 @@
 <div>
-The name of the Selenium Port to be used.  For tests run using Sauce Connect, this should be 4445.  If using ondemand.saucelabs.com for the Selenium Host, then use 4444.  The value of the host will be stored in the SAUCE_ONDEMAND_HOST environment variable. 	
+The name of the Selenium Port to be used.  For tests run using Sauce Connect, this should be 4445.  If using ondemand.saucelabs.com for the Selenium Host, then use 4444.  The value of the host will be stored in the SAUCE_ONDEMAND_PORT environment variable.
 </div>