You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by rv...@apache.org on 2014/10/23 15:20:02 UTC
[10/14] git commit: Get Fuseki2 passing the RAT checks
Get Fuseki2 passing the RAT checks
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e6a64104
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e6a64104
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e6a64104
Branch: refs/heads/hadoop-rdf
Commit: e6a64104a869f0323293953d232ca388dc7b31f6
Parents: d54be97
Author: Rob Vesse <rv...@apache.org>
Authored: Thu Oct 23 14:01:30 2014 +0100
Committer: Rob Vesse <rv...@apache.org>
Committed: Thu Oct 23 14:01:30 2014 +0100
----------------------------------------------------------------------
jena-fuseki2/src/main/resources/log4j.properties | 2 ++
.../org/apache/jena/fuseki/server/config.ttl | 4 +++-
.../org/apache/jena/fuseki/server/shiro.ini | 2 ++
jena-fuseki2/src/main/webapp/WEB-INF/web.xml | 16 ++++++++++++++++
jena-parent/pom.xml | 4 +++-
5 files changed, 26 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/e6a64104/jena-fuseki2/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/jena-fuseki2/src/main/resources/log4j.properties b/jena-fuseki2/src/main/resources/log4j.properties
index cf2ef71..6da6301 100644
--- a/jena-fuseki2/src/main/resources/log4j.properties
+++ b/jena-fuseki2/src/main/resources/log4j.properties
@@ -1,3 +1,5 @@
+# Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
+
# Plain output to stdout
log4j.appender.jena.plainstdout=org.apache.log4j.ConsoleAppender
log4j.appender.jena.plainstdout.target=System.out
http://git-wip-us.apache.org/repos/asf/jena/blob/e6a64104/jena-fuseki2/src/main/resources/org/apache/jena/fuseki/server/config.ttl
----------------------------------------------------------------------
diff --git a/jena-fuseki2/src/main/resources/org/apache/jena/fuseki/server/config.ttl b/jena-fuseki2/src/main/resources/org/apache/jena/fuseki/server/config.ttl
index dd0eb89..7b9ac5b 100644
--- a/jena-fuseki2/src/main/resources/org/apache/jena/fuseki/server/config.ttl
+++ b/jena-fuseki2/src/main/resources/org/apache/jena/fuseki/server/config.ttl
@@ -1,4 +1,6 @@
-## Fuseki Server configuation file.
+# Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
+
+## Fuseki Server configuration file.
@prefix : <#> .
@prefix fuseki: <http://jena.apache.org/fuseki#> .
http://git-wip-us.apache.org/repos/asf/jena/blob/e6a64104/jena-fuseki2/src/main/resources/org/apache/jena/fuseki/server/shiro.ini
----------------------------------------------------------------------
diff --git a/jena-fuseki2/src/main/resources/org/apache/jena/fuseki/server/shiro.ini b/jena-fuseki2/src/main/resources/org/apache/jena/fuseki/server/shiro.ini
index c5561f9..0395070 100644
--- a/jena-fuseki2/src/main/resources/org/apache/jena/fuseki/server/shiro.ini
+++ b/jena-fuseki2/src/main/resources/org/apache/jena/fuseki/server/shiro.ini
@@ -1,3 +1,5 @@
+# Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
+
[main]
# Development
ssl.enabled = false
http://git-wip-us.apache.org/repos/asf/jena/blob/e6a64104/jena-fuseki2/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/src/main/webapp/WEB-INF/web.xml b/jena-fuseki2/src/main/webapp/WEB-INF/web.xml
index f3db445..2e6ec18 100644
--- a/jena-fuseki2/src/main/webapp/WEB-INF/web.xml
+++ b/jena-fuseki2/src/main/webapp/WEB-INF/web.xml
@@ -1,4 +1,20 @@
<?xml version="1.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.
+-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
http://git-wip-us.apache.org/repos/asf/jena/blob/e6a64104/jena-parent/pom.xml
----------------------------------------------------------------------
diff --git a/jena-parent/pom.xml b/jena-parent/pom.xml
index cbe3dde..8ce6282 100644
--- a/jena-parent/pom.xml
+++ b/jena-parent/pom.xml
@@ -338,11 +338,13 @@
<exclude>**/dist/ABOUT</exclude>
<exclude>**/SEE_FUSEKI2</exclude>
<!--
- Need to exclude CSS since much of it comes from other Apache licensed projects
+ Need to exclude JS and CSS since much of it comes from other Apache licensed projects
e.g. Bootstrap, Qonsole
-->
<exclude>**/src/main/webapp/css/*</exclude>
+ <exclude>**/src/main/webapp/fonts/*</exclude>
+ <exclude>**/src/main/webapp/js/**/*</exclude>
<!-- General exclusions -->
<!--