diff --git a/V8/v8-actions.cpp b/V8/v8-actions.cpp index 996d0abe8e..a1d6262c80 100644 --- a/V8/v8-actions.cpp +++ b/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) -/// contain proprietary information of triAGENS GmbH; they are -/// provided under a license agreement containing restrictions on use and -/// 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. +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at /// -/// The Programs are not intended for use in any nuclear, aviation, mass -/// 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. +/// http://www.apache.org/licenses/LICENSE-2.0 /// -/// This software is the confidential and proprietary information of -/// triAGENS GmbH. You shall not disclose such confidential and -/// proprietary information and shall use it only in accordance with the -/// terms of the license agreement you entered into with triAGENS GmbH. +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. /// /// Copyright holder is triAGENS GmbH, Cologne, Germany /// diff --git a/V8/v8-actions.h b/V8/v8-actions.h index b7f7cfcd41..3c673ef419 100644 --- a/V8/v8-actions.h +++ b/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) -/// contain proprietary information of triAGENS GmbH; they are -/// provided under a license agreement containing restrictions on use and -/// 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. +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at /// -/// The Programs are not intended for use in any nuclear, aviation, mass -/// 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. +/// http://www.apache.org/licenses/LICENSE-2.0 /// -/// This software is the confidential and proprietary information of -/// triAGENS GmbH. You shall not disclose such confidential and -/// proprietary information and shall use it only in accordance with the -/// terms of the license agreement you entered into with triAGENS GmbH. +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. /// /// Copyright holder is triAGENS GmbH, Cologne, Germany /// diff --git a/V8/v8-debug-shell.cpp b/V8/v8-debug-shell.cpp index ddf6ee688b..34194166ee 100644 --- a/V8/v8-debug-shell.cpp +++ b/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) -/// contain proprietary information of triAGENS GmbH; they are -/// provided under a license agreement containing restrictions on use and -/// 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. +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at /// -/// The Programs are not intended for use in any nuclear, aviation, mass -/// 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. +/// http://www.apache.org/licenses/LICENSE-2.0 /// -/// This software is the confidential and proprietary information of -/// triAGENS GmbH. You shall not disclose such confidential and -/// proprietary information and shall use it only in accordance with the -/// terms of the license agreement you entered into with triAGENS GmbH. +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// 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 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) { - LOG_ERROR("cannot load file 'js/modules.js'"); + ok = TRI_LoadJavaScriptFile(context, files[i]); + + 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); } diff --git a/V8/v8-globals.h b/V8/v8-globals.h index 7e6b126dbf..536a45fa04 100644 --- a/V8/v8-globals.h +++ b/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) -/// contain proprietary information of triAGENS GmbH; they are -/// provided under a license agreement containing restrictions on use and -/// 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. +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at /// -/// The Programs are not intended for use in any nuclear, aviation, mass -/// 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. +/// http://www.apache.org/licenses/LICENSE-2.0 /// -/// This software is the confidential and proprietary information of -/// triAGENS GmbH. You shall not disclose such confidential and -/// proprietary information and shall use it only in accordance with the -/// terms of the license agreement you entered into with triAGENS GmbH. +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. /// /// Copyright holder is triAGENS GmbH, Cologne, Germany /// diff --git a/V8/v8-json.h b/V8/v8-json.h index 09605b2d7f..eedbac61ee 100644 --- a/V8/v8-json.h +++ b/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) -/// contain proprietary information of triAGENS GmbH; they are -/// provided under a license agreement containing restrictions on use and -/// 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. +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at /// -/// The Programs are not intended for use in any nuclear, aviation, mass -/// 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. +/// http://www.apache.org/licenses/LICENSE-2.0 /// -/// This software is the confidential and proprietary information of -/// triAGENS GmbH. You shall not disclose such confidential and -/// proprietary information and shall use it only in accordance with the -/// terms of the license agreement you entered into with triAGENS GmbH. +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. /// /// Copyright holder is triAGENS GmbH, Cologne, Germany /// diff --git a/V8/v8-shell.cpp b/V8/v8-shell.cpp index c2ab1a85d1..ce7bf3c8da 100644 --- a/V8/v8-shell.cpp +++ b/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) -/// contain proprietary information of triAGENS GmbH; they are -/// provided under a license agreement containing restrictions on use and -/// 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. +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at /// -/// The Programs are not intended for use in any nuclear, aviation, mass -/// 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. +/// http://www.apache.org/licenses/LICENSE-2.0 /// -/// This software is the confidential and proprietary information of -/// triAGENS GmbH. You shall not disclose such confidential and -/// proprietary information and shall use it only in accordance with the -/// terms of the license agreement you entered into with triAGENS GmbH. +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. /// /// Copyright holder is triAGENS GmbH, Cologne, Germany /// diff --git a/V8/v8-shell.h b/V8/v8-shell.h index d14d33a9e0..16d6a96f9f 100644 --- a/V8/v8-shell.h +++ b/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) -/// contain proprietary information of triAGENS GmbH; they are -/// provided under a license agreement containing restrictions on use and -/// 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. +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at /// -/// The Programs are not intended for use in any nuclear, aviation, mass -/// 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. +/// http://www.apache.org/licenses/LICENSE-2.0 /// -/// This software is the confidential and proprietary information of -/// triAGENS GmbH. You shall not disclose such confidential and -/// proprietary information and shall use it only in accordance with the -/// terms of the license agreement you entered into with triAGENS GmbH. +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. /// /// Copyright holder is triAGENS GmbH, Cologne, Germany /// diff --git a/V8/v8-utils.cpp b/V8/v8-utils.cpp index e8698e0db6..58ddf6ebc3 100644 --- a/V8/v8-utils.cpp +++ b/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) -/// contain proprietary information of triAGENS GmbH; they are -/// provided under a license agreement containing restrictions on use and -/// 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. +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at /// -/// The Programs are not intended for use in any nuclear, aviation, mass -/// 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. +/// http://www.apache.org/licenses/LICENSE-2.0 /// -/// This software is the confidential and proprietary information of -/// triAGENS GmbH. You shall not disclose such confidential and -/// proprietary information and shall use it only in accordance with the -/// terms of the license agreement you entered into with triAGENS GmbH. +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// 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 json, set& seenHashes, vector< v8::Handle >& seenObjects) { @@ -1048,7 +1038,7 @@ static bool FillShapeValueJson (TRI_shaper_t* shaper, return FillShapeValueNull(shaper, dst); } } - + seenObjects.push_back(o); } else { diff --git a/V8/v8-utils.h b/V8/v8-utils.h index 5b03dfad61..b59532f2df 100644 --- a/V8/v8-utils.h +++ b/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) -/// contain proprietary information of triAGENS GmbH; they are -/// provided under a license agreement containing restrictions on use and -/// 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. +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at /// -/// The Programs are not intended for use in any nuclear, aviation, mass -/// 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. +/// http://www.apache.org/licenses/LICENSE-2.0 /// -/// This software is the confidential and proprietary information of -/// triAGENS GmbH. You shall not disclose such confidential and -/// proprietary information and shall use it only in accordance with the -/// terms of the license agreement you entered into with triAGENS GmbH. +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. /// /// Copyright holder is triAGENS GmbH, Cologne, Germany /// diff --git a/V8/v8-vocbase.cpp b/V8/v8-vocbase.cpp index 7fd3cd1b4b..3800280856 100644 --- a/V8/v8-vocbase.cpp +++ b/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) -/// contain proprietary information of triAGENS GmbH; they are -/// provided under a license agreement containing restrictions on use and -/// 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. +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at /// -/// The Programs are not intended for use in any nuclear, aviation, mass -/// 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. +/// http://www.apache.org/licenses/LICENSE-2.0 /// -/// This software is the confidential and proprietary information of -/// triAGENS GmbH. You shall not disclose such confidential and -/// proprietary information and shall use it only in accordance with the -/// terms of the license agreement you entered into with triAGENS GmbH. +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. /// /// Copyright holder is triAGENS GmbH, Cologne, Germany /// diff --git a/V8/v8-vocbase.h b/V8/v8-vocbase.h index 23d9a53e4a..26ee6fca44 100644 --- a/V8/v8-vocbase.h +++ b/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) -/// contain proprietary information of triAGENS GmbH; they are -/// provided under a license agreement containing restrictions on use and -/// 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. +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at /// -/// The Programs are not intended for use in any nuclear, aviation, mass -/// 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. +/// http://www.apache.org/licenses/LICENSE-2.0 /// -/// This software is the confidential and proprietary information of -/// triAGENS GmbH. You shall not disclose such confidential and -/// proprietary information and shall use it only in accordance with the -/// terms of the license agreement you entered into with triAGENS GmbH. +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. /// /// Copyright holder is triAGENS GmbH, Cologne, Germany ///