svn commit: r734783 - in /activemq/camel/trunk/components/camel-rest: ./ src/main/java/org/apache/camel/rest/resources/ src/test/java/org/apache/camel/rest/

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r734783 - in /activemq/camel/trunk/components/camel-rest: ./ src/main/java/org/apache/camel/rest/resources/ src/test/java/org/apache/camel/rest/

jstrachan-2
Author: jstrachan
Date: Thu Jan 15 11:23:11 2009
New Revision: 734783

URL: http://svn.apache.org/viewvc?rev=734783&view=rev
Log:
removed some old cruft from CAMEL-888

Removed:
    activemq/camel/trunk/components/camel-rest/src/main/java/org/apache/camel/rest/resources/Constants.java
Modified:
    activemq/camel/trunk/components/camel-rest/pom.xml
    activemq/camel/trunk/components/camel-rest/src/main/java/org/apache/camel/rest/resources/CamelContextResource.java
    activemq/camel/trunk/components/camel-rest/src/test/java/org/apache/camel/rest/Main.java

Modified: activemq/camel/trunk/components/camel-rest/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rest/pom.xml?rev=734783&r1=734782&r2=734783&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-rest/pom.xml (original)
+++ activemq/camel/trunk/components/camel-rest/pom.xml Thu Jan 15 11:23:11 2009
@@ -33,8 +33,6 @@
 
   <properties>
     <camel.osgi.export.pkg>org.apache.camel.rest.*</camel.osgi.export.pkg>
-    <!--<jersey-version>1.0.1-ea-SNAPSHOT</jersey-version>-->
-    <!--<jersey-version>1.0.2-SNAPSHOT</jersey-version>-->
     <jersey-version>1.0.1</jersey-version>
     <jetty-port>8080</jetty-port>
   </properties>
@@ -57,18 +55,10 @@
       <artifactId>camel-spring</artifactId>
     </dependency>
     <dependency>
-      <!--<groupId>com.sun.jersey</groupId>-->
       <groupId>com.sun.jersey.contribs</groupId>
       <artifactId>jersey-spring</artifactId>
       <version>${jersey-version}</version>
     </dependency>
-    <!--
-        <dependency>
-          <groupId>com.sun.jersey</groupId>
-          <artifactId>jersey-server</artifactId>
-          <version>${jersey-version}</version>
-        </dependency>
-    -->
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-json</artifactId>
@@ -119,20 +109,7 @@
         <version>1.1.2</version>
     </dependency>
 
-    <!-- enable commons-logging when inside jetty6:run -->
-    <!--
-    <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jcl104-over-slf4j</artifactId>
-        <version>1.5.0</version>
-    </dependency>
-    -->
-    <!--
-        <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-jcl</artifactId>
-        </dependency>
-    -->
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -141,14 +118,6 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
     </dependency>
-
-    <!--
-        <dependency>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-web</artifactId>
-          <scope>test</scope>
-        </dependency>
-    -->
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
@@ -236,25 +205,6 @@
           </systemProperties>
           <scanIntervalSeconds>10</scanIntervalSeconds>
         </configuration>
-        <!--
-                <dependencies>
-                  <dependency>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                    <version>${log4j-version}</version>
-                  </dependency>
-                  <dependency>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>jstl</artifactId>
-                    <version>1.2</version>
-                  </dependency>
-                  <dependency>
-                    <groupId>taglibs</groupId>
-                    <artifactId>standard</artifactId>
-                    <version>1.1.2</version>
-                  </dependency>
-                </dependencies>
-        -->
       </plugin>
 
       <plugin>

Modified: activemq/camel/trunk/components/camel-rest/src/main/java/org/apache/camel/rest/resources/CamelContextResource.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rest/src/main/java/org/apache/camel/rest/resources/CamelContextResource.java?rev=734783&r1=734782&r2=734783&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-rest/src/main/java/org/apache/camel/rest/resources/CamelContextResource.java (original)
+++ activemq/camel/trunk/components/camel-rest/src/main/java/org/apache/camel/rest/resources/CamelContextResource.java Thu Jan 15 11:23:11 2009
@@ -59,13 +59,6 @@
         return camelContext.getName();
     }
 
-/*
-    @Produces({MediaType.TEXT_HTML, MediaType.APPLICATION_XHTML_XML,
-            MediaType.WILDCARD, //MediaType.MEDIA_TYPE_WILDCARD,
-            MediaType.APPLICATION_OCTET_STREAM, MediaType.TEXT_PLAIN})
-*/
-
-
     @GET
     @Path("{view}")
     @Produces({MediaType.TEXT_HTML})
@@ -76,22 +69,6 @@
         return new Viewable(view, this);
     }
 
-/*
-    @GET
-    @Produces({MediaType.TEXT_HTML})
-    public Viewable getIndexView() {
-        return new Viewable("index", this);
-    }
-
-    @GET
-    @Path("endpoints")
-    @Produces({MediaType.TEXT_HTML})
-    public Viewable getEndpointsView() {
-        return new Viewable("endpoints", this);
-    }
-*/
-
-
     @GET
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Camel getCamel() {

Modified: activemq/camel/trunk/components/camel-rest/src/test/java/org/apache/camel/rest/Main.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rest/src/test/java/org/apache/camel/rest/Main.java?rev=734783&r1=734782&r2=734783&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-rest/src/test/java/org/apache/camel/rest/Main.java (original)
+++ activemq/camel/trunk/components/camel-rest/src/test/java/org/apache/camel/rest/Main.java Thu Jan 15 11:23:11 2009
@@ -61,17 +61,6 @@
         context.setContextPath(WEBAPP_CTX);
         context.setServer(server);
 
-        // lets find the class loader of JSTL
-/*
-        Class<?> stlVersion = Class.forName("org.apache.taglibs.standard.Version");
-        System.out.println("Found STL Version: " + stlVersion);
-        ClassLoader classLoader = stlVersion.getClassLoader();
-        context.setClassLoader(classLoader);
-*/
-
-
-        //Thread.currentThread().setContextClassLoader(classLoader);
-
         server.setHandlers(new Handler[] {context});
         server.setConnectors(new Connector[] {connector});
         server.start();