updated disclaimer

V8/v8-actions.cpp

@@ -5,29 +5,19 @@
 ///
 /// DISCLAIMER
 ///
-/// Copyright by triAGENS GmbH - All rights reserved.
+/// Copyright 2010-2011 triagens GmbH, Cologne, Germany
 ///
-/// The Programs (which include both the software and documentation)
+/// Licensed under the Apache License, Version 2.0 (the "License");
-/// contain proprietary information of triAGENS GmbH; they are
+/// you may not use this file except in compliance with the License.
-/// provided under a license agreement containing restrictions on use and
+/// You may obtain a copy of the License at
-/// disclosure and are also protected by copyright, patent and other
-/// intellectual and industrial property laws. Reverse engineering,
-/// disassembly or decompilation of the Programs, except to the extent
-/// required to obtain interoperability with other independently created
-/// software or as specified by law, is prohibited.
 ///
-/// The Programs are not intended for use in any nuclear, aviation, mass
+///     http://www.apache.org/licenses/LICENSE-2.0
-/// transit, medical, or other inherently dangerous applications. It shall
-/// be the licensee's responsibility to take all appropriate fail-safe,
-/// backup, redundancy, and other measures to ensure the safe use of such
-/// applications if the Programs are used for such purposes, and triAGENS
-/// GmbH disclaims liability for any damages caused by such use of
-/// the Programs.
 ///
-/// This software is the confidential and proprietary information of
+/// Unless required by applicable law or agreed to in writing, software
-/// triAGENS GmbH. You shall not disclose such confidential and
+/// distributed under the License is distributed on an "AS IS" BASIS,
-/// proprietary information and shall use it only in accordance with the
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-/// terms of the license agreement you entered into with triAGENS GmbH.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
 ///
 /// Copyright holder is triAGENS GmbH, Cologne, Germany
 ///

V8/v8-actions.h

@@ -5,29 +5,19 @@
 ///
 /// DISCLAIMER
 ///
-/// Copyright by triAGENS GmbH - All rights reserved.
+/// Copyright 2010-2011 triagens GmbH, Cologne, Germany
 ///
-/// The Programs (which include both the software and documentation)
+/// Licensed under the Apache License, Version 2.0 (the "License");
-/// contain proprietary information of triAGENS GmbH; they are
+/// you may not use this file except in compliance with the License.
-/// provided under a license agreement containing restrictions on use and
+/// You may obtain a copy of the License at
-/// disclosure and are also protected by copyright, patent and other
-/// intellectual and industrial property laws. Reverse engineering,
-/// disassembly or decompilation of the Programs, except to the extent
-/// required to obtain interoperability with other independently created
-/// software or as specified by law, is prohibited.
 ///
-/// The Programs are not intended for use in any nuclear, aviation, mass
+///     http://www.apache.org/licenses/LICENSE-2.0
-/// transit, medical, or other inherently dangerous applications. It shall
-/// be the licensee's responsibility to take all appropriate fail-safe,
-/// backup, redundancy, and other measures to ensure the safe use of such
-/// applications if the Programs are used for such purposes, and triAGENS
-/// GmbH disclaims liability for any damages caused by such use of
-/// the Programs.
 ///
-/// This software is the confidential and proprietary information of
+/// Unless required by applicable law or agreed to in writing, software
-/// triAGENS GmbH. You shall not disclose such confidential and
+/// distributed under the License is distributed on an "AS IS" BASIS,
-/// proprietary information and shall use it only in accordance with the
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-/// terms of the license agreement you entered into with triAGENS GmbH.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
 ///
 /// Copyright holder is triAGENS GmbH, Cologne, Germany
 ///

V8/v8-debug-shell.cpp

@@ -5,29 +5,19 @@
 ///
 /// DISCLAIMER
 ///
-/// Copyright by triAGENS GmbH - All rights reserved.
+/// Copyright 2010-2011 triagens GmbH, Cologne, Germany
 ///
-/// The Programs (which include both the software and documentation)
+/// Licensed under the Apache License, Version 2.0 (the "License");
-/// contain proprietary information of triAGENS GmbH; they are
+/// you may not use this file except in compliance with the License.
-/// provided under a license agreement containing restrictions on use and
+/// You may obtain a copy of the License at
-/// disclosure and are also protected by copyright, patent and other
-/// intellectual and industrial property laws. Reverse engineering,
-/// disassembly or decompilation of the Programs, except to the extent
-/// required to obtain interoperability with other independently created
-/// software or as specified by law, is prohibited.
 ///
-/// The Programs are not intended for use in any nuclear, aviation, mass
+///     http://www.apache.org/licenses/LICENSE-2.0
-/// transit, medical, or other inherently dangerous applications. It shall
-/// be the licensee's responsibility to take all appropriate fail-safe,
-/// backup, redundancy, and other measures to ensure the safe use of such
-/// applications if the Programs are used for such purposes, and triAGENS
-/// GmbH disclaims liability for any damages caused by such use of
-/// the Programs.
 ///
-/// This software is the confidential and proprietary information of
+/// Unless required by applicable law or agreed to in writing, software
-/// triAGENS GmbH. You shall not disclose such confidential and
+/// distributed under the License is distributed on an "AS IS" BASIS,
-/// proprietary information and shall use it only in accordance with the
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-/// terms of the license agreement you entered into with triAGENS GmbH.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
 ///
 /// Copyright holder is triAGENS GmbH, Cologne, Germany
 ///
@@ -130,7 +120,7 @@ static int RunMain (v8::Handle<v8::Context> context, int argc, char* argv[]) {
 
     if (strcmp(str, "--shell") == 0) {
       RunShellFlag = true;
-    } 
+    }
     else if (strncmp(str, "--", 2) == 0) {
       printf("Warning: unknown flag %s.\n", str);
     }
@@ -216,27 +206,23 @@ int main (int argc, char* argv[]) {
   TRI_InitV8Utils(context, ".");
   TRI_InitV8Shell(context);
 
-  bool ok;
+  char const* files[] = {
+    "js/modules.js",
+    "js/shell.js"
+  };
 
-  ok = TRI_LoadJavaScriptFile(context, "js/modules.js");
+  for (size_t i = 0;   i < sizeof(files) / sizeof(files[0]);  ++i) {
+    bool ok;
 
-  if (! ok) {
+    ok = TRI_LoadJavaScriptFile(context, files[i]);
-    LOG_ERROR("cannot load file 'js/modules.js'");
+
+    if (! ok) {
+      LOG_ERROR("cannot load file '%s'", files[i]);
+    }
   }
 
-  ok = TRI_LoadJavaScriptFile(context, "js/shell.js");
+  RunMain(context, argc, argv);
 
-  if (! ok) {
-    LOG_ERROR("cannot load file 'js/shell.js'");
-  }
-
-  ok = TRI_LoadJavaScriptFile(context, "js/actions.js");
-
-  if (! ok) {
-    LOG_ERROR("cannot load file 'js/actions.js'");
-  }
-
-  int result = RunMain(context, argc, argv);
   if (RunShellFlag) {
     RunShell(context);
   }

V8/v8-globals.h

@@ -5,29 +5,19 @@
 ///
 /// DISCLAIMER
 ///
-/// Copyright by triAGENS GmbH - All rights reserved.
+/// Copyright 2010-2011 triagens GmbH, Cologne, Germany
 ///
-/// The Programs (which include both the software and documentation)
+/// Licensed under the Apache License, Version 2.0 (the "License");
-/// contain proprietary information of triAGENS GmbH; they are
+/// you may not use this file except in compliance with the License.
-/// provided under a license agreement containing restrictions on use and
+/// You may obtain a copy of the License at
-/// disclosure and are also protected by copyright, patent and other
-/// intellectual and industrial property laws. Reverse engineering,
-/// disassembly or decompilation of the Programs, except to the extent
-/// required to obtain interoperability with other independently created
-/// software or as specified by law, is prohibited.
 ///
-/// The Programs are not intended for use in any nuclear, aviation, mass
+///     http://www.apache.org/licenses/LICENSE-2.0
-/// transit, medical, or other inherently dangerous applications. It shall
-/// be the licensee's responsibility to take all appropriate fail-safe,
-/// backup, redundancy, and other measures to ensure the safe use of such
-/// applications if the Programs are used for such purposes, and triAGENS
-/// GmbH disclaims liability for any damages caused by such use of
-/// the Programs.
 ///
-/// This software is the confidential and proprietary information of
+/// Unless required by applicable law or agreed to in writing, software
-/// triAGENS GmbH. You shall not disclose such confidential and
+/// distributed under the License is distributed on an "AS IS" BASIS,
-/// proprietary information and shall use it only in accordance with the
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-/// terms of the license agreement you entered into with triAGENS GmbH.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
 ///
 /// Copyright holder is triAGENS GmbH, Cologne, Germany
 ///

V8/v8-json.h

@@ -5,29 +5,19 @@
 ///
 /// DISCLAIMER
 ///
-/// Copyright by triAGENS GmbH - All rights reserved.
+/// Copyright 2010-2011 triagens GmbH, Cologne, Germany
 ///
-/// The Programs (which include both the software and documentation)
+/// Licensed under the Apache License, Version 2.0 (the "License");
-/// contain proprietary information of triAGENS GmbH; they are
+/// you may not use this file except in compliance with the License.
-/// provided under a license agreement containing restrictions on use and
+/// You may obtain a copy of the License at
-/// disclosure and are also protected by copyright, patent and other
-/// intellectual and industrial property laws. Reverse engineering,
-/// disassembly or decompilation of the Programs, except to the extent
-/// required to obtain interoperability with other independently created
-/// software or as specified by law, is prohibited.
 ///
-/// The Programs are not intended for use in any nuclear, aviation, mass
+///     http://www.apache.org/licenses/LICENSE-2.0
-/// transit, medical, or other inherently dangerous applications. It shall
-/// be the licensee's responsibility to take all appropriate fail-safe,
-/// backup, redundancy, and other measures to ensure the safe use of such
-/// applications if the Programs are used for such purposes, and triAGENS
-/// GmbH disclaims liability for any damages caused by such use of
-/// the Programs.
 ///
-/// This software is the confidential and proprietary information of
+/// Unless required by applicable law or agreed to in writing, software
-/// triAGENS GmbH. You shall not disclose such confidential and
+/// distributed under the License is distributed on an "AS IS" BASIS,
-/// proprietary information and shall use it only in accordance with the
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-/// terms of the license agreement you entered into with triAGENS GmbH.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
 ///
 /// Copyright holder is triAGENS GmbH, Cologne, Germany
 ///

V8/v8-shell.cpp

@@ -5,29 +5,19 @@
 ///
 /// DISCLAIMER
 ///
-/// Copyright by triAGENS GmbH - All rights reserved.
+/// Copyright 2010-2011 triagens GmbH, Cologne, Germany
 ///
-/// The Programs (which include both the software and documentation)
+/// Licensed under the Apache License, Version 2.0 (the "License");
-/// contain proprietary information of triAGENS GmbH; they are
+/// you may not use this file except in compliance with the License.
-/// provided under a license agreement containing restrictions on use and
+/// You may obtain a copy of the License at
-/// disclosure and are also protected by copyright, patent and other
-/// intellectual and industrial property laws. Reverse engineering,
-/// disassembly or decompilation of the Programs, except to the extent
-/// required to obtain interoperability with other independently created
-/// software or as specified by law, is prohibited.
 ///
-/// The Programs are not intended for use in any nuclear, aviation, mass
+///     http://www.apache.org/licenses/LICENSE-2.0
-/// transit, medical, or other inherently dangerous applications. It shall
-/// be the licensee's responsibility to take all appropriate fail-safe,
-/// backup, redundancy, and other measures to ensure the safe use of such
-/// applications if the Programs are used for such purposes, and triAGENS
-/// GmbH disclaims liability for any damages caused by such use of
-/// the Programs.
 ///
-/// This software is the confidential and proprietary information of
+/// Unless required by applicable law or agreed to in writing, software
-/// triAGENS GmbH. You shall not disclose such confidential and
+/// distributed under the License is distributed on an "AS IS" BASIS,
-/// proprietary information and shall use it only in accordance with the
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-/// terms of the license agreement you entered into with triAGENS GmbH.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
 ///
 /// Copyright holder is triAGENS GmbH, Cologne, Germany
 ///

V8/v8-shell.h

@@ -5,29 +5,19 @@
 ///
 /// DISCLAIMER
 ///
-/// Copyright by triAGENS GmbH - All rights reserved.
+/// Copyright 2010-2011 triagens GmbH, Cologne, Germany
 ///
-/// The Programs (which include both the software and documentation)
+/// Licensed under the Apache License, Version 2.0 (the "License");
-/// contain proprietary information of triAGENS GmbH; they are
+/// you may not use this file except in compliance with the License.
-/// provided under a license agreement containing restrictions on use and
+/// You may obtain a copy of the License at
-/// disclosure and are also protected by copyright, patent and other
-/// intellectual and industrial property laws. Reverse engineering,
-/// disassembly or decompilation of the Programs, except to the extent
-/// required to obtain interoperability with other independently created
-/// software or as specified by law, is prohibited.
 ///
-/// The Programs are not intended for use in any nuclear, aviation, mass
+///     http://www.apache.org/licenses/LICENSE-2.0
-/// transit, medical, or other inherently dangerous applications. It shall
-/// be the licensee's responsibility to take all appropriate fail-safe,
-/// backup, redundancy, and other measures to ensure the safe use of such
-/// applications if the Programs are used for such purposes, and triAGENS
-/// GmbH disclaims liability for any damages caused by such use of
-/// the Programs.
 ///
-/// This software is the confidential and proprietary information of
+/// Unless required by applicable law or agreed to in writing, software
-/// triAGENS GmbH. You shall not disclose such confidential and
+/// distributed under the License is distributed on an "AS IS" BASIS,
-/// proprietary information and shall use it only in accordance with the
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-/// terms of the license agreement you entered into with triAGENS GmbH.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
 ///
 /// Copyright holder is triAGENS GmbH, Cologne, Germany
 ///

V8/v8-utils.cpp

@@ -5,29 +5,19 @@
 ///
 /// DISCLAIMER
 ///
-/// Copyright by triAGENS GmbH - All rights reserved.
+/// Copyright 2010-2011 triagens GmbH, Cologne, Germany
 ///
-/// The Programs (which include both the software and documentation)
+/// Licensed under the Apache License, Version 2.0 (the "License");
-/// contain proprietary information of triAGENS GmbH; they are
+/// you may not use this file except in compliance with the License.
-/// provided under a license agreement containing restrictions on use and
+/// You may obtain a copy of the License at
-/// disclosure and are also protected by copyright, patent and other
-/// intellectual and industrial property laws. Reverse engineering,
-/// disassembly or decompilation of the Programs, except to the extent
-/// required to obtain interoperability with other independently created
-/// software or as specified by law, is prohibited.
 ///
-/// The Programs are not intended for use in any nuclear, aviation, mass
+///     http://www.apache.org/licenses/LICENSE-2.0
-/// transit, medical, or other inherently dangerous applications. It shall
-/// be the licensee's responsibility to take all appropriate fail-safe,
-/// backup, redundancy, and other measures to ensure the safe use of such
-/// applications if the Programs are used for such purposes, and triAGENS
-/// GmbH disclaims liability for any damages caused by such use of
-/// the Programs.
 ///
-/// This software is the confidential and proprietary information of
+/// Unless required by applicable law or agreed to in writing, software
-/// triAGENS GmbH. You shall not disclose such confidential and
+/// distributed under the License is distributed on an "AS IS" BASIS,
-/// proprietary information and shall use it only in accordance with the
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-/// terms of the license agreement you entered into with triAGENS GmbH.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
 ///
 /// Copyright holder is triAGENS GmbH, Cologne, Germany
 ///
@@ -1031,7 +1021,7 @@ static bool FillShapeValueArray (TRI_shaper_t* shaper,
 ////////////////////////////////////////////////////////////////////////////////
 
 static bool FillShapeValueJson (TRI_shaper_t* shaper,
-                                TRI_shape_value_t* dst, 
+                                TRI_shape_value_t* dst,
                                 v8::Handle<v8::Value> json,
                                 set<int>& seenHashes,
                                 vector< v8::Handle<v8::Object> >& seenObjects) {
@@ -1048,7 +1038,7 @@ static bool FillShapeValueJson (TRI_shaper_t* shaper,
           return FillShapeValueNull(shaper, dst);
         }
       }
-    
+
       seenObjects.push_back(o);
     }
     else {

V8/v8-utils.h

@@ -5,29 +5,19 @@
 ///
 /// DISCLAIMER
 ///
-/// Copyright by triAGENS GmbH - All rights reserved.
+/// Copyright 2010-2011 triagens GmbH, Cologne, Germany
 ///
-/// The Programs (which include both the software and documentation)
+/// Licensed under the Apache License, Version 2.0 (the "License");
-/// contain proprietary information of triAGENS GmbH; they are
+/// you may not use this file except in compliance with the License.
-/// provided under a license agreement containing restrictions on use and
+/// You may obtain a copy of the License at
-/// disclosure and are also protected by copyright, patent and other
-/// intellectual and industrial property laws. Reverse engineering,
-/// disassembly or decompilation of the Programs, except to the extent
-/// required to obtain interoperability with other independently created
-/// software or as specified by law, is prohibited.
 ///
-/// The Programs are not intended for use in any nuclear, aviation, mass
+///     http://www.apache.org/licenses/LICENSE-2.0
-/// transit, medical, or other inherently dangerous applications. It shall
-/// be the licensee's responsibility to take all appropriate fail-safe,
-/// backup, redundancy, and other measures to ensure the safe use of such
-/// applications if the Programs are used for such purposes, and triAGENS
-/// GmbH disclaims liability for any damages caused by such use of
-/// the Programs.
 ///
-/// This software is the confidential and proprietary information of
+/// Unless required by applicable law or agreed to in writing, software
-/// triAGENS GmbH. You shall not disclose such confidential and
+/// distributed under the License is distributed on an "AS IS" BASIS,
-/// proprietary information and shall use it only in accordance with the
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-/// terms of the license agreement you entered into with triAGENS GmbH.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
 ///
 /// Copyright holder is triAGENS GmbH, Cologne, Germany
 ///

V8/v8-vocbase.cpp

@@ -5,29 +5,19 @@
 ///
 /// DISCLAIMER
 ///
-/// Copyright by triAGENS GmbH - All rights reserved.
+/// Copyright 2010-2011 triagens GmbH, Cologne, Germany
 ///
-/// The Programs (which include both the software and documentation)
+/// Licensed under the Apache License, Version 2.0 (the "License");
-/// contain proprietary information of triAGENS GmbH; they are
+/// you may not use this file except in compliance with the License.
-/// provided under a license agreement containing restrictions on use and
+/// You may obtain a copy of the License at
-/// disclosure and are also protected by copyright, patent and other
-/// intellectual and industrial property laws. Reverse engineering,
-/// disassembly or decompilation of the Programs, except to the extent
-/// required to obtain interoperability with other independently created
-/// software or as specified by law, is prohibited.
 ///
-/// The Programs are not intended for use in any nuclear, aviation, mass
+///     http://www.apache.org/licenses/LICENSE-2.0
-/// transit, medical, or other inherently dangerous applications. It shall
-/// be the licensee's responsibility to take all appropriate fail-safe,
-/// backup, redundancy, and other measures to ensure the safe use of such
-/// applications if the Programs are used for such purposes, and triAGENS
-/// GmbH disclaims liability for any damages caused by such use of
-/// the Programs.
 ///
-/// This software is the confidential and proprietary information of
+/// Unless required by applicable law or agreed to in writing, software
-/// triAGENS GmbH. You shall not disclose such confidential and
+/// distributed under the License is distributed on an "AS IS" BASIS,
-/// proprietary information and shall use it only in accordance with the
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-/// terms of the license agreement you entered into with triAGENS GmbH.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
 ///
 /// Copyright holder is triAGENS GmbH, Cologne, Germany
 ///

V8/v8-vocbase.h

@@ -5,29 +5,19 @@
 ///
 /// DISCLAIMER
 ///
-/// Copyright by triAGENS GmbH - All rights reserved.
+/// Copyright 2010-2011 triagens GmbH, Cologne, Germany
 ///
-/// The Programs (which include both the software and documentation)
+/// Licensed under the Apache License, Version 2.0 (the "License");
-/// contain proprietary information of triAGENS GmbH; they are
+/// you may not use this file except in compliance with the License.
-/// provided under a license agreement containing restrictions on use and
+/// You may obtain a copy of the License at
-/// disclosure and are also protected by copyright, patent and other
-/// intellectual and industrial property laws. Reverse engineering,
-/// disassembly or decompilation of the Programs, except to the extent
-/// required to obtain interoperability with other independently created
-/// software or as specified by law, is prohibited.
 ///
-/// The Programs are not intended for use in any nuclear, aviation, mass
+///     http://www.apache.org/licenses/LICENSE-2.0
-/// transit, medical, or other inherently dangerous applications. It shall
-/// be the licensee's responsibility to take all appropriate fail-safe,
-/// backup, redundancy, and other measures to ensure the safe use of such
-/// applications if the Programs are used for such purposes, and triAGENS
-/// GmbH disclaims liability for any damages caused by such use of
-/// the Programs.
 ///
-/// This software is the confidential and proprietary information of
+/// Unless required by applicable law or agreed to in writing, software
-/// triAGENS GmbH. You shall not disclose such confidential and
+/// distributed under the License is distributed on an "AS IS" BASIS,
-/// proprietary information and shall use it only in accordance with the
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-/// terms of the license agreement you entered into with triAGENS GmbH.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
 ///
 /// Copyright holder is triAGENS GmbH, Cologne, Germany
 ///