Return-Path: 
 <commits-return-15148-apmail-jena-commits-archive=jena.apache.org@jena.apache.org>
X-Original-To: apmail-jena-commits-archive@www.apache.org
Delivered-To: apmail-jena-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3DEB118EA7
	for <apmail-jena-commits-archive@www.apache.org>;
 Tue,  5 Jan 2016 13:41:15 +0000 (UTC)
Received: (qmail 51607 invoked by uid 500); 5 Jan 2016 13:41:15 -0000
Delivered-To: apmail-jena-commits-archive@jena.apache.org
Received: (qmail 51575 invoked by uid 500); 5 Jan 2016 13:41:15 -0000
Mailing-List: contact commits-help@jena.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@jena.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@jena.apache.org>
List-Post: <mailto:commits@jena.apache.org>
List-Id: <commits.jena.apache.org>
Reply-To: dev@jena.apache.org
Delivered-To: mailing list commits@jena.apache.org
Received: (qmail 51565 invoked by uid 99); 5 Jan 2016 13:41:14 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jan 2016 13:41:14 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id CA65DDFFF7; Tue,  5 Jan 2016 13:41:14 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: andy@apache.org
To: commits@jena.apache.org
Message-Id: <5984c467238448dd947ea6922f31af48@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: jena git commit: JENA-1108: Fix apache-jena as a <type>pom to get
 jena-cmds
Date: Tue,  5 Jan 2016 13:41:14 +0000 (UTC)

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 <andy@apache.org>
Authored: Tue Jan 5 13:40:59 2016 +0000
Committer: Andy Seaborne <andy@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 ;
     .