Add merge feature to override
authorMathieu Baudier <mbaudier@argeo.org>
Fri, 12 Sep 2008 13:42:32 +0000 (13:42 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Fri, 12 Sep 2008 13:42:32 +0000 (13:42 +0000)
commitd52185471bcb481f11a12a2e1dd36d150b552126
tree5cf54531511b625f2663865e2bb248cb19ec5898
parentdcb3b4bd424ade010b92916a8fe8d0fdb14e71d0
Add merge feature to override

git-svn-id: https://svn.argeo.org/slc/trunk@1590 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
15 files changed:
org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntExecutionContext.java
org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/deploy/SlcDeployTask.java
org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/spring/ListArg.java [new file with mode: 0644]
org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/spring/MapArg.java
org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/spring/OverrideArg.java
org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/spring/SpringArg.java
org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/spring/SpringRegister.java
org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/structure/SAwareTask.java
org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/test/SlcCloseTestResultTask.java
org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/test/SlcTestTask.java
org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/unit/MinimalAntClasspathTestCase.java
org.argeo.slc.agent/src/test/java/org/argeo/slc/ant/DummyObject.java [new file with mode: 0644]
org.argeo.slc.agent/src/test/java/org/argeo/slc/ant/OverrideTest.java [new file with mode: 0644]
org.argeo.slc.agent/src/test/resources/org/argeo/slc/ant/acOverride.xml [new file with mode: 0644]
org.argeo.slc.agent/src/test/resources/org/argeo/slc/ant/buildOverride.xml [new file with mode: 0644]