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 2016/05/14 13:50:57 UTC
[1/2] jena git commit: Fix the complete Windows path,
not just the filename
Repository: jena
Updated Branches:
refs/heads/master d545dac47 -> 338d2bb4a
Fix the complete Windows path, not just the filename
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e3741512
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e3741512
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e3741512
Branch: refs/heads/master
Commit: e37415125ee2ab89222efaf753050e323d175560
Parents: 0df832a
Author: Joerg Schoenfisch <jo...@users.noreply.github.com>
Authored: Tue May 10 16:28:14 2016 +0200
Committer: Joerg Schoenfisch <jo...@users.noreply.github.com>
Committed: Tue May 10 16:28:14 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/jena/tools/schemagen/SchemagenMojo.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/e3741512/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenMojo.java
----------------------------------------------------------------------
diff --git a/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenMojo.java b/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenMojo.java
index 7186253..985ca88 100644
--- a/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenMojo.java
+++ b/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/SchemagenMojo.java
@@ -236,11 +236,6 @@ public class SchemagenMojo
protected void processFile( String fileName )
throws MojoExecutionException, SchemagenOptionsConfigurationException
{
- //fix windows paths
- if( File.separator.equals("\\") ){
- fileName = fileName.replaceAll( "\\\\", "/" );
- }
-
getLog().info( "processFile with " + fileName );
getLog().info( optIndex.keySet().toString() );
SchemagenOptions so = optIndex.get( fileName );
@@ -265,6 +260,10 @@ public class SchemagenMojo
getLog().info( "baseDir = " + baseDir );
getLog().info( "getBaseDir() = " + getBaseDir() );
soFileName = relative ? "file:" + baseDir + File.separator + soFileName : soFileName;
+ //fix windows paths
+ if( File.separator.equals("\\") ){
+ soFileName = soFileName.replaceAll( "\\\\", "/" );
+ }
getLog().info( "input after adjustment: " + soFileName );
Resource input = ResourceFactory.createResource( soFileName );
so.setOption( OPT.INPUT, input );
[2/2] jena git commit: Merge commit 'refs/pull/141/head' of
github.com:apache/jena
Posted by an...@apache.org.
Merge commit 'refs/pull/141/head' of github.com:apache/jena
This closes #141.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/338d2bb4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/338d2bb4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/338d2bb4
Branch: refs/heads/master
Commit: 338d2bb4ab781340491034244c2d3a5129d25f54
Parents: d545dac e374151
Author: Andy Seaborne <an...@apache.org>
Authored: Sat May 14 14:50:36 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat May 14 14:50:36 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/tools/schemagen/SchemagenMojo.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------