Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix JENKINS-13937
  • Loading branch information
gboissinot committed Jul 10, 2012
1 parent 9765320 commit d6087bd
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 33 deletions.
Expand Up @@ -57,7 +57,7 @@ public List<ArtifactDeployerVO> invoke(File localWorkspace, VirtualChannel chann
ArtifactDeployerVO deploymentResultEntry = new ArtifactDeployerVO();
deploymentResultEntry.setId(++numberOfCurrentDeployedArtifacts);
deploymentResultEntry.setDeployed(true);
deploymentResultEntry.setFileName(renoteFile.getCanonicalPath());
deploymentResultEntry.setFileName(renoteFile.getName());
deploymentResultEntry.setRemotePath(renoteFile.getPath());
deployedArtifactsResultList.add(deploymentResultEntry);
}
Expand Down
@@ -1,51 +1,52 @@
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">

<f:entry field="includes" title="${%Files to deploy}">
<f:textbox name="artifactdeployer.entry.includes" value="${instance.entry.includes}"/>
</f:entry>
<f:entry field="includes" title="${%Files to deploy}">
<f:textbox name="artifactdeployer.entry.includes" value="${instance.entry.includes}"/>
</f:entry>

<f:entry field="remote" title="${%Remote directory}">
<f:textbox name="artifactdeployer.entry.remote" value="${instance.entry.remote}"/>
</f:entry>
<f:entry field="remote" title="${%Remote directory}">
<f:textbox name="artifactdeployer.entry.remote" value="${instance.entry.remote}"/>
</f:entry>

<f:advanced>
<f:advanced>

<f:entry field="excludes" title="${%Excludes}">
<f:entry field="excludes" title="${%Excludes}">
<f:textbox name="artifactdeployer.entry.excludes" value="${instance.entry.excludes}"/>
</f:entry>
</f:entry>

<f:entry field="flatten">
<f:entry field="flatten">
<f:checkbox name="artifactdeployer.entry.flatten" checked="${instance.entry.flatten}"/>
<label class="attach-previous">Flatten</label>
</f:entry>

<f:entry field="deleteRemote">
<f:entry field="deleteRemote">
<f:checkbox name="artifactdeployer.entry.deleteRemote" checked="${instance.entry.deleteRemote}"/>
<label class="attach-previous">Clean-up remote directory before deployment</label>
</f:entry>
</f:entry>

<f:entry field="deleteRemoteArtifacts">
<f:checkbox name="artifactdeployer.entry.deleteRemoteArtifacts" checked="${instance.entry.deleteRemoteArtifacts}"/>
<f:entry field="deleteRemoteArtifacts">
<f:checkbox name="artifactdeployer.entry.deleteRemoteArtifacts"
checked="${instance.entry.deleteRemoteArtifacts}"/>
<label class="attach-previous">Delete remote artifacts when the build is deleted</label>
</f:entry>
</f:entry>

<f:entry>
<table style="width:100%">
<f:entry>
<table style="width:100%">
<f:optionalBlock
field="deleteRemoteArtifactsByScript"
name="artifactdeployer.entry.deleteRemoteArtifactsByScript"
checked="${instance.entry.deletedRemoteArtifactsByScript}"
title="${%Execute a groovy script when the job is deleted}">

<f:entry field="groovyExpression" title="${%Groovy Expression}">
<f:textarea name="artifactdeployer.entry.groovyExpression" value="${instance.entry.groovyExpression}"/>
</f:entry>
</f:optionalBlock>
</table>
field="deleteRemoteArtifactsByScript"
name="artifactdeployer.entry.deleteRemoteArtifactsByScript"
checked="${instance.entry.deletedRemoteArtifactsByScript}"
title="${%Execute a groovy script when the job is deleted}">

<f:entry field="groovyExpression" title="${%Groovy Expression}">
<f:textarea name="artifactdeployer.entry.groovyExpression"
value="${instance.entry.groovyExpression}"/>
</f:entry>
</f:optionalBlock>
</table>
</f:entry>

</f:advanced>
</f:advanced>


</j:jelly>
Expand Up @@ -9,7 +9,7 @@
<j:set var="lastSuccessfulNumber" value="${it.lastSuccessfulNumber}"/>
<j:forEach var="artifact" items="${latestDeployedArtifacts.allArtifacts}" >
<li>
<a href="${lastSuccessfulNumber}/deployedArtifacts/download/artifact.${artifact.id}/">${h.escape(artifact.fileName)}</a>
<a href="${lastSuccessfulNumber}/deployedArtifacts/download/artifact.${artifact.id}/">${h.escape(artifact.remotePath)}</a>
<br />
</li>
</j:forEach>
Expand Down
Expand Up @@ -5,7 +5,7 @@
<ul>
<j:forEach var="artifact" items="${it.allArtifacts}">
<li>
<a href="deployedArtifacts/download/artifact.${artifact.id}/">${h.escape(artifact.fileName)}</a>
<a href="deployedArtifacts/download/artifact.${artifact.id}/">${h.escape(artifact.remotePath)}</a>
<br/>
</li>
</j:forEach>
Expand Down

0 comments on commit d6087bd

Please sign in to comment.