LPS-47337 Remove test conf; we will do in a nicer way

juangon · Jun 5, 2014 · 0cde384 · 0cde384
1 parent 4faa8cb
commit 0cde384
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 39 deletions.
diff --git a/build-common.xml b/build-common.xml
@@ -842,24 +842,9 @@ Please find a solution that does not require portal-impl.jar.
 						<fileset dir="@{module.dir}/test/@{test.type}" includes="**/*.png,**/*.properties,**/*.xml" />
 					</copy>
 
-					<if>
-						<available file="@{module.dir}/ivy.xml" />
-						<then>
-							<path id="plugin-test-type.classpath">
-								<pathelement location="@{module.dir}/test-classes/@{test.type}" />
-								<ivy:resources
-									conf="test"
-									file="@{module.dir}/ivy.xml"
-									transitive="${ivy.resolve.transitive.dependencies}"
-								/>
-							</path>
-						</then>
-						<else>
-							<path id="plugin-test-type.classpath">
-								<pathelement location="@{module.dir}/test-classes/@{test.type}" />
-							</path>
-						</else>
-					</if>
+					<path id="plugin-test-type.classpath">
+						<pathelement location="@{module.dir}/test-classes/@{test.type}" />
+					</path>
 
 					<compile-java
 						javac.classpathref="test.classpath"
@@ -2176,24 +2161,9 @@ Please find a solution that does not require portal-impl.jar.
 						test.type="@{test.type}"
 					/>
 
-					<if>
-						<available file="@{module.dir}/ivy.xml" />
-						<then>
-							<path id="plugin-test-type.classpath">
-								<pathelement location="@{module.dir}/test-classes/@{test.type}" />
-								<ivy:resources
-									conf="test"
-									file="@{module.dir}/ivy.xml"
-									transitive="${ivy.resolve.transitive.dependencies}"
-								/>
-							</path>
-						</then>
-						<else>
-							<path id="plugin-test-type.classpath">
-								<pathelement location="@{module.dir}/test-classes/@{test.type}" />
-							</path>
-						</else>
-					</if>
+					<path id="plugin-test-type.classpath">
+						<pathelement location="@{module.dir}/test-classes/@{test.type}" />
+					</path>
 
 					<if>
 						<available file="@{module.dir}/test/@{test.type}" type="dir" />
@@ -2724,4 +2694,4 @@ for (String path : paths) {
 			target.name="war"
 		/>
 	</target>
-</project>
+</project>
diff --git a/ivy.xml b/ivy.xml
@@ -15,7 +15,6 @@
 		<conf name="default" />
 		<conf name="internal" />
 		<conf name="provided" />
-		<conf name="test" />
 	</configurations>
 
 	<dependencies defaultconf="default">
@@ -54,4 +53,4 @@
 		<dependency name="xercesImpl" org="xerces" rev="2.10.0" />
 		<dependency name="xml-apis" org="xml-apis" rev="1.4.01" />
 	</dependencies>
-</ivy-module>
+</ivy-module>