camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r745791 - in /camel/trunk/components/camel-web: pom.xml src/main/java/org/apache/camel/rest/ src/main/java/org/apache/camel/web/model/package-info.java src/test/java/org/apache/camel/web/resources/RoutesTest.java
Date Thu, 19 Feb 2009 09:39:50 GMT
Author: jstrachan
Date: Thu Feb 19 09:39:49 2009
New Revision: 745791

URL: http://svn.apache.org/viewvc?rev=745791&view=rev
Log:
applied patch from Stephen Gargan for CAMEL-1358 to renable failing test - thanks Stephen!

Removed:
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/
Modified:
    camel/trunk/components/camel-web/pom.xml
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/package-info.java
    camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/RoutesTest.java

Modified: camel/trunk/components/camel-web/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/pom.xml?rev=745791&r1=745790&r2=745791&view=diff
==============================================================================
--- camel/trunk/components/camel-web/pom.xml (original)
+++ camel/trunk/components/camel-web/pom.xml Thu Feb 19 09:39:49 2009
@@ -177,10 +177,6 @@
           <includes>
             <include>**/*Test.*</include>
           </includes>
-          <excludes>
-            <!-- TODO FIXME ASAP -->
-            <exclude>**/RoutesTest.*</exclude>
-          </excludes>
         </configuration>
       </plugin>
 
@@ -327,7 +323,7 @@
             <configuration>
               <artifacts>
                 <artifact>
-                  <file>${project.build.directory}/schema/camel-rest.xsd</file>
+                  <file>${project.build.directory}/schema/camel-web.xsd</file>
                   <type>xsd</type>
                 </artifact>
               </artifacts>
@@ -350,8 +346,8 @@
                 <srcdir>src/main/java/org/apache/camel/web/model</srcdir>
                 <schemas>
                   <schema>
-                    <namespace>http://camel.apache.org/schema/rest</namespace>
-                    <file>camel-rest.xsd</file>
+                    <namespace>http://camel.apache.org/schema/web</namespace>
+                    <file>camel-web.xsd</file>
                   </schema>
                 </schemas>
                 <!--<verbose>false</verbose>-->
@@ -366,12 +362,12 @@
             <artifactItems>
               <artifactItem>
                 <groupId>org.apache.camel</groupId>
-                <artifactId>camel-rest</artifactId>
+                <artifactId>camel-web</artifactId>
                 <version>${pom.version}</version>
                 <type>xsd</type>
                 <overWrite>false</overWrite>
                 <outputDirectory>${project.build.directory}/schema</outputDirectory>
-                <destFileName>camel-rest.xsd</destFileName>
+                <destFileName>camel-web.xsd</destFileName>
               </artifactItem>
             </artifactItems>
           </configuration>

Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/package-info.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/package-info.java?rev=745791&r1=745790&r2=745791&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/package-info.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/package-info.java
Thu Feb 19 09:39:49 2009
@@ -19,5 +19,5 @@
  * The JAXB POJOs for the
  * <a href="http://camel.apache.org/rest.html">Camel REST Support</a>
  */
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/rest", elementFormDefault
= javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.web.model;
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/web", elementFormDefault
= javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.web.model;
 

Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/RoutesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/RoutesTest.java?rev=745791&r1=745790&r2=745791&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/RoutesTest.java
(original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/RoutesTest.java
Thu Feb 19 09:39:49 2009
@@ -16,6 +16,11 @@
  */
 package org.apache.camel.web.resources;
 
+import org.apache.camel.model.RoutesType;
+import org.apache.camel.model.RouteType;
+
+import java.util.List;
+
 
 /**
  * @version $Revision$
@@ -24,15 +29,14 @@
 
     public void testRoutes() throws Exception {
 
-        String routes = resource.path("routes").accept("application/xml").get(String.class);
-        System.out.println("Routes: " + routes);
-/*
-        RoutesType routes = wr.path("routes").accept("application/xml").get(RoutesType.class);
+        String text = resource.path("routes").accept("application/xml").get(String.class);
+        System.out.println("Routes XML: " + text);
+        assertNotNull("XML should not be null", text);
+
+        RoutesType routes = resource.path("routes").accept("application/xml").get(RoutesType.class);
         assertNotNull("Should have found routes", routes);
         List<RouteType> routeList = routes.getRoutes();
         assertNotNull("Should have more than one route", routeList.size() > 0);
-
         System.out.println("Have routes: " + routeList);
-*/
     }
 }
\ No newline at end of file



Mime
View raw message