Author: bhavani
Date: Wed Feb 1 15:20:50 2012
New Revision: 1239168
URL: http://svn.apache.org/viewvc?rev=1239168&view=rev
Log:
UIMA-2363 added apr-util and update buildsdk script, licence and documentation
Modified:
uima/uimacpp/trunk/LICENSE
uima/uimacpp/trunk/NOTICE.4bin
uima/uimacpp/trunk/README.4bin
uima/uimacpp/trunk/README.4src
uima/uimacpp/trunk/buildsdk.cmd
uima/uimacpp/trunk/createRelease.txt
Modified: uima/uimacpp/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/uima/uimacpp/trunk/LICENSE?rev=1239168&r1=1239167&r2=1239168&view=diff
==============================================================================
--- uima/uimacpp/trunk/LICENSE (original)
+++ uima/uimacpp/trunk/LICENSE Wed Feb 1 15:20:50 2012
@@ -390,4 +390,247 @@ Copyright © 2008 Mateusz Loskot mateusz
Copying and distribution of this file, with or without modification, are
permitted in any medium without royalty provided the copyright notice and this
notice are preserved. This file is offered as-is, without any warranty.
+-----------------------------------------------------------------------------------
+
+For APR-Util
+
+APACHE PORTABLE RUNTIME SUBCOMPONENTS:
+
+The Apache Portable Runtime includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+For the include\apr_md5.h component:
+/*
+ * This is work is derived from material Copyright RSA Data Security, Inc.
+ *
+ * The RSA copyright statement and Licence for that original material is
+ * included below. This is followed by the Apache copyright statement and
+ * licence for the modifications made to that material.
+ */
+
+/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+ rights reserved.
+
+ License to copy and use this software is granted provided that it
+ is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+ Algorithm" in all material mentioning or referencing this software
+ or this function.
+
+ License is also granted to make and use derivative works provided
+ that such works are identified as "derived from the RSA Data
+ Security, Inc. MD5 Message-Digest Algorithm" in all material
+ mentioning or referencing the derived work.
+
+ RSA Data Security, Inc. makes no representations concerning either
+ the merchantability of this software or the suitability of this
+ software for any particular purpose. It is provided "as is"
+ without express or implied warranty of any kind.
+
+ These notices must be retained in any copies of any part of this
+ documentation and/or software.
+ */
+
+For the passwd\apr_md5.c component:
+
+/*
+ * This is work is derived from material Copyright RSA Data Security, Inc.
+ *
+ * The RSA copyright statement and Licence for that original material is
+ * included below. This is followed by the Apache copyright statement and
+ * licence for the modifications made to that material.
+ */
+
+/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
+ */
+
+/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+ rights reserved.
+
+ License to copy and use this software is granted provided that it
+ is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+ Algorithm" in all material mentioning or referencing this software
+ or this function.
+
+ License is also granted to make and use derivative works provided
+ that such works are identified as "derived from the RSA Data
+ Security, Inc. MD5 Message-Digest Algorithm" in all material
+ mentioning or referencing the derived work.
+
+ RSA Data Security, Inc. makes no representations concerning either
+ the merchantability of this software or the suitability of this
+ software for any particular purpose. It is provided "as is"
+ without express or implied warranty of any kind.
+
+ These notices must be retained in any copies of any part of this
+ documentation and/or software.
+ */
+/*
+ * The apr_md5_encode() routine uses much code obtained from the FreeBSD 3.0
+ * MD5 crypt() function, which is licenced as follows:
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <[email protected]> wrote this file. As long as you retain this notice
you
+ * can do whatever you want with this stuff. If we meet some day, and you think
+ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
+ * ----------------------------------------------------------------------------
+ */
+
+For the crypto\apr_md4.c component:
+
+ * This is derived from material copyright RSA Data Security, Inc.
+ * Their notice is reproduced below in its entirety.
+ *
+ * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+ * rights reserved.
+ *
+ * License to copy and use this software is granted provided that it
+ * is identified as the "RSA Data Security, Inc. MD4 Message-Digest
+ * Algorithm" in all material mentioning or referencing this software
+ * or this function.
+ *
+ * License is also granted to make and use derivative works provided
+ * that such works are identified as "derived from the RSA Data
+ * Security, Inc. MD4 Message-Digest Algorithm" in all material
+ * mentioning or referencing the derived work.
+ *
+ * RSA Data Security, Inc. makes no representations concerning either
+ * the merchantability of this software or the suitability of this
+ * software for any particular purpose. It is provided "as is"
+ * without express or implied warranty of any kind.
+ *
+ * These notices must be retained in any copies of any part of this
+ * documentation and/or software.
+ */
+
+For the include\apr_md4.h component:
+
+ *
+ * This is derived from material copyright RSA Data Security, Inc.
+ * Their notice is reproduced below in its entirety.
+ *
+ * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+ * rights reserved.
+ *
+ * License to copy and use this software is granted provided that it
+ * is identified as the "RSA Data Security, Inc. MD4 Message-Digest
+ * Algorithm" in all material mentioning or referencing this software
+ * or this function.
+ *
+ * License is also granted to make and use derivative works provided
+ * that such works are identified as "derived from the RSA Data
+ * Security, Inc. MD4 Message-Digest Algorithm" in all material
+ * mentioning or referencing the derived work.
+ *
+ * RSA Data Security, Inc. makes no representations concerning either
+ * the merchantability of this software or the suitability of this
+ * software for any particular purpose. It is provided "as is"
+ * without express or implied warranty of any kind.
+ *
+ * These notices must be retained in any copies of any part of this
+ * documentation and/or software.
+ */
+
+For the test\testmd4.c component:
+
+ *
+ * This is derived from material copyright RSA Data Security, Inc.
+ * Their notice is reproduced below in its entirety.
+ *
+ * Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
+ * rights reserved.
+ *
+ * RSA Data Security, Inc. makes no representations concerning either
+ * the merchantability of this software or the suitability of this
+ * software for any particular purpose. It is provided "as is"
+ * without express or implied warranty of any kind.
+ *
+ * These notices must be retained in any copies of any part of this
+ * documentation and/or software.
+ */
+
+For the xml\expat\conftools\install-sh component:
+
+#
+# install - install a program, script, or datafile
+# This comes from X11R5 (mit/util/scripts/install.sh).
+#
+# Copyright 1991 by the Massachusetts Institute of Technology
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission. M.I.T. makes no representations about the
+# suitability of this software for any purpose. It is provided "as is"
+# without express or implied warranty.
+#
+
+For the expat xml parser component:
+
+Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
+ and Clark Cooper
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+====================================================================
+
+For the ldap/apr_ldap_url.c component:
+
+/* Portions Copyright 1998-2002 The OpenLDAP Foundation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License. A copy of this license is available at
+ * http://www.OpenLDAP.org/license.html or in file LICENSE in the
+ * top-level directory of the distribution.
+ *
+ * OpenLDAP is a registered trademark of the OpenLDAP Foundation.
+ *
+ * Individual files and/or contributed packages may be copyright by
+ * other parties and subject to additional restrictions.
+ *
+ * This work is derived from the University of Michigan LDAP v3.3
+ * distribution. Information concerning this software is available
+ * at: http://www.umich.edu/~dirsvcs/ldap/
+ *
+ * This work also contains materials derived from public sources.
+ *
+ * Additional information about OpenLDAP can be obtained at:
+ * http://www.openldap.org/
+ */
+
+/*
+ * Portions Copyright (c) 1992-1996 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ */
+
Modified: uima/uimacpp/trunk/NOTICE.4bin
URL:
http://svn.apache.org/viewvc/uima/uimacpp/trunk/NOTICE.4bin?rev=1239168&r1=1239167&r2=1239168&view=diff
==============================================================================
--- uima/uimacpp/trunk/NOTICE.4bin (original)
+++ uima/uimacpp/trunk/NOTICE.4bin Wed Feb 1 15:20:50 2012
@@ -39,4 +39,20 @@ For ActiveMQ CPP 3.4.1
== ZLib Compression / Decompression Library Notice ==
=========================================================================
This product includes software developed by the Jean-loup Gailly and Mark Adler
-http://www.zlib.net/
\ No newline at end of file
+http://www.zlib.net/
+
+------------------------------------------------------------------------
+Apache Portable Runtime Utility Library
+Copyright (c) 2009 The Apache Software Foundation.
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software were developed at the National Center
+for Supercomputing Applications (NCSA) at the University of
+Illinois at Urbana-Champaign.
+
+This software contains code derived from the RSA Data Security
+Inc. MD5 Message-Digest Algorithm, including various
+modifications by Spyglass Inc., Carnegie Mellon University, and
+Bell Communications Research, Inc (Bellcore).
Modified: uima/uimacpp/trunk/README.4bin
URL:
http://svn.apache.org/viewvc/uima/uimacpp/trunk/README.4bin?rev=1239168&r1=1239167&r2=1239168&view=diff
==============================================================================
--- uima/uimacpp/trunk/README.4bin (original)
+++ uima/uimacpp/trunk/README.4bin Wed Feb 1 15:20:50 2012
@@ -18,12 +18,15 @@ on Linux systems with gcc version 3.4.6
using MSVC version 8. 64-bit builds have only been tested on Linux with gcc
4.3.2.
UIMACPP has dependencies on APR, ICU, Xerces-C and ActiveMQ-cpp
-libraries. The UIMA C++ SDK has been built with the following versions of
these dependencies:
+libraries. ActiveMQ-cpp has a dependency on apr-util.
+
+The UIMA C++ SDK has been built with the following versions of these
dependencies:
- APR 1.3.8
- ICU 3.6
- XERCES 2.8.0
- ACTIVEMQ CPP 3.4.1
+- APR-UTIL 1.3.8
Environment Variables
Modified: uima/uimacpp/trunk/README.4src
URL:
http://svn.apache.org/viewvc/uima/uimacpp/trunk/README.4src?rev=1239168&r1=1239167&r2=1239168&view=diff
==============================================================================
--- uima/uimacpp/trunk/README.4src (original)
+++ uima/uimacpp/trunk/README.4src Wed Feb 1 15:20:50 2012
@@ -13,17 +13,18 @@ using MSVC version 8. 64-bit builds have
Setting up the build environment:
---------------------------------
UIMACPP has dependencies on APR, ICU, Xerces-C and ActiveMQ-cpp
-libraries.
+libraries. ActiveMQ-cpp has a runtime dependency on APR-Util and is required
to build the
+binary distribution.
On Windows dependent libraries must be specified with the
-environmental parameters APR_HOME, ICU_HOME, XERCES_HOME and
-ACTIVEMQ_HOME. For now, the ActiveMQ CPP dependency is optional; if not
+environmental parameters APR_HOME, ICU_HOME, XERCES_HOME, APU_HOME and
+ACTIVEMQ_HOME. For now, the ActiveMQ CPP and APR Util dependencies are
optional; if not
specified the UIMA-AS compatible service wrapper deployCppService will
fail to build.
On Linux, system install of dependencies - APR, ICU, XERCES, ACTIVEMQ
will be used if minimum version requirements are met. They may also
-be specified with the environmental parameters APR_HOME, ICU_HOME, XERCES_HOME
and
+be specified with the environmental parameters APR_HOME, ICU_HOME,
XERCES_HOME,
ACTIVEMQ_HOME. The ActiveMQ CPP library is required.
There is also a dependency on JNI headers from a Java JDK. The build
@@ -36,8 +37,8 @@ On Unix, dependent headers are expected
dependent libraries under $dependent_HOME/lib.
The build of dependent libraries on Windows is less consistent.
-APR libraries are expected in %APR_HOME%\Release. ActiveMQ libraries
-are in %ACTIVEMQ_HOME%\vs2008-build\ReleaseDLL (or DebugDLL) and
+APR and APR-Util libraries are expected in %APR_HOME%\Release and
%APU_HOME%\Release respectively.
+ActiveMQ libraries are in %ACTIVEMQ_HOME%\vs2008-build\ReleaseDLL (or
DebugDLL) and
ActiveMQ headers are expected in %ACTIVEMQ_HOME%\src\main.
On Windows, buildsdk command tries to copy the msvc*.dll runtime libs from
@@ -69,7 +70,7 @@ assume you have unpacked the source into
make check
4 Build the SDK tree:
- Requires environmental parameters to be set for ICU_HOME, XERCES_HOME,
APR_HOME, and ACTIVEMQ_HOME.
+ Requires environmental parameters to be set for ICU_HOME, XERCES_HOME,
APR_HOME, ACTIVEMQ_HOME, APU_HOME.
From root of the SVN extract
make sdk ARGS=target_dir
This will build the documentation.
@@ -111,6 +112,7 @@ If using MSVC Express Edition, replace t
4 Build the SDK tree:
set MSVCRT_HOME to the directory with the msvc*.dll files required.
+ set ACTIVEMQ_HOME and APU_HOME if building and distributing the ActiveMQ CPP
service wrapper, deployCppService.
cd \uimacpp-2.X.Y
buildsdk target_dir
@@ -142,6 +144,7 @@ Building the dependencies: APR, ICU, Xer
Download and build information for these libraries are at:
APR - http://apr.apache.org/
+ APR-Util - http://apr.apache.org/
ICU - http://www.icu-project.org/
XERCES - http://xml.apache.org/xerces-c/
ACTIVEMQ - http://activemq.apache.org/cms/download.html
@@ -159,7 +162,7 @@ after building APR, install using:
On Windows, the only activemq-cpp targets needed by uimacpp are ReleaseDLL and
DebugDLL,
e.g. devenv vs2008-build/vs2008-activemq.vcproj /build ReleaseDLL
-Also, the APR library can be built by launching libapr.dsp or by following the
+Also, the APR and APR-Util libraries can be built by launching libapr.dsp or
by following the
instructions in Makefile.win.
Binary distributions are available for Xerces and ICU.
Modified: uima/uimacpp/trunk/buildsdk.cmd
URL:
http://svn.apache.org/viewvc/uima/uimacpp/trunk/buildsdk.cmd?rev=1239168&r1=1239167&r2=1239168&view=diff
==============================================================================
--- uima/uimacpp/trunk/buildsdk.cmd (original)
+++ uima/uimacpp/trunk/buildsdk.cmd Wed Feb 1 15:20:50 2012
@@ -34,6 +34,7 @@ if "%~1" == "" (
echo ICU_HOME - root of the ICU install. Required.
echo XERCES_HOME - root of the XERCES install. Required.
echo MSVCRT_HOME - directory with required msvc*.dll files
+ echo APU_HOME - root of the APR Util install Required if
ACTIVEMQ_HOME is set.
echo ACTIVEMQ_HOME - root of the XERCES install. Optional.
echo Optional environment variable:
echo UIMA_INSTALL - 'install' location of uimacpp build.
@@ -54,6 +55,10 @@ set UIMA_DIR=%TARGET_DIR%\uimacpp
if "%APR_HOME%" == "" goto Missing
if "%ICU_HOME%" == "" goto Missing
if "%XERCES_HOME%" == "" goto Missing
+if not "%ACTIVEMQ_HOME%" == "" (
+ if "%APU_HOME%" == "" goto MissingAprUtil
+
+)
echo.
echo SDK directory tree will be built in %UIMA_DIR%
@@ -186,6 +191,7 @@ xcopy /Q /Y %APR_HOME%\include\apr*.h %U
xcopy /Q /Y %APR_HOME%\Release\libapr*.dll %UIMA_DIR%\bin
xcopy /Q /Y %APR_HOME%\Release\libapr*.lib %UIMA_DIR%\lib
+
echo.
echo copying from %ICU_HOME%...
mkdir %UIMA_DIR%\include\unicode
@@ -262,6 +268,10 @@ REM xcopy /Q /Y %XERCES_HOME%\LICENSE* %
if not "%ACTIVEMQ_HOME%" == "" (
echo.
+ echo copying from %APU_HOME%...
+ xcopy /Q /Y %APU_HOME%\Release\libaprutil*.dll %UIMA_DIR%\bin
+ xcopy /Q /Y %APU_HOME%\Release\libaprutil*.lib %UIMA_DIR%\lib
+ echo.
echo copying from %ACTIVEMQ_HOME%...
xcopy /Q /Y %ACTIVEMQ_HOME%\vs2008-build\win32\ReleaseDLL\activemq-cpp.dll
%UIMA_DIR%\bin
xcopy /Q /Y %ACTIVEMQ_HOME%\vs2008-build\win32\DebugDLL\activemq-cppd.dll
%UIMA_DIR%\bin
@@ -278,6 +288,11 @@ echo APR_HOME and ICU_HOME and XERCES_HO
echo and must contain the directories produced by their "install" builds
goto end
+:MissingAprUtil
+echo APU_HOME must be specifed when ACTIVEMQ_HOME is specified
+echo and must contain the directories produced by apr-util "install" build
+goto end
+
:error
echo FAILED: UIMA C++ SDK was not built.
Modified: uima/uimacpp/trunk/createRelease.txt
URL:
http://svn.apache.org/viewvc/uima/uimacpp/trunk/createRelease.txt?rev=1239168&r1=1239167&r2=1239168&view=diff
==============================================================================
--- uima/uimacpp/trunk/createRelease.txt (original)
+++ uima/uimacpp/trunk/createRelease.txt Wed Feb 1 15:20:50 2012
@@ -33,7 +33,7 @@ For a new build on Linux
5. build, test and create sdk tree
cd uimacpp-2.4.0
- [setup env for the build]
+ [setup env for the build]. Requires environment variables APR_HOME,
ICU_HOME, XERCES_HOME, ACTIVEMQ_HOME, APU_HOME.
make
DESTDIR=`pwd` make install
make check
@@ -90,7 +90,7 @@ For a new build on Windows
2. build, test and create sdk tree
cd uimacpp-2.4.0\src
- [setup env for the build]
+ [setup env for the build] Requires environment variables APR_HOME,
ICU_HOME, XERCES_HOME, ACTIVEMQ_HOME, APU_HOME.
winmake /build release
winmake /build debug
cd ..\docs
