Bug 3800 - remove unecessary metadata

12 files changed, 22 insertions, 13 deletions

diff --git a/cpp/demo/Freeze/casino/CasinoStore.ice b/cpp/demo/Freeze/casino/CasinoStore.ice
index f240f1a9a2e..5f20fa190b7 100644
--- a/cpp/demo/Freeze/casino/CasinoStore.ice
+++ b/cpp/demo/Freeze/casino/CasinoStore.ice
@@ -28,7 +28,7 @@ module CasinoStore
         //
         ["freeze:write:mandatory"] void win(int count);
     };
-    ["java:type:{java.util.Vector}:{java.util.Vector}"] sequence<Winner*> WinnerPrxSeq;
+    sequence<Winner*> WinnerPrxSeq;
 
 
     class PersistentPlayer implements Casino::Player, Winner
diff --git a/cpp/demo/Ice/MFC/client/Hello.ice b/cpp/demo/Ice/MFC/client/Hello.ice
index 6d5ed8419aa..b5c9e4a599e 100644
--- a/cpp/demo/Ice/MFC/client/Hello.ice
+++ b/cpp/demo/Ice/MFC/client/Hello.ice
@@ -15,7 +15,7 @@ module Demo
 
 interface Hello
 {
-    ["ami", "cpp:const"] idempotent void sayHello(int delay);
+    ["ami"] idempotent void sayHello(int delay);
     ["ami"] void shutdown();
 };
 
diff --git a/cpp/demo/Ice/MFC/server/Hello.ice b/cpp/demo/Ice/MFC/server/Hello.ice
index 50120520456..bcaed6ad877 100644
--- a/cpp/demo/Ice/MFC/server/Hello.ice
+++ b/cpp/demo/Ice/MFC/server/Hello.ice
@@ -15,7 +15,7 @@ module Demo
 
 interface Hello
 {
-    ["cpp:const"] idempotent void sayHello(int delay);
+    idempotent void sayHello(int delay);
     void shutdown();
 };
 
diff --git a/cpp/demo/Ice/MFC/server/HelloI.cpp b/cpp/demo/Ice/MFC/server/HelloI.cpp
index 54c83b9ff4e..66500ead03a 100644
--- a/cpp/demo/Ice/MFC/server/HelloI.cpp
+++ b/cpp/demo/Ice/MFC/server/HelloI.cpp
@@ -19,7 +19,7 @@ HelloI::HelloI(const LogIPtr& log, CDialog* dialog) :
 }
 
 void
-HelloI::sayHello(int delay, const Ice::Current&) const
+HelloI::sayHello(int delay, const Ice::Current&)
 {
     if(delay != 0)
     {
diff --git a/cpp/demo/Ice/MFC/server/HelloI.h b/cpp/demo/Ice/MFC/server/HelloI.h
index 8af2b47c74b..b32daf35f24 100644
--- a/cpp/demo/Ice/MFC/server/HelloI.h
+++ b/cpp/demo/Ice/MFC/server/HelloI.h
@@ -21,7 +21,7 @@ public:
 
     HelloI(const LogIPtr&, CDialog*);
 
-    virtual void sayHello(int, const Ice::Current&) const;
+    virtual void sayHello(int, const Ice::Current&);
     virtual void shutdown(const Ice::Current&);
 
 private:
diff --git a/cpp/demo/Ice/converter/Greet.ice b/cpp/demo/Ice/converter/Greet.ice
index 888baa2cbf9..77802a19be8 100644
--- a/cpp/demo/Ice/converter/Greet.ice
+++ b/cpp/demo/Ice/converter/Greet.ice
@@ -15,7 +15,7 @@ module Demo
 
 interface Greet
 {
-    ["cpp:const"] idempotent string exchangeGreeting(string s);
+    idempotent string exchangeGreeting(string s);
     void shutdown();
 };
 
diff --git a/cpp/demo/Ice/converter/GreetI.cpp b/cpp/demo/Ice/converter/GreetI.cpp
index 453416dabc4..13d35ce539d 100644
--- a/cpp/demo/Ice/converter/GreetI.cpp
+++ b/cpp/demo/Ice/converter/GreetI.cpp
@@ -32,7 +32,7 @@ string decodeString(const string& str)
 }
 
 string
-GreetI::exchangeGreeting(const std::string& msg, const Ice::Current&) const
+GreetI::exchangeGreeting(const std::string& msg, const Ice::Current&)
 {
     cout << "Received (UTF-8): \"" << decodeString(msg) << '\"' << endl;
     return "Bonne journ\303\251e";
diff --git a/cpp/demo/Ice/converter/GreetI.h b/cpp/demo/Ice/converter/GreetI.h
index 1648853be9c..cbe31c2a373 100644
--- a/cpp/demo/Ice/converter/GreetI.h
+++ b/cpp/demo/Ice/converter/GreetI.h
@@ -16,7 +16,7 @@ class GreetI : public Demo::Greet
 {
 public:
 
-    virtual std::string exchangeGreeting(const std::string&, const Ice::Current&) const;
+    virtual std::string exchangeGreeting(const std::string&, const Ice::Current&);
     virtual void shutdown(const Ice::Current&);
 };
 
diff --git a/cpp/demo/Ice/session/Session.ice b/cpp/demo/Ice/session/Session.ice
index ceb87714846..dc1ca46fb15 100644
--- a/cpp/demo/Ice/session/Session.ice
+++ b/cpp/demo/Ice/session/Session.ice
@@ -15,7 +15,7 @@ module Demo
 
 interface Hello
 {
-    ["cpp:const"] idempotent void sayHello();
+    idempotent void sayHello();
 };
 
 //
@@ -37,7 +37,7 @@ interface Session
     //
     idempotent void refresh();
 
-    ["cpp:const"] idempotent string getName();
+    idempotent string getName();
 
     //
     // Destroy the session explicitly.
diff --git a/cpp/demo/Ice/session/SessionI.cpp b/cpp/demo/Ice/session/SessionI.cpp
index 824a204e504..e8f07122be8 100644
--- a/cpp/demo/Ice/session/SessionI.cpp
+++ b/cpp/demo/Ice/session/SessionI.cpp
@@ -28,7 +28,7 @@ public:
     }
 
     void
-    sayHello(const Ice::Current&) const
+    sayHello(const Ice::Current&)
     {
         cout << "Hello object #" << _id << " for session `" << _name << "' says:\n"
              << "Hello " << _name << "!" << endl;
@@ -76,7 +76,7 @@ SessionI::refresh(const Ice::Current& c)
 }
 
 string
-SessionI::getName(const Ice::Current&) const
+SessionI::getName(const Ice::Current&)
 {
     Lock sync(*this);
     if(_destroy)
diff --git a/cpp/demo/Ice/session/SessionI.h b/cpp/demo/Ice/session/SessionI.h
index 955013cb08d..d3b404f423f 100644
--- a/cpp/demo/Ice/session/SessionI.h
+++ b/cpp/demo/Ice/session/SessionI.h
@@ -22,7 +22,7 @@ public:
 
     virtual Demo::HelloPrx createHello(const Ice::Current&);
     virtual void refresh(const Ice::Current&);
-    virtual std::string getName(const Ice::Current&) const;
+    virtual std::string getName(const Ice::Current&);
     virtual void destroy(const Ice::Current&);
 
     IceUtil::Time timestamp() const;
diff --git a/cpp/demo/book/lifecycle/Filesystem.ice b/cpp/demo/book/lifecycle/Filesystem.ice
index 195002c8c46..c81a265d6b5 100644
--- a/cpp/demo/book/lifecycle/Filesystem.ice
+++ b/cpp/demo/book/lifecycle/Filesystem.ice
@@ -1,3 +1,12 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
 module Filesystem {
     exception GenericError
     {