You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2007/08/20 21:32:19 UTC
svn commit: r567797 - in
/portals/jetspeed-2/trunk/components/jetspeed-capability: pom.xml
src/test/java/org/apache/jetspeed/capabilities/TestCapability.java
Author: ate
Date: Mon Aug 20 12:32:18 2007
New Revision: 567797
URL: http://svn.apache.org/viewvc?rev=567797&view=rev
Log:
JS2-770: Provide a new maven-2 (only) build environment and restructure the source tree according to the maven-2 conventions
See: http://issues.apache.org/jira/browse/JS2-770
Correcting test setup: test resources must be kept out of the build outputDirectory (target/classes)
Modified:
portals/jetspeed-2/trunk/components/jetspeed-capability/pom.xml
portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/java/org/apache/jetspeed/capabilities/TestCapability.java
Modified: portals/jetspeed-2/trunk/components/jetspeed-capability/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-capability/pom.xml?rev=567797&r1=567796&r2=567797&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-capability/pom.xml (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-capability/pom.xml Mon Aug 20 12:32:18 2007
@@ -95,7 +95,7 @@
<configuration>
<skip>${maven.test.skip}</skip>
<resourceBundle>${groupId}:jetspeed-portal-resources:${pom.version}</resourceBundle>
- <targetBaseDirectory>${project.build.outputDirectory}</targetBaseDirectory>
+ <targetBaseDirectory>${project.build.testOutputDirectory}</targetBaseDirectory>
<resources>
<unpack>
<entryset dir="webapp/WEB-INF/assembly" includes="capabilities.xml,transaction.xml"/>
Modified: portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/java/org/apache/jetspeed/capabilities/TestCapability.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/java/org/apache/jetspeed/capabilities/TestCapability.java?rev=567797&r1=567796&r2=567797&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/java/org/apache/jetspeed/capabilities/TestCapability.java (original)
+++ portals/jetspeed-2/trunk/components/jetspeed-capability/src/test/java/org/apache/jetspeed/capabilities/TestCapability.java Mon Aug 20 12:32:18 2007
@@ -73,7 +73,7 @@
System.out.println("testSetup");
JetspeedSerializer serializer = (JetspeedSerializer)ctx.getBean("serializer");
serializer.deleteData();
- serializer.importData(getBasedir()+"target/classes/j2-seed.xml");
+ serializer.importData(getBasedir()+"target/test-classes/j2-seed.xml");
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org