You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2016/11/13 18:50:49 UTC
[4/9] incubator-guacamole-client git commit: GUACAMOLE-119: Add
Apache license boilerplate to example project. Remove META-INF.
GUACAMOLE-119: Add Apache license boilerplate to example project. Remove META-INF.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/44516e4d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/44516e4d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/44516e4d
Branch: refs/heads/master
Commit: 44516e4de4d678d0a07525d8c894ed07fbb5645f
Parents: 4241e8c
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Nov 12 17:56:54 2016 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Nov 12 18:16:47 2016 -0800
----------------------------------------------------------------------
doc/guacamole-example/.gitignore | 1 +
.../src/main/webapp/META-INF/context.xml | 2 --
doc/guacamole-example/src/main/webapp/index.html | 19 ++++++++++++++++++-
3 files changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/44516e4d/doc/guacamole-example/.gitignore
----------------------------------------------------------------------
diff --git a/doc/guacamole-example/.gitignore b/doc/guacamole-example/.gitignore
index 42f4a1a..c352b37 100644
--- a/doc/guacamole-example/.gitignore
+++ b/doc/guacamole-example/.gitignore
@@ -1,2 +1,3 @@
+src/main/webapp/META-INF/
target/
*~
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/44516e4d/doc/guacamole-example/src/main/webapp/META-INF/context.xml
----------------------------------------------------------------------
diff --git a/doc/guacamole-example/src/main/webapp/META-INF/context.xml b/doc/guacamole-example/src/main/webapp/META-INF/context.xml
deleted file mode 100644
index 5bee3dc..0000000
--- a/doc/guacamole-example/src/main/webapp/META-INF/context.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Context antiJARLocking="true" path=""/>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/44516e4d/doc/guacamole-example/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/doc/guacamole-example/src/main/webapp/index.html b/doc/guacamole-example/src/main/webapp/index.html
index 6b31813..5a513a6 100644
--- a/doc/guacamole-example/src/main/webapp/index.html
+++ b/doc/guacamole-example/src/main/webapp/index.html
@@ -1,5 +1,22 @@
<!DOCTYPE HTML>
-
+<!--
+ 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.
+-->
<html>
<head>