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 2015/04/30 19:04:38 UTC
[1/3] jena git commit: Remove unused import
Repository: jena
Updated Branches:
refs/heads/master 02545b777 -> 1e8d3e15f
Remove unused import
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/089136e1
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/089136e1
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/089136e1
Branch: refs/heads/master
Commit: 089136e17ce2af8d5ec7dbebee8800b1df5358f3
Parents: 02545b7
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Apr 30 17:39:50 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Apr 30 17:39:50 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/089136e1/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java
index 63204a3..6c6b2c0 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java
@@ -19,7 +19,6 @@
package org.apache.jena.fuseki.cmd ;
import java.util.List ;
-import java.util.Map ;
import org.apache.jena.atlas.lib.FileOps ;
import org.apache.jena.fuseki.Fuseki ;
[2/3] jena git commit: Fix to seeking out development classes
Posted by an...@apache.org.
Fix to seeking out development classes
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/325e86cf
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/325e86cf
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/325e86cf
Branch: refs/heads/master
Commit: 325e86cf0f476e0017718fc77fca2833ddcc9faf
Parents: 089136e
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Apr 30 18:02:32 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Apr 30 18:02:32 2015 +0100
----------------------------------------------------------------------
jena-fuseki2/jena-fuseki-core/fuseki-dev | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/325e86cf/jena-fuseki2/jena-fuseki-core/fuseki-dev
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/fuseki-dev b/jena-fuseki2/jena-fuseki-core/fuseki-dev
index 91a30a6..cd27cf2 100755
--- a/jena-fuseki2/jena-fuseki-core/fuseki-dev
+++ b/jena-fuseki2/jena-fuseki-core/fuseki-dev
@@ -61,16 +61,18 @@ fi
DEVDIRS="jena-core jena-tdb jena-arq jena-text"
for X in $DEVDIRS
do
- CPX="$FUSEKI_HOME/../$X/target/classes"
+ CPX="$FUSEKI_HOME/../../$X/target/classes"
if [ -e "$CPX" ]
then
CP="$CPX:$CP"
fi
done
+## echo "$CP"
+## exit
+
FUSEKI_LOG="" #${FUSEKI_LOG:-}
JVM_ARGS="${JVM_ARGS:--Xmx1200M}"
-#echo "$CP"
exec java -cp "$CP" $JVM_ARGS $FUSEKI_LOG org.apache.jena.fuseki.cmd.FusekiCmd "$@"
# Run as war file.
[3/3] jena git commit: JENA-927: ja:loadClass - Intercept
com.hp.hpl.jena and use org.apache.jena
Posted by an...@apache.org.
JENA-927: ja:loadClass - Intercept com.hp.hpl.jena and use org.apache.jena
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/1e8d3e15
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/1e8d3e15
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/1e8d3e15
Branch: refs/heads/master
Commit: 1e8d3e15fc6a5faf16032902f63682e546b6cbd0
Parents: 325e86c
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Apr 30 18:04:26 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Apr 30 18:04:26 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/assembler/AssemblerHelp.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/1e8d3e15/jena-core/src/main/java/org/apache/jena/assembler/AssemblerHelp.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/assembler/AssemblerHelp.java b/jena-core/src/main/java/org/apache/jena/assembler/AssemblerHelp.java
index 2625c77..6e743ab 100644
--- a/jena-core/src/main/java/org/apache/jena/assembler/AssemblerHelp.java
+++ b/jena-core/src/main/java/org/apache/jena/assembler/AssemblerHelp.java
@@ -138,10 +138,17 @@ public class AssemblerHelp
}
private static Class<?> loadClassNamedBy( Statement s )
- {
- try { return Class.forName( getString( s ) ); }
+ {
+ String x = getString( s ) ;
+ // Jena2 -> Jena3 transition
+ if ( x.startsWith("com.hp.hpl.jena") )
+ x = x.replaceFirst("com.hp.hpl.jena", "org.apache.jena") ;
+
+ System.err.println( "********* "+x) ;
+
+ try { return Class.forName(x); }
catch (Exception e) { throw new JenaException( e ); }
- }
+ }
private static void runAnyAssemblerConstructor( AssemblerGroup group, Statement s, Class<?> c )
{