You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2013/01/15 21:50:46 UTC
svn commit: r1433636 - in
/uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site:
category.xml index.html pom.xml signEclipseUpdateSite.sh site.xml
verifySigsEclipseUpdateSite.sh web/
Author: pkluegl
Date: Tue Jan 15 20:50:45 2013
New Revision: 1433636
URL: http://svn.apache.org/viewvc?rev=1433636&view=rev
Log:
UIMA-2581
- adapted to new approach
Added:
uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site/category.xml
Removed:
uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site/index.html
uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site/site.xml
uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site/web/
Modified:
uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site/pom.xml
uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site/signEclipseUpdateSite.sh
uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site/verifySigsEclipseUpdateSite.sh
Added: uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site/category.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site/category.xml?rev=1433636&view=auto
==============================================================================
--- uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site/category.xml (added)
+++ uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site/category.xml Tue Jan 15 20:50:45 2013
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<site>
+ <feature url="features/org.apache.uima.textmarker.feature_2.0.0.SNAPSHOT.jar" id="org.apache.uima.textmarker.feature" version="2.0.0.SNAPSHOT">
+ <category name="uima-textmarker"/>
+ </feature>
+ <category-def name="uima-textmarker" label="Apache UIMA TextMarker Workbench">
+ <description>
+ Apache UIMA Eclipse tooling and runtime support
+ </description>
+ </category-def>
+</site>
Modified: uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site/pom.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site/pom.xml?rev=1433636&r1=1433635&r2=1433636&view=diff
==============================================================================
--- uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site/pom.xml (original)
+++ uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site/pom.xml Tue Jan 15 20:50:45 2013
@@ -29,20 +29,12 @@
<artifactId>uimaj-textmarker-eclipse-update-site</artifactId>
<packaging>pom</packaging>
- <version>3</version>
+ <version>2.0.0</version>
<name>Apache UIMA TextMarker Eclipse: ${project.artifactId}</name>
<description>The UIMA TextMarker Eclipse update site</description>
<url>${uimaWebsiteUrl}</url>
- <!-- Special inheritance note
- even though the <scm> element that follows is exactly the
- same as those in super poms, it cannot be inherited because
- there is some special code that computes the connection elements
- from the chain of parent poms, if this is omitted.
-
- Keeping this a bit factored allows cutting/pasting the <scm>
- element, and just changing the following two properties -->
<scm>
<connection>
scm:svn:http://svn.apache.org/repos/asf/uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site
@@ -62,53 +54,26 @@
<item-maven-release-version>2.0.0-SNAPSHOT</item-maven-release-version>
<item-eclipse-release-version>2.0.0.SNAPSHOT</item-eclipse-release-version>
</properties>
-
<!-- don't use dependency mechanism - use dependency:copy
because we need to get multiple versions for the
eclipese-feature-projects, and Maven
wants to resolve multiple versions into one. -->
<build>
- <!-- normally, the resources spec copies into
- target/classes/ ... but if it's not a "jar" packaging,
- it copies into target/
- -->
- <resources>
- <resource>
- <targetPath>eclipse-update-site/web</targetPath>
- <directory>web</directory>
- </resource>
- <resource>
- <targetPath>eclipse-update-site</targetPath>
- <directory>.</directory>
- <includes>
- <include>index.html</include>
- <include>site.xml</include>
- </includes>
- </resource>
- </resources>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>copy-plugins-being-released</id>
+ <id>copy-all-plugins</id>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<!-- ===================================================================
- List here just the new versions of plugins that are being released;
- remove old versions from this list.
-
- Include (hard-code) the specific versions you wish to use.
-
- The build will include just those new plugins; these should be
- merged with other released plugins for previous versions that the
- feature(s) support, on the actual eclipse-update-site
- ======================================================================= -->
+ List here all the PLUGINS, with all versions - needed by P2 build
+ ======================================================================= -->
<artifactItems>
<artifactItem>
<groupId>org.apache.uima</groupId>
@@ -141,7 +106,7 @@
<destFileName>org.apache.uima.textmarker.textruler_${item-eclipse-release-version}.jar</destFileName>
</artifactItem>
</artifactItems>
- <outputDirectory>${project.build.directory}/work/plugins</outputDirectory>
+ <outputDirectory>${eclipseUpdateSite}/plugins</outputDirectory>
</configuration>
</execution>
<execution>
@@ -150,9 +115,9 @@
<goal>copy</goal>
</goals>
<configuration>
- <!-- include here all of the new / updated
- features being included in this build.
- Merge in older features on the target update site -->
+ <!-- ===================================================================
+ List here all the FEATURES, with all versions - needed by P2 build
+ ======================================================================= -->
<artifactItems>
<artifactItem>
<groupId>org.apache.uima</groupId>
@@ -161,7 +126,7 @@
<destFileName>org.apache.uima.textmarker.feature_${item-eclipse-release-version}.jar</destFileName>
</artifactItem>
</artifactItems>
- <outputDirectory>${project.build.directory}/eclipse-update-site/features</outputDirectory>
+ <outputDirectory>${eclipseUpdateSite}/features</outputDirectory>
</configuration>
</execution>
</executions>
@@ -172,7 +137,7 @@
<executions>
<execution>
<id>BuildUpdateSite</id>
- <phase>package</phase>
+ <phase>package</phase>
<configuration>
<target>
<!-- if the property uima-maven-build-eclipse-home is set, use it, otherwise don't -->
@@ -181,43 +146,56 @@
<equals arg1="${uima-maven-build-eclipse-home}" arg2="$${uima-maven-build-eclipse-home}" />
</not>
</condition>
-
+
<property environment="envVar" />
<condition property="eclipse.home" value="${envVar.ECLIPSE_HOME}">
<isset property="envVar.ECLIPSE_HOME" />
</condition>
-
- <fail unless="eclipse.home" message="********** Please set up and use an ant property eclipse.home set to an Eclipse installation at level 3.3 or later, e.g. c:/eclipses/3.3/eclipse" />
-
- <!-- Define property: eclipse-equinox-launcher in m2/settings.xml to point to the
- ECLIPSE_HOME/plugins/org.eclipse.equinox.launcherXXX.jar -->
- <java jar="${eclipse-equinox-launcher}" fork="true" failonerror="true" maxmemory="256m">
- <arg line="-application org.eclipse.update.core.siteOptimizer" />
- <arg line="-jarProcessor -verbose -processAll -pack" />
- <arg line="-outputDir ${eclipseUpdateSite}/plugins" />
- <arg line="${project.build.directory}/work/plugins" />
+
+ <fail unless="eclipse.home"
+ message="********** Please set up and use an ant property eclipse.home set to an Eclipse installation at level 3.3 or later, e.g. c:/eclipses/3.3/eclipse" />
+
+ <fail unless="uima-eclipse-jar-processor"
+ message="********** Please add to your settings.xml file the property uima-eclipse-jar-processor, point to this within an Eclipse installation, e.g. \$\{uima-maven-build-eclipse-home\}/plugins/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110808-1657.jar" />
+
+ <echo>Compress plugin Jars using pack200 - this may take a minute or 2</echo>
+ <java jar="${uima-eclipse-jar-processor}" fork="true" failonerror="true" maxmemory="256m">
+ <arg line="-processAll"/>
+ <arg line="-repack"/>
+ <arg line="-pack"/>
+ <arg line="-verbose"/>
+ <!-- only pack the plugins. The publisher won't copy packed "features",
+ they are tiny anyways -->
+ <arg line="-outputDir ${eclipseUpdateSite}/plugins"/>
+ <arg line="${eclipseUpdateSite}/plugins"/>
+
</java>
- <copy todir="${eclipseUpdateSite}/web" preservelastmodified="true">
- <fileset dir="web" />
- </copy>
- <copy todir="${eclipseUpdateSite}" file="index.html" preservelastmodified="true" />
- <copy todir="${eclipseUpdateSite}" file="site.xml" preservelastmodified="true" />
-
- <!-- copy all feature jars preserved in SVN in the features/ folder to the target -->
- <copy todir="${eclipseUpdateSite}/features" preservelastmodified="true">
- <fileset dir="features" />
- </copy>
-
+ <echo>Generate p2 metadata</echo>
+ <!-- Generate p2 metadata -->
+
+ <java jar="${eclipse-equinox-launcher}" fork="true" failonerror="true"
+ maxmemory="256m">
+ <arg line="-application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher" />
+ <arg line="-metadataRepository file://${eclipseUpdateSite}" />
+ <arg line="-artifactRepository file://${eclipseUpdateSite}" />
+ <arg line="-source ${eclipseUpdateSite}" />
+ <arg line="-configs ANY.ANY.ANY" />
+ <arg line="-publishArtifacts" />
+ <arg line="-reusePack200Files"/>
+ <arg line="-compress"/>
+ </java>
- <!-- see http://wiki.eclipse.org/Update_Site_Optimization -->
- <!-- Define property: eclipse-equinox-launcher in m2/settings.xml to point to the
- ECLIPSE_HOME/plugins/org.eclipse.equinox.launcherXXX.jar -->
- <java jar="${eclipse-equinox-launcher}" fork="true" failonerror="true" maxmemory="256m">
- <arg line="-application org.eclipse.update.core.siteOptimizer" />
- <arg line="-digestBuilder -digestOutputDir=target/eclipse-update-site" />
- <arg line="-siteXML=target/eclipse-update-site/site.xml" />
+ <echo>Generate category information</echo>
+ <java jar="${eclipse-equinox-launcher}" fork="true" failonerror="true"
+ maxmemory="256m">
+ <arg line="-application org.eclipse.equinox.p2.publisher.CategoryPublisher" />
+ <arg line="-metadataRepository file://${eclipseUpdateSite}" />
+ <arg line="-categoryDefinition file://${basedir}/category.xml" />
+ <arg line="-categoryQualifier apache-uima" />
+ <arg line="-compress"/>
</java>
+
</target>
</configuration>
<goals>
@@ -226,6 +204,8 @@
</execution>
</executions>
</plugin>
+
+
</plugins>
</build>
Modified: uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site/signEclipseUpdateSite.sh
URL: http://svn.apache.org/viewvc/uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site/signEclipseUpdateSite.sh?rev=1433636&r1=1433635&r2=1433636&view=diff
==============================================================================
--- uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site/signEclipseUpdateSite.sh (original)
+++ uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site/signEclipseUpdateSite.sh Tue Jan 15 20:50:45 2013
@@ -20,7 +20,7 @@
# Bourne shell syntax, this should hopefully run on pretty much anything.
usage() {
- echo "Usage: cd to the uimaj-eclipse-update-site project, then ./signEclipseUpdateSite.sh"
+ echo "Usage: cd to this project's project directory, then ./signEclipseUpdateSite.sh"
}
if [ "$1" = "-help" ]
@@ -29,19 +29,11 @@ then
exit 1
fi
-# Create PGP signatures
-for i in target/eclipse-update-site/features/org.apache.uima.*.jar; do gpg --output $i.asc --detach-sig --armor $i; done
-for i in target/eclipse-update-site/plugins/org.apache.uima.*.jar; do gpg --output $i.asc --detach-sig --armor $i; done
-for i in target/eclipse-update-site/plugins/org.apache.uima.*.pack.gz; do gpg --output $i.asc --detach-sig --armor $i; done
-gpg --output target/eclipse-update-site/digest.zip.asc --detach-sig --armor target/eclipse-update-site/digest.zip
-
-
-# Create MD5 checksums
-for i in target/eclipse-update-site/features/org.apache.uima.*.jar; do md5sum --binary $i > $i.md5; done
-for i in target/eclipse-update-site/plugins/org.apache.uima.*.jar; do md5sum --binary $i > $i.md5; done
-md5sum --binary target/eclipse-update-site/digest.zip > target/eclipse-update-site/digest.zip.md5
-
-# Create SHA1 checksums
-for i in target/eclipse-update-site/features/org.apache.uima.*.jar; do sha1sum --binary $i > $i.sha1; done
-for i in target/eclipse-update-site/plugins/org.apache.uima.*.jar; do sha1sum --binary $i > $i.sha1; done
-sha1sum --binary target/eclipse-update-site/digest.zip > target/eclipse-update-site/digest.zip.sha1
+# Create PGP signatures, MD5, and SHA1 checksums on all jars
+for i in $(find ./target/eclipse-update-site -name '*.jar')
+ do
+ rm -f $i.asc
+ gpg --output $i.asc --detach-sig --armor $i
+ md5sum --binary $i > $i.md5
+ sha1sum --binary $i > $i.sha1
+ done
Modified: uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site/verifySigsEclipseUpdateSite.sh
URL: http://svn.apache.org/viewvc/uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site/verifySigsEclipseUpdateSite.sh?rev=1433636&r1=1433635&r2=1433636&view=diff
==============================================================================
--- uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site/verifySigsEclipseUpdateSite.sh (original)
+++ uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site/verifySigsEclipseUpdateSite.sh Tue Jan 15 20:50:45 2013
@@ -21,21 +21,19 @@
# Bourne shell syntax, this should hopefully run on pretty much anything.
usage() {
- echo "Usage: cd to eclipseUpdateSite, then verifySigsEclipseUpdateSite.sh )"
+ echo "Usage: cd to this project's project directory, then ./verifySigsEclipseUpdateSite.sh"
}
-# Verify PGP signatures
-for i in target/eclipse-update-site/features/org.apache.uima.*.jar; do gpg --verify $i.asc; done
-for i in target/eclipse-update-site/plugins/org.apache.uima.*.jar; do gpg --verify $i.asc; done
-gpg --verify target/eclipse-update-site/digest.zip.asc
-
-# Verify MD5 checksums
-for i in target/eclipse-update-site/features/org.apache.uima.*.jar; do md5sum --check $i.md5; done
-for i in target/eclipse-update-site/plugins/org.apache.uima.*.jar; do md5sum --check $i.md5; done
-md5sum --check target/eclipse-update-site/digest.zip.md5
-
-# Verify SHA1 checksums
-for i in target/eclipse-update-site/features/org.apache.uima.*.jar; do sha1sum --check $i.sha1; done
-for i in target/eclipse-update-site/plugins/org.apache.uima.*.jar; do sha1sum --check $i.sha1; done
-md5sum --check target/eclipse-update-site/digest.zip.md5
+if [ "$1" = "-help" ]
+then
+ usage
+ exit 1
+fi
+# Verify PGP signatures, MD5 and SHA1 checksums on all jars
+for i in $(find ./target/eclipse-update-site -name '*.jar')
+ do
+ gpg --verify $i.asc
+ md5sum --check $i.md5
+ sha1sum --check $i.sha1
+ done
Re: svn commit: r1433636 - in /uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site:
category.xml index.html pom.xml signEclipseUpdateSite.sh site.xml verifySigsEclipseUpdateSite.sh
web/
Posted by Peter Klügl <pk...@uni-wuerzburg.de>.
Oops, I thought I changed that.
Thanks :-)
Am 15.01.2013 23:35, schrieb Marshall Schor:
> Looks like the <description> for the textmarker category is a cut and paste
> leftover :-)
>
> -Marshall
> On 1/15/2013 3:50 PM, pkluegl@apache.org wrote:
>> ...<snip>
>> +<site>
>> + <feature url="features/org.apache.uima.textmarker.feature_2.0.0.SNAPSHOT.jar" id="org.apache.uima.textmarker.feature" version="2.0.0.SNAPSHOT">
>> + <category name="uima-textmarker"/>
>> + </feature>
>> + <category-def name="uima-textmarker" label="Apache UIMA TextMarker Workbench">
>> + <description>
>> + Apache UIMA Eclipse tooling and runtime support
>> + </description>
>> + </category-def>
>> +</site>
>> ...<snip>
Re: svn commit: r1433636 - in /uima/sandbox/TextMarker/trunk/uimaj-textmarker-eclipse-update-site:
category.xml index.html pom.xml signEclipseUpdateSite.sh site.xml verifySigsEclipseUpdateSite.sh
web/
Posted by Marshall Schor <ms...@schor.com>.
Looks like the <description> for the textmarker category is a cut and paste
leftover :-)
-Marshall
On 1/15/2013 3:50 PM, pkluegl@apache.org wrote:
> ...<snip>
> +<site>
> + <feature url="features/org.apache.uima.textmarker.feature_2.0.0.SNAPSHOT.jar" id="org.apache.uima.textmarker.feature" version="2.0.0.SNAPSHOT">
> + <category name="uima-textmarker"/>
> + </feature>
> + <category-def name="uima-textmarker" label="Apache UIMA TextMarker Workbench">
> + <description>
> + Apache UIMA Eclipse tooling and runtime support
> + </description>
> + </category-def>
> +</site>
> ...<snip>