Author: ijd
Date: Wed Oct 30 13:54:56 2013
New Revision: 1537091
URL: http://svn.apache.org/r1537091
Log:
Fix artefacts used in integration test POMs. Fix integration test scripts to be
more path agnostic.
Modified:
jena/trunk/jena-maven-tools/ (props changed)
jena/trunk/jena-maven-tools/src/it/schemagen-integration-0/pom.xml
jena/trunk/jena-maven-tools/src/it/schemagen-integration-0/verify.bsh
jena/trunk/jena-maven-tools/src/it/schemagen-integration-1/pom.xml
jena/trunk/jena-maven-tools/src/it/schemagen-integration-1/verify.bsh
jena/trunk/jena-maven-tools/src/it/schemagen-integration-2/pom.xml
jena/trunk/jena-maven-tools/src/it/schemagen-integration-2/verify.bsh
jena/trunk/jena-maven-tools/src/it/schemagen-integration-3/pom.xml
jena/trunk/jena-maven-tools/src/it/schemagen-integration-3/verify.bsh
Propchange: jena/trunk/jena-maven-tools/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Oct 30 13:54:56 2013
@@ -1 +1,7 @@
target
+
+.settings
+
+.classpath
+
+.project
Modified: jena/trunk/jena-maven-tools/src/it/schemagen-integration-0/pom.xml
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-maven-tools/src/it/schemagen-integration-0/pom.xml?rev=1537091&r1=1537090&r2=1537091&view=diff
==============================================================================
--- jena/trunk/jena-maven-tools/src/it/schemagen-integration-0/pom.xml
(original)
+++ jena/trunk/jena-maven-tools/src/it/schemagen-integration-0/pom.xml Wed Oct
30 13:54:56 2013
@@ -9,9 +9,9 @@
<build>
<plugins>
<plugin>
- <groupId>org.openjena.tools</groupId>
- <artifactId>schemagen</artifactId>
- <version>@project.version@</version>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-maven-tools</artifactId>
+ <version>@project.version@</version>
<configuration>
<includes>
<include>src/main/vocabs/*.ttl</include>
Modified: jena/trunk/jena-maven-tools/src/it/schemagen-integration-0/verify.bsh
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-maven-tools/src/it/schemagen-integration-0/verify.bsh?rev=1537091&r1=1537090&r2=1537091&view=diff
==============================================================================
--- jena/trunk/jena-maven-tools/src/it/schemagen-integration-0/verify.bsh
(original)
+++ jena/trunk/jena-maven-tools/src/it/schemagen-integration-0/verify.bsh Wed
Oct 30 13:54:56 2013
@@ -1,6 +1,10 @@
import org.apache.maven.it.Verifier;
File testDir = new File("src/it/schemagen-integration-0");
+if (!testDir.exists()) {
+ testDir = new File( "jena-maven-tools/" + testDir.getPath() );
+}
+
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
String test1 = verifier.getBasedir() + "/target/generated-sources/Test1.java";
Modified: jena/trunk/jena-maven-tools/src/it/schemagen-integration-1/pom.xml
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-maven-tools/src/it/schemagen-integration-1/pom.xml?rev=1537091&r1=1537090&r2=1537091&view=diff
==============================================================================
--- jena/trunk/jena-maven-tools/src/it/schemagen-integration-1/pom.xml
(original)
+++ jena/trunk/jena-maven-tools/src/it/schemagen-integration-1/pom.xml Wed Oct
30 13:54:56 2013
@@ -9,9 +9,9 @@
<build>
<plugins>
<plugin>
- <groupId>org.openjena.tools</groupId>
- <artifactId>schemagen</artifactId>
- <version>@project.version@</version>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-maven-tools</artifactId>
+ <version>@project.version@</version>
<configuration>
<includes>
<include>src/main/vocabs/*.ttl</include>
@@ -40,5 +40,5 @@
<artifactId>jena-core</artifactId>
<version>@jenaCoreVersion@</version>
</dependency>
- </dependencies>
+ </dependencies>
</project>
\ No newline at end of file
Modified: jena/trunk/jena-maven-tools/src/it/schemagen-integration-1/verify.bsh
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-maven-tools/src/it/schemagen-integration-1/verify.bsh?rev=1537091&r1=1537090&r2=1537091&view=diff
==============================================================================
--- jena/trunk/jena-maven-tools/src/it/schemagen-integration-1/verify.bsh
(original)
+++ jena/trunk/jena-maven-tools/src/it/schemagen-integration-1/verify.bsh Wed
Oct 30 13:54:56 2013
@@ -1,6 +1,9 @@
import org.apache.maven.it.Verifier;
File testDir = new File("src/it/schemagen-integration-1");
+if (!testDir.exists()) {
+ testDir = new File( "jena-maven-tools/" + testDir.getPath() );
+}
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
String test1 = verifier.getBasedir() +
"/target/generated-sources/org/example/test/Test1.java";
Modified: jena/trunk/jena-maven-tools/src/it/schemagen-integration-2/pom.xml
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-maven-tools/src/it/schemagen-integration-2/pom.xml?rev=1537091&r1=1537090&r2=1537091&view=diff
==============================================================================
--- jena/trunk/jena-maven-tools/src/it/schemagen-integration-2/pom.xml
(original)
+++ jena/trunk/jena-maven-tools/src/it/schemagen-integration-2/pom.xml Wed Oct
30 13:54:56 2013
@@ -9,9 +9,9 @@
<build>
<plugins>
<plugin>
- <groupId>org.openjena.tools</groupId>
- <artifactId>schemagen</artifactId>
- <version>@project.version@</version>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-maven-tools</artifactId>
+ <version>@project.version@</version>
<configuration>
<includes>
<include>src/main/vocabs/*.ttl</include>
@@ -41,5 +41,5 @@
<artifactId>jena-core</artifactId>
<version>@jenaCoreVersion@</version>
</dependency>
- </dependencies>
+ </dependencies>
</project>
\ No newline at end of file
Modified: jena/trunk/jena-maven-tools/src/it/schemagen-integration-2/verify.bsh
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-maven-tools/src/it/schemagen-integration-2/verify.bsh?rev=1537091&r1=1537090&r2=1537091&view=diff
==============================================================================
--- jena/trunk/jena-maven-tools/src/it/schemagen-integration-2/verify.bsh
(original)
+++ jena/trunk/jena-maven-tools/src/it/schemagen-integration-2/verify.bsh Wed
Oct 30 13:54:56 2013
@@ -1,6 +1,9 @@
import org.apache.maven.it.Verifier;
File testDir = new File("src/it/schemagen-integration-2");
+if (!testDir.exists()) {
+ testDir = new File( "jena-maven-tools/" + testDir.getPath() );
+}
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
String test1 = verifier.getBasedir() +
"/target/alt-source-dir/org/example/test/Test1.java";
Modified: jena/trunk/jena-maven-tools/src/it/schemagen-integration-3/pom.xml
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-maven-tools/src/it/schemagen-integration-3/pom.xml?rev=1537091&r1=1537090&r2=1537091&view=diff
==============================================================================
--- jena/trunk/jena-maven-tools/src/it/schemagen-integration-3/pom.xml
(original)
+++ jena/trunk/jena-maven-tools/src/it/schemagen-integration-3/pom.xml Wed Oct
30 13:54:56 2013
@@ -9,9 +9,9 @@
<build>
<plugins>
<plugin>
- <groupId>org.openjena.tools</groupId>
- <artifactId>schemagen</artifactId>
- <version>@project.version@</version>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-maven-tools</artifactId>
+ <version>@project.version@</version>
<configuration>
<includes>
<include>src/main/vocabs/*.ttl</include>
@@ -45,5 +45,5 @@
<artifactId>jena-core</artifactId>
<version>@jenaCoreVersion@</version>
</dependency>
- </dependencies>
+ </dependencies>
</project>
\ No newline at end of file
Modified: jena/trunk/jena-maven-tools/src/it/schemagen-integration-3/verify.bsh
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-maven-tools/src/it/schemagen-integration-3/verify.bsh?rev=1537091&r1=1537090&r2=1537091&view=diff
==============================================================================
--- jena/trunk/jena-maven-tools/src/it/schemagen-integration-3/verify.bsh
(original)
+++ jena/trunk/jena-maven-tools/src/it/schemagen-integration-3/verify.bsh Wed
Oct 30 13:54:56 2013
@@ -1,6 +1,9 @@
import org.apache.maven.it.Verifier;
File testDir = new File("src/it/schemagen-integration-3");
+if (!testDir.exists()) {
+ testDir = new File( "jena-maven-tools/" + testDir.getPath() );
+}
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
// Test2.java should use the Ont API, Test1.java should not
