Skip to content

Commit

Permalink
updating pom.xml
Browse files Browse the repository at this point in the history
  • Loading branch information
Andy Pemberton committed Oct 22, 2014
1 parent 319f4b5 commit c41160d
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
</build>

<properties>
<jersey.version>2.9.1</jersey.version>
<jersey.version>2.13</jersey.version>
<spring.version>4.0.5.RELEASE</spring.version>
<joda.version>2.3</joda.version>
<grizzly.version>2.3.11</grizzly.version>
Expand Down
19 changes: 19 additions & 0 deletions src/main/resources/logging.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# handlers=java.util.logging.ConsoleHandler
# java.util.logging.ConsoleHandler.level=ALL
# .level=ALL

handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler

############################################################
# Handler specific properties.
# Describes specific configuration info for Handlers.
############################################################

org.apache.juli.FileHandler.level = FINE
org.apache.juli.FileHandler.directory = ${catalina.base}/logs
org.apache.juli.FileHandler.prefix = servlet-examples.

java.util.logging.ConsoleHandler.level = FINE
java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter

org.apache.catalina.level=FINEST
29 changes: 29 additions & 0 deletions src/main/webapp/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
Manifest-Version: 1.0
Class-Path: lib/javax.servlet-api-3.0.1.jar lib/joda-time-2.3.jar lib/
jersey-spring3-2.9.1.jar lib/jersey-server-2.9.1.jar lib/jersey-clien
t-2.9.1.jar lib/javax.annotation-api-1.2.jar lib/hk2-api-2.3.0-b05.ja
r lib/aopalliance-repackaged-2.3.0-b05.jar lib/hk2-locator-2.3.0-b05.
jar lib/javassist-3.18.1-GA.jar lib/validation-api-1.1.0.Final.jar li
b/jersey-container-servlet-core-2.9.1.jar lib/hk2-2.3.0-b05.jar lib/h
k2-utils-2.3.0-b05.jar lib/javax.inject-1.jar lib/config-types-2.3.0-
b05.jar lib/core-2.3.0-b05.jar lib/hk2-config-2.3.0-b05.jar lib/tiger
-types-1.4.jar lib/bean-validator-2.3.0-b05.jar lib/hk2-runlevel-2.3.
0-b05.jar lib/class-model-2.3.0-b05.jar lib/asm-all-repackaged-2.3.0-
b05.jar lib/spring-bridge-2.3.0-b05.jar lib/javax.ws.rs-api-2.0.jar l
ib/spring-core-4.0.5.RELEASE.jar lib/commons-logging-1.1.3.jar lib/sp
ring-context-4.0.5.RELEASE.jar lib/spring-aop-4.0.5.RELEASE.jar lib/a
opalliance-1.0.jar lib/spring-beans-4.0.5.RELEASE.jar lib/spring-expr
ession-4.0.5.RELEASE.jar lib/spring-web-4.0.5.RELEASE.jar lib/jersey-
container-grizzly2-http-2.9.1.jar lib/javax.inject-2.3.0-b05.jar lib/
grizzly-http-server-2.3.8.jar lib/grizzly-http-2.3.8.jar lib/grizzly-
framework-2.3.8.jar lib/jersey-common-2.9.1.jar lib/jersey-guava-2.9.
1.jar lib/osgi-resource-locator-1.0.1.jar lib/grizzly-http-servlet-2.
3.11.jar lib/jersey-media-moxy-2.9.1.jar lib/jersey-entity-filtering-
2.9.1.jar lib/org.eclipse.persistence.moxy-2.5.0.jar lib/org.eclipse.
persistence.core-2.5.0.jar lib/org.eclipse.persistence.asm-2.5.0.jar
lib/org.eclipse.persistence.antlr-2.5.0.jar
Build-Jdk: 1.7.0_45
Built-By: apemberton
Created-By: Apache Maven 3.1.1
Main-Class: com.cloudbees.examples.todo.api.Main

4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/web.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- This web.xml file is not required when using Servlet 3.0 container,
see implementation details http://jersey.java.net/nonav/documentation/latest/jax-rs.html -->
<web-app version="2.5" 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_2_5.xsd">
<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">
<servlet>
<servlet-name>Jersey Web Application</servlet-name>
<servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
Expand All @@ -13,6 +13,6 @@
</servlet>
<servlet-mapping>
<servlet-name>Jersey Web Application</servlet-name>
<url-pattern>/webapi/*</url-pattern>
<url-pattern>/*</url-pattern>
</servlet-mapping>
</web-app>

0 comments on commit c41160d

Please sign in to comment.