You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by to...@apache.org on 2011/05/31 10:32:23 UTC
svn commit: r1129570 - in /uima/sandbox/trunk:
FsVariables/marker-file-identifying-single-project
FsVariables/marker-file-identifying-standard-pear FsVariables/pom.xml
uima-addons-parent/pom.xml uima-addons/ uima-addons/src/main/assembly/bin.xml
Author: tommaso
Date: Tue May 31 08:32:22 2011
New Revision: 1129570
URL: http://svn.apache.org/viewvc?rev=1129570&view=rev
Log:
[UIMA-2103] - added marker-file-identifying-standard-pear file to enable pear generation for FsVariables; added configuration for non-pears in uima-addons-parent to create NOTICE/LICENSE/etc files in distribution package
Added:
uima/sandbox/trunk/FsVariables/marker-file-identifying-standard-pear
Removed:
uima/sandbox/trunk/FsVariables/marker-file-identifying-single-project
Modified:
uima/sandbox/trunk/FsVariables/pom.xml
uima/sandbox/trunk/uima-addons/ (props changed)
uima/sandbox/trunk/uima-addons-parent/pom.xml
uima/sandbox/trunk/uima-addons/src/main/assembly/bin.xml
Added: uima/sandbox/trunk/FsVariables/marker-file-identifying-standard-pear
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/FsVariables/marker-file-identifying-standard-pear?rev=1129570&view=auto
==============================================================================
(empty)
Modified: uima/sandbox/trunk/FsVariables/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/FsVariables/pom.xml?rev=1129570&r1=1129569&r2=1129570&view=diff
==============================================================================
--- uima/sandbox/trunk/FsVariables/pom.xml (original)
+++ uima/sandbox/trunk/FsVariables/pom.xml Tue May 31 08:32:22 2011
@@ -60,6 +60,7 @@
<uimaScmProject>${project.artifactId}</uimaScmProject>
<uimaDependencyVersion>2.3.1</uimaDependencyVersion>
<bookNameRoot>fsVariablesUserGuide</bookNameRoot>
+ <pearMainDescriptor>desc/fsvars_descriptor.xml</pearMainDescriptor>
</properties>
<dependencies>
Propchange: uima/sandbox/trunk/uima-addons/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue May 31 08:32:22 2011
@@ -2,3 +2,5 @@ issuesFixed
.project
target
.settings
+
+*.iml
Modified: uima/sandbox/trunk/uima-addons-parent/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/uima-addons-parent/pom.xml?rev=1129570&r1=1129569&r2=1129570&view=diff
==============================================================================
--- uima/sandbox/trunk/uima-addons-parent/pom.xml (original)
+++ uima/sandbox/trunk/uima-addons-parent/pom.xml Tue May 31 08:32:22 2011
@@ -235,5 +235,130 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>build simple project binary assembly</id>
+ <activation>
+ <file>
+ <exists>marker-file-identifying-single-project</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <!--
+ 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/assembly-bin/lib</outputDirectory>
+ <includeScope>runtime</includeScope>
+ <excludeTransitive>true</excludeTransitive>
+ <excludeGroupIds>org.apache.uima</excludeGroupIds>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <!--
+ copy the License/notice/readme/release/keys notes files into the component assembly-bin at the top level
+ -->
+ <execution>
+ <id>Copy Component Lic/Not/Readme/Relnotes</id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <outputDirectory>target/assembly-bin</outputDirectory>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>README*</include>
+ <include>readme*</include>
+ <include>RELEASE_NOTES*</include>
+ <include>ReleaseNotes*</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <!-- copy generated Jar to target/assembly-bin/lib spot -->
+ <execution>
+ <id>
+ copy standard sandbox target jar to target/assembly-bin/lib
+ </id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
+ <!-- a phase after jar -->
+ <configuration>
+ <outputDirectory>target/assembly-bin/lib</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*-sources.jar</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <!--
+ copy generated docbook artifacts to pearPackaging/doc folder
+ -->
+ <execution>
+ <id>
+ copy generated docbook artifacts to target/assembly-bin/doc folder
+ </id>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
+ <!-- a phase after docbkx (package) phase -->
+ <configuration>
+ <outputDirectory>target/assembly-bin/doc</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/docbkx</directory>
+ <excludes>
+ <exclude>**/*.fo</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <!-- turn on javadoc build for each module -->
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
Modified: uima/sandbox/trunk/uima-addons/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/uima-addons/src/main/assembly/bin.xml?rev=1129570&r1=1129569&r2=1129570&view=diff
==============================================================================
--- uima/sandbox/trunk/uima-addons/src/main/assembly/bin.xml (original)
+++ uima/sandbox/trunk/uima-addons/src/main/assembly/bin.xml Tue May 31 08:32:22 2011
@@ -419,10 +419,7 @@ under the License.
</fileSet>
<fileSet>
<outputDirectory>FsVariables</outputDirectory>
- <directory>../FsVariables/</directory>
- <includes>
- <include>*.txt</include>
- </includes>
+ <directory>../FsVariables/target/pearPackaging</directory>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
@@ -440,10 +437,7 @@ under the License.
</fileSet>
<fileSet>
<outputDirectory>PearPackagingAntTask</outputDirectory>
- <directory>../PearPackagingAntTask/</directory>
- <includes>
- <include>*.txt</include>
- </includes>
+ <directory>../PearPackagingAntTask/target/assembly-bin</directory>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
@@ -455,10 +449,7 @@ under the License.
</fileSet>
<fileSet>
<outputDirectory>SimpleServer</outputDirectory>
- <directory>../SimpleServer/</directory>
- <includes>
- <include>*.txt</include>
- </includes>
+ <directory>../SimpleServer/target/assembly-bin</directory>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
@@ -486,6 +477,12 @@ under the License.
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
</fileSet>
+ <fileSet>
+ <outputDirectory>annotator/Solrcas</outputDirectory>
+ <directory>../Solrcas/target/pearPackaging</directory>
+ <fileMode>644</fileMode>
+ <directoryMode>755</directoryMode>
+ </fileSet>
<fileSet>
<directory>src/main/scripts</directory>