[FIXED JENKINS-11104] Wsadmin command was not working with "sudo wsad…

…min"
jenkinsci · Sep 30, 2011 · 1427fcd · 1427fcd
1 parent 8083afc
commit 1427fcd
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1,20 @@
+WAS Builder plugin
+==================
+Copyright &copy; 2009-2011, Manufacture Française des Pneumatiques Michelin, Romain Seguy, and other contributors. Licensed under MIT License.
+
+About this plugin
+-----------------
+The WAS Builder plugin is meant to be used from [Jenkins][1] to run wsadmin commands againt IBM WebSphere Application Server through build steps in order, for example, to deploy applications. Please take a look at [Jenkins' wiki][2] to get detailed information.
+
+Installation
+------------
+The WAS Builder plugin can be installed from any Jenkins installation connected to the Internet using the **Plugin Manager** screen.
+
+Source code
+-----------
+The primary location for the source code of this plugin is on [Jenkins' SVN repository][3]. It is also mirrored on [GitHub][4] for conveniency.
+
+[1]: http://jenkins-ci.org/
+[2]: http://wiki.jenkins-ci.org/display/JENKINS/WAS+Builder+Plugin
+[3]: https://svn.jenkins-ci.org/trunk/hudson/plugins/was-builder/
+[4]: https://github.com/jenkinsci/was-builder-plugin
diff --git a/pom.xml b/pom.xml
@@ -4,14 +4,14 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>1.398</version>
+    <version>1.409</version>
   </parent>
 
   <artifactId>was-builder</artifactId>
   <packaging>hpi</packaging>
   <name>WAS Builder Plugin</name>
   <url>http://wiki.jenkins-ci.org/display/JENKINS/WAS+Builder+Plugin</url>
-  <version>1.7-SNAPSHOT</version>
+  <version>1.6.1-SNAPSHOT</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -21,7 +21,7 @@
     <developer>
       <id>rseguy</id>
       <name>Romain Seguy</name>
-      <email>rseguy@ifrance.com</email>
+      <email>romain.seguy@gmail.com</email>
       <timezone>+1</timezone>
     </developer>
   </developers>

diff --git a/src/main/java/com/michelin/cio/hudson/plugins/wasbuilder/WASBuildStep.java b/src/main/java/com/michelin/cio/hudson/plugins/wasbuilder/WASBuildStep.java
@@ -1,7 +1,8 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2009-2010, Manufacture Française des Pneumatiques Michelin, Romain Seguy
+ * Copyright (c) 2009-2011, Manufacture Française des Pneumatiques Michelin,
+ * Romain Seguy, Alan Harder
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -236,7 +237,9 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
 
                 String wsadminExecutable = wasInstallation.getWsadminExecutable(launcher);
                 if(wsadminExecutable != null) {
-                    args.add(wsadminExecutable);
+                    for(String wsadminExecutablePart: wsadminExecutable.split(" ")) {
+                        args.add(wsadminExecutablePart);
+                    }
                 }
                 else {
                     listener.fatalError(ResourceBundleHolder.get(WASBuildStep.class).format("NoWsadminExecutable", wasInstallation.getName(), wasServer.getName()));

diff --git a/src/main/java/com/michelin/cio/hudson/plugins/wasbuilder/WASInstallation.java b/src/main/java/com/michelin/cio/hudson/plugins/wasbuilder/WASInstallation.java
@@ -1,7 +1,8 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2009-2010, Manufacture Française des Pneumatiques Michelin, Romain Seguy
+ * Copyright (c) 2009-2011, Manufacture Française des Pneumatiques Michelin,
+ * Romain Seguy, Alan Harder
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/src/main/java/com/michelin/cio/hudson/plugins/wasbuilder/WASServer.java b/src/main/java/com/michelin/cio/hudson/plugins/wasbuilder/WASServer.java
@@ -1,7 +1,8 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2009-2010, Manufacture Française des Pneumatiques Michelin, Romain Seguy
+ * Copyright (c) 2009-2011, Manufacture Française des Pneumatiques Michelin,
+ * Romain Seguy, Alan Harder
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal