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/11/08 16:56:26 UTC

[1/5] jena git commit: Better message

Repository: jena
Updated Branches:
  refs/heads/master e059b78a0 -> 2baa77c4f


Better message

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2baa77c4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2baa77c4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2baa77c4

Branch: refs/heads/master
Commit: 2baa77c4ffbda397d709913d4aa9da421d2dcfee
Parents: 79fbb45
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Nov 8 15:54:46 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Nov 8 15:55:55 2015 +0000

----------------------------------------------------------------------
 .../main/java/org/apache/jena/sparql/util/MappedLoader.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/2baa77c4/jena-arq/src/main/java/org/apache/jena/sparql/util/MappedLoader.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/MappedLoader.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/MappedLoader.java
index a65a855..4f36e71 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/MappedLoader.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/MappedLoader.java
@@ -60,8 +60,10 @@ public class MappedLoader {
 
     public static String mapDynamicURI(String uri) {
         // Jena2 -> Jena3 transition
-        if ( uri.startsWith("http://jena.hpl.hp.com/ARQ") )
-            Log.warnOnce(MappedLoader.class, "Loading function or property function with old style 'jena.hpl.hp.com' used - preferred style is to use 'jena.apache.org': "+uri, uri) ;  
+        if ( uri.startsWith("http://jena.hpl.hp.com/ARQ") ) {
+            String newURI = uri.replace("http://jena.hpl.hp.com/", "http://jena.apache.org/") ;
+            Log.warnOnce(MappedLoader.class, "Loading function or property function with old style 'jena.hpl.hp.com' used - preferred style is to use 'jena.apache.org': "+uri+ " => "+newURI, uri) ;
+        }
         
         Map.Entry<String, String> e = find(uri);
         if (e == null) {


[4/5] jena git commit: Removed unused comment.

Posted by an...@apache.org.
Removed unused comment.

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/79fbb45c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/79fbb45c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/79fbb45c

Branch: refs/heads/master
Commit: 79fbb45ceec8e21e6f23bd120a457f4ea699e6b7
Parents: 81fc0f0
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Nov 7 17:14:29 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Nov 8 15:55:55 2015 +0000

----------------------------------------------------------------------
 .../src/main/webapp/WEB-INF/web.xml             | 21 --------------------
 1 file changed, 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/79fbb45c/jena-fuseki2/jena-fuseki-core/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/webapp/WEB-INF/web.xml b/jena-fuseki2/jena-fuseki-core/src/main/webapp/WEB-INF/web.xml
index b3ba1c3..0b646de 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/webapp/WEB-INF/web.xml
+++ b/jena-fuseki2/jena-fuseki-core/src/main/webapp/WEB-INF/web.xml
@@ -286,25 +286,4 @@
     <mime-type>application/trig;charset=utf-8</mime-type>
   </mime-mapping>
 
-  <!-- If using security via Shiro - ->
-
-  <listener>
-    <listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class>
-  </listener>
-
-  <filter>
-    <filter-name>ShiroFilter</filter-name>
-    <filter-class>org.apache.shiro.web.servlet.ShiroFilter</filter-class>
-  </filter>
-
-  <filter-mapping>
-    <filter-name>ShiroFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-    <dispatcher>REQUEST</dispatcher>
-    <dispatcher>FORWARD</dispatcher>
-    <dispatcher>INCLUDE</dispatcher>
-    <dispatcher>ERROR</dispatcher>
-  </filter-mapping>
-  -->
-
 </web-app>


[5/5] jena git commit: Better error message --conf and dataset name.

Posted by an...@apache.org.
Better error message --conf and dataset name.

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/7e700034
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/7e700034
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/7e700034

Branch: refs/heads/master
Commit: 7e70003475d46c431e1fd7fc0b829a18152b1fe9
Parents: 536149d
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 6 11:20:03 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Nov 8 15:55:55 2015 +0000

----------------------------------------------------------------------
 .../src/main/java/org/apache/jena/fuseki/cmd/FusekiCmd.java    | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/7e700034/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 e8f6dd9..549e277 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
@@ -201,8 +201,14 @@ public class FusekiCmd {
             boolean cmdlineConfigPresent = ( x != 0 ) ;
             if ( cmdlineConfigPresent && getPositional().size() == 0 )
                 throw new CmdException("Missing service name") ;
+
+            if ( cmdLineConfig.fusekiCmdLineConfigFile != null && getPositional().size() > 0 )
+                throw new CmdException("Service name will come from --conf; no command line service name allowed") ;
+
+            
             if ( !cmdlineConfigPresent && getPositional().size() > 0 )
                 throw new CmdException("Service name given but no configuration argument to match (e.g. --mem, --loc/--tdb, --file)") ;
+            
             if ( cmdlineConfigPresent && getPositional().size() > 1 )
                 throw new CmdException("Multiple dataset path names given") ;
             


[3/5] jena git commit: Typo

Posted by an...@apache.org.
Typo

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/536149d6
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/536149d6
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/536149d6

Branch: refs/heads/master
Commit: 536149d6d936532f57bb768571fc953629c799e2
Parents: e059b78
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 6 11:19:18 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Nov 8 15:55:55 2015 +0000

----------------------------------------------------------------------
 .../src/main/java/org/apache/jena/fuseki/FusekiLogging.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/536149d6/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java
index 1810f1e..9ae4a3f 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java
@@ -64,7 +64,7 @@ public class FusekiLogging
         logLogging("log4j.configuration = %s", x) ;
 
         if ( x != null ) { 
-            // log4j wil initialize in the usual way. This includes avalue of
+            // log4j will initialize in the usual way. This includes a value of
             // "set", which indicates that logging was set before by some other Jena code.
             if ( x.equals("set") )
                 Fuseki.serverLog.warn("Fuseki logging: Unexpected: Log4j was setup by someother part of Jena") ;


[2/5] jena git commit: Update Shiro version

Posted by an...@apache.org.
Update Shiro version


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/81fc0f0f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/81fc0f0f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/81fc0f0f

Branch: refs/heads/master
Commit: 81fc0f0fabfb3ecc69f1dc8682918d61afbe5b9b
Parents: 7e70003
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 6 11:20:21 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Nov 8 15:55:55 2015 +0000

----------------------------------------------------------------------
 jena-fuseki2/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/81fc0f0f/jena-fuseki2/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/pom.xml b/jena-fuseki2/pom.xml
index 2bfa165..87d6f74 100644
--- a/jena-fuseki2/pom.xml
+++ b/jena-fuseki2/pom.xml
@@ -63,7 +63,7 @@
   <properties>
     <!--<ver.jetty>9.1.1.v20140108</ver.jetty>-->
     <ver.jetty>9.3.3.v20150827</ver.jetty>
-    <ver.shiro>1.2.2</ver.shiro>
+    <ver.shiro>1.2.4</ver.shiro>
     <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
     <build.time.xsd>${maven.build.timestamp}</build.time.xsd>  
   </properties>