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

Commit b4d621c

Browse files
author
Adam Lindenthal
committed
Fixed spring3 references
Change-Id: I778fb1f095da6f2e336a034d0fbae1199f7c801c
1 parent bf3b5fb commit b4d621c

31 files changed

+75
-80
lines changed

‎bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
</dependency>
199199
<dependency>
200200
<groupId>org.glassfish.jersey.ext</groupId>
201-
<artifactId>jersey-spring3</artifactId>
201+
<artifactId>jersey-spring4</artifactId>
202202
<version>${project.version}</version>
203203
</dependency>
204204
<dependency>

‎docs/src/main/docbook/jersey.ent

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<!ENTITY jersey.ext.mvc-freemarker.deps.link "<link xlink:href='&jersey.project-info.uri.prefix;/jersey-mvc-freemarker/dependencies.html'>jersey-mvc-freemarker</link>" >
9898
<!ENTITY jersey.ext.mvc-jsp.deps.link "<link xlink:href='&jersey.project-info.uri.prefix;/jersey-mvc-jsp/dependencies.html'>jersey-mvc-jsp</link>" >
9999
<!ENTITY jersey.ext.mvc-mustache.deps.link "<link xlink:href='&jersey.project-info.uri.prefix;/jersey-mvc-mustache/dependencies.html'>jersey-mvc-mustache</link>" >
100-
<!ENTITY jersey.ext.spring3.deps.link "<link xlink:href='&jersey.project-info.uri.prefix;/jersey-spring3/dependencies.html'>jersey-spring3</link>" >
100+
<!ENTITY jersey.ext.spring4.deps.link "<link xlink:href='&jersey.project-info.uri.prefix;/jersey-spring4/dependencies.html'>jersey-spring4</link>" >
101101
<!ENTITY jersey.docs.root.uri "https://jersey.java.net/documentation/&docs.version;">
102102
<!ENTITY jersey.docs.index.uri "&jersey.docs.root.uri;/index.html">
103103
<!ENTITY jersey.github.examples.uri "&jersey.github.release.uri;/examples">

‎docs/src/main/docbook/spring.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,18 +99,18 @@ public class SomeResource {
9999

100100
<para>
101101
If you want to use Jersey Spring DI support
102-
you will need to add the <literal>jersey-spring3</literal> module into the list of your dependencies:
102+
you will need to add the <literal>jersey-spring4</literal> module into the list of your dependencies:
103103

104104
<programlisting language="xml">&lt;dependency&gt;
105105
&lt;groupId&gt;org.glassfish.jersey.ext&lt;/groupId&gt;
106-
&lt;artifactId&gt;jersey-spring3&lt;/artifactId&gt;
106+
&lt;artifactId&gt;jersey-spring4&lt;/artifactId&gt;
107107
&lt;version&gt;&version;&lt;/version&gt;
108108
&lt;/dependency&gt;</programlisting>
109109
</para>
110110

111111
<para>
112112
The above module adds transitive dependencies on Spring modules.
113-
See &jersey.ext.spring3.deps.link; module dependencies for more details about list and scope of dependencies.
113+
See &jersey.ext.spring4.deps.link; module dependencies for more details about list and scope of dependencies.
114114
Please note the module depends on &hk2.spring-bridge.link; that is used to inject Spring services into HK2 services
115115
or inject HK2 services into Spring services.
116116
</para>

‎tests/integration/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
<module>servlet-request-wrapper-binding</module>
147147
<module>servlet-tests</module>
148148
<module>sonar-test</module>
149-
<module>spring3</module>
149+
<module>spring4</module>
150150
<module>tracing-support</module>
151151
</modules>
152152

‎tests/integration/spring3/README.txt renamed to ‎tests/integration/spring4/README.txt

File renamed without changes.

‎tests/integration/spring3/pom.xml renamed to ‎tests/integration/spring4/pom.xml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848
<version>3.0-SNAPSHOT</version>
4949
</parent>
5050

51-
<artifactId>spring3</artifactId>
51+
<artifactId>spring4</artifactId>
5252

5353
<packaging>war</packaging>
54-
<name>jersey-tests-integration-spring3</name>
54+
<name>jersey-tests-integration-spring4</name>
5555

5656
<description>
57-
Jersey tests for Spring 3 integration
57+
Jersey tests for Spring 4 integration
5858
</description>
5959

6060
<dependencies>
@@ -74,7 +74,7 @@
7474

7575
<dependency>
7676
<groupId>org.glassfish.jersey.ext</groupId>
77-
<artifactId>jersey-spring3</artifactId>
77+
<artifactId>jersey-spring4</artifactId>
7878
<version>${project.version}</version>
7979
<scope>compile</scope>
8080
</dependency>
@@ -105,10 +105,6 @@
105105

106106
</dependencies>
107107

108-
<properties>
109-
<spring3.version>3.2.3.RELEASE</spring3.version>
110-
</properties>
111-
112108
<build>
113109
<plugins>
114110
<plugin>

‎tests/integration/spring3/src/main/java/org/glassfish/jersey/server/spring/test/AccountJerseyResource.java renamed to ‎tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/AccountJerseyResource.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33
*
4-
* Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
4+
* Copyright (c) 2013-2015 Oracle and/or its affiliates. All rights reserved.
55
*
66
* The contents of this file are subject to the terms of either the GNU
77
* General Public License Version 2 only ("GPL") or the Common Development
@@ -41,19 +41,19 @@
4141

4242
import java.math.BigDecimal;
4343

44-
import org.springframework.beans.factory.annotation.Autowired;
45-
import org.springframework.beans.factory.annotation.Qualifier;
46-
47-
import javax.inject.Inject;
48-
import javax.inject.Named;
49-
5044
import javax.ws.rs.core.MediaType;
5145
import javax.ws.rs.Consumes;
5246
import javax.ws.rs.GET;
5347
import javax.ws.rs.PUT;
5448
import javax.ws.rs.Path;
5549
import javax.ws.rs.PathParam;
5650

51+
import javax.inject.Inject;
52+
import javax.inject.Named;
53+
54+
import org.springframework.beans.factory.annotation.Autowired;
55+
import org.springframework.beans.factory.annotation.Qualifier;
56+
5757
/**
5858
* Jersey managed JAX-RS resource for testing jersey-spring.
5959
*
@@ -108,36 +108,36 @@ public String getMessage() {
108108
@PUT
109109
@Path("message")
110110
@Consumes(MediaType.TEXT_PLAIN)
111-
public String setMessage(String message) {
111+
public String setMessage(final String message) {
112112
this.message = message;
113113
return message;
114114
}
115115

116116
// resource methods for testing singleton scoped beans
117117
@GET
118118
@Path("singleton/inject/{accountId}")
119-
public BigDecimal getAccountBalanceSingletonInject(@PathParam("accountId") String accountId) {
119+
public BigDecimal getAccountBalanceSingletonInject(@PathParam("accountId") final String accountId) {
120120
return accountServiceInject.getAccountBalance(accountId);
121121
}
122122

123123
@GET
124124
@Path("singleton/autowired/{accountId}")
125-
public BigDecimal getAccountBalanceSingletonAutowired(@PathParam("accountId") String accountId) {
125+
public BigDecimal getAccountBalanceSingletonAutowired(@PathParam("accountId") final String accountId) {
126126
return accountServiceAutowired.getAccountBalance(accountId);
127127
}
128128

129129
@PUT
130130
@Path("singleton/{accountId}")
131131
@Consumes(MediaType.TEXT_PLAIN)
132-
public void setAccountBalanceSingleton(@PathParam("accountId") String accountId, String balance) {
132+
public void setAccountBalanceSingleton(@PathParam("accountId") final String accountId, final String balance) {
133133
accountServiceInject.setAccountBalance(accountId, new BigDecimal(balance));
134134
}
135135

136136
// resource methods for testing request scoped beans
137137
@PUT
138138
@Path("request/{accountId}")
139139
@Consumes(MediaType.TEXT_PLAIN)
140-
public BigDecimal setAccountBalanceRequest(@PathParam("accountId") String accountId, String balance) {
140+
public BigDecimal setAccountBalanceRequest(@PathParam("accountId") final String accountId, final String balance) {
141141
accountServiceRequest1.setAccountBalance(accountId, new BigDecimal(balance));
142142
return accountServiceRequest2.getAccountBalance(accountId);
143143
}
@@ -146,7 +146,7 @@ public BigDecimal setAccountBalanceRequest(@PathParam("accountId") String accoun
146146
@PUT
147147
@Path("prototype/{accountId}")
148148
@Consumes(MediaType.TEXT_PLAIN)
149-
public BigDecimal setAccountBalancePrototype(@PathParam("accountId") String accountId, String balance) {
149+
public BigDecimal setAccountBalancePrototype(@PathParam("accountId") final String accountId, final String balance) {
150150
accountServicePrototype1.setAccountBalance(accountId, new BigDecimal(balance));
151151
return accountServicePrototype2.getAccountBalance(accountId);
152152
}

‎tests/integration/spring3/src/main/java/org/glassfish/jersey/server/spring/test/AccountService.java renamed to ‎tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/AccountService.java

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

‎tests/integration/spring3/src/main/java/org/glassfish/jersey/server/spring/test/AccountServiceImpl.java renamed to ‎tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/AccountServiceImpl.java

File renamed without changes.

‎tests/integration/spring3/src/main/java/org/glassfish/jersey/server/spring/test/AccountSpringResource.java renamed to ‎tests/integration/spring4/src/main/java/org/glassfish/jersey/server/spring/test/AccountSpringResource.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33
*
4-
* Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
4+
* Copyright (c) 2013-2015 Oracle and/or its affiliates. All rights reserved.
55
*
66
* The contents of this file are subject to the terms of either the GNU
77
* General Public License Version 2 only ("GPL") or the Common Development
@@ -39,15 +39,8 @@
3939
*/
4040
package org.glassfish.jersey.server.spring.test;
4141

42-
import org.springframework.beans.factory.annotation.Autowired;
43-
import org.springframework.beans.factory.annotation.Qualifier;
44-
import org.springframework.stereotype.Component;
4542

4643
import java.math.BigDecimal;
47-
import java.util.logging.Logger;
48-
49-
import javax.inject.Inject;
50-
import javax.inject.Named;
5144

5245
import javax.ws.rs.core.MediaType;
5346
import javax.ws.rs.Consumes;
@@ -56,6 +49,13 @@
5649
import javax.ws.rs.Path;
5750
import javax.ws.rs.PathParam;
5851

52+
import javax.inject.Inject;
53+
import javax.inject.Named;
54+
55+
import org.springframework.beans.factory.annotation.Autowired;
56+
import org.springframework.beans.factory.annotation.Qualifier;
57+
import org.springframework.stereotype.Component;
58+
5959
/**
6060
* Spring managed JAX-RS resource for testing jersey-spring.
6161
*
@@ -64,7 +64,6 @@
6464
@Path("/spring/account")
6565
@Component
6666
public class AccountSpringResource {
67-
private static final Logger LOGGER = Logger.getLogger(AccountSpringResource.class.getName());
6867

6968
@Inject
7069
@Named("AccountService-singleton")

0 commit comments

Comments
 (0)