Skip to content
This repository was archived by the owner on May 11, 2018. It is now read-only.

Commit 3dd47ca

Browse files
yaminikbyaminikb
committed
Replacing with correct (BSD) license
1 parent f89e2aa commit 3dd47ca

File tree

33 files changed

+835
-873
lines changed

33 files changed

+835
-873
lines changed

Diff for: ‎README.adoc

+33
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,36 @@
1+
///////////////////////////////////////////////////////////////////////////////
2+
3+
Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
4+
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions
7+
are met:
8+
9+
- Redistributions of source code must retain the above copyright
10+
notice, this list of conditions and the following disclaimer.
11+
12+
- Redistributions in binary form must reproduce the above copyright
13+
notice, this list of conditions and the following disclaimer in the
14+
documentation and/or other materials provided with the distribution.
15+
16+
- Neither the name of Oracle nor the names of its
17+
contributors may be used to endorse or promote products derived
18+
from this software without specific prior written permission.
19+
20+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
21+
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
22+
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
23+
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
24+
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
25+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
26+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
27+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
28+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
29+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
30+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31+
32+
///////////////////////////////////////////////////////////////////////////////
33+
134
= Examples
235
336
The goal if this repo is to get everyone on the same page with level of knowledge.

Diff for: ‎addmodule.sh

+26-35
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,33 @@
11
#!/bin/bash
22
#
3-
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
4-
#
53
# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
64
#
7-
# The contents of this file are subject to the terms of either the GNU
8-
# General Public License Version 2 only ("GPL") or the Common Development
9-
# and Distribution License("CDDL") (collectively, the "License"). You
10-
# may not use this file except in compliance with the License. You can
11-
# obtain a copy of the License at
12-
# https://oss.oracle.com/licenses/CDDL+GPL-1.1
13-
# or LICENSE.txt. See the License for the specific
14-
# language governing permissions and limitations under the License.
15-
#
16-
# When distributing the software, include this License Header Notice in each
17-
# file and include the License file at LICENSE.txt.
18-
#
19-
# GPL Classpath Exception:
20-
# Oracle designates this particular file as subject to the "Classpath"
21-
# exception as provided by Oracle in the GPL Version 2 section of the License
22-
# file that accompanied this code.
23-
#
24-
# Modifications:
25-
# If applicable, add the following below the License Header, with the fields
26-
# enclosed by brackets [] replaced by your own identifying information:
27-
# "Portions Copyright [year] [name of copyright owner]"
28-
#
29-
# Contributor(s):
30-
# If you wish your version of this file to be governed by only the CDDL or
31-
# only the GPL Version 2, indicate your decision by adding "[Contributor]
32-
# elects to include this software in this distribution under the [CDDL or GPL
33-
# Version 2] license." If you don't indicate a single choice of license, a
34-
# recipient has the option to distribute your version of this file under
35-
# either the CDDL, the GPL Version 2 or to extend the choice of license to
36-
# its licensees as provided above. However, if you add GPL Version 2 code
37-
# and therefore, elected the GPL Version 2 license, then the option applies
38-
# only if the new code is made subject to such option by the copyright
39-
# holder.
5+
# Redistribution and use in source and binary forms, with or without
6+
# modification, are permitted provided that the following conditions
7+
# are met:
8+
#
9+
# - Redistributions of source code must retain the above copyright
10+
# notice, this list of conditions and the following disclaimer.
11+
#
12+
# - Redistributions in binary form must reproduce the above copyright
13+
# notice, this list of conditions and the following disclaimer in the
14+
# documentation and/or other materials provided with the distribution.
15+
#
16+
# - Neither the name of Oracle nor the names of its
17+
# contributors may be used to endorse or promote products derived
18+
# from this software without specific prior written permission.
19+
#
20+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
21+
# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
22+
# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
23+
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
24+
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
25+
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
26+
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
27+
# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
28+
# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
29+
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
30+
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4031
#
4132

4233
export name=${1?Specify a module name}

Diff for: ‎pom.xml

+26-35
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,33 @@
11
<!--
22
3-
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
4-
53
Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
64
7-
The contents of this file are subject to the terms of either the GNU
8-
General Public License Version 2 only ("GPL") or the Common Development
9-
and Distribution License("CDDL") (collectively, the "License"). You
10-
may not use this file except in compliance with the License. You can
11-
obtain a copy of the License at
12-
https://oss.oracle.com/licenses/CDDL+GPL-1.1
13-
or LICENSE.txt. See the License for the specific
14-
language governing permissions and limitations under the License.
15-
16-
When distributing the software, include this License Header Notice in each
17-
file and include the License file at LICENSE.txt.
18-
19-
GPL Classpath Exception:
20-
Oracle designates this particular file as subject to the "Classpath"
21-
exception as provided by Oracle in the GPL Version 2 section of the License
22-
file that accompanied this code.
23-
24-
Modifications:
25-
If applicable, add the following below the License Header, with the fields
26-
enclosed by brackets [] replaced by your own identifying information:
27-
"Portions Copyright [year] [name of copyright owner]"
28-
29-
Contributor(s):
30-
If you wish your version of this file to be governed by only the CDDL or
31-
only the GPL Version 2, indicate your decision by adding "[Contributor]
32-
elects to include this software in this distribution under the [CDDL or GPL
33-
Version 2] license." If you don't indicate a single choice of license, a
34-
recipient has the option to distribute your version of this file under
35-
either the CDDL, the GPL Version 2 or to extend the choice of license to
36-
its licensees as provided above. However, if you add GPL Version 2 code
37-
and therefore, elected the GPL Version 2 license, then the option applies
38-
only if the new code is made subject to such option by the copyright
39-
holder.
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions
7+
are met:
8+
9+
- Redistributions of source code must retain the above copyright
10+
notice, this list of conditions and the following disclaimer.
11+
12+
- Redistributions in binary form must reproduce the above copyright
13+
notice, this list of conditions and the following disclaimer in the
14+
documentation and/or other materials provided with the distribution.
15+
16+
- Neither the name of Oracle nor the names of its
17+
contributors may be used to endorse or promote products derived
18+
from this software without specific prior written permission.
19+
20+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
21+
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
22+
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
23+
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
24+
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
25+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
26+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
27+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
28+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
29+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
30+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4031
4132
-->
4233

Diff for: ‎rest-basic-example/README.adoc

+33
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,36 @@
1+
///////////////////////////////////////////////////////////////////////////////
2+
3+
Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
4+
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions
7+
are met:
8+
9+
- Redistributions of source code must retain the above copyright
10+
notice, this list of conditions and the following disclaimer.
11+
12+
- Redistributions in binary form must reproduce the above copyright
13+
notice, this list of conditions and the following disclaimer in the
14+
documentation and/or other materials provided with the distribution.
15+
16+
- Neither the name of Oracle nor the names of its
17+
contributors may be used to endorse or promote products derived
18+
from this software without specific prior written permission.
19+
20+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
21+
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
22+
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
23+
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
24+
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
25+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
26+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
27+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
28+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
29+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
30+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31+
32+
///////////////////////////////////////////////////////////////////////////////
33+
134
# rest-basic-example
235
336
Test for https://github.com/javaee-security-spec/soteria/issues/25 which only works on WildFly 10 in the case the Authorization header is specified.

Diff for: ‎rest-basic-example/pom.xml

+22-31
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,34 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5-
64
Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
75
8-
The contents of this file are subject to the terms of either the GNU
9-
General Public License Version 2 only ("GPL") or the Common Development
10-
and Distribution License("CDDL") (collectively, the "License"). You
11-
may not use this file except in compliance with the License. You can
12-
obtain a copy of the License at
13-
https://oss.oracle.com/licenses/CDDL+GPL-1.1
14-
or LICENSE.txt. See the License for the specific
15-
language governing permissions and limitations under the License.
6+
Redistribution and use in source and binary forms, with or without
7+
modification, are permitted provided that the following conditions
8+
are met:
169
17-
When distributing the software, include this License Header Notice in each
18-
file and include the License file at LICENSE.txt.
10+
- Redistributions of source code must retain the above copyright
11+
notice, this list of conditions and the following disclaimer.
1912
20-
GPL Classpath Exception:
21-
Oracle designates this particular file as subject to the "Classpath"
22-
exception as provided by Oracle in the GPL Version 2 section of the License
23-
file that accompanied this code.
13+
- Redistributions in binary form must reproduce the above copyright
14+
notice, this list of conditions and the following disclaimer in the
15+
documentation and/or other materials provided with the distribution.
2416
25-
Modifications:
26-
If applicable, add the following below the License Header, with the fields
27-
enclosed by brackets [] replaced by your own identifying information:
28-
"Portions Copyright [year] [name of copyright owner]"
17+
- Neither the name of Oracle nor the names of its
18+
contributors may be used to endorse or promote products derived
19+
from this software without specific prior written permission.
2920
30-
Contributor(s):
31-
If you wish your version of this file to be governed by only the CDDL or
32-
only the GPL Version 2, indicate your decision by adding "[Contributor]
33-
elects to include this software in this distribution under the [CDDL or GPL
34-
Version 2] license." If you don't indicate a single choice of license, a
35-
recipient has the option to distribute your version of this file under
36-
either the CDDL, the GPL Version 2 or to extend the choice of license to
37-
its licensees as provided above. However, if you add GPL Version 2 code
38-
and therefore, elected the GPL Version 2 license, then the option applies
39-
only if the new code is made subject to such option by the copyright
40-
holder.
21+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
22+
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
23+
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
24+
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
25+
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
26+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
27+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
28+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
29+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
30+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
31+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4132
4233
-->
4334

Diff for: ‎rest-basic-example/src/main/java/be/c4j/security/soteria/HelloResource.java

+22-31
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,32 @@
11
/*
2-
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3-
*
42
* Copyright (c) 2015-2018 Oracle and/or its affiliates. All rights reserved.
53
*
6-
* The contents of this file are subject to the terms of either the GNU
7-
* General Public License Version 2 only ("GPL") or the Common Development
8-
* and Distribution License("CDDL") (collectively, the "License"). You
9-
* may not use this file except in compliance with the License. You can
10-
* obtain a copy of the License at
11-
* https://oss.oracle.com/licenses/CDDL+GPL-1.1
12-
* or LICENSE.txt. See the License for the specific
13-
* language governing permissions and limitations under the License.
4+
* Redistribution and use in source and binary forms, with or without
5+
* modification, are permitted provided that the following conditions
6+
* are met:
147
*
15-
* When distributing the software, include this License Header Notice in each
16-
* file and include the License file at LICENSE.txt.
8+
* - Redistributions of source code must retain the above copyright
9+
* notice, this list of conditions and the following disclaimer.
1710
*
18-
* GPL Classpath Exception:
19-
* Oracle designates this particular file as subject to the "Classpath"
20-
* exception as provided by Oracle in the GPL Version 2 section of the License
21-
* file that accompanied this code.
11+
* - Redistributions in binary form must reproduce the above copyright
12+
* notice, this list of conditions and the following disclaimer in the
13+
* documentation and/or other materials provided with the distribution.
2214
*
23-
* Modifications:
24-
* If applicable, add the following below the License Header, with the fields
25-
* enclosed by brackets [] replaced by your own identifying information:
26-
* "Portions Copyright [year] [name of copyright owner]"
15+
* - Neither the name of Oracle nor the names of its
16+
* contributors may be used to endorse or promote products derived
17+
* from this software without specific prior written permission.
2718
*
28-
* Contributor(s):
29-
* If you wish your version of this file to be governed by only the CDDL or
30-
* only the GPL Version 2, indicate your decision by adding "[Contributor]
31-
* elects to include this software in this distribution under the [CDDL or GPL
32-
* Version 2] license." If you don't indicate a single choice of license, a
33-
* recipient has the option to distribute your version of this file under
34-
* either the CDDL, the GPL Version 2 or to extend the choice of license to
35-
* its licensees as provided above. However, if you add GPL Version 2 code
36-
* and therefore, elected the GPL Version 2 license, then the option applies
37-
* only if the new code is made subject to such option by the copyright
38-
* holder.
19+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
20+
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
21+
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22+
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
23+
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
24+
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
25+
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
26+
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
27+
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
28+
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
29+
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3930
*/
4031

4132
package be.c4j.security.soteria;

0 commit comments

Comments
 (0)