[OLINGO-834] Adjust LICENSE file I removed the Antlr and treelayout bsd license.
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/53d2e8bb Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/53d2e8bb Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/53d2e8bb Branch: refs/heads/master Commit: 53d2e8bb8c81433a96a235b8a0f8a485278cd0b6 Parents: 40be3e4 Author: Christian Amend <[email protected]> Authored: Fri Jan 8 10:03:04 2016 +0100 Committer: Christian Amend <[email protected]> Committed: Fri Jan 8 10:03:04 2016 +0100 ---------------------------------------------------------------------- dist/server-lib/src/main/resources/LICENSE | 67 -------------------- dist/server-lib/src/main/resources/NOTICE | 31 +-------- fit/pom.xml | 1 - .../olingo/server/core/uri/parser/RawUri.java | 46 -------------- .../queryoption/expression/ExpressionImpl.java | 25 -------- 5 files changed, 1 insertion(+), 169 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53d2e8bb/dist/server-lib/src/main/resources/LICENSE ---------------------------------------------------------------------- diff --git a/dist/server-lib/src/main/resources/LICENSE b/dist/server-lib/src/main/resources/LICENSE index f858fe4..1685307 100644 --- a/dist/server-lib/src/main/resources/LICENSE +++ b/dist/server-lib/src/main/resources/LICENSE @@ -205,73 +205,6 @@ See the License for the specific language governing permissions and limitations under the License. -From: 'abego Software GmbH, Germany' (http://abego-software.de) - abego -TreeLayout Core (http://code.google.com/p/treelayout/) -org.abego.treelayout:org.abego.treelayout.core:jar:1.0.1 License: BSD 3-Clause -"New" or "Revised" License (BSD-3-Clause) -(http://treelayout.googlecode.com/files/LICENSE.TXT) - -[The "BSD license"] -Copyright (c) 2011, abego Software GmbH, Germany (http://www.abego.org) -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. -3. Neither the name of the abego Software GmbH nor the names of its - contributors may be used to endorse or promote products derived from this - software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - - - - -From: 'ANTLR' (http://www.antlr.org) - ANTLR 4 Runtime -(http://www.antlr.org/antlr4-runtime) org.antlr:antlr4-runtime:jar:4.1 License: -The BSD License (http://www.antlr.org/license.html) - -[The BSD License] -Copyright (c) 2012 Terence Parr and Sam Harwell -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. Redistributions in binary - form must reproduce the above copyright notice, this list of conditions and - the following disclaimer in the documentation and/or other materials - provided with the distribution. Neither the name of the author nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - From: 'fasterxml.com' (http://fasterxml.com) - Stax2 API (http://wiki.fasterxml.com/WoodstoxStax2) org.codehaus.woodstox:stax2-api:bundle:3.1.4 License: The BSD License http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53d2e8bb/dist/server-lib/src/main/resources/NOTICE ---------------------------------------------------------------------- diff --git a/dist/server-lib/src/main/resources/NOTICE b/dist/server-lib/src/main/resources/NOTICE index 5a87ef7..bb34cf8 100644 --- a/dist/server-lib/src/main/resources/NOTICE +++ b/dist/server-lib/src/main/resources/NOTICE @@ -18,33 +18,4 @@ FasterXML.com (http://fasterxml.com). ## Credits A list of contributors may be found from CREDITS file, which is included in some artifacts (usually source distributions); but is always available -from the source code management (SCM) system project uses. - -This distribution includes TreeLayout Core (http://code.google.com/p/treelayout/) -Copyright (c) 2011, abego Software GmbH, Germany (http://www.abego.org) -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: -1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. -3. Neither the name of the abego Software GmbH nor the names of its - contributors may be used to endorse or promote products derived from this - software without specific prior written permission. -(http://treelayout.googlecode.com/files/LICENSE.TXT) - -This distribution includes ANTLR 4 Runtime (http://www.antlr.org/antlr4-runtime) -Copyright (c) 2012 Terence Parr and Sam Harwell -All rights reserved. -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: -Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. -Neither the name of the author nor the names of its contributors may be used to -endorse or promote products derived from this software without specific prior written permission. -(http://www.antlr.org/license.html) +from the source code management (SCM) system project uses. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53d2e8bb/fit/pom.xml ---------------------------------------------------------------------- diff --git a/fit/pom.xml b/fit/pom.xml index 34eff39..08dd7fc 100644 --- a/fit/pom.xml +++ b/fit/pom.xml @@ -239,7 +239,6 @@ <exclude>org/apache/olingo/**/tecsvc/**/*.class</exclude> <exclude>org/apache/olingo/**/fit/**/*.class</exclude> <exclude>org/apache/olingo/**/testutil/**/*.class</exclude> - <exclude>org/apache/olingo/**/antlr/**/*.class</exclude> </excludes> </instrumentation> <check/> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53d2e8bb/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/RawUri.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/RawUri.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/RawUri.java deleted file mode 100644 index 231317f..0000000 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/RawUri.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.server.core.uri.parser; - -import java.util.List; - -public class RawUri { - public String uri; - public String scheme; - public String authority; - public String path; - public String queryOptionString; - public String fragment; - public List<QueryOption> queryOptionList; - public List<QueryOption> queryOptionListDecoded; - - public List<String> pathSegmentList; - public List<String> pathSegmentListDecoded; - - public static class QueryOption { - public String name; - public String value; - - QueryOption(final String name, final String value) { - this.name = name; - this.value = value; - } - - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/53d2e8bb/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionImpl.java deleted file mode 100644 index e64a363..0000000 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionImpl.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.server.core.uri.queryoption.expression; - -import org.apache.olingo.server.api.uri.queryoption.expression.Expression; - -public abstract class ExpressionImpl implements Expression { - // No additional methods needed for now. -}
