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 2010/12/02 18:15:46 UTC
svn commit: r1041471 - in
/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor: ./
feature.properties marker-file-identifying-eclipse-feature pom.xml src/
src/main/ src/main/resources/ src/main/resources/feature.xml
Author: schor
Date: Thu Dec 2 17:15:46 2010
New Revision: 1041471
URL: http://svn.apache.org/viewvc?rev=1041471&view=rev
Log:
[UIMA-1959] add marker files to use common build pom for Eclipse feature projects. Move feature.xml to src/main/resources, and use resources plugin to copy to top level where Eclipse needs this, with filtering. mark feature.xml at top level as svn ignore - it's now a generated file.
Added:
uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/marker-file-identifying-eclipse-feature
uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/src/
uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/src/main/
uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/src/main/resources/
uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/src/main/resources/feature.xml
Modified:
uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/ (props changed)
uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/feature.properties
uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml
Propchange: uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 2 17:15:46 2010
@@ -3,3 +3,4 @@ build.properties
target
.settings
.classpath
+feature.xml
Modified: uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/feature.properties
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/feature.properties?rev=1041471&r1=1041470&r2=1041471&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/feature.properties (original)
+++ uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/feature.properties Thu Dec 2 17:15:46 2010
@@ -17,4 +17,10 @@
# * under the License.
# ***************************************************************
-# do not delete this file - it is required for optimized site generation
\ No newline at end of file
+# do not delete this file - it is required for optimized site generation
+
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
\ No newline at end of file
Added: uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/marker-file-identifying-eclipse-feature
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/marker-file-identifying-eclipse-feature?rev=1041471&view=auto
==============================================================================
(empty)
Modified: uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml?rev=1041471&r1=1041470&r2=1041471&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml Thu Dec 2 17:15:46 2010
@@ -61,15 +61,44 @@
<build>
<!-- parsedVersion set in parent-pom by builder-helper -->
- <finalName>org.apache.uima.as.deployeditor_${parsedVersion.osgiVersion}</finalName>
+ <finalName>${project.artifactId}_${parsedVersion.osgiVersion}</finalName>
+ <!-- turn on filtering for these resources -->
<resources>
<resource>
- <directory>.</directory>
+ <directory>${basedir}</directory>
<includes>
<include>feature.properties</include>
<include>feature.xml</include>
</includes>
+ <filtering>true</filtering>
</resource>
</resources>
+
+ <plugins>
+ <!-- filter the feature.xml to have the right version info
+ for Eclipse at the top level-->
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>filter feature.xml</id>
+ <!-- run before process-resources, which uses this result -->
+ <phase>generate-resources</phase>
+ <goals><goal>copy-resources</goal></goals>
+ <configuration>
+ <outputDirectory>${basedir}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes><include>feature.xml</include></includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
</build>
</project>
\ No newline at end of file
Added: uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/src/main/resources/feature.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/src/main/resources/feature.xml?rev=1041471&view=auto
==============================================================================
--- uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/src/main/resources/feature.xml (added)
+++ uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/src/main/resources/feature.xml Thu Dec 2 17:15:46 2010
@@ -0,0 +1,79 @@
+<?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.
+-->
+<feature
+ id="org.apache.uima.as.deployeditor"
+ label="UIMA-AS Deployment Descriptor Editor"
+ version="${parsedVersion.osgiVersion}"
+ provider-name="Apache Software Foundation">
+
+ <description url="http://uima.apache.org">
+ This feature adds to the UIMA Component Descriptor
+ Editor (CDE) the ability to edit the Deployment
+ Descriptor used by UIMA-AS to deploy
+ UIMA components using Asynchronous Scaleout
+ </description>
+
+ <copyright url="http://www.apache.org/licenses/LICENSE-2.0">
+ Copyright the Apache Software Foundation and others; see License
+and NOTICE files
+ </copyright>
+
+ <license url="http://www.apache.org/licenses/LICENSE-2.0">
+ 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.
+ </license>
+
+ <url>
+ <discovery label="UIMA Eclipse Plugins update site" url="http://www.apache.org/dist/uima/eclipse-update-site/"/>
+ </url>
+
+ <requires>
+ <import plugin="org.apache.uima.runtime" version="2.3.0" match="greaterOrEqual"/>
+ <import plugin="org.apache.uima.desceditor" version="2.3.0" match="greaterOrEqual"/>
+ </requires>
+
+ <plugin
+ id="org.apache.uima.deployeditor"
+ download-size="0"
+ install-size="0"
+ version="${parsedVersion.osgiVersion}"
+ unpack="false"/>
+
+ <plugin
+ id="org.apache.uima.runtime.fragments.deployeditor"
+ download-size="0"
+ install-size="0"
+ version="${parsedVersion.osgiVersion}"
+ fragment="true"
+ unpack="false"/>
+
+</feature>