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/01 22:39:52 UTC

svn commit: r1196298 - in /incubator/jena/Jena2/Fuseki/trunk: assembly-dist.xml pom.xml

Author: andy
Date: Tue Nov  1 21:39:52 2011
New Revision: 1196298

URL: http://svn.apache.org/viewvc?rev=1196298&view=rev
Log: (empty)

Modified:
    incubator/jena/Jena2/Fuseki/trunk/assembly-dist.xml
    incubator/jena/Jena2/Fuseki/trunk/pom.xml

Modified: incubator/jena/Jena2/Fuseki/trunk/assembly-dist.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/assembly-dist.xml?rev=1196298&r1=1196297&r2=1196298&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/assembly-dist.xml (original)
+++ incubator/jena/Jena2/Fuseki/trunk/assembly-dist.xml Tue Nov  1 21:39:52 2011
@@ -16,17 +16,6 @@ Assumes jar made and onejar has been ass
 
   <baseDirectory>${project.name}-${project.version}</baseDirectory>
 
-  <fileSet>
-    <includes>
-      <include>README*</include>
-      <include>DISCLAIMER*</include>
-      <include>LICENSE*</include>
-      <include>NOTICE*</include>
-      <include>ChangeLog.txt</include>
-      <include>pom.xml</include>
-      </includes>
-  </fileSet>
-  
   <files>
     <file>
       <source>${project.build.directory}/${server.jar.name}.jar</source>
@@ -39,6 +28,18 @@ Assumes jar made and onejar has been ass
     <fileSet>
       <outputDirectory></outputDirectory>
       <includes>
+	<include>README*</include>
+	<include>DISCLAIMER*</include>
+	<include>LICENSE*</include>
+	<include>NOTICE*</include>
+	<include>ChangeLog.txt</include>
+	<include>pom.xml</include>
+      </includes>
+    </fileSet>
+
+    <fileSet>
+      <outputDirectory></outputDirectory>
+      <includes>
 	<include>log4j.properties</include>
 	<include>fuseki-server</include>
 	<include>tdb.ttl</include>

Modified: incubator/jena/Jena2/Fuseki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/pom.xml?rev=1196298&r1=1196297&r2=1196298&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/pom.xml (original)
+++ incubator/jena/Jena2/Fuseki/trunk/pom.xml Tue Nov  1 21:39:52 2011
@@ -43,7 +43,10 @@
   <properties>
     <this.root>${project.artifactId}-${project.version}</this.root>
     <!-- and the classifier is added using the id -->
+    <!--
     <server.jar.name>fuseki-server-${project.version}</server.jar.name>
+    -->
+    <server.jar.name>${this.root}-server</server.jar.name>
     <assembly.name>${this.root}</assembly.name>
     <assembly.soh.name>${this.root}</assembly.soh.name>
     <assembly.zip.name>${this.root}</assembly.zip.name>
@@ -354,8 +357,10 @@
 	    <phase>package</phase>
 	    <goals><goal>single</goal></goals>
 	    <configuration>
+	      <!--
 	      <finalName>${assembly.zip.name}</finalName>
 	      <appendAssemblyId>false</appendAssemblyId>
+	      -->
 	      <descriptors>
 		<descriptor>assembly-dist.xml</descriptor>
 	      </descriptors>