Skip to content
This repository was archived by the owner on Apr 5, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ dependencies {

// Spring
compile("org.springframework:spring-aop:$springVersion") { force = true }
compile("org.springframework:spring-asm:$springVersion") { force = true }
compile("org.springframework:spring-beans:$springVersion") { force = true }
compile("org.springframework:spring-context:$springVersion") { force = true }
compile("org.springframework:spring-core:$springVersion") { force = true }
Expand All @@ -62,7 +61,7 @@ dependencies {
compile "javax.inject:javax.inject:1"

// Spring Data
compile "org.springframework.data:spring-data-commons-core:$sdCommonsVersion"
compile "org.springframework.data:spring-data-commons:$sdCommonsVersion"
compile "org.springframework.data:spring-data-jpa:$sdJpaVersion"

// Spring Data REST
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ slf4jVersion = 1.6.6
logbackVersion = 1.0.6

# Supporting libraries
springVersion = 3.1.2.RELEASE
sdCommonsVersion = 1.4.0.RELEASE
sdJpaVersion = 1.2.0.RELEASE
springVersion = 3.2.5.RELEASE
sdCommonsVersion = 1.5.3.RELEASE
sdJpaVersion = 1.3.5.RELEASE
hibernateVersion = 4.1.6.Final
tomcatVersion = 7.0.30
tomcatVersion = 7.0.30

sdRestVersion = 1.0.0.RELEASE
sdRestVersion = 2.0.0.RELEASE
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import org.springframework.data.rest.repository.annotation.RestResource;
import org.springframework.data.rest.core.annotation.RestResource;

/**
* @author Jon Brisbin <jon@jbrisbin.com>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import javax.servlet.ServletException;
import javax.servlet.ServletRegistration;

import org.springframework.data.rest.webmvc.RepositoryRestExporterServlet;
import org.springframework.data.rest.webmvc.RepositoryRestDispatcherServlet;
import org.springframework.web.WebApplicationInitializer;
import org.springframework.web.context.ContextLoaderListener;
import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
Expand All @@ -21,7 +21,7 @@ public class RestExporterWebInitializer implements WebApplicationInitializer {

ctx.addListener(new ContextLoaderListener(rootCtx));

RepositoryRestExporterServlet exporter = new RepositoryRestExporterServlet();
RepositoryRestDispatcherServlet exporter = new RepositoryRestDispatcherServlet();

ServletRegistration.Dynamic reg = ctx.addServlet("rest-exporter", exporter);
reg.setLoadOnStartup(1);
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/servlet-2.5-web.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<servlet>
<servlet-name>rest-exporter</servlet-name>
<servlet-class>org.springframework.data.rest.webmvc.RepositoryRestExporterServlet</servlet-class>
<servlet-class>org.springframework.data.rest.webmvc.RepositoryRestDispatcherServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>

Expand Down