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/05/06 23:24:52 UTC
svn commit: r941935 - in /uima/uima-as/branches/mavenAlign:
aggregate-uima-as-eclipse-plugins/ aggregate-uima-as/ uima-as-docbooks/
uimaj-as-camel/ uimaj-as-core/ uimaj-as-osgi-runtime/
uimaj-eclipse-feature-deployeditor/
Author: schor
Date: Thu May 6 21:24:51 2010
New Revision: 941935
URL: http://svn.apache.org/viewvc?rev=941935&view=rev
Log:
[UIMA-1756] name cleanup, svn ignore .settings and target on some projects
Added:
uima/uima-as/branches/mavenAlign/uimaj-eclipse-feature-deployeditor/.classpath
Modified:
uima/uima-as/branches/mavenAlign/aggregate-uima-as/ (props changed)
uima/uima-as/branches/mavenAlign/aggregate-uima-as-eclipse-plugins/ (props changed)
uima/uima-as/branches/mavenAlign/aggregate-uima-as-eclipse-plugins/pom.xml
uima/uima-as/branches/mavenAlign/aggregate-uima-as/pom.xml
uima/uima-as/branches/mavenAlign/uima-as-docbooks/ (props changed)
uima/uima-as/branches/mavenAlign/uima-as-docbooks/pom.xml
uima/uima-as/branches/mavenAlign/uimaj-as-camel/pom.xml
uima/uima-as/branches/mavenAlign/uimaj-as-core/pom.xml
uima/uima-as/branches/mavenAlign/uimaj-as-osgi-runtime/pom.xml
uima/uima-as/branches/mavenAlign/uimaj-eclipse-feature-deployeditor/ (props changed)
uima/uima-as/branches/mavenAlign/uimaj-eclipse-feature-deployeditor/.project
Propchange: uima/uima-as/branches/mavenAlign/aggregate-uima-as/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu May 6 21:24:51 2010
@@ -1 +1,3 @@
.project
+.settings
+target
Propchange: uima/uima-as/branches/mavenAlign/aggregate-uima-as-eclipse-plugins/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu May 6 21:24:51 2010
@@ -1 +1,3 @@
.project
+.settings
+target
Modified: uima/uima-as/branches/mavenAlign/aggregate-uima-as-eclipse-plugins/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/branches/mavenAlign/aggregate-uima-as-eclipse-plugins/pom.xml?rev=941935&r1=941934&r2=941935&view=diff
==============================================================================
--- uima/uima-as/branches/mavenAlign/aggregate-uima-as-eclipse-plugins/pom.xml (original)
+++ uima/uima-as/branches/mavenAlign/aggregate-uima-as-eclipse-plugins/pom.xml Thu May 6 21:24:51 2010
@@ -32,7 +32,7 @@
<artifactId>aggregate-uima-as-eclipse-plugins</artifactId>
<packaging>pom</packaging>
<version>2.3.1-SNAPSHOT</version>
- <name>UIMA Aggregate: ${project.artifactId}</name>
+ <name>UIMA-AS Aggregate: ${project.artifactId}</name>
<description>The aggregate for building the Eclipse plugins
that are part of the UIMA-AS framework</description>
<url>${uimaWebsiteUrl}</url>
@@ -67,5 +67,6 @@
<module>../uimaj-ep-deployeditor</module>
<module>../uimaj-ep-runtime-deployeditor</module>
<module>../uimaj-as-osgi-runtime</module>
+ <module>../uimaj-as-camel</module>
</modules>
</project>
Modified: uima/uima-as/branches/mavenAlign/aggregate-uima-as/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/branches/mavenAlign/aggregate-uima-as/pom.xml?rev=941935&r1=941934&r2=941935&view=diff
==============================================================================
--- uima/uima-as/branches/mavenAlign/aggregate-uima-as/pom.xml (original)
+++ uima/uima-as/branches/mavenAlign/aggregate-uima-as/pom.xml Thu May 6 21:24:51 2010
@@ -32,7 +32,7 @@
<artifactId>aggregate-uima-as</artifactId>
<packaging>pom</packaging>
<version>2.3.1-SNAPSHOT</version>
- <name>UIMA Aggregate: ${project.artifactId}</name>
+ <name>UIMA-AS Aggregate: ${project.artifactId}</name>
<description>The aggregate for building the uima-as functionality,
the eclipse plugins, and the docbooks
</description>
Propchange: uima/uima-as/branches/mavenAlign/uima-as-docbooks/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu May 6 21:24:51 2010
@@ -1,2 +1,3 @@
target
.project
+.settings
Modified: uima/uima-as/branches/mavenAlign/uima-as-docbooks/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/branches/mavenAlign/uima-as-docbooks/pom.xml?rev=941935&r1=941934&r2=941935&view=diff
==============================================================================
--- uima/uima-as/branches/mavenAlign/uima-as-docbooks/pom.xml (original)
+++ uima/uima-as/branches/mavenAlign/uima-as-docbooks/pom.xml Thu May 6 21:24:51 2010
@@ -32,7 +32,7 @@
<artifactId>uima-as-docbooks</artifactId>
<packaging>pom</packaging>
<version>2.3.1-SNAPSHOT</version>
- <name>Apache UIMA-AS Documentation</name>
+ <name>UIMA-AS: ${project.artifactId}</name>
<url>${uimaWebsiteUrl}</url>
<!-- Special inheritance note
Modified: uima/uima-as/branches/mavenAlign/uimaj-as-camel/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/branches/mavenAlign/uimaj-as-camel/pom.xml?rev=941935&r1=941934&r2=941935&view=diff
==============================================================================
--- uima/uima-as/branches/mavenAlign/uimaj-as-camel/pom.xml (original)
+++ uima/uima-as/branches/mavenAlign/uimaj-as-camel/pom.xml Thu May 6 21:24:51 2010
@@ -31,7 +31,7 @@
<artifactId>uimaj-as-camel</artifactId>
<packaging>jar</packaging>
<version>2.3.1-SNAPSHOT</version>
- <name>Apache UIMA-AS Camel Driver: ${project.artifactId}</name>
+ <name>UIMA-AS: ${project.artifactId}</name>
<description>Apache UIMA-AS Camel Driver</description>
<url>http://incubator.apache.org/uima</url>
Modified: uima/uima-as/branches/mavenAlign/uimaj-as-core/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/branches/mavenAlign/uimaj-as-core/pom.xml?rev=941935&r1=941934&r2=941935&view=diff
==============================================================================
--- uima/uima-as/branches/mavenAlign/uimaj-as-core/pom.xml (original)
+++ uima/uima-as/branches/mavenAlign/uimaj-as-core/pom.xml Thu May 6 21:24:51 2010
@@ -34,7 +34,7 @@
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-as-core</artifactId>
<version>2.3.1-SNAPSHOT</version>
- <name>Apache UIMA Async Scaleout core</name>
+ <name>UIMA-AS: ${project.artifactId}</name>
<url>http://incubator.apache.org/uima</url>
<!-- Special inheritance note
Modified: uima/uima-as/branches/mavenAlign/uimaj-as-osgi-runtime/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/branches/mavenAlign/uimaj-as-osgi-runtime/pom.xml?rev=941935&r1=941934&r2=941935&view=diff
==============================================================================
--- uima/uima-as/branches/mavenAlign/uimaj-as-osgi-runtime/pom.xml (original)
+++ uima/uima-as/branches/mavenAlign/uimaj-as-osgi-runtime/pom.xml Thu May 6 21:24:51 2010
@@ -31,7 +31,7 @@
<artifactId>uimaj-as-osgi-runtime</artifactId>
<packaging>jar</packaging>
<version>2.3.1-SNAPSHOT</version>
- <name>Apache UIMA AS OSGI Runtime Fragment</name>
+ <name>UIMA AS: ${project.artifact}</name>
<description>Apache UIMA AS runtime code packaged for osgi use</description>
<url>http://incubator.apache.org/uima</url>
Propchange: uima/uima-as/branches/mavenAlign/uimaj-eclipse-feature-deployeditor/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu May 6 21:24:51 2010
@@ -1,3 +1,4 @@
.project
build.properties
target
+.settings
Added: uima/uima-as/branches/mavenAlign/uimaj-eclipse-feature-deployeditor/.classpath
URL: http://svn.apache.org/viewvc/uima/uima-as/branches/mavenAlign/uimaj-eclipse-feature-deployeditor/.classpath?rev=941935&view=auto
==============================================================================
--- uima/uima-as/branches/mavenAlign/uimaj-eclipse-feature-deployeditor/.classpath (added)
+++ uima/uima-as/branches/mavenAlign/uimaj-eclipse-feature-deployeditor/.classpath Thu May 6 21:24:51 2010
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: uima/uima-as/branches/mavenAlign/uimaj-eclipse-feature-deployeditor/.project
URL: http://svn.apache.org/viewvc/uima/uima-as/branches/mavenAlign/uimaj-eclipse-feature-deployeditor/.project?rev=941935&r1=941934&r2=941935&view=diff
==============================================================================
--- uima/uima-as/branches/mavenAlign/uimaj-eclipse-feature-deployeditor/.project (original)
+++ uima/uima-as/branches/mavenAlign/uimaj-eclipse-feature-deployeditor/.project Thu May 6 21:24:51 2010
@@ -1,22 +1,4 @@
<?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.
--->
<projectDescription>
<name>uimaj-eclipse-feature-deployeditor</name>
<comment></comment>
@@ -24,12 +6,24 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
-</projectDescription>
\ No newline at end of file
+</projectDescription>