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

Commit 102a289

Browse files
author
Adam Lindenthal
committed
Fixing copyright headers and wrong ending tag for pull request #106
Change-Id: Id2db76276d6dbb6092cbdfbd68c0c52dbb7d3ec3
1 parent 5a0552a commit 102a289

File tree

4 files changed

+42
-3
lines changed

4 files changed

+42
-3
lines changed

docs/src/main/docbook/spring.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ holder.
6767
To enable JAX-RS resources to work Spring functionality that requires proxying, such as Spring transaction management
6868
(with <literal>@Transactional</literal>), Spring Security and aspect oriented programming (such as <literal>@Aspect</literal>), the resources
6969
must themselves be managed by Spring, by annotating with <literal>@Component</literal>, <literal>@Service</literal>,
70-
<literal>@Controller</literal> or <literal>@Repository</literal></literal>:
70+
<literal>@Controller</literal> or <literal>@Repository</literal>:
7171

7272
<programlisting language="java" linenumbering="numbered">import javax.ws.rs.GET;
7373
import javax.ws.rs.Path;

ext/spring3/src/main/resources/jersey-spring-applicationContext.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
55
6-
Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2013-2014 Oracle and/or its affiliates. All rights reserved.
77
88
The contents of this file are subject to the terms of either the GNU
99
General Public License Version 2 only ("GPL") or the Common Development

ext/spring3/src/test/java/org/glassfish/jersey/server/spring/aspect4j/TestAspect.java

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,42 @@
1+
/*
2+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3+
*
4+
* Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
5+
*
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+
* http://glassfish.java.net/public/CDDL+GPL_1_1.html
12+
* or packager/legal/LICENSE.txt. See the License for the specific
13+
* language governing permissions and limitations under the License.
14+
*
15+
* When distributing the software, include this License Header Notice in each
16+
* file and include the License file at packager/legal/LICENSE.txt.
17+
*
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.
22+
*
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]"
27+
*
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.
39+
*/
140
package org.glassfish.jersey.server.spring.aspect4j;
241

342
import javax.inject.Singleton;

ext/spring3/src/test/resources/jersey-spring-aspect4j-applicationContext.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
55
6-
Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
6+
Copyright (c) 2013-2014 Oracle and/or its affiliates. All rights reserved.
77
88
The contents of this file are subject to the terms of either the GNU
99
General Public License Version 2 only ("GPL") or the Common Development

0 commit comments

Comments
 (0)