camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r745637 - in /camel/trunk/components/camel-web: ./ src/main/java/org/apache/camel/rest/model/ src/main/java/org/apache/camel/rest/resources/ src/main/java/org/apache/camel/rest/util/ src/main/java/org/apache/camel/web/ src/main/java/org/apa...
Date Wed, 18 Feb 2009 20:23:47 GMT
Author: jstrachan
Date: Wed Feb 18 20:23:44 2009
New Revision: 745637

URL: http://svn.apache.org/viewvc?rev=745637&view=rev
Log:
refactored the package to match the camel-web module name

Added:
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/
      - copied from r745452, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/model/
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Camel.java
      - copied, changed from r745562, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/model/Camel.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/EndpointLink.java
      - copied, changed from r745562, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/model/EndpointLink.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Endpoints.java
      - copied, changed from r745562, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/model/Endpoints.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/jaxb.index
      - copied unchanged from r745452, camel/trunk/components/camel-web/src/main/resources/org/apache/camel/rest/model/jaxb.index
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/package-info.java
      - copied, changed from r745562, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/model/package-info.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/
      - copied from r745452, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelChildResourceSupport.java
      - copied, changed from r745562, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/CamelChildResourceSupport.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelContextResource.java
      - copied, changed from r745562, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/CamelContextResource.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointResource.java
      - copied, changed from r745562, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/EndpointResource.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointsResource.java
      - copied, changed from r745562, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/EndpointsResource.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ExchangeResource.java
      - copied, changed from r745506, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/ExchangeResource.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
      - copied, changed from r745562, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/RouteResource.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java
      - copied, changed from r745562, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/RoutesResource.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/
      - copied from r745452, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/util/
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CamelResourceConfig.java
      - copied, changed from r745562, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/util/CamelResourceConfig.java
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JAXBContextResolver.java
      - copied, changed from r745585, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/util/JAXBContextResolver.java
    camel/trunk/components/camel-web/src/main/resources/org/apache/camel/web/
    camel/trunk/components/camel-web/src/main/resources/org/apache/camel/web/model/
    camel/trunk/components/camel-web/src/main/resources/org/apache/camel/web/model/jaxb.index
      - copied unchanged from r745452, camel/trunk/components/camel-web/src/main/resources/org/apache/camel/rest/model/jaxb.index
    camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/
    camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/
      - copied from r745452, camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/rest/resources/
    camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/EndpointResource/index.jsp
      - copied unchanged from r745506, camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/rest/resources/EndpointResource/index.jsp
    camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/EndpointResource/send.jsp
      - copied unchanged from r745494, camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/rest/resources/EndpointResource/send.jsp
    camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/EndpointsResource/
      - copied from r745547, camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/rest/resources/EndpointsResource/
    camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/ExchangeResource/
      - copied from r745506, camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/rest/resources/ExchangeResource/
    camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/ExchangeResource/index.jsp
      - copied unchanged from r745568, camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/rest/resources/ExchangeResource/index.jsp
    camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/RouteResource/
      - copied from r745562, camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/rest/resources/RouteResource/
    camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/RoutesResource/
      - copied from r745556, camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/rest/resources/RoutesResource/
    camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/RoutesResource/index.jsp
      - copied unchanged from r745562, camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/rest/resources/RoutesResource/index.jsp
    camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/
    camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/Main.java   (contents,
props changed)
      - copied, changed from r745452, camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/Main.java
    camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/
    camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/EndpointsHtmlTest.java
  (contents, props changed)
      - copied, changed from r745452, camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/resources/EndpointsHtmlTest.java
    camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/EndpointsTest.java
  (with props)
    camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/RoutesTest.java
  (contents, props changed)
      - copied, changed from r745452, camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/resources/RoutesTest.java
    camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/StaticContentTest.java
  (contents, props changed)
      - copied, changed from r745452, camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/resources/StaticContentTest.java
    camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/TestSupport.java
  (contents, props changed)
      - copied, changed from r745452, camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/resources/TestSupport.java
    camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/spring/
      - copied from r745452, camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/spring/
    camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/spring/CamelRouteTest.java
      - copied, changed from r745556, camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/spring/CamelRouteTest.java
Removed:
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/model/
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/
    camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/util/
    camel/trunk/components/camel-web/src/main/resources/org/apache/camel/rest/
    camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/rest/
    camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/CamelContextResource/endpoints.jsp
    camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/CamelContextResource/foo.jsp
    camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/CamelContextResource/routes.jsp
    camel/trunk/components/camel-web/src/test/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/resources/Constants.java
    camel/trunk/components/camel-web/src/main/webapp/WEB-INF/web.xml

Modified: camel/trunk/components/camel-web/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/pom.xml?rev=745637&r1=745636&r2=745637&view=diff
==============================================================================
--- camel/trunk/components/camel-web/pom.xml (original)
+++ camel/trunk/components/camel-web/pom.xml Wed Feb 18 20:23:44 2009
@@ -347,7 +347,7 @@
               <phase>process-sources</phase>
               <configuration>
                 <destdir>${project.build.directory}/schema</destdir>
-                <srcdir>src/main/java/org/apache/camel/rest/model</srcdir>
+                <srcdir>src/main/java/org/apache/camel/web/model</srcdir>
                 <schemas>
                   <schema>
                     <namespace>http://camel.apache.org/schema/rest</namespace>

Copied: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Camel.java
(from r745562, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/model/Camel.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Camel.java?p2=camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Camel.java&p1=camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/model/Camel.java&r1=745562&r2=745637&rev=745637&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/model/Camel.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Camel.java Wed
Feb 18 20:23:44 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.rest.model;
+package org.apache.camel.web.model;
 
 import org.apache.camel.CamelContext;
 

Copied: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/EndpointLink.java
(from r745562, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/model/EndpointLink.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/EndpointLink.java?p2=camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/EndpointLink.java&p1=camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/model/EndpointLink.java&r1=745562&r2=745637&rev=745637&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/model/EndpointLink.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/EndpointLink.java
Wed Feb 18 20:23:44 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.rest.model;
+package org.apache.camel.web.model;
 
 import org.apache.camel.Endpoint;
 

Copied: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Endpoints.java
(from r745562, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/model/Endpoints.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Endpoints.java?p2=camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Endpoints.java&p1=camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/model/Endpoints.java&r1=745562&r2=745637&rev=745637&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/model/Endpoints.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Endpoints.java
Wed Feb 18 20:23:44 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.rest.model;
+package org.apache.camel.web.model;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;

Copied: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/package-info.java
(from r745562, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/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?p2=camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/package-info.java&p1=camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/model/package-info.java&r1=745562&r2=745637&rev=745637&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/model/package-info.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/package-info.java
Wed Feb 18 20:23:44 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.rest.model;
+@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;
 

Copied: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelChildResourceSupport.java
(from r745562, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/CamelChildResourceSupport.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelChildResourceSupport.java?p2=camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelChildResourceSupport.java&p1=camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/CamelChildResourceSupport.java&r1=745562&r2=745637&rev=745637&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/CamelChildResourceSupport.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelChildResourceSupport.java
Wed Feb 18 20:23:44 2009
@@ -15,14 +15,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.rest.resources;
+package org.apache.camel.web.resources;
 
 import com.sun.jersey.api.view.ImplicitProduces;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
 
 /**
- * A useful base class for any sub resource of the root {@link org.apache.camel.rest.resources.CamelContextResource}
+ * A useful base class for any sub resource of the root {@link org.apache.camel.web.resources.CamelContextResource}
  *
  * @version $Revision: 1.1 $
  */

Copied: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelContextResource.java
(from r745562, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/CamelContextResource.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelContextResource.java?p2=camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelContextResource.java&p1=camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/CamelContextResource.java&r1=745562&r2=745637&rev=745637&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/CamelContextResource.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelContextResource.java
Wed Feb 18 20:23:44 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.rest.resources;
+package org.apache.camel.web.resources;
 
 
 import com.sun.jersey.api.view.ImplicitProduces;
@@ -22,7 +22,7 @@
 import com.sun.jersey.spi.resource.Singleton;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
-import org.apache.camel.rest.model.Camel;
+import org.apache.camel.web.model.Camel;
 
 import javax.annotation.PreDestroy;
 import javax.ws.rs.GET;

Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/Constants.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/Constants.java?rev=745637&r1=745452&r2=745637&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/Constants.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/Constants.java
Wed Feb 18 20:23:44 2009
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.rest.resources;
+package org.apache.camel.web.resources;
 
 /**
  * @version $Revision: 1.1 $

Copied: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointResource.java
(from r745562, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/EndpointResource.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointResource.java?p2=camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointResource.java&p1=camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/EndpointResource.java&r1=745562&r2=745637&rev=745637&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/EndpointResource.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointResource.java
Wed Feb 18 20:23:44 2009
@@ -14,15 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.rest.resources;
+package org.apache.camel.web.resources;
 
 import com.sun.jersey.api.representation.Form;
-import com.sun.jersey.api.view.ImplicitProduces;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.Processor;
-import org.apache.camel.rest.model.EndpointLink;
+import org.apache.camel.web.model.EndpointLink;
 import org.apache.camel.spi.BrowsableEndpoint;
 import org.apache.camel.util.ExchangeHelper;
 

Copied: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointsResource.java
(from r745562, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/EndpointsResource.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointsResource.java?p2=camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointsResource.java&p1=camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/EndpointsResource.java&r1=745562&r2=745637&rev=745637&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/EndpointsResource.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointsResource.java
Wed Feb 18 20:23:44 2009
@@ -15,13 +15,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.rest.resources;
+package org.apache.camel.web.resources;
 
 import com.sun.jersey.api.representation.Form;
 import com.sun.jersey.api.view.Viewable;
 import org.apache.camel.Endpoint;
-import org.apache.camel.rest.model.EndpointLink;
-import org.apache.camel.rest.model.Endpoints;
+import org.apache.camel.web.model.EndpointLink;
+import org.apache.camel.web.model.Endpoints;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;

Copied: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ExchangeResource.java
(from r745506, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/ExchangeResource.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ExchangeResource.java?p2=camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ExchangeResource.java&p1=camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/ExchangeResource.java&r1=745506&r2=745637&rev=745637&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/ExchangeResource.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ExchangeResource.java
Wed Feb 18 20:23:44 2009
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.rest.resources;
+package org.apache.camel.web.resources;
 
 import com.sun.jersey.api.view.ImplicitProduces;
 import org.apache.camel.CamelContext;

Copied: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
(from r745562, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/RouteResource.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java?p2=camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java&p1=camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/RouteResource.java&r1=745562&r2=745637&rev=745637&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/RouteResource.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
Wed Feb 18 20:23:44 2009
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.rest.resources;
+package org.apache.camel.web.resources;
 
 import org.apache.camel.model.RouteType;
 

Copied: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java
(from r745562, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/RoutesResource.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java?p2=camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java&p1=camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/RoutesResource.java&r1=745562&r2=745637&rev=745637&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/resources/RoutesResource.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java
Wed Feb 18 20:23:44 2009
@@ -15,10 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.rest.resources;
+package org.apache.camel.web.resources;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.Endpoint;
 import org.apache.camel.model.RouteType;
 import org.apache.camel.model.RoutesType;
 

Copied: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CamelResourceConfig.java
(from r745562, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/util/CamelResourceConfig.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CamelResourceConfig.java?p2=camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CamelResourceConfig.java&p1=camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/util/CamelResourceConfig.java&r1=745562&r2=745637&rev=745637&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/util/CamelResourceConfig.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CamelResourceConfig.java
Wed Feb 18 20:23:44 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.rest.util;
+package org.apache.camel.web.util;
 
 import com.sun.jersey.api.core.PackagesResourceConfig;
 
@@ -27,7 +27,7 @@
  */
 public class CamelResourceConfig extends PackagesResourceConfig {
     public CamelResourceConfig() {
-        super("org.apache.camel.rest");
+        super("org.apache.camel.web");
     }
 
     public Map<String, MediaType> getMediaTypeMappings() {

Copied: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JAXBContextResolver.java
(from r745585, camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/util/JAXBContextResolver.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JAXBContextResolver.java?p2=camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JAXBContextResolver.java&p1=camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/util/JAXBContextResolver.java&r1=745585&r2=745637&rev=745637&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/rest/util/JAXBContextResolver.java
(original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JAXBContextResolver.java
Wed Feb 18 20:23:44 2009
@@ -14,24 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.rest.util;
+package org.apache.camel.web.util;
 
 
 import com.sun.jersey.api.json.JSONConfiguration;
 import com.sun.jersey.api.json.JSONJAXBContext;
-import org.apache.camel.model.RouteType;
-import org.apache.camel.model.RoutesType;
 import org.apache.camel.model.Constants;
-import org.apache.camel.rest.model.Camel;
-import org.apache.camel.rest.model.EndpointLink;
-import org.apache.camel.rest.model.Endpoints;
 
 import javax.ws.rs.ext.ContextResolver;
 import javax.ws.rs.ext.Provider;
 import javax.xml.bind.JAXBContext;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
 
 /**
  * @version $Revision$
@@ -47,7 +39,7 @@
         JSONConfiguration.Builder builder = JSONConfiguration.mapped();
         //JSONConfiguration.Builder builder = JSONConfiguration.natural();
         //this.context = new JSONJAXBContext(builder.build(), cTypes);
-        this.packages = Constants.JAXB_CONTEXT_PACKAGES + ":org.apache.camel.rest.model";
+        this.packages = Constants.JAXB_CONTEXT_PACKAGES + ":org.apache.camel.web.model";
         this.context = new JSONJAXBContext(builder.build(), packages);
     }
 

Modified: camel/trunk/components/camel-web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/webapp/WEB-INF/web.xml?rev=745637&r1=745636&r2=745637&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/webapp/WEB-INF/web.xml (original)
+++ camel/trunk/components/camel-web/src/main/webapp/WEB-INF/web.xml Wed Feb 18 20:23:44 2009
@@ -45,7 +45,7 @@
     <filter-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</filter-class>
     <init-param>
       <param-name>com.sun.jersey.config.property.resourceConfigClass</param-name>
-      <param-value>org.apache.camel.rest.util.CamelResourceConfig</param-value>
+      <param-value>org.apache.camel.web.util.CamelResourceConfig</param-value>
     </init-param>
     <init-param>
       <param-name>com.sun.jersey.config.feature.Redirect</param-name>
@@ -57,7 +57,7 @@
     </init-param>
     <init-param>
       <param-name>com.sun.jersey.config.property.packages</param-name>
-      <param-value>org.apache.camel.rest</param-value>
+      <param-value>org.apache.camel.web</param-value>
     </init-param>
     <init-param>
       <param-name>com.sun.jersey.config.property.WebPageContentRegex</param-name>

Copied: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/Main.java (from
r745452, camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/Main.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/Main.java?p2=camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/Main.java&p1=camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/Main.java&r1=745452&r2=745637&rev=745637&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/Main.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/Main.java Wed Feb
18 20:23:44 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.rest;
+package org.apache.camel.web;
 
 import org.mortbay.jetty.Connector;
 import org.mortbay.jetty.Handler;

Propchange: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/Main.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/Main.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/EndpointsHtmlTest.java
(from r745452, camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/resources/EndpointsHtmlTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/EndpointsHtmlTest.java?p2=camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/EndpointsHtmlTest.java&p1=camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/resources/EndpointsHtmlTest.java&r1=745452&r2=745637&rev=745637&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/resources/EndpointsHtmlTest.java
(original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/EndpointsHtmlTest.java
Wed Feb 18 20:23:44 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.rest.resources;
+package org.apache.camel.web.resources;
 
 
 /**

Propchange: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/EndpointsHtmlTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/EndpointsHtmlTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/EndpointsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/EndpointsTest.java?rev=745637&view=auto
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/EndpointsTest.java
(added)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/EndpointsTest.java
Wed Feb 18 20:23:44 2009
@@ -0,0 +1,64 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.web.resources;
+
+import java.util.List;
+
+import org.apache.camel.web.model.Camel;
+import org.apache.camel.web.model.EndpointLink;
+import org.apache.camel.web.model.Endpoints;
+
+/**
+ * @version $Revision: 735413 $
+ */
+public class EndpointsTest extends TestSupport {
+
+    public void testCamelAsXml() throws Exception {
+        Camel camel = resource("/").accept("application/xml").get(Camel.class);
+        assertValidCamel(camel);
+
+        camel = resource("/.xml").get(Camel.class);
+        assertValidCamel(camel);
+    }
+
+    public void testEndpointsAsXml() throws Exception {
+        Endpoints endpoints = resource("endpoints").accept("application/xml").get(Endpoints.class);
+        assertValidEndpoints(endpoints);
+
+        endpoints = resource("endpoints.xml").get(Endpoints.class);
+        assertValidEndpoints(endpoints);
+    }
+
+
+    // TODO test as JSON
+
+
+    protected void assertValidCamel(Camel camel) {
+        assertNotNull("Should have found camel", camel);
+
+        System.out.println("Found: " + camel);
+    }
+
+    protected void assertValidEndpoints(Endpoints endpoints) {
+        assertNotNull("Should have found endpoints", endpoints);
+
+        System.out.println("Found: " + endpoints.getEndpoints());
+
+        List<EndpointLink> list = endpoints.getEndpoints();
+        assertTrue("Should have received some endpoints!", !list.isEmpty());
+    }
+}
\ No newline at end of file

Propchange: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/EndpointsTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/RoutesTest.java
(from r745452, camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/resources/RoutesTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/RoutesTest.java?p2=camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/RoutesTest.java&p1=camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/resources/RoutesTest.java&r1=745452&r2=745637&rev=745637&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/resources/RoutesTest.java
(original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/RoutesTest.java
Wed Feb 18 20:23:44 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.rest.resources;
+package org.apache.camel.web.resources;
 
 
 /**

Propchange: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/RoutesTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/RoutesTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/StaticContentTest.java
(from r745452, camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/resources/StaticContentTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/StaticContentTest.java?p2=camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/StaticContentTest.java&p1=camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/resources/StaticContentTest.java&r1=745452&r2=745637&rev=745637&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/resources/StaticContentTest.java
(original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/StaticContentTest.java
Wed Feb 18 20:23:44 2009
@@ -15,9 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.rest.resources;
-
-import com.sun.jersey.api.client.WebResource;
+package org.apache.camel.web.resources;
 
 /**
  * @version $Revision: 1.1 $

Propchange: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/StaticContentTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/TestSupport.java
(from r745452, camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/resources/TestSupport.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/TestSupport.java?p2=camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/TestSupport.java&p1=camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/resources/TestSupport.java&r1=745452&r2=745637&rev=745637&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/resources/TestSupport.java
(original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/TestSupport.java
Wed Feb 18 20:23:44 2009
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.rest.resources;
+package org.apache.camel.web.resources;
 
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.WebResource;
 import com.sun.jersey.api.client.config.ClientConfig;
 import com.sun.jersey.api.client.config.DefaultClientConfig;
 import junit.framework.TestCase;
-import org.apache.camel.rest.Main;
+import org.apache.camel.web.Main;
 
 /**
  * @version $Revision$

Propchange: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/TestSupport.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/TestSupport.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/spring/CamelRouteTest.java
(from r745556, camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/spring/CamelRouteTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/spring/CamelRouteTest.java?p2=camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/spring/CamelRouteTest.java&p1=camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/spring/CamelRouteTest.java&r1=745556&r2=745637&rev=745637&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/rest/spring/CamelRouteTest.java
(original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/spring/CamelRouteTest.java
Wed Feb 18 20:23:44 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.rest.spring;
+package org.apache.camel.web.spring;
 
 import java.io.StringWriter;
 import java.util.List;
@@ -25,7 +25,7 @@
 import org.apache.camel.CamelContext;
 import org.apache.camel.model.RouteType;
 import org.apache.camel.model.RoutesType;
-import org.apache.camel.rest.resources.CamelContextResource;
+import org.apache.camel.web.resources.CamelContextResource;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.FileSystemXmlApplicationContext;
 



Mime
View raw message