resteasy for first part of legacy api

fcrepo · Mar 20, 2013 · ff5e0a6 · ff5e0a6
1 parent 5f84e3e
commit ff5e0a6
Show file tree

Hide file tree

Showing 11 changed files with 543 additions and 518 deletions.
diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/integration/DatastreamIT.java b/fcrepo-kernel/src/test/java/org/fcrepo/integration/DatastreamIT.java
@@ -30,6 +30,7 @@ public class DatastreamIT extends AbstractIT {
 
     @Test
     public void testLabel() throws Exception {
+    	System.out.println("INIT FOR testLABEL");
         Session session = repo.login();
         createObjectNode(session, "testDatastreamObject");
         Node dsNode =

diff --git a/fcrepo-legacy-api/pom.xml b/fcrepo-legacy-api/pom.xml
@@ -16,6 +16,21 @@
   <name>fcrepo 3.x compatible REST API</name>
 
   <dependencies>
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-transports-http-jetty</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-rs-extension-providers</artifactId>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.fcrepo</groupId>
       <artifactId>fcrepo-kernel</artifactId>
@@ -41,6 +56,7 @@
       </exclusions>
     </dependency>
 
+
     <!-- test gear -->
     <dependency>
       <groupId>org.fcrepo</groupId>
@@ -60,17 +76,26 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-transports-http-jetty</artifactId>
+    	<groupId>org.jboss.resteasy</groupId>
+    	<artifactId>resteasy-multipart-provider</artifactId>
+    	<version>2.3.5.Final</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-      <scope>provided</scope>
+     <groupId>org.jboss.resteasy</groupId>
+     <artifactId>resteasy-jaxrs</artifactId>
+   	 <version>2.3.5.Final</version>
+       <exclusions>
+         <exclusion>
+           <groupId>commons-logging</groupId>
+           <artifactId>commons-logging</artifactId>
+         </exclusion>
+       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.apache.cxf</groupId>
-      <artifactId>cxf-rt-rs-extension-providers</artifactId>
+      <groupId>org.jboss.resteasy</groupId>
+      <artifactId>resteasy-spring</artifactId>
+      <version>2.3.5.Final</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
@@ -119,6 +144,38 @@
       	<groupId>org.apache.maven.plugins</groupId>
       	<artifactId>maven-failsafe-plugin</artifactId>
       </plugin>
+	  <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>maven-jetty-plugin</artifactId>
+        <version>6.1.26</version>
+          <configuration>
+            <contextPath>/</contextPath>
+              <stopPort>8005</stopPort>
+              <stopKey>STOP</stopKey>
+            </configuration>
+            <executions>
+              <execution>
+                <id>start-jetty</id>
+                <phase>pre-integration-test</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <daemon>true</daemon>
+		          <webAppSourceDirectory>${basedir}/src/test/resources</webAppSourceDirectory>
+		          <useTestClasspath>true</useTestClasspath>
+                </configuration>
+              </execution>
+              <execution>
+                <id>stop-jetty</id>
+                <phase>post-integration-test</phase>
+                <goals>
+                  <goal>stop</goal>
+                </goals>
+              </execution>
+            </executions>
+        </plugin>
     </plugins>
+
   </build>
 </project>