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 da...@apache.org on 2004/11/30 12:49:04 UTC
cvs commit: ws-axis/c/src/xml/expat XMLParserExpat.h
damitha 2004/11/30 03:49:04
Modified: c/include/axis GDefine.hpp
c/src/engine/client Call.cpp
c/src/transport Makefile
c/src/transport/axis2 Axis2Transport.cpp Axis2Transport.h
Makefile SSLChannelFactory.cpp
SSLChannelFactory.hpp SecureChannel.cpp
SecureChannel.h
c/src/xml/expat XMLParserExpat.h
Log:
Removed the globals from SSLChannelFactor and solved it as Fred suggested
Revision Changes Path
1.2 +2 -1 ws-axis/c/include/axis/GDefine.hpp
Index: GDefine.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/include/axis/GDefine.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GDefine.hpp 23 Nov 2004 11:11:11 -0000 1.1
+++ GDefine.hpp 30 Nov 2004 11:49:03 -0000 1.2
@@ -50,7 +50,8 @@
SERVICE_URI,
OPERATION_NAME,
SOAP_MESSAGE_LENGTH,
- SECURE_PROPERTIES
+ SECURE_PROPERTIES,
+ DLL_NAME
} AXIS_TRANSPORT_INFORMATION_TYPE;
#define SOAPACTIONHEADER "SOAPAction"
1.79 +12 -6 ws-axis/c/src/engine/client/Call.cpp
Index: Call.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/engine/client/Call.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- Call.cpp 29 Nov 2004 12:42:59 -0000 1.78
+++ Call.cpp 30 Nov 2004 11:49:03 -0000 1.79
@@ -36,6 +36,8 @@
#include "../../soap/SoapDeSerializer.h"
#include "../../soap/HeaderBlock.h"
+extern AXIS_CPP_NAMESPACE_PREFIX AxisConfig* g_pConfig;
+
extern "C" int initialize_module (int bServer);
extern "C" int uninitialize_module ();
@@ -309,12 +311,16 @@
m_pTransport = SOAPTransportFactory::getTransportObject(m_nTransportType);
if (!m_pTransport) return AXIS_FAIL;
- m_pTransport->setEndpointUri(m_pcEndPointUri);
-
- //if use proxy then set proxy
- if( m_bUseProxy )
- m_pTransport->setProxy(m_strProxyHost.c_str(), m_uiProxyPort);
- m_nStatus = m_pTransport->openConnection();
+ m_pTransport->setEndpointUri(m_pcEndPointUri);
+ /* damitha:SSLChannelFactory needs the ssl channel library name to load the
+ optional ssl channel library*/
+ char* pcLibraryPath = g_pConfig->getAxisConfProperty(AXCONF_SSLCHANNEL);
+ m_pTransport->setTransportProperty(DLL_NAME, pcLibraryPath);
+
+ //if use proxy then set proxy
+ if( m_bUseProxy )
+ m_pTransport->setProxy(m_strProxyHost.c_str(), m_uiProxyPort);
+ m_nStatus = m_pTransport->openConnection();
}
catch(AxisException& e)
{
1.9 +10 -10 ws-axis/c/src/transport/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile 25 Nov 2004 12:41:58 -0000 1.8
+++ Makefile 30 Nov 2004 11:49:03 -0000 1.9
@@ -38,10 +38,10 @@
pkgincludedir = $(includedir)/axis-c-src
top_builddir = ../..
-ACLOCAL = ${SHELL} /home/damitha/projects/cvshead/missing --run aclocal-1.6
-AUTOCONF = ${SHELL} /home/damitha/projects/cvshead/missing --run autoconf
-AUTOMAKE = ${SHELL} /home/damitha/projects/cvshead/missing --run automake-1.6
-AUTOHEADER = ${SHELL} /home/damitha/projects/cvshead/missing --run autoheader
+ACLOCAL = ${SHELL} /home/damith/projects/cvshead/missing --run aclocal-1.6
+AUTOCONF = ${SHELL} /home/damith/projects/cvshead/missing --run autoconf
+AUTOMAKE = ${SHELL} /home/damith/projects/cvshead/missing --run automake-1.6
+AUTOHEADER = ${SHELL} /home/damith/projects/cvshead/missing --run autoheader
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = /usr/bin/install -c
@@ -65,7 +65,7 @@
EXEEXT =
OBJEXT = o
PATH_SEPARATOR = :
-AMTAR = ${SHELL} /home/damitha/projects/cvshead/missing --run tar
+AMTAR = ${SHELL} /home/damith/projects/cvshead/missing --run tar
APACHE2BUILD = apache2
APACHE2INC = -I/usr/local/apache2/include
APACHEBUILD =
@@ -77,13 +77,13 @@
DEPDIR = .deps
DLLTOOL = @DLLTOOL@
ECHO = echo
-EXPATBUILD =
-EXPATINC =
-EXPATLIB =
+EXPATBUILD = expat
+EXPATINC = -I/usr/local/expat/include
+EXPATLIB = -L/usr/local/expat/lib -lexpat -ldl
INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
LIBTOOL = $(SHELL) $(top_builddir)/libtool
LIBWWWBUILD =
-LINKCLIENTLIB = -L/home/damitha/projects/cvshead/src/engine/client -laxiscpp_client -ldl
+LINKCLIENTLIB = -L/home/damith/projects/cvshead/src/engine/client -laxiscpp_client -ldl
LN_S = ln -s
OBJDUMP = @OBJDUMP@
PACKAGE = axis-c-src
@@ -101,7 +101,7 @@
XERCESCLIB = -L/usr/local/xerces-c/lib -lxerces-c -ldl
am__include = include
am__quote =
-install_sh = /home/damitha/projects/cvshead/install-sh
+install_sh = /home/damith/projects/cvshead/install-sh
SUBDIRS = axis2
subdir = src/transport
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
1.24 +223 -19 ws-axis/c/src/transport/axis2/Axis2Transport.cpp
Index: Axis2Transport.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis2/Axis2Transport.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Axis2Transport.cpp 24 Nov 2004 08:08:50 -0000 1.23
+++ Axis2Transport.cpp 30 Nov 2004 11:49:03 -0000 1.24
@@ -359,8 +359,8 @@
try
{
*m_pChannel >> m_strReceived;
-
- if (!m_bReadPastHTTPHeaders)
+
+ if (!m_bReadPastHTTPHeaders)
{
do
{
@@ -464,9 +464,7 @@
{
do
{
- std::string strTempReceived = "";
- *m_pChannel >> strTempReceived; // Assume non blocking here
- m_strReceived += strTempReceived;
+ *m_pChannel >> m_strReceived;
endOfChunkData = m_strReceived.find ("\r\n");
}
while (endOfChunkData == std::string::npos);
@@ -504,6 +502,11 @@
m_strReceived =
m_strReceived.substr (endOfChunkData + 2);
}
+ /* We have received part of chunk data. If received payload
+ * is a mime struct, process it
+ */
+ if(m_bMimeTrue)
+ processRootMimeBody();
}
else
{
@@ -526,14 +529,6 @@
// Start looking for the next chunk
unsigned int endOfChunkData = m_strReceived.find ("\r\n"); // Skip end of previous chunk
- while (endOfChunkData == std::string::npos)
- {
- std::string strTempRecv = "";
- *m_pChannel >> strTempRecv;
- m_strReceived += strTempRecv;
- endOfChunkData = m_strReceived.find ("\r\n");
- }
-
m_strReceived = m_strReceived.substr (endOfChunkData + 2);
endOfChunkData = m_strReceived.find ("\r\n"); // Locate start of next chunk
@@ -583,6 +578,11 @@
m_strReceived =
m_strReceived.substr (endOfChunkData + 2);
}
+ /* We have received part of chunk data. If received payload
+ * is a mime struct, process it
+ */
+ if(m_bMimeTrue)
+ processRootMimeBody();
}
else
{
@@ -598,6 +598,11 @@
else // Not chunked
{
//nothing to do here
+ /* We have received part of chunk data. If received payload
+ * is a mime struct, process it
+ */
+ if(m_bMimeTrue)
+ processRootMimeBody();
}
m_pcReceived = m_strReceived.c_str ();
@@ -632,10 +637,12 @@
int iToCopy = (*pSize < m_iBytesLeft) ? *pSize : m_iBytesLeft;
strncpy (pcBuffer, m_pcReceived, iToCopy);
- pcBuffer[iToCopy] = '\0';
+
m_iBytesLeft -= iToCopy;
m_pcReceived += iToCopy;
*pSize = iToCopy;
+ if(m_iBytesLeft == 0)
+ return TRANSPORT_FINISHED;
return TRANSPORT_IN_PROGRESS;
}
@@ -689,13 +696,22 @@
}
case SECURE_PROPERTIES:
+ {
+ if (m_bChannelSecure)
{
- if (m_bChannelSecure)
- {
- ((SecureChannel *) m_pChannel)->setSecureProperties (value);
- }
- break;
+ ((SecureChannel *) m_pChannel)->setSecureProperties (value);
+ }
+ break;
+ }
+
+ case DLL_NAME:
+ {
+ if (m_bChannelSecure)
+ {
+ ((SecureChannel *) m_pChannel)->setTransportProperty (type, value);
}
+ break;
+ }
default:
{
@@ -1091,6 +1107,40 @@
}
}
+
+ /* If Content-Type: Multipart/Related; boundary=<MIME_boundary>; type=text/xml;
+ start="<content id>"*/
+ if (key == "Content-Type")
+ {
+ m_strContentType = value;
+ unsigned long ulMimePos = m_strContentType.find(";");
+ std::string strTypePart;
+ if (ulMimePos != std::string::npos)
+ {
+ strTypePart = m_strContentType.substr(1, ulMimePos - 1);
+ }
+ if("Multipart/Related" == strTypePart)
+ {
+ m_bMimeTrue = true;
+ m_strContentType = m_strContentType.substr(ulMimePos + 1,
+ m_strContentType.length());
+
+ ulMimePos = m_strContentType.find("boundary=");
+ m_strMimeBoundary = m_strContentType.substr(ulMimePos);
+ ulMimePos = m_strMimeBoundary.find(";");
+ m_strMimeBoundary = m_strMimeBoundary.substr(9, ulMimePos - 9);
+
+ ulMimePos = m_strContentType.find("type=");
+ m_strMimeType = m_strContentType.substr(ulMimePos);
+ ulMimePos = m_strMimeType.find(";");
+ m_strMimeType = m_strMimeType.substr(5, ulMimePos - 5);
+
+ ulMimePos = m_strContentType.find("start=");
+ m_strMimeStart = m_strContentType.substr(ulMimePos);
+ ulMimePos = m_strMimeStart.find(";");
+ m_strMimeStart = m_strMimeStart.substr(6, ulMimePos - 6);
+ }
+ }
}
while (iPosition != std::string::npos);
}
@@ -1101,6 +1151,159 @@
}
}
+/* Axis2Transport::processRootMimeBody() Is a public method used to
+ * parse the mime attachments.
+ */
+void
+Axis2Transport::processRootMimeBody ()
+{
+ if (false == m_bReadPastRootMimeHeader)
+ {
+ do
+ {
+ if (m_strReceived.find ("\r\n\r\n") == std::string::npos)
+ {
+ std::string strTempReceived = "";
+ *m_pChannel >> strTempReceived; // Assume non blocking here
+ m_strReceived += strTempReceived;
+ }
+ }
+ while (m_strReceived.find ("\r\n\r\n") == std::string::npos);
+
+ //now we have found the end of root mime header
+ m_bReadPastRootMimeHeader = true;
+ //processMimeHeader(); For the time being we don't process this
+ // Done with root mime body headers, get rest of the payload
+ // which contain the soap message
+ m_strReceived =
+ m_strReceived.substr (m_strReceived.find ("\r\n\r\n") +
+ 4);
+ int intMimeTemp = m_strReceived.find(m_strMimeBoundary);
+ if (intMimeTemp != std::string::npos)
+ {
+ m_strReceived = m_strReceived.substr(0, intMimeTemp);
+ m_strMimeReceived = m_strReceived.substr(intMimeTemp);
+ /* Using m_strMimeReceived will be
+ * continued when getAttachment is called.
+ */
+ m_bMimeTrue = false;
+ }
+ }
+ else
+ {
+ int intMimeTemp = m_strReceived.find(m_strMimeBoundary);
+ if (intMimeTemp != std::string::npos)
+ {
+ m_strReceived = m_strReceived.substr(0, intMimeTemp);
+ m_strMimeReceived = m_strReceived.substr(intMimeTemp);
+ /* Using m_strMimeReceived will be
+ * continued when getAttachment is called.
+ */
+ m_bMimeTrue = false;
+ }
+ return;
+ }
+}
+
+/* Axis2Transport::processMimeHeaders() Is a public method used to
+ * parse the Mime headers of the response message.
+ */
+void
+Axis2Transport::processMimeHeader ()
+{
+ unsigned int pos = 0;
+ unsigned int temppos = 0;
+
+ // Look for content lenght
+ if ((pos =
+ m_strMimeReceived.find ("Content-Type: ")) !=
+ std::string::npos)
+ {
+ m_strMimeContentType =
+ m_strMimeReceived.
+ substr (pos + strlen ("Content-Type: "),
+ m_strMimeReceived.find ("\n",
+ pos));
+ pos = m_strMimeContentType.find(";");
+ temppos = m_strMimeContentType.find("\r\n");
+ if(pos < temppos)
+ m_strMimeContentType = m_strMimeContentType.substr(0, pos);
+ else
+ m_strMimeContentType = m_strMimeContentType.substr(0, temppos);
+ }
+
+ // Look for mime root body's content transfer encoding
+ if ((pos =
+ m_strMimeReceived.find ("Content-Transfer-Encoding: ")) !=
+ std::string::npos)
+ {
+ m_strMimeContentTransferEncoding =
+ m_strMimeReceived.
+ substr (pos + strlen ("Content-Transfer-Encoding: "),
+ m_strMimeReceived.find ("\n",
+ pos));
+ temppos = m_strMimeContentTransferEncoding.find("\r\n");
+ m_strMimeContentTransferEncoding = m_strMimeContentTransferEncoding.substr(0, temppos);
+ }
+
+ // Look for mime root body's content id
+ if ((pos =
+ m_strMimeReceived.find ("Content-ID: ")) !=
+ std::string::npos)
+ {
+ m_strMimeContentID =
+ m_strMimeReceived.
+ substr (pos + strlen ("Content-ID: "),
+ m_strMimeReceived.find ("\n",
+ pos));
+ temppos = m_strMimeContentID.find("\r\n");
+ m_strMimeContentID = m_strMimeContentID.substr(0, temppos);
+ }
+
+ // Look for mime root body's content location
+ if ((pos =
+ m_strMimeReceived.find ("Content-Location: ")) !=
+ std::string::npos)
+ {
+ m_strMimeContentLocation =
+ atoi (m_strMimeReceived.
+ substr (pos + strlen ("Content-Location: "),
+ m_strMimeReceived.find ("\n",
+ pos)).c_str ());
+ temppos = m_strMimeContentLocation.find("\r\n");
+ m_strMimeContentLocation = m_strMimeContentLocation.substr(0, temppos);
+ }
+}
+
+void
+Axis2Transport::processMimeBody()
+{
+}
+
+void
+Axis2Transport::getAttachment(char* pStrAttachment, int* pIntSize,
+ int intAttachmentId)
+{
+ std::string strTempReceived = "";
+ *m_pChannel >> strTempReceived; // Assume non blocking here
+ m_strMimeReceived += strTempReceived;
+ do
+ {
+ if (m_strMimeReceived.find ("\r\n\r\n") == std::string::npos)
+ {
+ strTempReceived = "";
+ *m_pChannel >> strTempReceived; // Assume non blocking here
+ m_strMimeReceived += strTempReceived;
+ }
+ }
+ while (m_strMimeReceived.find ("\r\n\r\n") == std::string::npos);
+ //now we have found the end of next mime header
+ processMimeHeader();
+ m_strMimeReceived = m_strMimeReceived.substr(m_strMimeReceived.
+ find("\r\n\r\n"));
+ processMimeBody();
+}
+
void
Axis2Transport::setSocket (unsigned int uiNewSocket)
{
@@ -1209,3 +1412,4 @@
{
return m_strSessionKey.c_str();
}
+
1.17 +35 -1 ws-axis/c/src/transport/axis2/Axis2Transport.h
Index: Axis2Transport.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis2/Axis2Transport.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Axis2Transport.h 15 Nov 2004 16:47:43 -0000 1.16
+++ Axis2Transport.h 30 Nov 2004 11:49:03 -0000 1.17
@@ -209,6 +209,10 @@
protected:
void processResponseHTTPHeaders ();
+ void processRootMimeBody ();
+ void processMimeHeader ();
+ void processMimeBody();
+ void getAttachment(char* pStrAttachment, int* pIntSize, int intAttachmentId);
int FindTransportPropertyIndex (std::string);
/**
@@ -333,8 +337,38 @@
* Session key sent by service
*/
std::string m_strSessionKey;
+
+ /**
+ * Content-Type holder
+ */
+ std::string m_strContentType;
-
+ /**
+ * Mime Boundary value
+ */
+ std::string m_strMimeBoundary;
+
+ /**
+ * Mime type value
+ */
+ std::string m_strMimeType;
+
+ /**
+ * Mime start value
+ */
+ std::string m_strMimeStart;
+
+ /**
+ * Received payload is a mime struct
+ */
+ bool m_bMimeTrue;
+
+ bool m_bReadPastRootMimeHeader;
+ std::string m_strMimeContentType;
+ std::string m_strMimeContentTransferEncoding;
+ std::string m_strMimeContentID;
+ std::string m_strMimeContentLocation;
+ std::string m_strMimeReceived;
};
#endif
1.12 +163 -267 ws-axis/c/src/transport/axis2/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis2/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile 30 Nov 2004 10:35:42 -0000 1.11
+++ Makefile 30 Nov 2004 11:49:04 -0000 1.12
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
# src/transport/axis2/Makefile. Generated from Makefile.in by configure.
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -13,190 +13,97 @@
# PARTICULAR PURPOSE.
-
-SOURCES = $(libaxis2_transport_la_SOURCES)
+SHELL = /bin/sh
srcdir = .
top_srcdir = ../../..
+prefix = /usr/local/axiscpp_deploy
+exec_prefix = ${prefix}
+
+bindir = ${exec_prefix}/bin
+sbindir = ${exec_prefix}/sbin
+libexecdir = ${exec_prefix}/libexec
+datadir = ${prefix}/share
+sysconfdir = ${prefix}/etc
+sharedstatedir = ${prefix}/com
+localstatedir = ${prefix}/var
+libdir = ${exec_prefix}/lib
+infodir = ${prefix}/info
+mandir = ${prefix}/man
+includedir = ${prefix}/include
+oldincludedir = /usr/include
pkgdatadir = $(datadir)/axis-c-src
pkglibdir = $(libdir)/axis-c-src
pkgincludedir = $(includedir)/axis-c-src
top_builddir = ../../..
+
+ACLOCAL = ${SHELL} /home/damith/projects/cvshead/missing --run aclocal-1.6
+AUTOCONF = ${SHELL} /home/damith/projects/cvshead/missing --run autoconf
+AUTOMAKE = ${SHELL} /home/damith/projects/cvshead/missing --run automake-1.6
+AUTOHEADER = ${SHELL} /home/damith/projects/cvshead/missing --run autoheader
+
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = /usr/bin/install -c
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DATA = ${INSTALL} -m 644
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = ${INSTALL}
INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = s,x,x,
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_triplet = i686-redhat-linux-gnu
-subdir = src/transport/axis2
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(libdir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libaxis2_transport_la_DEPENDENCIES =
-am_libaxis2_transport_la_OBJECTS = SecureChannel.lo Channel.lo URL.lo \
- Axis2Transport.lo AxisTransportException.lo \
- Axis2TransportInstantiator.lo SSLChannelFactory.lo
-libaxis2_transport_la_OBJECTS = $(am_libaxis2_transport_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-DEP_FILES = ./$(DEPDIR)/Axis2Transport.Plo \
- ./$(DEPDIR)/Axis2TransportInstantiator.Plo \
- ./$(DEPDIR)/AxisTransportException.Plo \
- ./$(DEPDIR)/Channel.Plo \
- ./$(DEPDIR)/SSLChannelFactory.Plo \
- ./$(DEPDIR)/SecureChannel.Plo ./$(DEPDIR)/URL.Plo
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libaxis2_transport_la_SOURCES)
-DIST_SOURCES = $(libaxis2_transport_la_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/samisa/autoCVS/cvsAutoBuild/missing --run aclocal-1.8
-AMDEP_FALSE = #
-AMDEP_TRUE =
-AMTAR = ${SHELL} /home/samisa/autoCVS/cvsAutoBuild/missing --run tar
+host_alias =
+host_triplet = i686-pc-linux-gnu
+
+EXEEXT =
+OBJEXT = o
+PATH_SEPARATOR = :
+AMTAR = ${SHELL} /home/damith/projects/cvshead/missing --run tar
APACHE2BUILD = apache2
APACHE2INC = -I/usr/local/apache2/include
APACHEBUILD =
APACHEINC =
-AR = ar
-AUTOCONF = ${SHELL} /home/samisa/autoCVS/cvsAutoBuild/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/samisa/autoCVS/cvsAutoBuild/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/samisa/autoCVS/cvsAutoBuild/missing --run automake-1.8
+AS = @AS@
AWK = gawk
CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -Wall -Wshadow -DENABLE_AXISTRACE
-CPP = gcc -E
-CPPFLAGS = -Wall -Wshadow -DENABLE_AXISTRACE
CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
+DLLTOOL = @DLLTOOL@
ECHO = echo
-ECHO_C =
-ECHO_N = -n
-ECHO_T =
-EGREP = grep -E
-EXEEXT =
-EXPATBUILD =
-EXPATINC =
-EXPATLIB =
-F77 = g77
-FFLAGS = -g -O2
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
+EXPATBUILD = expat
+EXPATINC = -I/usr/local/expat/include
+EXPATLIB = -L/usr/local/expat/lib -lexpat -ldl
INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = -lstdc++
-LIBOBJS =
-LIBS =
LIBTOOL = $(SHELL) $(top_builddir)/libtool
LIBWWWBUILD =
-LINKCLIENTLIB = -L/home/samisa/autoCVS/cvsAutoBuild/src/engine/client -laxiscpp_client -ldl
+LINKCLIENTLIB = -L/home/damith/projects/cvshead/src/engine/client -laxiscpp_client -ldl
LN_S = ln -s
-LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/samisa/autoCVS/cvsAutoBuild/missing --run makeinfo
-OBJEXT = o
+OBJDUMP = @OBJDUMP@
PACKAGE = axis-c-src
-PACKAGE_BUGREPORT = BUG-REPORT-ADDRESS
-PACKAGE_NAME = axis-c-src
-PACKAGE_STRING = axis-c-src 1-3-beta-linux
-PACKAGE_TARNAME = axis-c-src
-PACKAGE_VERSION = 1-3-beta-linux
-PATH_SEPARATOR = :
RANLIB = ranlib
SAMPLESBUILD = samples
-SET_MAKE =
-SHELL = /bin/sh
-SSLBUILD =
-SSLINC =
-SSLLIB =
+SSLBUILD = ssl
+SSLINC = -I/usr/local/ssl/include
+SSLLIB = -L/usr/local/ssl/lib -lssl -L/usr/local/ssl/lib -lcrypto -ldl
STRIP = strip
TESTCASESBUILD = tests
TSPPBUILD = tspp
VERSION = 1-3-beta-linux
XERCESCBUILD = xerces
-XERCESCINC = -I/home/samisa/cpp/xerces-c-src2_2_0/include
-XERCESCLIB = -L/home/samisa/cpp/xerces-c-src2_2_0/lib -lxerces-c -ldl
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = g77
-ac_ct_RANLIB = ranlib
-ac_ct_STRIP = strip
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE =
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE =
+XERCESCINC = -I/usr/local/xerces-c/include
+XERCESCLIB = -L/usr/local/xerces-c/lib -lxerces-c -ldl
am__include = include
-am__leading_dot = .
am__quote =
-bindir = ${exec_prefix}/bin
-build = i686-redhat-linux-gnu
-build_alias =
-build_cpu = i686
-build_os = linux-gnu
-build_vendor = redhat
-datadir = ${prefix}/share
-exec_prefix = ${prefix}
-host = i686-redhat-linux-gnu
-host_alias =
-host_cpu = i686
-host_os = linux-gnu
-host_vendor = redhat
-includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /home/samisa/autoCVS/cvsAutoBuild/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localstatedir = ${prefix}/var
-mandir = ${prefix}/man
-mkdir_p = mkdir -p -- .
-oldincludedir = /usr/include
-prefix = /home/samisa/autoCVS/cvsAutoBuild/deploy
-program_transform_name = s,x,x,
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target_alias =
+install_sh = /home/damith/projects/cvshead/install-sh
lib_LTLIBRARIES = libaxis2_transport.la
-SUBDIRS = ipv6
+SUBDIRS = ipv6 ssl
AM_CPPFLAGS = $(CPPFLAGS)
libaxis2_transport_la_SOURCES = SecureChannel.cpp \
Channel.cpp \
@@ -206,49 +113,72 @@
Axis2TransportInstantiator.cpp \
SSLChannelFactory.cpp
+
libaxis2_transport_la_LIBADD = -lstdc++
INCLUDES = -I../../../include
+subdir = src/transport/axis2
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(lib_LTLIBRARIES)
+
+libaxis2_transport_la_LDFLAGS =
+libaxis2_transport_la_DEPENDENCIES =
+am_libaxis2_transport_la_OBJECTS = SecureChannel.lo Channel.lo URL.lo \
+ Axis2Transport.lo AxisTransportException.lo \
+ Axis2TransportInstantiator.lo SSLChannelFactory.lo
+libaxis2_transport_la_OBJECTS = $(am_libaxis2_transport_la_OBJECTS)
+
+DEFS = -DHAVE_CONFIG_H
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = -Wall -Wshadow -DENABLE_AXISTRACE
+LDFLAGS = -lstdc++
+LIBS =
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+DEP_FILES = ./$(DEPDIR)/Axis2Transport.Plo \
+ ./$(DEPDIR)/Axis2TransportInstantiator.Plo \
+ ./$(DEPDIR)/AxisTransportException.Plo \
+ ./$(DEPDIR)/Channel.Plo \
+ ./$(DEPDIR)/SSLChannelFactory.Plo \
+ ./$(DEPDIR)/SecureChannel.Plo ./$(DEPDIR)/URL.Plo
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXFLAGS = -g -O2
+DIST_SOURCES = $(libaxis2_transport_la_SOURCES)
+
+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
+ uninstall-info-recursive all-recursive install-data-recursive \
+ install-exec-recursive installdirs-recursive install-recursive \
+ uninstall-recursive check-recursive installcheck-recursive
+DIST_COMMON = Makefile.am Makefile.in
+DIST_SUBDIRS = $(SUBDIRS)
+SOURCES = $(libaxis2_transport_la_SOURCES)
+
all: all-recursive
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/transport/axis2/Makefile'; \
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu src/transport/axis2/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+libLTLIBRARIES_INSTALL = $(INSTALL)
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ $(mkinstalldirs) $(DESTDIR)$(libdir)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
else :; fi; \
done
@@ -256,15 +186,15 @@
@$(NORMAL_UNINSTALL)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
done
clean-libLTLIBRARIES:
-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" = "$$p" && dir=.; \
+ test -z "$dir" && dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
@@ -272,7 +202,7 @@
$(CXXLINK) -rpath $(libdir) $(libaxis2_transport_la_LDFLAGS) $(libaxis2_transport_la_OBJECTS) $(libaxis2_transport_la_LIBADD) $(LIBS)
mostlyclean-compile:
- -rm -f *.$(OBJEXT)
+ -rm -f *.$(OBJEXT) core *.core
distclean-compile:
-rm -f *.tab.c
@@ -285,29 +215,27 @@
include ./$(DEPDIR)/SecureChannel.Plo
include ./$(DEPDIR)/URL.Plo
+distclean-depend:
+ -rm -rf ./$(DEPDIR)
+
.cpp.o:
- if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-# source='$<' object='$@' libtool=no \
-# depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
-# $(CXXDEPMODE) $(depcomp) \
-# $(CXXCOMPILE) -c -o $@ $<
+ source='$<' object='$@' libtool=no \
+ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+ $(CXXDEPMODE) $(depcomp) \
+ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
.cpp.obj:
- if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-# source='$<' object='$@' libtool=no \
-# depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
-# $(CXXDEPMODE) $(depcomp) \
-# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ source='$<' object='$@' libtool=no \
+ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+ $(CXXDEPMODE) $(depcomp) \
+ $(CXXCOMPILE) -c -o $@ `cygpath -w $<`
.cpp.lo:
- if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-# source='$<' object='$@' libtool=yes \
-# depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' \
-# $(CXXDEPMODE) $(depcomp) \
-# $(LTCXXCOMPILE) -c -o $@ $<
+ source='$<' object='$@' libtool=yes \
+ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' \
+ $(CXXDEPMODE) $(depcomp) \
+ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+CXXDEPMODE = depmode=gcc3
mostlyclean-libtool:
-rm -f *.lo
@@ -373,10 +301,11 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
+
+ETAGS = etags
+ETAGSFLAGS =
+
+tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -386,21 +315,14 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
-tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- if (etags --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
- else \
- include_option=--include; \
- fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -412,20 +334,6 @@
test -z "$(ETAGS_ARGS)$$tags$$unique" \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
@@ -433,21 +341,19 @@
&& gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @list='$(DISTFILES)'; for file in $$list; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
+ $(mkinstalldirs) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
@@ -464,13 +370,13 @@
done
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || mkdir "$(distdir)/$$subdir" \
+ test -d $(distdir)/$$subdir \
+ || mkdir $(distdir)/$$subdir \
|| exit 1; \
(cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="../$(top_distdir)" \
- distdir="../$(distdir)/$$subdir" \
+ top_distdir="$(top_distdir)" \
+ distdir=../$(distdir)/$$subdir \
distdir) \
|| exit 1; \
fi; \
@@ -480,9 +386,8 @@
all-am: Makefile $(LTLIBRARIES)
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(libdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
- done
+ $(mkinstalldirs) $(DESTDIR)$(libdir)
+
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -494,7 +399,7 @@
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -502,7 +407,7 @@
clean-generic:
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -513,17 +418,14 @@
mostlyclean-am
distclean: distclean-recursive
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-libtool distclean-tags
+
+distclean-am: clean-am distclean-compile distclean-depend \
+ distclean-generic distclean-libtool distclean-tags
dvi: dvi-recursive
dvi-am:
-html: html-recursive
-
info: info-recursive
info-am:
@@ -539,8 +441,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
+
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
@@ -548,32 +449,27 @@
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
uninstall-info: uninstall-info-recursive
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- clean clean-generic clean-libLTLIBRARIES clean-libtool \
- clean-recursive ctags ctags-recursive distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-recursive distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-libLTLIBRARIES install-man \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
+ clean-generic clean-libLTLIBRARIES clean-libtool \
+ clean-recursive distclean distclean-compile distclean-depend \
+ distclean-generic distclean-libtool distclean-recursive \
+ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
+ info-recursive install install-am install-data install-data-am \
+ install-data-recursive install-exec install-exec-am \
+ install-exec-recursive install-info install-info-am \
+ install-info-recursive install-libLTLIBRARIES install-man \
+ install-recursive install-strip installcheck installcheck-am \
+ installdirs installdirs-am installdirs-recursive \
+ maintainer-clean maintainer-clean-generic \
maintainer-clean-recursive mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
- uninstall-info-am uninstall-libLTLIBRARIES
+ tags tags-recursive uninstall uninstall-am uninstall-info-am \
+ uninstall-info-recursive uninstall-libLTLIBRARIES \
+ uninstall-recursive
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
1.2 +11 -10 ws-axis/c/src/transport/axis2/SSLChannelFactory.cpp
Index: SSLChannelFactory.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis2/SSLChannelFactory.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SSLChannelFactory.cpp 25 Nov 2004 12:41:58 -0000 1.1
+++ SSLChannelFactory.cpp 30 Nov 2004 11:49:04 -0000 1.2
@@ -31,12 +31,12 @@
#include "../../engine/AxisEngineException.h"
#include "../../common/AxisTrace.h"
-extern AXIS_CPP_NAMESPACE_PREFIX AxisTrace* g_pAT;
-extern AXIS_CPP_NAMESPACE_PREFIX AxisConfig* g_pConfig;
+//extern AXIS_CPP_NAMESPACE_PREFIX AxisTrace* g_pAT;
+//extern AXIS_CPP_NAMESPACE_PREFIX AxisConfig* g_pConfig;
AXIS_CPP_NAMESPACE_START
-const char* SSLChannelFactory::m_pcLibraryPath = 0;
+const char* SSLChannelFactory::m_pcLibraryName = 0;
DLHandler SSLChannelFactory::m_LibHandler = 0;
CREATE_OBJECT3 SSLChannelFactory::m_Create = 0;
DELETE_OBJECT3 SSLChannelFactory::m_Delete = 0;
@@ -51,9 +51,10 @@
}
-int SSLChannelFactory::initialize()
+int SSLChannelFactory::initialize(const char* pcLibraryName)
{
- m_pcLibraryPath = g_pConfig->getAxisConfProperty(AXCONF_SSLCHANNEL);
+ //m_pcLibraryName = g_pConfig->getAxisConfProperty(AXCONF_SSLCHANNEL);
+ m_pcLibraryName = pcLibraryName;
if (!loadLib())
{
@@ -63,16 +64,16 @@
{
unloadLib();
AXISTRACE1("SERVER_ENGINE_LOADING_PARSER_FAILED" , CRITICAL);
- char *s = new char[strlen(m_pcLibraryPath)+1];
- strcpy(s,m_pcLibraryPath);
+ char *s = new char[strlen(m_pcLibraryName)+1];
+ strcpy(s,m_pcLibraryName);
throw AxisEngineException(SERVER_ENGINE_LOADING_PARSER_FAILED, s);
}
}
else
{
AXISTRACE1("SERVER_ENGINE_LOADING_PARSER_FAILED" , CRITICAL);
- char *s = new char[strlen(m_pcLibraryPath)+1];
- strcpy(s,m_pcLibraryPath);
+ char *s = new char[strlen(m_pcLibraryName)+1];
+ strcpy(s,m_pcLibraryName);
throw AxisEngineException(SERVER_ENGINE_LOADING_PARSER_FAILED, s);
}
return AXIS_SUCCESS;
@@ -100,7 +101,7 @@
int SSLChannelFactory::loadLib()
{
- m_LibHandler = PLATFORM_LOADLIB(m_pcLibraryPath);
+ m_LibHandler = PLATFORM_LOADLIB(m_pcLibraryName);
if (!m_LibHandler)
{
AXISTRACE1("SERVER_ENGINE_LOADING_PARSER_FAILED" , CRITICAL);
1.2 +2 -2 ws-axis/c/src/transport/axis2/SSLChannelFactory.hpp
Index: SSLChannelFactory.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis2/SSLChannelFactory.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SSLChannelFactory.hpp 25 Nov 2004 12:41:58 -0000 1.1
+++ SSLChannelFactory.hpp 30 Nov 2004 11:49:04 -0000 1.2
@@ -49,7 +49,7 @@
* 3. Get the function pointers of the exported functions
* 4. Get any other information about the library.
*/
- static int initialize();
+ static int initialize(const char* pcLibraryName);
/**
* Used to uninitialize the global object.
* 1. Unloads dynamic parser library.
@@ -68,7 +68,7 @@
static int unloadLib();
private:
- static const char* m_pcLibraryPath;
+ static const char* m_pcLibraryName;
static DLHandler m_LibHandler;
static CREATE_OBJECT3 m_Create;
static DELETE_OBJECT3 m_Delete;
1.4 +15 -3 ws-axis/c/src/transport/axis2/SecureChannel.cpp
Index: SecureChannel.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis2/SecureChannel.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SecureChannel.cpp 25 Nov 2004 12:41:58 -0000 1.3
+++ SecureChannel.cpp 30 Nov 2004 11:49:04 -0000 1.4
@@ -4,9 +4,9 @@
SecureChannel::SecureChannel()
{
m_pFactory = new SSLChannelFactory();
- m_pFactory->initialize();
- m_pSSLChannel = m_pFactory->getSSLChannelObject();
- m_pSSLChannel->SSLInit();
+ //m_pFactory->initialize();
+ //m_pSSLChannel = m_pFactory->getSSLChannelObject();
+ //m_pSSLChannel->SSLInit();
}
SecureChannel::~SecureChannel()
@@ -15,6 +15,8 @@
bool SecureChannel::open() throw (AxisTransportException&)
{
+ m_pSSLChannel = m_pFactory->getSSLChannelObject();
+ m_pSSLChannel->SSLInit();
Channel::open();
m_pSSLChannel->openSSLConnection(&m_Sock);
return true;
@@ -47,3 +49,13 @@
return pSSLProperty;
}
+
+int SecureChannel::setTransportProperty (AXIS_TRANSPORT_INFORMATION_TYPE type,
+ const char* value)
+{
+ if(DLL_NAME == type)
+ m_pFactory->initialize(value);
+ //m_pFactory->setTransportProperty(type, value);
+ return AXIS_SUCCESS;
+}
+
1.5 +2 -0 ws-axis/c/src/transport/axis2/SecureChannel.h
Index: SecureChannel.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/axis2/SecureChannel.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SecureChannel.h 30 Nov 2004 07:46:00 -0000 1.4
+++ SecureChannel.h 30 Nov 2004 11:49:04 -0000 1.5
@@ -24,6 +24,8 @@
void setSecureProperties( const char *);
const char * getSecureProperties();
+ int setTransportProperty(AXIS_TRANSPORT_INFORMATION_TYPE
+ type, const char* value);
private:
bool openConnection();
1.7 +1 -1 ws-axis/c/src/xml/expat/XMLParserExpat.h
Index: XMLParserExpat.h
===================================================================
RCS file: /home/cvs/ws-axis/c/src/xml/expat/XMLParserExpat.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLParserExpat.h 26 Oct 2004 11:00:53 -0000 1.6
+++ XMLParserExpat.h 30 Nov 2004 11:49:04 -0000 1.7
@@ -29,7 +29,7 @@
#else
#include <expat.h>
#endif
-#include <axis/server/Packet.hpp>
+//#include <axis/server/Packet.hpp>
#include "../QName.h"
#include "../AnyElement.h"