You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@griffin.apache.org by gu...@apache.org on 2017/07/05 03:28:43 UTC
[01/10] incubator-griffin git commit: rename license.md as license
and update third party license
Repository: incubator-griffin
Updated Branches:
refs/heads/griffin-0.1.5-incubating-rc2 [created] a9bb9231e
rename license.md as license and update third party license
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/fdd6d790
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/fdd6d790
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/fdd6d790
Branch: refs/heads/griffin-0.1.5-incubating-rc2
Commit: fdd6d790c65c52fc3c9397fbee8af8e2a489e2af
Parents: e76275f
Author: William Guo <gu...@icloud.com>
Authored: Wed Jul 5 08:45:38 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Wed Jul 5 08:45:38 2017 +0800
----------------------------------------------------------------------
LICENSE | 360 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
LICENSE.md | 355 -------------------------------------------------------
2 files changed, 360 insertions(+), 355 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/fdd6d790/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..88f96af
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,360 @@
+
+This software is distributed under the Apache License, version 2.0. See (1) below.
+This software is copyright (c) The Apache Software Foundation and contributors.
+
+Contents:
+
+ (1) This software license: Apache License, version 2.0
+ (2) Notices for third-party software
+ (3) Licenses for third-party software
+
+
+---------------------------------------------------
+
+(1) This software license: Apache License, version 2.0
+
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+
+---------------------------------------------------
+
+(2) Notices for third-party software
+
+The Apache Griffin project contains subcomponents in the source code
+release with separate copyright notices and license terms. Your use of
+the source code for the these subcomponents is subject to the terms and
+conditions of their respective licenses.
+
+
+This project includes the software: angular
+ Available at: https://github.com/angular/angular.js/blob/v1.6.4/LICENSE
+ Version used: 1.6.4
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ Copyright (c) 2010-2017 Google, Inc. http://angularjs.org
+
+This project includes the software: angular-route
+ Available at: https://github.com/angular/bower-angular-route/blob/v1.6.4/LICENSE.md
+ Version used: 1.6.4
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ Copyright (c) 2016 Angular
+
+This project includes the software: angular-smart-table
+ Available at: https://github.com/lorenzofox3/Smart-Table
+ Version used: 2.1.7
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ Copyright (C) 2016 Laurent Renard.
+
+This project includes the software: angular-cookies.js
+ Available at: https://github.com/angular/bower-angular-cookies/blob/v1.6.4/LICENSE.md
+ Version used: 1.6.4
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ Copyright (c) 2016 Angular
+
+This project includes the software: angular-spinner
+ Available at: https://github.com/urish/angular-spinner/tree/0.8.0
+ Version used: 0.8.0
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ Copyright (C) 2013, 2014, 2015, Uri Shaked uri@urish.org.
+
+This project includes the software: AngularJS-Toaster
+ Available at: https://github.com/jirikavi/AngularJS-Toaster/blob/1.2.0/LICENSE
+ Version used: 1.2.0
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ Copyright (c) 2013 jirikavi
+
+This project includes the software: bootswatch
+ Available at: https://github.com/thomaspark/bootswatch/blob/v3.3.6/LICENSE
+ Version used: 3.3.6
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ Copyright (c) 2013 Thomas Park
+
+This project includes the software: domReady
+ Available at: https://github.com/requirejs/domReady/blob/2.0.1/LICENSE
+ Version used: 2.0.1
+ Used under the following license: The BSD 3-Clause (New BSD) License (http://opensource.org/licenses/BSD-3-Clause)
+ Copyright (c) 2010-2011, The Dojo Foundation
+
+This project includes the software: echarts
+ Available at: https://github.com/ecomfe/echarts/blob/3.2.2/LICENSE
+ Version used: 3.2.2
+ Used under the following license: The BSD 3-Clause (New BSD) License (http://opensource.org/licenses/BSD-3-Clause)
+ Copyright (c) 2013, Baidu Inc.
+
+This project includes the software: Font Awesome (code)
+ Available at: http://fontawesome.io/
+ Inclusive of: font-awesome/{css,scss,less}/*
+ Version used: 4.7.0
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ Copyright (c) Dave Gandy (2016)
+
+This project includes the software: Font Awesome (fonts)
+ Available at: http://fontawesome.io/
+ Inclusive of: font-awesome/fonts/*
+ Version used: 4.7.0
+ Used under the following license: SIL OFL 1.1 (http://scripts.sil.org/OFL)
+ Copyright (c) Dave Gandy (2016)
+
+This project includes the software: requirejs
+ Available at: https://github.com/requirejs/requirejs/blob/2.1.22/LICENSE
+ Version used: 2.1.22
+ Used under the following license: The BSD 3-Clause (New BSD) License (http://opensource.org/licenses/BSD-3-Clause)
+ Copyright (c) 2010-2015, The Dojo Foundation
+
+
+---------------------------------------------------
+
+(3) Licenses for third-party software
+
+Contents:
+
+ The BSD 2-Clause License
+ The BSD 3-Clause License ("New BSD")
+ The MIT License ("MIT")
+
+
+The BSD 2-Clause License
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+The BSD 3-Clause License ("New BSD")
+
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ 3. Neither the name of the copyright holder nor the names of its contributors
+ may be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+
+The MIT License ("MIT")
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/fdd6d790/LICENSE.md
----------------------------------------------------------------------
diff --git a/LICENSE.md b/LICENSE.md
deleted file mode 100644
index 7969af7..0000000
--- a/LICENSE.md
+++ /dev/null
@@ -1,355 +0,0 @@
-
-This software is distributed under the Apache License, version 2.0. See (1) below.
-This software is copyright (c) The Apache Software Foundation and contributors.
-
-Contents:
-
- (1) This software license: Apache License, version 2.0
- (2) Notices for bundled software
- (3) Licenses for bundled software
-
-
----------------------------------------------------
-
-(1) This software license: Apache License, version 2.0
-
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
-
----------------------------------------------------
-
-(2) Notices for bundled software
-
-```
-This project includes the software: angular
- Available at: https://github.com/angular/angular.js/blob/v1.6.4/LICENSE
- Version used: 1.6.4
- Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
- Copyright (c) 2010-2017 Google, Inc. http://angularjs.org
-
-This project includes the software: angular-route
- Available at: https://github.com/angular/bower-angular-route/blob/v1.6.4/LICENSE.md
- Version used: 1.6.4
- Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
- Copyright (c) 2016 Angular
-
-This project includes the software: angular-smart-table
- Available at: https://github.com/lorenzofox3/Smart-Table
- Version used: 2.1.7
- Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
- Copyright (C) 2016 Laurent Renard.
-
-This project includes the software: angular-cookies.js
- Available at: https://github.com/angular/bower-angular-cookies/blob/v1.6.4/LICENSE.md
- Version used: 1.6.4
- Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
- Copyright (c) 2016 Angular
-
-This project includes the software: angular-spinner
- Available at: https://github.com/urish/angular-spinner/tree/0.8.0
- Version used: 0.8.0
- Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
- Copyright (C) 2013, 2014, 2015, Uri Shaked uri@urish.org.
-
-This project includes the software: AngularJS-Toaster
- Available at: https://github.com/jirikavi/AngularJS-Toaster/blob/1.2.0/LICENSE
- Version used: 1.2.0
- Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
- Copyright (c) 2013 jirikavi
-
-This project includes the software: bootswatch
- Available at: https://github.com/thomaspark/bootswatch/blob/v3.3.6/LICENSE
- Version used: 3.3.6
- Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
- Copyright (c) 2013 Thomas Park
-
-This project includes the software: domReady
- Available at: https://github.com/requirejs/domReady/blob/2.0.1/LICENSE
- Version used: 2.0.1
- Used under the following license: The BSD 3-Clause (New BSD) License (http://opensource.org/licenses/BSD-3-Clause)
- Copyright (c) 2010-2011, The Dojo Foundation
-
-This project includes the software: echarts
- Available at: https://github.com/ecomfe/echarts/blob/3.2.2/LICENSE
- Version used: 3.2.2
- Used under the following license: The BSD 3-Clause (New BSD) License (http://opensource.org/licenses/BSD-3-Clause)
- Copyright (c) 2013, Baidu Inc.
-
-This project includes the software: Font Awesome (code)
- Available at: http://fontawesome.io/
- Inclusive of: font-awesome/{css,scss,less}/*
- Version used: 4.7.0
- Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
- Copyright (c) Dave Gandy (2016)
-
-This project includes the software: Font Awesome (fonts)
- Available at: http://fontawesome.io/
- Inclusive of: font-awesome/fonts/*
- Version used: 4.7.0
- Used under the following license: SIL OFL 1.1 (http://scripts.sil.org/OFL)
- Copyright (c) Dave Gandy (2016)
-
-This project includes the software: requirejs
- Available at: https://github.com/requirejs/requirejs/blob/2.1.22/LICENSE
- Version used: 2.1.22
- Used under the following license: The BSD 3-Clause (New BSD) License (http://opensource.org/licenses/BSD-3-Clause)
- Copyright (c) 2010-2015, The Dojo Foundation
-
-```
----------------------------------------------------
-
-(3) Licenses for bundled software
-
-Contents:
-
- The BSD 2-Clause License
- The BSD 3-Clause License ("New BSD")
- The MIT License ("MIT")
-
-
-The BSD 2-Clause License
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-The BSD 3-Clause License ("New BSD")
-
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. Neither the name of the copyright holder nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
-
-The MIT License ("MIT")
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
-
[03/10] incubator-griffin git commit: modify background color and
remove possible illegal licensed background image
Posted by gu...@apache.org.
modify background color and remove possible illegal licensed background image
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/2425e0dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/2425e0dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/2425e0dd
Branch: refs/heads/griffin-0.1.5-incubating-rc2
Commit: 2425e0dd15f7bbc9d94cd36f93430b8a054da85b
Parents: e798e4d
Author: William Guo <gu...@icloud.com>
Authored: Wed Jul 5 08:58:35 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Wed Jul 5 08:58:35 2017 +0800
----------------------------------------------------------------------
ui/login/background.jpg | Bin 225253 -> 0 bytes
ui/login/login.css | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/2425e0dd/ui/login/background.jpg
----------------------------------------------------------------------
diff --git a/ui/login/background.jpg b/ui/login/background.jpg
deleted file mode 100644
index 70e05c1..0000000
Binary files a/ui/login/background.jpg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/2425e0dd/ui/login/login.css
----------------------------------------------------------------------
diff --git a/ui/login/login.css b/ui/login/login.css
index a4956b7..9185e01 100644
--- a/ui/login/login.css
+++ b/ui/login/login.css
@@ -17,7 +17,7 @@ html, body {
}
body {
- background-image: url("./background.jpg");
+ background-color: lightblue;
background-position: center center;
background-repeat: no-repeat;
background-attachment: fixed;
[09/10] incubator-griffin git commit: fix angular animate verison to
1.6.4
Posted by gu...@apache.org.
fix angular animate verison to 1.6.4
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/65ddd975
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/65ddd975
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/65ddd975
Branch: refs/heads/griffin-0.1.5-incubating-rc2
Commit: 65ddd975cff18abc988ec26408ed4cc029a61b78
Parents: 4a915f6
Author: William Guo <gu...@icloud.com>
Authored: Wed Jul 5 11:18:18 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Wed Jul 5 11:18:18 2017 +0800
----------------------------------------------------------------------
ui/bower.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/65ddd975/ui/bower.json
----------------------------------------------------------------------
diff --git a/ui/bower.json b/ui/bower.json
index 6f6ff2e..bd1f8ee 100644
--- a/ui/bower.json
+++ b/ui/bower.json
@@ -14,7 +14,8 @@
"requirejs": "2.1.22",
"domReady": "2.0.1",
"angular-spinner": "0.8.0",
- "echarts": "3.2.2"
+ "echarts": "3.2.2",
+ "angular-animate": "1.6.4"
},
"resolutions": {
"angular": "1.6.4"
[06/10] incubator-griffin git commit: bower angular conflict
resolution
Posted by gu...@apache.org.
bower angular conflict resolution
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/c267949d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/c267949d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/c267949d
Branch: refs/heads/griffin-0.1.5-incubating-rc2
Commit: c267949da23d0f3f6ebfff179a2feb1c5153ed59
Parents: 7722d2d
Author: William Guo <gu...@icloud.com>
Authored: Wed Jul 5 10:13:38 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Wed Jul 5 10:13:38 2017 +0800
----------------------------------------------------------------------
ui/bower.json | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/c267949d/ui/bower.json
----------------------------------------------------------------------
diff --git a/ui/bower.json b/ui/bower.json
index 5677280..6f6ff2e 100644
--- a/ui/bower.json
+++ b/ui/bower.json
@@ -15,5 +15,8 @@
"domReady": "2.0.1",
"angular-spinner": "0.8.0",
"echarts": "3.2.2"
+ },
+ "resolutions": {
+ "angular": "1.6.4"
}
}
[10/10] incubator-griffin git commit: [maven-release-plugin] prepare
release griffin-0.1.5-incubating
Posted by gu...@apache.org.
[maven-release-plugin] prepare release griffin-0.1.5-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/a9bb9231
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/a9bb9231
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/a9bb9231
Branch: refs/heads/griffin-0.1.5-incubating-rc2
Commit: a9bb9231ea424799321a6c063faaeee3c4e91f55
Parents: 65ddd97
Author: William Guo <gu...@icloud.com>
Authored: Wed Jul 5 11:28:27 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Wed Jul 5 11:28:27 2017 +0800
----------------------------------------------------------------------
measure/pom.xml | 2 +-
pom.xml | 4 ++--
service/pom.xml | 2 +-
ui/pom.xml | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/a9bb9231/measure/pom.xml
----------------------------------------------------------------------
diff --git a/measure/pom.xml b/measure/pom.xml
index 02d058b..6fd6dc9 100644
--- a/measure/pom.xml
+++ b/measure/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.griffin</groupId>
<artifactId>griffin-parent</artifactId>
- <version>0.1.5-incubating-SNAPSHOT</version>
+ <version>0.1.5-incubating</version>
</parent>
<artifactId>measure</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/a9bb9231/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d42b636..ab3f358 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.griffin</groupId>
<artifactId>griffin-parent</artifactId>
- <version>0.1.5-incubating-SNAPSHOT</version>
+ <version>0.1.5-incubating</version>
<packaging>pom</packaging>
<name>Apache Griffin ${project.version}</name>
<url>http://griffin.incubator.apache.org</url>
@@ -78,7 +78,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-griffin.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-griffin.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf?p=incubator-griffin.git;a=summary</url>
- <tag>HEAD</tag>
+ <tag>griffin-0.1.5-incubating</tag>
</scm>
<distributionManagement>
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/a9bb9231/service/pom.xml
----------------------------------------------------------------------
diff --git a/service/pom.xml b/service/pom.xml
index e3341dc..1d205b8 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.griffin</groupId>
<artifactId>griffin-parent</artifactId>
- <version>0.1.5-incubating-SNAPSHOT</version>
+ <version>0.1.5-incubating</version>
</parent>
<artifactId>service</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/a9bb9231/ui/pom.xml
----------------------------------------------------------------------
diff --git a/ui/pom.xml b/ui/pom.xml
index 167644d..a47b1c1 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.griffin</groupId>
<artifactId>griffin-parent</artifactId>
- <version>0.1.5-incubating-SNAPSHOT</version>
+ <version>0.1.5-incubating</version>
</parent>
<artifactId>ui</artifactId>
<packaging>pom</packaging>
[04/10] incubator-griffin git commit: Fix LF
Posted by gu...@apache.org.
Fix LF
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/59e81ada
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/59e81ada
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/59e81ada
Branch: refs/heads/griffin-0.1.5-incubating-rc2
Commit: 59e81ada50ab7a512266e73db7c5f77bdb373916
Parents: 2425e0d
Author: William Guo <gu...@icloud.com>
Authored: Wed Jul 5 09:18:29 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Wed Jul 5 09:18:29 2017 +0800
----------------------------------------------------------------------
.../main/resources/application-dev.properties | 41 --------------------
1 file changed, 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/59e81ada/service/src/main/resources/application-dev.properties
----------------------------------------------------------------------
diff --git a/service/src/main/resources/application-dev.properties b/service/src/main/resources/application-dev.properties
deleted file mode 100644
index c380bd9..0000000
--- a/service/src/main/resources/application-dev.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# 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.
-#
-
-spring.datasource.url= jdbc:mysql://localhost:3306/quartz?autoReconnect=true&useSSL=false
-spring.datasource.username =griffin
-spring.datasource.password =123456
-
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-## Hibernate ddl auto (validate,create, create-drop, update)
-
-spring.jpa.hibernate.ddl-auto = update
-spring.jpa.show-sql=true
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
-#
-#
-## Naming strategy
-spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy
-
-# hive metastore
-hive.metastore.uris = thrift://10.9.246.187:9083
-hive.metastore.dbname = default
-
-# kafka schema registry
-kafka.schema.registry.url = http://10.65.159.119:8081
[05/10] incubator-griffin git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-griffin
Posted by gu...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/7722d2d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/7722d2d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/7722d2d6
Branch: refs/heads/griffin-0.1.5-incubating-rc2
Commit: 7722d2d6d7a18f4ab77a0c1d2b979d90753384d2
Parents: 59e81ad 4eee878
Author: William Guo <gu...@icloud.com>
Authored: Wed Jul 5 09:19:44 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Wed Jul 5 09:19:44 2017 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[02/10] incubator-griffin git commit: remove apache license 2 from
treeview.js
Posted by gu...@apache.org.
remove apache license 2 from treeview.js
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/e798e4d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/e798e4d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/e798e4d2
Branch: refs/heads/griffin-0.1.5-incubating-rc2
Commit: e798e4d25f6a7d0d850021084a1410d5243e2d3c
Parents: fdd6d79
Author: William Guo <gu...@icloud.com>
Authored: Wed Jul 5 08:48:11 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Wed Jul 5 08:48:11 2017 +0800
----------------------------------------------------------------------
ui/js/directives/treeview.js | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/e798e4d2/ui/js/directives/treeview.js
----------------------------------------------------------------------
diff --git a/ui/js/directives/treeview.js b/ui/js/directives/treeview.js
index f9a2190..3b7633c 100644
--- a/ui/js/directives/treeview.js
+++ b/ui/js/directives/treeview.js
@@ -1,18 +1,3 @@
-/*-
- * 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
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-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.
-
- */
-
/*
The MIT License (MIT)
@@ -36,8 +21,9 @@ limitations under the License.
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+
/*
- Code copy from https://github.com/eu81273/angular.treeview
+ Made some adaptation and the original copy is from https://github.com/eu81273/angular.treeview
*/
define(['./module'], function (directives) {
'use strict';
[08/10] incubator-griffin git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-griffin
Posted by gu...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-griffin
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/4a915f65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/4a915f65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/4a915f65
Branch: refs/heads/griffin-0.1.5-incubating-rc2
Commit: 4a915f653dcae207dce9c04a99ccf0c0af569689
Parents: 80e9552 ede1914
Author: William Guo <gu...@icloud.com>
Authored: Wed Jul 5 10:48:35 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Wed Jul 5 10:48:35 2017 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------
[07/10] incubator-griffin git commit: update .gitignore
Posted by gu...@apache.org.
update .gitignore
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/80e95529
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/80e95529
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/80e95529
Branch: refs/heads/griffin-0.1.5-incubating-rc2
Commit: 80e955291f4fb04352f639699e562167da2697b4
Parents: c267949
Author: William Guo <gu...@icloud.com>
Authored: Wed Jul 5 10:19:14 2017 +0800
Committer: William Guo <gu...@icloud.com>
Committed: Wed Jul 5 10:19:14 2017 +0800
----------------------------------------------------------------------
.gitignore | 1 -
.../main/resources/application-dev.properties | 41 ++++++++++++++++++++
2 files changed, 41 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/80e95529/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 9ba7afc..1ba27fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,6 @@ target/**
*.ear
target
service/src/main/resources/public/
-service/src/main/resources/application-dev.properties
.project
http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/80e95529/service/src/main/resources/application-dev.properties
----------------------------------------------------------------------
diff --git a/service/src/main/resources/application-dev.properties b/service/src/main/resources/application-dev.properties
new file mode 100644
index 0000000..c380bd9
--- /dev/null
+++ b/service/src/main/resources/application-dev.properties
@@ -0,0 +1,41 @@
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# 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.
+#
+
+spring.datasource.url= jdbc:mysql://localhost:3306/quartz?autoReconnect=true&useSSL=false
+spring.datasource.username =griffin
+spring.datasource.password =123456
+
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+
+## Hibernate ddl auto (validate,create, create-drop, update)
+
+spring.jpa.hibernate.ddl-auto = update
+spring.jpa.show-sql=true
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+#
+#
+## Naming strategy
+spring.jpa.hibernate.naming-strategy = org.hibernate.cfg.ImprovedNamingStrategy
+
+# hive metastore
+hive.metastore.uris = thrift://10.9.246.187:9083
+hive.metastore.dbname = default
+
+# kafka schema registry
+kafka.schema.registry.url = http://10.65.159.119:8081