jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1295771 - in /incubator/jena/Jena2/Fuseki/trunk: assembly-dist.xml assembly-server.xml pom.xml
Date Thu, 01 Mar 2012 20:25:20 GMT
Author: andy
Date: Thu Mar  1 20:25:20 2012
New Revision: 1295771

URL: http://svn.apache.org/viewvc?rev=1295771&view=rev
Log:
better server jar, better distribution, no tabs

Modified:
    incubator/jena/Jena2/Fuseki/trunk/assembly-dist.xml
    incubator/jena/Jena2/Fuseki/trunk/assembly-server.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=1295771&r1=1295770&r2=1295771&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/assembly-dist.xml (original)
+++ incubator/jena/Jena2/Fuseki/trunk/assembly-dist.xml Thu Mar  1 20:25:20 2012
@@ -32,7 +32,7 @@ Assumes jar made and onejar has been ass
     <format>tar.gz</format>
   </formats>
 
-  <baseDirectory>apache-${project.artifactId}-${project.version}</baseDirectory>
+  <baseDirectory>${project.artifactId}-${project.version}</baseDirectory>
 
   <files>
     <file>
@@ -54,21 +54,21 @@ Assumes jar made and onejar has been ass
     <fileSet>
       <outputDirectory></outputDirectory>
       <includes>
-	<include>README*</include>
-	<include>DEPENDENCIES*</include>
-	<include>DISCLAIMER*</include>
-	<include>ChangeLog.txt</include>
+        <include>README*</include>
+        <include>DEPENDENCIES*</include>
+        <include>DISCLAIMER*</include>
+        <include>ChangeLog.txt</include>
       </includes>
     </fileSet>
 
     <fileSet>
       <outputDirectory></outputDirectory>
       <includes>
-	<include>log4j.properties</include>
-	<include>fuseki-server</include>
-	<include>config*.ttl</include>
-	<include>s-*</include>
-	<include>pages/*</include>
+        <include>log4j.properties</include>
+        <include>fuseki-server</include>
+        <include>config*.ttl</include>
+        <include>s-*</include>
+        <include>pages/*</include>
       </includes>
     </fileSet>
   </fileSets>

Modified: incubator/jena/Jena2/Fuseki/trunk/assembly-server.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/assembly-server.xml?rev=1295771&r1=1295770&r2=1295771&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/assembly-server.xml (original)
+++ incubator/jena/Jena2/Fuseki/trunk/assembly-server.xml Thu Mar  1 20:25:20 2012
@@ -29,15 +29,33 @@ just want -jar-with-dependences to by re
     <format>jar</format>
   </formats>
   <includeBaseDirectory>false</includeBaseDirectory>
+  
   <dependencySets>
     <dependencySet>
+      <useProjectArtifact>true</useProjectArtifact>
       <unpack>true</unpack>
       <scope>runtime</scope>
+      <unpackOptions>
+        <excludes>
+          <exclude>**/NOTICE*</exclude>
+          <exclude>**/LICENSE*</exclude>
+          <exclude>**/DEPENDENCIES*</exclude>
+        </excludes>
+    </unpackOptions>
     </dependencySet>
   </dependencySets>
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.outputDirectory}</directory>
-    </fileSet>
-  </fileSets>
+  
+  <!-- put our (rolled up) LICNESE and NOTICE.  We have no DEPENDENCIES --> 
+  <files>
+    <file>
+      <source>dist/LICENSE-dist</source>
+      <outputDirectory>META-INF</outputDirectory>
+      <destName>LICENSE</destName>
+    </file>
+    <file>
+      <source>dist/NOTICE-dist</source>
+      <outputDirectory>META-INF</outputDirectory>
+      <destName>NOTICE</destName>
+    </file>
+  </files>
 </assembly>

Modified: incubator/jena/Jena2/Fuseki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/pom.xml?rev=1295771&r1=1295770&r2=1295771&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/pom.xml (original)
+++ incubator/jena/Jena2/Fuseki/trunk/pom.xml Thu Mar  1 20:25:20 2012
@@ -117,7 +117,7 @@
       <artifactId>httpclient</artifactId>
       <version>${ver.httpclient}</version>
       <exclusions>
-	<!-- Replace with slf4j adapter -->
+        <!-- Replace with slf4j adapter -->
         <exclusion>
           <groupId>commons-logging</groupId>
           <artifactId>commons-logging</artifactId>
@@ -220,18 +220,18 @@
   <build>
     <resources>
       <resource>
-	<filtering>false</filtering>
-	<directory>src/main/resources</directory>
-	<excludes>
-	  <exclude>org/apache/jena/fuseki/fuseki-properties.xml</exclude>
-	</excludes>
+        <filtering>false</filtering>
+        <directory>src/main/resources</directory>
+        <excludes>
+          <exclude>org/apache/jena/fuseki/fuseki-properties.xml</exclude>
+        </excludes>
       </resource>
       <resource>
-	<filtering>true</filtering>
-	<directory>src/main/resources</directory>
-	<includes>
-	  <include>org/apache/jena/fuseki/fuseki-properties.xml</include>
-	</includes>
+        <filtering>true</filtering>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>org/apache/jena/fuseki/fuseki-properties.xml</include>
+        </includes>
       </resource>
     </resources>
     <filters>
@@ -240,12 +240,12 @@
     
     <plugins>
       <!-- This produce a java properties file 'filter.properties' with timestanps in
-	   For use with fileritng resources.
+           For use with fileritng resources.
       -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
-	
+        
         <executions>
           <execution>
             <id>ant-generate-resources</id>
@@ -278,12 +278,12 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3.2</version>
-	<configuration>
-	  <encoding>UTF-8</encoding>
+        <configuration>
+          <encoding>UTF-8</encoding>
           <optimize>true</optimize>
-	  <debug>true</debug>
+          <debug>true</debug>
           <debuglevel>source,lines,vars</debuglevel>
-	  <source>1.6</source>
+          <source>1.6</source>
           <target>1.6</target>
         </configuration>
       </plugin>
@@ -292,7 +292,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
          <version>2.1.2</version>
-	 <executions> 
+         <executions> 
           <execution>
             <id>attach-sources</id>
             <phase>package</phase>
@@ -306,7 +306,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-	<version>2.9</version>
+        <version>2.9</version>
         <configuration>
           <includes>
             <include>**/TS_*.java</include>
@@ -326,64 +326,65 @@
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
 
-	<executions>
+        <executions>
 
-	  <execution>
-	    <id>create-server-assembly</id>
-	    <phase>package</phase>
-	    <goals><goal>single</goal></goals>
-	    <configuration>
-	      <archive>
-		<manifest>
-		  <mainClass>org.apache.jena.fuseki.FusekiCmd</mainClass>
-		</manifest>
-	      </archive>
-	      <!--
-	      <finalName>${server.jar.name}</finalName>
-	      <appendAssemblyId>false</appendAssemblyId>
-	      -->
-	      <descriptors>
-		<descriptor>assembly-server.xml</descriptor>
-	      </descriptors>
-	    </configuration>
-	  </execution>
-
-	  <!--
-	  <execution>
-	    <id>create-soh-assembly</id>
-	    <phase>package</phase>
-	    <goals><goal>single</goal></goals>
-	    <configuration>
-	      <finalName>${assembly.soh.name}</finalName>
-	      <!- -<appendAssemblyId>false</appendAssemblyId> - ->
-	      <descriptors>
-		<descriptor>assembly-soh.xml</descriptor>
-	      </descriptors>
-	    </configuration>
-	  </execution>
-	  -->
-
-	  <execution>
-	    <id>create-zip-assembly</id>
-	    <phase>package</phase>
-	    <goals><goal>single</goal></goals>
-	    <configuration>
-	      <!--
-	      <finalName>${assembly.zip.name}</finalName>
-	      <appendAssemblyId>false</appendAssemblyId>
-	      -->
-	      <descriptors>
-		<descriptor>assembly-dist.xml</descriptor>
-	      </descriptors>
-	    </configuration>
-	  </execution>
-	</executions>
+          <execution>
+            <id>create-server-assembly</id>
+            <phase>package</phase>
+            <goals><goal>single</goal></goals>
+            <configuration>
+              <!--
+              <finalName>${server.jar.name}</finalName>
+              <appendAssemblyId>false</appendAssemblyId>
+              <attach>false</attach>
+              -->
+              <archive>
+                <manifest>
+                  <mainClass>org.apache.jena.fuseki.FusekiCmd</mainClass>
+                </manifest>
+              </archive>
+              <descriptors>
+                <descriptor>assembly-server.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+
+          <!--
+          <execution>
+            <id>create-soh-assembly</id>
+            <phase>package</phase>
+            <goals><goal>single</goal></goals>
+            <configuration>
+              <finalName>${assembly.soh.name}</finalName>
+              <!- -<appendAssemblyId>false</appendAssemblyId> - ->
+              <descriptors>
+                <descriptor>assembly-soh.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+          -->
+
+          <execution>
+            <id>create-zip-assembly</id>
+            <phase>package</phase>
+            <goals><goal>single</goal></goals>
+            <configuration>
+              <!--
+              <finalName>${assembly.zip.name}</finalName>
+              <appendAssemblyId>false</appendAssemblyId>
+              -->
+              <descriptors>
+                <descriptor>assembly-dist.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
       
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
-	<version>2.5</version>
+        <version>2.5</version>
         <configuration>
           <encoding>UTF-8</encoding>
         </configuration>



Mime
View raw message