You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by to...@apache.org on 2009/09/03 12:16:18 UTC
svn commit: r810863 - in /incubator/uima/sandbox/trunk: SimpleServer/
SimpleServer/src/main/assembly/ SimpleUimaAsService/
SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/
Author: tommaso
Date: Thu Sep 3 10:16:17 2009
New Revision: 810863
URL: http://svn.apache.org/viewvc?rev=810863&view=rev
Log:
[UIMA-1462] SimpleUimaAsService has checked in SimpleServer libraries as binaries
Added:
incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/
incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml
Modified:
incubator/uima/sandbox/trunk/SimpleServer/pom.xml
incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml
incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java
Modified: incubator/uima/sandbox/trunk/SimpleServer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/pom.xml?rev=810863&r1=810862&r2=810863&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/pom.xml (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/pom.xml Thu Sep 3 10:16:17 2009
@@ -1,103 +1,244 @@
-<!--
- 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"
+ <!--
+ 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>org.apache.uima</groupId>
<artifactId>SimpleServer</artifactId>
<packaging>jar</packaging>
- <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a flag for changeVersion -->
+ <version>2.3.0-incubating-SNAPSHOT</version>
<name>Apache UIMA Simple Server</name>
-
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>SandboxDistr</artifactId>
- <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a flag for changeVersion -->
- <relativePath>../SandboxDistr</relativePath>
- </parent>
-
- <dependencies>
- <!-- versions from parent -->
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-test-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-component-test-util</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.uima.xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>${basedir}/lib/xbean.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>org.apache.uima.xmlbeans</groupId>
- <artifactId>jsr-173-api</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>${basedir}/lib/jsr173_1.0_api.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>org.apache.uima.xmlbeans</groupId>
- <artifactId>uima-simple-server-xbean</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>${basedir}/lib/uima-simple-server-xbean.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.8</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.0-alpha2</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
+ <url>http://incubator.apache.org/uima</url>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-core</artifactId>
+ <version>2.3.0-incubating-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-test-util</artifactId>
+ <version>2.3.0-incubating-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-component-test-util</artifactId>
+ <version>2.3.0-incubating-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima.xmlbeans</groupId>
+ <artifactId>uima-simple-server-xbean</artifactId>
+ <version>1.0</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/uima-simple-server-xbean.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.8</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.0-alpha2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>2.2.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
<build>
<finalName>uima-simple-server</finalName>
- </build>
-
-</project>
-
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <format>{0,date,yyyy-MM-dd HH:mm:ss}</format>
+ <items>
+ <item>timestamp</item>
+ </items>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>CopyLicenseNoticeDisclaimer</id>
+ <phase>process-resources</phase>
+ <configuration>
+ <tasks>
+ <copy todir="src/main/resources/META-INF">
+ <fileset dir="." includes="LICENSE NOTICE DISCLAIMER" />
+ </copy>
+ <copy todir="target/classes/META-INF">
+ <fileset dir="." includes="LICENSE.txt NOTICE.txt DISCLAIMER" />
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <!--
+ after compilation has been done and the files have been copied to
+ the target directory, delete them from the source directory.
+ -->
+ <execution>
+ <id>DeleteLicenseNoticeDisclaimer</id>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <delete dir="src/main/resources/META-INF" deleteOnExit="true"
+ quiet="true" failOnError="false">
+ <fileset dir="src/main/resources/META-INF" includes="LICENSE NOTICE DISCLAIMER" />
+ </delete>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <!-- also delete on clean. -->
+ <execution>
+ <id>CleanLicenseNoticeDisclaimer</id>
+ <phase>clean</phase>
+ <configuration>
+ <tasks>
+ <delete dir="src/main/resources/META-INF" deleteOnExit="true"
+ quiet="true" failOnError="false">
+ <fileset dir="src/main/resources/META-INF" includes="LICENSE NOTICE DISCLAIMER" />
+ </delete>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <!-- Build documentation -->
+ <ant antfile="build_documentation.xml" target="copyDocs" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Project-Title>Apache UIMA</Project-Title>
+ <Implementation-Title>${pom.name}</Implementation-Title>
+ <Implementation-Version>${pom.version}</Implementation-Version>
+ <Implementation-Vendor>Apache Software Foundation</Implementation-Vendor>
+ <Implementation-Url>${pom.url}</Implementation-Url>
+ <Implementation-License>http://www.apache.org/licenses/LICENSE-2.0.txt</Implementation-License>
+ <Build-Date>${buildNumber}</Build-Date>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/distribution.xml</descriptor>
+ </descriptors>
+ <archive>
+ <manifestEntries>
+ <Project-Title>Apache UIMA</Project-Title>
+ <Implementation-Title>${pom.name}</Implementation-Title>
+ <Implementation-Version>${pom.version}</Implementation-Version>
+ <Implementation-Vendor>Apache Software Foundation</Implementation-Vendor>
+ <Implementation-Url>${pom.url}</Implementation-Url>
+ <Implementation-License>http://www.apache.org/licenses/LICENSE-2.0.txt</Implementation-License>
+ <Build-Date>${buildNumber}</Build-Date>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <repository>
+ <id>ApacheIncubatorRepository</id>
+ <url>http://people.apache.org/repo/m2-incubating-repository/</url>
+ </repository>
+ </repositories>
+</project>
\ No newline at end of file
Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml?rev=810863&view=auto
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml (added)
+++ incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml Thu Sep 3 10:16:17 2009
@@ -0,0 +1,29 @@
+<assembly>
+ <id>distribution</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib/${artifact.groupId}</outputDirectory>
+ <unpack>false</unpack>
+ <scope>system</scope>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>lib/${artifact.groupId}</outputDirectory>
+ <unpack>false</unpack>
+ <scope>compile</scope>
+ <includes>
+ <include>javax.xml.bind:jsr173_api</include>
+ <include>xmlbeans:xbean</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Modified: incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml?rev=810863&r1=810862&r2=810863&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml (original)
+++ incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml Thu Sep 3 10:16:17 2009
@@ -1,21 +1,19 @@
-<!--
- 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"
@@ -40,34 +38,6 @@
<version>2.4</version>
</dependency>
<dependency>
- <groupId>org.apache.uima.xmlbeans</groupId>
- <artifactId>jsr-173-api</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>${basedir}/lib/jsr173_1.0_api.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>local.xmlbeans.dependency</groupId>
- <artifactId>xsdbeans</artifactId>
- <version>2.2</version>
- <scope>system</scope>
- <systemPath>${basedir}/lib/xbean.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>org.apache.uima.xmlbeans</groupId>
- <artifactId>uima-simple-server-xbean</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>${basedir}/lib/uima-simple-server-xbean.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>org.apache.uima</groupId>
- <artifactId>uima-simple-server</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>${basedir}/lib/uima-simple-server.jar</systemPath>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.0</version>
@@ -85,6 +55,19 @@
<version>2.3.0-incubating-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>SimpleServer</artifactId>
+ <version>2.3.0-incubating-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>2.2.0</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
<finalName>simple-uima-as-service</finalName>
@@ -98,7 +81,7 @@
<target>1.5</target>
</configuration>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<executions>
@@ -167,9 +150,7 @@
<repositories>
<repository>
<id>ApacheIncubatorRepository</id>
- <url>
- http://people.apache.org/repo/m2-incubating-repository/
- </url>
+ <url>http://people.apache.org/repo/m2-incubating-repository/</url>
</repository>
</repositories>
</project>
Modified: incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java?rev=810863&r1=810862&r2=810863&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java (original)
+++ incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java Thu Sep 3 10:16:17 2009
@@ -20,7 +20,6 @@
import java.io.File;
import java.io.FileOutputStream;
-import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.HashMap;
@@ -37,12 +36,9 @@
import org.apache.uima.cas.Type;
import org.apache.uima.cas.impl.XmiCasSerializer;
import org.apache.uima.collection.EntityProcessStatus;
-import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.ResourceProcessException;
import org.apache.uima.simpleserver.Service;
-import org.apache.uima.simpleserver.SimpleServerException;
import org.apache.uima.simpleserver.output.Result;
-import org.apache.xmlbeans.XmlException;
public class UimaAsSerive extends Service {
Re: svn commit: r810863 - in /incubator/uima/sandbox/trunk:
SimpleServer/ SimpleServer/src/main/assembly/ SimpleUimaAsService/
SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/
Posted by Tommaso Teofili <to...@gmail.com>.
For SVN I've always used SVN plugin for Eclipse: Subclipse (I'm using
Eclipse Galileo) .
I updated SimpleServer with Subclipse, then applied the patch I made some
weeks ago ( https://issues.apache.org/jira/browse/UIMA-1462 )
Then some conflicts between patch and latest revision came out that had to
be merged, I for sure missed something there.
The problem is that the patch was made before some changes on the POM so
that conflicts came out .
Tommaso
2009/9/3 Marshall Schor <ms...@schor.com>
> Tommaso - I'm curious to know a bit more how this could have happened.
> The tools that I use for SVN commits (mainly the SVN plugin for Eclipse)
> prevent me from committing a change if I haven't done an update to the
> latest level, and resolved any conflicts.
>
> What tooling are you using to do SVN commits?
>
> -Marshall
>
> Tommaso Teofili wrote:
> > Marhsall, I am afraid, you are right, some lines have not been merged
> > properly.
> > Do you know how can I fix it without changing revision?
> > Tommaso
> >
> > 2009/9/3 Marshall Schor <ms...@schor.com>
> >
> >
> >> Tommaso, I see some issues with this commit.
> >>
> >> Looking at the SimpleServer/pom.xml changes, it looks like your changes
> >> undid the previous-to-yours changes, done in revision 807268. Did you
> >> do that on purpose?
> >>
> >> -Marshall
> >>
> >> tommaso@apache.org wrote:
> >>
> >>> Author: tommaso
> >>> Date: Thu Sep 3 10:16:17 2009
> >>> New Revision: 810863
> >>>
> >>> URL: http://svn.apache.org/viewvc?rev=810863&view=rev
> >>> Log:
> >>> [UIMA-1462] SimpleUimaAsService has checked in SimpleServer libraries
> as
> >>>
> >> binaries
> >>
> >>> Added:
> >>> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/
> >>>
> >>>
> >>
> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml
> >>
> >>> Modified:
> >>> incubator/uima/sandbox/trunk/SimpleServer/pom.xml
> >>> incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml
> >>>
> >>>
> >>
> incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java
> >>
> >>> Modified: incubator/uima/sandbox/trunk/SimpleServer/pom.xml
> >>> URL:
> >>>
> >>
> http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/pom.xml?rev=810863&r1=810862&r2=810863&view=diff
> >>
> >>
> ==============================================================================
> >>
> >>> --- incubator/uima/sandbox/trunk/SimpleServer/pom.xml (original)
> >>> +++ incubator/uima/sandbox/trunk/SimpleServer/pom.xml Thu Sep 3
> 10:16:17
> >>>
> >> 2009
> >>
> >>> @@ -1,103 +1,244 @@
> >>> -<!--
> >>> - 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"
> >>> + <!--
> >>> + 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>org.apache.uima</groupId>
> >>> <artifactId>SimpleServer</artifactId>
> >>> <packaging>jar</packaging>
> >>> - <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is
> a
> >>>
> >> flag for changeVersion -->
> >>
> >>> + <version>2.3.0-incubating-SNAPSHOT</version>
> >>> <name>Apache UIMA Simple Server</name>
> >>> -
> >>> - <parent>
> >>> - <groupId>org.apache.uima</groupId>
> >>> - <artifactId>SandboxDistr</artifactId>
> >>> - <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is
> a
> >>>
> >> flag for changeVersion -->
> >>
> >>> - <relativePath>../SandboxDistr</relativePath>
> >>> - </parent>
> >>> -
> >>> - <dependencies>
> >>> - <!-- versions from parent -->
> >>> - <dependency>
> >>> - <groupId>org.apache.uima</groupId>
> >>> - <artifactId>uimaj-core</artifactId>
> >>> - </dependency>
> >>> - <dependency>
> >>> - <groupId>org.apache.uima</groupId>
> >>> - <artifactId>uimaj-test-util</artifactId>
> >>> - </dependency>
> >>> - <dependency>
> >>> - <groupId>org.apache.uima</groupId>
> >>> - <artifactId>uimaj-component-test-util</artifactId>
> >>> - </dependency>
> >>> -
> >>> - <dependency>
> >>> - <groupId>javax.servlet</groupId>
> >>> - <artifactId>servlet-api</artifactId>
> >>> - <version>2.4</version>
> >>> - </dependency>
> >>> - <dependency>
> >>> - <groupId>org.apache.uima.xmlbeans</groupId>
> >>> - <artifactId>xbean</artifactId>
> >>> - <version>1.0</version>
> >>> - <scope>system</scope>
> >>> - <systemPath>${basedir}/lib/xbean.jar</systemPath>
> >>> - </dependency>
> >>> - <dependency>
> >>> - <groupId>org.apache.uima.xmlbeans</groupId>
> >>> - <artifactId>jsr-173-api</artifactId>
> >>> - <version>1.0</version>
> >>> - <scope>system</scope>
> >>> - <systemPath>${basedir}/lib/jsr173_1.0_api.jar</systemPath>
> >>> - </dependency>
> >>> - <dependency>
> >>> - <groupId>org.apache.uima.xmlbeans</groupId>
> >>> - <artifactId>uima-simple-server-xbean</artifactId>
> >>> - <version>1.0</version>
> >>> - <scope>system</scope>
> >>> -
> >>>
> >> <systemPath>${basedir}/lib/uima-simple-server-xbean.jar</systemPath>
> >>
> >>> - </dependency>
> >>> - <dependency>
> >>> - <groupId>junit</groupId>
> >>> - <artifactId>junit</artifactId>
> >>> - <version>4.0</version>
> >>> - <scope>compile</scope>
> >>> - </dependency>
> >>> - <dependency>
> >>> - <groupId>org.mortbay.jetty</groupId>
> >>> - <artifactId>jetty</artifactId>
> >>> - <version>6.1.8</version>
> >>> - <scope>compile</scope>
> >>> - </dependency>
> >>> - <dependency>
> >>> - <groupId>org.apache.httpcomponents</groupId>
> >>> - <artifactId>httpclient</artifactId>
> >>> - <version>4.0-alpha2</version>
> >>> - <scope>compile</scope>
> >>> - </dependency>
> >>> - </dependencies>
> >>> -
> >>> + <url>http://incubator.apache.org/uima</url>
> >>> + <dependencies>
> >>> + <dependency>
> >>> + <groupId>org.apache.uima</groupId>
> >>> + <artifactId>uimaj-core</artifactId>
> >>> + <version>2.3.0-incubating-SNAPSHOT</version>
> >>> + <scope>compile</scope>
> >>> + </dependency>
> >>> + <dependency>
> >>> + <groupId>org.apache.uima</groupId>
> >>> + <artifactId>uimaj-test-util</artifactId>
> >>> + <version>2.3.0-incubating-SNAPSHOT</version>
> >>> + <scope>compile</scope>
> >>> + </dependency>
> >>> + <dependency>
> >>> + <groupId>org.apache.uima</groupId>
> >>> +
> <artifactId>uimaj-component-test-util</artifactId>
> >>> + <version>2.3.0-incubating-SNAPSHOT</version>
> >>> + <scope>compile</scope>
> >>> + </dependency>
> >>> + <dependency>
> >>> + <groupId>javax.servlet</groupId>
> >>> + <artifactId>servlet-api</artifactId>
> >>> + <version>2.4</version>
> >>> + <scope>compile</scope>
> >>> + </dependency>
> >>> + <dependency>
> >>> + <groupId>org.apache.uima.xmlbeans</groupId>
> >>> + <artifactId>uima-simple-server-xbean</artifactId>
> >>> + <version>1.0</version>
> >>> + <scope>system</scope>
> >>> +
> >>>
> >> <systemPath>${basedir}/lib/uima-simple-server-xbean.jar</systemPath>
> >>
> >>> + </dependency>
> >>> + <dependency>
> >>> + <groupId>junit</groupId>
> >>> + <artifactId>junit</artifactId>
> >>> + <version>4.0</version>
> >>> + <scope>test</scope>
> >>> + </dependency>
> >>> + <dependency>
> >>> + <groupId>org.mortbay.jetty</groupId>
> >>> + <artifactId>jetty</artifactId>
> >>> + <version>6.1.8</version>
> >>> + <scope>compile</scope>
> >>> + </dependency>
> >>> + <dependency>
> >>> + <groupId>org.apache.httpcomponents</groupId>
> >>> + <artifactId>httpclient</artifactId>
> >>> + <version>4.0-alpha2</version>
> >>> + <scope>compile</scope>
> >>> + </dependency>
> >>> + <dependency>
> >>> + <groupId>xmlbeans</groupId>
> >>> + <artifactId>xbean</artifactId>
> >>> + <version>2.2.0</version>
> >>> + <scope>compile</scope>
> >>> + </dependency>
> >>> + <dependency>
> >>> + <groupId>javax.xml.bind</groupId>
> >>> + <artifactId>jsr173_api</artifactId>
> >>> + <version>1.0</version>
> >>> + <scope>compile</scope>
> >>> + </dependency>
> >>> + </dependencies>
> >>> <build>
> >>> <finalName>uima-simple-server</finalName>
> >>> - </build>
> >>> -
> >>> -</project>
> >>> -
> >>> + <plugins>
> >>> + <plugin>
> >>> +
> <groupId>org.apache.maven.plugins</groupId>
> >>> +
> >>>
> >> <artifactId>maven-compiler-plugin</artifactId>
> >>
> >>> + <configuration>
> >>> + <source>1.5</source>
> >>> + <target>1.5</target>
> >>> + <encoding>UTF-8</encoding>
> >>> + </configuration>
> >>> + </plugin>
> >>> + <plugin>
> >>> + <groupId>org.codehaus.mojo</groupId>
> >>> +
> >>>
> >> <artifactId>buildnumber-maven-plugin</artifactId>
> >>
> >>> + <executions>
> >>> + <execution>
> >>> +
> >>>
> >> <phase>process-classes</phase>
> >>
> >>> + <goals>
> >>> +
> <goal>create</goal>
> >>> + </goals>
> >>> + </execution>
> >>> + </executions>
> >>> + <configuration>
> >>> + <format>{0,date,yyyy-MM-dd
> >>>
> >> HH:mm:ss}</format>
> >>
> >>> + <items>
> >>> + <item>timestamp</item>
> >>> + </items>
> >>> + </configuration>
> >>> + </plugin>
> >>> + <plugin>
> >>> +
> <groupId>org.apache.maven.plugins</groupId>
> >>> +
> >>>
> >> <artifactId>maven-antrun-plugin</artifactId>
> >>
> >>> + <executions>
> >>> + <execution>
> >>> +
> >>>
> >> <id>CopyLicenseNoticeDisclaimer</id>
> >>
> >>> +
> >>>
> >> <phase>process-resources</phase>
> >>
> >>> + <configuration>
> >>> + <tasks>
> >>> + <copy
> >>>
> >> todir="src/main/resources/META-INF">
> >>
> >>> +
> >>>
> >> <fileset dir="." includes="LICENSE NOTICE DISCLAIMER" />
> >>
> >>> + </copy>
> >>> + <copy
> >>>
> >> todir="target/classes/META-INF">
> >>
> >>> +
> >>>
> >> <fileset dir="." includes="LICENSE.txt NOTICE.txt DISCLAIMER" />
> >>
> >>> + </copy>
> >>> + </tasks>
> >>> + </configuration>
> >>> + <goals>
> >>> + <goal>run</goal>
> >>> + </goals>
> >>> + </execution>
> >>> + <!--
> >>> + after compilation has
> been
> >>>
> >> done and the files have been copied to
> >>
> >>> + the target directory,
> >>>
> >> delete them from the source directory.
> >>
> >>> + -->
> >>> + <execution>
> >>> +
> >>>
> >> <id>DeleteLicenseNoticeDisclaimer</id>
> >>
> >>> + <phase>package</phase>
> >>> + <configuration>
> >>> + <tasks>
> >>> + <delete
> >>>
> >> dir="src/main/resources/META-INF" deleteOnExit="true"
> >>
> >>> +
> >>>
> >> quiet="true" failOnError="false">
> >>
> >>> +
> >>>
> >> <fileset dir="src/main/resources/META-INF" includes="LICENSE NOTICE
> >> DISCLAIMER" />
> >>
> >>> + </delete>
> >>> + </tasks>
> >>> + </configuration>
> >>> + <goals>
> >>> + <goal>run</goal>
> >>> + </goals>
> >>> + </execution>
> >>> + <!-- also delete on clean. -->
> >>> + <execution>
> >>> +
> >>>
> >> <id>CleanLicenseNoticeDisclaimer</id>
> >>
> >>> + <phase>clean</phase>
> >>> + <configuration>
> >>> + <tasks>
> >>> + <delete
> >>>
> >> dir="src/main/resources/META-INF" deleteOnExit="true"
> >>
> >>> +
> >>>
> >> quiet="true" failOnError="false">
> >>
> >>> +
> >>>
> >> <fileset dir="src/main/resources/META-INF" includes="LICENSE NOTICE
> >> DISCLAIMER" />
> >>
> >>> + </delete>
> >>> + </tasks>
> >>> + </configuration>
> >>> + <goals>
> >>> + <goal>run</goal>
> >>> + </goals>
> >>> + </execution>
> >>> + <execution>
> >>> + <phase>package</phase>
> >>> + <configuration>
> >>> + <tasks>
> >>> + <!--
> Build
> >>>
> >> documentation -->
> >>
> >>> + <ant
> >>>
> >> antfile="build_documentation.xml" target="copyDocs" />
> >>
> >>> + </tasks>
> >>> + </configuration>
> >>> + <goals>
> >>> + <goal>run</goal>
> >>> + </goals>
> >>> + </execution>
> >>> + </executions>
> >>> + </plugin>
> >>> + <plugin>
> >>> +
> <groupId>org.apache.maven.plugins</groupId>
> >>> + <artifactId>maven-jar-plugin</artifactId>
> >>> + <configuration>
> >>> + <archive>
> >>> + <manifestEntries>
> >>> +
> >>>
> >> <Project-Title>Apache UIMA</Project-Title>
> >>
> >>> +
> >>>
> >> <Implementation-Title>${pom.name}</Implementation-Title>
> >>
> >>> +
> >>>
> >> <Implementation-Version>${pom.version}</Implementation-Version>
> >>
> >>> +
> >>>
> >> <Implementation-Vendor>Apache Software
> Foundation</Implementation-Vendor>
> >>
> >>> +
> >>>
> >> <Implementation-Url>${pom.url}</Implementation-Url>
> >>
> >>> +
> >>>
> >> <Implementation-License>http://www.apache.org/licenses/LICENSE-2.0.txt
> >> </Implementation-License>
> >>
> >>> +
> >>>
> >> <Build-Date>${buildNumber}</Build-Date>
> >>
> >>> + </manifestEntries>
> >>> + </archive>
> >>> + </configuration>
> >>> + </plugin>
> >>> + <plugin>
> >>> +
> <groupId>org.apache.maven.plugins</groupId>
> >>> +
> >>>
> >> <artifactId>maven-assembly-plugin</artifactId>
> >>
> >>> + <configuration>
> >>> + <descriptors>
> >>> +
> >>>
> >> <descriptor>src/main/assembly/distribution.xml</descriptor>
> >>
> >>> + </descriptors>
> >>> + <archive>
> >>> + <manifestEntries>
> >>> +
> >>>
> >> <Project-Title>Apache UIMA</Project-Title>
> >>
> >>> +
> >>>
> >> <Implementation-Title>${pom.name}</Implementation-Title>
> >>
> >>> +
> >>>
> >> <Implementation-Version>${pom.version}</Implementation-Version>
> >>
> >>> +
> >>>
> >> <Implementation-Vendor>Apache Software
> Foundation</Implementation-Vendor>
> >>
> >>> +
> >>>
> >> <Implementation-Url>${pom.url}</Implementation-Url>
> >>
> >>> +
> >>>
> >> <Implementation-License>http://www.apache.org/licenses/LICENSE-2.0.txt
> >> </Implementation-License>
> >>
> >>> +
> >>>
> >> <Build-Date>${buildNumber}</Build-Date>
> >>
> >>> + </manifestEntries>
> >>> + </archive>
> >>> + </configuration>
> >>> + <executions>
> >>> + <execution>
> >>> + <id>make-assembly</id>
> >>> + <phase>package</phase>
> >>> + <goals>
> >>> +
> <goal>single</goal>
> >>> + </goals>
> >>> + </execution>
> >>> + </executions>
> >>> + </plugin>
> >>> + </plugins>
> >>> + </build>
> >>> + <repositories>
> >>> + <repository>
> >>> + <id>ApacheIncubatorRepository</id>
> >>> + <url>
> >>>
> >> http://people.apache.org/repo/m2-incubating-repository/</url>
> >>
> >>> + </repository>
> >>> + </repositories>
> >>> +</project>
> >>> \ No newline at end of file
> >>>
> >>> Added:
> >>>
> >>
> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml
> >>
> >>> URL:
> >>>
> >>
> http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml?rev=810863&view=auto
> >>
> >>
> ==============================================================================
> >>
> >>> ---
> >>>
> >>
> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml
> >> (added)
> >>
> >>> +++
> >>>
> >>
> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml
> >> Thu Sep 3 10:16:17 2009
> >>
> >>> @@ -0,0 +1,29 @@
> >>> +<assembly>
> >>> + <id>distribution</id>
> >>> + <formats>
> >>> + <format>jar</format>
> >>> + </formats>
> >>> + <includeBaseDirectory>false</includeBaseDirectory>
> >>> + <dependencySets>
> >>> + <dependencySet>
> >>> +
> >>>
> >> <outputDirectory>lib/${artifact.groupId}</outputDirectory>
> >>
> >>> + <unpack>false</unpack>
> >>> + <scope>system</scope>
> >>> + </dependencySet>
> >>> + <dependencySet>
> >>> +
> >>>
> >> <outputDirectory>lib/${artifact.groupId}</outputDirectory>
> >>
> >>> + <unpack>false</unpack>
> >>> + <scope>compile</scope>
> >>> + <includes>
> >>> +
> >>>
> >> <include>javax.xml.bind:jsr173_api</include>
> >>
> >>> + <include>xmlbeans:xbean</include>
> >>> + </includes>
> >>> + </dependencySet>
> >>> + </dependencySets>
> >>> + <fileSets>
> >>> + <fileSet>
> >>> + <directory>target/classes</directory>
> >>> + <outputDirectory></outputDirectory>
> >>> + </fileSet>
> >>> + </fileSets>
> >>> +</assembly>
> >>> \ No newline at end of file
> >>>
> >>> Modified: incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml
> >>> URL:
> >>>
> >>
> http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml?rev=810863&r1=810862&r2=810863&view=diff
> >>
> >>
> ==============================================================================
> >>
> >>> --- incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml (original)
> >>> +++ incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml Thu Sep 3
> >>>
> >> 10:16:17 2009
> >>
> >>> @@ -1,21 +1,19 @@
> >>> -<!--
> >>> - 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"
> >>> @@ -40,34 +38,6 @@
> >>> <version>2.4</version>
> >>> </dependency>
> >>> <dependency>
> >>> - <groupId>org.apache.uima.xmlbeans</groupId>
> >>> - <artifactId>jsr-173-api</artifactId>
> >>> - <version>1.0</version>
> >>> - <scope>system</scope>
> >>> - <systemPath>${basedir}/lib/jsr173_1.0_api.jar</systemPath>
> >>> - </dependency>
> >>> - <dependency>
> >>> - <groupId>local.xmlbeans.dependency</groupId>
> >>> - <artifactId>xsdbeans</artifactId>
> >>> - <version>2.2</version>
> >>> - <scope>system</scope>
> >>> - <systemPath>${basedir}/lib/xbean.jar</systemPath>
> >>> - </dependency>
> >>> - <dependency>
> >>> - <groupId>org.apache.uima.xmlbeans</groupId>
> >>> - <artifactId>uima-simple-server-xbean</artifactId>
> >>> - <version>1.0</version>
> >>> - <scope>system</scope>
> >>> -
> >>>
> >> <systemPath>${basedir}/lib/uima-simple-server-xbean.jar</systemPath>
> >>
> >>> - </dependency>
> >>> - <dependency>
> >>> - <groupId>org.apache.uima</groupId>
> >>> - <artifactId>uima-simple-server</artifactId>
> >>> - <version>1.0</version>
> >>> - <scope>system</scope>
> >>> -
> >>>
> >> <systemPath>${basedir}/lib/uima-simple-server.jar</systemPath>
> >>
> >>> - </dependency>
> >>> - <dependency>
> >>> <groupId>junit</groupId>
> >>> <artifactId>junit</artifactId>
> >>> <version>4.0</version>
> >>> @@ -85,6 +55,19 @@
> >>> <version>2.3.0-incubating-SNAPSHOT</version>
> >>> <scope>compile</scope>
> >>> </dependency>
> >>> + <dependency>
> >>> + <groupId>org.apache.uima</groupId>
> >>> + <artifactId>SimpleServer</artifactId>
> >>> + <version>2.3.0-incubating-SNAPSHOT</version>
> >>> + <scope>compile</scope>
> >>> + </dependency>
> >>> + <dependency>
> >>> + <groupId>xmlbeans</groupId>
> >>> + <artifactId>xbean</artifactId>
> >>> + <version>2.2.0</version>
> >>> + <scope>compile</scope>
> >>> + <optional>true</optional>
> >>> + </dependency>
> >>> </dependencies>
> >>> <build>
> >>> <finalName>simple-uima-as-service</finalName>
> >>> @@ -98,7 +81,7 @@
> >>> <target>1.5</target>
> >>> </configuration>
> >>> </plugin>
> >>> - <plugin>
> >>> + <plugin>
> >>> <groupId>org.codehaus.mojo</groupId>
> >>> <artifactId>buildnumber-maven-plugin</artifactId>
> >>> <executions>
> >>> @@ -167,9 +150,7 @@
> >>> <repositories>
> >>> <repository>
> >>> <id>ApacheIncubatorRepository</id>
> >>> - <url>
> >>> -
> >>>
> >> http://people.apache.org/repo/m2-incubating-repository/
> >>
> >>> - </url>
> >>> + <url>
> >>>
> >> http://people.apache.org/repo/m2-incubating-repository/</url>
> >>
> >>> </repository>
> >>> </repositories>
> >>> </project>
> >>>
> >>> Modified:
> >>>
> >>
> incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java
> >>
> >>> URL:
> >>>
> >>
> http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java?rev=810863&r1=810862&r2=810863&view=diff
> >>
> >>
> ==============================================================================
> >>
> >>> ---
> >>>
> >>
> incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java
> >> (original)
> >>
> >>> +++
> >>>
> >>
> incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java
> >> Thu Sep 3 10:16:17 2009
> >>
> >>> @@ -20,7 +20,6 @@
> >>>
> >>> import java.io.File;
> >>> import java.io.FileOutputStream;
> >>> -import java.io.IOException;
> >>> import java.net.MalformedURLException;
> >>> import java.net.URL;
> >>> import java.util.HashMap;
> >>> @@ -37,12 +36,9 @@
> >>> import org.apache.uima.cas.Type;
> >>> import org.apache.uima.cas.impl.XmiCasSerializer;
> >>> import org.apache.uima.collection.EntityProcessStatus;
> >>> -import org.apache.uima.resource.ResourceInitializationException;
> >>> import org.apache.uima.resource.ResourceProcessException;
> >>> import org.apache.uima.simpleserver.Service;
> >>> -import org.apache.uima.simpleserver.SimpleServerException;
> >>> import org.apache.uima.simpleserver.output.Result;
> >>> -import org.apache.xmlbeans.XmlException;
> >>>
> >>> public class UimaAsSerive extends Service {
> >>>
> >>>
> >>>
> >>>
> >>>
> >>>
> >>>
> >
> >
>
Re: svn commit: r810863 - in /incubator/uima/sandbox/trunk: SimpleServer/
SimpleServer/src/main/assembly/ SimpleUimaAsService/ SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/
Posted by Marshall Schor <ms...@schor.com>.
Tommaso - I'm curious to know a bit more how this could have happened.
The tools that I use for SVN commits (mainly the SVN plugin for Eclipse)
prevent me from committing a change if I haven't done an update to the
latest level, and resolved any conflicts.
What tooling are you using to do SVN commits?
-Marshall
Tommaso Teofili wrote:
> Marhsall, I am afraid, you are right, some lines have not been merged
> properly.
> Do you know how can I fix it without changing revision?
> Tommaso
>
> 2009/9/3 Marshall Schor <ms...@schor.com>
>
>
>> Tommaso, I see some issues with this commit.
>>
>> Looking at the SimpleServer/pom.xml changes, it looks like your changes
>> undid the previous-to-yours changes, done in revision 807268. Did you
>> do that on purpose?
>>
>> -Marshall
>>
>> tommaso@apache.org wrote:
>>
>>> Author: tommaso
>>> Date: Thu Sep 3 10:16:17 2009
>>> New Revision: 810863
>>>
>>> URL: http://svn.apache.org/viewvc?rev=810863&view=rev
>>> Log:
>>> [UIMA-1462] SimpleUimaAsService has checked in SimpleServer libraries as
>>>
>> binaries
>>
>>> Added:
>>> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/
>>>
>>>
>> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml
>>
>>> Modified:
>>> incubator/uima/sandbox/trunk/SimpleServer/pom.xml
>>> incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml
>>>
>>>
>> incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java
>>
>>> Modified: incubator/uima/sandbox/trunk/SimpleServer/pom.xml
>>> URL:
>>>
>> http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/pom.xml?rev=810863&r1=810862&r2=810863&view=diff
>>
>> ==============================================================================
>>
>>> --- incubator/uima/sandbox/trunk/SimpleServer/pom.xml (original)
>>> +++ incubator/uima/sandbox/trunk/SimpleServer/pom.xml Thu Sep 3 10:16:17
>>>
>> 2009
>>
>>> @@ -1,103 +1,244 @@
>>> -<!--
>>> - 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"
>>> + <!--
>>> + 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>org.apache.uima</groupId>
>>> <artifactId>SimpleServer</artifactId>
>>> <packaging>jar</packaging>
>>> - <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a
>>>
>> flag for changeVersion -->
>>
>>> + <version>2.3.0-incubating-SNAPSHOT</version>
>>> <name>Apache UIMA Simple Server</name>
>>> -
>>> - <parent>
>>> - <groupId>org.apache.uima</groupId>
>>> - <artifactId>SandboxDistr</artifactId>
>>> - <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a
>>>
>> flag for changeVersion -->
>>
>>> - <relativePath>../SandboxDistr</relativePath>
>>> - </parent>
>>> -
>>> - <dependencies>
>>> - <!-- versions from parent -->
>>> - <dependency>
>>> - <groupId>org.apache.uima</groupId>
>>> - <artifactId>uimaj-core</artifactId>
>>> - </dependency>
>>> - <dependency>
>>> - <groupId>org.apache.uima</groupId>
>>> - <artifactId>uimaj-test-util</artifactId>
>>> - </dependency>
>>> - <dependency>
>>> - <groupId>org.apache.uima</groupId>
>>> - <artifactId>uimaj-component-test-util</artifactId>
>>> - </dependency>
>>> -
>>> - <dependency>
>>> - <groupId>javax.servlet</groupId>
>>> - <artifactId>servlet-api</artifactId>
>>> - <version>2.4</version>
>>> - </dependency>
>>> - <dependency>
>>> - <groupId>org.apache.uima.xmlbeans</groupId>
>>> - <artifactId>xbean</artifactId>
>>> - <version>1.0</version>
>>> - <scope>system</scope>
>>> - <systemPath>${basedir}/lib/xbean.jar</systemPath>
>>> - </dependency>
>>> - <dependency>
>>> - <groupId>org.apache.uima.xmlbeans</groupId>
>>> - <artifactId>jsr-173-api</artifactId>
>>> - <version>1.0</version>
>>> - <scope>system</scope>
>>> - <systemPath>${basedir}/lib/jsr173_1.0_api.jar</systemPath>
>>> - </dependency>
>>> - <dependency>
>>> - <groupId>org.apache.uima.xmlbeans</groupId>
>>> - <artifactId>uima-simple-server-xbean</artifactId>
>>> - <version>1.0</version>
>>> - <scope>system</scope>
>>> -
>>>
>> <systemPath>${basedir}/lib/uima-simple-server-xbean.jar</systemPath>
>>
>>> - </dependency>
>>> - <dependency>
>>> - <groupId>junit</groupId>
>>> - <artifactId>junit</artifactId>
>>> - <version>4.0</version>
>>> - <scope>compile</scope>
>>> - </dependency>
>>> - <dependency>
>>> - <groupId>org.mortbay.jetty</groupId>
>>> - <artifactId>jetty</artifactId>
>>> - <version>6.1.8</version>
>>> - <scope>compile</scope>
>>> - </dependency>
>>> - <dependency>
>>> - <groupId>org.apache.httpcomponents</groupId>
>>> - <artifactId>httpclient</artifactId>
>>> - <version>4.0-alpha2</version>
>>> - <scope>compile</scope>
>>> - </dependency>
>>> - </dependencies>
>>> -
>>> + <url>http://incubator.apache.org/uima</url>
>>> + <dependencies>
>>> + <dependency>
>>> + <groupId>org.apache.uima</groupId>
>>> + <artifactId>uimaj-core</artifactId>
>>> + <version>2.3.0-incubating-SNAPSHOT</version>
>>> + <scope>compile</scope>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>org.apache.uima</groupId>
>>> + <artifactId>uimaj-test-util</artifactId>
>>> + <version>2.3.0-incubating-SNAPSHOT</version>
>>> + <scope>compile</scope>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>org.apache.uima</groupId>
>>> + <artifactId>uimaj-component-test-util</artifactId>
>>> + <version>2.3.0-incubating-SNAPSHOT</version>
>>> + <scope>compile</scope>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>javax.servlet</groupId>
>>> + <artifactId>servlet-api</artifactId>
>>> + <version>2.4</version>
>>> + <scope>compile</scope>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>org.apache.uima.xmlbeans</groupId>
>>> + <artifactId>uima-simple-server-xbean</artifactId>
>>> + <version>1.0</version>
>>> + <scope>system</scope>
>>> +
>>>
>> <systemPath>${basedir}/lib/uima-simple-server-xbean.jar</systemPath>
>>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>junit</groupId>
>>> + <artifactId>junit</artifactId>
>>> + <version>4.0</version>
>>> + <scope>test</scope>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>org.mortbay.jetty</groupId>
>>> + <artifactId>jetty</artifactId>
>>> + <version>6.1.8</version>
>>> + <scope>compile</scope>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>org.apache.httpcomponents</groupId>
>>> + <artifactId>httpclient</artifactId>
>>> + <version>4.0-alpha2</version>
>>> + <scope>compile</scope>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>xmlbeans</groupId>
>>> + <artifactId>xbean</artifactId>
>>> + <version>2.2.0</version>
>>> + <scope>compile</scope>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>javax.xml.bind</groupId>
>>> + <artifactId>jsr173_api</artifactId>
>>> + <version>1.0</version>
>>> + <scope>compile</scope>
>>> + </dependency>
>>> + </dependencies>
>>> <build>
>>> <finalName>uima-simple-server</finalName>
>>> - </build>
>>> -
>>> -</project>
>>> -
>>> + <plugins>
>>> + <plugin>
>>> + <groupId>org.apache.maven.plugins</groupId>
>>> +
>>>
>> <artifactId>maven-compiler-plugin</artifactId>
>>
>>> + <configuration>
>>> + <source>1.5</source>
>>> + <target>1.5</target>
>>> + <encoding>UTF-8</encoding>
>>> + </configuration>
>>> + </plugin>
>>> + <plugin>
>>> + <groupId>org.codehaus.mojo</groupId>
>>> +
>>>
>> <artifactId>buildnumber-maven-plugin</artifactId>
>>
>>> + <executions>
>>> + <execution>
>>> +
>>>
>> <phase>process-classes</phase>
>>
>>> + <goals>
>>> + <goal>create</goal>
>>> + </goals>
>>> + </execution>
>>> + </executions>
>>> + <configuration>
>>> + <format>{0,date,yyyy-MM-dd
>>>
>> HH:mm:ss}</format>
>>
>>> + <items>
>>> + <item>timestamp</item>
>>> + </items>
>>> + </configuration>
>>> + </plugin>
>>> + <plugin>
>>> + <groupId>org.apache.maven.plugins</groupId>
>>> +
>>>
>> <artifactId>maven-antrun-plugin</artifactId>
>>
>>> + <executions>
>>> + <execution>
>>> +
>>>
>> <id>CopyLicenseNoticeDisclaimer</id>
>>
>>> +
>>>
>> <phase>process-resources</phase>
>>
>>> + <configuration>
>>> + <tasks>
>>> + <copy
>>>
>> todir="src/main/resources/META-INF">
>>
>>> +
>>>
>> <fileset dir="." includes="LICENSE NOTICE DISCLAIMER" />
>>
>>> + </copy>
>>> + <copy
>>>
>> todir="target/classes/META-INF">
>>
>>> +
>>>
>> <fileset dir="." includes="LICENSE.txt NOTICE.txt DISCLAIMER" />
>>
>>> + </copy>
>>> + </tasks>
>>> + </configuration>
>>> + <goals>
>>> + <goal>run</goal>
>>> + </goals>
>>> + </execution>
>>> + <!--
>>> + after compilation has been
>>>
>> done and the files have been copied to
>>
>>> + the target directory,
>>>
>> delete them from the source directory.
>>
>>> + -->
>>> + <execution>
>>> +
>>>
>> <id>DeleteLicenseNoticeDisclaimer</id>
>>
>>> + <phase>package</phase>
>>> + <configuration>
>>> + <tasks>
>>> + <delete
>>>
>> dir="src/main/resources/META-INF" deleteOnExit="true"
>>
>>> +
>>>
>> quiet="true" failOnError="false">
>>
>>> +
>>>
>> <fileset dir="src/main/resources/META-INF" includes="LICENSE NOTICE
>> DISCLAIMER" />
>>
>>> + </delete>
>>> + </tasks>
>>> + </configuration>
>>> + <goals>
>>> + <goal>run</goal>
>>> + </goals>
>>> + </execution>
>>> + <!-- also delete on clean. -->
>>> + <execution>
>>> +
>>>
>> <id>CleanLicenseNoticeDisclaimer</id>
>>
>>> + <phase>clean</phase>
>>> + <configuration>
>>> + <tasks>
>>> + <delete
>>>
>> dir="src/main/resources/META-INF" deleteOnExit="true"
>>
>>> +
>>>
>> quiet="true" failOnError="false">
>>
>>> +
>>>
>> <fileset dir="src/main/resources/META-INF" includes="LICENSE NOTICE
>> DISCLAIMER" />
>>
>>> + </delete>
>>> + </tasks>
>>> + </configuration>
>>> + <goals>
>>> + <goal>run</goal>
>>> + </goals>
>>> + </execution>
>>> + <execution>
>>> + <phase>package</phase>
>>> + <configuration>
>>> + <tasks>
>>> + <!-- Build
>>>
>> documentation -->
>>
>>> + <ant
>>>
>> antfile="build_documentation.xml" target="copyDocs" />
>>
>>> + </tasks>
>>> + </configuration>
>>> + <goals>
>>> + <goal>run</goal>
>>> + </goals>
>>> + </execution>
>>> + </executions>
>>> + </plugin>
>>> + <plugin>
>>> + <groupId>org.apache.maven.plugins</groupId>
>>> + <artifactId>maven-jar-plugin</artifactId>
>>> + <configuration>
>>> + <archive>
>>> + <manifestEntries>
>>> +
>>>
>> <Project-Title>Apache UIMA</Project-Title>
>>
>>> +
>>>
>> <Implementation-Title>${pom.name}</Implementation-Title>
>>
>>> +
>>>
>> <Implementation-Version>${pom.version}</Implementation-Version>
>>
>>> +
>>>
>> <Implementation-Vendor>Apache Software Foundation</Implementation-Vendor>
>>
>>> +
>>>
>> <Implementation-Url>${pom.url}</Implementation-Url>
>>
>>> +
>>>
>> <Implementation-License>http://www.apache.org/licenses/LICENSE-2.0.txt
>> </Implementation-License>
>>
>>> +
>>>
>> <Build-Date>${buildNumber}</Build-Date>
>>
>>> + </manifestEntries>
>>> + </archive>
>>> + </configuration>
>>> + </plugin>
>>> + <plugin>
>>> + <groupId>org.apache.maven.plugins</groupId>
>>> +
>>>
>> <artifactId>maven-assembly-plugin</artifactId>
>>
>>> + <configuration>
>>> + <descriptors>
>>> +
>>>
>> <descriptor>src/main/assembly/distribution.xml</descriptor>
>>
>>> + </descriptors>
>>> + <archive>
>>> + <manifestEntries>
>>> +
>>>
>> <Project-Title>Apache UIMA</Project-Title>
>>
>>> +
>>>
>> <Implementation-Title>${pom.name}</Implementation-Title>
>>
>>> +
>>>
>> <Implementation-Version>${pom.version}</Implementation-Version>
>>
>>> +
>>>
>> <Implementation-Vendor>Apache Software Foundation</Implementation-Vendor>
>>
>>> +
>>>
>> <Implementation-Url>${pom.url}</Implementation-Url>
>>
>>> +
>>>
>> <Implementation-License>http://www.apache.org/licenses/LICENSE-2.0.txt
>> </Implementation-License>
>>
>>> +
>>>
>> <Build-Date>${buildNumber}</Build-Date>
>>
>>> + </manifestEntries>
>>> + </archive>
>>> + </configuration>
>>> + <executions>
>>> + <execution>
>>> + <id>make-assembly</id>
>>> + <phase>package</phase>
>>> + <goals>
>>> + <goal>single</goal>
>>> + </goals>
>>> + </execution>
>>> + </executions>
>>> + </plugin>
>>> + </plugins>
>>> + </build>
>>> + <repositories>
>>> + <repository>
>>> + <id>ApacheIncubatorRepository</id>
>>> + <url>
>>>
>> http://people.apache.org/repo/m2-incubating-repository/</url>
>>
>>> + </repository>
>>> + </repositories>
>>> +</project>
>>> \ No newline at end of file
>>>
>>> Added:
>>>
>> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml
>>
>>> URL:
>>>
>> http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml?rev=810863&view=auto
>>
>> ==============================================================================
>>
>>> ---
>>>
>> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml
>> (added)
>>
>>> +++
>>>
>> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml
>> Thu Sep 3 10:16:17 2009
>>
>>> @@ -0,0 +1,29 @@
>>> +<assembly>
>>> + <id>distribution</id>
>>> + <formats>
>>> + <format>jar</format>
>>> + </formats>
>>> + <includeBaseDirectory>false</includeBaseDirectory>
>>> + <dependencySets>
>>> + <dependencySet>
>>> +
>>>
>> <outputDirectory>lib/${artifact.groupId}</outputDirectory>
>>
>>> + <unpack>false</unpack>
>>> + <scope>system</scope>
>>> + </dependencySet>
>>> + <dependencySet>
>>> +
>>>
>> <outputDirectory>lib/${artifact.groupId}</outputDirectory>
>>
>>> + <unpack>false</unpack>
>>> + <scope>compile</scope>
>>> + <includes>
>>> +
>>>
>> <include>javax.xml.bind:jsr173_api</include>
>>
>>> + <include>xmlbeans:xbean</include>
>>> + </includes>
>>> + </dependencySet>
>>> + </dependencySets>
>>> + <fileSets>
>>> + <fileSet>
>>> + <directory>target/classes</directory>
>>> + <outputDirectory></outputDirectory>
>>> + </fileSet>
>>> + </fileSets>
>>> +</assembly>
>>> \ No newline at end of file
>>>
>>> Modified: incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml
>>> URL:
>>>
>> http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml?rev=810863&r1=810862&r2=810863&view=diff
>>
>> ==============================================================================
>>
>>> --- incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml (original)
>>> +++ incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml Thu Sep 3
>>>
>> 10:16:17 2009
>>
>>> @@ -1,21 +1,19 @@
>>> -<!--
>>> - 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"
>>> @@ -40,34 +38,6 @@
>>> <version>2.4</version>
>>> </dependency>
>>> <dependency>
>>> - <groupId>org.apache.uima.xmlbeans</groupId>
>>> - <artifactId>jsr-173-api</artifactId>
>>> - <version>1.0</version>
>>> - <scope>system</scope>
>>> - <systemPath>${basedir}/lib/jsr173_1.0_api.jar</systemPath>
>>> - </dependency>
>>> - <dependency>
>>> - <groupId>local.xmlbeans.dependency</groupId>
>>> - <artifactId>xsdbeans</artifactId>
>>> - <version>2.2</version>
>>> - <scope>system</scope>
>>> - <systemPath>${basedir}/lib/xbean.jar</systemPath>
>>> - </dependency>
>>> - <dependency>
>>> - <groupId>org.apache.uima.xmlbeans</groupId>
>>> - <artifactId>uima-simple-server-xbean</artifactId>
>>> - <version>1.0</version>
>>> - <scope>system</scope>
>>> -
>>>
>> <systemPath>${basedir}/lib/uima-simple-server-xbean.jar</systemPath>
>>
>>> - </dependency>
>>> - <dependency>
>>> - <groupId>org.apache.uima</groupId>
>>> - <artifactId>uima-simple-server</artifactId>
>>> - <version>1.0</version>
>>> - <scope>system</scope>
>>> -
>>>
>> <systemPath>${basedir}/lib/uima-simple-server.jar</systemPath>
>>
>>> - </dependency>
>>> - <dependency>
>>> <groupId>junit</groupId>
>>> <artifactId>junit</artifactId>
>>> <version>4.0</version>
>>> @@ -85,6 +55,19 @@
>>> <version>2.3.0-incubating-SNAPSHOT</version>
>>> <scope>compile</scope>
>>> </dependency>
>>> + <dependency>
>>> + <groupId>org.apache.uima</groupId>
>>> + <artifactId>SimpleServer</artifactId>
>>> + <version>2.3.0-incubating-SNAPSHOT</version>
>>> + <scope>compile</scope>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>xmlbeans</groupId>
>>> + <artifactId>xbean</artifactId>
>>> + <version>2.2.0</version>
>>> + <scope>compile</scope>
>>> + <optional>true</optional>
>>> + </dependency>
>>> </dependencies>
>>> <build>
>>> <finalName>simple-uima-as-service</finalName>
>>> @@ -98,7 +81,7 @@
>>> <target>1.5</target>
>>> </configuration>
>>> </plugin>
>>> - <plugin>
>>> + <plugin>
>>> <groupId>org.codehaus.mojo</groupId>
>>> <artifactId>buildnumber-maven-plugin</artifactId>
>>> <executions>
>>> @@ -167,9 +150,7 @@
>>> <repositories>
>>> <repository>
>>> <id>ApacheIncubatorRepository</id>
>>> - <url>
>>> -
>>>
>> http://people.apache.org/repo/m2-incubating-repository/
>>
>>> - </url>
>>> + <url>
>>>
>> http://people.apache.org/repo/m2-incubating-repository/</url>
>>
>>> </repository>
>>> </repositories>
>>> </project>
>>>
>>> Modified:
>>>
>> incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java
>>
>>> URL:
>>>
>> http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java?rev=810863&r1=810862&r2=810863&view=diff
>>
>> ==============================================================================
>>
>>> ---
>>>
>> incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java
>> (original)
>>
>>> +++
>>>
>> incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java
>> Thu Sep 3 10:16:17 2009
>>
>>> @@ -20,7 +20,6 @@
>>>
>>> import java.io.File;
>>> import java.io.FileOutputStream;
>>> -import java.io.IOException;
>>> import java.net.MalformedURLException;
>>> import java.net.URL;
>>> import java.util.HashMap;
>>> @@ -37,12 +36,9 @@
>>> import org.apache.uima.cas.Type;
>>> import org.apache.uima.cas.impl.XmiCasSerializer;
>>> import org.apache.uima.collection.EntityProcessStatus;
>>> -import org.apache.uima.resource.ResourceInitializationException;
>>> import org.apache.uima.resource.ResourceProcessException;
>>> import org.apache.uima.simpleserver.Service;
>>> -import org.apache.uima.simpleserver.SimpleServerException;
>>> import org.apache.uima.simpleserver.output.Result;
>>> -import org.apache.xmlbeans.XmlException;
>>>
>>> public class UimaAsSerive extends Service {
>>>
>>>
>>>
>>>
>>>
>>>
>>>
>
>
Re: svn commit: r810863 - in /incubator/uima/sandbox/trunk: SimpleServer/
SimpleServer/src/main/assembly/ SimpleUimaAsService/ SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/
Posted by Marshall Schor <ms...@schor.com>.
Thilo Goetz wrote:
> Tommaso Teofili wrote:
>
>> Marhsall, I am afraid, you are right, some lines have not been merged
>> properly.
>> Do you know how can I fix it without changing revision?
>>
>
> I don't think you can (not sure though).
>
> There's no problem with creating another revision. Just
> fix the problem, and commit with the same jira issue in
> the comment. The transactional scope is the Jira issue,
> so to speak.
>
+1. The purpose of SVN is to track all the changes... so it doesn't
let you make something disappear. Maybe the best approach is to revert
this last change (as an SVN update) and then do your change as another
update - that way it will be clearer exactly what you're changing with
your update.
-Marshall
> --Thilo
>
>
>> Tommaso
>>
>> 2009/9/3 Marshall Schor <ms...@schor.com>
>>
>>
>>> Tommaso, I see some issues with this commit.
>>>
>>> Looking at the SimpleServer/pom.xml changes, it looks like your changes
>>> undid the previous-to-yours changes, done in revision 807268. Did you
>>> do that on purpose?
>>>
>>> -Marshall
>>>
>>> tommaso@apache.org wrote:
>>>
>>>> Author: tommaso
>>>> Date: Thu Sep 3 10:16:17 2009
>>>> New Revision: 810863
>>>>
>>>> URL: http://svn.apache.org/viewvc?rev=810863&view=rev
>>>> Log:
>>>> [UIMA-1462] SimpleUimaAsService has checked in SimpleServer libraries as
>>>>
>>> binaries
>>>
>>>> Added:
>>>> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/
>>>>
>>>>
>>> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml
>>>
>>>> Modified:
>>>> incubator/uima/sandbox/trunk/SimpleServer/pom.xml
>>>> incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml
>>>>
>>>>
>>> incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java
>>>
>>>> Modified: incubator/uima/sandbox/trunk/SimpleServer/pom.xml
>>>> URL:
>>>>
>>> http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/pom.xml?rev=810863&r1=810862&r2=810863&view=diff
>>> ==============================================================================
>>>
>>>> --- incubator/uima/sandbox/trunk/SimpleServer/pom.xml (original)
>>>> +++ incubator/uima/sandbox/trunk/SimpleServer/pom.xml Thu Sep 3 10:16:17
>>>>
>>> 2009
>>>
>>>> @@ -1,103 +1,244 @@
>>>> -<!--
>>>> - 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"
>>>> + <!--
>>>> + 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>org.apache.uima</groupId>
>>>> <artifactId>SimpleServer</artifactId>
>>>> <packaging>jar</packaging>
>>>> - <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a
>>>>
>>> flag for changeVersion -->
>>>
>>>> + <version>2.3.0-incubating-SNAPSHOT</version>
>>>> <name>Apache UIMA Simple Server</name>
>>>> -
>>>> - <parent>
>>>> - <groupId>org.apache.uima</groupId>
>>>> - <artifactId>SandboxDistr</artifactId>
>>>> - <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a
>>>>
>>> flag for changeVersion -->
>>>
>>>> - <relativePath>../SandboxDistr</relativePath>
>>>> - </parent>
>>>> -
>>>> - <dependencies>
>>>> - <!-- versions from parent -->
>>>> - <dependency>
>>>> - <groupId>org.apache.uima</groupId>
>>>> - <artifactId>uimaj-core</artifactId>
>>>> - </dependency>
>>>> - <dependency>
>>>> - <groupId>org.apache.uima</groupId>
>>>> - <artifactId>uimaj-test-util</artifactId>
>>>> - </dependency>
>>>> - <dependency>
>>>> - <groupId>org.apache.uima</groupId>
>>>> - <artifactId>uimaj-component-test-util</artifactId>
>>>> - </dependency>
>>>> -
>>>> - <dependency>
>>>> - <groupId>javax.servlet</groupId>
>>>> - <artifactId>servlet-api</artifactId>
>>>> - <version>2.4</version>
>>>> - </dependency>
>>>> - <dependency>
>>>> - <groupId>org.apache.uima.xmlbeans</groupId>
>>>> - <artifactId>xbean</artifactId>
>>>> - <version>1.0</version>
>>>> - <scope>system</scope>
>>>> - <systemPath>${basedir}/lib/xbean.jar</systemPath>
>>>> - </dependency>
>>>> - <dependency>
>>>> - <groupId>org.apache.uima.xmlbeans</groupId>
>>>> - <artifactId>jsr-173-api</artifactId>
>>>> - <version>1.0</version>
>>>> - <scope>system</scope>
>>>> - <systemPath>${basedir}/lib/jsr173_1.0_api.jar</systemPath>
>>>> - </dependency>
>>>> - <dependency>
>>>> - <groupId>org.apache.uima.xmlbeans</groupId>
>>>> - <artifactId>uima-simple-server-xbean</artifactId>
>>>> - <version>1.0</version>
>>>> - <scope>system</scope>
>>>> -
>>>>
>>> <systemPath>${basedir}/lib/uima-simple-server-xbean.jar</systemPath>
>>>
>>>> - </dependency>
>>>> - <dependency>
>>>> - <groupId>junit</groupId>
>>>> - <artifactId>junit</artifactId>
>>>> - <version>4.0</version>
>>>> - <scope>compile</scope>
>>>> - </dependency>
>>>> - <dependency>
>>>> - <groupId>org.mortbay.jetty</groupId>
>>>> - <artifactId>jetty</artifactId>
>>>> - <version>6.1.8</version>
>>>> - <scope>compile</scope>
>>>> - </dependency>
>>>> - <dependency>
>>>> - <groupId>org.apache.httpcomponents</groupId>
>>>> - <artifactId>httpclient</artifactId>
>>>> - <version>4.0-alpha2</version>
>>>> - <scope>compile</scope>
>>>> - </dependency>
>>>> - </dependencies>
>>>> -
>>>> + <url>http://incubator.apache.org/uima</url>
>>>> + <dependencies>
>>>> + <dependency>
>>>> + <groupId>org.apache.uima</groupId>
>>>> + <artifactId>uimaj-core</artifactId>
>>>> + <version>2.3.0-incubating-SNAPSHOT</version>
>>>> + <scope>compile</scope>
>>>> + </dependency>
>>>> + <dependency>
>>>> + <groupId>org.apache.uima</groupId>
>>>> + <artifactId>uimaj-test-util</artifactId>
>>>> + <version>2.3.0-incubating-SNAPSHOT</version>
>>>> + <scope>compile</scope>
>>>> + </dependency>
>>>> + <dependency>
>>>> + <groupId>org.apache.uima</groupId>
>>>> + <artifactId>uimaj-component-test-util</artifactId>
>>>> + <version>2.3.0-incubating-SNAPSHOT</version>
>>>> + <scope>compile</scope>
>>>> + </dependency>
>>>> + <dependency>
>>>> + <groupId>javax.servlet</groupId>
>>>> + <artifactId>servlet-api</artifactId>
>>>> + <version>2.4</version>
>>>> + <scope>compile</scope>
>>>> + </dependency>
>>>> + <dependency>
>>>> + <groupId>org.apache.uima.xmlbeans</groupId>
>>>> + <artifactId>uima-simple-server-xbean</artifactId>
>>>> + <version>1.0</version>
>>>> + <scope>system</scope>
>>>> +
>>>>
>>> <systemPath>${basedir}/lib/uima-simple-server-xbean.jar</systemPath>
>>>
>>>> + </dependency>
>>>> + <dependency>
>>>> + <groupId>junit</groupId>
>>>> + <artifactId>junit</artifactId>
>>>> + <version>4.0</version>
>>>> + <scope>test</scope>
>>>> + </dependency>
>>>> + <dependency>
>>>> + <groupId>org.mortbay.jetty</groupId>
>>>> + <artifactId>jetty</artifactId>
>>>> + <version>6.1.8</version>
>>>> + <scope>compile</scope>
>>>> + </dependency>
>>>> + <dependency>
>>>> + <groupId>org.apache.httpcomponents</groupId>
>>>> + <artifactId>httpclient</artifactId>
>>>> + <version>4.0-alpha2</version>
>>>> + <scope>compile</scope>
>>>> + </dependency>
>>>> + <dependency>
>>>> + <groupId>xmlbeans</groupId>
>>>> + <artifactId>xbean</artifactId>
>>>> + <version>2.2.0</version>
>>>> + <scope>compile</scope>
>>>> + </dependency>
>>>> + <dependency>
>>>> + <groupId>javax.xml.bind</groupId>
>>>> + <artifactId>jsr173_api</artifactId>
>>>> + <version>1.0</version>
>>>> + <scope>compile</scope>
>>>> + </dependency>
>>>> + </dependencies>
>>>> <build>
>>>> <finalName>uima-simple-server</finalName>
>>>> - </build>
>>>> -
>>>> -</project>
>>>> -
>>>> + <plugins>
>>>> + <plugin>
>>>> + <groupId>org.apache.maven.plugins</groupId>
>>>> +
>>>>
>>> <artifactId>maven-compiler-plugin</artifactId>
>>>
>>>> + <configuration>
>>>> + <source>1.5</source>
>>>> + <target>1.5</target>
>>>> + <encoding>UTF-8</encoding>
>>>> + </configuration>
>>>> + </plugin>
>>>> + <plugin>
>>>> + <groupId>org.codehaus.mojo</groupId>
>>>> +
>>>>
>>> <artifactId>buildnumber-maven-plugin</artifactId>
>>>
>>>> + <executions>
>>>> + <execution>
>>>> +
>>>>
>>> <phase>process-classes</phase>
>>>
>>>> + <goals>
>>>> + <goal>create</goal>
>>>> + </goals>
>>>> + </execution>
>>>> + </executions>
>>>> + <configuration>
>>>> + <format>{0,date,yyyy-MM-dd
>>>>
>>> HH:mm:ss}</format>
>>>
>>>> + <items>
>>>> + <item>timestamp</item>
>>>> + </items>
>>>> + </configuration>
>>>> + </plugin>
>>>> + <plugin>
>>>> + <groupId>org.apache.maven.plugins</groupId>
>>>> +
>>>>
>>> <artifactId>maven-antrun-plugin</artifactId>
>>>
>>>> + <executions>
>>>> + <execution>
>>>> +
>>>>
>>> <id>CopyLicenseNoticeDisclaimer</id>
>>>
>>>> +
>>>>
>>> <phase>process-resources</phase>
>>>
>>>> + <configuration>
>>>> + <tasks>
>>>> + <copy
>>>>
>>> todir="src/main/resources/META-INF">
>>>
>>>> +
>>>>
>>> <fileset dir="." includes="LICENSE NOTICE DISCLAIMER" />
>>>
>>>> + </copy>
>>>> + <copy
>>>>
>>> todir="target/classes/META-INF">
>>>
>>>> +
>>>>
>>> <fileset dir="." includes="LICENSE.txt NOTICE.txt DISCLAIMER" />
>>>
>>>> + </copy>
>>>> + </tasks>
>>>> + </configuration>
>>>> + <goals>
>>>> + <goal>run</goal>
>>>> + </goals>
>>>> + </execution>
>>>> + <!--
>>>> + after compilation has been
>>>>
>>> done and the files have been copied to
>>>
>>>> + the target directory,
>>>>
>>> delete them from the source directory.
>>>
>>>> + -->
>>>> + <execution>
>>>> +
>>>>
>>> <id>DeleteLicenseNoticeDisclaimer</id>
>>>
>>>> + <phase>package</phase>
>>>> + <configuration>
>>>> + <tasks>
>>>> + <delete
>>>>
>>> dir="src/main/resources/META-INF" deleteOnExit="true"
>>>
>>>> +
>>>>
>>> quiet="true" failOnError="false">
>>>
>>>> +
>>>>
>>> <fileset dir="src/main/resources/META-INF" includes="LICENSE NOTICE
>>> DISCLAIMER" />
>>>
>>>> + </delete>
>>>> + </tasks>
>>>> + </configuration>
>>>> + <goals>
>>>> + <goal>run</goal>
>>>> + </goals>
>>>> + </execution>
>>>> + <!-- also delete on clean. -->
>>>> + <execution>
>>>> +
>>>>
>>> <id>CleanLicenseNoticeDisclaimer</id>
>>>
>>>> + <phase>clean</phase>
>>>> + <configuration>
>>>> + <tasks>
>>>> + <delete
>>>>
>>> dir="src/main/resources/META-INF" deleteOnExit="true"
>>>
>>>> +
>>>>
>>> quiet="true" failOnError="false">
>>>
>>>> +
>>>>
>>> <fileset dir="src/main/resources/META-INF" includes="LICENSE NOTICE
>>> DISCLAIMER" />
>>>
>>>> + </delete>
>>>> + </tasks>
>>>> + </configuration>
>>>> + <goals>
>>>> + <goal>run</goal>
>>>> + </goals>
>>>> + </execution>
>>>> + <execution>
>>>> + <phase>package</phase>
>>>> + <configuration>
>>>> + <tasks>
>>>> + <!-- Build
>>>>
>>> documentation -->
>>>
>>>> + <ant
>>>>
>>> antfile="build_documentation.xml" target="copyDocs" />
>>>
>>>> + </tasks>
>>>> + </configuration>
>>>> + <goals>
>>>> + <goal>run</goal>
>>>> + </goals>
>>>> + </execution>
>>>> + </executions>
>>>> + </plugin>
>>>> + <plugin>
>>>> + <groupId>org.apache.maven.plugins</groupId>
>>>> + <artifactId>maven-jar-plugin</artifactId>
>>>> + <configuration>
>>>> + <archive>
>>>> + <manifestEntries>
>>>> +
>>>>
>>> <Project-Title>Apache UIMA</Project-Title>
>>>
>>>> +
>>>>
>>> <Implementation-Title>${pom.name}</Implementation-Title>
>>>
>>>> +
>>>>
>>> <Implementation-Version>${pom.version}</Implementation-Version>
>>>
>>>> +
>>>>
>>> <Implementation-Vendor>Apache Software Foundation</Implementation-Vendor>
>>>
>>>> +
>>>>
>>> <Implementation-Url>${pom.url}</Implementation-Url>
>>>
>>>> +
>>>>
>>> <Implementation-License>http://www.apache.org/licenses/LICENSE-2.0.txt
>>> </Implementation-License>
>>>
>>>> +
>>>>
>>> <Build-Date>${buildNumber}</Build-Date>
>>>
>>>> + </manifestEntries>
>>>> + </archive>
>>>> + </configuration>
>>>> + </plugin>
>>>> + <plugin>
>>>> + <groupId>org.apache.maven.plugins</groupId>
>>>> +
>>>>
>>> <artifactId>maven-assembly-plugin</artifactId>
>>>
>>>> + <configuration>
>>>> + <descriptors>
>>>> +
>>>>
>>> <descriptor>src/main/assembly/distribution.xml</descriptor>
>>>
>>>> + </descriptors>
>>>> + <archive>
>>>> + <manifestEntries>
>>>> +
>>>>
>>> <Project-Title>Apache UIMA</Project-Title>
>>>
>>>> +
>>>>
>>> <Implementation-Title>${pom.name}</Implementation-Title>
>>>
>>>> +
>>>>
>>> <Implementation-Version>${pom.version}</Implementation-Version>
>>>
>>>> +
>>>>
>>> <Implementation-Vendor>Apache Software Foundation</Implementation-Vendor>
>>>
>>>> +
>>>>
>>> <Implementation-Url>${pom.url}</Implementation-Url>
>>>
>>>> +
>>>>
>>> <Implementation-License>http://www.apache.org/licenses/LICENSE-2.0.txt
>>> </Implementation-License>
>>>
>>>> +
>>>>
>>> <Build-Date>${buildNumber}</Build-Date>
>>>
>>>> + </manifestEntries>
>>>> + </archive>
>>>> + </configuration>
>>>> + <executions>
>>>> + <execution>
>>>> + <id>make-assembly</id>
>>>> + <phase>package</phase>
>>>> + <goals>
>>>> + <goal>single</goal>
>>>> + </goals>
>>>> + </execution>
>>>> + </executions>
>>>> + </plugin>
>>>> + </plugins>
>>>> + </build>
>>>> + <repositories>
>>>> + <repository>
>>>> + <id>ApacheIncubatorRepository</id>
>>>> + <url>
>>>>
>>> http://people.apache.org/repo/m2-incubating-repository/</url>
>>>
>>>> + </repository>
>>>> + </repositories>
>>>> +</project>
>>>> \ No newline at end of file
>>>>
>>>> Added:
>>>>
>>> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml
>>>
>>>> URL:
>>>>
>>> http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml?rev=810863&view=auto
>>> ==============================================================================
>>>
>>>> ---
>>>>
>>> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml
>>> (added)
>>>
>>>> +++
>>>>
>>> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml
>>> Thu Sep 3 10:16:17 2009
>>>
>>>> @@ -0,0 +1,29 @@
>>>> +<assembly>
>>>> + <id>distribution</id>
>>>> + <formats>
>>>> + <format>jar</format>
>>>> + </formats>
>>>> + <includeBaseDirectory>false</includeBaseDirectory>
>>>> + <dependencySets>
>>>> + <dependencySet>
>>>> +
>>>>
>>> <outputDirectory>lib/${artifact.groupId}</outputDirectory>
>>>
>>>> + <unpack>false</unpack>
>>>> + <scope>system</scope>
>>>> + </dependencySet>
>>>> + <dependencySet>
>>>> +
>>>>
>>> <outputDirectory>lib/${artifact.groupId}</outputDirectory>
>>>
>>>> + <unpack>false</unpack>
>>>> + <scope>compile</scope>
>>>> + <includes>
>>>> +
>>>>
>>> <include>javax.xml.bind:jsr173_api</include>
>>>
>>>> + <include>xmlbeans:xbean</include>
>>>> + </includes>
>>>> + </dependencySet>
>>>> + </dependencySets>
>>>> + <fileSets>
>>>> + <fileSet>
>>>> + <directory>target/classes</directory>
>>>> + <outputDirectory></outputDirectory>
>>>> + </fileSet>
>>>> + </fileSets>
>>>> +</assembly>
>>>> \ No newline at end of file
>>>>
>>>> Modified: incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml
>>>> URL:
>>>>
>>> http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml?rev=810863&r1=810862&r2=810863&view=diff
>>> ==============================================================================
>>>
>>>> --- incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml (original)
>>>> +++ incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml Thu Sep 3
>>>>
>>> 10:16:17 2009
>>>
>>>> @@ -1,21 +1,19 @@
>>>> -<!--
>>>> - 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"
>>>> @@ -40,34 +38,6 @@
>>>> <version>2.4</version>
>>>> </dependency>
>>>> <dependency>
>>>> - <groupId>org.apache.uima.xmlbeans</groupId>
>>>> - <artifactId>jsr-173-api</artifactId>
>>>> - <version>1.0</version>
>>>> - <scope>system</scope>
>>>> - <systemPath>${basedir}/lib/jsr173_1.0_api.jar</systemPath>
>>>> - </dependency>
>>>> - <dependency>
>>>> - <groupId>local.xmlbeans.dependency</groupId>
>>>> - <artifactId>xsdbeans</artifactId>
>>>> - <version>2.2</version>
>>>> - <scope>system</scope>
>>>> - <systemPath>${basedir}/lib/xbean.jar</systemPath>
>>>> - </dependency>
>>>> - <dependency>
>>>> - <groupId>org.apache.uima.xmlbeans</groupId>
>>>> - <artifactId>uima-simple-server-xbean</artifactId>
>>>> - <version>1.0</version>
>>>> - <scope>system</scope>
>>>> -
>>>>
>>> <systemPath>${basedir}/lib/uima-simple-server-xbean.jar</systemPath>
>>>
>>>> - </dependency>
>>>> - <dependency>
>>>> - <groupId>org.apache.uima</groupId>
>>>> - <artifactId>uima-simple-server</artifactId>
>>>> - <version>1.0</version>
>>>> - <scope>system</scope>
>>>> -
>>>>
>>> <systemPath>${basedir}/lib/uima-simple-server.jar</systemPath>
>>>
>>>> - </dependency>
>>>> - <dependency>
>>>> <groupId>junit</groupId>
>>>> <artifactId>junit</artifactId>
>>>> <version>4.0</version>
>>>> @@ -85,6 +55,19 @@
>>>> <version>2.3.0-incubating-SNAPSHOT</version>
>>>> <scope>compile</scope>
>>>> </dependency>
>>>> + <dependency>
>>>> + <groupId>org.apache.uima</groupId>
>>>> + <artifactId>SimpleServer</artifactId>
>>>> + <version>2.3.0-incubating-SNAPSHOT</version>
>>>> + <scope>compile</scope>
>>>> + </dependency>
>>>> + <dependency>
>>>> + <groupId>xmlbeans</groupId>
>>>> + <artifactId>xbean</artifactId>
>>>> + <version>2.2.0</version>
>>>> + <scope>compile</scope>
>>>> + <optional>true</optional>
>>>> + </dependency>
>>>> </dependencies>
>>>> <build>
>>>> <finalName>simple-uima-as-service</finalName>
>>>> @@ -98,7 +81,7 @@
>>>> <target>1.5</target>
>>>> </configuration>
>>>> </plugin>
>>>> - <plugin>
>>>> + <plugin>
>>>> <groupId>org.codehaus.mojo</groupId>
>>>> <artifactId>buildnumber-maven-plugin</artifactId>
>>>> <executions>
>>>> @@ -167,9 +150,7 @@
>>>> <repositories>
>>>> <repository>
>>>> <id>ApacheIncubatorRepository</id>
>>>> - <url>
>>>> -
>>>>
>>> http://people.apache.org/repo/m2-incubating-repository/
>>>
>>>> - </url>
>>>> + <url>
>>>>
>>> http://people.apache.org/repo/m2-incubating-repository/</url>
>>>
>>>> </repository>
>>>> </repositories>
>>>> </project>
>>>>
>>>> Modified:
>>>>
>>> incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java
>>>
>>>> URL:
>>>>
>>> http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java?rev=810863&r1=810862&r2=810863&view=diff
>>> ==============================================================================
>>>
>>>> ---
>>>>
>>> incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java
>>> (original)
>>>
>>>> +++
>>>>
>>> incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java
>>> Thu Sep 3 10:16:17 2009
>>>
>>>> @@ -20,7 +20,6 @@
>>>>
>>>> import java.io.File;
>>>> import java.io.FileOutputStream;
>>>> -import java.io.IOException;
>>>> import java.net.MalformedURLException;
>>>> import java.net.URL;
>>>> import java.util.HashMap;
>>>> @@ -37,12 +36,9 @@
>>>> import org.apache.uima.cas.Type;
>>>> import org.apache.uima.cas.impl.XmiCasSerializer;
>>>> import org.apache.uima.collection.EntityProcessStatus;
>>>> -import org.apache.uima.resource.ResourceInitializationException;
>>>> import org.apache.uima.resource.ResourceProcessException;
>>>> import org.apache.uima.simpleserver.Service;
>>>> -import org.apache.uima.simpleserver.SimpleServerException;
>>>> import org.apache.uima.simpleserver.output.Result;
>>>> -import org.apache.xmlbeans.XmlException;
>>>>
>>>> public class UimaAsSerive extends Service {
>>>>
>>>>
>>>>
>>>>
>>>>
>>>>
>>>>
>
>
>
Re: svn commit: r810863 - in /incubator/uima/sandbox/trunk: SimpleServer/
SimpleServer/src/main/assembly/ SimpleUimaAsService/ SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/
Posted by Thilo Goetz <tw...@gmx.de>.
Tommaso Teofili wrote:
> Marhsall, I am afraid, you are right, some lines have not been merged
> properly.
> Do you know how can I fix it without changing revision?
I don't think you can (not sure though).
There's no problem with creating another revision. Just
fix the problem, and commit with the same jira issue in
the comment. The transactional scope is the Jira issue,
so to speak.
--Thilo
> Tommaso
>
> 2009/9/3 Marshall Schor <ms...@schor.com>
>
>> Tommaso, I see some issues with this commit.
>>
>> Looking at the SimpleServer/pom.xml changes, it looks like your changes
>> undid the previous-to-yours changes, done in revision 807268. Did you
>> do that on purpose?
>>
>> -Marshall
>>
>> tommaso@apache.org wrote:
>>> Author: tommaso
>>> Date: Thu Sep 3 10:16:17 2009
>>> New Revision: 810863
>>>
>>> URL: http://svn.apache.org/viewvc?rev=810863&view=rev
>>> Log:
>>> [UIMA-1462] SimpleUimaAsService has checked in SimpleServer libraries as
>> binaries
>>> Added:
>>> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/
>>>
>> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml
>>> Modified:
>>> incubator/uima/sandbox/trunk/SimpleServer/pom.xml
>>> incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml
>>>
>> incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java
>>> Modified: incubator/uima/sandbox/trunk/SimpleServer/pom.xml
>>> URL:
>> http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/pom.xml?rev=810863&r1=810862&r2=810863&view=diff
>> ==============================================================================
>>> --- incubator/uima/sandbox/trunk/SimpleServer/pom.xml (original)
>>> +++ incubator/uima/sandbox/trunk/SimpleServer/pom.xml Thu Sep 3 10:16:17
>> 2009
>>> @@ -1,103 +1,244 @@
>>> -<!--
>>> - 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"
>>> + <!--
>>> + 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>org.apache.uima</groupId>
>>> <artifactId>SimpleServer</artifactId>
>>> <packaging>jar</packaging>
>>> - <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a
>> flag for changeVersion -->
>>> + <version>2.3.0-incubating-SNAPSHOT</version>
>>> <name>Apache UIMA Simple Server</name>
>>> -
>>> - <parent>
>>> - <groupId>org.apache.uima</groupId>
>>> - <artifactId>SandboxDistr</artifactId>
>>> - <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a
>> flag for changeVersion -->
>>> - <relativePath>../SandboxDistr</relativePath>
>>> - </parent>
>>> -
>>> - <dependencies>
>>> - <!-- versions from parent -->
>>> - <dependency>
>>> - <groupId>org.apache.uima</groupId>
>>> - <artifactId>uimaj-core</artifactId>
>>> - </dependency>
>>> - <dependency>
>>> - <groupId>org.apache.uima</groupId>
>>> - <artifactId>uimaj-test-util</artifactId>
>>> - </dependency>
>>> - <dependency>
>>> - <groupId>org.apache.uima</groupId>
>>> - <artifactId>uimaj-component-test-util</artifactId>
>>> - </dependency>
>>> -
>>> - <dependency>
>>> - <groupId>javax.servlet</groupId>
>>> - <artifactId>servlet-api</artifactId>
>>> - <version>2.4</version>
>>> - </dependency>
>>> - <dependency>
>>> - <groupId>org.apache.uima.xmlbeans</groupId>
>>> - <artifactId>xbean</artifactId>
>>> - <version>1.0</version>
>>> - <scope>system</scope>
>>> - <systemPath>${basedir}/lib/xbean.jar</systemPath>
>>> - </dependency>
>>> - <dependency>
>>> - <groupId>org.apache.uima.xmlbeans</groupId>
>>> - <artifactId>jsr-173-api</artifactId>
>>> - <version>1.0</version>
>>> - <scope>system</scope>
>>> - <systemPath>${basedir}/lib/jsr173_1.0_api.jar</systemPath>
>>> - </dependency>
>>> - <dependency>
>>> - <groupId>org.apache.uima.xmlbeans</groupId>
>>> - <artifactId>uima-simple-server-xbean</artifactId>
>>> - <version>1.0</version>
>>> - <scope>system</scope>
>>> -
>> <systemPath>${basedir}/lib/uima-simple-server-xbean.jar</systemPath>
>>> - </dependency>
>>> - <dependency>
>>> - <groupId>junit</groupId>
>>> - <artifactId>junit</artifactId>
>>> - <version>4.0</version>
>>> - <scope>compile</scope>
>>> - </dependency>
>>> - <dependency>
>>> - <groupId>org.mortbay.jetty</groupId>
>>> - <artifactId>jetty</artifactId>
>>> - <version>6.1.8</version>
>>> - <scope>compile</scope>
>>> - </dependency>
>>> - <dependency>
>>> - <groupId>org.apache.httpcomponents</groupId>
>>> - <artifactId>httpclient</artifactId>
>>> - <version>4.0-alpha2</version>
>>> - <scope>compile</scope>
>>> - </dependency>
>>> - </dependencies>
>>> -
>>> + <url>http://incubator.apache.org/uima</url>
>>> + <dependencies>
>>> + <dependency>
>>> + <groupId>org.apache.uima</groupId>
>>> + <artifactId>uimaj-core</artifactId>
>>> + <version>2.3.0-incubating-SNAPSHOT</version>
>>> + <scope>compile</scope>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>org.apache.uima</groupId>
>>> + <artifactId>uimaj-test-util</artifactId>
>>> + <version>2.3.0-incubating-SNAPSHOT</version>
>>> + <scope>compile</scope>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>org.apache.uima</groupId>
>>> + <artifactId>uimaj-component-test-util</artifactId>
>>> + <version>2.3.0-incubating-SNAPSHOT</version>
>>> + <scope>compile</scope>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>javax.servlet</groupId>
>>> + <artifactId>servlet-api</artifactId>
>>> + <version>2.4</version>
>>> + <scope>compile</scope>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>org.apache.uima.xmlbeans</groupId>
>>> + <artifactId>uima-simple-server-xbean</artifactId>
>>> + <version>1.0</version>
>>> + <scope>system</scope>
>>> +
>> <systemPath>${basedir}/lib/uima-simple-server-xbean.jar</systemPath>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>junit</groupId>
>>> + <artifactId>junit</artifactId>
>>> + <version>4.0</version>
>>> + <scope>test</scope>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>org.mortbay.jetty</groupId>
>>> + <artifactId>jetty</artifactId>
>>> + <version>6.1.8</version>
>>> + <scope>compile</scope>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>org.apache.httpcomponents</groupId>
>>> + <artifactId>httpclient</artifactId>
>>> + <version>4.0-alpha2</version>
>>> + <scope>compile</scope>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>xmlbeans</groupId>
>>> + <artifactId>xbean</artifactId>
>>> + <version>2.2.0</version>
>>> + <scope>compile</scope>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>javax.xml.bind</groupId>
>>> + <artifactId>jsr173_api</artifactId>
>>> + <version>1.0</version>
>>> + <scope>compile</scope>
>>> + </dependency>
>>> + </dependencies>
>>> <build>
>>> <finalName>uima-simple-server</finalName>
>>> - </build>
>>> -
>>> -</project>
>>> -
>>> + <plugins>
>>> + <plugin>
>>> + <groupId>org.apache.maven.plugins</groupId>
>>> +
>> <artifactId>maven-compiler-plugin</artifactId>
>>> + <configuration>
>>> + <source>1.5</source>
>>> + <target>1.5</target>
>>> + <encoding>UTF-8</encoding>
>>> + </configuration>
>>> + </plugin>
>>> + <plugin>
>>> + <groupId>org.codehaus.mojo</groupId>
>>> +
>> <artifactId>buildnumber-maven-plugin</artifactId>
>>> + <executions>
>>> + <execution>
>>> +
>> <phase>process-classes</phase>
>>> + <goals>
>>> + <goal>create</goal>
>>> + </goals>
>>> + </execution>
>>> + </executions>
>>> + <configuration>
>>> + <format>{0,date,yyyy-MM-dd
>> HH:mm:ss}</format>
>>> + <items>
>>> + <item>timestamp</item>
>>> + </items>
>>> + </configuration>
>>> + </plugin>
>>> + <plugin>
>>> + <groupId>org.apache.maven.plugins</groupId>
>>> +
>> <artifactId>maven-antrun-plugin</artifactId>
>>> + <executions>
>>> + <execution>
>>> +
>> <id>CopyLicenseNoticeDisclaimer</id>
>>> +
>> <phase>process-resources</phase>
>>> + <configuration>
>>> + <tasks>
>>> + <copy
>> todir="src/main/resources/META-INF">
>>> +
>> <fileset dir="." includes="LICENSE NOTICE DISCLAIMER" />
>>> + </copy>
>>> + <copy
>> todir="target/classes/META-INF">
>>> +
>> <fileset dir="." includes="LICENSE.txt NOTICE.txt DISCLAIMER" />
>>> + </copy>
>>> + </tasks>
>>> + </configuration>
>>> + <goals>
>>> + <goal>run</goal>
>>> + </goals>
>>> + </execution>
>>> + <!--
>>> + after compilation has been
>> done and the files have been copied to
>>> + the target directory,
>> delete them from the source directory.
>>> + -->
>>> + <execution>
>>> +
>> <id>DeleteLicenseNoticeDisclaimer</id>
>>> + <phase>package</phase>
>>> + <configuration>
>>> + <tasks>
>>> + <delete
>> dir="src/main/resources/META-INF" deleteOnExit="true"
>>> +
>> quiet="true" failOnError="false">
>>> +
>> <fileset dir="src/main/resources/META-INF" includes="LICENSE NOTICE
>> DISCLAIMER" />
>>> + </delete>
>>> + </tasks>
>>> + </configuration>
>>> + <goals>
>>> + <goal>run</goal>
>>> + </goals>
>>> + </execution>
>>> + <!-- also delete on clean. -->
>>> + <execution>
>>> +
>> <id>CleanLicenseNoticeDisclaimer</id>
>>> + <phase>clean</phase>
>>> + <configuration>
>>> + <tasks>
>>> + <delete
>> dir="src/main/resources/META-INF" deleteOnExit="true"
>>> +
>> quiet="true" failOnError="false">
>>> +
>> <fileset dir="src/main/resources/META-INF" includes="LICENSE NOTICE
>> DISCLAIMER" />
>>> + </delete>
>>> + </tasks>
>>> + </configuration>
>>> + <goals>
>>> + <goal>run</goal>
>>> + </goals>
>>> + </execution>
>>> + <execution>
>>> + <phase>package</phase>
>>> + <configuration>
>>> + <tasks>
>>> + <!-- Build
>> documentation -->
>>> + <ant
>> antfile="build_documentation.xml" target="copyDocs" />
>>> + </tasks>
>>> + </configuration>
>>> + <goals>
>>> + <goal>run</goal>
>>> + </goals>
>>> + </execution>
>>> + </executions>
>>> + </plugin>
>>> + <plugin>
>>> + <groupId>org.apache.maven.plugins</groupId>
>>> + <artifactId>maven-jar-plugin</artifactId>
>>> + <configuration>
>>> + <archive>
>>> + <manifestEntries>
>>> +
>> <Project-Title>Apache UIMA</Project-Title>
>>> +
>> <Implementation-Title>${pom.name}</Implementation-Title>
>>> +
>> <Implementation-Version>${pom.version}</Implementation-Version>
>>> +
>> <Implementation-Vendor>Apache Software Foundation</Implementation-Vendor>
>>> +
>> <Implementation-Url>${pom.url}</Implementation-Url>
>>> +
>> <Implementation-License>http://www.apache.org/licenses/LICENSE-2.0.txt
>> </Implementation-License>
>>> +
>> <Build-Date>${buildNumber}</Build-Date>
>>> + </manifestEntries>
>>> + </archive>
>>> + </configuration>
>>> + </plugin>
>>> + <plugin>
>>> + <groupId>org.apache.maven.plugins</groupId>
>>> +
>> <artifactId>maven-assembly-plugin</artifactId>
>>> + <configuration>
>>> + <descriptors>
>>> +
>> <descriptor>src/main/assembly/distribution.xml</descriptor>
>>> + </descriptors>
>>> + <archive>
>>> + <manifestEntries>
>>> +
>> <Project-Title>Apache UIMA</Project-Title>
>>> +
>> <Implementation-Title>${pom.name}</Implementation-Title>
>>> +
>> <Implementation-Version>${pom.version}</Implementation-Version>
>>> +
>> <Implementation-Vendor>Apache Software Foundation</Implementation-Vendor>
>>> +
>> <Implementation-Url>${pom.url}</Implementation-Url>
>>> +
>> <Implementation-License>http://www.apache.org/licenses/LICENSE-2.0.txt
>> </Implementation-License>
>>> +
>> <Build-Date>${buildNumber}</Build-Date>
>>> + </manifestEntries>
>>> + </archive>
>>> + </configuration>
>>> + <executions>
>>> + <execution>
>>> + <id>make-assembly</id>
>>> + <phase>package</phase>
>>> + <goals>
>>> + <goal>single</goal>
>>> + </goals>
>>> + </execution>
>>> + </executions>
>>> + </plugin>
>>> + </plugins>
>>> + </build>
>>> + <repositories>
>>> + <repository>
>>> + <id>ApacheIncubatorRepository</id>
>>> + <url>
>> http://people.apache.org/repo/m2-incubating-repository/</url>
>>> + </repository>
>>> + </repositories>
>>> +</project>
>>> \ No newline at end of file
>>>
>>> Added:
>> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml
>>> URL:
>> http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml?rev=810863&view=auto
>> ==============================================================================
>>> ---
>> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml
>> (added)
>>> +++
>> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml
>> Thu Sep 3 10:16:17 2009
>>> @@ -0,0 +1,29 @@
>>> +<assembly>
>>> + <id>distribution</id>
>>> + <formats>
>>> + <format>jar</format>
>>> + </formats>
>>> + <includeBaseDirectory>false</includeBaseDirectory>
>>> + <dependencySets>
>>> + <dependencySet>
>>> +
>> <outputDirectory>lib/${artifact.groupId}</outputDirectory>
>>> + <unpack>false</unpack>
>>> + <scope>system</scope>
>>> + </dependencySet>
>>> + <dependencySet>
>>> +
>> <outputDirectory>lib/${artifact.groupId}</outputDirectory>
>>> + <unpack>false</unpack>
>>> + <scope>compile</scope>
>>> + <includes>
>>> +
>> <include>javax.xml.bind:jsr173_api</include>
>>> + <include>xmlbeans:xbean</include>
>>> + </includes>
>>> + </dependencySet>
>>> + </dependencySets>
>>> + <fileSets>
>>> + <fileSet>
>>> + <directory>target/classes</directory>
>>> + <outputDirectory></outputDirectory>
>>> + </fileSet>
>>> + </fileSets>
>>> +</assembly>
>>> \ No newline at end of file
>>>
>>> Modified: incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml
>>> URL:
>> http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml?rev=810863&r1=810862&r2=810863&view=diff
>> ==============================================================================
>>> --- incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml (original)
>>> +++ incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml Thu Sep 3
>> 10:16:17 2009
>>> @@ -1,21 +1,19 @@
>>> -<!--
>>> - 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"
>>> @@ -40,34 +38,6 @@
>>> <version>2.4</version>
>>> </dependency>
>>> <dependency>
>>> - <groupId>org.apache.uima.xmlbeans</groupId>
>>> - <artifactId>jsr-173-api</artifactId>
>>> - <version>1.0</version>
>>> - <scope>system</scope>
>>> - <systemPath>${basedir}/lib/jsr173_1.0_api.jar</systemPath>
>>> - </dependency>
>>> - <dependency>
>>> - <groupId>local.xmlbeans.dependency</groupId>
>>> - <artifactId>xsdbeans</artifactId>
>>> - <version>2.2</version>
>>> - <scope>system</scope>
>>> - <systemPath>${basedir}/lib/xbean.jar</systemPath>
>>> - </dependency>
>>> - <dependency>
>>> - <groupId>org.apache.uima.xmlbeans</groupId>
>>> - <artifactId>uima-simple-server-xbean</artifactId>
>>> - <version>1.0</version>
>>> - <scope>system</scope>
>>> -
>> <systemPath>${basedir}/lib/uima-simple-server-xbean.jar</systemPath>
>>> - </dependency>
>>> - <dependency>
>>> - <groupId>org.apache.uima</groupId>
>>> - <artifactId>uima-simple-server</artifactId>
>>> - <version>1.0</version>
>>> - <scope>system</scope>
>>> -
>> <systemPath>${basedir}/lib/uima-simple-server.jar</systemPath>
>>> - </dependency>
>>> - <dependency>
>>> <groupId>junit</groupId>
>>> <artifactId>junit</artifactId>
>>> <version>4.0</version>
>>> @@ -85,6 +55,19 @@
>>> <version>2.3.0-incubating-SNAPSHOT</version>
>>> <scope>compile</scope>
>>> </dependency>
>>> + <dependency>
>>> + <groupId>org.apache.uima</groupId>
>>> + <artifactId>SimpleServer</artifactId>
>>> + <version>2.3.0-incubating-SNAPSHOT</version>
>>> + <scope>compile</scope>
>>> + </dependency>
>>> + <dependency>
>>> + <groupId>xmlbeans</groupId>
>>> + <artifactId>xbean</artifactId>
>>> + <version>2.2.0</version>
>>> + <scope>compile</scope>
>>> + <optional>true</optional>
>>> + </dependency>
>>> </dependencies>
>>> <build>
>>> <finalName>simple-uima-as-service</finalName>
>>> @@ -98,7 +81,7 @@
>>> <target>1.5</target>
>>> </configuration>
>>> </plugin>
>>> - <plugin>
>>> + <plugin>
>>> <groupId>org.codehaus.mojo</groupId>
>>> <artifactId>buildnumber-maven-plugin</artifactId>
>>> <executions>
>>> @@ -167,9 +150,7 @@
>>> <repositories>
>>> <repository>
>>> <id>ApacheIncubatorRepository</id>
>>> - <url>
>>> -
>> http://people.apache.org/repo/m2-incubating-repository/
>>> - </url>
>>> + <url>
>> http://people.apache.org/repo/m2-incubating-repository/</url>
>>> </repository>
>>> </repositories>
>>> </project>
>>>
>>> Modified:
>> incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java
>>> URL:
>> http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java?rev=810863&r1=810862&r2=810863&view=diff
>> ==============================================================================
>>> ---
>> incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java
>> (original)
>>> +++
>> incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java
>> Thu Sep 3 10:16:17 2009
>>> @@ -20,7 +20,6 @@
>>>
>>> import java.io.File;
>>> import java.io.FileOutputStream;
>>> -import java.io.IOException;
>>> import java.net.MalformedURLException;
>>> import java.net.URL;
>>> import java.util.HashMap;
>>> @@ -37,12 +36,9 @@
>>> import org.apache.uima.cas.Type;
>>> import org.apache.uima.cas.impl.XmiCasSerializer;
>>> import org.apache.uima.collection.EntityProcessStatus;
>>> -import org.apache.uima.resource.ResourceInitializationException;
>>> import org.apache.uima.resource.ResourceProcessException;
>>> import org.apache.uima.simpleserver.Service;
>>> -import org.apache.uima.simpleserver.SimpleServerException;
>>> import org.apache.uima.simpleserver.output.Result;
>>> -import org.apache.xmlbeans.XmlException;
>>>
>>> public class UimaAsSerive extends Service {
>>>
>>>
>>>
>>>
>>>
>>>
>
Re: svn commit: r810863 - in /incubator/uima/sandbox/trunk:
SimpleServer/ SimpleServer/src/main/assembly/ SimpleUimaAsService/
SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/
Posted by Tommaso Teofili <to...@gmail.com>.
Marhsall, I am afraid, you are right, some lines have not been merged
properly.
Do you know how can I fix it without changing revision?
Tommaso
2009/9/3 Marshall Schor <ms...@schor.com>
> Tommaso, I see some issues with this commit.
>
> Looking at the SimpleServer/pom.xml changes, it looks like your changes
> undid the previous-to-yours changes, done in revision 807268. Did you
> do that on purpose?
>
> -Marshall
>
> tommaso@apache.org wrote:
> > Author: tommaso
> > Date: Thu Sep 3 10:16:17 2009
> > New Revision: 810863
> >
> > URL: http://svn.apache.org/viewvc?rev=810863&view=rev
> > Log:
> > [UIMA-1462] SimpleUimaAsService has checked in SimpleServer libraries as
> binaries
> >
> > Added:
> > incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/
> >
> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml
> > Modified:
> > incubator/uima/sandbox/trunk/SimpleServer/pom.xml
> > incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml
> >
> incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java
> >
> > Modified: incubator/uima/sandbox/trunk/SimpleServer/pom.xml
> > URL:
> http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/pom.xml?rev=810863&r1=810862&r2=810863&view=diff
> >
> ==============================================================================
> > --- incubator/uima/sandbox/trunk/SimpleServer/pom.xml (original)
> > +++ incubator/uima/sandbox/trunk/SimpleServer/pom.xml Thu Sep 3 10:16:17
> 2009
> > @@ -1,103 +1,244 @@
> > -<!--
> > - 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"
> > + <!--
> > + 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>org.apache.uima</groupId>
> > <artifactId>SimpleServer</artifactId>
> > <packaging>jar</packaging>
> > - <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a
> flag for changeVersion -->
> > + <version>2.3.0-incubating-SNAPSHOT</version>
> > <name>Apache UIMA Simple Server</name>
> > -
> > - <parent>
> > - <groupId>org.apache.uima</groupId>
> > - <artifactId>SandboxDistr</artifactId>
> > - <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a
> flag for changeVersion -->
> > - <relativePath>../SandboxDistr</relativePath>
> > - </parent>
> > -
> > - <dependencies>
> > - <!-- versions from parent -->
> > - <dependency>
> > - <groupId>org.apache.uima</groupId>
> > - <artifactId>uimaj-core</artifactId>
> > - </dependency>
> > - <dependency>
> > - <groupId>org.apache.uima</groupId>
> > - <artifactId>uimaj-test-util</artifactId>
> > - </dependency>
> > - <dependency>
> > - <groupId>org.apache.uima</groupId>
> > - <artifactId>uimaj-component-test-util</artifactId>
> > - </dependency>
> > -
> > - <dependency>
> > - <groupId>javax.servlet</groupId>
> > - <artifactId>servlet-api</artifactId>
> > - <version>2.4</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>org.apache.uima.xmlbeans</groupId>
> > - <artifactId>xbean</artifactId>
> > - <version>1.0</version>
> > - <scope>system</scope>
> > - <systemPath>${basedir}/lib/xbean.jar</systemPath>
> > - </dependency>
> > - <dependency>
> > - <groupId>org.apache.uima.xmlbeans</groupId>
> > - <artifactId>jsr-173-api</artifactId>
> > - <version>1.0</version>
> > - <scope>system</scope>
> > - <systemPath>${basedir}/lib/jsr173_1.0_api.jar</systemPath>
> > - </dependency>
> > - <dependency>
> > - <groupId>org.apache.uima.xmlbeans</groupId>
> > - <artifactId>uima-simple-server-xbean</artifactId>
> > - <version>1.0</version>
> > - <scope>system</scope>
> > -
> <systemPath>${basedir}/lib/uima-simple-server-xbean.jar</systemPath>
> > - </dependency>
> > - <dependency>
> > - <groupId>junit</groupId>
> > - <artifactId>junit</artifactId>
> > - <version>4.0</version>
> > - <scope>compile</scope>
> > - </dependency>
> > - <dependency>
> > - <groupId>org.mortbay.jetty</groupId>
> > - <artifactId>jetty</artifactId>
> > - <version>6.1.8</version>
> > - <scope>compile</scope>
> > - </dependency>
> > - <dependency>
> > - <groupId>org.apache.httpcomponents</groupId>
> > - <artifactId>httpclient</artifactId>
> > - <version>4.0-alpha2</version>
> > - <scope>compile</scope>
> > - </dependency>
> > - </dependencies>
> > -
> > + <url>http://incubator.apache.org/uima</url>
> > + <dependencies>
> > + <dependency>
> > + <groupId>org.apache.uima</groupId>
> > + <artifactId>uimaj-core</artifactId>
> > + <version>2.3.0-incubating-SNAPSHOT</version>
> > + <scope>compile</scope>
> > + </dependency>
> > + <dependency>
> > + <groupId>org.apache.uima</groupId>
> > + <artifactId>uimaj-test-util</artifactId>
> > + <version>2.3.0-incubating-SNAPSHOT</version>
> > + <scope>compile</scope>
> > + </dependency>
> > + <dependency>
> > + <groupId>org.apache.uima</groupId>
> > + <artifactId>uimaj-component-test-util</artifactId>
> > + <version>2.3.0-incubating-SNAPSHOT</version>
> > + <scope>compile</scope>
> > + </dependency>
> > + <dependency>
> > + <groupId>javax.servlet</groupId>
> > + <artifactId>servlet-api</artifactId>
> > + <version>2.4</version>
> > + <scope>compile</scope>
> > + </dependency>
> > + <dependency>
> > + <groupId>org.apache.uima.xmlbeans</groupId>
> > + <artifactId>uima-simple-server-xbean</artifactId>
> > + <version>1.0</version>
> > + <scope>system</scope>
> > +
> <systemPath>${basedir}/lib/uima-simple-server-xbean.jar</systemPath>
> > + </dependency>
> > + <dependency>
> > + <groupId>junit</groupId>
> > + <artifactId>junit</artifactId>
> > + <version>4.0</version>
> > + <scope>test</scope>
> > + </dependency>
> > + <dependency>
> > + <groupId>org.mortbay.jetty</groupId>
> > + <artifactId>jetty</artifactId>
> > + <version>6.1.8</version>
> > + <scope>compile</scope>
> > + </dependency>
> > + <dependency>
> > + <groupId>org.apache.httpcomponents</groupId>
> > + <artifactId>httpclient</artifactId>
> > + <version>4.0-alpha2</version>
> > + <scope>compile</scope>
> > + </dependency>
> > + <dependency>
> > + <groupId>xmlbeans</groupId>
> > + <artifactId>xbean</artifactId>
> > + <version>2.2.0</version>
> > + <scope>compile</scope>
> > + </dependency>
> > + <dependency>
> > + <groupId>javax.xml.bind</groupId>
> > + <artifactId>jsr173_api</artifactId>
> > + <version>1.0</version>
> > + <scope>compile</scope>
> > + </dependency>
> > + </dependencies>
> > <build>
> > <finalName>uima-simple-server</finalName>
> > - </build>
> > -
> > -</project>
> > -
> > + <plugins>
> > + <plugin>
> > + <groupId>org.apache.maven.plugins</groupId>
> > +
> <artifactId>maven-compiler-plugin</artifactId>
> > + <configuration>
> > + <source>1.5</source>
> > + <target>1.5</target>
> > + <encoding>UTF-8</encoding>
> > + </configuration>
> > + </plugin>
> > + <plugin>
> > + <groupId>org.codehaus.mojo</groupId>
> > +
> <artifactId>buildnumber-maven-plugin</artifactId>
> > + <executions>
> > + <execution>
> > +
> <phase>process-classes</phase>
> > + <goals>
> > + <goal>create</goal>
> > + </goals>
> > + </execution>
> > + </executions>
> > + <configuration>
> > + <format>{0,date,yyyy-MM-dd
> HH:mm:ss}</format>
> > + <items>
> > + <item>timestamp</item>
> > + </items>
> > + </configuration>
> > + </plugin>
> > + <plugin>
> > + <groupId>org.apache.maven.plugins</groupId>
> > +
> <artifactId>maven-antrun-plugin</artifactId>
> > + <executions>
> > + <execution>
> > +
> <id>CopyLicenseNoticeDisclaimer</id>
> > +
> <phase>process-resources</phase>
> > + <configuration>
> > + <tasks>
> > + <copy
> todir="src/main/resources/META-INF">
> > +
> <fileset dir="." includes="LICENSE NOTICE DISCLAIMER" />
> > + </copy>
> > + <copy
> todir="target/classes/META-INF">
> > +
> <fileset dir="." includes="LICENSE.txt NOTICE.txt DISCLAIMER" />
> > + </copy>
> > + </tasks>
> > + </configuration>
> > + <goals>
> > + <goal>run</goal>
> > + </goals>
> > + </execution>
> > + <!--
> > + after compilation has been
> done and the files have been copied to
> > + the target directory,
> delete them from the source directory.
> > + -->
> > + <execution>
> > +
> <id>DeleteLicenseNoticeDisclaimer</id>
> > + <phase>package</phase>
> > + <configuration>
> > + <tasks>
> > + <delete
> dir="src/main/resources/META-INF" deleteOnExit="true"
> > +
> quiet="true" failOnError="false">
> > +
> <fileset dir="src/main/resources/META-INF" includes="LICENSE NOTICE
> DISCLAIMER" />
> > + </delete>
> > + </tasks>
> > + </configuration>
> > + <goals>
> > + <goal>run</goal>
> > + </goals>
> > + </execution>
> > + <!-- also delete on clean. -->
> > + <execution>
> > +
> <id>CleanLicenseNoticeDisclaimer</id>
> > + <phase>clean</phase>
> > + <configuration>
> > + <tasks>
> > + <delete
> dir="src/main/resources/META-INF" deleteOnExit="true"
> > +
> quiet="true" failOnError="false">
> > +
> <fileset dir="src/main/resources/META-INF" includes="LICENSE NOTICE
> DISCLAIMER" />
> > + </delete>
> > + </tasks>
> > + </configuration>
> > + <goals>
> > + <goal>run</goal>
> > + </goals>
> > + </execution>
> > + <execution>
> > + <phase>package</phase>
> > + <configuration>
> > + <tasks>
> > + <!-- Build
> documentation -->
> > + <ant
> antfile="build_documentation.xml" target="copyDocs" />
> > + </tasks>
> > + </configuration>
> > + <goals>
> > + <goal>run</goal>
> > + </goals>
> > + </execution>
> > + </executions>
> > + </plugin>
> > + <plugin>
> > + <groupId>org.apache.maven.plugins</groupId>
> > + <artifactId>maven-jar-plugin</artifactId>
> > + <configuration>
> > + <archive>
> > + <manifestEntries>
> > +
> <Project-Title>Apache UIMA</Project-Title>
> > +
> <Implementation-Title>${pom.name}</Implementation-Title>
> > +
> <Implementation-Version>${pom.version}</Implementation-Version>
> > +
> <Implementation-Vendor>Apache Software Foundation</Implementation-Vendor>
> > +
> <Implementation-Url>${pom.url}</Implementation-Url>
> > +
> <Implementation-License>http://www.apache.org/licenses/LICENSE-2.0.txt
> </Implementation-License>
> > +
> <Build-Date>${buildNumber}</Build-Date>
> > + </manifestEntries>
> > + </archive>
> > + </configuration>
> > + </plugin>
> > + <plugin>
> > + <groupId>org.apache.maven.plugins</groupId>
> > +
> <artifactId>maven-assembly-plugin</artifactId>
> > + <configuration>
> > + <descriptors>
> > +
> <descriptor>src/main/assembly/distribution.xml</descriptor>
> > + </descriptors>
> > + <archive>
> > + <manifestEntries>
> > +
> <Project-Title>Apache UIMA</Project-Title>
> > +
> <Implementation-Title>${pom.name}</Implementation-Title>
> > +
> <Implementation-Version>${pom.version}</Implementation-Version>
> > +
> <Implementation-Vendor>Apache Software Foundation</Implementation-Vendor>
> > +
> <Implementation-Url>${pom.url}</Implementation-Url>
> > +
> <Implementation-License>http://www.apache.org/licenses/LICENSE-2.0.txt
> </Implementation-License>
> > +
> <Build-Date>${buildNumber}</Build-Date>
> > + </manifestEntries>
> > + </archive>
> > + </configuration>
> > + <executions>
> > + <execution>
> > + <id>make-assembly</id>
> > + <phase>package</phase>
> > + <goals>
> > + <goal>single</goal>
> > + </goals>
> > + </execution>
> > + </executions>
> > + </plugin>
> > + </plugins>
> > + </build>
> > + <repositories>
> > + <repository>
> > + <id>ApacheIncubatorRepository</id>
> > + <url>
> http://people.apache.org/repo/m2-incubating-repository/</url>
> > + </repository>
> > + </repositories>
> > +</project>
> > \ No newline at end of file
> >
> > Added:
> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml
> > URL:
> http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml?rev=810863&view=auto
> >
> ==============================================================================
> > ---
> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml
> (added)
> > +++
> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml
> Thu Sep 3 10:16:17 2009
> > @@ -0,0 +1,29 @@
> > +<assembly>
> > + <id>distribution</id>
> > + <formats>
> > + <format>jar</format>
> > + </formats>
> > + <includeBaseDirectory>false</includeBaseDirectory>
> > + <dependencySets>
> > + <dependencySet>
> > +
> <outputDirectory>lib/${artifact.groupId}</outputDirectory>
> > + <unpack>false</unpack>
> > + <scope>system</scope>
> > + </dependencySet>
> > + <dependencySet>
> > +
> <outputDirectory>lib/${artifact.groupId}</outputDirectory>
> > + <unpack>false</unpack>
> > + <scope>compile</scope>
> > + <includes>
> > +
> <include>javax.xml.bind:jsr173_api</include>
> > + <include>xmlbeans:xbean</include>
> > + </includes>
> > + </dependencySet>
> > + </dependencySets>
> > + <fileSets>
> > + <fileSet>
> > + <directory>target/classes</directory>
> > + <outputDirectory></outputDirectory>
> > + </fileSet>
> > + </fileSets>
> > +</assembly>
> > \ No newline at end of file
> >
> > Modified: incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml
> > URL:
> http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml?rev=810863&r1=810862&r2=810863&view=diff
> >
> ==============================================================================
> > --- incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml (original)
> > +++ incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml Thu Sep 3
> 10:16:17 2009
> > @@ -1,21 +1,19 @@
> > -<!--
> > - 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"
> > @@ -40,34 +38,6 @@
> > <version>2.4</version>
> > </dependency>
> > <dependency>
> > - <groupId>org.apache.uima.xmlbeans</groupId>
> > - <artifactId>jsr-173-api</artifactId>
> > - <version>1.0</version>
> > - <scope>system</scope>
> > - <systemPath>${basedir}/lib/jsr173_1.0_api.jar</systemPath>
> > - </dependency>
> > - <dependency>
> > - <groupId>local.xmlbeans.dependency</groupId>
> > - <artifactId>xsdbeans</artifactId>
> > - <version>2.2</version>
> > - <scope>system</scope>
> > - <systemPath>${basedir}/lib/xbean.jar</systemPath>
> > - </dependency>
> > - <dependency>
> > - <groupId>org.apache.uima.xmlbeans</groupId>
> > - <artifactId>uima-simple-server-xbean</artifactId>
> > - <version>1.0</version>
> > - <scope>system</scope>
> > -
> <systemPath>${basedir}/lib/uima-simple-server-xbean.jar</systemPath>
> > - </dependency>
> > - <dependency>
> > - <groupId>org.apache.uima</groupId>
> > - <artifactId>uima-simple-server</artifactId>
> > - <version>1.0</version>
> > - <scope>system</scope>
> > -
> <systemPath>${basedir}/lib/uima-simple-server.jar</systemPath>
> > - </dependency>
> > - <dependency>
> > <groupId>junit</groupId>
> > <artifactId>junit</artifactId>
> > <version>4.0</version>
> > @@ -85,6 +55,19 @@
> > <version>2.3.0-incubating-SNAPSHOT</version>
> > <scope>compile</scope>
> > </dependency>
> > + <dependency>
> > + <groupId>org.apache.uima</groupId>
> > + <artifactId>SimpleServer</artifactId>
> > + <version>2.3.0-incubating-SNAPSHOT</version>
> > + <scope>compile</scope>
> > + </dependency>
> > + <dependency>
> > + <groupId>xmlbeans</groupId>
> > + <artifactId>xbean</artifactId>
> > + <version>2.2.0</version>
> > + <scope>compile</scope>
> > + <optional>true</optional>
> > + </dependency>
> > </dependencies>
> > <build>
> > <finalName>simple-uima-as-service</finalName>
> > @@ -98,7 +81,7 @@
> > <target>1.5</target>
> > </configuration>
> > </plugin>
> > - <plugin>
> > + <plugin>
> > <groupId>org.codehaus.mojo</groupId>
> > <artifactId>buildnumber-maven-plugin</artifactId>
> > <executions>
> > @@ -167,9 +150,7 @@
> > <repositories>
> > <repository>
> > <id>ApacheIncubatorRepository</id>
> > - <url>
> > -
> http://people.apache.org/repo/m2-incubating-repository/
> > - </url>
> > + <url>
> http://people.apache.org/repo/m2-incubating-repository/</url>
> > </repository>
> > </repositories>
> > </project>
> >
> > Modified:
> incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java
> > URL:
> http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java?rev=810863&r1=810862&r2=810863&view=diff
> >
> ==============================================================================
> > ---
> incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java
> (original)
> > +++
> incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java
> Thu Sep 3 10:16:17 2009
> > @@ -20,7 +20,6 @@
> >
> > import java.io.File;
> > import java.io.FileOutputStream;
> > -import java.io.IOException;
> > import java.net.MalformedURLException;
> > import java.net.URL;
> > import java.util.HashMap;
> > @@ -37,12 +36,9 @@
> > import org.apache.uima.cas.Type;
> > import org.apache.uima.cas.impl.XmiCasSerializer;
> > import org.apache.uima.collection.EntityProcessStatus;
> > -import org.apache.uima.resource.ResourceInitializationException;
> > import org.apache.uima.resource.ResourceProcessException;
> > import org.apache.uima.simpleserver.Service;
> > -import org.apache.uima.simpleserver.SimpleServerException;
> > import org.apache.uima.simpleserver.output.Result;
> > -import org.apache.xmlbeans.XmlException;
> >
> > public class UimaAsSerive extends Service {
> >
> >
> >
> >
> >
> >
>
Re: svn commit: r810863 - in /incubator/uima/sandbox/trunk: SimpleServer/
SimpleServer/src/main/assembly/ SimpleUimaAsService/ SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/
Posted by Marshall Schor <ms...@schor.com>.
Tommaso, I see some issues with this commit.
Looking at the SimpleServer/pom.xml changes, it looks like your changes
undid the previous-to-yours changes, done in revision 807268. Did you
do that on purpose?
-Marshall
tommaso@apache.org wrote:
> Author: tommaso
> Date: Thu Sep 3 10:16:17 2009
> New Revision: 810863
>
> URL: http://svn.apache.org/viewvc?rev=810863&view=rev
> Log:
> [UIMA-1462] SimpleUimaAsService has checked in SimpleServer libraries as binaries
>
> Added:
> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/
> incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml
> Modified:
> incubator/uima/sandbox/trunk/SimpleServer/pom.xml
> incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml
> incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java
>
> Modified: incubator/uima/sandbox/trunk/SimpleServer/pom.xml
> URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/pom.xml?rev=810863&r1=810862&r2=810863&view=diff
> ==============================================================================
> --- incubator/uima/sandbox/trunk/SimpleServer/pom.xml (original)
> +++ incubator/uima/sandbox/trunk/SimpleServer/pom.xml Thu Sep 3 10:16:17 2009
> @@ -1,103 +1,244 @@
> -<!--
> - 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"
> + <!--
> + 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>org.apache.uima</groupId>
> <artifactId>SimpleServer</artifactId>
> <packaging>jar</packaging>
> - <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a flag for changeVersion -->
> + <version>2.3.0-incubating-SNAPSHOT</version>
> <name>Apache UIMA Simple Server</name>
> -
> - <parent>
> - <groupId>org.apache.uima</groupId>
> - <artifactId>SandboxDistr</artifactId>
> - <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a flag for changeVersion -->
> - <relativePath>../SandboxDistr</relativePath>
> - </parent>
> -
> - <dependencies>
> - <!-- versions from parent -->
> - <dependency>
> - <groupId>org.apache.uima</groupId>
> - <artifactId>uimaj-core</artifactId>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.uima</groupId>
> - <artifactId>uimaj-test-util</artifactId>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.uima</groupId>
> - <artifactId>uimaj-component-test-util</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>javax.servlet</groupId>
> - <artifactId>servlet-api</artifactId>
> - <version>2.4</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.uima.xmlbeans</groupId>
> - <artifactId>xbean</artifactId>
> - <version>1.0</version>
> - <scope>system</scope>
> - <systemPath>${basedir}/lib/xbean.jar</systemPath>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.uima.xmlbeans</groupId>
> - <artifactId>jsr-173-api</artifactId>
> - <version>1.0</version>
> - <scope>system</scope>
> - <systemPath>${basedir}/lib/jsr173_1.0_api.jar</systemPath>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.uima.xmlbeans</groupId>
> - <artifactId>uima-simple-server-xbean</artifactId>
> - <version>1.0</version>
> - <scope>system</scope>
> - <systemPath>${basedir}/lib/uima-simple-server-xbean.jar</systemPath>
> - </dependency>
> - <dependency>
> - <groupId>junit</groupId>
> - <artifactId>junit</artifactId>
> - <version>4.0</version>
> - <scope>compile</scope>
> - </dependency>
> - <dependency>
> - <groupId>org.mortbay.jetty</groupId>
> - <artifactId>jetty</artifactId>
> - <version>6.1.8</version>
> - <scope>compile</scope>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.httpcomponents</groupId>
> - <artifactId>httpclient</artifactId>
> - <version>4.0-alpha2</version>
> - <scope>compile</scope>
> - </dependency>
> - </dependencies>
> -
> + <url>http://incubator.apache.org/uima</url>
> + <dependencies>
> + <dependency>
> + <groupId>org.apache.uima</groupId>
> + <artifactId>uimaj-core</artifactId>
> + <version>2.3.0-incubating-SNAPSHOT</version>
> + <scope>compile</scope>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.uima</groupId>
> + <artifactId>uimaj-test-util</artifactId>
> + <version>2.3.0-incubating-SNAPSHOT</version>
> + <scope>compile</scope>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.uima</groupId>
> + <artifactId>uimaj-component-test-util</artifactId>
> + <version>2.3.0-incubating-SNAPSHOT</version>
> + <scope>compile</scope>
> + </dependency>
> + <dependency>
> + <groupId>javax.servlet</groupId>
> + <artifactId>servlet-api</artifactId>
> + <version>2.4</version>
> + <scope>compile</scope>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.uima.xmlbeans</groupId>
> + <artifactId>uima-simple-server-xbean</artifactId>
> + <version>1.0</version>
> + <scope>system</scope>
> + <systemPath>${basedir}/lib/uima-simple-server-xbean.jar</systemPath>
> + </dependency>
> + <dependency>
> + <groupId>junit</groupId>
> + <artifactId>junit</artifactId>
> + <version>4.0</version>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> + <groupId>org.mortbay.jetty</groupId>
> + <artifactId>jetty</artifactId>
> + <version>6.1.8</version>
> + <scope>compile</scope>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.httpcomponents</groupId>
> + <artifactId>httpclient</artifactId>
> + <version>4.0-alpha2</version>
> + <scope>compile</scope>
> + </dependency>
> + <dependency>
> + <groupId>xmlbeans</groupId>
> + <artifactId>xbean</artifactId>
> + <version>2.2.0</version>
> + <scope>compile</scope>
> + </dependency>
> + <dependency>
> + <groupId>javax.xml.bind</groupId>
> + <artifactId>jsr173_api</artifactId>
> + <version>1.0</version>
> + <scope>compile</scope>
> + </dependency>
> + </dependencies>
> <build>
> <finalName>uima-simple-server</finalName>
> - </build>
> -
> -</project>
> -
> + <plugins>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-compiler-plugin</artifactId>
> + <configuration>
> + <source>1.5</source>
> + <target>1.5</target>
> + <encoding>UTF-8</encoding>
> + </configuration>
> + </plugin>
> + <plugin>
> + <groupId>org.codehaus.mojo</groupId>
> + <artifactId>buildnumber-maven-plugin</artifactId>
> + <executions>
> + <execution>
> + <phase>process-classes</phase>
> + <goals>
> + <goal>create</goal>
> + </goals>
> + </execution>
> + </executions>
> + <configuration>
> + <format>{0,date,yyyy-MM-dd HH:mm:ss}</format>
> + <items>
> + <item>timestamp</item>
> + </items>
> + </configuration>
> + </plugin>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-antrun-plugin</artifactId>
> + <executions>
> + <execution>
> + <id>CopyLicenseNoticeDisclaimer</id>
> + <phase>process-resources</phase>
> + <configuration>
> + <tasks>
> + <copy todir="src/main/resources/META-INF">
> + <fileset dir="." includes="LICENSE NOTICE DISCLAIMER" />
> + </copy>
> + <copy todir="target/classes/META-INF">
> + <fileset dir="." includes="LICENSE.txt NOTICE.txt DISCLAIMER" />
> + </copy>
> + </tasks>
> + </configuration>
> + <goals>
> + <goal>run</goal>
> + </goals>
> + </execution>
> + <!--
> + after compilation has been done and the files have been copied to
> + the target directory, delete them from the source directory.
> + -->
> + <execution>
> + <id>DeleteLicenseNoticeDisclaimer</id>
> + <phase>package</phase>
> + <configuration>
> + <tasks>
> + <delete dir="src/main/resources/META-INF" deleteOnExit="true"
> + quiet="true" failOnError="false">
> + <fileset dir="src/main/resources/META-INF" includes="LICENSE NOTICE DISCLAIMER" />
> + </delete>
> + </tasks>
> + </configuration>
> + <goals>
> + <goal>run</goal>
> + </goals>
> + </execution>
> + <!-- also delete on clean. -->
> + <execution>
> + <id>CleanLicenseNoticeDisclaimer</id>
> + <phase>clean</phase>
> + <configuration>
> + <tasks>
> + <delete dir="src/main/resources/META-INF" deleteOnExit="true"
> + quiet="true" failOnError="false">
> + <fileset dir="src/main/resources/META-INF" includes="LICENSE NOTICE DISCLAIMER" />
> + </delete>
> + </tasks>
> + </configuration>
> + <goals>
> + <goal>run</goal>
> + </goals>
> + </execution>
> + <execution>
> + <phase>package</phase>
> + <configuration>
> + <tasks>
> + <!-- Build documentation -->
> + <ant antfile="build_documentation.xml" target="copyDocs" />
> + </tasks>
> + </configuration>
> + <goals>
> + <goal>run</goal>
> + </goals>
> + </execution>
> + </executions>
> + </plugin>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-jar-plugin</artifactId>
> + <configuration>
> + <archive>
> + <manifestEntries>
> + <Project-Title>Apache UIMA</Project-Title>
> + <Implementation-Title>${pom.name}</Implementation-Title>
> + <Implementation-Version>${pom.version}</Implementation-Version>
> + <Implementation-Vendor>Apache Software Foundation</Implementation-Vendor>
> + <Implementation-Url>${pom.url}</Implementation-Url>
> + <Implementation-License>http://www.apache.org/licenses/LICENSE-2.0.txt</Implementation-License>
> + <Build-Date>${buildNumber}</Build-Date>
> + </manifestEntries>
> + </archive>
> + </configuration>
> + </plugin>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-assembly-plugin</artifactId>
> + <configuration>
> + <descriptors>
> + <descriptor>src/main/assembly/distribution.xml</descriptor>
> + </descriptors>
> + <archive>
> + <manifestEntries>
> + <Project-Title>Apache UIMA</Project-Title>
> + <Implementation-Title>${pom.name}</Implementation-Title>
> + <Implementation-Version>${pom.version}</Implementation-Version>
> + <Implementation-Vendor>Apache Software Foundation</Implementation-Vendor>
> + <Implementation-Url>${pom.url}</Implementation-Url>
> + <Implementation-License>http://www.apache.org/licenses/LICENSE-2.0.txt</Implementation-License>
> + <Build-Date>${buildNumber}</Build-Date>
> + </manifestEntries>
> + </archive>
> + </configuration>
> + <executions>
> + <execution>
> + <id>make-assembly</id>
> + <phase>package</phase>
> + <goals>
> + <goal>single</goal>
> + </goals>
> + </execution>
> + </executions>
> + </plugin>
> + </plugins>
> + </build>
> + <repositories>
> + <repository>
> + <id>ApacheIncubatorRepository</id>
> + <url>http://people.apache.org/repo/m2-incubating-repository/</url>
> + </repository>
> + </repositories>
> +</project>
> \ No newline at end of file
>
> Added: incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml
> URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml?rev=810863&view=auto
> ==============================================================================
> --- incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml (added)
> +++ incubator/uima/sandbox/trunk/SimpleServer/src/main/assembly/distribution.xml Thu Sep 3 10:16:17 2009
> @@ -0,0 +1,29 @@
> +<assembly>
> + <id>distribution</id>
> + <formats>
> + <format>jar</format>
> + </formats>
> + <includeBaseDirectory>false</includeBaseDirectory>
> + <dependencySets>
> + <dependencySet>
> + <outputDirectory>lib/${artifact.groupId}</outputDirectory>
> + <unpack>false</unpack>
> + <scope>system</scope>
> + </dependencySet>
> + <dependencySet>
> + <outputDirectory>lib/${artifact.groupId}</outputDirectory>
> + <unpack>false</unpack>
> + <scope>compile</scope>
> + <includes>
> + <include>javax.xml.bind:jsr173_api</include>
> + <include>xmlbeans:xbean</include>
> + </includes>
> + </dependencySet>
> + </dependencySets>
> + <fileSets>
> + <fileSet>
> + <directory>target/classes</directory>
> + <outputDirectory></outputDirectory>
> + </fileSet>
> + </fileSets>
> +</assembly>
> \ No newline at end of file
>
> Modified: incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml
> URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml?rev=810863&r1=810862&r2=810863&view=diff
> ==============================================================================
> --- incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml (original)
> +++ incubator/uima/sandbox/trunk/SimpleUimaAsService/pom.xml Thu Sep 3 10:16:17 2009
> @@ -1,21 +1,19 @@
> -<!--
> - 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"
> @@ -40,34 +38,6 @@
> <version>2.4</version>
> </dependency>
> <dependency>
> - <groupId>org.apache.uima.xmlbeans</groupId>
> - <artifactId>jsr-173-api</artifactId>
> - <version>1.0</version>
> - <scope>system</scope>
> - <systemPath>${basedir}/lib/jsr173_1.0_api.jar</systemPath>
> - </dependency>
> - <dependency>
> - <groupId>local.xmlbeans.dependency</groupId>
> - <artifactId>xsdbeans</artifactId>
> - <version>2.2</version>
> - <scope>system</scope>
> - <systemPath>${basedir}/lib/xbean.jar</systemPath>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.uima.xmlbeans</groupId>
> - <artifactId>uima-simple-server-xbean</artifactId>
> - <version>1.0</version>
> - <scope>system</scope>
> - <systemPath>${basedir}/lib/uima-simple-server-xbean.jar</systemPath>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.uima</groupId>
> - <artifactId>uima-simple-server</artifactId>
> - <version>1.0</version>
> - <scope>system</scope>
> - <systemPath>${basedir}/lib/uima-simple-server.jar</systemPath>
> - </dependency>
> - <dependency>
> <groupId>junit</groupId>
> <artifactId>junit</artifactId>
> <version>4.0</version>
> @@ -85,6 +55,19 @@
> <version>2.3.0-incubating-SNAPSHOT</version>
> <scope>compile</scope>
> </dependency>
> + <dependency>
> + <groupId>org.apache.uima</groupId>
> + <artifactId>SimpleServer</artifactId>
> + <version>2.3.0-incubating-SNAPSHOT</version>
> + <scope>compile</scope>
> + </dependency>
> + <dependency>
> + <groupId>xmlbeans</groupId>
> + <artifactId>xbean</artifactId>
> + <version>2.2.0</version>
> + <scope>compile</scope>
> + <optional>true</optional>
> + </dependency>
> </dependencies>
> <build>
> <finalName>simple-uima-as-service</finalName>
> @@ -98,7 +81,7 @@
> <target>1.5</target>
> </configuration>
> </plugin>
> - <plugin>
> + <plugin>
> <groupId>org.codehaus.mojo</groupId>
> <artifactId>buildnumber-maven-plugin</artifactId>
> <executions>
> @@ -167,9 +150,7 @@
> <repositories>
> <repository>
> <id>ApacheIncubatorRepository</id>
> - <url>
> - http://people.apache.org/repo/m2-incubating-repository/
> - </url>
> + <url>http://people.apache.org/repo/m2-incubating-repository/</url>
> </repository>
> </repositories>
> </project>
>
> Modified: incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java
> URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java?rev=810863&r1=810862&r2=810863&view=diff
> ==============================================================================
> --- incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java (original)
> +++ incubator/uima/sandbox/trunk/SimpleUimaAsService/src/main/java/org/apache/uima/simpleserver/as/UimaAsSerive.java Thu Sep 3 10:16:17 2009
> @@ -20,7 +20,6 @@
>
> import java.io.File;
> import java.io.FileOutputStream;
> -import java.io.IOException;
> import java.net.MalformedURLException;
> import java.net.URL;
> import java.util.HashMap;
> @@ -37,12 +36,9 @@
> import org.apache.uima.cas.Type;
> import org.apache.uima.cas.impl.XmiCasSerializer;
> import org.apache.uima.collection.EntityProcessStatus;
> -import org.apache.uima.resource.ResourceInitializationException;
> import org.apache.uima.resource.ResourceProcessException;
> import org.apache.uima.simpleserver.Service;
> -import org.apache.uima.simpleserver.SimpleServerException;
> import org.apache.uima.simpleserver.output.Result;
> -import org.apache.xmlbeans.XmlException;
>
> public class UimaAsSerive extends Service {
>
>
>
>
>
>