diff --git a/pom.xml b/pom.xml
index 5fa11f5..e86e8d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,11 +9,58 @@
    <packaging>war</packaging>
    
    <properties>
+    <jetty-version>8.1.11.v20130520</jetty-version>
+
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <servlet-api-version>2.5</servlet-api-version>
     <scope>compile</scope>
   </properties>
-  
+  <build>
+
+    <plugins>
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
+        <version>${jetty-version}</version>
+        <configuration>
+          <webAppConfig>
+            <contextPath>/api</contextPath>
+          </webAppConfig>
+          <webAppSourceDirectory>target/${project.artifactId}-${project.version}</webAppSourceDirectory>
+          <webDefaultXml>${project.basedir}/conf/jetty/webdefault.xml</webDefaultXml>
+          <stopPort>8079</stopPort>
+          <stopKey>stopit</stopKey>
+          <connectors>
+            <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+              <port>8080</port>
+              <maxIdleTime>60000</maxIdleTime>
+              <confidentialPort>8443</confidentialPort>
+            </connector>
+          </connectors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>start-jetty</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <scanIntervalSeconds>0</scanIntervalSeconds>
+              <daemon>true</daemon>
+            </configuration>
+          </execution>
+          <execution>
+            <id>stop-jetty</id>
+            <phase>post-integration-test</phase>
+            <goals>
+              <goal>stop</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
   <dependencies>
  
 		<!-- JBoss RESTEasy -->
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 5c95cd7..370220f 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -46,7 +46,7 @@
   <servlet>
       <servlet-name>MyCustomBootstrap</servlet-name>
       <servlet-class>org.resteasy.MyCustomBootstrap</servlet-class>
-      <load-on-startup>1</load-on-startup>
+      <load-on-startup>2</load-on-startup>
   </servlet>
 	
 	<servlet>
@@ -56,11 +56,7 @@
     		<param-name>api.version</param-name>
     		<param-value>1.0.0</param-value>
   		</init-param>
-  		<init-param>
-    		<param-name>swagger.api.basepath</param-name>
-    		<param-value>http://localhost:8080/resteasy-spring-1</param-value>
-  		</init-param>
-  		<load-on-startup>2</load-on-startup>
+  		<load-on-startup>1</load-on-startup>
 	</servlet>
  
 </web-app>
\ No newline at end of file