LPS-47337 Missed

22996963 · Jun 3, 2014 · d37331e · d37331e
1 parent 0695b72
commit d37331e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/build-common.xml b/build-common.xml
@@ -2159,18 +2159,23 @@ Please find a solution that does not require portal-impl.jar.
 						test.type="@{test.type}"
 					/>
 
-					<path id="plugin-test-type.classpath">
-						<pathelement location="@{module.dir}/test-classes/@{test.type}" />
-					</path>
-
 					<if>
 						<available file="@{module.dir}/ivy.xml" />
 						<then>
 							<path id="plugin-test-type.classpath">
 								<pathelement location="@{module.dir}/test-classes/@{test.type}" />
-								<ivy:resources file="@{module.dir}/ivy.xml" transitive="${ivy.resolve.transitive.dependencies}" conf="test"/>
+								<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>
 
 					<if>
@@ -2702,4 +2707,4 @@ for (String path : paths) {
 			target.name="war"
 		/>
 	</target>
-</project>
+</project>
diff --git a/ivy.xml b/ivy.xml
@@ -54,4 +54,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>
diff --git a/ivy.xml.MD5 b/ivy.xml.MD5
@@ -1 +1 @@
-42e2f79bd0460997d29975fb09d409a5
+09d741392659c2251c54eab3b48c3cdd
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		42e2f79bd0460997d29975fb09d409a5
		09d741392659c2251c54eab3b48c3cdd