merging javascript branch

1 files changed, 28 insertions, 0 deletions

diff --git a/js/src/Ice/ObjectFactory.js b/js/src/Ice/ObjectFactory.js
new file mode 100644
index 00000000000..2f178c4c73c
--- /dev/null
+++ b/js/src/Ice/ObjectFactory.js
@@ -0,0 +1,28 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 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.
+//
+// **********************************************************************
+
+(function(global){
+    var Ice = global.Ice || {};
+    
+    require("Ice/Class");
+    
+    var ObjectFactory = Ice.Class({
+        create: function(type)
+        {
+            throw new Error("not implemented");
+        },
+        destroy: function()
+        {
+            throw new Error("not implemented");
+        }
+    });
+    
+    Ice.ObjectFactory = ObjectFactory;
+    global.Ice = Ice;
+}(typeof (global) === "undefined" ? window : global));