Skip to content

Commit

Permalink
updates to resteasy-spring:
Browse files Browse the repository at this point in the history 
1) Fixed RESTEASY-511 (relating to integration with @configuration beans) 
2) Allowed for injection of @Provider classes
3) Singletons can now be injected with @context

git-svn-id: file:///Users/billburke/jboss/resteasy/resteasy-git/svn-server-sync/resteasy/trunk/jaxrs@1442 2b1ed4c4-5db3-0410-90e4-80a7a6204c25
  • Loading branch information
sduskis committed Sep 16, 2011
1 parent a55a851 commit fcced9f
Show file tree
Hide file tree
Showing 36 changed files with 958 additions and 555 deletions.
2 changes: 1 addition & 1 deletion examples/resteasy-springMVC/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>2.5.6</version>
<version>3.0.3.RELEASE</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
Expand Down
25 changes: 22 additions & 3 deletions examples/spring-hibernate-contacts/persistence/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.4</version>
<version>4.7</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -65,8 +65,27 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<version>2.5.5</version>
<artifactId>spring-core</artifactId>
<version>3.0.3.RELEASE</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>3.0.3.RELEASE</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>3.0.3.RELEASE</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>3.0.3.RELEASE</version>
<scope>provided</scope>
</dependency>
</dependencies>

Expand Down
16 changes: 12 additions & 4 deletions examples/spring-hibernate-contacts/pom.xml
View file
Expand Up @@ -58,7 +58,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.4</version>
<version>4.7</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -82,14 +82,22 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<version>2.5.5</version>
<artifactId>spring-core</artifactId>
<version>3.0.3.RELEASE</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>3.0.3.RELEASE</version>
<scope>provided</scope>
</dependency>
<!-- Test classes that integrates Junit 3.8 and 4 to Spring based applications -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>2.5.5</version>
<version>3.0.3.RELEASE</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
Expand Down
26 changes: 23 additions & 3 deletions examples/spring-hibernate-contacts/services/pom.xml
View file
Expand Up @@ -50,13 +50,33 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.4</version>
<version>4.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<version>2.5.5</version>
<artifactId>spring-core</artifactId>
<version>3.0.3.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>3.0.3.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>3.0.3.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>3.0.3.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>3.0.3.RELEASE</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
Expand Down
4 changes: 2 additions & 2 deletions resteasy-spring/pom.xml
View file
Expand Up @@ -38,7 +38,7 @@
<version>2.5</version>
<scope>provided</scope>
</dependency>
<!-- <dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
<version>2.1_3</version>
Expand All @@ -49,7 +49,7 @@
<artifactId>asm</artifactId>
<version>3.0</version>
<scope>test</scope>
</dependency>-->
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...asy-spring/src/main/java/org/jboss/resteasy/client/spring/RestClientProxyFactoryBean.java
View file
Expand Up @@ -30,7 +30,7 @@
* @param <T>
* The type representing the client interface.
*/
public class RestClientProxyFactoryBean<T> implements FactoryBean,
public class RestClientProxyFactoryBean<T> implements FactoryBean<T>,
InitializingBean
{
private Class<T> serviceInterface;
Expand Down
2 changes: 1 addition & 1 deletion ...easy-spring/src/main/java/org/jboss/resteasy/plugins/spring/OptionalValueBeanFactory.java
View file
Expand Up @@ -13,7 +13,7 @@
* @version $Revision: 1 $
*/

public class OptionalValueBeanFactory implements FactoryBean, BeanFactoryAware
public class OptionalValueBeanFactory implements FactoryBean<Object>, BeanFactoryAware
{
private final static Logger logger = Logger
.getLogger(OptionalValueBeanFactory.class);
Expand Down
10 changes: 10 additions & 0 deletions resteasy-spring/src/main/java/org/jboss/resteasy/plugins/spring/ResteasyRegistration.java
View file
Expand Up @@ -13,6 +13,16 @@ public class ResteasyRegistration
private String context = "";
private String beanName;

public ResteasyRegistration()
{
}

public ResteasyRegistration(String context, String beanName)
{
this.context = context;
this.beanName = beanName;
}

@Required
public String getContext()
{
Expand Down

0 comments on commit fcced9f

Please sign in to comment.