You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/08/21 05:31:23 UTC
[5/8] git commit: Clean up some Tomcat dependencies,
also fix formatting in web.xml.
Clean up some Tomcat dependencies, also fix formatting in web.xml.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/aa5f24d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/aa5f24d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/aa5f24d1
Branch: refs/heads/two-dot-o-push-notifications
Commit: aa5f24d16e2ddfa3c4d93891c16d3c35d518631f
Parents: 648becf
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Aug 20 14:22:19 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Aug 20 14:22:19 2014 -0400
----------------------------------------------------------------------
stack/rest/pom.xml | 2 --
stack/rest/src/main/webapp/WEB-INF/web.xml | 34 ++++++++++++-------------
stack/test-utils/pom.xml | 5 ----
3 files changed, 17 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa5f24d1/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index b780709..adaf848 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -265,7 +265,6 @@
<!-- SUN, Javax Package, and Other Com Dependencies -->
-
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
@@ -277,7 +276,6 @@
<artifactId>jstl</artifactId>
</dependency>
-
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-multipart</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa5f24d1/stack/rest/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/webapp/WEB-INF/web.xml b/stack/rest/src/main/webapp/WEB-INF/web.xml
index 80019a6..92753de 100644
--- a/stack/rest/src/main/webapp/WEB-INF/web.xml
+++ b/stack/rest/src/main/webapp/WEB-INF/web.xml
@@ -17,50 +17,50 @@
-->
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
- <display-name>Usergrid REST API Server</display-name>
+ <display-name>Usergrid REST API Server</display-name>
- <context-param>
+ <context-param>
<param-name>contextConfigLocation</param-name>
<param-value>classpath:usergrid-rest-deploy-context.xml</param-value>
</context-param>
- <listener>
+ <listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
- <listener>
+ <listener>
<listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
</listener>
- <filter>
+ <filter>
<filter-name>swaggerFilter</filter-name>
<filter-class>org.apache.usergrid.rest.SwaggerServlet</filter-class>
</filter>
- <filter-mapping>
+ <filter-mapping>
<filter-name>swaggerFilter</filter-name>
<url-pattern>/resources.json</url-pattern>
</filter-mapping>
- <filter-mapping>
+ <filter-mapping>
<filter-name>swaggerFilter</filter-name>
<url-pattern>/applications.json</url-pattern>
</filter-mapping>
- <filter-mapping>
+ <filter-mapping>
<filter-name>swaggerFilter</filter-name>
<url-pattern>/management.json</url-pattern>
</filter-mapping>
- <!-- filter for setting default accept and Content-Type as application/json when undefined by client -->
- <filter>
+ <!-- filter for setting default accept and Content-Type as application/json when undefined by client -->
+ <filter>
<filter-name>contentTypeFilter</filter-name>
<filter-class>org.apache.usergrid.rest.filters.ContentTypeFilter</filter-class>
</filter>
- <filter-mapping>
+ <filter-mapping>
<filter-name>contentTypeFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
- `
- <filter>
+ `
+ <filter>
<filter-name>shiroFilter</filter-name>
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
<init-param>
@@ -68,12 +68,12 @@
<param-value>true</param-value>
</init-param>
</filter>
- <filter-mapping>
+ <filter-mapping>
<filter-name>shiroFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
- <filter>
+ <filter>
<filter-name>Usergrid REST API Server</filter-name>
<filter-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</filter-class>
<init-param>
@@ -114,12 +114,12 @@
</init-param>
</filter>
- <filter-mapping>
+ <filter-mapping>
<filter-name>Usergrid REST API Server</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
- <jsp-config>
+ <jsp-config>
<taglib>
<taglib-uri>http://java.sun.com/jsp/jstl/core</taglib-uri>
<taglib-location>c.tld</taglib-location>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aa5f24d1/stack/test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/stack/test-utils/pom.xml b/stack/test-utils/pom.xml
index 96ca346..a548b1e 100644
--- a/stack/test-utils/pom.xml
+++ b/stack/test-utils/pom.xml
@@ -250,11 +250,6 @@
</dependency>
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</dependency>