Author: schor Date: Thu Aug 18 18:06:29 2011 New Revision: 1159330 URL: http://svn.apache.org/viewvc?rev=1159330&view=rev Log: [UIMA-1967] move uimaj project up one level; merge uimaj-distr into it. Change uimaj-parent to use version 3-SNAPSHOT of the UIMA -wide parent. (This will be converted to version 3 once we release build parent-pom at that level).
Removed: uima/uimaj/trunk/uimaj-distr/src/main/build/ uima/uimaj/trunk/uimaj-distr/src/main/readme_src/README uima/uimaj/trunk/uimaj-distr/src/main/resources/ Modified: uima/uimaj/trunk/uimaj-distr/src/main/assembly/bin.xml uima/uimaj/trunk/uimaj-distr/src/main/assembly/src.xml Modified: uima/uimaj/trunk/uimaj-distr/src/main/assembly/bin.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-distr/src/main/assembly/bin.xml?rev=1159330&r1=1159329&r2=1159330&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-distr/src/main/assembly/bin.xml (original) +++ uima/uimaj/trunk/uimaj-distr/src/main/assembly/bin.xml Thu Aug 18 18:06:29 2011 @@ -222,114 +222,95 @@ under the License. <!-- docbooks --> <fileSet> - <directory>../uima-docbook-overview-and-setup/target/site/</directory> + <directory>uima-docbook-overview-and-setup/target/site/</directory> <outputDirectory>docs</outputDirectory> <fileMode>644</fileMode> <directoryMode>755</directoryMode> </fileSet> <fileSet> - <directory>../uima-docbook-references/target/site</directory> + <directory>uima-docbook-references/target/site</directory> <outputDirectory>docs</outputDirectory> <fileMode>644</fileMode> <directoryMode>755</directoryMode> </fileSet> <fileSet> - <directory>../uima-docbook-tools/target/site</directory> + <directory>uima-docbook-tools/target/site</directory> <outputDirectory>docs</outputDirectory> <fileMode>644</fileMode> <directoryMode>755</directoryMode> </fileSet> <fileSet> - <directory>../uima-docbook-tutorials-and-users-guides/target/site</directory> + <directory>uima-docbook-tutorials-and-users-guides/target/site</directory> <outputDirectory>docs</outputDirectory> <fileMode>644</fileMode> <directoryMode>755</directoryMode> </fileSet> - + <!-- examples --> <fileSet> - <directory>../uimaj-examples/src/main/java</directory> + <directory>uimaj-examples/src/main</directory> + <outputDirectory>examples</outputDirectory> + <fileMode>644</fileMode> + <directoryMode>755</directoryMode> + <includes> + <include>deploy/**</include> + <include>descriptors/**</include> + <include>resources/**</include> + <include>run_configuration/**</include> + </includes> + </fileSet> + <fileSet> + <directory>uimaj-examples/src/main/java</directory> <outputDirectory>examples/src</outputDirectory> <excludes> - <exclude> org/apache/uima/examples/xmi/XmiEcoreCasConsumer.java</exclude> - <exclude> org/apache/uima/examples/xmi/Ecore2UimaTypeSystem.java</exclude> - <exclude> org/apache/uima/examples/xmi/UimaTypeSystem2Ecore.java</exclude> + <exclude>org/apache/uima/examples/xmi/XmiEcoreCasConsumer.java</exclude> + <exclude>org/apache/uima/examples/xmi/Ecore2UimaTypeSystem.java</exclude> + <exclude>org/apache/uima/examples/xmi/UimaTypeSystem2Ecore.java</exclude> </excludes> <fileMode>644</fileMode> <directoryMode>755</directoryMode> </fileSet> <fileSet> - <directory>../uimaj-examples/src/main/data</directory> + <directory>uimaj-examples/src/main/data</directory> <outputDirectory>examples/data</outputDirectory> <fileMode>644</fileMode> <!-- next mode 777 because some examples write into dir and we want to eliminate failures due to write permissions --> <directoryMode>777</directoryMode> </fileSet> - <fileSet> - <directory>../uimaj-examples/src/main/deploy</directory> - <outputDirectory>examples/deploy</outputDirectory> - <fileMode>644</fileMode> - <directoryMode>755</directoryMode> - </fileSet> - <fileSet> - <directory>../uimaj-examples/src/main/descriptors</directory> - <outputDirectory>examples/descriptors</outputDirectory> - <fileMode>644</fileMode> - <directoryMode>755</directoryMode> - </fileSet> - <!-- removed in 2.3.0 --> - <!--fileSet> - <directory>../uimaj-examples/src/main/opennlp_wrappers</directory> - <outputDirectory>examples/opennlp_wrappers</outputDirectory> - <fileMode>644</fileMode> - <directoryMode>755</directoryMode> - </fileSet--> - <fileSet> - <directory>../uimaj-examples/src/main/resources</directory> - <outputDirectory>examples/resources</outputDirectory> - <fileMode>644</fileMode> - <directoryMode>755</directoryMode> - </fileSet> - <fileSet> - <directory>../uimaj-examples/src/main/run_configuration</directory> - <outputDirectory>examples/run_configuration</outputDirectory> - <fileMode>644</fileMode> - <directoryMode>755</directoryMode> - </fileSet> </fileSets> <files> <file> - <source>../uimaj-examples/src/main/eclipseProject/project</source> + <source>uimaj-examples/src/main/eclipseProject/project</source> <outputDirectory>examples</outputDirectory> <destName>.project</destName> <fileMode>644</fileMode> </file> <file> - <source>../uimaj-examples/src/main/eclipseProject/classpath</source> + <source>uimaj-examples/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> + <source>uimaj-examples/src/main/eclipseProject/ecore_src_readme.txt</source> <outputDirectory>examples/ecore_src</outputDirectory> <destName>readme.txt</destName> <fileMode>644</fileMode> </file> <file> - <source>../uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiEcoreCasConsumer.java</source> + <source>uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiEcoreCasConsumer.java</source> <outputDirectory>examples/ecore_src/org/apache/uima/examples/xmi</outputDirectory> <fileMode>644</fileMode> </file> <file> - <source>../uimaj-examples/src/main/java/org/apache/uima/examples/xmi/Ecore2UimaTypeSystem.java</source> + <source>uimaj-examples/src/main/java/org/apache/uima/examples/xmi/Ecore2UimaTypeSystem.java</source> <outputDirectory>examples/ecore_src/org/apache/uima/examples/xmi</outputDirectory> <fileMode>644</fileMode> </file> <file> - <source>../uimaj-examples/src/main/java/org/apache/uima/examples/xmi/UimaTypeSystem2Ecore.java</source> + <source>uimaj-examples/src/main/java/org/apache/uima/examples/xmi/UimaTypeSystem2Ecore.java</source> <outputDirectory>examples/ecore_src/org/apache/uima/examples/xmi</outputDirectory> <fileMode>644</fileMode> </file> Modified: uima/uimaj/trunk/uimaj-distr/src/main/assembly/src.xml URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-distr/src/main/assembly/src.xml?rev=1159330&r1=1159329&r2=1159330&view=diff ============================================================================== --- uima/uimaj/trunk/uimaj-distr/src/main/assembly/src.xml (original) +++ uima/uimaj/trunk/uimaj-distr/src/main/assembly/src.xml Thu Aug 18 18:06:29 2011 @@ -40,14 +40,12 @@ under the License. <!-- Leave out .sh/.bat/.cmd files, include them in the next step as executable --> <fileSet> <directory>.</directory> - <outputDirectory>/uimaj-distr</outputDirectory> + <outputDirectory/> <includes> <include>src/**</include> <include>pom.xml</include> </includes> <excludes> - <exclude>src/**/*.bat</exclude> - <exclude>src/**/*.cmd</exclude> <exclude>src/**/*.sh</exclude> </excludes> <fileMode>644</fileMode> @@ -56,21 +54,11 @@ under the License. <fileSet> <fileMode>755</fileMode> <directory>.</directory> - <outputDirectory>/uimaj-distr</outputDirectory> + <outputDirectory/> <includes> <include>src/**/*.sh</include> </includes> </fileSet> - <!-- Copy .bat and cmd files as not-executable --> - <fileSet> - <fileMode>644</fileMode> - <directory>.</directory> - <outputDirectory>/uimaj-distr</outputDirectory> - <includes> - <include>src/**/*.bat</include> - <include>src/**/*.cmd</include> - </includes> - </fileSet> <!-- ===================================== --> <!-- copy top level files to the top level --> @@ -78,10 +66,6 @@ under the License. <fileSet> <directory>src/main/readme</directory> <outputDirectory/> - <excludes> - <!-- exclude bin distr README --> - <exclude>README</exclude> - </excludes> <fileMode>644</fileMode> </fileSet> @@ -116,7 +100,31 @@ under the License. Aggregator poms used in this build are included. --> + <fileSet> + <directory>.</directory> + <outputDirectory/> + <includes> + <include>aggregate*/**</include> + <include>jVinci/**</include> + <include>PearPackagingMavenPlugin/**</include> + <include>uima-docbook-*/**</include> + <include>uimaj-adapter-*/**</include> + <include>uimaj-bootstrap/**</include> + <include>uimaj-component-test-util/**</include> + <include>uimaj-core/**</include> + <include>uimaj-cpe/**</include> + <include>uimaj-document-annotation/**</include> + <include>uimaj-eclipse-*/**</include> + <include>uimaj-ep-*/**</include> + <include>uimaj-examples/**</include> + <include>uimaj-parent</include> + <include>uimaj-test-util</include> + <include>uimaj-tools</include> + </includes> + </fileSet> + <!-- aggregator poms --> + <!-- <fileSet> <directory>../aggregate-uimaj</directory> <outputDirectory>/aggregate-uimaj</outputDirectory> @@ -144,8 +152,9 @@ under the License. </excludes> <fileMode>644</fileMode> </fileSet> - + --> <!-- from aggregate-uimaj-docbooks --> + <!-- <fileSet> <directory>../uima-docbook-overview-and-setup</directory> <outputDirectory>/uima-docbook-overview-and-setup</outputDirectory> @@ -182,8 +191,9 @@ under the License. </excludes> <fileMode>644</fileMode> </fileSet> - - <!-- from aggregate-uimaj-eclipse-plugins --> + --> + <!-- from aggregate-uimaj-eclipse-plugins --> + <!-- <fileSet> <directory>../uimaj-ep-cas-editor</directory> <outputDirectory>/uimaj-ep-cas-editor</outputDirectory> @@ -244,8 +254,9 @@ under the License. </excludes> <fileMode>644</fileMode> </fileSet> - - <!-- from aggregate-uimaj --> + --> + <!-- from aggregate-uimaj --> + <!-- <fileSet> <directory>../jVinci</directory> <outputDirectory>/jVinci</outputDirectory> @@ -353,7 +364,8 @@ under the License. <exclude>.*/**</exclude> </excludes> <fileMode>644</fileMode> - </fileSet> + </fileSet> + --> </fileSets>