Remove duplicated packages causing conflicts

git-svn-id: https://svn.argeo.org/slc/trunk@1172 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.slc.core/src/main/resources/META-INF/services/org.apache.tools.ant.ProjectHelper b/org.argeo.slc.core/src/main/resources/META-INF/services/org.apache.tools.ant.ProjectHelper
deleted file mode 100644 (file)
index 1c222d5..0000000
--- a/org.argeo.slc.core/src/main/resources/META-INF/services/org.apache.tools.ant.ProjectHelper
+++ /dev/null
@@ -1 +0,0 @@
-org.argeo.slc.ant.SlcProjectHelper
\ No newline at end of file

diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/ant/taskdefs.properties b/org.argeo.slc.core/src/main/resources/org/argeo/slc/ant/taskdefs.properties
deleted file mode 100644 (file)
index 85e0743..0000000
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/ant/taskdefs.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# Tasks\r
-slc.test=org.argeo.slc.ant.test.SlcTestTask\r
-slc.deploy=org.argeo.slc.ant.deploy.SlcDeployTask\r
-slc.closeResult=org.argeo.slc.ant.test.SlcCloseTestResultTask\r
-slc.report=org.argeo.slc.ant.test.SlcReportTask\r

diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/ant/typedefs.properties b/org.argeo.slc.core/src/main/resources/org/argeo/slc/ant/typedefs.properties
deleted file mode 100644 (file)
index 0cb3b2c..0000000
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/ant/typedefs.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-# Types\r
-slc.context=org.argeo.slc.ant.test.ParentContextType\r

diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/support/deploy/ant/build.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/support/deploy/ant/build.xml
deleted file mode 100644 (file)
index 693f5ec..0000000
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/support/deploy/ant/build.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<project>\r
-\r
-       <target name="deployZip">
-               <unzip src="${src}" dest="${tempDir}" />
-               <copyFromTemp />
-       </target>
-
-       <target name="deployTarGz">
-               <untar src="${src}" dest="${tempDir}" compression="gzip" />
-               <copyFromTemp />
-       </target>
-
-       <macrodef name="copyFromTemp">
-               <sequential>
-                       <copy todir="${dest}" includeemptydirs="true">
-                               <fileset dir="${tempDir}">
-                                       <include name="**/*" />
-                               </fileset>
-                               <mapper classname="org.argeo.slc.ant.RemoveRootDirMapper" to="${removeRootDir}" />
-                       </copy>
-               </sequential>
-       </macrodef>
-</project>
\ No newline at end of file

diff --git a/org.argeo.slc.core/src/main/resources/org/argeo/slc/ws/client/spring/applicationContext.xml b/org.argeo.slc.core/src/main/resources/org/argeo/slc/ws/client/spring/applicationContext.xml
deleted file mode 100644 (file)
index 9bb2ff7..0000000
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/ws/client/spring/applicationContext.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"\r
-       default-lazy-init="true">\r
-\r
-       <import\r
-               resource="classpath:/org/argeo/slc/castor/spring/applicationContext.xml" />\r
-       <import\r
-               resource="classpath:/org/argeo/slc/xml/spring/applicationContext.xml" />\r
-\r
-       <bean id="slcDefault.ws.client.webServiceTemplate"\r
-               class="org.springframework.ws.client.core.WebServiceTemplate">\r
-               <constructor-arg ref="slcDefault.ws.client.messageFactory" />\r
-               <property name="marshaller" ref="slcDefault.castor.marshaller" />\r
-               <property name="unmarshaller"\r
-                       ref="slcDefault.castor.marshaller" />\r
-               <property name="defaultUri"\r
-                       value="http://localhost:8080/org.argeo.slc.webapp/slcService/" />\r
-               <property name="interceptors">\r
-                       <list>\r
-                               <bean\r
-                                       class="org.argeo.slc.ws.client.ValidatingClientInterceptor">\r
-                                       <property name="validator"\r
-                                               ref="slcDefault.xml.xsdValidator" />\r
-                               </bean>\r
-                       </list>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="slcDefault.ws.client.messageFactory"\r
-               class="org.springframework.ws.soap.saaj.SaajSoapMessageFactory" />\r
-\r
-       <bean name="slcDefault.ws.client.treeTestResultWsNotfier"\r
-               class="org.argeo.slc.core.test.tree.WebServiceTreeTestResultNotifier">\r
-               <property name="template"\r
-                       ref="slcDefault.ws.client.webServiceTemplate" />\r
-               <property name="onlyOnClose" value="false" />\r
-       </bean>\r
-\r
-</beans>\r

diff --git a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/applicationContext.xml b/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/applicationContext.xml
deleted file mode 100644 (file)
index 6ff9b85..0000000
--- a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/applicationContext.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
-       <import resource="classpath:/org/argeo/slc/ant/nonDepContext.xml" />\r
-\r
-       <bean id="testResult"\r
-               parent="slcDefault.test.basicTreeTestResult">\r
-       </bean>\r
-\r
-</beans>
\ No newline at end of file

diff --git a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/build.xml b/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/build.xml
deleted file mode 100644 (file)
index f2ea5c5..0000000
--- a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/build.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<project default="test">\r
-\r
-       <target name="test">\r
-               <echo message="Hello World!" />\r
-               \r
-               <slc.test path="/testRoot/testPath">\r
-                       <testDefinition bean="testDef"/>\r
-                       <testData bean="testData1"/>\r
-               </slc.test>\r
-               \r
-               <slc.test path="/testRoot/testContext">\r
-                       <testDefinition bean="testDef"/>\r
-                       <testData bean="testData.context1"/>\r
-               </slc.test>\r
-               \r
-               <slc.closeResult result="testResult" />\r
-       </target>\r
-</project>
\ No newline at end of file

diff --git a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/nonDepContext.xml b/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/nonDepContext.xml
deleted file mode 100644 (file)
index 56da88a..0000000
--- a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/nonDepContext.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
-       <import\r
-               resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />\r
-\r
-       <bean name="testDef"\r
-               class="org.argeo.slc.core.test.BasicTestDefinition" scope="prototype" />\r
-\r
-       <bean name="testData1"\r
-               class="org.argeo.slc.core.test.BasicTestData">\r
-               <property name="expected">\r
-                       <value>toto</value>\r
-               </property>\r
-               <property name="reached">\r
-                       <value>toto</value>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="testData.context1" parent="context.template">\r
-               <property name="values">\r
-                       <map>\r
-                               <entry key="reference" value="20" />\r
-                               <entry key="varIntern" value="60" />\r
-                       </map>\r
-               </property>\r
-               <property name="expectedValues">\r
-                       <map>\r
-                               <entry key="reference" value="21" />\r
-                               <entry key="varIntern" value="60" />\r
-                       </map>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="context.template"\r
-               class="org.argeo.slc.core.test.context.DefaultContextTestData"\r
-               abstract="true">\r
-       </bean>\r
-\r
-</beans>
\ No newline at end of file

diff --git a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ws/applicationContext.xml b/org.argeo.slc.core/src/test/resources/org/argeo/slc/ws/applicationContext.xml
deleted file mode 100644 (file)
index a94d128..0000000
--- a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ws/applicationContext.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
-       <import\r
-               resource="classpath:/org/argeo/slc/ws/client/spring/applicationContext.xml" />\r
-       <import resource="classpath:/org/argeo/slc/ant/nonDepContext.xml" />\r
-       <import resource="execution.xml" />\r
-       <import resource="result.xml" />\r
-\r
-</beans>\r

diff --git a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ws/execution.xml b/org.argeo.slc.core/src/test/resources/org/argeo/slc/ws/execution.xml
deleted file mode 100644 (file)
index bdb071b..0000000
--- a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ws/execution.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
-       <import\r
-               resource="classpath:/org/argeo/slc/ws/client/spring/applicationContext.xml" />\r
-\r
-       <bean name="executionBuildListener"\r
-               class="org.argeo.slc.ant.SlcExecutionBuildListener">\r
-               <property name="notifiers">\r
-                       <list>\r
-                               <ref bean="webServiceNotifier" />\r
-                       </list>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean name="fileNotifier"\r
-               class="org.argeo.slc.core.process.FileSlcExecutionNotifier">\r
-               <property name="basePath" value="${slc.workDir}/process" />\r
-               <property name="marshaller" ref="slcDefault.castor.marshaller" />\r
-       </bean>\r
-\r
-       <bean name="webServiceNotifier"\r
-               class="org.argeo.slc.core.process.WebServiceSlcExecutionNotifier">\r
-               <property name="template"\r
-                       ref="slcDefault.ws.client.webServiceTemplate" />\r
-       </bean>\r
-\r
-</beans>
\ No newline at end of file

diff --git a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ws/result.xml b/org.argeo.slc.core/src/test/resources/org/argeo/slc/ws/result.xml
deleted file mode 100644 (file)
index ce5442d..0000000
--- a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ws/result.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
-       <import\r
-               resource="classpath:/org/argeo/slc/ws/client/spring/applicationContext.xml" />\r
-\r
-       <bean id="testResult"\r
-               parent="slcDefault.test.basicTreeTestResult">\r
-               <property name="listeners">\r
-                       <list merge="true">\r
-                               <ref\r
-                                       bean="slcDefault.ws.client.treeTestResultWsNotfier" />\r
-                               <ref bean="slcDefault.castor.xsltReportGenerator" />\r
-                       </list>\r
-               </property>\r
-       </bean>\r
-\r
-</beans>
\ No newline at end of file