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/01/05 14:41:14 UTC

jena git commit: JENA-1108: Fix apache-jena as a pom to get jena-cmds

Repository: jena
Updated Branches:
  refs/heads/master 620b6f278 -> 245d5cad8


JENA-1108: Fix apache-jena as a <type>pom to get jena-cmds


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

Branch: refs/heads/master
Commit: 245d5cad8755ab3da561f9e4b02e1d35bae8fedf
Parents: 620b6f2
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jan 5 13:40:59 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jan 5 13:40:59 2016 +0000

----------------------------------------------------------------------
 apache-jena/pom.xml                                          | 8 ++++++++
 .../src/main/java/org/apache/jena/fuseki/build/Template.java | 5 +++++
 .../org/apache/jena/fuseki/server/templates/config-mem       | 2 +-
 .../org/apache/jena/fuseki/server/templates/config-tdb-mem   | 5 ++---
 4 files changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/245d5cad/apache-jena/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena/pom.xml b/apache-jena/pom.xml
index 4bbc6e8..ec7f94b 100644
--- a/apache-jena/pom.xml
+++ b/apache-jena/pom.xml
@@ -68,6 +68,7 @@
       <artifactId>jena-arq</artifactId>
       <version>3.1.0-SNAPSHOT</version>
       <classifier>sources</classifier>
+      <optional>true</optional>
     </dependency>
 
     <dependency>
@@ -75,6 +76,7 @@
       <artifactId>jena-arq</artifactId>
       <version>3.1.0-SNAPSHOT</version>
       <classifier>javadoc</classifier>
+      <optional>true</optional>
     </dependency>
 
     <dependency>
@@ -88,6 +90,7 @@
       <artifactId>jena-core</artifactId>
       <version>3.1.0-SNAPSHOT</version>
       <classifier>sources</classifier>
+      <optional>true</optional>
     </dependency>
 
     <dependency>
@@ -95,6 +98,7 @@
       <artifactId>jena-core</artifactId>
       <version>3.1.0-SNAPSHOT</version>
       <classifier>javadoc</classifier>
+      <optional>true</optional>
     </dependency>
 
     <dependency>
@@ -108,6 +112,7 @@
       <artifactId>jena-tdb</artifactId>
       <version>3.1.0-SNAPSHOT</version>
       <classifier>sources</classifier>
+      <optional>true</optional>
     </dependency>
 
     <dependency>
@@ -115,6 +120,7 @@
       <artifactId>jena-tdb</artifactId>
       <version>3.1.0-SNAPSHOT</version>
       <classifier>javadoc</classifier>
+      <optional>true</optional>
     </dependency>
 
     <dependency>
@@ -128,6 +134,7 @@
       <artifactId>jena-cmds</artifactId>
       <version>3.1.0-SNAPSHOT</version>
       <classifier>sources</classifier>
+      <optional>true</optional>
     </dependency>
 
     <dependency>
@@ -135,6 +142,7 @@
       <artifactId>jena-cmds</artifactId>
       <version>3.1.0-SNAPSHOT</version>
       <classifier>javadoc</classifier>
+      <optional>true</optional>
     </dependency>
 
   </dependencies>

http://git-wip-us.apache.org/repos/asf/jena/blob/245d5cad/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/Template.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/Template.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/Template.java
index 55a449e..b6cfccf 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/Template.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/Template.java
@@ -35,6 +35,11 @@ public class Template
     public static final String templateTDBDirFN     = templateDir+"/config-tdb-dir" ;
     public static final String templateServiceFN    = templateDir+"/config-service" ;       // Dummy used by dataset-less service.
     
+    public static final String templateMemFN_1      = templateDir+"/config-mem-txn" ;
+
+
+    
+    
     // Template may be in a resources area of a jar file so you can't do a directory listing.
     public static final String[] templateNames = {
         templateMemFN ,

http://git-wip-us.apache.org/repos/asf/jena/blob/245d5cad/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/server/templates/config-mem
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/server/templates/config-mem b/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/server/templates/config-mem
index 06dcf1e..e455cca 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/server/templates/config-mem
+++ b/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/server/templates/config-mem
@@ -12,7 +12,7 @@
 ## Updatable in-memory dataset.
 
 <#service1> rdf:type fuseki:Service ;
-    # URI of the dataset -- http://host:port/ds
+    # URI of the dataset -- http://host:port/{NAME}
     fuseki:name                        "{NAME}" ;
     fuseki:serviceQuery                "sparql" ;
     fuseki:serviceQuery                "query" ;

http://git-wip-us.apache.org/repos/asf/jena/blob/245d5cad/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/server/templates/config-tdb-mem
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/server/templates/config-tdb-mem b/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/server/templates/config-tdb-mem
index 32bb4a0..449de5e 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/server/templates/config-tdb-mem
+++ b/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/server/templates/config-tdb-mem
@@ -8,7 +8,7 @@
 @prefix ja:      <http://jena.hpl.hp.com/2005/11/Assembler#> .
 
 ## ---------------------------------------------------------------
-## Updatable TDB dataset with all services enabled.
+## Updatable TDB dataset im-memory with all services enabled.
 
 <#service_tdb_all> rdf:type fuseki:Service ;
     rdfs:label                      "TDB {NAME}" ;
@@ -26,6 +26,5 @@
 
 <#tdb_dataset_readwrite> rdf:type      tdb:DatasetTDB ;
     tdb:location "--mem--" ;
-    ja:context [ ja:cxtName "arq:queryTimeout" ;  ja:cxtValue "1000" ] ;
-    # tdb:unionDefaultGraph true ;
+    ## tdb:unionDefaultGraph true ;
     .


Re: jena git commit: JENA-1108: Fix apache-jena as a pom to get jena-cmds

Posted by Andy Seaborne <an...@apache.org>.
On 05/01/16 14:15, Rob Vesse wrote:
> Why are the dependencies marked optional?

The dependencies for sources and javadoc are explicitly named so the 
assembly pulls them into the distribution.  There maybe a better way to 
do that.  If there is, let's do that.

They are optional because they get pulled in as jar files and become 
maven dependencies when using apache-jena<type>pom</type>.

If they get on the classpath, the jars have the same package structure 
as the binary class jars.

If one is found before the binary class jar, it was getting used which 
does not work.

It does not happen when you have the projects open in Eclipse 
development, only when using the maven artifacts.

mvn dependency:tree shows

[INFO] +- org.apache.jena:jena-tdb:jar:sources:3.1.0-SNAPSHOT:compile

If there is a better way to get the javadoc and sources , then lets do 
it.  This way is a bit of a hack. Is there a correct way to do all this?

	Andy

Alternatives, neither of which are very nice, include (1) separate the 
artifacts [naming?] or (2) demoting the assembly step to a special build 
step, which in the past gets mixed as to what the uploaded artifact 
actually is.

>
> Rob
>
> On 05/01/2016 13:41, "andy@apache.org" <an...@apache.org> wrote:
>
>> Repository: jena
>> Updated Branches:
>>   refs/heads/master 620b6f278 -> 245d5cad8
>>
>>
>> JENA-1108: Fix apache-jena as a <type>pom to get jena-cmds
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/jena/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/245d5cad
>> Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/245d5cad
>> Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/245d5cad
>>
>> Branch: refs/heads/master
>> Commit: 245d5cad8755ab3da561f9e4b02e1d35bae8fedf
>> Parents: 620b6f2
>> Author: Andy Seaborne <an...@apache.org>
>> Authored: Tue Jan 5 13:40:59 2016 +0000
>> Committer: Andy Seaborne <an...@apache.org>
>> Committed: Tue Jan 5 13:40:59 2016 +0000
>>
>> ----------------------------------------------------------------------
>> apache-jena/pom.xml                                          | 8 ++++++++
>> .../src/main/java/org/apache/jena/fuseki/build/Template.java | 5 +++++
>> .../org/apache/jena/fuseki/server/templates/config-mem       | 2 +-
>> .../org/apache/jena/fuseki/server/templates/config-tdb-mem   | 5 ++---
>> 4 files changed, 16 insertions(+), 4 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>> http://git-wip-us.apache.org/repos/asf/jena/blob/245d5cad/apache-jena/pom.
>> xml
>> ----------------------------------------------------------------------
>> diff --git a/apache-jena/pom.xml b/apache-jena/pom.xml
>> index 4bbc6e8..ec7f94b 100644
>> --- a/apache-jena/pom.xml
>> +++ b/apache-jena/pom.xml
>> @@ -68,6 +68,7 @@
>>        <artifactId>jena-arq</artifactId>
>>        <version>3.1.0-SNAPSHOT</version>
>>        <classifier>sources</classifier>
>> +      <optional>true</optional>
>>      </dependency>
>>
>>      <dependency>
>> @@ -75,6 +76,7 @@
>>        <artifactId>jena-arq</artifactId>
>>        <version>3.1.0-SNAPSHOT</version>
>>        <classifier>javadoc</classifier>
>> +      <optional>true</optional>
>>      </dependency>
>>
>>      <dependency>
>> @@ -88,6 +90,7 @@
>>        <artifactId>jena-core</artifactId>
>>        <version>3.1.0-SNAPSHOT</version>
>>        <classifier>sources</classifier>
>> +      <optional>true</optional>
>>      </dependency>
>>
>>      <dependency>
>> @@ -95,6 +98,7 @@
>>        <artifactId>jena-core</artifactId>
>>        <version>3.1.0-SNAPSHOT</version>
>>        <classifier>javadoc</classifier>
>> +      <optional>true</optional>
>>      </dependency>
>>
>>      <dependency>
>> @@ -108,6 +112,7 @@
>>        <artifactId>jena-tdb</artifactId>
>>        <version>3.1.0-SNAPSHOT</version>
>>        <classifier>sources</classifier>
>> +      <optional>true</optional>
>>      </dependency>
>>
>>      <dependency>
>> @@ -115,6 +120,7 @@
>>        <artifactId>jena-tdb</artifactId>
>>        <version>3.1.0-SNAPSHOT</version>
>>        <classifier>javadoc</classifier>
>> +      <optional>true</optional>
>>      </dependency>
>>
>>      <dependency>
>> @@ -128,6 +134,7 @@
>>        <artifactId>jena-cmds</artifactId>
>>        <version>3.1.0-SNAPSHOT</version>
>>        <classifier>sources</classifier>
>> +      <optional>true</optional>
>>      </dependency>
>>
>>      <dependency>
>> @@ -135,6 +142,7 @@
>>        <artifactId>jena-cmds</artifactId>
>>        <version>3.1.0-SNAPSHOT</version>
>>        <classifier>javadoc</classifier>
>> +      <optional>true</optional>
>>      </dependency>
>>
>>    </dependencies>
>>
>> http://git-wip-us.apache.org/repos/asf/jena/blob/245d5cad/jena-fuseki2/jen
>> a-fuseki-core/src/main/java/org/apache/jena/fuseki/build/Template.java
>> ----------------------------------------------------------------------
>> diff --git
>> a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build
>> /Template.java
>> b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build
>> /Template.java
>> index 55a449e..b6cfccf 100644
>> ---
>> a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build
>> /Template.java
>> +++
>> b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build
>> /Template.java
>> @@ -35,6 +35,11 @@ public class Template
>>      public static final String templateTDBDirFN     =
>> templateDir+"/config-tdb-dir" ;
>>      public static final String templateServiceFN    =
>> templateDir+"/config-service" ;       // Dummy used by dataset-less
>> service.
>>
>> +    public static final String templateMemFN_1      =
>> templateDir+"/config-mem-txn" ;
>> +
>> +
>> +
>> +
>>      // Template may be in a resources area of a jar file so you can't do
>> a directory listing.
>>      public static final String[] templateNames = {
>>          templateMemFN ,
>>
>> http://git-wip-us.apache.org/repos/asf/jena/blob/245d5cad/jena-fuseki2/jen
>> a-fuseki-core/src/main/resources/org/apache/jena/fuseki/server/templates/c
>> onfig-mem
>> ----------------------------------------------------------------------
>> diff --git
>> a/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/
>> server/templates/config-mem
>> b/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/
>> server/templates/config-mem
>> index 06dcf1e..e455cca 100644
>> ---
>> a/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/
>> server/templates/config-mem
>> +++
>> b/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/
>> server/templates/config-mem
>> @@ -12,7 +12,7 @@
>> ## Updatable in-memory dataset.
>>
>> <#service1> rdf:type fuseki:Service ;
>> -    # URI of the dataset -- http://host:port/ds
>> +    # URI of the dataset -- http://host:port/{NAME}
>>      fuseki:name                        "{NAME}" ;
>>      fuseki:serviceQuery                "sparql" ;
>>      fuseki:serviceQuery                "query" ;
>>
>> http://git-wip-us.apache.org/repos/asf/jena/blob/245d5cad/jena-fuseki2/jen
>> a-fuseki-core/src/main/resources/org/apache/jena/fuseki/server/templates/c
>> onfig-tdb-mem
>> ----------------------------------------------------------------------
>> diff --git
>> a/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/
>> server/templates/config-tdb-mem
>> b/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/
>> server/templates/config-tdb-mem
>> index 32bb4a0..449de5e 100644
>> ---
>> a/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/
>> server/templates/config-tdb-mem
>> +++
>> b/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/
>> server/templates/config-tdb-mem
>> @@ -8,7 +8,7 @@
>> @prefix ja:      <http://jena.hpl.hp.com/2005/11/Assembler#> .
>>
>> ## ---------------------------------------------------------------
>> -## Updatable TDB dataset with all services enabled.
>> +## Updatable TDB dataset im-memory with all services enabled.
>>
>> <#service_tdb_all> rdf:type fuseki:Service ;
>>      rdfs:label                      "TDB {NAME}" ;
>> @@ -26,6 +26,5 @@
>>
>> <#tdb_dataset_readwrite> rdf:type      tdb:DatasetTDB ;
>>      tdb:location "--mem--" ;
>> -    ja:context [ ja:cxtName "arq:queryTimeout" ;  ja:cxtValue "1000" ] ;
>> -    # tdb:unionDefaultGraph true ;
>> +    ## tdb:unionDefaultGraph true ;
>>      .
>>
>
>
>
>


Re: jena git commit: JENA-1108: Fix apache-jena as a pom to get jena-cmds

Posted by Rob Vesse <rv...@dotnetrdf.org>.
Why are the dependencies marked optional?

Rob

On 05/01/2016 13:41, "andy@apache.org" <an...@apache.org> wrote:

>Repository: jena
>Updated Branches:
>  refs/heads/master 620b6f278 -> 245d5cad8
>
>
>JENA-1108: Fix apache-jena as a <type>pom to get jena-cmds
>
>
>Project: http://git-wip-us.apache.org/repos/asf/jena/repo
>Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/245d5cad
>Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/245d5cad
>Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/245d5cad
>
>Branch: refs/heads/master
>Commit: 245d5cad8755ab3da561f9e4b02e1d35bae8fedf
>Parents: 620b6f2
>Author: Andy Seaborne <an...@apache.org>
>Authored: Tue Jan 5 13:40:59 2016 +0000
>Committer: Andy Seaborne <an...@apache.org>
>Committed: Tue Jan 5 13:40:59 2016 +0000
>
>----------------------------------------------------------------------
> apache-jena/pom.xml                                          | 8 ++++++++
> .../src/main/java/org/apache/jena/fuseki/build/Template.java | 5 +++++
> .../org/apache/jena/fuseki/server/templates/config-mem       | 2 +-
> .../org/apache/jena/fuseki/server/templates/config-tdb-mem   | 5 ++---
> 4 files changed, 16 insertions(+), 4 deletions(-)
>----------------------------------------------------------------------
>
>
>http://git-wip-us.apache.org/repos/asf/jena/blob/245d5cad/apache-jena/pom.
>xml
>----------------------------------------------------------------------
>diff --git a/apache-jena/pom.xml b/apache-jena/pom.xml
>index 4bbc6e8..ec7f94b 100644
>--- a/apache-jena/pom.xml
>+++ b/apache-jena/pom.xml
>@@ -68,6 +68,7 @@
>       <artifactId>jena-arq</artifactId>
>       <version>3.1.0-SNAPSHOT</version>
>       <classifier>sources</classifier>
>+      <optional>true</optional>
>     </dependency>
> 
>     <dependency>
>@@ -75,6 +76,7 @@
>       <artifactId>jena-arq</artifactId>
>       <version>3.1.0-SNAPSHOT</version>
>       <classifier>javadoc</classifier>
>+      <optional>true</optional>
>     </dependency>
> 
>     <dependency>
>@@ -88,6 +90,7 @@
>       <artifactId>jena-core</artifactId>
>       <version>3.1.0-SNAPSHOT</version>
>       <classifier>sources</classifier>
>+      <optional>true</optional>
>     </dependency>
> 
>     <dependency>
>@@ -95,6 +98,7 @@
>       <artifactId>jena-core</artifactId>
>       <version>3.1.0-SNAPSHOT</version>
>       <classifier>javadoc</classifier>
>+      <optional>true</optional>
>     </dependency>
> 
>     <dependency>
>@@ -108,6 +112,7 @@
>       <artifactId>jena-tdb</artifactId>
>       <version>3.1.0-SNAPSHOT</version>
>       <classifier>sources</classifier>
>+      <optional>true</optional>
>     </dependency>
> 
>     <dependency>
>@@ -115,6 +120,7 @@
>       <artifactId>jena-tdb</artifactId>
>       <version>3.1.0-SNAPSHOT</version>
>       <classifier>javadoc</classifier>
>+      <optional>true</optional>
>     </dependency>
> 
>     <dependency>
>@@ -128,6 +134,7 @@
>       <artifactId>jena-cmds</artifactId>
>       <version>3.1.0-SNAPSHOT</version>
>       <classifier>sources</classifier>
>+      <optional>true</optional>
>     </dependency>
> 
>     <dependency>
>@@ -135,6 +142,7 @@
>       <artifactId>jena-cmds</artifactId>
>       <version>3.1.0-SNAPSHOT</version>
>       <classifier>javadoc</classifier>
>+      <optional>true</optional>
>     </dependency>
> 
>   </dependencies>
>
>http://git-wip-us.apache.org/repos/asf/jena/blob/245d5cad/jena-fuseki2/jen
>a-fuseki-core/src/main/java/org/apache/jena/fuseki/build/Template.java
>----------------------------------------------------------------------
>diff --git 
>a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build
>/Template.java 
>b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build
>/Template.java
>index 55a449e..b6cfccf 100644
>--- 
>a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build
>/Template.java
>+++ 
>b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build
>/Template.java
>@@ -35,6 +35,11 @@ public class Template
>     public static final String templateTDBDirFN     =
>templateDir+"/config-tdb-dir" ;
>     public static final String templateServiceFN    =
>templateDir+"/config-service" ;       // Dummy used by dataset-less
>service.
>     
>+    public static final String templateMemFN_1      =
>templateDir+"/config-mem-txn" ;
>+
>+
>+    
>+    
>     // Template may be in a resources area of a jar file so you can't do
>a directory listing.
>     public static final String[] templateNames = {
>         templateMemFN ,
>
>http://git-wip-us.apache.org/repos/asf/jena/blob/245d5cad/jena-fuseki2/jen
>a-fuseki-core/src/main/resources/org/apache/jena/fuseki/server/templates/c
>onfig-mem
>----------------------------------------------------------------------
>diff --git 
>a/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/
>server/templates/config-mem
>b/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/
>server/templates/config-mem
>index 06dcf1e..e455cca 100644
>--- 
>a/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/
>server/templates/config-mem
>+++ 
>b/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/
>server/templates/config-mem
>@@ -12,7 +12,7 @@
> ## Updatable in-memory dataset.
> 
> <#service1> rdf:type fuseki:Service ;
>-    # URI of the dataset -- http://host:port/ds
>+    # URI of the dataset -- http://host:port/{NAME}
>     fuseki:name                        "{NAME}" ;
>     fuseki:serviceQuery                "sparql" ;
>     fuseki:serviceQuery                "query" ;
>
>http://git-wip-us.apache.org/repos/asf/jena/blob/245d5cad/jena-fuseki2/jen
>a-fuseki-core/src/main/resources/org/apache/jena/fuseki/server/templates/c
>onfig-tdb-mem
>----------------------------------------------------------------------
>diff --git 
>a/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/
>server/templates/config-tdb-mem
>b/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/
>server/templates/config-tdb-mem
>index 32bb4a0..449de5e 100644
>--- 
>a/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/
>server/templates/config-tdb-mem
>+++ 
>b/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/
>server/templates/config-tdb-mem
>@@ -8,7 +8,7 @@
> @prefix ja:      <http://jena.hpl.hp.com/2005/11/Assembler#> .
> 
> ## ---------------------------------------------------------------
>-## Updatable TDB dataset with all services enabled.
>+## Updatable TDB dataset im-memory with all services enabled.
> 
> <#service_tdb_all> rdf:type fuseki:Service ;
>     rdfs:label                      "TDB {NAME}" ;
>@@ -26,6 +26,5 @@
> 
> <#tdb_dataset_readwrite> rdf:type      tdb:DatasetTDB ;
>     tdb:location "--mem--" ;
>-    ja:context [ ja:cxtName "arq:queryTimeout" ;  ja:cxtValue "1000" ] ;
>-    # tdb:unionDefaultGraph true ;
>+    ## tdb:unionDefaultGraph true ;
>     .
>