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 2008/03/05 17:35:48 UTC

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

Author: schor
Date: Wed Mar  5 08:35:47 2008
New Revision: 633916

URL: http://svn.apache.org/viewvc?rev=633916&view=rev
Log:
[UIMA-839] Partial update to get uima-as-distr into some kind of shape.  More updates needed.

Modified:
    incubator/uima/sandbox/trunk/uima-as/uima-as-distr/   (props changed)
    incubator/uima/sandbox/trunk/uima-as/uima-as-distr/pom.xml
    incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/   (props changed)
    incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/assembly/bin.xml
    incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/assembly/src.xml

Propchange: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar  5 08:35:47 2008
@@ -0,0 +1 @@
+target

Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/pom.xml?rev=633916&r1=633915&r2=633916&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/pom.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/pom.xml Wed Mar  5 08:35:47 2008
@@ -49,9 +49,199 @@
 		<artifactId>uimaj-as</artifactId>
 		<version>0.7.0-incubating-SNAPSHOT</version> <!-- this comment is a flag for changeVersion -->
 	</parent>
+  
+  <!-- dependencies used during assembly -->
 	<dependencies>
-    <!-- unclear what the dependencies are used for here 
-         try leaving them out -->    
+    <!-- uima base -->
+    <dependency>
+      <groupId>org.apache.uima</groupId>
+      <artifactId>uimaj-adapter-vinci</artifactId>
+      <version>${uimaj-release-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.uima</groupId>
+      <artifactId>uimaj-adapter-soap</artifactId>
+      <version>${uimaj-release-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.uima</groupId>
+      <artifactId>uimaj-core</artifactId>
+      <version>${uimaj-release-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.uima</groupId>
+      <artifactId>uimaj-cpe</artifactId>
+      <version>${uimaj-release-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.uima</groupId>
+      <artifactId>uimaj-examples</artifactId>
+      <version>${uimaj-release-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.uima</groupId>
+      <artifactId>uimaj-tools</artifactId>
+      <version>${uimaj-release-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.uima</groupId>
+      <artifactId>uimaj-ep-configurator</artifactId>
+      <version>${uimaj-release-eclipse-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.uima</groupId>
+      <artifactId>uimaj-ep-debug</artifactId>
+      <version>${uimaj-release-eclipse-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.uima</groupId>
+      <artifactId>uimaj-ep-jcasgen</artifactId>
+      <version>${uimaj-release-eclipse-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.uima</groupId>
+      <artifactId>uimaj-ep-pear-packager</artifactId>
+      <version>${uimaj-release-eclipse-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.uima</groupId>
+      <artifactId>uimaj-ep-runtime</artifactId>
+      <version>${uimaj-release-eclipse-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    
+    <!-- uima-as -->
+    <dependency>
+      <groupId>org.apache.uima</groupId>
+      <artifactId>uimaj-as-core</artifactId>
+      <version>${uimaj-as-release-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.uima</groupId>
+      <artifactId>uimaj-as-activemq</artifactId>
+      <version>${uimaj-as-release-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.uima</groupId>
+      <artifactId>uimaj-as-jms</artifactId>
+      <version>${uimaj-as-release-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.uima</groupId>
+      <artifactId>uimaj-ep-deployeditor</artifactId>
+      <version>${uimaj-as-release-eclipse-version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.uima</groupId>
+      <artifactId>uimaj-ep-runtime-deployeditor</artifactId>
+      <version>${uimaj-as-release-eclipse-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-pool</groupId>
+      <artifactId>commons-pool</artifactId>
+      <version>20030825.183949</version>
+      <scope>compile</scope>
+    </dependency> 
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring</artifactId>
+      <version>2.5.1</version>
+    </dependency> 
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>apache-activemq</artifactId>
+      <version>5.0.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.activemq</groupId>
+          <artifactId>activemq-console</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.activemq</groupId>
+          <artifactId>activemq-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.activemq</groupId>
+          <artifactId>activemq-web</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.activemq</groupId>
+          <artifactId>activeio-core</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency> 
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-optional</artifactId>
+      <version>5.0.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.activemq</groupId>
+          <artifactId>activemq-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.activemq</groupId>
+          <artifactId>activeio-core</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>3.1</version>
+    </dependency> 
+
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty</artifactId>
+      <version>6.1.7</version>
+    </dependency> 
+
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <version>6.1.7</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>servlet-api-2.5</artifactId>
+      <version>6.1.7</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>xmlpull</groupId>
+      <artifactId>xmlpull</artifactId>
+      <version>1.1.3.4d_b4_min</version>
+    </dependency> 
+  
+    <dependency>
+      <groupId>xstream</groupId>
+      <artifactId>xstream</artifactId>
+      <version>1.1.2</version>
+    </dependency>
+        
+    <dependency>
+      <groupId>net.sf.saxon</groupId>
+      <artifactId>saxon</artifactId>
+      <version>8.7</version>
+    </dependency>
 	</dependencies>
 	<build>
 		<pluginManagement>
@@ -96,7 +286,7 @@
 							<goal>javadoc</goal>
 						</goals>
 						<configuration>
-              <quiet>true</quiet>
+              <!--quiet>true</quiet-->
               <!-- needs to be 5 to process enums -->
 							<source>5</source>
 							<groups>
@@ -105,14 +295,28 @@
 									<packages>*</packages>
 								</group>
 							</groups>
-							<!--sourcepath>
+							<sourcepath>
                 ../uimaj-as-core/src/main/java
-              </sourcepath-->
-							<excludePackageNames>*.internal.*:*.impl.*</excludePackageNames>
+              </sourcepath>
+              <!-- *.aae makes javadoc fail -->
+							<excludePackageNames>
+                org.apache.uima.aae:
+                *.aae.controller:
+                *.aae.deploymentDescriptor:
+                *.aae.error:
+                *.aae.error.handler:
+                *.aae.handler:
+                *.aae.handler.input:
+                *.aae.jmx:
+                *.aae.message:
+                *.aae.monitor:
+                *.aae.monitor.statistics
+              </excludePackageNames>
 							<!-- add a few classes in impl packages that are directly used by user code -->
               <additionalparam>
                 ${basedir}/../uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaAsynchronousEngine.java
-                ${basedir}/../uimaj-as-core/src/main/java/org/apache/uima/aae.client.UimaEEStatusCallbackListener.java
+                ${basedir}/../uimaj-as-core/src/main/java/org/apache/uima/aae/client/UimaEEStatusCallbackListener.java
+                ${basedir}/../uimaj-as-core/src/main/java/org/apache/uima/aae/error/ErrorResult.java
               </additionalparam>
 							<doctitle>Apache UIMA Async Scaleout Java SDK ${pom.version} User-Level API Documentation</doctitle>
 							<windowtitle>Apache UIMA-AS Java SDK ${pom.version} User-Level API Documentation</windowtitle>
@@ -144,6 +348,16 @@
             </dependency>
 		      </dependencies>
         <executions>
+          <!--execution>
+            <id>makeTarget</id>
+            <phase>validate</phase>
+            <configuration>
+              <tasks>
+                <mkdir dir="target"/>
+              </tasks>
+            </configuration>
+            <goals><goal>run</goal></goals>
+          </execution-->
           <execution>
             <phase>package</phase>
             <configuration>
@@ -152,14 +366,14 @@
                 <ant dir="../uima-as-docbooks" inheritAll="false"/>
                 <!-- build eclipse update site -->
                   
-                <ant dir="../uimaj-eclipse-update-site">
+                <!--ant dir="../uimaj-eclipse-update-site"-->
                   <!-- property values from maven must be passed in 
                        using what looks like a redundant <property> statement.
                        See http://cwiki.apache.org/UIMA/maven-tips.html 
                          section on passing parameters to ant scripts -->
-                  <property name="uima-maven-build-eclipse-home" value="${uima-maven-build-eclipse-home}"/>                 
+                  <!--property name="uima-maven-build-eclipse-home" value="${uima-maven-build-eclipse-home}"/>                 
                   <property name="project.version" value="${uimaj-release-eclipse-version}"/>
-                </ant>            
+                </ant-->            
               </tasks>
             </configuration>
             <goals>

Propchange: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar  5 08:35:47 2008
@@ -0,0 +1 @@
+resources

Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/assembly/bin.xml?rev=633916&r1=633915&r2=633916&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/assembly/bin.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/assembly/bin.xml Wed Mar  5 08:35:47 2008
@@ -26,14 +26,9 @@
     <!--format>tar.bz2</format-->  
     <format>zip</format>
   </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
   
-  <!-- This tag is only supported in assembly plugin v2.2, which is
-  still in SNAPSHOT releases at this time.  Instead of having a dependency
-  on a SNAPSHOT, I've added apache-uima separately to each of the 
-  outputDirectory elements in this file.
-  <baseDirectory>apache-uima</baseDirectory>
-  -->
+  <baseDirectory>apache-uima-as</baseDirectory>
+  <includeBaseDirectory>true</includeBaseDirectory>
   
   <dependencySets>
     <!-- Because our artifactIds are uimaj-xxx but our jars are uima-xxx,
@@ -47,69 +42,74 @@
       <includes>
         <include>org.apache.uima:uimaj-core</include>
       </includes>
-      
+      <unpack>false</unpack> 
+      <scope>runtime</scope>
       <outputFileNameMapping>uima-core.jar</outputFileNameMapping>
-      <outputDirectory>/apache-uima-as/lib</outputDirectory>
+      <outputDirectory>lib</outputDirectory>
+      <useProjectArtifact>false</useProjectArtifact>
     </dependencySet>
+
     <dependencySet>
       <includes>
         <include>org.apache.uima:uimaj-cpe</include>
       </includes>
-      
       <outputFileNameMapping>uima-cpe.jar</outputFileNameMapping>
-      <outputDirectory>/apache-uima-as/lib</outputDirectory>
+      <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>/apache-uima-as/lib</outputDirectory>
+      <outputDirectory>lib</outputDirectory>
+      <useProjectArtifact>false</useProjectArtifact>
     </dependencySet>
+    
     <dependencySet>
       <includes>
         <include>org.apache.uima:uimaj-examples</include>
       </includes>
-      
       <outputFileNameMapping>uima-examples.jar</outputFileNameMapping>
-      <outputDirectory>/apache-uima-as/lib</outputDirectory>
+      <outputDirectory>lib</outputDirectory>
+      <useProjectArtifact>false</useProjectArtifact>
     </dependencySet>
+    
     <dependencySet>
       <includes>
         <include>org.apache.uima:uimaj-tools</include>
       </includes>
-      
-      
       <outputFileNameMapping>uima-tools.jar</outputFileNameMapping>
-      <outputDirectory>/apache-uima-as/lib</outputDirectory>
+      <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>/apache-uima-as/lib</outputDirectory>
+      <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>/apache-uima-as/lib</outputDirectory>
+      <outputDirectory>lib</outputDirectory>
+      <useProjectArtifact>false</useProjectArtifact>
     </dependencySet>
+    
     <dependencySet>
       <includes>
         <include>org.apache.uima:jVinci</include>
       </includes>
-      
-      
       <outputFileNameMapping>jVinci.jar</outputFileNameMapping>
-      <outputDirectory>/apache-uima-as/lib</outputDirectory>
+      <outputDirectory>lib</outputDirectory>
+      <useProjectArtifact>false</useProjectArtifact>
     </dependencySet>
     
     <!-- UIMA-AS -->
@@ -119,32 +119,48 @@
         <include>org.apache.uima:uimaj-as-core</include>
         <include>org.apache.uima:uimaj-as-jms</include>
       </includes>      
-      
-      <outputFileNameMapping>${artifactId}.jar</outputFileNameMapping>
-      <outputDirectory>/apache-uima-as/lib</outputDirectory>
+      <outputFileNameMapping>${artifact.artifactId}.jar</outputFileNameMapping>
+      <outputDirectory>lib</outputDirectory>
+      <useProjectArtifact>false</useProjectArtifact>
     </dependencySet>
+    <!--dependencySet>
+      <includes>
+        <include>org.apache.uima:uimaj-as-core</include>
+      </includes>      
+      <outputFileNameMapping>uimaj-as-core.jar</outputFileNameMapping>
+      <outputDirectory>lib</outputDirectory>
+      <useProjectArtifact>false</useProjectArtifact>
+    </dependencySet>
+    <dependencySet>
+      <includes>
+        <include>org.apache.uima:uimaj-as-jms</include>
+      </includes>      
+      <outputFileNameMapping>uimaj-as-jms.jar</outputFileNameMapping>
+      <outputDirectory>lib</outputDirectory>
+      <useProjectArtifact>false</useProjectArtifact>
+    </dependencySet-->
     
     <!-- UIMA-AS included other projects -->
 
     <dependencySet>
       <includes>
-        <include>commons-httpclient:commons-httpclient:3.1</include>
-        <include>org.mortbay.jetty:jetty:6.1.7</include>
-        <include>org.mortbay.jetty:jetty-util:6.1.7</include>
-        <include>org.mortbay.jetty:servlet-api-2.5:6.1.7</include>
-        <include>xmlpull:xmlpull:1.1.3.4d_b4_min</include>
-        <include>xstream:xstream:1.1.2</include>
-        <include>org.springframework:spring:2.5.1</include>
-        <include>commons-pool:commons-pool:20030825.183949</include>
-        <include>org.apache.activemq:apache-activemq:5.0.0</include>
-        <include>net.sf.saxon:saxon:8.7</include>
+        <include>commons-httpclient:commons-httpclient</include>
+        <include>org.mortbay.jetty:jetty</include>
+        <include>org.mortbay.jetty:jetty-util</include>
+        <include>org.mortbay.jetty:servlet-api-2.5</include>
+        <include>xmlpull:xmlpull</include>
+        <include>xstream:xstream</include>
+        <include>org.springframework:spring</include>
+        <include>commons-pool:commons-pool</include>
+        <include>org.apache.activemq:apache-activemq</include>
+        <include>net.sf.saxon:saxon</include>
       </includes>
       <useTransitiveDependencies>false</useTransitiveDependencies>
-      <outputDirectory>/apache-uima-as/lib</outputDirectory>
+      <outputDirectory>lib</outputDirectory>
+      <useProjectArtifact>false</useProjectArtifact>
+      <outputFileNameMapping>${artifact.artifactId}.jar</outputFileNameMapping>
     </dependencySet>
-
-              
-    
+   
     <!-- Copy each eclipse plugin into the /eclipsePlugins dir of the distribution -->
     <dependencySet>
       <includes>
@@ -159,9 +175,8 @@
         <include>org.apache.uima:uimaj-ep-runtime-deployeditor</include>
         
       </includes>
-      
-      
-      <outputDirectory>/apache-uima-as/eclipsePlugins</outputDirectory>
+      <outputDirectory>eclipsePlugins</outputDirectory>
+      <useProjectArtifact>false</useProjectArtifact>
     </dependencySet>
   </dependencySets>
   
@@ -170,12 +185,12 @@
     <!-- base UIMA -->
     <fileSet>
       <directory>../uimaj-distr/src/main/scripts</directory>
-      <outputDirectory>/apache-uima-as/bin</outputDirectory>
+      <outputDirectory>bin</outputDirectory>
       <fileMode>755</fileMode>
     </fileSet>
     <fileSet>
       <directory>../uimaj-distr/src/main/properties</directory>
-      <outputDirectory>/apache-uima-as/config</outputDirectory>
+      <outputDirectory>config</outputDirectory>
     </fileSet>
     <!-- there is one readme-file -->
     <!--fileSet>
@@ -186,21 +201,33 @@
     <!-- uima-as -->
     <fileSet>
       <directory>src/main/scripts</directory>
-      <outputDirectory>/apache-uima-as/bin</outputDirectory>
+      <outputDirectory>bin</outputDirectory>
       <fileMode>755</fileMode>
     </fileSet>
     <fileSet>
       <directory>src/main/properties</directory>
-      <outputDirectory>/apache-uima-as/config</outputDirectory>
+      <outputDirectory>config</outputDirectory>
     </fileSet>
     <fileSet>
       <directory>src/main/readme</directory>
-      <outputDirectory>/apache-uima</outputDirectory>
+      <excludes>
+        <!-- top level README being replaced by one from readme_src -->
+        <exclude>README</exclude>
+      </excludes>
+      <!-- to get things into the base dir, use this form
+           If you use <outputDirectory>.</outputDirectory> - 
+           it also puts into the base dir, but creates an
+           extra (empty) version of the base dir - probably 
+           a bug. -->
+      <outputDirectory></outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>/src/main/readme_src</directory>
     </fileSet>
     
     <fileSet>
       <directory>target/site/apidocs</directory>
-      <outputDirectory>/apache-uima-as/docs/api</outputDirectory>
+      <outputDirectory>docs/api</outputDirectory>
       <excludes>
         <exclude>options</exclude>
         <exclude>packages</exclude>
@@ -210,7 +237,7 @@
     </fileSet>
     <fileSet>
       <directory>../uima-as-docbooks/target</directory>
-      <outputDirectory>/apache-uima-as/docs/html</outputDirectory>
+      <outputDirectory>docs/html</outputDirectory>
       <includes>
         <include>images/**</include>
         <!--include>index.html</include-->
@@ -219,88 +246,67 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>../uima-as-docbooks/target/overview_and_setup</directory>
-      <outputDirectory>/apache-uima-as/docs/pdf</outputDirectory>
+      <directory>../uima-as-docbooks/target/uima_async_scaleout</directory>
+      <outputDirectory>docs/pdf</outputDirectory>
       <includes>
         <include>uima_async_scaleout.pdf</include>
       </includes>
     </fileSet>
-    <fileSet>
-      <directory>../uima-docbooks/target/tutorials_and_users_guides</directory>
-      <outputDirectory>/apache-uima-as/docs/pdf</outputDirectory>
-      <includes>
-        <include>tutorials_and_users_guides.pdf</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>../uima-docbooks/target/tools</directory>
-      <outputDirectory>/apache-uima-as/docs/pdf</outputDirectory>
-      <includes>
-        <include>tools.pdf</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>../uima-docbooks/target/references</directory>
-      <outputDirectory>/apache-uima-as/docs/pdf</outputDirectory>
-      <includes>
-        <include>references.pdf</include>
-      </includes>
-    </fileSet>
     <fileSet>
       <directory>../uimaj-examples/src/main/java</directory>
-      <outputDirectory>/apache-uima-as/examples/src</outputDirectory>
+      <outputDirectory>examples/src</outputDirectory>
       <excludes>
         <exclude> org/apache/uima/examples/xmi/XmiEcoreCasConsumer.java</exclude>
       </excludes>
     </fileSet>
     <fileSet>
       <directory>../uimaj-examples/src/main/data</directory>
-      <outputDirectory>/apache-uima-as/examples/data</outputDirectory>
+      <outputDirectory>examples/data</outputDirectory>
     </fileSet>
     <fileSet>
       <directory>../uimaj-examples/src/main/deploy</directory>
-      <outputDirectory>/apache-uima-as/examples/deploy</outputDirectory>
+      <outputDirectory>examples/deploy</outputDirectory>
     </fileSet>
     <fileSet>
       <directory>../uimaj-examples/src/main/descriptors</directory>
-      <outputDirectory>/apache-uima-as/examples/descriptors</outputDirectory>
+      <outputDirectory>examples/descriptors</outputDirectory>
     </fileSet>
     <fileSet>
       <directory>../uimaj-examples/src/main/opennlp_wrappers</directory>
-      <outputDirectory>/apache-uima-as/examples/opennlp_wrappers</outputDirectory>
+      <outputDirectory>examples/opennlp_wrappers</outputDirectory>
     </fileSet>
     <fileSet>
       <directory>../uimaj-examples/src/main/resources</directory>
-      <outputDirectory>/apache-uima-as/examples/resources</outputDirectory>
+      <outputDirectory>examples/resources</outputDirectory>
     </fileSet>
     <fileSet>
       <directory>../uimaj-examples/src/main/run_configuration</directory>
-      <outputDirectory>/apache-uima-as/examples/run_configuration</outputDirectory>
+      <outputDirectory>examples/run_configuration</outputDirectory>
     </fileSet>
   </fileSets>
   <files>
     <file>
       <source>../uimaj-examples/src/main/eclipseProject/project</source>
-      <outputDirectory>/apache-uima-as/examples</outputDirectory>
+      <outputDirectory>examples</outputDirectory>
       <destName>.project</destName>
-      <fileMode>420</fileMode> <!-- workaround for bug MASSEMBLY-173 -->
+      <fileMode>644</fileMode> <!-- workaround for bug MASSEMBLY-173 -->
     </file>
     <file>
       <source>../uimaj-examples/src/main/eclipseProject/classpath</source>
-      <outputDirectory>/apache-uima-as/examples</outputDirectory>
+      <outputDirectory>examples</outputDirectory>
       <destName>.classpath</destName>
-      <fileMode>420</fileMode> <!-- workaround for bug MASSEMBLY-173 -->
+      <fileMode>644</fileMode> <!-- workaround for bug MASSEMBLY-173 -->
     </file>
     <file>
       <source> ../uimaj-examples/src/main/eclipseProject/ecore_src_readme.txt</source>
-      <outputDirectory>/apache-uima-as/examples/ecore_src</outputDirectory>
+      <outputDirectory>examples/ecore_src</outputDirectory>
       <destName>readme.txt</destName>
-      <fileMode>420</fileMode> <!-- workaround for bug MASSEMBLY-173 -->
+      <fileMode>644</fileMode> <!-- workaround for bug MASSEMBLY-173 -->
     </file>
     <file>
       <source>../uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiEcoreCasConsumer.java</source>
-      <outputDirectory>/apache-uima-as/examples/ecore_src/org/apache/uima/examples/xmi</outputDirectory>
-      <fileMode>420</fileMode> <!-- workaround for bug MASSEMBLY-173 -->
+      <outputDirectory>examples/ecore_src/org/apache/uima/examples/xmi</outputDirectory>
+      <fileMode>644</fileMode> <!-- workaround for bug MASSEMBLY-173 -->
     </file>
   </files>
 </assembly>

Modified: incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/assembly/src.xml?rev=633916&r1=633915&r2=633916&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/assembly/src.xml (original)
+++ incubator/uima/sandbox/trunk/uima-as/uima-as-distr/src/main/assembly/src.xml Wed Mar  5 08:35:47 2008
@@ -27,12 +27,13 @@
     <format>zip</format>
   </formats>
   
+  <baseDirectory>apache-uima-as</baseDirectory>
   <includeBaseDirectory>true</includeBaseDirectory>
   
   <fileSets>
     <fileSet>
-      <directory>.</directory>
-      <outputDirectory>/uimaj-distr</outputDirectory>
+      <directory>/apache.uima-as</directory>
+      <outputDirectory>uimaj-distr</outputDirectory>
       <includes>
         <include>src/**</include>
         <include>pom.xml</include>
@@ -40,32 +41,29 @@
     </fileSet>
     <fileSet>
       <directory>src/main/readme</directory>
-      <outputDirectory>/</outputDirectory>
+      <!-- to get things into the base dir, use this form
+           If you use <outputDirectory>.</outputDirectory> - 
+           it also puts into the base dir, but creates an
+           extra (empty) version of the base dir - probably 
+           a bug. -->
+      <outputDirectory></outputDirectory>
       <excludes>
-		  <exclude>README</exclude>
+  		  <exclude>README</exclude>
       </excludes>
     </fileSet>
     <fileSet>
-      <directory>src/main/readme_src</directory>
-      <outputDirectory>/</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>../uima-docbooks</directory>
-      <outputDirectory>/uima-docbooks</outputDirectory>
+      <directory>../uima-as-docbooks</directory>
+      <outputDirectory>uima-as-docbooks</outputDirectory>
       <excludes>
         <exclude>target/**</exclude>
-        <!-- Directories does not exist -->
-        <!-- <exclude>docbook/**</exclude>  -->
-        <!-- <exclude>lib/**</exclude> -->
-        <!-- <exclude>Source_UIMA_SDK_Guide_Ref/**</exclude> -->
         <exclude>.*</exclude>   
-        <exclude>LICENSE.txt</exclude>
-        <exclude>src/styles/titlepage/*.xsl</exclude>     
+        <exclude>src/styles/titlepage/*.xsl</exclude>
+        <exclude>src/olink/**/*.db</exclude>     
       </excludes>
     </fileSet>   
     <fileSet>
       <directory>../uima-docbook-tool</directory>
-      <outputDirectory>/uima-docbook-tool</outputDirectory>
+      <outputDirectory>uima-docbook-tool</outputDirectory>
       <includes>
         <include>build/**</include>
         <include>catalog/**</include>
@@ -79,160 +77,62 @@
     </fileSet>
     <fileSet>
       <directory>../uimaj-eclipse-update-site</directory>
-      <outputDirectory>/uimaj-eclipse-update-site</outputDirectory>
+      <outputDirectory>uimaj-eclipse-update-site</outputDirectory>
       <includes>
         <include>features/**</include>
-        <include>plugins/**</include>
+        <!--include>plugins/**</include-->
         <include>web/**</include>
         <include>build.xml</include>
         <include>index.html</include>
         <include>site.xml</include>
       </includes>
-    </fileSet>    
-    <fileSet>
-      <directory>../uimaj-eclipse-feature-runtime</directory>
-      <outputDirectory>/uimaj-eclipse-feature-runtime</outputDirectory>
-      <includes>
-        <include>build.properties</include>
-        <include>feature.properties</include>
-        <include>feature.xml</include>
-      </includes>
-    </fileSet>    
-    <fileSet>
-      <directory>../uimaj-eclipse-feature-tools</directory>
-      <outputDirectory>/uimaj-eclipse-feature-tools</outputDirectory>
-      <includes>
-        <include>build.properties</include>
-        <include>feature.properties</include>
-        <include>feature.xml</include>
-      </includes>
-    </fileSet>    
-    <fileSet>
-      <directory>../uimaj</directory>
-      <outputDirectory>/uimaj</outputDirectory>
-      <includes>
-        <include>pom.xml</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>../jVinci</directory>
-      <outputDirectory>/jVinci</outputDirectory>
-      <includes>
-        <include>src/**</include>
-        <include>pom.xml</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>../uimaj-adapter-soap</directory>
-      <outputDirectory>/uimaj-adapter-soap</outputDirectory>
-      <includes>
-        <include>src/**</include>
-        <include>pom.xml</include>
-      </includes>
     </fileSet>
     <fileSet>
-      <directory>../uimaj-adapter-vinci</directory>
-      <outputDirectory>/uimaj-adapter-vinci</outputDirectory>
-      <includes>
-        <include>src/**</include>
-        <include>pom.xml</include>
-      </includes>
-    </fileSet>    
-    <fileSet>
-      <directory>../uimaj-component-test-util</directory>
-      <outputDirectory>/uimaj-component-test-util</outputDirectory>
+      <directory>../uimaj-ep-deployeditor</directory>
+      <outputDirectory>uimaj-ep-deployeditor</outputDirectory>
       <includes>
         <include>src/**</include>
         <include>pom.xml</include>
       </includes>
     </fileSet>  
     <fileSet>
-      <directory>../uimaj-core</directory>
-      <outputDirectory>/uimaj-core</outputDirectory>
-      <includes>
-        <include>src/**</include>
-        <include>pom.xml</include>
-      </includes>
-    </fileSet>  
-    <fileSet>
-      <directory>../uimaj-cpe</directory>
-      <outputDirectory>/uimaj-cpe</outputDirectory>
-      <includes>
-        <include>src/**</include>
-        <include>pom.xml</include>
-      </includes>
-    </fileSet>      
-    <fileSet>
-      <directory>../uimaj-document-annotation</directory>
-      <outputDirectory>/uimaj-document-annotation</outputDirectory>
-      <includes>
-        <include>src/**</include>
-        <include>pom.xml</include>
-      </includes>
-    </fileSet>   
-    <fileSet>
-      <directory>../uimaj-ep-configurator</directory>
-      <outputDirectory>/uimaj-ep-configurator</outputDirectory>
-      <includes>
-        <include>src/**</include>
-        <include>pom.xml</include>
-      </includes>
-    </fileSet>      
-    <fileSet>
-      <directory>../uimaj-ep-debug</directory>
-      <outputDirectory>/uimaj-ep-debug</outputDirectory>
-      <includes>
-        <include>src/**</include>
-        <include>pom.xml</include>
-      </includes>
-    </fileSet>       
-    <fileSet>
-      <directory>../uimaj-ep-jcasgen</directory>
-      <outputDirectory>/uimaj-ep-jcasgen</outputDirectory>
-      <includes>
-        <include>src/**</include>
-        <include>pom.xml</include>
-      </includes>
-    </fileSet> 
-    <fileSet>
-      <directory>../uimaj-ep-pear-packager</directory>
-      <outputDirectory>/uimaj-ep-pear-packager</outputDirectory>
+      <directory>../uimaj-ep-runtime-deployeditor</directory>
+      <outputDirectory>uimaj-ep-runtime-deployeditor</outputDirectory>
       <includes>
         <include>src/**</include>
         <include>pom.xml</include>
       </includes>
     </fileSet>     
     <fileSet>
-      <directory>../uimaj-ep-runtime</directory>
-      <outputDirectory>/uimaj-ep-runtime</outputDirectory>
+      <directory>../uimaj-as</directory>
+      <outputDirectory>uimaj-as</outputDirectory>
       <includes>
-        <include>src/**</include>
         <include>pom.xml</include>
       </includes>
-    </fileSet>      
+    </fileSet>
     <fileSet>
-      <directory>../uimaj-examples</directory>
-      <outputDirectory>/uimaj-examples</outputDirectory>
+      <directory>../uimaj-as-activemq</directory>
+      <outputDirectory>uimaj-as-activemq</outputDirectory>
       <includes>
         <include>src/**</include>
         <include>pom.xml</include>
       </includes>
-    </fileSet>      
+    </fileSet>
     <fileSet>
-      <directory>../uimaj-test-util</directory>
-      <outputDirectory>/uimaj-test-util</outputDirectory>
+      <directory>../uimaj-as-core</directory>
+      <outputDirectory>uimaj-as-core</outputDirectory>
       <includes>
         <include>src/**</include>
         <include>pom.xml</include>
       </includes>
-    </fileSet>     
+    </fileSet>
     <fileSet>
-      <directory>../uimaj-tools</directory>
-      <outputDirectory>/uimaj-tools</outputDirectory>
+      <directory>../uimaj-as-jms</directory>
+      <outputDirectory>uimaj-as-jms</outputDirectory>
       <includes>
         <include>src/**</include>
         <include>pom.xml</include>
       </includes>
-    </fileSet>       
+    </fileSet>    
   </fileSets>  
 </assembly>