You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2009/09/29 19:13:27 UTC

svn commit: r820034 - in /incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly: bin.xml src.xml

Author: schor
Date: Tue Sep 29 17:13:27 2009
New Revision: 820034

URL: http://svn.apache.org/viewvc?rev=820034&view=rev
Log:
UIMA-1517 set executable permissions in assembly

Modified:
    incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/bin.xml
    incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/src.xml

Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/bin.xml?rev=820034&r1=820033&r2=820034&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/bin.xml (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/bin.xml Tue Sep 29 17:13:27 2009
@@ -40,6 +40,7 @@
       <outputFileNameMapping>${artifact.artifactId}.jar</outputFileNameMapping>
       <outputDirectory>lib</outputDirectory>
       <useProjectArtifact>false</useProjectArtifact>
+      <fileMode>644</fileMode> 
     </dependencySet>
 
     <!-- UIMA-AS included other projects -->
@@ -58,6 +59,7 @@
       <useTransitiveDependencies>false</useTransitiveDependencies>
       <outputDirectory>apache-activemq-4.1.1/lib</outputDirectory>
       <useProjectArtifact>false</useProjectArtifact>
+      <fileMode>644</fileMode> 
     </dependencySet>
     
     <dependencySet>
@@ -85,6 +87,7 @@
       <useTransitiveDependencies>false</useTransitiveDependencies>
       <outputDirectory>apache-activemq-4.1.1/lib/optional</outputDirectory>
       <useProjectArtifact>false</useProjectArtifact>
+      <fileMode>644</fileMode> 
     </dependencySet>
 
     <!--dependencySet>
@@ -109,11 +112,13 @@
       <outputDirectory>eclipsePlugins</outputDirectory>
       <outputFileNameMapping>${artifact.build.finalName}.jar</outputFileNameMapping>
       <useProjectArtifact>false</useProjectArtifact>
+      <fileMode>644</fileMode> 
     </dependencySet>
   </dependencySets>
   
   <!-- Add other files - scripts, documentation, examples -->
   <fileSets>
+    <!-- UIMA-AS no longer includes base UIMA as of 2.3.0 -->
     <!-- base UIMA -->
     <!--fileSet>
       <directory>../uimaj-distr/src/main/scripts</directory>
@@ -141,11 +146,19 @@
     <fileSet>
       <directory>src/main/scripts</directory>
       <outputDirectory>bin</outputDirectory>
+      <includes><include>**/*.sh</include></includes>
       <fileMode>755</fileMode>
     </fileSet>
     <fileSet>
+      <directory>src/main/scripts</directory>
+      <outputDirectory>bin</outputDirectory>
+      <excludes><exclude>**/*.sh</exclude></excludes>
+      <fileMode>644</fileMode>
+    </fileSet>
+    <fileSet>
       <directory>src/main/config</directory>
       <outputDirectory>as_config</outputDirectory>
+      <fileMode>644</fileMode>
     </fileSet>
     <fileSet>
       <directory>src/main/readme</directory>
@@ -155,6 +168,7 @@
            extra (empty) version of the base dir - probably 
            a bug. -->
       <outputDirectory>uima-as/readme</outputDirectory>
+      <fileMode>644</fileMode>
     </fileSet>
     
     <fileSet>
@@ -166,6 +180,7 @@
         <exclude>files</exclude>
         <exclude>argfile</exclude>        
       </excludes>
+      <fileMode>644</fileMode>
     </fileSet>
     <fileSet>
       <directory>../uima-as-docbooks/target</directory>
@@ -176,6 +191,7 @@
         <include>uima_async_scaleout/uima_async_scaleout.html</include>
         <include>uima_async_scaleout/css/**</include>
       </includes>
+      <fileMode>644</fileMode>
     </fileSet>
     <fileSet>
       <directory>../uima-as-docbooks/target/uima_async_scaleout</directory>
@@ -183,6 +199,7 @@
       <includes>
         <include>uima_async_scaleout.pdf</include>
       </includes>
+      <fileMode>644</fileMode>
     </fileSet>
     <fileSet>
       <directory>../uima-as-docbooks/src</directory>
@@ -190,6 +207,7 @@
       <includes>
         <include>index.html</include>
       </includes>
+      <fileMode>644</fileMode>
     </fileSet>    
     <!--fileSet>
       <directory>../uimaj-examples/src/main/java</directory>
@@ -229,22 +247,40 @@
     <fileSet>
       <directory>src/main/examples</directory>
       <outputDirectory>examples</outputDirectory>
+      <fileMode>644</fileMode>
     </fileSet>
     <fileSet>
       <directory>../uimaj-as-activemq/src/main/java/org/apache/uima/examples/as</directory>
       <outputDirectory>examples/src/org/apache/uima/examples/as</outputDirectory>
+      <fileMode>644</fileMode>
     </fileSet>
     
     <!-- activemq -->
     <fileSet>
       <directory>src/main/apache-activemq-4.1.1</directory>
       <outputDirectory>apache-activemq-4.1.1</outputDirectory>
+      <includes><include>bin/**</include></includes>
+      <excludes><exclude>bin/**/*.*</exclude></excludes>
+      <fileMode>755</fileMode>
+    </fileSet>  
+    <fileSet>
+      <directory>src/main/apache-activemq-4.1.1</directory>
+      <outputDirectory>apache-activemq-4.1.1</outputDirectory>
+      <includes><include>bin/**/*.*</include></includes>
+      <fileMode>644</fileMode>
     </fileSet>  
-    
+    <fileSet>
+      <directory>src/main/apache-activemq-4.1.1</directory>
+      <outputDirectory>apache-activemq-4.1.1</outputDirectory>
+      <excludes><exclude>bin/**</exclude></excludes>
+      <fileMode>644</fileMode>
+    </fileSet>  
+        
     <!-- saxon -->    
     <fileSet>
       <directory>src/main/saxon</directory>
       <outputDirectory>saxon</outputDirectory>
+      <fileMode>644</fileMode>
     </fileSet>
   </fileSets>
   

Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/src.xml?rev=820034&r1=820033&r2=820034&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/src.xml (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/src.xml Tue Sep 29 17:13:27 2009
@@ -38,7 +38,44 @@
         <include>src/**</include>
         <include>pom.xml</include>
       </includes>
+      <excludes>
+        <exclude>src/main/readme/**</exclude>
+        <exclude>**/*.sh</exclude>
+        <exclude>src/main/apache-activemq-4.1.1/bin</exclude>
+      </excludes>
+      <fileMode>644</fileMode>
+    </fileSet>
+
+    <fileSet>
+      <directory>.</directory>
+      <outputDirectory>uima-as-distr</outputDirectory>
+      <includes>
+        <include>src/**/*.sh</include>
+      </includes>
+      <fileMode>755</fileMode>
+    </fileSet>
+    
+    <fileSet>
+      <directory>.</directory>
+      <outputDirectory>uima-as-distr</outputDirectory>
+      <includes>
+        <include>src/main/apache-activemq-4.1.1/bin/**/*.*</include>
+      </includes>
+      <fileMode>644</fileMode>
     </fileSet>
+
+    <fileSet>
+      <directory>.</directory>
+      <outputDirectory>uima-as-distr</outputDirectory>
+      <includes>
+        <include>src/main/apache-activemq-4.1.1/bin/**</include>
+      </includes>
+      <excludes>
+        <exclude>src/main/apache-activemq-4.1.1/bin/**/*.*</exclude>
+      </excludes>
+      <fileMode>755</fileMode>
+    </fileSet>
+    
     <fileSet>
       <directory>src/main/readme</directory>
       <excludes>
@@ -52,6 +89,7 @@
            extra (empty) version of the base dir - probably 
            a bug. -->
       <outputDirectory></outputDirectory>
+      <fileMode>644</fileMode>
     </fileSet>
     <fileSet>
       <directory>src/main/readme_src</directory>
@@ -61,6 +99,7 @@
            extra (empty) version of the base dir - probably 
            a bug. -->
       <outputDirectory></outputDirectory>
+      <fileMode>644</fileMode>
     </fileSet>
     <fileSet>
       <directory>../uima-as-docbooks</directory>
@@ -71,6 +110,7 @@
         <exclude>src/styles/titlepage/*.xsl</exclude>
         <exclude>src/olink/**/*.db</exclude>     
       </excludes>
+      <fileMode>644</fileMode>
     </fileSet>   
     <fileSet>
       <directory>../uima-docbook-tool</directory>
@@ -86,6 +126,7 @@
         <include>README</include>
         <include>README.FIRST</include>
       </includes>
+      <fileMode>644</fileMode>
     </fileSet>
     <!-- include part of the base docbook - need to build the
          tools documentation to produce the help files
@@ -113,6 +154,7 @@
         <exclude>build_all_books.xml</exclude>
         <exclude>README.USER.txt</exclude>  <!-- remove, because it has misleading info in this context -->    
       </excludes>
+      <fileMode>644</fileMode>
     </fileSet>
     <!-- update site not part of the source distribution.  This is 
          something built after the release vote, as part of deployment -->
@@ -135,6 +177,7 @@
         <include>src/**</include>
         <include>pom.xml</include>
       </includes>
+      <fileMode>644</fileMode>
     </fileSet>  
     <fileSet>
       <directory>../uimaj-ep-runtime-deployeditor</directory>
@@ -143,6 +186,7 @@
         <include>src/**</include>
         <include>pom.xml</include>
       </includes>
+      <fileMode>644</fileMode>
     </fileSet>     
     <fileSet>
       <directory>../uimaj-as-osgi-runtime</directory>
@@ -150,6 +194,7 @@
       <includes>
         <include>pom.xml</include>
       </includes>
+      <fileMode>644</fileMode>
     </fileSet>
     <fileSet>
       <directory>../uimaj-as</directory>
@@ -158,6 +203,7 @@
         <include>pom.xml</include>
         <include>eclipse-plugin-superPom/*</include>
       </includes>
+      <fileMode>644</fileMode>
     </fileSet>
     <fileSet>
       <directory>../uimaj-as-activemq</directory>
@@ -166,6 +212,7 @@
         <include>src/**</include>
         <include>pom.xml</include>
       </includes>
+      <fileMode>644</fileMode>
     </fileSet>
     <fileSet>
       <directory>../uimaj-as-camel</directory>
@@ -174,6 +221,7 @@
         <include>src/**</include>
         <include>pom.xml</include>
       </includes>
+      <fileMode>644</fileMode>
     </fileSet>
     <fileSet>
       <directory>../uimaj-as-core</directory>
@@ -182,6 +230,7 @@
         <include>src/**</include>
         <include>pom.xml</include>
       </includes>
+      <fileMode>644</fileMode>
     </fileSet>
     <fileSet>
       <directory>../uimaj-as-jms</directory>
@@ -190,14 +239,17 @@
         <include>src/**</include>
         <include>pom.xml</include>
       </includes>
+      <fileMode>644</fileMode>
     </fileSet>
-    <fileSet>
+    <!-- next is base UIMA - no longer part of UIMA-AS distribution as of 2.3.0 -->
+    <!-- fileSet>
       <directory>../uimaj</directory>
       <outputDirectory>uimaj</outputDirectory>
       <includes>
         <include>eclipse-plugin-superPom/*</include>
         <include>pom.xml</include>
       </includes>
+      <fileMode>644</fileMode>
     </fileSet>
     <fileSet>
       <directory>../uimaj-distr</directory>
@@ -214,6 +266,6 @@
         <include>src/**</include>
         <include>pom.xml</include>
       </includes>
-    </fileSet>  
+    </fileSet-->  
   </fileSets>  
 </assembly>
\ No newline at end of file