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/28 17:28:08 UTC

svn commit: r819586 - in /incubator/uima/sandbox/trunk/SandboxDistr: DISCLAIMER LICENSE.txt NOTICE.txt annotator-package/assembly/bin.xml annotator-package/assembly/src.xml annotator-package/readme/LICENSE pom.xml

Author: schor
Date: Mon Sep 28 15:28:08 2009
New Revision: 819586

URL: http://svn.apache.org/viewvc?rev=819586&view=rev
Log:
UIMA-1546 remove unnecessary LIC/NOT/DIS files from top level of sandbox distr, and also slight renaming improvement of assembly generation - rename target/bin and target/src to target/assembly-bin and target/assembly-src.  Add to License used for bin assembly the license for open office XML schemas (used in Tika)

Removed:
    incubator/uima/sandbox/trunk/SandboxDistr/DISCLAIMER
    incubator/uima/sandbox/trunk/SandboxDistr/LICENSE.txt
    incubator/uima/sandbox/trunk/SandboxDistr/NOTICE.txt
Modified:
    incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/assembly/bin.xml
    incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/assembly/src.xml
    incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/LICENSE
    incubator/uima/sandbox/trunk/SandboxDistr/pom.xml

Modified: incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/assembly/bin.xml?rev=819586&r1=819585&r2=819586&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/assembly/bin.xml (original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/assembly/bin.xml Mon Sep 28 15:28:08 2009
@@ -36,59 +36,59 @@
     <!-- Add files for all the Sandbox components being released -->	
     <fileSet>
       <outputDirectory>/apache-uima/addons/annotator</outputDirectory>            
-      <directory>../../BSFAnnotator/target/bin</directory>
+      <directory>../../BSFAnnotator/target/assembly-bin</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons/annotator</outputDirectory>            
-      <directory>../../ConceptMapper/target/bin</directory>
+      <directory>../../ConceptMapper/target/assembly-bin</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons/annotator</outputDirectory>            
-      <directory>../../ConfigurableFeatureExtractor/target/bin</directory>
+      <directory>../../ConfigurableFeatureExtractor/target/assembly-bin</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
-      <directory>../../DictionaryAnnotator/target/bin</directory>
+      <directory>../../DictionaryAnnotator/target/assembly-bin</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons</outputDirectory>
-      <directory>../../FsVariables/target/bin</directory>
+      <directory>../../FsVariables/target/assembly-bin</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons/annotator</outputDirectory>            
-      <directory>../../Lucas/target/bin</directory>
+      <directory>../../Lucas/target/assembly-bin</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
-      <directory>../../OpenCalaisAnnotator/target/bin</directory>
+      <directory>../../OpenCalaisAnnotator/target/assembly-bin</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons</outputDirectory>
-      <directory>../../PearPackagingAntTask/target/bin</directory>
+      <directory>../../PearPackagingAntTask/target/assembly-bin</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons/annotator</outputDirectory>            
-      <directory>../../RegularExpressionAnnotator/target/bin</directory>
+      <directory>../../RegularExpressionAnnotator/target/assembly-bin</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons</outputDirectory>
-      <directory>../../SimpleServer/target/bin</directory>
+      <directory>../../SimpleServer/target/assembly-bin</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
-      <directory>../../SnowballAnnotator/target/bin</directory>
+      <directory>../../SnowballAnnotator/target/assembly-bin</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
-      <directory>../../Tagger/target/bin</directory>
+      <directory>../../Tagger/target/assembly-bin</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
-      <directory>../../TikaAnnotator/target/bin</directory>
+      <directory>../../TikaAnnotator/target/assembly-bin</directory>
     </fileSet>
 		<fileSet>
       <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
-			<directory>../../WhitespaceTokenizer/target/bin</directory>
+			<directory>../../WhitespaceTokenizer/target/assembly-bin</directory>
     </fileSet>		
 	</fileSets>
 </assembly>
\ No newline at end of file

Modified: incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/assembly/src.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/assembly/src.xml?rev=819586&r1=819585&r2=819586&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/assembly/src.xml (original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/assembly/src.xml Mon Sep 28 15:28:08 2009
@@ -93,59 +93,59 @@
     <!-- Add files for all the Sandbox components being released -->  
     <fileSet>
       <outputDirectory>/apache-uima/addons/annotator</outputDirectory>            
-      <directory>../../BSFAnnotator/target/src</directory>
+      <directory>../../BSFAnnotator/target/assembly-src</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons/annotator</outputDirectory>            
-      <directory>../../ConceptMapper/target/src</directory>
+      <directory>../../ConceptMapper/target/assembly-src</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons/annotator</outputDirectory>            
-      <directory>../../ConfigurableFeatureExtractor/target/src</directory>
+      <directory>../../ConfigurableFeatureExtractor/target/assembly-src</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
-      <directory>../../DictionaryAnnotator/target/src</directory>
+      <directory>../../DictionaryAnnotator/target/assembly-src</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons</outputDirectory>
-      <directory>../../FsVariables/target/src</directory>
+      <directory>../../FsVariables/target/assembly-src</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons/annotator</outputDirectory>            
-      <directory>../../Lucas/target/src</directory>
+      <directory>../../Lucas/target/assembly-src</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
-      <directory>../../OpenCalaisAnnotator/target/src</directory>
+      <directory>../../OpenCalaisAnnotator/target/assembly-src</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons</outputDirectory>
-      <directory>../../PearPackagingAntTask/target/src</directory>
+      <directory>../../PearPackagingAntTask/target/assembly-src</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons/annotator</outputDirectory>            
-      <directory>../../RegularExpressionAnnotator/target/src</directory>
+      <directory>../../RegularExpressionAnnotator/target/assembly-src</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons</outputDirectory>
-      <directory>../../SimpleServer/target/src</directory>
+      <directory>../../SimpleServer/target/assembly-src</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
-      <directory>../../SnowballAnnotator/target/src</directory>
+      <directory>../../SnowballAnnotator/target/assembly-src</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
-      <directory>../../Tagger/target/src</directory>
+      <directory>../../Tagger/target/assembly-src</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
-      <directory>../../TikaAnnotator/target/src</directory>
+      <directory>../../TikaAnnotator/target/assembly-src</directory>
     </fileSet>
     <fileSet>
       <outputDirectory>/apache-uima/addons/annotator</outputDirectory>
-      <directory>../../WhitespaceTokenizer/target/src</directory>
+      <directory>../../WhitespaceTokenizer/target/assembly-src</directory>
     </fileSet>    
 		
 	</fileSets>

Modified: incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/LICENSE
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/LICENSE?rev=819586&r1=819585&r2=819586&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/LICENSE (original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/readme/LICENSE Mon Sep 28 15:28:08 2009
@@ -1221,4 +1221,286 @@
       The Initial Developer of the Original Code is ________________________. Portions created by ______________________ are Copyright (C) ______ _______________________. All Rights Reserved.
 
       Contributor(s): ______________________________________.''   
+   
+   
+   
+Office Open XML schemas (ooxml-schemas-1.0.jar)
+
+    The Office Open XML schema definitions used by Apache POI are
+    a part of the Office Open XML ECMA Specification (ECMA-376, [1]).
+    As defined in section 9.4 of the ECMA bylaws [2], this specification
+    is available to all interested parties without restriction:
+
+        9.4 All documents when approved shall be made available to
+            all interested parties without restriction.
+
+    Furthermore, both Microsoft and Adobe have granted patent licenses
+    to this work [3,4,5].
+
+    [1] http://www.ecma-international.org/publications/standards/Ecma-376.htm
+    [2] http://www.ecma-international.org/memento/Ecmabylaws.htm
+    [3] http://www.microsoft.com/interop/osp/
+    [4] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/ECMA-376%20Edition%201%20Microsoft%20Patent%20Declaration.pdf
+    [5] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/ga-2006-191.pdf
+
+DOM4J library (dom4j-1.6.1.jar)
+
+    Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
+
+    Redistribution and use of this software and associated documentation
+    ("Software"), with or without modification, are permitted provided
+    that the following conditions are met:
+
+    1. Redistributions of source code must retain copyright
+       statements and notices.  Redistributions must also contain a
+       copy of this document.
+
+    2. Redistributions in binary form must reproduce the
+       above copyright notice, this list of conditions and the
+       following disclaimer in the documentation and/or other
+       materials provided with the distribution.
+
+    3. The name "DOM4J" must not be used to endorse or promote
+       products derived from this Software without prior written
+       permission of MetaStuff, Ltd.  For written permission,
+       please contact dom4j-info@metastuff.com.
+
+    4. Products derived from this Software may not be called "DOM4J"
+       nor may "DOM4J" appear in their names without prior written
+       permission of MetaStuff, Ltd. DOM4J is a registered
+       trademark of MetaStuff, Ltd.
+
+    5. Due credit should be given to the DOM4J Project - 
+       http://www.dom4j.org
+ 
+    THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
+    ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+    NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+    METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+    INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+    STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+    OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE 
+PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION 
+OF THE PROGRAM CONSTITUTES RECIPIENT’S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+    a) in the case of the initial Contributor, the initial code and 
+       documentation distributed under this Agreement, and
+    b) in the case of each subsequent Contributor:
+
+    i)changes to the Program, and
+
+    ii)additions to the Program;
+
+    where such changes and/or additions to the Program originate from 
+    and are distributed by that particular Contributor. 
+    A Contribution 'originates' from a Contributor if it was added to the 
+    Program by such Contributor itself or anyone acting on such 
+    Contributor’s behalf. Contributions do not include additions to the 
+    Program which: (i) are separate modules of software distributed in 
+    conjunction with the Program under their own license agreement, and 
+    (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor 
+which are necessarily infringed by the use or sale of its Contribution 
+alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, 
+including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants 
+Recipient a non-exclusive, worldwide, royalty-free copyright license to 
+reproduce, prepare derivative works of, publicly display, publicly perform, 
+distribute and sublicense the Contribution of such Contributor, if any, 
+and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants 
+Recipient a non-exclusive, worldwide, royalty-free patent license under 
+Licensed Patents to make, use, sell, offer to sell, import and otherwise 
+transfer the Contribution of such Contributor, if any, in source code and 
+object code form. This patent license shall apply to the combination of the 
+Contribution and the Program if, at the time the Contribution is added by 
+the Contributor, such addition of the Contribution causes such combination 
+to be covered by the Licensed Patents. The patent license shall not apply 
+to any other combinations which include the Contribution. No hardware per 
+se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses 
+to its Contributions set forth herein, no assurances are provided by any 
+Contributor that the Program does not infringe the patent or other 
+intellectual property rights of any other entity. Each Contributor disclaims 
+any liability to Recipient for claims brought by any other entity based on 
+infringement of intellectual property rights or otherwise. As a condition 
+to exercising the rights and licenses granted hereunder, each Recipient 
+hereby assumes sole responsibility to secure any other intellectual property 
+rights needed, if any. For example, if a third party patent license is 
+required to allow Recipient to distribute the Program, it is Recipient’s 
+responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient 
+copyright rights in its Contribution, if any, to grant the copyright license 
+set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form 
+under its own license agreement, provided that:
+
+    a) it complies with the terms and conditions of this Agreement; and
+
+    b) its license agreement:
+
+    i) effectively disclaims on behalf of all Contributors all warranties 
+    and conditions, express and implied, including warranties or conditions 
+    of title and non-infringement, and implied warranties or conditions of 
+    merchantability and fitness for a particular purpose;
+
+    ii) effectively excludes on behalf of all Contributors all liability 
+    for damages, including direct, indirect, special, incidental and consequential 
+    damages, such as lost profits;
+
+    iii) states that any provisions which differ from this Agreement are 
+    offered by that Contributor alone and not by any other party; and
+
+    iv) states that source code for the Program is available from such 
+    Contributor, and informs licensees how to obtain it in a reasonable 
+    manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+    a) it must be made available under this Agreement; and
+
+    b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained 
+within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, 
+if any, in a manner that reasonably allows subsequent Recipients to identify 
+the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities 
+with respect to end users, business partners and the like. While this 
+license is intended to facilitate the commercial use of the Program, the 
+Contributor who includes the Program in a commercial product offering 
+should do so in a manner which does not create potential liability for 
+other Contributors. Therefore, if a Contributor includes the Program 
+in a commercial product offering, such Contributor ("Commercial Contributor") 
+hereby agrees to defend and indemnify every other Contributor 
+("Indemnified Contributor") against any losses, damages and costs 
+(collectively "Losses") arising from claims, lawsuits and other legal 
+actions brought by a third party against the Indemnified Contributor 
+to the extent caused by the acts or omissions of such Commercial Contributor 
+in connection with its distribution of the Program in a commercial 
+product offering. The obligations in this section do not apply to any 
+claims or Losses relating to any actual or alleged intellectual property 
+infringement. In order to qualify, an Indemnified Contributor must: a) 
+promptly notify the Commercial Contributor in writing of such claim, 
+and b) allow the Commercial Contributor to control, and cooperate with 
+the Commercial Contributor in, the defense and any related settlement 
+negotiations. The Indemnified Contributor may participate in any such 
+claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial 
+product offering, Product X. That Contributor is then a Commercial 
+Contributor. If that Commercial Contributor then makes performance 
+claims, or offers warranties related to Product X, those performance claims 
+and warranties are such Commercial Contributor’s responsibility alone. 
+Under this section, the Commercial Contributor would have to defend claims 
+against the other Contributors related to those performance claims and 
+warranties, and if a court requires any other Contributor to pay any 
+damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED 
+ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER 
+EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR 
+CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A 
+PARTICULAR PURPOSE. Each Recipient is solely responsible for determining 
+the appropriateness of using and distributing the Program and assumes all 
+risks associated with its exercise of rights under this Agreement , 
+including but not limited to the risks and costs of program errors, 
+compliance with applicable laws, damage to or loss of data, programs or 
+equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR 
+ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, 
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING 
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF 
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION 
+OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN 
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under 
+applicable law, it shall not affect the validity or enforceability of the 
+remainder of the terms of this Agreement, and without further action by the 
+parties hereto, such provision shall be reformed to the minimum extent 
+necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including 
+a cross-claim or counterclaim in a lawsuit) alleging that the Program 
+itself (excluding combinations of the Program with other software or 
+hardware) infringes such Recipient’s patent(s), then such Recipient’s 
+rights granted under Section 2(b) shall terminate as of the date such 
+litigation is filed.
+
+All Recipient’s rights under this Agreement shall terminate if it fails 
+to comply with any of the material terms or conditions of this Agreement 
+and does not cure such failure in a reasonable period of time after becoming 
+aware of such noncompliance. If all Recipient’s rights under this Agreement 
+terminate, Recipient agrees to cease use and distribution of the Program as 
+soon as reasonably practicable. However, Recipient’s obligations under this 
+Agreement and any licenses granted by Recipient relating to the Program shall 
+continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but 
+in order to avoid inconsistency the Agreement is copyrighted and may only 
+be modified in the following manner. The Agreement Steward reserves the 
+right to publish new versions (including revisions) of this Agreement from 
+time to time. No one other than the Agreement Steward has the right to 
+modify this Agreement. The Eclipse Foundation is the initial Agreement 
+Steward. The Eclipse Foundation may assign the responsibility to serve 
+as the Agreement Steward to a suitable separate entity. Each new version 
+of the Agreement will be given a distinguishing version number. The Program 
+(including Contributions) may always be distributed subject to the version 
+of the Agreement under which it was received. In addition, after a new 
+version of the Agreement is published, Contributor may elect to distribute 
+the Program (including its Contributions) under the new version. Except as 
+expressly stated in Sections 2(a) and 2(b) above, Recipient receives no 
+rights or licenses to the intellectual property of any Contributor under 
+this Agreement, whether expressly, by implication, estoppel or otherwise. 
+All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the 
+intellectual property laws of the United States of America. No party to 
+this Agreement will bring a legal action under this Agreement more than 
+one year after the cause of action arose. Each party waives its rights 
+to a jury trial in any resulting litigation. 
    
\ No newline at end of file

Modified: incubator/uima/sandbox/trunk/SandboxDistr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/pom.xml?rev=819586&r1=819585&r2=819586&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/pom.xml (original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/pom.xml Mon Sep 28 15:28:08 2009
@@ -47,7 +47,7 @@
          1) have the project's POM declare the dependencies 
          2) at project build time the dependencies and their dependencies (recursively) are
             fetched from maven repos and put into
-              target/bin/<artifactId>/lib
+              target/assembly-bin/<artifactId>/lib
          3) This lib/ dir is included in the bin distribution build
             
          2) If the child pom is preparing a PEAR, the lib dir is included in the 
@@ -56,7 +56,7 @@
        
   <dependencyManagement>
     <dependencies>
-      <!-- switch uima jars scope to provided to 
+      <!-- change the default uima jars scope to "provided" to 
            prevent the dependency plugin from including them -->
       <dependency>
         <groupId>org.apache.uima</groupId>
@@ -113,9 +113,9 @@
 
     <!-- Common operations done while building all sandbox projects 
            - build the docs (if build_documentation.xml exists)
-           - build the target/bin and target/src dirs used by later assembly steps
+           - build the target/assembly-bin and target/assembly-src dirs used by later assembly steps
              - these dirs are layed out as follows:
-               target/bin/artifactId
+               target/assembly-bin/artifactId
                    LIC/NOT/DIS files
                    readme's  (if exist)
                    pear file (if exist)
@@ -124,7 +124,7 @@
                    desc      (if exist) sample descriptors
                    lib                  holds all jars including main one excluding -sources jar
                                             
-               target/src/artifactId
+               target/assembly-src/artifactId
                    LIC/NOT/DIS for source
                    pom.xml
                    build_documentation.xml (if exists)
@@ -161,13 +161,13 @@
         <artifactId>maven-dependency-plugin</artifactId>
         <inherited>true</inherited>
         <executions>
-          <!-- Copy the dependencies to the target/bin folder for the PEAR to copy -->
+          <!-- Copy the dependencies to the target/assembly-bin folder for the PEAR to copy -->
           <execution>
             <id>copy dependencies to lib</id>
             <goals><goal>copy-dependencies</goal></goals>
             <phase>process-resources</phase>
             <configuration>
-              <outputDirectory>target/bin/${artifactId}/lib</outputDirectory>
+              <outputDirectory>target/assembly-bin/${artifactId}/lib</outputDirectory>
               <includeScope>runtime</includeScope>
               <excludeScope>test</excludeScope>
             </configuration>
@@ -179,11 +179,11 @@
         <artifactId>maven-resources-plugin</artifactId>
         <executions>
           <execution>
-            <id>copy standard sandbox resources to bin</id>
+            <id>copy standard sandbox resources to assembly-bin</id>
             <goals><goal>copy-resources</goal></goals>
             <phase>process-resources</phase>  <!-- required -->
             <configuration>
-              <outputDirectory>${project.build.directory}/bin/${artifactId}</outputDirectory>
+              <outputDirectory>${project.build.directory}/assembly-bin/${artifactId}</outputDirectory>
               <resources>
                 <resource>
                   <directory>.</directory>
@@ -203,11 +203,11 @@
           </execution>
           
           <execution>
-            <id>copy standard sandbox target jar to bin</id>
+            <id>copy standard sandbox target jar to assembly-bin</id>
             <goals><goal>copy-resources</goal></goals>
             <phase>pre-integration-test</phase>  <!-- a phase after jar -->
             <configuration>
-              <outputDirectory>${project.build.directory}/bin/${artifactId}/lib</outputDirectory>
+              <outputDirectory>${project.build.directory}/assembly-bin/${artifactId}/lib</outputDirectory>
               <resources>
                 <resource>
                   <directory>${project.build.directory}</directory>
@@ -219,11 +219,11 @@
           </execution>
 
           <execution>
-            <id>copy standard sandbox target pear and docs to bin</id>
+            <id>copy standard sandbox target pear and docs to assembly-bin</id>
             <goals><goal>copy-resources</goal></goals>
             <phase>pre-integration-test</phase>  <!-- a phase after pear packager -->
             <configuration>
-              <outputDirectory>${project.build.directory}/bin/${artifactId}</outputDirectory>
+              <outputDirectory>${project.build.directory}/assembly-bin/${artifactId}</outputDirectory>
               <resources>
                 <resource>
                   <directory>${project.build.directory}</directory>
@@ -237,17 +237,17 @@
           </execution>          
 
           <execution>
-            <id>copy standard sandbox resources to src</id>
+            <id>copy standard sandbox resources to assembly-src</id>
             <goals><goal>copy-resources</goal></goals>  
             <phase>process-resources</phase>  <!-- required -->
             <configuration>
-              <outputDirectory>${project.build.directory}/src/${artifactId}</outputDirectory>
+              <outputDirectory>${project.build.directory}/assembly-src/${artifactId}</outputDirectory>
               <resources>
                 <resource>
                   <directory>.</directory>
                   <includes>
                     <!-- these license/notice files are the not the plain versions, 
-                         they are the same as the bin version even though
+                         they are the same as the assembly-bin version even though
                          we're not shipping the 3rd party jars, because
                          maven will silently fetch them -->
                     <include>LICENSE*</include>
@@ -259,7 +259,7 @@
                   <directory>.</directory>
                   <includes>
                     <!-- these license/notice files are the not the plain versions, 
-                         they are the same as the bin version even though
+                         they are the same as the assembly-bin version even though
                          we're not shipping the 3rd party jars, because
                          maven will silently fetch them -->
                     <include>readme*</include>