svn commit: r983585 - in /camel/trunk/components/camel-web: pom.xml src/main/webapp/favicon.ico src/test/java/org/apache/camel/web/spring/CamelRouteTest.java

[jstrachan]

Author: jstrachan
Date: Mon Aug  9 11:07:21 2010
New Revision: 983585

URL: http://svn.apache.org/viewvc?rev=983585&view=rev
Log:
upgraded Jersey to get nicer stack traces with 404s, fixed up failing test case 
and added a better favicon.ico

Modified:
    camel/trunk/components/camel-web/pom.xml
    camel/trunk/components/camel-web/src/main/webapp/favicon.ico
    
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/spring/CamelRouteTest.java

Modified: camel/trunk/components/camel-web/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/pom.xml?rev=983585&r1=983584&r2=983585&view=diff
==============================================================================
--- camel/trunk/components/camel-web/pom.xml (original)
+++ camel/trunk/components/camel-web/pom.xml Mon Aug  9 11:07:21 2010
@@ -31,15 +31,9 @@
        <properties>
                
<camel.osgi.export.pkg>org.apache.camel.web.*</camel.osgi.export.pkg>
                <scalate-version>1.3-SNAPSHOT</scalate-version>
-    <jersey-version>1.4-ea04</jersey-version>
-<!--
-    <jersey-version>1.4-SNAPSHOT</jersey-version>
--->
+    <jersey-version>1.4-ea05</jersey-version>
     <logback-version>0.9.24</logback-version>
                <jetty-port>8080</jetty-port>
-<!--
-               <webdriver-version>0.6.1039</webdriver-version>
--->
                <webdriver-version>0.9.7376</webdriver-version>
        </properties>
 

Modified: camel/trunk/components/camel-web/src/main/webapp/favicon.ico
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/webapp/favicon.ico?rev=983585&r1=983584&r2=983585&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/spring/CamelRouteTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/spring/CamelRouteTest.java?rev=983585&r1=983584&r2=983585&view=diff
==============================================================================
--- 
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/spring/CamelRouteTest.java
 (original)
+++ 
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/spring/CamelRouteTest.java
 Mon Aug  9 11:07:21 2010
@@ -58,7 +58,8 @@ public class CamelRouteTest extends Asse
     public void setUp() throws Exception {
         applicationContext = new 
FileSystemXmlApplicationContext("src/main/webapp/WEB-INF/applicationContext.xml");
         applicationContext.start();
-        camelContext = (CamelContext) 
applicationContext.getBean("camelContext", CamelContext.class);
+        camelContext = applicationContext.getBean(CamelContext.class);
+        //applicationContext.getBean("camelContext", CamelContext.class);
         assertNotNull("camelContext", camelContext);
     }