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/09/13 16:29:30 UTC
svn commit: r1522950 - in /jena/trunk/jena-core/src/main/java/jena:
cmdline/CmdLineUtils.java cmdline/CommandLine.java qtest.java query.java
rset.java sparql.java turtle.java
Author: andy
Date: Fri Sep 13 14:29:30 2013
New Revision: 1522950
URL: http://svn.apache.org/r1522950
Log:
Move reflection call code to CmdLineUtils.
Remove logging setup from code that's going to call
Modified:
jena/trunk/jena-core/src/main/java/jena/cmdline/CmdLineUtils.java
jena/trunk/jena-core/src/main/java/jena/cmdline/CommandLine.java
jena/trunk/jena-core/src/main/java/jena/qtest.java
jena/trunk/jena-core/src/main/java/jena/query.java
jena/trunk/jena-core/src/main/java/jena/rset.java
jena/trunk/jena-core/src/main/java/jena/sparql.java
jena/trunk/jena-core/src/main/java/jena/turtle.java
Modified: jena/trunk/jena-core/src/main/java/jena/cmdline/CmdLineUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/jena/cmdline/CmdLineUtils.java?rev=1522950&r1=1522949&r2=1522950&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/jena/cmdline/CmdLineUtils.java (original)
+++ jena/trunk/jena-core/src/main/java/jena/cmdline/CmdLineUtils.java Fri Sep 13 14:29:30 2013
@@ -18,26 +18,60 @@
package jena.cmdline;
-import com.hp.hpl.jena.util.FileManager;
+import java.lang.reflect.InvocationTargetException ;
+import java.lang.reflect.Method ;
public class CmdLineUtils
{
- // Indirection so this can be rewritten to be independent of Jena's filemanager.
- static public String readWholeFileAsUTF8(String filename)
- {
- return FileManager.get().readWholeFileAsUTF8(filename) ;
- }
-
static public void setLog4jConfiguration()
{
setLog4jConfiguration("jena-log4j.properties") ;
}
- static public void setLog4jConfiguration(String filename)
+ static public void setLog4jConfiguration(String resourceName)
{
if ( System.getProperty("log4j.configuration") == null )
- {
- System.setProperty("log4j.configuration", filename) ;
- }
+ System.setProperty("log4j.configuration", resourceName) ;
+ }
+
+ public static void invokeCmd(String className, String[] args)
+ {
+ Class<?> cmd = null ;
+ try { cmd = Class.forName(className) ; }
+ catch (ClassNotFoundException ex)
+ {
+ System.err.println("Class '"+className+"' not found") ;
+ System.exit(1) ;
+ }
+
+ Method method = null ;
+ try { method = cmd.getMethod("main", new Class[]{String[].class}) ; }
+ catch (NoSuchMethodException ex)
+ {
+ System.err.println("'main' not found but the class '"+className+"' was") ;
+ System.exit(1) ;
+ }
+
+ try
+ {
+ method.invoke(null, new Object[]{args}) ;
+ return ;
+ } catch (IllegalArgumentException ex)
+ {
+ System.err.println("IllegalArgumentException exception: "+ex.getMessage());
+ System.exit(7) ;
+ } catch (IllegalAccessException ex)
+ {
+ System.err.println("IllegalAccessException exception: "+ex.getMessage());
+ System.exit(8) ;
+ } catch (InvocationTargetException ex)
+ {
+ System.err.println("InvocationTargetException exception: "+ex.getMessage());
+ System.exit(9) ;
+ }
+
+
+ //arq.query.main(args) ;
}
+
}
Modified: jena/trunk/jena-core/src/main/java/jena/cmdline/CommandLine.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/jena/cmdline/CommandLine.java?rev=1522950&r1=1522949&r2=1522950&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/jena/cmdline/CommandLine.java (original)
+++ jena/trunk/jena-core/src/main/java/jena/cmdline/CommandLine.java Fri Sep 13 14:29:30 2013
@@ -21,6 +21,8 @@ package jena.cmdline;
import java.io.* ;
import java.util.* ;
+import com.hp.hpl.jena.util.FileUtils ;
+
/**
* Command line argument processing based on a trigger model.
* An action is called whenever an argument is encountered. Example:
@@ -112,7 +114,7 @@ public class CommandLine
if ( withIndirect && item.startsWith(indirectionMarker) )
{
item = item.substring(1) ;
- try { item = CmdLineUtils.readWholeFileAsUTF8(item) ; }
+ try { item = FileUtils.readWholeFileAsUTF8(item) ; }
catch (Exception ex)
{ throw new IllegalArgumentException("Failed to read '"+item+"': "+ex.getMessage()) ; }
}
Modified: jena/trunk/jena-core/src/main/java/jena/qtest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/jena/qtest.java?rev=1522950&r1=1522949&r2=1522950&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/jena/qtest.java (original)
+++ jena/trunk/jena-core/src/main/java/jena/qtest.java Fri Sep 13 14:29:30 2013
@@ -18,11 +18,13 @@
package jena;
+import jena.cmdline.CmdLineUtils ;
+
public class qtest
{
// Call-through to arq command line application
public static void main(String[] args)
{
- query.invokeCmd("arq.qtest",args) ;
+ CmdLineUtils.invokeCmd("arq.qtest",args) ;
}
}
Modified: jena/trunk/jena-core/src/main/java/jena/query.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/jena/query.java?rev=1522950&r1=1522949&r2=1522950&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/jena/query.java (original)
+++ jena/trunk/jena-core/src/main/java/jena/query.java Fri Sep 13 14:29:30 2013
@@ -18,64 +18,17 @@
package jena;
-import static jena.cmdline.CmdLineUtils.setLog4jConfiguration;
+import jena.cmdline.CmdLineUtils ;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
public class query
{
-
- static {
- setLog4jConfiguration() ;
- }
-
// Call-through to arq command line application
public static void main(String... args)
{
// Do this by reflection so it is not assumed that ARQ is available
// at compile time.
- invokeCmd("arq.query", args) ;
- }
-
- public static void invokeCmd(String className, String[] args)
- {
- Class<?> cmd = null ;
- try { cmd = Class.forName(className) ; }
- catch (ClassNotFoundException ex)
- {
- System.err.println("Class '"+className+"' not found") ;
- System.exit(1) ;
- }
-
- Method method = null ;
- try { method = cmd.getMethod("main", new Class[]{String[].class}) ; }
- catch (NoSuchMethodException ex)
- {
- System.err.println("'main' not found but the class '"+className+"' was") ;
- System.exit(1) ;
- }
-
- try
- {
- method.invoke(null, new Object[]{args}) ;
- return ;
- } catch (IllegalArgumentException ex)
- {
- System.err.println("IllegalArgumentException exception: "+ex.getMessage());
- System.exit(7) ;
- } catch (IllegalAccessException ex)
- {
- System.err.println("IllegalAccessException exception: "+ex.getMessage());
- System.exit(8) ;
- } catch (InvocationTargetException ex)
- {
- System.err.println("InvocationTargetException exception: "+ex.getMessage());
- System.exit(9) ;
- }
-
-
- //arq.query.main(args) ;
+ CmdLineUtils.invokeCmd("arq.query", args) ;
}
}
Modified: jena/trunk/jena-core/src/main/java/jena/rset.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/jena/rset.java?rev=1522950&r1=1522949&r2=1522950&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/jena/rset.java (original)
+++ jena/trunk/jena-core/src/main/java/jena/rset.java Fri Sep 13 14:29:30 2013
@@ -18,11 +18,13 @@
package jena;
+import jena.cmdline.CmdLineUtils ;
+
public class rset
{
// Call-through to arq command line application
public static void main(String... args)
{
- query.invokeCmd("arq.rset", args) ;
+ CmdLineUtils.invokeCmd("arq.rset", args) ;
}
}
Modified: jena/trunk/jena-core/src/main/java/jena/sparql.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/jena/sparql.java?rev=1522950&r1=1522949&r2=1522950&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/jena/sparql.java (original)
+++ jena/trunk/jena-core/src/main/java/jena/sparql.java Fri Sep 13 14:29:30 2013
@@ -18,11 +18,13 @@
package jena;
+import jena.cmdline.CmdLineUtils ;
+
public class sparql
{
// Call-through to arq command line application
public static void main(String[] args)
{
- query.invokeCmd("arq.sparql",args) ;
+ CmdLineUtils.invokeCmd("arq.sparql",args) ;
}
}
Modified: jena/trunk/jena-core/src/main/java/jena/turtle.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/jena/turtle.java?rev=1522950&r1=1522949&r2=1522950&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/jena/turtle.java (original)
+++ jena/trunk/jena-core/src/main/java/jena/turtle.java Fri Sep 13 14:29:30 2013
@@ -18,11 +18,13 @@
package jena;
+import jena.cmdline.CmdLineUtils ;
+
public class turtle
{
public static void main(String... args)
{
- query.invokeCmd("riotcmd.turtle",args) ;
+ CmdLineUtils.invokeCmd("riotcmd.turtle",args) ;
}
}