Author: cwiklik
Date: Wed May 4 19:41:27 2016
New Revision: 1742323
URL: http://svn.apache.org/viewvc?rev=1742323&view=rev
Log:
UIMA-4916
Modified:
uima/uima-as/trunk/NOTICE
uima/uima-as/trunk/README
uima/uima-as/trunk/src/main/assembly/bin.xml
uima/uima-as/trunk/src/main/readme/LICENSE
uima/uima-as/trunk/src/main/readme/NOTICE
uima/uima-as/trunk/uima-as-parent/pom.xml
uima/uima-as/trunk/uimaj-as-activemq/pom.xml
Modified: uima/uima-as/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/NOTICE?rev=1742323&r1=1742322&r2=1742323&view=diff
==============================================================================
--- uima/uima-as/trunk/NOTICE (original)
+++ uima/uima-as/trunk/NOTICE Wed May 4 19:41:27 2016
@@ -82,40 +82,3 @@ Some portions of the code are Copyright:
2006 Tim Vernum
1999 Jason Gilbert.
-===============================================================
-== NOTICE File for JmDNS ==
-===============================================================
-
-Java Multicast Domain Name Server (JmDNS)
-
-This project was originally developed by Arthur van Hoff under the GNU
-Lesser General Public License as jRendevous. It was moved to Sourceforge
-by Rick Blair and renamed to JmDNS with the Arthur's kind permission.
-
-Currently it has been re-released under the Apache License, Version 2.0.
-
-Details of the Apache License, Version 2.0 can be found at:
-http://www.apache.org/licenses/
-
-Portions of this software were originally based on the following:
- - software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
-
-Aside from contributions to the Apache XMLBeans project, this
-software also includes:
-
- - one or more source files from the Apache Xerces-J and Apache Axis
- products, Copyright (c) 1999-2003 Apache Software Foundation
-
- - W3C XML Schema documents Copyright 2001-2003 (c) World Wide Web
- Consortium (Massachusetts Institute of Technology, European Research
- Consortium for Informatics and Mathematics, Keio University)
-
- - resolver.jar from Apache Xml Commons project,
- Copyright (c) 2001-2003 Apache Software Foundation
-
- - Piccolo XML Parser for Java from http://piccolo.sourceforge.net/,
- Copyright 2002 Yuval Oren under the terms of the Apache Software License
2.0
-
- - JSR-173 Streaming API for XML from
http://sourceforge.net/projects/xmlpullparser/,
- Copyright 2005 BEA under the terms of the Apache Software License 2.0
-
\ No newline at end of file
Modified: uima/uima-as/trunk/README
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/README?rev=1742323&r1=1742322&r2=1742323&view=diff
==============================================================================
--- uima/uima-as/trunk/README (original)
+++ uima/uima-as/trunk/README Wed May 4 19:41:27 2016
@@ -152,7 +152,12 @@ run the base Eclipse using Java 7 (or la
3.1 Starting the ActiveMQ Broker
--------------------------------
+UIMA AS includes a partial distribution of Apache ActiveMQ to support core
functionality of
+the broker. This includes a single broker support, network of brokers with
fixed URLs, stomp, persistence,
+http, ssl, openwire, springframework integration, and jetty. If you need
additional broker functionality you
+need to download and install a complete version of ActiveMQ from
http://activemq.apache.org/download.html.
+
UIMA AS services require an ActiveMQ broker to be available with which to
create/register
the service request queue. If no broker is available, start a new broker on
the same machine
the services will run on or another machine; this is done by first setting an
env parameter
Modified: uima/uima-as/trunk/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/src/main/assembly/bin.xml?rev=1742323&r1=1742322&r2=1742323&view=diff
==============================================================================
--- uima/uima-as/trunk/src/main/assembly/bin.xml (original)
+++ uima/uima-as/trunk/src/main/assembly/bin.xml Wed May 4 19:41:27 2016
@@ -80,8 +80,7 @@
<include>org.apache.activemq:activemq-partition</include>
<include>org.apache.activemq:activemq-runtime-config</include>
<include>org.apache.activemq:activemq-shiro</include>
-
<include>org.apache.activemq:activemq-openwire-legacy</include>
-
<include>org.apache.activemq.protobuf:activemq-protobuf</include>
+
<!-- Spring Framework -->
<include>org.springframework:spring-aop</include>
<include>org.springframework:spring-core</include>
Modified: uima/uima-as/trunk/src/main/readme/LICENSE
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/src/main/readme/LICENSE?rev=1742323&r1=1742322&r2=1742323&view=diff
==============================================================================
--- uima/uima-as/trunk/src/main/readme/LICENSE (original)
+++ uima/uima-as/trunk/src/main/readme/LICENSE Wed May 4 19:41:27 2016
@@ -400,8 +400,6 @@ activemq-runtime-config-5.13.2.jar
activemq-jms-pool-5.13.2.jar
activemq-partition-5.13.2.jar
activemq-http-5.13.2.jar
-activemq-openwire-legacy-5.13.2.jar
-activemq-protobuf-1.1.jar
jcl-over-slf4j-1.7.13.jar
slf4j-log4j12-1.7.13.jar
log4j-1.2.17.jar
Modified: uima/uima-as/trunk/src/main/readme/NOTICE
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/src/main/readme/NOTICE?rev=1742323&r1=1742322&r2=1742323&view=diff
==============================================================================
--- uima/uima-as/trunk/src/main/readme/NOTICE (original)
+++ uima/uima-as/trunk/src/main/readme/NOTICE Wed May 4 19:41:27 2016
@@ -26,14 +26,6 @@ This product includes software, Apache A
at the Apache Software Foundation (http://www.apache.org/).
=========================================================================
-== Protocol Buffers Notice ==
-=========================================================================
-
-This product includes software developed by the Protocol Buffers
-project (http://code.google.com/apis/protocolbuffers).
-
-
-=========================================================================
== Spring Notice ==
=========================================================================
Modified: uima/uima-as/trunk/uima-as-parent/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-parent/pom.xml?rev=1742323&r1=1742322&r2=1742323&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as-parent/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-parent/pom.xml Wed May 4 19:41:27 2016
@@ -160,7 +160,6 @@
<hawtbuff.version>1.11</hawtbuff.version>
- <activemq.protobuf.version>1.1</activemq.protobuf.version>
<!-- Needed for NOTICE file packaged in each jar under META-INF -->
<uimaASNoticeText>
Portions of UIMA-AS were originally developed by
@@ -312,19 +311,6 @@ ${uimaASNoticeText}
<version>${org.apache.activemq.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
-
<artifactId>activemq-openwire-legacy</artifactId>
-
<version>${org.apache.activemq.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq.protobuf</groupId>
- <artifactId>activemq-protobuf</artifactId>
- <version>${activemq.protobuf.version}</version>
- </dependency>
-
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>activemq-http</artifactId>
Modified: uima/uima-as/trunk/uimaj-as-activemq/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/pom.xml?rev=1742323&r1=1742322&r2=1742323&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/pom.xml Wed May 4 19:41:27 2016
@@ -83,16 +83,6 @@
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-openwire-legacy</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq.protobuf</groupId>
- <artifactId>activemq-protobuf</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
<artifactId>activemq-web</artifactId>
<exclusions>
<exclusion>
