You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2018/06/26 19:50:03 UTC
[3/4] aries-jax-rs-whiteboard git commit: Proper licenses
Proper licenses
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/ee8f02d8
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/ee8f02d8
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/ee8f02d8
Branch: refs/heads/master
Commit: ee8f02d8d08cb1dd63b34a08eec6ee4590a2c678
Parents: 4c13daf
Author: Carlos Sierra <cs...@apache.org>
Authored: Tue Jun 26 21:46:18 2018 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Tue Jun 26 21:47:45 2018 +0200
----------------------------------------------------------------------
jax-rs.itests-fragment/pom.xml | 17 ++++++++++++
jax-rs.itests-jaxb-json/itest.bndrun | 17 ++++++++++++
jax-rs.itests-jaxb-json/logback.xml | 18 +++++++++++++
jax-rs.itests/itest.bndrun | 17 ++++++++++++
jax-rs.itests/logback.xml | 18 +++++++++++++
.../main/java/test/types/TestAddonConflict.java | 27 +++++++++++---------
.../java/test/types/TestAddonConflict2.java | 27 +++++++++++---------
jax-rs.whiteboard/LICENSE | 7 +++++
jax-rs.whiteboard/README | 9 +++++++
.../src/main/resources/static/index.html | 17 ++++++++++++
.../src/main/resources/static/style.css | 17 ++++++++++++
11 files changed, 167 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ee8f02d8/jax-rs.itests-fragment/pom.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests-fragment/pom.xml b/jax-rs.itests-fragment/pom.xml
index 15a2d85..ffdb91a 100644
--- a/jax-rs.itests-fragment/pom.xml
+++ b/jax-rs.itests-fragment/pom.xml
@@ -1,4 +1,21 @@
<?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
+ 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.
+-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ee8f02d8/jax-rs.itests-jaxb-json/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jaxb-json/itest.bndrun b/jax-rs.itests-jaxb-json/itest.bndrun
index ae50046..5de9f62 100644
--- a/jax-rs.itests-jaxb-json/itest.bndrun
+++ b/jax-rs.itests-jaxb-json/itest.bndrun
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://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.
+
-standalone: ${.}/target/index.xml
-runrequires: \
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ee8f02d8/jax-rs.itests-jaxb-json/logback.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests-jaxb-json/logback.xml b/jax-rs.itests-jaxb-json/logback.xml
index 1952216..b3a37f9 100644
--- a/jax-rs.itests-jaxb-json/logback.xml
+++ b/jax-rs.itests-jaxb-json/logback.xml
@@ -1,3 +1,21 @@
+<?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
+ 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>
<contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
<resetJUL>true</resetJUL>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ee8f02d8/jax-rs.itests/itest.bndrun
----------------------------------------------------------------------
diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun
index 8ad686b..117a0d6 100644
--- a/jax-rs.itests/itest.bndrun
+++ b/jax-rs.itests/itest.bndrun
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://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.
+
-standalone: ${.}/target/index.xml
-runrequires: \
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ee8f02d8/jax-rs.itests/logback.xml
----------------------------------------------------------------------
diff --git a/jax-rs.itests/logback.xml b/jax-rs.itests/logback.xml
index 1952216..b3a37f9 100644
--- a/jax-rs.itests/logback.xml
+++ b/jax-rs.itests/logback.xml
@@ -1,3 +1,21 @@
+<?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
+ 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>
<contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
<resetJUL>true</resetJUL>
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ee8f02d8/jax-rs.itests/src/main/java/test/types/TestAddonConflict.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/types/TestAddonConflict.java b/jax-rs.itests/src/main/java/test/types/TestAddonConflict.java
index 02f96a7..0916681 100644
--- a/jax-rs.itests/src/main/java/test/types/TestAddonConflict.java
+++ b/jax-rs.itests/src/main/java/test/types/TestAddonConflict.java
@@ -1,15 +1,18 @@
-/**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- * <p>
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- * <p>
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+/*
+ * 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 test.types;
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ee8f02d8/jax-rs.itests/src/main/java/test/types/TestAddonConflict2.java
----------------------------------------------------------------------
diff --git a/jax-rs.itests/src/main/java/test/types/TestAddonConflict2.java b/jax-rs.itests/src/main/java/test/types/TestAddonConflict2.java
index c402753..c17f0b6 100644
--- a/jax-rs.itests/src/main/java/test/types/TestAddonConflict2.java
+++ b/jax-rs.itests/src/main/java/test/types/TestAddonConflict2.java
@@ -1,15 +1,18 @@
-/**
- * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
- * <p>
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- * <p>
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
+/*
+ * 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 test.types;
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ee8f02d8/jax-rs.whiteboard/LICENSE
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/LICENSE b/jax-rs.whiteboard/LICENSE
index d645695..e0f9a0a 100644
--- a/jax-rs.whiteboard/LICENSE
+++ b/jax-rs.whiteboard/LICENSE
@@ -200,3 +200,10 @@
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.
+
+This product bundles hightlight.js, by Ivan Sagalaev. For details see
+src/main/resources/static/highlight/LICENSE.
+
+This product bundles github.css, by Vasily Polovnyov. For details see
+src/main/resources/static/highlight/styles/github.css
+
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ee8f02d8/jax-rs.whiteboard/README
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/README b/jax-rs.whiteboard/README
new file mode 100644
index 0000000..2d351e0
--- /dev/null
+++ b/jax-rs.whiteboard/README
@@ -0,0 +1,9 @@
+Apache Aries JAX-RS Whiteboard
+Copyright 2017 The Apache Software Foundation
+
+This product includes software by Ivan Sagalaev in [1] and by Vasily Polovnyov
+in [2]
+
+[1] resources/static/highlight
+[2] resources/static/highlight/styles/github.css
+
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ee8f02d8/jax-rs.whiteboard/src/main/resources/static/index.html
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/resources/static/index.html b/jax-rs.whiteboard/src/main/resources/static/index.html
index 8980475..d2ad805 100644
--- a/jax-rs.whiteboard/src/main/resources/static/index.html
+++ b/jax-rs.whiteboard/src/main/resources/static/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 lang="en">
<head>
<meta charset="utf-8">
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/ee8f02d8/jax-rs.whiteboard/src/main/resources/static/style.css
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/resources/static/style.css b/jax-rs.whiteboard/src/main/resources/static/style.css
index 320c465..0816086 100644
--- a/jax-rs.whiteboard/src/main/resources/static/style.css
+++ b/jax-rs.whiteboard/src/main/resources/static/style.css
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://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,
body {
font-family: Helvetica, Tahoma, sans-serif;