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 2014/03/22 11:41:02 UTC

svn commit: r1580189 - in /jena/branches/jena-fuseki-new-ui: ./ assembly-dist.xml pom.xml

Author: andy
Date: Sat Mar 22 10:41:01 2014
New Revision: 1580189

URL: http://svn.apache.org/r1580189
Log:
Build war file

Modified:
    jena/branches/jena-fuseki-new-ui/   (props changed)
    jena/branches/jena-fuseki-new-ui/assembly-dist.xml
    jena/branches/jena-fuseki-new-ui/pom.xml

Propchange: jena/branches/jena-fuseki-new-ui/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Mar 22 10:41:01 2014
@@ -13,3 +13,4 @@ lib
 fuseki.pid
 Lucene
 run
+fuseki.classpath

Modified: jena/branches/jena-fuseki-new-ui/assembly-dist.xml
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/assembly-dist.xml?rev=1580189&r1=1580188&r2=1580189&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/assembly-dist.xml (original)
+++ jena/branches/jena-fuseki-new-ui/assembly-dist.xml Sat Mar 22 10:41:01 2014
@@ -40,12 +40,12 @@ Assumes jar made and onejar has been ass
       <outputDirectory></outputDirectory>
       <destName>fuseki-server.jar</destName>
     </file>
-    <!-- include sources in binary distribution?
     <file>
-      <source>${project.artifactId}-${project.version}-sources.jar</source>
+      <source>${project.build.directory}/${project.build.finalName}.war</source>
       <outputDirectory></outputDirectory>
+      <destName>fuseki-server.war</destName>
     </file>
-    -->
+
     <file>
       <source>dist/LICENSE-dist</source>
       <destName>LICENSE</destName>
@@ -60,6 +60,7 @@ Assumes jar made and onejar has been ass
     <fileSet>
       <outputDirectory></outputDirectory>
       <includes>
+	<include>templates/*</include>
         <include>README*</include>
         <include>DEPENDENCIES*</include>
         <include>ReleaseNotes.txt</include>
@@ -72,12 +73,12 @@ Assumes jar made and onejar has been ass
         <include>log4j.properties</include>
         <include>examples/**</include>
         <include>fuseki</include>
+        <include>fuseki_d/sh</include>
         <include>fuseki-server</include>
         <include>fuseki-server.bat</include>
         <include>config*.ttl</include>
+	<include>shiro.ini</include>
         <include>s-*</include>
-        <include>pages/*</include>
-        <include>Data/*</include>
       </includes>
     </fileSet>
   </fileSets>

Modified: jena/branches/jena-fuseki-new-ui/pom.xml
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/pom.xml?rev=1580189&r1=1580188&r2=1580189&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pom.xml (original)
+++ jena/branches/jena-fuseki-new-ui/pom.xml Sat Mar 22 10:41:01 2014
@@ -362,7 +362,8 @@
         </configuration>
         <executions>
           <execution>
-            <phase>package</phase>
+	    <phase>package</phase>
+	    <!--<phase/><!- - Switch off -->
             <goals>
               <goal>shade</goal>
             </goals>
@@ -402,11 +403,12 @@
 
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <!-- After shared jar, after war file - same phase -->
+        <!-- After shaded jar, after war file - same phase -->
         <executions>
           <execution>
             <id>create-zip-assembly</id>
-            <phase>package</phase>
+	    <phase>package</phase>
+	    <!--<phase/>-->
             <goals><goal>single</goal></goals>
             <configuration>
               <!--