1 files changed, 9 insertions, 25 deletions
diff --git a/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl b/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
index 3206359fb6..69638e325c 100644
--- a/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
+++ b/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
@@ -29,44 +29,28 @@
 #ifndef _AMQP_ServerProxy_
 #define _AMQP_ServerProxy_
 
-#include <AMQP_ServerOperations.h>
-#include <FieldTable.h>
-#include <FramingContent.h>
-#include <OutputHandler.h>
+#include "framing/Proxy.h"
 
 namespace qpid {
 namespace framing {
 
-class AMQP_ServerProxy : public AMQP_ServerOperations
+class AMQP_ServerProxy : public Proxy
 {
-private:
-    ProtocolVersion version;
-    OutputHandler* out;
-%{CLIST} ${sph_handler_pointer_defn}
-
 public:
-    AMQP_ServerProxy(OutputHandler* out, u_int8_t major, u_int8_t minor);
-    const ProtocolVersion& getProtocolVersion() {return version;}
-    virtual ~AMQP_ServerProxy() {}
-
-	// Get methods for handlers
+    AMQP_ServerProxy(ChannelAdapter& ch);
 
-%{CLIST} ${sph_handler_pointer_get_method}
-
-	// Inner class definitions
+    // Inner class definitions
 
 %{CLIST} ${sph_inner_class_defn}
 
+    // Inner class instance get methods
+	
+%{CLIST} ${sph_inner_class_get_method}
+    
 private:
-	// Inner class instances
+    // Inner class instances
 	
 %{CLIST} ${sph_inner_class_instance}
-
-public:
-	// Inner class instance get methods
-	
-%{CLIST} ${sph_inner_class_get_method}
-
 }; /* class AMQP_ServerProxy */
 
 } /* namespace framing */