Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #5 from riso/master
[JENKINS-27945] Enable cluster support
  • Loading branch information
greg-peters committed Apr 17, 2015
2 parents c7c3a48 + d53dec9 commit 2d2c3ee
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 7 deletions.
14 changes: 7 additions & 7 deletions pom.xml
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.509.4</version><!-- which version of Jenkins is this plugin built against? -->
<version>1.608</version><!-- which version of Jenkins is this plugin built against? -->
</parent>

<artifactId>websphere-deployer</artifactId>
Expand Down Expand Up @@ -65,37 +65,37 @@
<groupId>com.ibm.ws</groupId>
<artifactId>admin</artifactId>
<version>8.5.0</version>
<scope>runtime</scope>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.ibm.ws</groupId>
<artifactId>orb</artifactId>
<version>8.5.0</version>
<scope>runtime</scope>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.ibm.ws</groupId>
<artifactId>liberty-connector</artifactId>
<version>8.5.5</version>
<scope>runtime</scope>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.ibm.ws</groupId>
<artifactId>liberty-rest-connector</artifactId>
<version>8.5.5</version>
<scope>runtime</scope>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.ibm.ws</groupId>
<artifactId>liberty-basic</artifactId>
<version>8.5.5</version>
<scope>runtime</scope>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.ibm.ws</groupId>
<artifactId>liberty-endpoint</artifactId>
<version>8.5.5</version>
<scope>runtime</scope>
<scope>provided</scope>
</dependency>
</dependencies>

Expand Down
Expand Up @@ -47,6 +47,7 @@ public class WebSphereDeployerPlugin extends Notifier {
private final String node;
private final String cell;
private final String server;
private final String cluster;
private final String artifacts;
private final String clientKeyPassword;
private final String clientTrustPassword;
Expand All @@ -68,6 +69,7 @@ public WebSphereDeployerPlugin(String ipAddress,
String node,
String cell,
String server,
String cluster,
String clientKeyPassword,
String clientTrustPassword,
String earLevel,
Expand All @@ -86,6 +88,7 @@ public WebSphereDeployerPlugin(String ipAddress,
this.node = node;
this.cell = cell;
this.server = server;
this.cluster = cluster;
this.autoStart = autoStart;
this.clientKeyPassword = Scrambler.scramble(clientKeyPassword);
this.clientTrustPassword = Scrambler.scramble(clientTrustPassword);
Expand Down Expand Up @@ -151,6 +154,10 @@ public String getServer() {
return server;
}

public String getCluster() {
return cluster;
}

public String getCell() {
return cell;
}
Expand Down Expand Up @@ -270,6 +277,7 @@ private void connect(BuildListener listener,WebSphereDeploymentService service,E
service.setTargetCell(env.expand(getCell()));
service.setTargetNode(env.expand(getNode()));
service.setTargetServer(env.expand(getServer()));
service.setTargetCluster(env.expand(getCluster()));
service.connect();
}

Expand Down
Expand Up @@ -49,6 +49,9 @@
<f:entry title="Target Server" field="server">
<f:textbox />
</f:entry>
<f:entry title="Target Cluster" field="cluster">
<f:textbox />
</f:entry>
<f:entry title="Deployment Timeout (minutes)" field="deploymentTimeout">
<f:textbox />
</f:entry>
Expand Down
@@ -0,0 +1,5 @@
<div>
The cluster to deploy to. To find the cluster you want to deploy to, simple look at the path where IBM WebSphere Application Server was installed. (i.e. '[WAS_INSTALL_ROOT]/profiles/[PROFILE]/config/cells/[CELL_NAME]/clusters/[CLUSTER_NAME]').

This property is optional, if left blank it is assumed that no application cluster is defined and the plugin will try to deploy directly on the server. If you have defined a cluster of applications though, you have to specify this property.
</div>

0 comments on commit 2d2c3ee

Please sign in to comment.