Return-Path: 
 <commits-return-11788-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 7F2CA10C0D
	for <apmail-jena-commits-archive@www.apache.org>;
 Mon,  5 Jan 2015 20:45:36 +0000 (UTC)
Received: (qmail 31178 invoked by uid 500); 5 Jan 2015 20:45:37 -0000
Delivered-To: apmail-jena-commits-archive@jena.apache.org
Received: (qmail 31155 invoked by uid 500); 5 Jan 2015 20:45:37 -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 31146 invoked by uid 99); 5 Jan 2015 20:45:37 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Jan 2015 20:45:37 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 39BAEA406A7; Mon,  5 Jan 2015 20:45:37 +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: <eb681c8f15144e8bb5bd6c3abea6db46@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: jena git commit: Tidy up distribution packaging
Date: Mon,  5 Jan 2015 20:45:37 +0000 (UTC)

Repository: jena
Updated Branches:
  refs/heads/master 4e6da043f -> 986d2dcf9


Tidy up distribution packaging


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

Branch: refs/heads/master
Commit: 986d2dcf9b992d668dca1a581d918b555f731cb5
Parents: 4e6da04
Author: Andy Seaborne <andy@apache.org>
Authored: Mon Jan 5 20:45:04 2015 +0000
Committer: Andy Seaborne <andy@apache.org>
Committed: Mon Jan 5 20:45:04 2015 +0000

----------------------------------------------------------------------
 jena-fuseki2/jena-fuseki-dist/fuseki-server | 3 ++-
 jena-fuseki2/jena-fuseki-dist/pom.xml       | 1 +
 jena-fuseki2/jena-fuseki-server/pom.xml     | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/986d2dcf/jena-fuseki2/jena-fuseki-dist/fuseki-server
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-dist/fuseki-server b/jena-fuseki2/jena-fuseki-dist/fuseki-server
index 679b3bd..6ed1ece 100755
--- a/jena-fuseki2/jena-fuseki-dist/fuseki-server
+++ b/jena-fuseki2/jena-fuseki-dist/fuseki-server
@@ -26,13 +26,14 @@ then
     fi
 
 JAR1="$FUSEKI_HOME/fuseki-server.jar"
-JAR2="$FUSEKI_HOME/jena-fuseki-*-server.jar"
+JAR2="$FUSEKI_HOME/jena-fuseki-server-*.jar"
 JAR=""
 
 for J in "$JAR1" "$JAR2"
 do
     # Expand
     J="$(echo $J)"
+    echo $J
     if [ -e "$J" ]
     then
 	JAR="$J"

http://git-wip-us.apache.org/repos/asf/jena/blob/986d2dcf/jena-fuseki2/jena-fuseki-dist/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-dist/pom.xml b/jena-fuseki2/jena-fuseki-dist/pom.xml
index 6da0ca9..c72f1ed 100644
--- a/jena-fuseki2/jena-fuseki-dist/pom.xml
+++ b/jena-fuseki2/jena-fuseki-dist/pom.xml
@@ -79,6 +79,7 @@
 	    <!--<phase/>-->
             <goals><goal>single</goal></goals>
             <configuration>
+	      <appendAssemblyId>false</appendAssemblyId>
               <descriptors>
                 <descriptor>assembly-dist.xml</descriptor>
               </descriptors>

http://git-wip-us.apache.org/repos/asf/jena/blob/986d2dcf/jena-fuseki2/jena-fuseki-server/pom.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-server/pom.xml b/jena-fuseki2/jena-fuseki-server/pom.xml
index b809285..7ee5d2b 100644
--- a/jena-fuseki2/jena-fuseki-server/pom.xml
+++ b/jena-fuseki2/jena-fuseki-server/pom.xml
@@ -87,7 +87,7 @@
 	  -->
           <transformers>
             <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-              <mainClass>org.apache.jena.fuseki.FusekiCmd</mainClass>
+              <mainClass>org.apache.jena.fuseki.cmd.FusekiCmd</mainClass>
             </transformer>
             <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
             <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />