You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2013/04/08 17:49:32 UTC
[4/5] git commit: MARMOTTA-190: clean missing headers
MARMOTTA-190: clean missing headers
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/ec458ce7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/ec458ce7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/ec458ce7
Branch: refs/heads/master
Commit: ec458ce78a14b71768b9a0ac19ee1bde2c0eb418
Parents: d7f7062
Author: Sergio Fernández <wi...@apache.org>
Authored: Mon Apr 8 17:46:49 2013 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Mon Apr 8 17:46:49 2013 +0200
----------------------------------------------------------------------
.../src/main/resources/logback.xml | 47 +++++----------
.../src/main/webapp/WEB-INF/jetty-web.xml | 48 +++++----------
.../src/test/resources/META-INF/beans.xml | 30 +++++-----
.../test/resources/META-INF/test-persistence.xml | 30 +++++-----
.../src/test/resources/WEB-INF/test-web.xml | 30 +++++-----
.../src/test/resources/arquillian.xml | 30 +++++----
.../src/test/resources/ehcache.xml | 32 +++++-----
.../src/test/resources/jndi.properties | 2 -
.../src/test/resources/logback.xml | 30 +++++----
.../src/test/resources/test-config.properties | 4 +-
.../org/apache/marmotta/client/test/demo-data.foaf | 28 ++++-----
.../commons/sesame/model/LiteralCommonsTest.java | 15 -----
.../commons/sesame/model/ResourceUtilsTest.java | 15 -----
.../marmotta/commons/sesame/model/demo-data.foaf | 30 +++++----
.../commons/sesame/rio/ical/TestICalParser.java | 21 +------
.../commons/sesame/rio/rss/TestAtomParser.java | 21 +------
.../commons/sesame/rio/rss/TestRSSParser.java | 21 +------
.../commons/sesame/rio/vcard/TestVCardParser.java | 15 -----
.../Start Apache Marmotta.app/Contents/Info.plist | 29 ++++-----
.../Stop Apache Marmotta.app/Contents/Info.plist | 29 ++++-----
launchers/marmotta-webapp/pom.xml | 1 -
.../src/test/resources/META-INF/beans.xml | 30 +++++-----
.../test/resources/META-INF/test-persistence.xml | 30 +++++-----
.../src/test/resources/WEB-INF/test-web.xml | 30 +++++-----
.../src/test/resources/arquillian.xml | 29 +++++----
.../marmotta-webapp/src/test/resources/ehcache.xml | 32 +++++-----
.../src/test/resources/jndi.properties | 2 -
.../marmotta-webapp/src/test/resources/logback.xml | 30 +++++----
.../src/test/resources/test-config.properties | 4 +-
.../org/apache/marmotta/kiwi/test/demo-data.foaf | 29 +++++----
.../apache/marmotta/kiwi/test/srfg-ontology.rdf | 32 +++++-----
.../marmotta/kiwi/versioning/test/version-base.rdf | 31 +++++-----
.../kiwi/versioning/test/version-update1.rdf | 31 +++++-----
.../kiwi/versioning/test/version-update2.rdf | 31 +++++-----
.../marmotta/ldpath/backend/file/ParserTest.java | 15 -----
.../marmotta/ldpath/backend/file/PathTest.java | 15 -----
.../marmotta/ldpath/backend/file/demo-data.foaf | 30 +++++----
parent/pom.xml | 8 ++-
.../src/test/resources/META-INF/beans.xml | 30 +++++-----
.../src/test/resources/ehcache-db.xml | 32 +++++-----
.../src/test/resources/ehcache-lmf.xml | 32 +++++-----
.../src/test/resources/logback-testing.xml | 30 +++++----
.../marmotta-core/src/test/resources/logback.xml | 30 +++++----
.../platform/core/test/sesame/demo-data.foaf | 30 +++++----
.../marmotta-sparql/src/test/resources/foaf.rdf | 18 +++++-
45 files changed, 491 insertions(+), 628 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/resources/logback.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/resources/logback.xml b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/resources/logback.xml
index e8e468c..1fab29a 100644
--- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/resources/logback.xml
+++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/resources/logback.xml
@@ -1,40 +1,23 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- 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
+ 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.
-
+ 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.
-->
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<!--
- ~ Copyright (c) 2008-2012 Salzburg Research.
- ~
- ~ 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.
- -->
<configuration>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-web.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-web.xml b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-web.xml
index ea15629..0ec4d0e 100644
--- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-web.xml
+++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-web.xml
@@ -1,41 +1,23 @@
-<!--
-
- 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.
-
--->
#set( $symbol_pound = '#' )
#set( $symbol_dollar = '$' )
#set( $symbol_escape = '\' )
+<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (c) 2012 Salzburg Research.
- ~
- ~ 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.
- -->
+ 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.
+-->
<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN"
"http://jetty.mortbay.org/configure.dtd">
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/META-INF/beans.xml b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/META-INF/beans.xml
index 1597d4e..9679e89 100644
--- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/META-INF/beans.xml
+++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/META-INF/beans.xml
@@ -2,22 +2,22 @@
#set( $symbol_dollar = '$' )
#set( $symbol_escape = '\' )
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
- ~ Copyright (c) 2012 Salzburg Research.
- ~
- ~ 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.
- -->
+ 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.
+-->
<beans
xmlns="http://java.sun.com/xml/ns/javaee"
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/META-INF/test-persistence.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/META-INF/test-persistence.xml b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/META-INF/test-persistence.xml
index 626b48f..852b672 100644
--- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/META-INF/test-persistence.xml
+++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/META-INF/test-persistence.xml
@@ -2,22 +2,22 @@
#set( $symbol_dollar = '$' )
#set( $symbol_escape = '\' )
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
- ~ Copyright (c) 2012 Salzburg Research.
- ~
- ~ 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.
- -->
+ 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.
+-->
<persistence xmlns="http://java.sun.com/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/WEB-INF/test-web.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/WEB-INF/test-web.xml b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/WEB-INF/test-web.xml
index 91a1517..7df9500 100644
--- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/WEB-INF/test-web.xml
+++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/WEB-INF/test-web.xml
@@ -2,22 +2,22 @@
#set( $symbol_dollar = '$' )
#set( $symbol_escape = '\' )
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
- ~ Copyright (c) 2012 Salzburg Research.
- ~
- ~ 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.
- -->
+ 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 version="2.5"
xmlns="http://java.sun.com/xml/ns/javaee"
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/arquillian.xml b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/arquillian.xml
index 22aa252..ab814c4 100644
--- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/arquillian.xml
+++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/arquillian.xml
@@ -1,21 +1,23 @@
#set( $symbol_pound = '#' )
#set( $symbol_dollar = '$' )
#set( $symbol_escape = '\' )
+<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (c) 2012 Salzburg Research.
- ~
- ~ 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.
- -->
+ 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.
+-->
<arquillian xmlns="http://jboss.com/arquillian"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/ehcache.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/ehcache.xml b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/ehcache.xml
index c1abc56..9174f6c 100644
--- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/ehcache.xml
+++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/ehcache.xml
@@ -2,22 +2,22 @@
#set( $symbol_dollar = '$' )
#set( $symbol_escape = '\' )
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
- ~ Copyright (c) 2012 Salzburg Research.
- ~
- ~ 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.
- -->
+ 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.
+-->
<!--
CacheManager Configuration
@@ -377,4 +377,4 @@ are "on" and "off". The default is "autodetect".
properties="monitorAddress=localhost, monitorPort=9889" />
-->
-</ehcache>
\ No newline at end of file
+</ehcache>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/jndi.properties b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/jndi.properties
index 4cd6580..56d60e9 100644
--- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/jndi.properties
+++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/jndi.properties
@@ -2,8 +2,6 @@
#set( $symbol_dollar = '$' )
#set( $symbol_escape = '\' )
${symbol_pound}
-${symbol_pound} Copyright (c) 2012 Salzburg Research.
-${symbol_pound}
${symbol_pound} Licensed under the Apache License, Version 2.0 (the "License");
${symbol_pound} you may not use this file except in compliance with the License.
${symbol_pound} You may obtain a copy of the License at
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/logback.xml b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/logback.xml
index e29a317..126540a 100644
--- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/logback.xml
+++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/logback.xml
@@ -1,21 +1,23 @@
#set( $symbol_pound = '#' )
#set( $symbol_dollar = '$' )
#set( $symbol_escape = '\' )
+<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (c) 2012 Salzburg Research.
- ~
- ~ 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.
- -->
+ 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.
+-->
<configuration>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/test-config.properties
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/test-config.properties b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/test-config.properties
index 1b8e0e6..1375ee9 100644
--- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/test-config.properties
+++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/test/resources/test-config.properties
@@ -2,8 +2,6 @@
#set( $symbol_dollar = '$' )
#set( $symbol_escape = '\' )
${symbol_pound}
-${symbol_pound} Copyright (c) 2012 Salzburg Research.
-${symbol_pound}
${symbol_pound} Licensed under the Apache License, Version 2.0 (the "License");
${symbol_pound} you may not use this file except in compliance with the License.
${symbol_pound} You may obtain a copy of the License at
@@ -73,4 +71,4 @@ renderlets.annotation.source=
renderlets.annotation.xom=kiwi.service.render.renderlet.HtmlLinkRenderlet,${symbol_escape}
kiwi.service.render.renderlet.AnnotationLinksRenderlet
-renderlets.media=
\ No newline at end of file
+renderlets.media=
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/client/marmotta-client-java/src/test/resources/org/apache/marmotta/client/test/demo-data.foaf
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/src/test/resources/org/apache/marmotta/client/test/demo-data.foaf b/client/marmotta-client-java/src/test/resources/org/apache/marmotta/client/test/demo-data.foaf
index 3528b48..f4f870a 100644
--- a/client/marmotta-client-java/src/test/resources/org/apache/marmotta/client/test/demo-data.foaf
+++ b/client/marmotta-client-java/src/test/resources/org/apache/marmotta/client/test/demo-data.foaf
@@ -1,18 +1,16 @@
-<!--
- ~ Copyright (c) 2012 Salzburg Research.
- ~
- ~ 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.
- -->
+<!--~
+ 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.
+-->
<rdf:RDF
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/commons/marmotta-commons/src/test/java/org/apache/marmotta/commons/sesame/model/LiteralCommonsTest.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/test/java/org/apache/marmotta/commons/sesame/model/LiteralCommonsTest.java b/commons/marmotta-commons/src/test/java/org/apache/marmotta/commons/sesame/model/LiteralCommonsTest.java
index b872071..9cad20a 100644
--- a/commons/marmotta-commons/src/test/java/org/apache/marmotta/commons/sesame/model/LiteralCommonsTest.java
+++ b/commons/marmotta-commons/src/test/java/org/apache/marmotta/commons/sesame/model/LiteralCommonsTest.java
@@ -16,21 +16,6 @@
* limitations under the License.
*/
package org.apache.marmotta.commons.sesame.model;
-/*
- * Copyright (c) 2012 Salzburg Research.
- *
- * 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.
- */
import org.apache.commons.lang.RandomStringUtils;
import org.apache.marmotta.commons.sesame.model.LiteralCommons;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/commons/marmotta-commons/src/test/java/org/apache/marmotta/commons/sesame/model/ResourceUtilsTest.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/test/java/org/apache/marmotta/commons/sesame/model/ResourceUtilsTest.java b/commons/marmotta-commons/src/test/java/org/apache/marmotta/commons/sesame/model/ResourceUtilsTest.java
index d849e4d..7a99a18 100644
--- a/commons/marmotta-commons/src/test/java/org/apache/marmotta/commons/sesame/model/ResourceUtilsTest.java
+++ b/commons/marmotta-commons/src/test/java/org/apache/marmotta/commons/sesame/model/ResourceUtilsTest.java
@@ -16,21 +16,6 @@
* limitations under the License.
*/
package org.apache.marmotta.commons.sesame.model;
-/*
- * Copyright (c) 2012 Salzburg Research.
- *
- * 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.
- */
import static org.hamcrest.CoreMatchers.allOf;
import static org.hamcrest.CoreMatchers.anyOf;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/commons/marmotta-commons/src/test/resources/org/apache/marmotta/commons/sesame/model/demo-data.foaf
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/test/resources/org/apache/marmotta/commons/sesame/model/demo-data.foaf b/commons/marmotta-commons/src/test/resources/org/apache/marmotta/commons/sesame/model/demo-data.foaf
index 37694c3..14ec6c8 100644
--- a/commons/marmotta-commons/src/test/resources/org/apache/marmotta/commons/sesame/model/demo-data.foaf
+++ b/commons/marmotta-commons/src/test/resources/org/apache/marmotta/commons/sesame/model/demo-data.foaf
@@ -1,18 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (c) 2012 Salzburg Research.
- ~
- ~ 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.
- -->
+ 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.
+-->
<rdf:RDF
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/commons/sesame-tools-rio-ical/src/test/java/org/apache/marmotta/commons/sesame/rio/ical/TestICalParser.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-ical/src/test/java/org/apache/marmotta/commons/sesame/rio/ical/TestICalParser.java b/commons/sesame-tools-rio-ical/src/test/java/org/apache/marmotta/commons/sesame/rio/ical/TestICalParser.java
index fad8bd0..961665f 100644
--- a/commons/sesame-tools-rio-ical/src/test/java/org/apache/marmotta/commons/sesame/rio/ical/TestICalParser.java
+++ b/commons/sesame-tools-rio-ical/src/test/java/org/apache/marmotta/commons/sesame/rio/ical/TestICalParser.java
@@ -1,24 +1,4 @@
-/**
- * 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.
- */
-package org.apache.marmotta.commons.sesame.rio.ical;
/*
- * Copyright (c) 2012 Salzburg Research.
- *
* 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
@@ -31,6 +11,7 @@ package org.apache.marmotta.commons.sesame.rio.ical;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.marmotta.commons.sesame.rio.ical;
import static java.util.Arrays.asList;
import static org.hamcrest.CoreMatchers.everyItem;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestAtomParser.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestAtomParser.java b/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestAtomParser.java
index c373c5a..311daec 100644
--- a/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestAtomParser.java
+++ b/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestAtomParser.java
@@ -1,24 +1,4 @@
-/**
- * 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.
- */
-package org.apache.marmotta.commons.sesame.rio.rss;
/*
- * Copyright (c) 2012 Salzburg Research.
- *
* 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
@@ -31,6 +11,7 @@ package org.apache.marmotta.commons.sesame.rio.rss;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.marmotta.commons.sesame.rio.rss;
import static java.util.Arrays.asList;
import static org.hamcrest.CoreMatchers.everyItem;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestRSSParser.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestRSSParser.java b/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestRSSParser.java
index 44f09a1..305f016 100644
--- a/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestRSSParser.java
+++ b/commons/sesame-tools-rio-rss/src/test/java/org/apache/marmotta/commons/sesame/rio/rss/TestRSSParser.java
@@ -1,24 +1,4 @@
-/**
- * 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.
- */
-package org.apache.marmotta.commons.sesame.rio.rss;
/*
- * Copyright (c) 2012 Salzburg Research.
- *
* 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
@@ -31,6 +11,7 @@ package org.apache.marmotta.commons.sesame.rio.rss;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.marmotta.commons.sesame.rio.rss;
import static java.util.Arrays.asList;
import static org.hamcrest.CoreMatchers.everyItem;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/commons/sesame-tools-rio-vcard/src/test/java/org/apache/marmotta/commons/sesame/rio/vcard/TestVCardParser.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-vcard/src/test/java/org/apache/marmotta/commons/sesame/rio/vcard/TestVCardParser.java b/commons/sesame-tools-rio-vcard/src/test/java/org/apache/marmotta/commons/sesame/rio/vcard/TestVCardParser.java
index f969b51..c34d92a 100644
--- a/commons/sesame-tools-rio-vcard/src/test/java/org/apache/marmotta/commons/sesame/rio/vcard/TestVCardParser.java
+++ b/commons/sesame-tools-rio-vcard/src/test/java/org/apache/marmotta/commons/sesame/rio/vcard/TestVCardParser.java
@@ -16,21 +16,6 @@
* limitations under the License.
*/
package org.apache.marmotta.commons.sesame.rio.vcard;
-/*
- * Copyright (c) 2012 Salzburg Research.
- *
- * 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.
- */
import static java.util.Arrays.asList;
import static org.hamcrest.CoreMatchers.everyItem;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/launchers/marmotta-installer/src/main/resources/macos/Start Apache Marmotta.app/Contents/Info.plist
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/macos/Start Apache Marmotta.app/Contents/Info.plist b/launchers/marmotta-installer/src/main/resources/macos/Start Apache Marmotta.app/Contents/Info.plist
index 632e5f5..c1cd022 100644
--- a/launchers/marmotta-installer/src/main/resources/macos/Start Apache Marmotta.app/Contents/Info.plist
+++ b/launchers/marmotta-installer/src/main/resources/macos/Start Apache Marmotta.app/Contents/Info.plist
@@ -1,21 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
- ~ Copyright (c) 2008-2012 Salzburg Research.
- ~
- ~ 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.
- -->
+ 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.
+-->
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/launchers/marmotta-installer/src/main/resources/macos/Stop Apache Marmotta.app/Contents/Info.plist
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/src/main/resources/macos/Stop Apache Marmotta.app/Contents/Info.plist b/launchers/marmotta-installer/src/main/resources/macos/Stop Apache Marmotta.app/Contents/Info.plist
index 54f36ec..3e2a33c 100644
--- a/launchers/marmotta-installer/src/main/resources/macos/Stop Apache Marmotta.app/Contents/Info.plist
+++ b/launchers/marmotta-installer/src/main/resources/macos/Stop Apache Marmotta.app/Contents/Info.plist
@@ -1,21 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
- ~ Copyright (c) 2008-2012 Salzburg Research.
- ~
- ~ 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.
- -->
+ 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.
+-->
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index 43cb57d..94366d8 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -286,7 +286,6 @@
<dependency>
<groupId>com.thetransactioncompany</groupId>
<artifactId>cors-filter</artifactId>
- <version>1.3.2</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/launchers/marmotta-webapp/src/test/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/test/resources/META-INF/beans.xml b/launchers/marmotta-webapp/src/test/resources/META-INF/beans.xml
index 4e44c49..6504987 100644
--- a/launchers/marmotta-webapp/src/test/resources/META-INF/beans.xml
+++ b/launchers/marmotta-webapp/src/test/resources/META-INF/beans.xml
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
- ~ Copyright (c) 2012 Salzburg Research.
- ~
- ~ 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.
- -->
+ 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.
+-->
<beans
xmlns="http://java.sun.com/xml/ns/javaee"
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/launchers/marmotta-webapp/src/test/resources/META-INF/test-persistence.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/test/resources/META-INF/test-persistence.xml b/launchers/marmotta-webapp/src/test/resources/META-INF/test-persistence.xml
index 7cb20e9..1043848 100644
--- a/launchers/marmotta-webapp/src/test/resources/META-INF/test-persistence.xml
+++ b/launchers/marmotta-webapp/src/test/resources/META-INF/test-persistence.xml
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
- ~ Copyright (c) 2012 Salzburg Research.
- ~
- ~ 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.
- -->
+ 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.
+-->
<persistence xmlns="http://java.sun.com/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/launchers/marmotta-webapp/src/test/resources/WEB-INF/test-web.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/test/resources/WEB-INF/test-web.xml b/launchers/marmotta-webapp/src/test/resources/WEB-INF/test-web.xml
index 6b545e0..7c88ab0 100644
--- a/launchers/marmotta-webapp/src/test/resources/WEB-INF/test-web.xml
+++ b/launchers/marmotta-webapp/src/test/resources/WEB-INF/test-web.xml
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
- ~ Copyright (c) 2012 Salzburg Research.
- ~
- ~ 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.
- -->
+ 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 version="2.5"
xmlns="http://java.sun.com/xml/ns/javaee"
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/launchers/marmotta-webapp/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/test/resources/arquillian.xml b/launchers/marmotta-webapp/src/test/resources/arquillian.xml
index dd0594c..379bb29 100644
--- a/launchers/marmotta-webapp/src/test/resources/arquillian.xml
+++ b/launchers/marmotta-webapp/src/test/resources/arquillian.xml
@@ -1,18 +1,19 @@
<!--
- ~ Copyright (c) 2012 Salzburg Research.
- ~
- ~ 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.
- -->
+ 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.
+-->
<arquillian xmlns="http://jboss.com/arquillian"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/launchers/marmotta-webapp/src/test/resources/ehcache.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/test/resources/ehcache.xml b/launchers/marmotta-webapp/src/test/resources/ehcache.xml
index 30cc789..727aef0 100644
--- a/launchers/marmotta-webapp/src/test/resources/ehcache.xml
+++ b/launchers/marmotta-webapp/src/test/resources/ehcache.xml
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
- ~ Copyright (c) 2012 Salzburg Research.
- ~
- ~ 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.
- -->
+ 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.
+-->
<!--
CacheManager Configuration
@@ -374,4 +374,4 @@ are "on" and "off". The default is "autodetect".
properties="monitorAddress=localhost, monitorPort=9889" />
-->
-</ehcache>
\ No newline at end of file
+</ehcache>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/launchers/marmotta-webapp/src/test/resources/jndi.properties
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/test/resources/jndi.properties b/launchers/marmotta-webapp/src/test/resources/jndi.properties
index 19e67c7..72a02c6 100644
--- a/launchers/marmotta-webapp/src/test/resources/jndi.properties
+++ b/launchers/marmotta-webapp/src/test/resources/jndi.properties
@@ -1,6 +1,4 @@
#
-# Copyright (c) 2012 Salzburg Research.
-#
# 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://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/launchers/marmotta-webapp/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/test/resources/logback.xml b/launchers/marmotta-webapp/src/test/resources/logback.xml
index 7cf9566..19b0144 100644
--- a/launchers/marmotta-webapp/src/test/resources/logback.xml
+++ b/launchers/marmotta-webapp/src/test/resources/logback.xml
@@ -1,18 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (c) 2012 Salzburg Research.
- ~
- ~ 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.
- -->
+ 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.
+-->
<configuration>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/launchers/marmotta-webapp/src/test/resources/test-config.properties
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/src/test/resources/test-config.properties b/launchers/marmotta-webapp/src/test/resources/test-config.properties
index 849cb90..1ac0b04 100644
--- a/launchers/marmotta-webapp/src/test/resources/test-config.properties
+++ b/launchers/marmotta-webapp/src/test/resources/test-config.properties
@@ -1,6 +1,4 @@
#
-# Copyright (c) 2012 Salzburg Research.
-#
# 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
@@ -70,4 +68,4 @@ renderlets.annotation.source=
renderlets.annotation.xom=kiwi.service.render.renderlet.HtmlLinkRenderlet,\
kiwi.service.render.renderlet.AnnotationLinksRenderlet
-renderlets.media=
\ No newline at end of file
+renderlets.media=
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/libraries/kiwi/kiwi-transactions/src/test/resources/org/apache/marmotta/kiwi/test/demo-data.foaf
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-transactions/src/test/resources/org/apache/marmotta/kiwi/test/demo-data.foaf b/libraries/kiwi/kiwi-transactions/src/test/resources/org/apache/marmotta/kiwi/test/demo-data.foaf
index 00f62fa..1b7695a 100644
--- a/libraries/kiwi/kiwi-transactions/src/test/resources/org/apache/marmotta/kiwi/test/demo-data.foaf
+++ b/libraries/kiwi/kiwi-transactions/src/test/resources/org/apache/marmotta/kiwi/test/demo-data.foaf
@@ -1,19 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (c) 2013 Salzburg Research.
- ~
- ~ 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.
- -->
+ 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.
+-->
<rdf:RDF
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:foaf="http://xmlns.com/foaf/0.1/"
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/libraries/kiwi/kiwi-transactions/src/test/resources/org/apache/marmotta/kiwi/test/srfg-ontology.rdf
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-transactions/src/test/resources/org/apache/marmotta/kiwi/test/srfg-ontology.rdf b/libraries/kiwi/kiwi-transactions/src/test/resources/org/apache/marmotta/kiwi/test/srfg-ontology.rdf
index e14002f..14e3ed1 100644
--- a/libraries/kiwi/kiwi-transactions/src/test/resources/org/apache/marmotta/kiwi/test/srfg-ontology.rdf
+++ b/libraries/kiwi/kiwi-transactions/src/test/resources/org/apache/marmotta/kiwi/test/srfg-ontology.rdf
@@ -1,22 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (c) 2013 Salzburg Research.
- ~
- ~ 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.
- -->
-
+ 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.
+-->
<!DOCTYPE rdf:RDF [
<!ENTITY lmf "http://localhost:8080/LMF/resource/">]>
-
<rdf:RDF
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-base.rdf
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-base.rdf b/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-base.rdf
index f15e108..b21cdb7 100644
--- a/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-base.rdf
+++ b/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-base.rdf
@@ -1,19 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (c) 2013 Salzburg Research.
- ~
- ~ 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.
- -->
+ 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.
+-->
<rdf:RDF
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:ns1="http://marmotta.incubator.apache.org/testing/ns1/">
@@ -22,4 +23,4 @@
<ns1:P2>property 2 value 1</ns1:P2>
</ns1:C>
-</rdf:RDF>
\ No newline at end of file
+</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-update1.rdf
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-update1.rdf b/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-update1.rdf
index 1f94210..d7d3ab4 100644
--- a/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-update1.rdf
+++ b/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-update1.rdf
@@ -1,19 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (c) 2013 Salzburg Research.
- ~
- ~ 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.
- -->
+ 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.
+-->
<rdf:RDF
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:ns1="http://marmotta.incubator.apache.org/testing/ns1/">
@@ -22,4 +23,4 @@
<ns1:P3>property 3 value 2</ns1:P3>
</ns1:C>
-</rdf:RDF>
\ No newline at end of file
+</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-update2.rdf
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-update2.rdf b/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-update2.rdf
index ab083fb..913b6a3 100644
--- a/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-update2.rdf
+++ b/libraries/kiwi/kiwi-versioning/src/test/resources/org/apache/marmotta/kiwi/versioning/test/version-update2.rdf
@@ -1,19 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (c) 2013 Salzburg Research.
- ~
- ~ 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.
- -->
+ 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.
+-->
<rdf:RDF
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:ns1="http://marmotta.incubator.apache.org/testing/ns1/">
@@ -21,4 +22,4 @@
<ns1:P3>property 3 value 1</ns1:P3>
</ns1:C>
-</rdf:RDF>
\ No newline at end of file
+</rdf:RDF>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/libraries/ldpath/ldpath-backend-file/src/test/java/org/apache/marmotta/ldpath/backend/file/ParserTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-file/src/test/java/org/apache/marmotta/ldpath/backend/file/ParserTest.java b/libraries/ldpath/ldpath-backend-file/src/test/java/org/apache/marmotta/ldpath/backend/file/ParserTest.java
index a30029d..d2304ac 100644
--- a/libraries/ldpath/ldpath-backend-file/src/test/java/org/apache/marmotta/ldpath/backend/file/ParserTest.java
+++ b/libraries/ldpath/ldpath-backend-file/src/test/java/org/apache/marmotta/ldpath/backend/file/ParserTest.java
@@ -16,21 +16,6 @@
* limitations under the License.
*/
package org.apache.marmotta.ldpath.backend.file;
-/*
- * Copyright (c) 2011 Salzburg Research.
- *
- * 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.
- */
import java.io.StringReader;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/libraries/ldpath/ldpath-backend-file/src/test/java/org/apache/marmotta/ldpath/backend/file/PathTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-file/src/test/java/org/apache/marmotta/ldpath/backend/file/PathTest.java b/libraries/ldpath/ldpath-backend-file/src/test/java/org/apache/marmotta/ldpath/backend/file/PathTest.java
index 6ccf825..773c439 100644
--- a/libraries/ldpath/ldpath-backend-file/src/test/java/org/apache/marmotta/ldpath/backend/file/PathTest.java
+++ b/libraries/ldpath/ldpath-backend-file/src/test/java/org/apache/marmotta/ldpath/backend/file/PathTest.java
@@ -16,21 +16,6 @@
* limitations under the License.
*/
package org.apache.marmotta.ldpath.backend.file;
-/*
- * Copyright (c) 2011 Salzburg Research.
- *
- * 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.
- */
import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.hasItems;
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/libraries/ldpath/ldpath-backend-file/src/test/resources/org/apache/marmotta/ldpath/backend/file/demo-data.foaf
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-file/src/test/resources/org/apache/marmotta/ldpath/backend/file/demo-data.foaf b/libraries/ldpath/ldpath-backend-file/src/test/resources/org/apache/marmotta/ldpath/backend/file/demo-data.foaf
index c80c76e..9a47c22 100644
--- a/libraries/ldpath/ldpath-backend-file/src/test/resources/org/apache/marmotta/ldpath/backend/file/demo-data.foaf
+++ b/libraries/ldpath/ldpath-backend-file/src/test/resources/org/apache/marmotta/ldpath/backend/file/demo-data.foaf
@@ -1,18 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (c) 2011 Salzburg Research.
- ~
- ~ 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.
- -->
+ 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.
+-->
<rdf:RDF
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ecf64e9..d0b74f2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1439,6 +1439,13 @@
</dependency>
</dependencies>
+ <!-- CORS filter -->
+ <dependency>
+ <groupId>com.thetransactioncompany</groupId>
+ <artifactId>cors-filter</artifactId>
+ <version>1.5.1</version>
+ </dependency>
+
</dependencyManagement>
<dependencies>
@@ -1466,7 +1473,6 @@
</dependency>
</dependencies>
-
<profiles>
<profile>
<!-- for signing artifacts with the GPG key on deploy -->
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/platform/marmotta-core/src/test/resources/META-INF/beans.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/test/resources/META-INF/beans.xml b/platform/marmotta-core/src/test/resources/META-INF/beans.xml
index 4e44c49..6504987 100644
--- a/platform/marmotta-core/src/test/resources/META-INF/beans.xml
+++ b/platform/marmotta-core/src/test/resources/META-INF/beans.xml
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
- ~ Copyright (c) 2012 Salzburg Research.
- ~
- ~ 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.
- -->
+ 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.
+-->
<beans
xmlns="http://java.sun.com/xml/ns/javaee"
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/platform/marmotta-core/src/test/resources/ehcache-db.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/test/resources/ehcache-db.xml b/platform/marmotta-core/src/test/resources/ehcache-db.xml
index 1e9832f..ad838b2 100644
--- a/platform/marmotta-core/src/test/resources/ehcache-db.xml
+++ b/platform/marmotta-core/src/test/resources/ehcache-db.xml
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
- ~ Copyright (c) 2008-2012 Salzburg Research.
- ~
- ~ 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.
- -->
+ 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.
+-->
<!--
CacheManager Configuration
@@ -448,4 +448,4 @@ are "on" and "off". The default is "autodetect".
properties="monitorAddress=localhost, monitorPort=9889" />
-->
-</ehcache>
\ No newline at end of file
+</ehcache>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ec458ce7/platform/marmotta-core/src/test/resources/ehcache-lmf.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/test/resources/ehcache-lmf.xml b/platform/marmotta-core/src/test/resources/ehcache-lmf.xml
index 70ceec0..824d596 100644
--- a/platform/marmotta-core/src/test/resources/ehcache-lmf.xml
+++ b/platform/marmotta-core/src/test/resources/ehcache-lmf.xml
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
- ~ Copyright (c) 2012 Salzburg Research.
- ~
- ~ 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.
- -->
+ 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.
+-->
<!--
CacheManager Configuration
@@ -414,4 +414,4 @@ are "on" and "off". The default is "autodetect".
properties="monitorAddress=localhost, monitorPort=9889" />
-->
-</ehcache>
\ No newline at end of file
+</ehcache>