From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 1 Jun 2008 08:36:17 +0000 (+0000)
Subject: Remove duplicated packages causing conflicts
X-Git-Tag: argeo-slc-2.1.7~2868
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=eddb39b8428437560eca49166c29cda2f8c264a4;p=gpl%2Fargeo-slc.git

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
index 1c222d5e1..000000000
--- 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
index 85e0743c8..000000000
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/ant/taskdefs.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# Tasks
-slc.test=org.argeo.slc.ant.test.SlcTestTask
-slc.deploy=org.argeo.slc.ant.deploy.SlcDeployTask
-slc.closeResult=org.argeo.slc.ant.test.SlcCloseTestResultTask
-slc.report=org.argeo.slc.ant.test.SlcReportTask
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
index 0cb3b2c46..000000000
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/ant/typedefs.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-# Types
-slc.context=org.argeo.slc.ant.test.ParentContextType
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
index 693f5ecb9..000000000
--- a/org.argeo.slc.core/src/main/resources/org/argeo/slc/support/deploy/ant/build.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<project>
-
-	<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
index 9bb2ff7f4..000000000
--- 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"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
-	default-lazy-init="true">
-
-	<import
-		resource="classpath:/org/argeo/slc/castor/spring/applicationContext.xml" />
-	<import
-		resource="classpath:/org/argeo/slc/xml/spring/applicationContext.xml" />
-
-	<bean id="slcDefault.ws.client.webServiceTemplate"
-		class="org.springframework.ws.client.core.WebServiceTemplate">
-		<constructor-arg ref="slcDefault.ws.client.messageFactory" />
-		<property name="marshaller" ref="slcDefault.castor.marshaller" />
-		<property name="unmarshaller"
-			ref="slcDefault.castor.marshaller" />
-		<property name="defaultUri"
-			value="http://localhost:8080/org.argeo.slc.webapp/slcService/" />
-		<property name="interceptors">
-			<list>
-				<bean
-					class="org.argeo.slc.ws.client.ValidatingClientInterceptor">
-					<property name="validator"
-						ref="slcDefault.xml.xsdValidator" />
-				</bean>
-			</list>
-		</property>
-	</bean>
-
-	<bean id="slcDefault.ws.client.messageFactory"
-		class="org.springframework.ws.soap.saaj.SaajSoapMessageFactory" />
-
-	<bean name="slcDefault.ws.client.treeTestResultWsNotfier"
-		class="org.argeo.slc.core.test.tree.WebServiceTreeTestResultNotifier">
-		<property name="template"
-			ref="slcDefault.ws.client.webServiceTemplate" />
-		<property name="onlyOnClose" value="false" />
-	</bean>
-
-</beans>
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
index 6ff9b8522..000000000
--- 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"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-	<import resource="classpath:/org/argeo/slc/ant/nonDepContext.xml" />
-
-	<bean id="testResult"
-		parent="slcDefault.test.basicTreeTestResult">
-	</bean>
-
-</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
index f2ea5c52c..000000000
--- a/org.argeo.slc.core/src/test/resources/org/argeo/slc/ant/build.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<project default="test">
-
-	<target name="test">
-		<echo message="Hello World!" />
-		
-		<slc.test path="/testRoot/testPath">
-			<testDefinition bean="testDef"/>
-			<testData bean="testData1"/>
-		</slc.test>
-		
-		<slc.test path="/testRoot/testContext">
-			<testDefinition bean="testDef"/>
-			<testData bean="testData.context1"/>
-		</slc.test>
-		
-		<slc.closeResult result="testResult" />
-	</target>
-</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
index 56da88a8b..000000000
--- 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"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-	<import
-		resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />
-
-	<bean name="testDef"
-		class="org.argeo.slc.core.test.BasicTestDefinition" scope="prototype" />
-
-	<bean name="testData1"
-		class="org.argeo.slc.core.test.BasicTestData">
-		<property name="expected">
-			<value>toto</value>
-		</property>
-		<property name="reached">
-			<value>toto</value>
-		</property>
-	</bean>
-
-	<bean id="testData.context1" parent="context.template">
-		<property name="values">
-			<map>
-				<entry key="reference" value="20" />
-				<entry key="varIntern" value="60" />
-			</map>
-		</property>
-		<property name="expectedValues">
-			<map>
-				<entry key="reference" value="21" />
-				<entry key="varIntern" value="60" />
-			</map>
-		</property>
-	</bean>
-
-	<bean id="context.template"
-		class="org.argeo.slc.core.test.context.DefaultContextTestData"
-		abstract="true">
-	</bean>
-
-</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
index a94d128b3..000000000
--- 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"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-	<import
-		resource="classpath:/org/argeo/slc/ws/client/spring/applicationContext.xml" />
-	<import resource="classpath:/org/argeo/slc/ant/nonDepContext.xml" />
-	<import resource="execution.xml" />
-	<import resource="result.xml" />
-
-</beans>
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
index bdb071b0c..000000000
--- 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"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-	<import
-		resource="classpath:/org/argeo/slc/ws/client/spring/applicationContext.xml" />
-
-	<bean name="executionBuildListener"
-		class="org.argeo.slc.ant.SlcExecutionBuildListener">
-		<property name="notifiers">
-			<list>
-				<ref bean="webServiceNotifier" />
-			</list>
-		</property>
-	</bean>
-
-	<bean name="fileNotifier"
-		class="org.argeo.slc.core.process.FileSlcExecutionNotifier">
-		<property name="basePath" value="${slc.workDir}/process" />
-		<property name="marshaller" ref="slcDefault.castor.marshaller" />
-	</bean>
-
-	<bean name="webServiceNotifier"
-		class="org.argeo.slc.core.process.WebServiceSlcExecutionNotifier">
-		<property name="template"
-			ref="slcDefault.ws.client.webServiceTemplate" />
-	</bean>
-
-</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
index ce5442d5e..000000000
--- 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"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-	<import
-		resource="classpath:/org/argeo/slc/ws/client/spring/applicationContext.xml" />
-
-	<bean id="testResult"
-		parent="slcDefault.test.basicTreeTestResult">
-		<property name="listeners">
-			<list merge="true">
-				<ref
-					bean="slcDefault.ws.client.treeTestResultWsNotfier" />
-				<ref bean="slcDefault.castor.xsltReportGenerator" />
-			</list>
-		</property>
-	</bean>
-
-</beans>
\ No newline at end of file