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 2008/09/04 23:22:03 UTC
svn commit: r692252 - in /incubator/uima/uimaj/trunk/uimaj-ep-jcasgen: ./
src/main/assembly/ src/main/java/org/apache/uima/jcas/jcasgenp/
Author: schor
Date: Thu Sep 4 14:22:02 2008
New Revision: 692252
URL: http://svn.apache.org/viewvc?rev=692252&view=rev
Log:
[UIMA-1163] set native eol-style, also fix mixed line-endings for pom.xml and assemble-plugin.xml
Modified:
incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/plugin.xml (props changed)
incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml (contents, props changed)
incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/assembly/assemble-plugin.xml (contents, props changed)
incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/EP_LogThrowErrorImpl.java (props changed)
incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPlugin.java (props changed)
incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPluginRunner.java (props changed)
incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/MergerImpl.java (props changed)
incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/ProgressMonitorImpl.java (props changed)
Propchange: incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/plugin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml?rev=692252&r1=692251&r2=692252&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml Thu Sep 4 14:22:02 2008
@@ -1,85 +1,85 @@
-<!--
- 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.
--->
-
+<!--
+ 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.
+-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <!-- groupId omitted - inherited from parent -->
+ <!-- groupId omitted - inherited from parent -->
<artifactId>uimaj-ep-jcasgen</artifactId>
<packaging>bundle</packaging>
- <!-- version omitted - inherited from parent-->
+ <!-- version omitted - inherited from parent-->
<name>Apache UIMA JCasGen Eclipse Plugin</name>
- <url>http://incubator.apache.org/uima</url>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <scm>
- <url>http://svn.apache.org/viewvc/incubator/uima</url>
+ <url>http://incubator.apache.org/uima</url>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <scm>
+ <url>http://svn.apache.org/viewvc/incubator/uima</url>
</scm>
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-eclipse-plugins</artifactId>
<version>2.3.0.incubating-SNAPSHOT</version> <!-- this comment is a flag for changeVersion -->
</parent>
- <dependencies>
- <!-- UIMA dependencies -->
- <!-- don't depend on the runtime plugin, instead,
- depend on the parts needed -->
- <!--dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-ep-runtime</artifactId>
- <version>${uimaj-release-eclipse-version}</version>
- <scope>compile</scope>
- </dependency-->
+ <dependencies>
+ <!-- UIMA dependencies -->
+ <!-- don't depend on the runtime plugin, instead,
+ depend on the parts needed -->
+ <!--dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-ep-runtime</artifactId>
+ <version>${uimaj-release-eclipse-version}</version>
+ <scope>compile</scope>
+ </dependency-->
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
<version>${uimaj-release-version}</version>
<scope>compile</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-tools</artifactId>
<version>${uimaj-release-version}</version>
<scope>compile</scope>
- </dependency>
-
+ </dependency>
+
<!-- Eclipse dependencies -->
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>org.eclipse.core.runtime</artifactId>
- <version>3.2.0</version>
- <scope>provided</scope>
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>org.eclipse.core.runtime</artifactId>
+ <version>3.2.0</version>
+ <scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>org.eclipse.core.runtime.compatibility</artifactId>
- <version>3.1.100</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>org.eclipse.core.runtime.compatibility</artifactId>
+ <version>3.1.100</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
@@ -91,41 +91,41 @@
<artifactId>codegen</artifactId>
<version>2.1.0</version>
<scope>provided</scope>
- </dependency>
- </dependencies>
+ </dependency>
+ </dependencies>
- <build>
+ <build>
- <finalName>org.apache.uima.jcas.jcasgenp_${uimaj-release-eclipse-version}</finalName>
-
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <!-- version 1.4.0 to support _nouses instruction -->
- <version>1.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <manifestLocation>META-INF</manifestLocation>
- <instructions>
- <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
- <_nouses>true</_nouses>
- <Export-Package>
- org.apache.uima.jcas.jcasgenp
- </Export-Package>
- <Bundle-Activator>org.eclipse.core.internal.compatibility.PluginActivator</Bundle-Activator>
- <!-- these next imports are needed by Eclipse to get things to compile, but
- not needed by maven -->
- <Import-Package>*,
- org.eclipse.core.runtime.jobs,
- org.osgi.framework
- </Import-Package>
- <Bundle-SymbolicName>org.apache.uima.jcas.jcasgenp;singleton:=true</Bundle-SymbolicName>
- <Eclipse-AutoStart>true</Eclipse-AutoStart>
- <Plugin-Class>org.apache.uima.jcas.jcasgenp.JgPlugin</Plugin-Class>
- </instructions>
- </configuration>
- </plugin>
+ <finalName>org.apache.uima.jcas.jcasgenp_${uimaj-release-eclipse-version}</finalName>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <!-- version 1.4.0 to support _nouses instruction -->
+ <version>1.4.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <!-- turn off "uses" generation because Eclipse 3.2.x doesn't work with them -->
+ <_nouses>true</_nouses>
+ <Export-Package>
+ org.apache.uima.jcas.jcasgenp
+ </Export-Package>
+ <Bundle-Activator>org.eclipse.core.internal.compatibility.PluginActivator</Bundle-Activator>
+ <!-- these next imports are needed by Eclipse to get things to compile, but
+ not needed by maven -->
+ <Import-Package>*,
+ org.eclipse.core.runtime.jobs,
+ org.osgi.framework
+ </Import-Package>
+ <Bundle-SymbolicName>org.apache.uima.jcas.jcasgenp;singleton:=true</Bundle-SymbolicName>
+ <Eclipse-AutoStart>true</Eclipse-AutoStart>
+ <Plugin-Class>org.apache.uima.jcas.jcasgenp.JgPlugin</Plugin-Class>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
Propchange: incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/assembly/assemble-plugin.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/assembly/assemble-plugin.xml?rev=692252&r1=692251&r2=692252&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/assembly/assemble-plugin.xml (original)
+++ incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/assembly/assemble-plugin.xml Thu Sep 4 14:22:02 2008
@@ -1,22 +1,22 @@
<assembly>
-<!--
- 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.
--->
+<!--
+ 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.
+-->
<id>plugin</id>
<formats>
<format>zip</format>
Propchange: incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/assembly/assemble-plugin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/EP_LogThrowErrorImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPlugin.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/JgPluginRunner.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/MergerImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/uima/uimaj/trunk/uimaj-ep-jcasgen/src/main/java/org/apache/uima/jcas/jcasgenp/ProgressMonitorImpl.java
------------------------------------------------------------------------------
svn:eol-style = native