You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2006/03/15 12:42:25 UTC
svn commit: r386057 - in /webservices/axis/trunk/c: ./ build/ include/axis/
src/server/adminservice/ vc/ vc/client/admin_client/
vc/server/admin_web_service/
Author: dicka
Date: Wed Mar 15 03:42:21 2006
New Revision: 386057
URL: http://svn.apache.org/viewcvs?rev=386057&view=rev
Log:
Update AxisAdminService to current APIs and include within the ANT build.
I also needed to make a small change to IMessageData to get the AxisAdminService compiling.
The AxisAdminService will only be built if the following are set in the build property files (I have defaulted them to these values):
server=true
server.adminService=true
In addition I have modified the AxisAdminClient to be dependent on the following being set in the build property files (again, I have defaulted them to these values):
server=true
server.adminClient=true
client=true
I have updated services.xml to always deploy the AxisAdminService.
Added:
webservices/axis/trunk/c/build/buildAdminService.xml
webservices/axis/trunk/c/src/server/adminservice/AxisAdminServiceWrapper.hpp
- copied, changed from r385470, webservices/axis/trunk/c/src/server/adminservice/AxisAdminServiceWrapper.h
Removed:
webservices/axis/trunk/c/src/server/adminservice/AxisAdminServiceWrapper.h
Modified:
webservices/axis/trunk/c/build.xml
webservices/axis/trunk/c/build/build.common.properties
webservices/axis/trunk/c/build/buildAdminClient.xml
webservices/axis/trunk/c/include/axis/IMessageData.hpp
webservices/axis/trunk/c/services.xml
webservices/axis/trunk/c/src/server/adminservice/AxisAdminServiceService.cpp
webservices/axis/trunk/c/src/server/adminservice/AxisAdminServiceWrapper.cpp
webservices/axis/trunk/c/vc/Distribution.dsw
webservices/axis/trunk/c/vc/client/admin_client/AdminClient.dsp
webservices/axis/trunk/c/vc/server/admin_web_service/AdminService.dsp
Modified: webservices/axis/trunk/c/build.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/build.xml?rev=386057&r1=386056&r2=386057&view=diff
==============================================================================
--- webservices/axis/trunk/c/build.xml (original)
+++ webservices/axis/trunk/c/build.xml Wed Mar 15 03:42:21 2006
@@ -50,6 +50,7 @@
<import file="${basedir}/build/buildWSDL2Ws.xml"/>
<import file="${basedir}/build/buildDocumentation.xml"/>
<import file="${basedir}/build/buildAdminClient.xml"/>
+ <import file="${basedir}/build/buildAdminService.xml"/>
<target name="buildVersionResource" if="windows">
<delete>
@@ -128,6 +129,21 @@
<antcall target="compileSimpleAxisServer" inheritall="true"/>
</then>
</if>
+ <if>
+ <equals arg1="${server.adminService}" arg2="true"/>
+ <then>
+ <antcall target="compileAdminService" inheritall="true"/>
+ </then>
+ </if>
+ <if>
+ <and>
+ <equals arg1="${server.adminClient}" arg2="true"/>
+ <equals arg1="${client}" arg2="true"/>
+ </and>
+ <then>
+ <antcall target="compileAdminClient" inheritall="true"/>
+ </then>
+ </if>
</then>
</if>
</target>
@@ -219,7 +235,7 @@
<antcall target="compileServer" inheritall="true"/>
</target>
- <target name="buildAll" depends="compile, compileWSDL2Ws, buildWSDL2WsJARFile, buildCBindings, buildDocumentation, buildAdminClient"/>
+ <target name="buildAll" depends="compile, compileWSDL2Ws, buildWSDL2WsJARFile, buildCBindings, buildDocumentation"/>
<target name="build" depends="initialize"
@@ -305,10 +321,4 @@
<delete dir="${basedir}/docs/apidocs/html"/>
<delete dir="${basedir}/docs/apidocs/latex"/>
</target>
-
- <target name="buildAdminClient" depends="initialize"
- description="Build AdminClient runtime">
- <antcall target="createAdminClient" inheritall="true"/>
- </target>
-
</project>
Modified: webservices/axis/trunk/c/build/build.common.properties
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/build/build.common.properties?rev=386057&r1=386056&r2=386057&view=diff
==============================================================================
--- webservices/axis/trunk/c/build/build.common.properties (original)
+++ webservices/axis/trunk/c/build/build.common.properties Wed Mar 15 03:42:21 2006
@@ -155,10 +155,25 @@
# AdminClient Properties #
##########################
+# Is AdminClient to be created?
+server.adminClient = true
+
# Name for compiled AdminClient - excluding any prefix or suffix
-# eg: For Windows : adminClient will produce adminClient.exe
-# For Unix : adminClient will produce adminClient
-adminClientExecutableName = admin_Client
+# eg: For Windows : AxisAdminClient will produce AxisAdminClient.exe
+# For Unix : AxisAdminClient will produce AxisAdminClient
+adminClientExecutableName = AxisAdminClient
+
+############################
+# Admin Service Properties #
+############################
+
+# Is Admin Service to be created?
+server.adminService = true
+
+# Name for compile AdminService = excluding any prefix or suffix
+# eg: For Windows : AxisAdminService will produce AxisAdminService.dll
+# For Unix : AxisAdminService will produce libAxisAdminService.so
+adminServiceLibraryName = AxisAdminService
#####################
# Apache Properties #
Modified: webservices/axis/trunk/c/build/buildAdminClient.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/build/buildAdminClient.xml?rev=386057&r1=386056&r2=386057&view=diff
==============================================================================
--- webservices/axis/trunk/c/build/buildAdminClient.xml (original)
+++ webservices/axis/trunk/c/build/buildAdminClient.xml Wed Mar 15 03:42:21 2006
@@ -4,7 +4,7 @@
Compile the Admin Client Library
-->
- <target name="createAdminClient">
+ <target name="compileAdminClient">
<mkdir dir="${dir.objects}"/>
<mkdir dir="${dir.bin}"/>
Added: webservices/axis/trunk/c/build/buildAdminService.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/build/buildAdminService.xml?rev=386057&view=auto
==============================================================================
--- webservices/axis/trunk/c/build/buildAdminService.xml (added)
+++ webservices/axis/trunk/c/build/buildAdminService.xml Wed Mar 15 03:42:21 2006
@@ -0,0 +1,60 @@
+<project name="Axis C Admin Service" default="compileAdminServiceEngine" basedir="..">
+
+ <!--
+ Compile the Axis Admin Service Library
+ -->
+ <target name="compileAdminService">
+ <mkdir dir="${dir.objects}"/>
+ <mkdir dir="${dir.bin}"/>
+ <antcall target="buildVersionResource" inheritall="true">
+ <param name="internalName" value="${serverEngineLibraryName}"/>
+ </antcall>
+ <if>
+ <not>
+ <isset property="aix"/>
+ </not>
+ <then>
+ <cc outfile="${dir.bin}/${adminServiceLibraryName}" objdir="${dir.objects}"
+ exceptions="true" outtype="shared" multithreaded="true">
+ <!-- Compilers -->
+ <compiler refid="SolarisCC"/>
+ <compiler refid="Linuxgcc"/>
+ <compiler refid="HP-UXaC++"/>
+ <compiler extends="VisualC++">
+ <defineset>
+ <define name="DYNALIB_EXPORTS"/>
+ </defineset>
+ </compiler>
+ <compiler refid="OS400icc"/>
+ <!-- Linkers -->
+ <linker refid="SolarisLinker"/>
+ <linker refid="LinuxLinker"/>
+ <linker refid="HP-UXLinker"/>
+ <linker refid="VisualC++Linker"/>
+ <linker extends="OS400Linker">
+ <linkerarg location="end" value="${dir.bin}/lib${serverEngineLibraryName}.so"/>
+ </linker>
+ <libset dir="${dir.bin}" libs="${serverEngineLibraryName}" unless="os400"/>
+ <!-- Files to be compiled -->
+ <fileset dir="${dir.src}">
+ <include name="server/adminservice/*.cpp"/>
+ </fileset>
+ </cc>
+ </then>
+ <else>
+ <cc outfile="${dir.bin}/${libraryPrefix}${adminServiceLibraryName}${librarySuffix}" objdir="${dir.objects}"
+ exceptions="true" multithreaded="true">
+ <!-- Compilers -->
+ <compiler refid="AIXxlc"/>
+ <!-- Linkers -->
+ <linker refid="AIXLinker"/>
+ <libset dir="${dir.bin}" libs="${serverEngineLibraryName}" unless="os400"/>
+ <!-- Files to be compiled -->
+ <fileset dir="${dir.src}">
+ <include name="server/adminservice/*.cpp"/>
+ </fileset>
+ </cc>
+ </else>
+ </if>
+ </target>
+</project>
\ No newline at end of file
Modified: webservices/axis/trunk/c/include/axis/IMessageData.hpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/include/axis/IMessageData.hpp?rev=386057&r1=386056&r2=386057&view=diff
==============================================================================
--- webservices/axis/trunk/c/include/axis/IMessageData.hpp (original)
+++ webservices/axis/trunk/c/include/axis/IMessageData.hpp Wed Mar 15 03:42:21 2006
@@ -38,12 +38,18 @@
class IMessageData
{
/* Allow AxisAdminService access to the private methods */
- friend class AxisAdminServiceWrapper;
public:
virtual ~IMessageData(){};
-private:
+
+/**
+ * This method provides access to the AdminUtils, providing a mechanism for
+ * deploying and undeploying services.
+ *
+ * It is intended that only the AdminService will make use of this API.
+ *
+ * @param pIAdminUtils will be updated with an IAdminUtils object
+ */
virtual void getAdminUtils(IAdminUtils** pIAdminUtils)=0;
-public:
/**
* This method stores the given property value with the key, inside the
Modified: webservices/axis/trunk/c/services.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/services.xml?rev=386057&r1=386056&r2=386057&view=diff
==============================================================================
--- webservices/axis/trunk/c/services.xml (original)
+++ webservices/axis/trunk/c/services.xml Wed Mar 15 03:42:21 2006
@@ -80,6 +80,30 @@
<globalConfiguration>
</globalConfiguration>
</echo>
+
+ <condition property="dir.adminService" value="${dir.release}/bin">
+ <or>
+ <equals arg1="${platform}" arg2="Win32"/>
+ <equals arg1="${platform}" arg2="Win64"/>
+ </or>
+ </condition>
+
+ <condition property="dir.adminService" value="${dir.release}/lib/axis">
+ <not>
+ <or>
+ <equals arg1="${platform}" arg2="Win32"/>
+ <equals arg1="${platform}" arg2="Win64"/>
+ </or>
+ </not>
+ </condition>
+
+ <!-- Insert entry for Admin Service -->
+ <echo file="${wsdd.file}" append="true"><!-- Entry for Axis Admin Service -- Do not remove -->
+<service name="AxisAdmin" provider="CPP:DOCUMENT" description="Axis C++ Admin Service">
+<parameter name="className" value="${dir.adminService}/${libraryPrefix}${adminServiceLibraryName}${librarySuffix}"/>
+</service>
+<-- End of entry for Axis Admin Service -->
+</echo>
</target>
<target name="endWSDDFile">
Modified: webservices/axis/trunk/c/src/server/adminservice/AxisAdminServiceService.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/server/adminservice/AxisAdminServiceService.cpp?rev=386057&r1=386056&r2=386057&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/server/adminservice/AxisAdminServiceService.cpp (original)
+++ webservices/axis/trunk/c/src/server/adminservice/AxisAdminServiceService.cpp Wed Mar 15 03:42:21 2006
@@ -1,46 +1,51 @@
-// Copyright 2003-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.
+/*
+ * Copyright 2003-2006 The Apache Software Foundation.
-/*This file is automatically generated by the Axis C++ Wrapper Class Generator
- *Service file containing the two export functions of the Web service Library*/
+ *
+ * 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.
+ *
+ * This file was auto-generated by the Axis C++ Web Service Generator (WSDL2Ws)
+ * This file contains the two export functions of the Web service Dynamic Library
+ */
-#include "AxisAdminServiceWrapper.h"
+#include "AxisAdminServiceWrapper.hpp"
extern "C" {
STORAGE_CLASS_INFO
int GetClassInstance(BasicHandler **inst)
{
- *inst = new BasicHandler();
- WrapperClassHandler* pWCH = new AxisAdminServiceWrapper();
- (*inst)->_functions = 0;
- if (pWCH)
- {
- (*inst)->_object = pWCH;
- return pWCH->init();
- }
- return AXIS_FAIL;
+ *inst = new BasicHandler();
+ WrapperClassHandler* pWCH = new AxisAdminServiceWrapper();
+ (*inst)->_functions = 0;
+ if (pWCH)
+ {
+ (*inst)->_object = pWCH;
+ return pWCH->init();
+ }
+ return AXIS_FAIL;
}
STORAGE_CLASS_INFO
int DestroyInstance(BasicHandler *inst)
{
- if (inst)
- {
- WrapperClassHandler* pWCH = reinterpret_cast<WrapperClassHandler*>(inst);
- pWCH->fini();
- delete pWCH;
- delete inst;
- return AXIS_SUCCESS;
- }
- return AXIS_FAIL;
+ if (inst)
+ {
+ WrapperClassHandler* pWCH = reinterpret_cast<WrapperClassHandler*>(inst->_object);
+ pWCH->fini();
+ delete pWCH;
+ pWCH = NULL;
+ delete inst;
+ inst = NULL;
+ return AXIS_SUCCESS;
+ }
+ return AXIS_FAIL;
}
}
Modified: webservices/axis/trunk/c/src/server/adminservice/AxisAdminServiceWrapper.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/server/adminservice/AxisAdminServiceWrapper.cpp?rev=386057&r1=386056&r2=386057&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/server/adminservice/AxisAdminServiceWrapper.cpp (original)
+++ webservices/axis/trunk/c/src/server/adminservice/AxisAdminServiceWrapper.cpp Wed Mar 15 03:42:21 2006
@@ -1,100 +1,114 @@
-/* -*- C++ -*- */
/*
- * Copyright 2003-2004 The Apache Software Foundation.
+ * Copyright 2003-2006 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
+ * 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.
- */
-
-/*
- * This is the Service implementation CPP file genarated by theWSDL2Ws.
- * AxisAdminServiceWrapper.cpp: implemtation for the AxisAdminServiceWrapper.
- *
+ * 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.
+ *
+ * This file was auto-generated by the Axis C++ Web Service Generator (WSDL2Ws)
+ * This file contains Web Service Wrapper implementations
*/
-#include "AxisAdminServiceWrapper.h"
+#include "AxisAdminServiceWrapper.hpp"
#include "../../common/IAdminUtils.h"
-AxisAdminServiceWrapper::AxisAdminServiceWrapper ()
+AxisAdminServiceWrapper::AxisAdminServiceWrapper()
{
}
-AxisAdminServiceWrapper::~AxisAdminServiceWrapper ()
+AxisAdminServiceWrapper::~AxisAdminServiceWrapper()
{
}
-/* Implementation of WrapperClassHandler interface */
-void AxisAdminServiceWrapper::onFault (void* pMsg)
+/* implementation of WrapperClassHandler interface */
+void AxisAdminServiceWrapper::onFault(void *pMsg)
{
}
-int AxisAdminServiceWrapper::init ()
-{
- return AXIS_SUCCESS;
-}
-
-int AxisAdminServiceWrapper::fini ()
-{
- return AXIS_SUCCESS;
-}
-
-
/*
* This method invokes the right service method
*/
-int AxisAdminServiceWrapper::invoke (void* pMsg)
+int AxisAdminServiceWrapper::invoke(void *pMsg)
{
- IMessageData* mc = (IMessageData*) pMsg;
- const AxisChar* method = mc->getOperationName ();
- if (0 == strcmp (method, "updateWSDD"))
- return updateWSDD (mc);
+ IMessageData* mc = (IMessageData*)pMsg;
+ const AxisChar *method = mc->getOperationName();
+ if( 0 == strcmp(method, "updateWSDD") )
+ {
+ return updateWSDD(mc);
+ }
else
+ {
return AXIS_FAIL;
+ }
}
-
/* Methods corresponding to the web service methods */
/*
* This method wrap the service method
*/
-int AxisAdminServiceWrapper::updateWSDD (void* pMsg)
+int AxisAdminServiceWrapper::updateWSDD(void* pMsg)
{
- IMessageData* mc = (IMessageData*) pMsg;
+ IMessageData* mc = (IMessageData*)pMsg;
int nStatus;
IWrapperSoapSerializer* pIWSSZ = NULL;
- mc->getSoapSerializer (&pIWSSZ);
+ mc->getSoapSerializer(&pIWSSZ);
if (!pIWSSZ)
+ {
return AXIS_FAIL;
+ }
IWrapperSoapDeSerializer* pIWSDZ = NULL;
- mc->getSoapDeSerializer (&pIWSDZ);
+ mc->getSoapDeSerializer(&pIWSDZ);
if (!pIWSDZ)
+ {
return AXIS_FAIL;
+ }
/* check whether we have got correct message */
- if (AXIS_SUCCESS !=
- pIWSDZ->checkMessageBody ("updateWSDD", "http://www.opensource.lk/xsd"))
+ if (AXIS_SUCCESS != pIWSDZ->checkMessageBody("updateWSDD", "http://www.opensource.lk/xsd"))
+ {
return AXIS_FAIL;
- pIWSSZ->createSoapMethod ("updateWSDDResponse",
- "http://www.opensource.lk/xsd");
- xsd__base64Binary v0 = pIWSDZ->getElementAsBase64Binary ("wsdd", 0);
- if (AXIS_SUCCESS != (nStatus = pIWSDZ->getStatus ()))
+ }
+ pIWSSZ->createSoapMethod("updateWSDDResponse", "http://www.opensource.lk/xsd");
+
+ xsd__base64Binary v0;
+ xsd__base64Binary * pValue0 = pIWSDZ->getElementAsBase64Binary("wsdd", 0);
+ if (pValue0)
+ {
+ v0 = *pValue0;
+ Axis::AxisDelete( (void *) pValue0, XSD_BASE64BINARY);
+ }
+
+ if (AXIS_SUCCESS != (nStatus = pIWSDZ->getStatus()))
+ {
return nStatus;
- xsd__boolean ret = false_;
- IAdminUtils* pAdminUtils;
- mc->getAdminUtils (&pAdminUtils);
- if (pAdminUtils)
+ }
+
+ try
{
- if (AXIS_SUCCESS == pAdminUtils->updateWSDD ((char*) v0.__ptr))
- ret = true_;
+ xsd__int size = 0;
+ xsd__boolean ret = false_;
+ IAdminUtils* pAdminUtils;
+ mc->getAdminUtils (&pAdminUtils);
+ if (pAdminUtils)
+ {
+ if (AXIS_SUCCESS == pAdminUtils->updateWSDD ((char*) v0.get(size)))
+ {
+ ret = true_;
+ }
+ }
+ return pIWSSZ->addOutputParam ("return", (void*) &ret, XSD_BOOLEAN);
+ }
+ catch(...)
+ {
+ return AXIS_FAIL;
}
- return pIWSSZ->addOutputParam ("return", (void*) &ret, XSD_BOOLEAN);
}
+
Copied: webservices/axis/trunk/c/src/server/adminservice/AxisAdminServiceWrapper.hpp (from r385470, webservices/axis/trunk/c/src/server/adminservice/AxisAdminServiceWrapper.h)
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/server/adminservice/AxisAdminServiceWrapper.hpp?p2=webservices/axis/trunk/c/src/server/adminservice/AxisAdminServiceWrapper.hpp&p1=webservices/axis/trunk/c/src/server/adminservice/AxisAdminServiceWrapper.h&r1=385470&r2=386057&rev=386057&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/server/adminservice/AxisAdminServiceWrapper.h (original)
+++ webservices/axis/trunk/c/src/server/adminservice/AxisAdminServiceWrapper.hpp Wed Mar 15 03:42:21 2006
@@ -1,51 +1,46 @@
-/* -*- C++ -*- */
/*
- * Copyright 2003-2004 The Apache Software Foundation.
-// (c) Copyright IBM Corp. 2004, 2005 All Rights Reserved
+ * Copyright 2003-2006 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
+ * 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
+ * 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.
- */
-
-/*
- * This is the Service Class genarated by the tool WSDL2Ws
- * AxisAdminServiceWrapper.h: interface for the AxisAdminServiceWrapperclass.
+ * 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.
+ *
+ * This file was auto-generated by the Axis C++ Web Service Generator (WSDL2Ws)
+ * This file contains Web Service Wrapper declarations
*/
-#if !defined(__AXISADMINSERVICEWRAPPER_SERVERWRAPPER_H__OF_AXIS_INCLUDED_)
-#define __AXISADMINSERVICEWRAPPER_SERVERWRAPPER_H__OF_AXIS_INCLUDED_
+#if !defined(__AXISADMINSERVICEWRAPPER_SERVERWRAPPER_H__INCLUDED_)
+#define __AXISADMINSERVICEWRAPPER_SERVERWRAPPER_H__INCLUDED_
#include <axis/server/WrapperClassHandler.hpp>
#include <axis/IMessageData.hpp>
#include <axis/GDefine.hpp>
+#include <axis/Axis.hpp>
#include <axis/AxisWrapperAPI.hpp>
+AXIS_CPP_NAMESPACE_USE
-class AxisAdminServiceWrapper:public WrapperClassHandler
+class AxisAdminServiceWrapper : public WrapperClassHandler
{
- public:
- AxisAdminServiceWrapper ();
- public:
- virtual ~ AxisAdminServiceWrapper ();
- public: /*implementation of WrapperClassHandler interface */
- int AXISCALL invoke (void* pMsg);
- void AXISCALL onFault (void* pMsg);
- int AXISCALL init ();
- int AXISCALL fini ();
- AXIS_BINDING_STYLE AXISCALL getBindingStyle ()
- {
- return DOC_LITERAL;
- };
- private: /*Methods corresponding to the web service methods */
- int updateWSDD (void* pMsg);
+public:
+ AxisAdminServiceWrapper();
+ virtual ~AxisAdminServiceWrapper();
+
+ /*implementation of WrapperClassHandler interface*/
+ int AXISCALL invoke(void* pMsg);
+ void AXISCALL onFault(void* pMsg);
+ AXIS_BINDING_STYLE AXISCALL getBindingStyle(){return DOC_LITERAL;};
+private:/*Methods corresponding to the web service methods*/
+ int updateWSDD(void* pMsg);
};
-#endif
+#endif /* !defined(__AXISADMINSERVICEWRAPPER_SERVERWRAPPER_H__INCLUDED_)*/
+
+
\ No newline at end of file
Modified: webservices/axis/trunk/c/vc/Distribution.dsw
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/vc/Distribution.dsw?rev=386057&r1=386056&r2=386057&view=diff
==============================================================================
--- webservices/axis/trunk/c/vc/Distribution.dsw (original)
+++ webservices/axis/trunk/c/vc/Distribution.dsw Wed Mar 15 03:42:21 2006
@@ -3,6 +3,36 @@
###############################################################################
+Project: "AdminClient"=".\client\admin_client\AdminClient.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name AxisClient
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "AdminService"=".\server\admin_web_service\AdminService.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name AxisServer
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "Apache1_3Module"=".\server\apache1_3\Apache1_3Module.dsp" - Package Owner=<4>
Package=<5>
Modified: webservices/axis/trunk/c/vc/client/admin_client/AdminClient.dsp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/vc/client/admin_client/AdminClient.dsp?rev=386057&r1=386056&r2=386057&view=diff
==============================================================================
--- webservices/axis/trunk/c/vc/client/admin_client/AdminClient.dsp (original)
+++ webservices/axis/trunk/c/vc/client/admin_client/AdminClient.dsp Wed Mar 15 03:42:21 2006
@@ -50,7 +50,7 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 AxisClient.lib /nologo /subsystem:console /machine:I386 /out:"../../../bin/AdminClient.exe" /libpath:"../../../bin/"
!ELSEIF "$(CFG)" == "AdminClient - Win32 Debug"
@@ -66,8 +66,8 @@
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# SUBTRACT CPP /YX /Yc /Yu
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -75,7 +75,7 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 AxisClient_D.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../bin/AdminClient_D.exe" /pdbtype:sept /libpath:"../../../bin/"
!ENDIF
Modified: webservices/axis/trunk/c/vc/server/admin_web_service/AdminService.dsp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/vc/server/admin_web_service/AdminService.dsp?rev=386057&r1=386056&r2=386057&view=diff
==============================================================================
--- webservices/axis/trunk/c/vc/server/admin_web_service/AdminService.dsp (original)
+++ webservices/axis/trunk/c/vc/server/admin_web_service/AdminService.dsp Wed Mar 15 03:42:21 2006
@@ -53,7 +53,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"../../../bin/AdminService.dll"
+# ADD LINK32 AxisServer.lib /nologo /dll /machine:I386 /out:"../../../bin/AdminService.dll"
!ELSEIF "$(CFG)" == "AdminService - Win32 Debug"
@@ -69,7 +69,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ADMINSERVICE_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ADMINSERVICE_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ADMINSERVICE_EXPORTS" /FR /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -79,7 +79,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"../../../bin/AdminService.dll" /pdbtype:sept
+# ADD LINK32 AxisServer_D.lib /nologo /dll /debug /machine:I386 /out:"../../../bin/AdminService.dll" /pdbtype:sept
!ENDIF
@@ -104,7 +104,7 @@
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=..\..\..\src\server\adminservice\AxisAdminServiceWrapper.h
+SOURCE=..\..\..\src\server\adminservice\AxisAdminServiceWrapper.hpp
# End Source File
# End Group
# Begin Group "Resource Files"