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 2011/11/07 17:10:05 UTC

svn commit: r1198792 - in /incubator/jena/Jena2/ARQ/trunk: Grammar/ src/main/java/com/hp/hpl/jena/sparql/lang/arq/ src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/ src/test/java/com/hp/hpl/jena/sparql/

Author: andy
Date: Mon Nov  7 16:10:05 2011
New Revision: 1198792

URL: http://svn.apache.org/viewvc?rev=1198792&view=rev
Log:
Update SPARQL 1.1 Grammar to include WG changes (ASK to take solution modifiers)

Modified:
    incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj
    incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj
    incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.jj
    incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java
    incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java
    incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java

Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj?rev=1198792&r1=1198791&r2=1198792&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/arq.jj Mon Nov  7 16:10:05 2011
@@ -223,6 +223,7 @@ void AskQuery() : {}
   <ASK> { getQuery().setQueryAskType() ; }
   ( DatasetClause() )*
   WhereClause()
+  SolutionModifier()
 }
 // ----
 void DatasetClause() : {}
@@ -1190,22 +1191,6 @@ Expr AdditiveExpression() : { Expr expr1
     { expr1 = new E_Add(expr1, expr2) ; }
   | <MINUS> expr2 = MultiplicativeExpression()
     { expr1 = new E_Subtract(expr1, expr2) ; }
-// SPARQL Bug.
-//   | n = NumericLiteralPositive()
-//     { 
-//       n = stripSign(n) ;
-//       expr2 = asExpr(n) ;
-//       expr1 = new E_Add(expr1, expr2) ; 
-//     }
-//   |
-//     n = NumericLiteralNegative()
-//     { 
-//       n = stripSign(n) ;
-//       expr2 = asExpr(n) ;
-//       expr1 = new E_Subtract(expr1, expr2) ; 
-//     }
-//   )*
-  // Expression - no + or -
   |
     (
       n = NumericLiteralPositive()

Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj?rev=1198792&r1=1198791&r2=1198792&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/master.jj Mon Nov  7 16:10:05 2011
@@ -290,6 +290,7 @@ void AskQuery() : {}
   <ASK> { getQuery().setQueryAskType() ; }
   ( DatasetClause() )*
   WhereClause()
+  SolutionModifier()
 }
 
 // ----

Modified: incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.jj
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.jj?rev=1198792&r1=1198791&r2=1198792&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.jj (original)
+++ incubator/jena/Jena2/ARQ/trunk/Grammar/sparql_11.jj Mon Nov  7 16:10:05 2011
@@ -209,6 +209,7 @@ void AskQuery() : {}
   <ASK> { getQuery().setQueryAskType() ; }
   ( DatasetClause() )*
   WhereClause()
+  SolutionModifier()
 }
 // ----
 void DatasetClause() : {}
@@ -1104,22 +1105,6 @@ Expr AdditiveExpression() : { Expr expr1
     { expr1 = new E_Add(expr1, expr2) ; }
   | <MINUS> expr2 = MultiplicativeExpression()
     { expr1 = new E_Subtract(expr1, expr2) ; }
-// SPARQL Bug.
-//   | n = NumericLiteralPositive()
-//     { 
-//       n = stripSign(n) ;
-//       expr2 = asExpr(n) ;
-//       expr1 = new E_Add(expr1, expr2) ; 
-//     }
-//   |
-//     n = NumericLiteralNegative()
-//     { 
-//       n = stripSign(n) ;
-//       expr2 = asExpr(n) ;
-//       expr1 = new E_Subtract(expr1, expr2) ; 
-//     }
-//   )*
-  // Expression - no + or -
   |
     (
       n = NumericLiteralPositive()

Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java?rev=1198792&r1=1198791&r2=1198792&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/arq/ARQParser.java Mon Nov  7 16:10:05 2011
@@ -730,6 +730,7 @@ public class ARQParser extends ARQParser
       DatasetClause();
     }
     WhereClause();
+    SolutionModifier();
   }
 
 // ----
@@ -5204,77 +5205,75 @@ public class ARQParser extends ARQParser
     return false;
   }
 
-  private boolean jj_3R_96() {
-    if (jj_scan_token(DOUBLE_NEGATIVE)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_95() {
-    if (jj_scan_token(DECIMAL_NEGATIVE)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_94() {
-    if (jj_scan_token(INTEGER_NEGATIVE)) return true;
+  private boolean jj_3R_40() {
+    if (jj_scan_token(MAX)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_85() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_94()) {
-    jj_scanpos = xsp;
-    if (jj_3R_95()) {
-    jj_scanpos = xsp;
-    if (jj_3R_96()) return true;
-    }
-    }
+  private boolean jj_3R_82() {
+    if (jj_scan_token(STRING_LITERAL_LONG2)) return true;
     return false;
   }
 
-  private boolean jj_3R_61() {
-    if (jj_scan_token(NIL)) return true;
+  private boolean jj_3R_39() {
+    if (jj_scan_token(MIN)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_93() {
-    if (jj_scan_token(DOUBLE_POSITIVE)) return true;
+  private boolean jj_3R_81() {
+    if (jj_scan_token(STRING_LITERAL_LONG1)) return true;
     return false;
   }
 
-  private boolean jj_3R_60() {
-    if (jj_3R_66()) return true;
+  private boolean jj_3R_80() {
+    if (jj_scan_token(STRING_LITERAL2)) return true;
     return false;
   }
 
-  private boolean jj_3R_92() {
-    if (jj_scan_token(DECIMAL_POSITIVE)) return true;
+  private boolean jj_3R_38() {
+    if (jj_scan_token(SUM)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_59() {
-    if (jj_3R_65()) return true;
+  private boolean jj_3R_79() {
+    if (jj_scan_token(STRING_LITERAL1)) return true;
     return false;
   }
 
-  private boolean jj_3R_91() {
-    if (jj_scan_token(INTEGER_POSITIVE)) return true;
+  private boolean jj_3R_61() {
+    if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_84() {
+  private boolean jj_3R_69() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_91()) {
+    if (jj_3R_79()) {
     jj_scanpos = xsp;
-    if (jj_3R_92()) {
+    if (jj_3R_80()) {
     jj_scanpos = xsp;
-    if (jj_3R_93()) return true;
+    if (jj_3R_81()) {
+    jj_scanpos = xsp;
+    if (jj_3R_82()) return true;
+    }
     }
     }
     return false;
   }
 
+  private boolean jj_3R_60() {
+    if (jj_3R_66()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_59() {
+    if (jj_3R_65()) return true;
+    return false;
+  }
+
   private boolean jj_3R_58() {
     if (jj_3R_64()) return true;
     return false;
@@ -5285,6 +5284,17 @@ public class ARQParser extends ARQParser
     return false;
   }
 
+  private boolean jj_3R_74() {
+    if (jj_scan_token(FALSE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_37() {
+    if (jj_scan_token(COUNT)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
   private boolean jj_3R_53() {
     Token xsp;
     xsp = jj_scanpos;
@@ -5312,18 +5322,48 @@ public class ARQParser extends ARQParser
     return false;
   }
 
-  private boolean jj_3R_90() {
-    if (jj_scan_token(DOUBLE)) return true;
+  private boolean jj_3R_73() {
+    if (jj_scan_token(TRUE)) return true;
     return false;
   }
 
-  private boolean jj_3R_49() {
-    if (jj_3R_53()) return true;
+  private boolean jj_3R_35() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_37()) {
+    jj_scanpos = xsp;
+    if (jj_3R_38()) {
+    jj_scanpos = xsp;
+    if (jj_3R_39()) {
+    jj_scanpos = xsp;
+    if (jj_3R_40()) {
+    jj_scanpos = xsp;
+    if (jj_3R_41()) {
+    jj_scanpos = xsp;
+    if (jj_3R_42()) {
+    jj_scanpos = xsp;
+    if (jj_3R_43()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_89() {
-    if (jj_scan_token(DECIMAL)) return true;
+  private boolean jj_3R_65() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_73()) {
+    jj_scanpos = xsp;
+    if (jj_3R_74()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_49() {
+    if (jj_3R_53()) return true;
     return false;
   }
 
@@ -5337,47 +5377,57 @@ public class ARQParser extends ARQParser
     return false;
   }
 
-  private boolean jj_3R_88() {
-    if (jj_scan_token(INTEGER)) return true;
+  private boolean jj_3R_96() {
+    if (jj_scan_token(DOUBLE_NEGATIVE)) return true;
     return false;
   }
 
-  private boolean jj_3R_83() {
+  private boolean jj_3R_95() {
+    if (jj_scan_token(DECIMAL_NEGATIVE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_94() {
+    if (jj_scan_token(INTEGER_NEGATIVE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_85() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_88()) {
+    if (jj_3R_94()) {
     jj_scanpos = xsp;
-    if (jj_3R_89()) {
+    if (jj_3R_95()) {
     jj_scanpos = xsp;
-    if (jj_3R_90()) return true;
+    if (jj_3R_96()) return true;
     }
     }
     return false;
   }
 
-  private boolean jj_3R_72() {
-    if (jj_3R_85()) return true;
+  private boolean jj_3R_93() {
+    if (jj_scan_token(DOUBLE_POSITIVE)) return true;
     return false;
   }
 
-  private boolean jj_3R_71() {
-    if (jj_3R_84()) return true;
+  private boolean jj_3R_92() {
+    if (jj_scan_token(DECIMAL_POSITIVE)) return true;
     return false;
   }
 
-  private boolean jj_3R_70() {
-    if (jj_3R_83()) return true;
+  private boolean jj_3R_91() {
+    if (jj_scan_token(INTEGER_POSITIVE)) return true;
     return false;
   }
 
-  private boolean jj_3R_64() {
+  private boolean jj_3R_84() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_70()) {
+    if (jj_3R_91()) {
     jj_scanpos = xsp;
-    if (jj_3R_71()) {
+    if (jj_3R_92()) {
     jj_scanpos = xsp;
-    if (jj_3R_72()) return true;
+    if (jj_3R_93()) return true;
     }
     }
     return false;
@@ -5398,90 +5448,100 @@ public class ARQParser extends ARQParser
     return false;
   }
 
-  private boolean jj_3R_63() {
-    if (jj_3R_69()) return true;
+  private boolean jj_3R_90() {
+    if (jj_scan_token(DOUBLE)) return true;
     return false;
   }
 
-  private boolean jj_3_1() {
-    if (jj_3R_35()) return true;
+  private boolean jj_3R_89() {
+    if (jj_scan_token(DECIMAL)) return true;
     return false;
   }
 
-  private boolean jj_3R_77() {
-    if (jj_scan_token(IRIref)) return true;
+  private boolean jj_3R_88() {
+    if (jj_scan_token(INTEGER)) return true;
     return false;
   }
 
-  private boolean jj_3R_76() {
-    if (jj_scan_token(ANON)) return true;
+  private boolean jj_3R_83() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_88()) {
+    jj_scanpos = xsp;
+    if (jj_3R_89()) {
+    jj_scanpos = xsp;
+    if (jj_3R_90()) return true;
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_54() {
-    if (jj_scan_token(LPAREN)) return true;
+  private boolean jj_3R_72() {
+    if (jj_3R_85()) return true;
     return false;
   }
 
-  private boolean jj_3_2() {
-    if (jj_scan_token(DOT)) return true;
-    if (jj_3R_36()) return true;
+  private boolean jj_3R_71() {
+    if (jj_3R_84()) return true;
     return false;
   }
 
-  private boolean jj_3R_75() {
-    if (jj_scan_token(BLANK_NODE_LABEL)) return true;
+  private boolean jj_3R_70() {
+    if (jj_3R_83()) return true;
     return false;
   }
 
-  private boolean jj_3R_66() {
+  private boolean jj_3R_64() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_75()) {
+    if (jj_3R_70()) {
     jj_scanpos = xsp;
-    if (jj_3R_76()) return true;
+    if (jj_3R_71()) {
+    jj_scanpos = xsp;
+    if (jj_3R_72()) return true;
+    }
     }
     return false;
   }
 
-  private boolean jj_3R_87() {
-    if (jj_scan_token(PNAME_NS)) return true;
+  private boolean jj_3_1() {
+    if (jj_3R_35()) return true;
     return false;
   }
 
-  private boolean jj_3R_86() {
-    if (jj_scan_token(PNAME_LN)) return true;
+  private boolean jj_3R_63() {
+    if (jj_3R_69()) return true;
     return false;
   }
 
-  private boolean jj_3R_55() {
-    if (jj_scan_token(LBRACKET)) return true;
+  private boolean jj_3R_54() {
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3_4() {
-    if (jj_scan_token(SEMICOLON)) return true;
-    if (jj_scan_token(SEPARATOR)) return true;
+  private boolean jj_3_2() {
+    if (jj_scan_token(DOT)) return true;
+    if (jj_3R_36()) return true;
     return false;
   }
 
-  private boolean jj_3R_78() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_86()) {
-    jj_scanpos = xsp;
-    if (jj_3R_87()) return true;
-    }
+  private boolean jj_3R_77() {
+    if (jj_scan_token(IRIref)) return true;
     return false;
   }
 
-  private boolean jj_3R_51() {
-    if (jj_3R_55()) return true;
+  private boolean jj_3R_55() {
+    if (jj_scan_token(LBRACKET)) return true;
     return false;
   }
 
-  private boolean jj_3R_68() {
-    if (jj_3R_78()) return true;
+  private boolean jj_3R_76() {
+    if (jj_scan_token(ANON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_51() {
+    if (jj_3R_55()) return true;
     return false;
   }
 
@@ -5500,109 +5560,78 @@ public class ARQParser extends ARQParser
     return false;
   }
 
-  private boolean jj_3R_43() {
-    if (jj_scan_token(GROUP_CONCAT)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_67() {
-    if (jj_3R_77()) return true;
+  private boolean jj_3R_75() {
+    if (jj_scan_token(BLANK_NODE_LABEL)) return true;
     return false;
   }
 
-  private boolean jj_3R_62() {
+  private boolean jj_3R_66() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_67()) {
+    if (jj_3R_75()) {
     jj_scanpos = xsp;
-    if (jj_3R_68()) return true;
+    if (jj_3R_76()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_42() {
-    if (jj_scan_token(SAMPLE)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_41() {
-    if (jj_scan_token(AVG)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+  private boolean jj_3R_87() {
+    if (jj_scan_token(PNAME_NS)) return true;
     return false;
   }
 
-  private boolean jj_3R_40() {
-    if (jj_scan_token(MAX)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+  private boolean jj_3R_86() {
+    if (jj_scan_token(PNAME_LN)) return true;
     return false;
   }
 
-  private boolean jj_3R_82() {
-    if (jj_scan_token(STRING_LITERAL_LONG2)) return true;
+  private boolean jj_3_4() {
+    if (jj_scan_token(SEMICOLON)) return true;
+    if (jj_scan_token(SEPARATOR)) return true;
     return false;
   }
 
-  private boolean jj_3R_39() {
-    if (jj_scan_token(MIN)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+  private boolean jj_3R_78() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_86()) {
+    jj_scanpos = xsp;
+    if (jj_3R_87()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_81() {
-    if (jj_scan_token(STRING_LITERAL_LONG1)) return true;
+  private boolean jj_3R_45() {
+    if (jj_3R_47()) return true;
     return false;
   }
 
-  private boolean jj_3R_80() {
-    if (jj_scan_token(STRING_LITERAL2)) return true;
+  private boolean jj_3R_68() {
+    if (jj_3R_78()) return true;
     return false;
   }
 
-  private boolean jj_3R_38() {
-    if (jj_scan_token(SUM)) return true;
+  private boolean jj_3R_43() {
+    if (jj_scan_token(GROUP_CONCAT)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_79() {
-    if (jj_scan_token(STRING_LITERAL1)) return true;
+  private boolean jj_3R_67() {
+    if (jj_3R_77()) return true;
     return false;
   }
 
-  private boolean jj_3R_69() {
+  private boolean jj_3R_62() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_79()) {
-    jj_scanpos = xsp;
-    if (jj_3R_80()) {
-    jj_scanpos = xsp;
-    if (jj_3R_81()) {
+    if (jj_3R_67()) {
     jj_scanpos = xsp;
-    if (jj_3R_82()) return true;
-    }
-    }
+    if (jj_3R_68()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_45() {
-    if (jj_3R_47()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_74() {
-    if (jj_scan_token(FALSE)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_37() {
-    if (jj_scan_token(COUNT)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
   private boolean jj_3R_44() {
     if (jj_3R_46()) return true;
     return false;
@@ -5618,43 +5647,15 @@ public class ARQParser extends ARQParser
     return false;
   }
 
-  private boolean jj_3R_73() {
-    if (jj_scan_token(TRUE)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_35() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_37()) {
-    jj_scanpos = xsp;
-    if (jj_3R_38()) {
-    jj_scanpos = xsp;
-    if (jj_3R_39()) {
-    jj_scanpos = xsp;
-    if (jj_3R_40()) {
-    jj_scanpos = xsp;
-    if (jj_3R_41()) {
-    jj_scanpos = xsp;
-    if (jj_3R_42()) {
-    jj_scanpos = xsp;
-    if (jj_3R_43()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
+  private boolean jj_3R_42() {
+    if (jj_scan_token(SAMPLE)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_65() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_73()) {
-    jj_scanpos = xsp;
-    if (jj_3R_74()) return true;
-    }
+  private boolean jj_3R_41() {
+    if (jj_scan_token(AVG)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 

Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java?rev=1198792&r1=1198791&r2=1198792&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/sparql_11/SPARQLParser11.java Mon Nov  7 16:10:05 2011
@@ -387,6 +387,7 @@ public class SPARQLParser11 extends SPAR
       DatasetClause();
     }
     WhereClause();
+    SolutionModifier();
   }
 
 // ----

Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java?rev=1198792&r1=1198791&r2=1198792&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java Mon Nov  7 16:10:05 2011
@@ -22,7 +22,6 @@ package com.hp.hpl.jena.sparql;
 import junit.framework.JUnit4TestAdapter ;
 import junit.framework.TestSuite ;
 import org.openjena.atlas.TC_Atlas ;
-import org.openjena.atlas.logging.Log ;
 import org.openjena.riot.ErrorHandlerFactory ;
 import org.openjena.riot.TC_Riot ;
 
@@ -54,8 +53,8 @@ import com.hp.hpl.jena.sparql.util.TS_Ut
 public class ARQTestSuite extends TestSuite
 {
     // Log4j for testing.
-    public static final String log4jPropertiesFilename = "log4j-testing.properties" ;
-    static { Log.setLog4j(log4jPropertiesFilename) ; }
+    public static final String log4jPropertiesResourceName = "log4j-testing.properties" ;
+    static { System.getProperty("log4j.configuration", log4jPropertiesResourceName) ; }
     
     public static final String testDirARQ = "testing/ARQ" ;