X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.agent%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2Fdeploy%2FSlcDeployTask.java;h=8e6fc63b108b84b04c0df2a15b8c8d84241512d2;hb=847af36ba908ea3285a16e17d809a2b29f207b0a;hp=36c22547bd73d1aee2428562f5de51e3eb85987c;hpb=a7b136d40c14e4559faa5c34dc2b4dd2170ac2d4;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/deploy/SlcDeployTask.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/deploy/SlcDeployTask.java
index 36c22547b..8e6fc63b1 100644
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/deploy/SlcDeployTask.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/deploy/SlcDeployTask.java
@@ -3,12 +3,13 @@ package org.argeo.slc.ant.deploy;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.tools.ant.BuildException;
-
-import org.argeo.slc.ant.spring.AbstractSpringArg;
+import org.argeo.slc.ant.SlcAntConfig;
+import org.argeo.slc.ant.spring.SpringArg;
 import org.argeo.slc.ant.structure.SAwareTask;
+import org.argeo.slc.core.build.Distribution;
+import org.argeo.slc.core.deploy.Deployment;
 import org.argeo.slc.core.deploy.DeploymentData;
 import org.argeo.slc.core.deploy.TargetData;
-import org.argeo.slc.core.deploy.WritableDeployment;
 
 /** Ant task wrapping a deployment. */
 public class SlcDeployTask extends SAwareTask {
@@ -16,22 +17,28 @@ public class SlcDeployTask extends SAwareTask {
 
 	private String deploymentBean = null;
 
-	private DeploymentDataArg deploymentDataArg;
-	private TargetDataArg targetDataArg;
+	private SpringArg<DeploymentData> deploymentDataArg;
+	private SpringArg<TargetData> targetDataArg;
+	private SpringArg<Distribution> distributionArg;
 
 	@Override
 	public void executeActions(String mode) throws BuildException {
-		WritableDeployment deployment = (WritableDeployment) getContext()
-				.getBean(deploymentBean);
+		Deployment deployment = (Deployment) getContext().getBean(
+				deploymentBean);
 
 		// set overridden references
+		if (distributionArg != null) {
+			deployment.setDistribution(distributionArg.getBeanInstance());
+			log.trace("Overrides distribution");
+		}
+
 		if (deploymentDataArg != null) {
-			deployment.setDeploymentData(deploymentDataArg.getDeploymentData());
+			deployment.setDeploymentData(deploymentDataArg.getBeanInstance());
 			log.trace("Overrides deployment data");
 		}
 
 		if (targetDataArg != null) {
-			deployment.setTargetData(targetDataArg.getTargetData());
+			deployment.setTargetData(targetDataArg.getBeanInstance());
 			log.trace("Overrides target data");
 		}
 
@@ -48,28 +55,19 @@ public class SlcDeployTask extends SAwareTask {
 	}
 
 	/** Creates deployment data sub tag. */
-	public DeploymentDataArg createDeploymentData() {
-		deploymentDataArg = new DeploymentDataArg();
+	public SpringArg<DeploymentData> createDeploymentData() {
+		deploymentDataArg = new SpringArg<DeploymentData>();
 		return deploymentDataArg;
 	}
 
 	/** Creates target data sub tag. */
-	public TargetDataArg createTargetData() {
-		targetDataArg = new TargetDataArg();
+	public SpringArg<TargetData> createTargetData() {
+		targetDataArg = new SpringArg<TargetData>();
 		return targetDataArg;
 	}
-}
 
-class DeploymentDataArg extends AbstractSpringArg {
-	DeploymentData getDeploymentData() {
-		return (DeploymentData) getBeanInstance();
+	public SpringArg<Distribution> createDistribution() {
+		distributionArg = new SpringArg<Distribution>();
+		return distributionArg;
 	}
-
-}
-
-class TargetDataArg extends AbstractSpringArg {
-	TargetData getTargetData() {
-		return (TargetData) getBeanInstance();
-	}
-
 }