You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2004/11/18 17:08:21 UTC
cvs commit: ws-axis/c/src/platforms/aix PlatformSpecificAIX.hpp
dicka 2004/11/18 08:08:21
Modified: c/build build.AIX.properties build.Linux.properties
build.OS400.properties build.SunOS.properties
c/src/platforms PlatformAutoSense.hpp
c/src/platforms/os400 PlatformSpecificOS400.hpp
c/src/platforms/unix PlatformSpecificUnix.hpp
Added: c/src/platforms/aix PlatformSpecificAIX.hpp
Log:
Remove full paths from default transport and xmlParser libraries.
PR: AXISCPP-220
Submitted by: Adrian Dick
Revision Changes Path
1.5 +3 -3 ws-axis/c/build/build.AIX.properties
Index: build.AIX.properties
===================================================================
RCS file: /home/cvs/ws-axis/c/build/build.AIX.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.AIX.properties 11 Nov 2004 16:44:12 -0000 1.4
+++ build.AIX.properties 18 Nov 2004 16:08:20 -0000 1.5
@@ -48,9 +48,9 @@
expat.xmlParserLibraryName = axis_expat
# Name for compiled XML Parser library - excluding any prefix or suffix
-# eg: For Windows : axis_xmlParser will produce axis_xmlParser.dll
-# For Unix : axis_xmlParser will produce libaxis_xmlParser.so
-xmlParserLibraryName = axis_xmlParser
+# eg: For Windows : axis_xmlparser will produce axis_xmlparser.dll
+# For Unix : axis_xmlparser will produce libaxis_xmlparser.so
+xmlParserLibraryName = axis_xmlparser
########################
# Transport Properties #
1.5 +3 -3 ws-axis/c/build/build.Linux.properties
Index: build.Linux.properties
===================================================================
RCS file: /home/cvs/ws-axis/c/build/build.Linux.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.Linux.properties 11 Nov 2004 16:44:12 -0000 1.4
+++ build.Linux.properties 18 Nov 2004 16:08:20 -0000 1.5
@@ -48,9 +48,9 @@
expat.xmlParserLibraryName = axis_expat
# Name for compiled XML Parser library - excluding any prefix or suffix
-# eg: For Windows : axis_xmlParser will produce axis_xmlParser.dll
-# For Unix : axis_xmlParser will produce libaxis_xmlParser.so
-xmlParserLibraryName = axis_xmlParser
+# eg: For Windows : axis_xmlparser will produce axis_xmlparser.dll
+# For Unix : axis_xmlparser will produce libaxis_xmlparser.so
+xmlParserLibraryName = axis_xmlparser
########################
# Transport Properties #
1.5 +3 -3 ws-axis/c/build/build.OS400.properties
Index: build.OS400.properties
===================================================================
RCS file: /home/cvs/ws-axis/c/build/build.OS400.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.OS400.properties 11 Nov 2004 16:44:12 -0000 1.4
+++ build.OS400.properties 18 Nov 2004 16:08:20 -0000 1.5
@@ -48,9 +48,9 @@
expat.xmlParserLibraryName = axis_expat
# Name for compiled XML Parser library - excluding any prefix or suffix
-# eg: For Windows : axis_xmlParser will produce axis_xmlParser.dll
-# For Unix : axis_xmlParser will produce libaxis_xmlParser.so
-xmlParserLibraryName = axis_xmlParser
+# eg: For Windows : axis_xmlparser will produce axis_xmlparser.dll
+# For Unix : axis_xmlparser will produce libaxis_xmlparser.so
+xmlParserLibraryName = axis_xmlparser
########################
# Transport Properties #
1.5 +3 -3 ws-axis/c/build/build.SunOS.properties
Index: build.SunOS.properties
===================================================================
RCS file: /home/cvs/ws-axis/c/build/build.SunOS.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.SunOS.properties 11 Nov 2004 16:44:12 -0000 1.4
+++ build.SunOS.properties 18 Nov 2004 16:08:20 -0000 1.5
@@ -48,9 +48,9 @@
expat.xmlParserLibraryName = axis_expat
# Name for compiled XML Parser library - excluding any prefix or suffix
-# eg: For Windows : axis_xmlParser will produce axis_xmlParser.dll
-# For Unix : axis_xmlParser will produce libaxis_xmlParser.so
-xmlParserLibraryName = axis_xmlParser
+# eg: For Windows : axis_xmlparser will produce axis_xmlparser.dll
+# For Unix : axis_xmlparser will produce libaxis_xmlparser.so
+xmlParserLibraryName = axis_xmlparser
########################
# Transport Properties #
1.2 +2 -0 ws-axis/c/src/platforms/PlatformAutoSense.hpp
Index: PlatformAutoSense.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/platforms/PlatformAutoSense.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PlatformAutoSense.hpp 1 Nov 2004 15:04:49 -0000 1.1
+++ PlatformAutoSense.hpp 18 Nov 2004 16:08:20 -0000 1.2
@@ -23,6 +23,8 @@
#include "windows/PlatformSpecificWindows.hpp"
#elif defined ( __OS400__ )
#include "os400/PlatformSpecificOS400.hpp"
+#elif defined ( AIX )
+ #include "aix/PlatformSpecificAIX.hpp"
#else
#include "unix/PlatformSpecificUnix.hpp"
#endif
1.3 +2 -2 ws-axis/c/src/platforms/os400/PlatformSpecificOS400.hpp
Index: PlatformSpecificOS400.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/platforms/os400/PlatformSpecificOS400.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PlatformSpecificOS400.hpp 11 Nov 2004 11:09:32 -0000 1.2
+++ PlatformSpecificOS400.hpp 18 Nov 2004 16:08:20 -0000 1.3
@@ -22,8 +22,8 @@
// =============================================================
// Default paths to shared library/DLLs and files
// =============================================================
-#define PLATFORM_XMLPARSER_PATH "/usr/local/axiscpp_deploy/lib/libaxis_xmlparser.so"
-#define PLATFORM_TRANSPORTHTTP_PATH "/usr/local/axiscpp_deploy/lib/libaxis_transport.so"
+#define PLATFORM_XMLPARSER_PATH "libaxis_xmlparser.so"
+#define PLATFORM_TRANSPORTHTTP_PATH "libaxis_transport.so"
#define PLATFORM_LOG_PATH "/usr/local/axiscpp_deploy/log/AxisLog"
#define PLATFORM_CLIENTLOG_PATH "/usr/local/axiscpp_deploy/log/AxisClientLog"
1.3 +2 -2 ws-axis/c/src/platforms/unix/PlatformSpecificUnix.hpp
Index: PlatformSpecificUnix.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/platforms/unix/PlatformSpecificUnix.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PlatformSpecificUnix.hpp 11 Nov 2004 11:09:32 -0000 1.2
+++ PlatformSpecificUnix.hpp 18 Nov 2004 16:08:20 -0000 1.3
@@ -22,8 +22,8 @@
// =============================================================
// Default paths to shared library/DLLs and files
// =============================================================
-#define PLATFORM_XMLPARSER_PATH "/usr/local/axiscpp_deploy/lib/libaxis_xmlparser.so"
-#define PLATFORM_TRANSPORTHTTP_PATH "/usr/local/axiscpp_deploy/lib/libaxis_transport.so"
+#define PLATFORM_XMLPARSER_PATH "libaxis_xmlparser.so"
+#define PLATFORM_TRANSPORTHTTP_PATH "libaxis_transport.so"
#define PLATFORM_LOG_PATH "/usr/local/axiscpp_deploy/log/AxisLog"
#define PLATFORM_CLIENTLOG_PATH "/usr/local/axiscpp_deploy/log/AxisClientLog"
1.1 ws-axis/c/src/platforms/aix/PlatformSpecificAIX.hpp
Index: PlatformSpecificAIX.hpp
===================================================================
/*
* Copyright 2004-2004 The Apache Software Foundation.
*
* Licensed 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.
*/
#if !defined(_PLATFORM_SPECIFIC_AIX_HPP)
#define _PLATFORM_SPECIFIC_AIX_HPP
// =============================================================
// Default paths to shared library/DLLs and files
// =============================================================
#define PLATFORM_XMLPARSER_PATH "libaxis_xmlparser.a"
#define PLATFORM_TRANSPORTHTTP_PATH "libaxis_transport.a"
#define PLATFORM_LOG_PATH "/usr/local/axiscpp_deploy/log/AxisLog"
#define PLATFORM_CLIENTLOG_PATH "/usr/local/axiscpp_deploy/log/AxisClientLog"
#define PLATFORM_CONFIG_PATH "/etc/axiscpp.conf"
// =============================================================
// Library loading and procedure resolution
// =============================================================
#ifdef USE_LTDL
#include <ltdl.h>
#define DLHandler lt_dlhandle
#define PLATFORM_LOADLIBINIT lt_dlinit
#define PLATFORM_LOADLIB(_lib) lt_dlopen(_lib)
#define PLATFORM_UNLOADLIB lt_dlclose
#define PLATFORM_GETPROCADDR lt_dlsym
#define PLATFORM_LOADLIBEXIT lt_dlexit
#define PLATFORM_LOADLIB_ERROR lt_dlerror()
#else
#include <dlfcn.h>
#define DLHandler void*
#define PLATFORM_LOADLIBINIT()
#define PLATFORM_LOADLIB(_lib) dlopen(_lib, RTLD_LAZY)
#define PLATFORM_UNLOADLIB dlclose
#define PLATFORM_GETPROCADDR dlsym
#define PLATFORM_LOADLIBEXIT()
#define PLATFORM_LOADLIB_ERROR dlerror()
#endif
// =============================================================
// National Language Support
// =============================================================
// STRTOASC is to translate single byte 'native' character representation to ASCII
// ASCTOSTR is to translate single byte ascii representation to 'native' character
// CANNOT be used with constants
#define PLATFORM_STRTOASC( x ) ( x )
#define PLATFORM_ASCTOSTR( x ) ( x )
#endif