Skip to content

Commit

Permalink
Fix License and Notice entries and headers for all web frontend files…
Browse files Browse the repository at this point in the history
… (css, js, fonts)
  • Loading branch information
StephanEwen committed Jul 28, 2014
1 parent 25b4099 commit ac6fd75
Show file tree
Hide file tree
Showing 11 changed files with 154 additions and 144 deletions.
22 changes: 19 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,8 @@ under the Apache License (v 2.0):
- Jetty Web Container (http:https://www.eclipse.org/jetty/)
- Amazon Web Services SDK for Java (http:https://aws.amazon.com/sdkforjava/)
- ScalaTest (http:https://www.scalatest.org)
- StartBootstrap (http:https://startbootstrap.com)
- CHAP Links Library Timeline (http:https://almende.github.io/chap-links-library/)

-----------------------------------------------------------------------
Eclipse Public License - v 1.0
Expand All @@ -256,10 +258,13 @@ The Apache Flink project depends on and/or bundles the following components
under the The MIT License

- Mockito (http:https://www.mockito.org) - Copyright (c) 2007 Mockito contributors
- SLF4J (http:https://www.slf4j.org/) - Copyright (c) 2004-2013 QOS.ch
- jQuery 1.4.2 (http:https://jquery.com/) - Copyright 2014 jQuery Foundation and other contributors
- SLF4J (http:https://www.slf4j.org) - Copyright (c) 2004-2013 QOS.ch
- jQuery 1.4.2 (http:https://jquery.com) - Copyright 2014 jQuery Foundation and other contributors
- jCanvas 13.11.21 (http:https://calebevans.me/projects/jcanvas/) - Copyright 2014 Caleb Evans
- Flot 0.8.1 (http:https://www.flotcharts.org/) - Copyright (c) 2007-2013 IOLA and Ole Laursen
- Flot 0.8.1 (http:https://www.flotcharts.org) - Copyright (c) 2007-2013 IOLA and Ole Laursen
- Bootstrap (http:https://getbootstrap.com) - Copyright (c) 2011-2014 Twitter, Inc
- Font Awesome - Code (http:https://fortawesome.github.io/Font-Awesome/) - Copyright (c) 2014 Dave Gandy


All rights reserved.

Expand Down Expand Up @@ -331,6 +336,17 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.


-----------------------------------------------------------------------
The Open Font License
-----------------------------------------------------------------------

The Apache Flink project packages the following fonts under the
Open Font License (OFT) - http:https://scripts.sil.org/OFL/

- Font Awesome (http:https://fortawesome.github.io/Font-Awesome/) - Created by Dave Gandy
-> fonts in "flink-runtime/resources/web-docs-infoserver/font-awesome/fonts"


-----------------------------------------------------------------------
For Apache Hadoop Subcomponents
-----------------------------------------------------------------------
Expand Down
34 changes: 25 additions & 9 deletions flink-dist/src/main/flink-bin/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -224,16 +224,18 @@ under the Apache License (v 2.0):
- Apache Commons FileUpload (http:https://commons.apache.org/fileupload/)
- Apache Commons IO (http:https://commons.apache.org/io/)
- Apache Log4J (http:https://logging.apache.org/log4j/1.2/)
- Apache Avro (http:https://avro.apache.org/)
- Apache Avro (http:https://avro.apache.org)
- Apache Hadoop (http:https://hadoop.apache.org)
- Apache Derby (http:https://db.apache.org/derby/)
- Google Guava (https://code.google.com/p/guava-libraries/)
- Netty (http:https://netty.io/)
- Netty (http:https://netty.io)
- Powermock (http:https://www.powermock.org)
- Javassist (http:https://www.javassist.org)
- Jetty Web Container (http:https://www.eclipse.org/jetty)
- Amazon Web Services SDK for Java (http:https://aws.amazon.com/sdkforjava)

- Jetty Web Container (http:https://www.eclipse.org/jetty/)
- Amazon Web Services SDK for Java (http:https://aws.amazon.com/sdkforjava/)
- ScalaTest (http:https://www.scalatest.org)
- StartBootstrap (http:https://startbootstrap.com)
- CHAP Links Library Timeline (http:https://almende.github.io/chap-links-library/)

-----------------------------------------------------------------------
Eclipse Public License - v 1.0
Expand All @@ -256,10 +258,13 @@ The Apache Flink project depends on and/or bundles the following components
under the The MIT License

- Mockito (http:https://www.mockito.org) - Copyright (c) 2007 Mockito contributors
- SLF4J (http:https://www.slf4j.org/) - Copyright (c) 2004-2013 QOS.ch
- jQuery 1.4.2 (http:https://jquery.com/) - Copyright 2014 jQuery Foundation and other contributors
- SLF4J (http:https://www.slf4j.org) - Copyright (c) 2004-2013 QOS.ch
- jQuery 1.4.2 (http:https://jquery.com) - Copyright 2014 jQuery Foundation and other contributors
- jCanvas 13.11.21 (http:https://calebevans.me/projects/jcanvas/) - Copyright 2014 Caleb Evans
- Flot 0.8.1 (http:https://www.flotcharts.org/) - Copyright (c) 2007-2013 IOLA and Ole Laursen
- Flot 0.8.1 (http:https://www.flotcharts.org) - Copyright (c) 2007-2013 IOLA and Ole Laursen
- Bootstrap (http:https://getbootstrap.com) - Copyright (c) 2011-2014 Twitter, Inc
- Font Awesome - Code (http:https://fortawesome.github.io/Font-Awesome/) - Copyright (c) 2014 Dave Gandy


All rights reserved.

Expand Down Expand Up @@ -299,7 +304,7 @@ under BSD-style licenses
- Scala Library (http:https://www.scala-lang.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
- Scala Compiler (BSD-like) - (http:https://www.scala-lang.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
- Scala Compiler Reflect (BSD-like) - (http:https://www.scala-lang.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.

- ASM (BSD-like) - (http:https://asm.ow2.org/) - Copyright (c) 2000-2011 INRIA, France Telecom

(Below is the 3-clause BSD license)

Expand Down Expand Up @@ -331,6 +336,17 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.


-----------------------------------------------------------------------
The Open Font License
-----------------------------------------------------------------------

The Apache Flink project packages the following fonts under the
Open Font License (OFT) - http:https://scripts.sil.org/OFL/

- Font Awesome (http:https://fortawesome.github.io/Font-Awesome/) - Created by Dave Gandy
-> fonts in "resources/web-docs-infoserver/font-awesome/fonts"


-----------------------------------------------------------------------
For Apache Hadoop Subcomponents
-----------------------------------------------------------------------
Expand Down
4 changes: 3 additions & 1 deletion flink-runtime/resources/web-docs-infoserver/analyze.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,13 @@
<script type="text/javascript" src="js/jquery.flot.min.js"></script>
<script type="text/javascript" src="js/helpers.js"></script>
<script type="text/javascript" src="js/jcanvas.min.js"></script>
<script type="text/javascript" src="js/googlejsapi.js"></script>
<script type="text/javascript" src="js/timeline.js"></script>
<script type="text/javascript" src="js/helpers.js"></script>
<script type="text/javascript" src="js/analyzer.js"></script>

<!-- Scripts from Google -->
<script type="text/javascript" src="https://www.google.com/jsapi"></script>

<!-- Load Menu -->
<script type="text/javascript">
$(document).ready(function() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
/*!
* 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:https://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.
*/

.opensub {
cursor: pointer
}
Binary file not shown.
20 changes: 19 additions & 1 deletion flink-runtime/resources/web-docs-infoserver/js/analyzer.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
/*
* 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:https://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.
*/

var jsonGlobal;
var widthProgressbar = 120;

Expand Down Expand Up @@ -292,4 +310,4 @@ function getSelectedRow(timeline) {
}
}
return row;
}
}
17 changes: 17 additions & 0 deletions flink-runtime/resources/web-docs-infoserver/js/configuration.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/*
* 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:https://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.
*/

$(document).ready(function() {
$.ajax({ url : "setupInfo?get=globalC", type : "GET", cache: false, success : function(json) {
Expand Down
Loading

0 comments on commit ac6fd75

Please sign in to comment.