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 2013/01/12 16:02:35 UTC
svn commit: r1432443 - in /uima/uimaj/trunk/uimaj-eclipse-update-site:
category.xml pom.xml site.xml
Author: schor
Date: Sat Jan 12 15:02:35 2013
New Revision: 1432443
URL: http://svn.apache.org/viewvc?rev=1432443&view=rev
Log:
[UIMA-2568] Remove old site.xml - reduce maintenance, is not used, the category.xml file is the replacement.
Remove uima-as category and features - that will be in the uima-as update sub-site. Remove use of extra directory target/work - not needed; generate directly into the update site.
Removed:
uima/uimaj/trunk/uimaj-eclipse-update-site/site.xml
Modified:
uima/uimaj/trunk/uimaj-eclipse-update-site/category.xml
uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml
Modified: uima/uimaj/trunk/uimaj-eclipse-update-site/category.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-eclipse-update-site/category.xml?rev=1432443&r1=1432442&r2=1432443&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-eclipse-update-site/category.xml (original)
+++ uima/uimaj/trunk/uimaj-eclipse-update-site/category.xml Sat Jan 12 15:02:35 2013
@@ -1,11 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.apache.uima.as.deployeditor_2.4.0.jar" id="org.apache.uima.as.deployeditor" version="2.4.0">
- <category name="uima-as-tooling"/>
- </feature>
- <feature url="features/org.apache.uima.as.deployeditor_2.3.1.jar" id="org.apache.uima.as.deployeditor" version="2.3.1">
- <category name="uima-as-tooling"/>
- </feature>
<feature url="features/org.apache.uima.runtime_2.4.0.jar" id="org.apache.uima.runtime" version="2.4.0">
<category name="uima-tooling-and-runtimes"/>
</feature>
@@ -23,9 +17,4 @@
Apache UIMA Eclipse tooling and runtime support
</description>
</category-def>
- <category-def name="uima-as-tooling" label="Apache UIMA-AS (Asynchronous Scaleout) Eclipse tooling">
- <description>
- Apache UIMA-AS (Asynchronous Scaleout) Eclipse tooling
- </description>
- </category-def>
</site>
Modified: uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml?rev=1432443&r1=1432442&r2=1432443&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml (original)
+++ uima/uimaj/trunk/uimaj-eclipse-update-site/pom.xml Sat Jan 12 15:02:35 2013
@@ -64,7 +64,8 @@
<build>
<!-- normally, the resources spec copies into target/classes/ ... but if it's not a "jar" packaging,
it copies into target/ -->
- <!--
+ <!-- This bit just copies in stuff that isn't needed for the update site, but makes it
+ show in a browser - supports IE and FireFox, not Chrome
<resources>
<resource>
<targetPath>eclipse-update-site/web</targetPath>
@@ -79,7 +80,8 @@
</includes>
</resource>
</resources>
- -->
+ -->
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -134,8 +136,9 @@
</artifactItem>
-->
- </artifactItems>
- <outputDirectory>${project.build.directory}/work/plugins</outputDirectory>
+ </artifactItems>
+ <outputDirectory>${eclipseUpdateSite}/plugins</outputDirectory>
+ <!-- outputDirectory>${project.build.directory}/work/plugins</outputDirectory-->
</configuration>
</execution>
<execution>
@@ -159,7 +162,8 @@
-->
</artifactItems>
- <outputDirectory>${project.build.directory}/work/features</outputDirectory>
+ <outputDirectory>${eclipseUpdateSite}/features</outputDirectory>
+ <!-- outputDirectory>${project.build.directory}/work/features</outputDirectory-->
</configuration>
</execution>
</executions>
@@ -234,8 +238,8 @@
<!-- arg line="-verbose"/-->
<!-- only pack the plugins. The publisher won't copy packed "features",
they are tiny anyways -->
- <arg line="-outputDir ${project.build.directory}/work/plugins"/>
- <arg line="${project.build.directory}/work/plugins"/>
+ <arg line="-outputDir ${eclipseUpdateSite}/plugins"/>
+ <arg line="${eclipseUpdateSite}/plugins"/>
</java>
@@ -247,7 +251,7 @@
<arg line="-application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher" />
<arg line="-metadataRepository file://${eclipseUpdateSite}" />
<arg line="-artifactRepository file://${eclipseUpdateSite}" />
- <arg line="-source ${project.build.directory}/work" />
+ <arg line="-source ${eclipseUpdateSite}" />
<arg line="-configs ANY.ANY.ANY" />
<arg line="-publishArtifacts" />
<arg line="-reusePack200Files"/>