--- a/package_definition.xml	Mon Mar 15 12:44:52 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="websrv" name="Web Services" levels="plugin framework server generic specific">
-    <collection id="webservices" name="Web Services Framework" level="generic">
-    	<!-- consider breaking this collection into more meaningful subsets -->
-      <component id="wsnotifierplugins" filter="s60" name="WS Notifier Plugins" class="plugin">
-        <unit bldFile="webservices/wsnotifierplugins/group"/>
-      </component>
-      <component id="wslogger" filter="s60" name="WS Logger">
-        <unit bldFile="webservices/wslogger/group"/>
-      </component>
-      <component id="wsxml" filter="s60" name="WS XML Extensions">
-        <unit bldFile="webservices/wsxml/group"/>
-      </component>
-      <component id="wsutils" filter="s60" name="WS Utils">
-        <unit bldFile="webservices/wsutils/group"/>
-      </component>
-      <component id="wsfragment" filter="s60" name="WS Fragment">
-        <unit bldFile="webservices/wsfragment/group"/>
-      </component>
-      <component id="wsdescription" filter="s60" name="WS Service Description">
-        <unit bldFile="webservices/wsdescription/group"/>
-      </component>
-      <component id="wshttpchanneltransportplugin" filter="s60" name="WS HTTP Channel Transport Plugin" class="plugin">
-        <unit bldFile="webservices/wshttpchanneltransportplugin/group"/>
-      </component>
-      <component id="wsconnection" filter="s60" name="WS Service Connection">
-        <unit bldFile="webservices/wsconnection/group"/>
-      </component>
-      <component id="wshostletconnection" filter="s60" name="WS Hostlet Connection">
-        <unit bldFile="webservices/wshostletconnection/group"/>
-      </component>
-      <component id="wscredentialmanager" filter="s60" name="WS Credential Manager">
-        <unit bldFile="webservices/wscredentialmanager/group"/>
-      </component>
-      <component id="wsmanager" filter="s60" name="WS Service Manager">
-        <unit bldFile="webservices/wsmanager/group"/>
-      </component>
-      <component id="wsidentitymanager" filter="s60" name="WS Identity Manager">
-        <unit bldFile="webservices/wsidentitymanager/group"/>
-      </component>
-      <component id="wsframework" filter="s60" name="WS Framework">
-        <unit bldFile="webservices/wsframework/group"/>
-      </component>
-      <component id="wsmessages" filter="s60" name="WS Messages">
-        <unit bldFile="webservices/wsmessages/group"/>
-      </component>
-      <component id="wsconnectionagent" filter="s60" name="WS Connection Agent">
-        <unit bldFile="webservices/wsconnectionagent/group"/>
-      </component>
-      <component id="idwsfplugin" filter="s60" name="ID-WSF Plugin" class="plugin">
-        <unit bldFile="webservices/idwsfplugin/group"/>
-      </component>
-      <component id="wsibasicplugin" filter="s60" name="WS-I Basic Plugin" class="plugin">
-        <unit bldFile="webservices/wsibasicplugin/group"/>
-      </component>
-      <component id="wsrestplugin" filter="s60" name="WS REST Plugin" class="plugin">
-        <unit bldFile="webservices/wsrestplugin/group"/>
-      </component>
-      <component id="idwsfsecuritymechanism" filter="s60" name="ID-WSF Security Mechanism">
-        <unit bldFile="webservices/idwsfsecuritymechanism/group"/>
-      </component>
-      <component id="wspasswordtransforms" filter="s60" name="WS Password Transforms">
-        <unit bldFile="webservices/wspasswordtransforms/group"/>
-      </component>
-      <component id="wscore" filter="s60" name="WS Core Service Manager">
-        <unit bldFile="webservices/wscore/group"/>
-      </component>
-      <component id="wsprovider" filter="s60" name="WS Provider">
-        <unit bldFile="webservices/wsprovider/group"/>
-      </component>
-      <component id="wslocaltransportplugin" filter="s60" name="WS Local Transport Plugin" class="plugin">
-        <unit bldFile="webservices/wslocaltransportplugin/group"/>
-      </component>
-      <component id="wshostlettransportplugin" filter="s60" name="WS Hostlet Transport Plugin" class="plugin">
-        <unit bldFile="webservices/wshostlettransportplugin/group"/>
-      </component>
-      <component id="wsstar" filter="s60" name="WS Star">
-        <!-- <unit bldFile="webservices/wsstar/group"/> -->
-      </component>
-      <component id="wsoviplugin" filter="s60" name="WS Ovi Plugin">
-        <unit bldFile="webservices/wsoviplugin/group"/>
-      </component>
-      <component id="webservices_build" filter="s60" name="Web Services Build">
-        <unit bldFile="webservices/group"/>
-      </component>
-    </collection>
-    <collection id="websrv_info" name="Web Services Info" level="specific">
-      <component id="websrv_pub" filter="s60" name="Web Services Public Interfaces" class="api">
-        <unit bldFile="websrv_pub/group"/>
-        	<!-- should these be #included? -->
-        <!-- <unit bldFile="websrv_pub/hostlet_connection_api/tsrc/bc/hostconn/group"/> -->
-        <!-- <unit bldFile="websrv_pub/hostlet_connection_api/tsrc/group"/> -->
-        <!-- <unit bldFile="websrv_pub/hostlet_connection_api/tsrc/hostconn/group"/> -->
-        <!-- <unit bldFile="websrv_pub/hostlet_connection_api/tsrc/hostconntester/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/bc/connection/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/bc/senutils/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/connection/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/senconnectiontester/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/senconnectiontimeoutstester/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/senlayeredpropertiestester/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/senutils/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/senutilstestcases/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/wspolicytester/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_connection_api/tsrc/wsstarmessagehandlertester/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_description_api/tsrc/bc/senservdesc/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_description_api/tsrc/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_description_api/tsrc/senservdesc/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_description_api/tsrc/senservdesctester/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_manager_api/tsrc/bc/senservicemanager/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_manager_api/tsrc/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_manager_api/tsrc/senservicemanager/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_manager_api/tsrc/senservicemanagertester/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_messaging_api/tsrc/bc/newsoapclasses/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_messaging_api/tsrc/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_messaging_api/tsrc/newsoapclasses/group"/> -->
-        <!-- <unit bldFile="websrv_pub/web_service_messaging_api/tsrc/newsoapclassestester/group"/> -->
-        <!-- <unit bldFile="websrv_pub/xml_extensions_api/tsrc/group"/> -->
-        <!-- <unit bldFile="websrv_pub/xml_extensions_api/tsrc/senxml/group"/> -->
-        <!-- <unit bldFile="websrv_pub/xml_extensions_api/tsrc/senxmltester/group"/> -->
-        <!-- <unit bldFile="websrv_pub/xml_fragment_api/tsrc/group"/> -->
-        <!-- <unit bldFile="websrv_pub/xml_fragment_api/tsrc/senfragmenttester/group"/> -->
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>

--- a/webservices/wshttpchanneltransportplugin/src/senhttpchannelimpl.cpp	Mon Mar 15 12:44:52 2010 +0200
+++ b/webservices/wshttpchanneltransportplugin/src/senhttpchannelimpl.cpp	Wed Mar 31 23:17:32 2010 +0300
@@ -31,10 +31,10 @@
 #include <http.h>
 
 #include "sendebug.h" // filelogging and debugging MACROS
-#include "senserviceconnection.h" // KErrSenNoHttpResponseBody
-#include "senelement.h"
-#include "senxmlutils.h"
-#include "senhttptransportproperties.h"
+#include "SenServiceConnection.h" // KErrSenNoHttpResponseBody
+#include "SenElement.h"
+#include "SenXmlUtils.h"
+#include "SenHttpTransportProperties.h"
 #include "senhttpchannelimpl.h"
 #include "senhttpeventhandler.h"
 #include "sentxnstate.h"

--- a/webservices/wshttpchanneltransportplugin/src/senhttpchanneltransportplugin.cpp	Mon Mar 15 12:44:52 2010 +0200
+++ b/webservices/wshttpchanneltransportplugin/src/senhttpchanneltransportplugin.cpp	Wed Mar 31 23:17:32 2010 +0300
@@ -26,25 +26,25 @@
 
 
 // INCLUDE FILES
-#include "senserviceconnection.h"
+#include "SenServiceConnection.h"
 #include "senhttpchanneltransportplugin.h"
 #include "senhttpchannelimpl.h"
 #include "senhttpsyncrequester.h"
-#include "senxmlutils.h"
-#include "senidentityprovider.h"
+#include "SenXmlUtils.h"
+#include "SenIdentityProvider.h"
 #include "senwspattern.h"
-#include "senfragment.h"
-#include "senelement.h"
+#include "SenFragment.h"
+#include "SenElement.h"
 #include "sendebug.h"
-#include "msenproperty.h"
-#include "senhttptransportproperties.h" // Utils\inc
+#include "MSenProperty.h"
+#include "SenHttpTransportProperties.h" // Utils\inc
 #include "sentransportcontext.h"
 #include "senlayeredhttptransportproperties.h" // internal Framework\inc
 #include "msenmessagecontext.h"
-#include "msenmessage.h"
-#include "sensoapmessage2.h"
-#include "rsendocument.h"
-#include "senparser.h"
+#include "MSenMessage.h"
+#include "SenSoapMessage2.h"
+#include "RSenDocument.h"
+#include "SenParser.h"
 #include "senservicesession.h"
 #include "senlogger.h"
 #include "senclientsession.h"