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/15 04:36:58 UTC

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

Author: schor
Date: Tue Sep 15 02:36:57 2009
New Revision: 814968

URL: http://svn.apache.org/viewvc?rev=814968&view=rev
Log:
UIMA-1555

Modified:
    incubator/uima/uima-as/trunk/uima-as-distr/src/main/assembly/bin.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=814968&r1=814967&r2=814968&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 15 02:36:57 2009
@@ -20,10 +20,7 @@
 <assembly>
   <id>bin</id>
   <formats>
-    <format>tar.gz</format>
-    <!-- this next format is very slow to generate, 
-         and gives little advantage over .gz -->
-    <!--format>tar.bz2</format-->  
+    <format>tar.gz</format>  
     <format>zip</format>
   </formats>
   
@@ -31,87 +28,7 @@
   <includeBaseDirectory>true</includeBaseDirectory>
   
   <dependencySets>
-    <!-- Because our artifactIds are uimaj-xxx but our jars are uima-xxx,
-    I need a separate dependency set for each module so that I can
-    specify the jar file name.  If we didn't have this inconsistency
-    we could have a single dependencySet that included all modules
-    and had an outputFileNameMapping of ${artifactId}.jar -->
-    
-    <!-- UIMA base -->
-    <dependencySet>
-      <includes>
-        <include>org.apache.uima:uimaj-core</include>
-      </includes>
-      <unpack>false</unpack> 
-      <scope>runtime</scope>
-      <outputFileNameMapping>uima-core.jar</outputFileNameMapping>
-      <outputDirectory>lib</outputDirectory>
-      <useProjectArtifact>false</useProjectArtifact>
-    </dependencySet>
-
-    <dependencySet>
-      <includes>
-        <include>org.apache.uima:uimaj-cpe</include>
-      </includes>
-      <outputFileNameMapping>uima-cpe.jar</outputFileNameMapping>
-      <outputDirectory>lib</outputDirectory>
-      <useProjectArtifact>false</useProjectArtifact>
-    </dependencySet>
-    
-    <dependencySet>
-      <includes>
-        <include>org.apache.uima:uimaj-document-annotation</include>
-      </includes>
-      <outputFileNameMapping>uima-document-annotation.jar</outputFileNameMapping>
-      <outputDirectory>lib</outputDirectory>
-      <useProjectArtifact>false</useProjectArtifact>
-    </dependencySet>
-    
-    <dependencySet>
-      <includes>
-        <include>org.apache.uima:uimaj-examples</include>
-      </includes>
-      <outputFileNameMapping>uima-examples.jar</outputFileNameMapping>
-      <outputDirectory>lib</outputDirectory>
-      <useProjectArtifact>false</useProjectArtifact>
-    </dependencySet>
-    
-    <dependencySet>
-      <includes>
-        <include>org.apache.uima:uimaj-tools</include>
-      </includes>
-      <outputFileNameMapping>uima-tools.jar</outputFileNameMapping>
-      <outputDirectory>lib</outputDirectory>
-      <useProjectArtifact>false</useProjectArtifact>
-    </dependencySet>
-    
-    <dependencySet>
-      <includes>
-        <include>org.apache.uima:uimaj-adapter-soap</include>
-      </includes>
-      <outputFileNameMapping>uima-adapter-soap.jar</outputFileNameMapping>
-      <outputDirectory>lib</outputDirectory>
-      <useProjectArtifact>false</useProjectArtifact>
-    </dependencySet>
-    
-    <dependencySet>
-      <includes>
-        <include>org.apache.uima:uimaj-adapter-vinci</include>
-      </includes>
-      <outputFileNameMapping> uima-adapter-vinci.jar</outputFileNameMapping>
-      <outputDirectory>lib</outputDirectory>
-      <useProjectArtifact>false</useProjectArtifact>
-    </dependencySet>
-    
-    <dependencySet>
-      <includes>
-        <include>org.apache.uima:jVinci</include>
-      </includes>
-      <outputFileNameMapping>jVinci.jar</outputFileNameMapping>
-      <outputDirectory>lib</outputDirectory>
-      <useProjectArtifact>false</useProjectArtifact>
-    </dependencySet>
-    
+            
     <!-- UIMA-AS -->
     <dependencySet>
       <includes>
@@ -125,9 +42,7 @@
       <useProjectArtifact>false</useProjectArtifact>
     </dependencySet>
 
-    
     <!-- UIMA-AS included other projects -->
-
     <dependencySet>
       <includes>
         <include>commons-logging:commons-logging</include>
@@ -157,15 +72,15 @@
         <include>org.apache.derby:derby</include>
         <include>org.apache.xbean:xbean-spring</include>
         <include>commons-beanutils:commons-beanutils</include>
-		<include>commons-collections:commons-collections</include>
-		<include>commons-dbcp:commons-dbcp</include>
-		<include>commons-pool:commons-pool</include>
-		<include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
-		<include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
-		<include>activemq:jmdns</include>
-		<include>log4j:log4j</include>
-		<include>mx4j:mx4j-remote</include>
-		<include>mx4j:mx4j-tools</include>
+		    <include>commons-collections:commons-collections</include>
+        <include>commons-dbcp:commons-dbcp</include>
+        <include>commons-pool:commons-pool</include>
+        <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
+        <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
+        <include>activemq:jmdns</include>
+        <include>log4j:log4j</include>
+        <include>mx4j:mx4j-remote</include>
+        <include>mx4j:mx4j-tools</include>
       </includes>
       <useTransitiveDependencies>false</useTransitiveDependencies>
       <outputDirectory>apache-activemq-4.1.1/lib/optional</outputDirectory>
@@ -186,18 +101,10 @@
    
     <!-- Copy each eclipse plugin into the /eclipsePlugins dir of the distribution -->
     <dependencySet>
-      <includes>
-        <include>org.apache.uima:uimaj-ep-configurator</include>
-        <include>org.apache.uima:uimaj-ep-debug</include>
-        <include>org.apache.uima:uimaj-ep-jcasgen</include>
-        <include>org.apache.uima:uimaj-ep-pear-packager</include>
-        <include>org.apache.uima:uimaj-ep-runtime</include>
-        
-        <!-- uima-as plugins -->
+      <includes>        
         <include>org.apache.uima:uimaj-ep-deployeditor</include>
         <include>org.apache.uima:uimaj-ep-runtime-deployeditor</include>
         <include>org.apache.uima:uimaj-as-osgi-runtime</include>
-        
       </includes>
       <outputDirectory>eclipsePlugins</outputDirectory>
       <outputFileNameMapping>${artifact.build.finalName}.jar</outputFileNameMapping>
@@ -208,7 +115,7 @@
   <!-- Add other files - scripts, documentation, examples -->
   <fileSets>
     <!-- base UIMA -->
-    <fileSet>
+    <!--fileSet>
       <directory>../uimaj-distr/src/main/scripts</directory>
       <excludes>
         <exclude>setUimaClassPath.*</exclude>
@@ -228,7 +135,7 @@
         <include>tools/css/**</include>
         <include>images/tools/**</include>
       </includes>
-    </fileSet>
+    </fileSet-->
     
     <!-- uima-as -->
     <fileSet>
@@ -247,12 +154,12 @@
            it also puts into the base dir, but creates an
            extra (empty) version of the base dir - probably 
            a bug. -->
-      <outputDirectory></outputDirectory>
+      <outputDirectory>uima-as/readme</outputDirectory>
     </fileSet>
     
     <fileSet>
       <directory>target/site/apidocs</directory>
-      <outputDirectory>docs/api</outputDirectory>
+      <outputDirectory>uima-as/docs/api</outputDirectory>
       <excludes>
         <exclude>options</exclude>
         <exclude>packages</exclude>
@@ -262,7 +169,7 @@
     </fileSet>
     <fileSet>
       <directory>../uima-as-docbooks/target</directory>
-      <outputDirectory>docs/html</outputDirectory>
+      <outputDirectory>uima-as/docs/html</outputDirectory>
       <includes>
         <include>images/**</include>
         <!--include>index.html</include-->
@@ -272,19 +179,19 @@
     </fileSet>
     <fileSet>
       <directory>../uima-as-docbooks/target/uima_async_scaleout</directory>
-      <outputDirectory>docs/pdf</outputDirectory>
+      <outputDirectory>uima-as/docs/pdf</outputDirectory>
       <includes>
         <include>uima_async_scaleout.pdf</include>
       </includes>
     </fileSet>
     <fileSet>
       <directory>../uima-as-docbooks/src</directory>
-      <outputDirectory>docs</outputDirectory>
+      <outputDirectory>uima-as/docs</outputDirectory>
       <includes>
         <include>index.html</include>
       </includes>
     </fileSet>    
-    <fileSet>
+    <!--fileSet>
       <directory>../uimaj-examples/src/main/java</directory>
       <outputDirectory>examples/src</outputDirectory>
       <excludes>
@@ -316,7 +223,7 @@
     <fileSet>
       <directory>../uimaj-examples/src/main/run_configuration</directory>
       <outputDirectory>examples/run_configuration</outputDirectory>
-    </fileSet>
+    </fileSet-->
     
     <!-- uima-as additions -->
     <fileSet>
@@ -342,6 +249,7 @@
   </fileSets>
   
   <files>
+    <!--  skip the main uima project files 
     <file>
       <source>../uimaj-examples/src/main/eclipseProject/project</source>
       <outputDirectory>examples</outputDirectory>
@@ -349,12 +257,6 @@
       <fileMode>644</fileMode> 
     </file>
     <file>
-      <source>src/main/eclipseProject/classpath</source>
-      <outputDirectory>examples</outputDirectory>
-      <destName>.classpath</destName>
-      <fileMode>644</fileMode> 
-    </file>
-    <file>
       <source> ../uimaj-examples/src/main/eclipseProject/ecore_src_readme.txt</source>
       <outputDirectory>examples/ecore_src</outputDirectory>
       <destName>readme.txt</destName>
@@ -375,5 +277,13 @@
       <outputDirectory>examples/ecore_src/org/apache/uima/examples/xmi</outputDirectory>
       <fileMode>644</fileMode> 
     </file>
+    
+    -->
+    <file>
+      <source>src/main/eclipseProject/classpath</source>
+      <outputDirectory>examples</outputDirectory>
+      <destName>.classpath</destName>
+      <fileMode>644</fileMode> 
+    </file>
   </files>
 </assembly>