You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2013/12/05 12:37:41 UTC
svn commit: r1548094 - in /jena/trunk/jena-maven-tools: ./
src/it/schemagen-integration-0/ src/it/schemagen-integration-1/
src/it/schemagen-integration-2/ src/it/schemagen-integration-3/
src/main/java/org/openjena/tools/schemagen/
Author: andy
Date: Thu Dec 5 11:37:40 2013
New Revision: 1548094
URL: http://svn.apache.org/r1548094
Log:
JENA-596 : Apply patch Dec 4 : jena-maven-tools-it.patch
Modified:
jena/trunk/jena-maven-tools/pom.xml
jena/trunk/jena-maven-tools/src/it/schemagen-integration-0/verify.bsh
jena/trunk/jena-maven-tools/src/it/schemagen-integration-1/verify.bsh
jena/trunk/jena-maven-tools/src/it/schemagen-integration-2/verify.bsh
jena/trunk/jena-maven-tools/src/it/schemagen-integration-3/verify.bsh
jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/SchemagenMojo.java
Modified: jena/trunk/jena-maven-tools/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-maven-tools/pom.xml?rev=1548094&r1=1548093&r2=1548094&view=diff
==============================================================================
--- jena/trunk/jena-maven-tools/pom.xml (original)
+++ jena/trunk/jena-maven-tools/pom.xml Thu Dec 5 11:37:40 2013
@@ -116,12 +116,13 @@
<debug>true</debug>
<localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
<postBuildHookScript>verify</postBuildHookScript>
+ <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
</configuration>
<executions>
<execution>
<id>integration-test</id>
<goals>
- <goal>install</goal>
+ <goal>install</goal>
<goal>run</goal>
</goals>
</execution>
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=1548094&r1=1548093&r2=1548094&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 Thu Dec 5 11:37:40 2013
@@ -1,6 +1,6 @@
import org.apache.maven.it.Verifier;
-File testDir = new File("src/it/schemagen-integration-0");
+File testDir = new File("target/it/schemagen-integration-0");
if (!testDir.exists()) {
testDir = new File( "jena-maven-tools/" + testDir.getPath() );
}
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=1548094&r1=1548093&r2=1548094&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 Thu Dec 5 11:37:40 2013
@@ -1,6 +1,6 @@
import org.apache.maven.it.Verifier;
-File testDir = new File("src/it/schemagen-integration-1");
+File testDir = new File("target/it/schemagen-integration-1");
if (!testDir.exists()) {
testDir = new File( "jena-maven-tools/" + testDir.getPath() );
}
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=1548094&r1=1548093&r2=1548094&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 Thu Dec 5 11:37:40 2013
@@ -1,6 +1,6 @@
import org.apache.maven.it.Verifier;
-File testDir = new File("src/it/schemagen-integration-2");
+File testDir = new File("target/it/schemagen-integration-2");
if (!testDir.exists()) {
testDir = new File( "jena-maven-tools/" + testDir.getPath() );
}
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=1548094&r1=1548093&r2=1548094&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 Thu Dec 5 11:37:40 2013
@@ -1,6 +1,6 @@
import org.apache.maven.it.Verifier;
-File testDir = new File("src/it/schemagen-integration-3");
+File testDir = new File("target/it/schemagen-integration-3");
if (!testDir.exists()) {
testDir = new File( "jena-maven-tools/" + testDir.getPath() );
}
Modified: jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/SchemagenMojo.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/SchemagenMojo.java?rev=1548094&r1=1548093&r2=1548094&view=diff
==============================================================================
--- jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/SchemagenMojo.java (original)
+++ jena/trunk/jena-maven-tools/src/main/java/org/openjena/tools/schemagen/SchemagenMojo.java Thu Dec 5 11:37:40 2013
@@ -66,43 +66,40 @@ public class SchemagenMojo
/* Static variables */
/***********************************/
- /**
- * Target directory
- * @parameter property="project.build.directory"
- */
- public static String projectBuildDir;
-
- /** Return the value of <code>${project.build.directory}</code> */
- public static String getProjectBuildDir() {
- return projectBuildDir;
- }
-
/***********************************/
/* Instance variables */
/***********************************/
/**
+ * @parameter property="project.build.directory"
+ */
+
+ @Parameter(property="project.build.directory")
+ private String projectBuildDir;
+
+
+ /**
* Array of file patterns to include in processing
- * @parameter alias="includes"
*/
+ @Parameter
private String[] includes = new String[0];
/**
* Array of file patterns to exclude from processing
- * @parameter alias="excludes"
*/
+ @Parameter
private String[] excludes = new String[0];
/**
* Options for individual files
- * @parameter alias="fileOptions"
*/
+ @Parameter
private List<Source> fileOptions;
/**
* The current base directory of the project
- * @parameter property="basedir"
*/
+ @Parameter(property="basedir")
private File baseDir;
/** The default options object, if any */
@@ -187,6 +184,11 @@ public class SchemagenMojo
return defaultOptions;
}
+ /** Return the value of <code>${project.build.directory}</code> */
+ public String getProjectBuildDir() {
+ return projectBuildDir;
+ }
+
/**
* Handle the default options by creating a default options object and assigning
* the options values from the given source object.
@@ -243,7 +245,7 @@ public class SchemagenMojo
// the name of the input file, and link it to the defaults
String soFileName;
if (so == null) {
- so = new SchemagenOptions(getDefaultOutputDir());
+ so = new SchemagenOptions(getDefaultOptions().getOutputOption());
soFileName = fileName;
so.setParent( getDefaultOptions() );
} else {