You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/02/21 10:38:14 UTC
svn commit: r746468 - in /camel/trunk/components: camel-activemq-web/
camel-web-standalone/
camel-web-standalone/src/main/java/org/apache/camel/web/
camel-web/src/main/java/org/apache/camel/web/model/
camel-web/src/main/java/org/apache/camel/web/resour...
Author: davsclaus
Date: Sat Feb 21 09:38:13 2009
New Revision: 746468
URL: http://svn.apache.org/viewvc?rev=746468&view=rev
Log:
Fixed checkstyle issues
Modified:
camel/trunk/components/camel-activemq-web/ (props changed)
camel/trunk/components/camel-web-standalone/ (props changed)
camel/trunk/components/camel-web-standalone/src/main/java/org/apache/camel/web/Main.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Camel.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/EndpointLink.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Endpoints.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/package-info.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelChildResourceSupport.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelContextResource.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/Constants.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointResource.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointsResource.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ExchangeResource.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CamelResourceConfig.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JAXBContextResolver.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/RoutesTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/StaticContentTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/TestSupport.java
Propchange: camel/trunk/components/camel-activemq-web/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Feb 21 09:38:13 2009
@@ -0,0 +1,8 @@
+.project
+.checkstyle
+.pmd
+.classpath
+target
+.settings
+eclipse-classes
+*.i??
Propchange: camel/trunk/components/camel-web-standalone/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Feb 21 09:38:13 2009
@@ -0,0 +1,8 @@
+.project
+.checkstyle
+.pmd
+.classpath
+target
+.settings
+eclipse-classes
+*.i??
Modified: camel/trunk/components/camel-web-standalone/src/main/java/org/apache/camel/web/Main.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web-standalone/src/main/java/org/apache/camel/web/Main.java?rev=746468&r1=746467&r2=746468&view=diff
==============================================================================
--- camel/trunk/components/camel-web-standalone/src/main/java/org/apache/camel/web/Main.java (original)
+++ camel/trunk/components/camel-web-standalone/src/main/java/org/apache/camel/web/Main.java Sat Feb 21 09:38:13 2009
@@ -16,8 +16,6 @@
*/
package org.apache.camel.web;
-import org.mortbay.jetty.runner.Runner;
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -28,17 +26,23 @@
import java.util.Arrays;
import java.util.List;
+import org.mortbay.jetty.runner.Runner;
+
/**
* A bootstrap class for starting Jetty Runner using an embedded war
*
* @version $Revision: 745637 $
*/
-public class Main {
+public final class Main {
private static final String WAR_POSTFIX = ".war";
private static final String WAR_NAME = "camel-web";
private static final String WAR_FILENAME = WAR_NAME + WAR_POSTFIX;
private static final int KB = 1024;
+ private Main() {
+ // is started from main
+ }
+
public static void main(String[] args) throws Exception {
System.out.println("Welcome to Apache Camel!");
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Camel.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Camel.java?rev=746468&r1=746467&r2=746468&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Camel.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Camel.java Sat Feb 21 09:38:13 2009
@@ -16,13 +16,13 @@
*/
package org.apache.camel.web.model;
-import org.apache.camel.CamelContext;
-
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
+import org.apache.camel.CamelContext;
+
/**
* @version $Revision$
*/
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/EndpointLink.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/EndpointLink.java?rev=746468&r1=746467&r2=746468&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/EndpointLink.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/EndpointLink.java Sat Feb 21 09:38:13 2009
@@ -16,13 +16,13 @@
*/
package org.apache.camel.web.model;
-import org.apache.camel.Endpoint;
-
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
+import org.apache.camel.Endpoint;
+
/**
* @version $Revision$
*/
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Endpoints.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Endpoints.java?rev=746468&r1=746467&r2=746468&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Endpoints.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/model/Endpoints.java Sat Feb 21 09:38:13 2009
@@ -16,17 +16,17 @@
*/
package org.apache.camel.web.model;
-import org.apache.camel.CamelContext;
-import org.apache.camel.Endpoint;
-import org.apache.camel.util.ObjectHelper;
-
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Endpoint;
+import org.apache.camel.util.ObjectHelper;
/**
* @version $Revision$
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=746468&r1=746467&r2=746468&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 Sat Feb 21 09:38:13 2009
@@ -19,5 +19,6 @@
* 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/web", 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/main/java/org/apache/camel/web/resources/CamelChildResourceSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelChildResourceSupport.java?rev=746468&r1=746467&r2=746468&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelChildResourceSupport.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelChildResourceSupport.java Sat Feb 21 09:38:13 2009
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,7 +6,7 @@
* (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
+ * 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,
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelContextResource.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelContextResource.java?rev=746468&r1=746467&r2=746468&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelContextResource.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelContextResource.java Sat Feb 21 09:38:13 2009
@@ -16,6 +16,11 @@
*/
package org.apache.camel.web.resources;
+import javax.annotation.PreDestroy;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
import com.sun.jersey.api.view.ImplicitProduces;
import com.sun.jersey.spi.inject.Inject;
@@ -24,13 +29,6 @@
import org.apache.camel.ProducerTemplate;
import org.apache.camel.web.model.Camel;
-import javax.annotation.PreDestroy;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-
/**
* The root Camel resource from which all other resources can be navigated such as for <code>endpoints</code>
* or <code>routes</code>
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=746468&r1=746467&r2=746468&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 Sat Feb 21 09:38:13 2009
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,7 +6,7 @@
* (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
+ * 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,
@@ -20,10 +19,15 @@
/**
* @version $Revision: 1.1 $
*/
-public class Constants {
+public final class Constants {
+
public static final String HTML_MIME_TYPES = "text/html;qs=5";
public static final String DATA_MIME_TYPES = "text/xml,application/xml,application/json";
public static final String DOT_MIMETYPE = "text/vnd.graphviz";
+
+ private Constants() {
+ }
+
}
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointResource.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointResource.java?rev=746468&r1=746467&r2=746468&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointResource.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointResource.java Sat Feb 21 09:38:13 2009
@@ -16,15 +16,11 @@
*/
package org.apache.camel.web.resources;
-import com.sun.jersey.api.representation.Form;
-import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-import org.apache.camel.Processor;
-import org.apache.camel.web.model.EndpointLink;
-import org.apache.camel.spi.BrowsableEndpoint;
-import org.apache.camel.util.ExchangeHelper;
-
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import javax.ws.rs.Consumes;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
@@ -34,11 +30,15 @@
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+
+import com.sun.jersey.api.representation.Form;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.Processor;
+import org.apache.camel.spi.BrowsableEndpoint;
+import org.apache.camel.util.ExchangeHelper;
+import org.apache.camel.web.model.EndpointLink;
/**
* A Camel <a href="http://camel.apache.org/endpoint.html">Endpoint</a>
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointsResource.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointsResource.java?rev=746468&r1=746467&r2=746468&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointsResource.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointsResource.java Sat Feb 21 09:38:13 2009
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,7 +6,7 @@
* (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
+ * 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,
@@ -17,12 +16,9 @@
*/
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.web.model.EndpointLink;
-import org.apache.camel.web.model.Endpoints;
-
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
@@ -33,13 +29,16 @@
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.List;
+
+import com.sun.jersey.api.representation.Form;
+import com.sun.jersey.api.view.Viewable;
+import org.apache.camel.Endpoint;
+import org.apache.camel.web.model.EndpointLink;
+import org.apache.camel.web.model.Endpoints;
/**
* The active endpoints in Camel
- *
+ *
* @version $Revision: 1.1 $
*/
public class EndpointsResource extends CamelChildResourceSupport {
@@ -109,7 +108,7 @@
* value in the form being used to specify the endpoints unique URI.
*
* @param formData is the form data POSTed typically from a HTML form with the <code>uri</code> field used to create
- * the endpoint
+ * the endpoint
*/
@POST
@Consumes("application/x-www-form-urlencoded")
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ExchangeResource.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ExchangeResource.java?rev=746468&r1=746467&r2=746468&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ExchangeResource.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ExchangeResource.java Sat Feb 21 09:38:13 2009
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,7 +6,7 @@
* (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
+ * 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,
@@ -17,6 +16,8 @@
*/
package org.apache.camel.web.resources;
+import java.util.Map;
+
import com.sun.jersey.api.view.ImplicitProduces;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
@@ -25,10 +26,9 @@
import org.apache.camel.Message;
import org.apache.camel.spi.UnitOfWork;
-import java.util.Map;
-
/**
- * A Camel <a href="http://camel.apache.org/exchange.html">message exchange</a>
+ * A Camel <a href="http://camel.apache.org/exchange.html">message exchange</a>
+ *
* @version $Revision: 1.1 $
*/
@ImplicitProduces(Constants.HTML_MIME_TYPES)
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java?rev=746468&r1=746467&r2=746468&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java Sat Feb 21 09:38:13 2009
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,7 +6,7 @@
* (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
+ * 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,
@@ -17,17 +16,17 @@
*/
package org.apache.camel.web.resources;
-import org.apache.camel.model.RouteType;
-import org.apache.camel.view.RouteDotGenerator;
-
+import java.io.IOException;
import javax.ws.rs.GET;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
-import java.io.IOException;
+
+import org.apache.camel.model.RouteType;
+import org.apache.camel.view.RouteDotGenerator;
/**
* A single Camel Route which is used to implement one or more
- * <a href="http://camel.apache.org/enterprise-integration-patterns.html">Enterprise Integration Paterns</a>
+ * <a href="http://camel.apache.org/enterprise-integration-patterns.html">Enterprise Integration Paterns</a>
*
* @version $Revision: 1.1 $
*/
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java?rev=746468&r1=746467&r2=746468&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java Sat Feb 21 09:38:13 2009
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,7 +6,7 @@
* (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
+ * 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,
@@ -17,22 +16,22 @@
*/
package org.apache.camel.web.resources;
-import org.apache.camel.CamelContext;
-import org.apache.camel.view.RouteDotGenerator;
-import org.apache.camel.model.RouteType;
-import org.apache.camel.model.RoutesType;
-
+import java.io.IOException;
+import java.util.List;
import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
-import java.util.List;
-import java.io.IOException;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.model.RouteType;
+import org.apache.camel.model.RoutesType;
+import org.apache.camel.view.RouteDotGenerator;
/**
* The active routes in Camel which are used to implement one or more
- * <a href="http://camel.apache.org/enterprise-integration-patterns.html">Enterprise Integration Paterns</a>
+ * <a href="http://camel.apache.org/enterprise-integration-patterns.html">Enterprise Integration Paterns</a>
*
* @version $Revision: 1.1 $
*/
@@ -69,10 +68,10 @@
}
/**
- * Looks up an individual route
- */
- @Path("{id}")
- public RouteResource getEndpoint(@PathParam("id") String id) {
+ * Looks up an individual route
+ */
+ @Path("{id}")
+ public RouteResource getEndpoint(@PathParam("id") String id) {
List<RouteType> list = getRoutes();
for (RouteType routeType : list) {
if (routeType.getId().equals(id)) {
@@ -80,7 +79,7 @@
}
}
return null;
- }
+ }
// Properties
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CamelResourceConfig.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CamelResourceConfig.java?rev=746468&r1=746467&r2=746468&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CamelResourceConfig.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CamelResourceConfig.java Sat Feb 21 09:38:13 2009
@@ -16,6 +16,10 @@
*/
package org.apache.camel.web.util;
+import java.util.HashMap;
+import java.util.Map;
+import javax.ws.rs.core.MediaType;
+
import com.sun.jersey.api.core.PackagesResourceConfig;
import com.sun.jersey.api.core.ResourceConfig;
import com.sun.jersey.api.wadl.config.WadlGeneratorConfig;
@@ -24,10 +28,6 @@
import com.sun.jersey.server.wadl.generators.resourcedoc.WadlGeneratorResourceDocSupport;
import org.apache.camel.web.resources.Constants;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* @version $Revision$
*/
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JAXBContextResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JAXBContextResolver.java?rev=746468&r1=746467&r2=746468&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JAXBContextResolver.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JAXBContextResolver.java Sat Feb 21 09:38:13 2009
@@ -17,14 +17,14 @@
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.Constants;
-
import javax.ws.rs.ext.ContextResolver;
import javax.ws.rs.ext.Provider;
import javax.xml.bind.JAXBContext;
+import com.sun.jersey.api.json.JSONConfiguration;
+import com.sun.jersey.api.json.JSONJAXBContext;
+import org.apache.camel.model.Constants;
+
/**
* A resolver of the JAXB context primed for the Camel XML languages
* which supports JSON as well as XML encoding
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=746468&r1=746467&r2=746468&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 Sat Feb 21 09:38:13 2009
@@ -16,11 +16,11 @@
*/
package org.apache.camel.web.resources;
-import org.apache.camel.model.RoutesType;
-import org.apache.camel.model.RouteType;
-
import java.util.List;
+import org.apache.camel.model.RouteType;
+import org.apache.camel.model.RoutesType;
+
/**
* @version $Revision$
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/StaticContentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/StaticContentTest.java?rev=746468&r1=746467&r2=746468&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/StaticContentTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/StaticContentTest.java Sat Feb 21 09:38:13 2009
@@ -1,5 +1,4 @@
/**
- *
* 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.
@@ -7,7 +6,7 @@
* (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
+ * 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,
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/TestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/TestSupport.java?rev=746468&r1=746467&r2=746468&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/TestSupport.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/resources/TestSupport.java Sat Feb 21 09:38:13 2009
@@ -16,11 +16,13 @@
*/
package org.apache.camel.web.resources;
+import junit.framework.TestCase;
+
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.web.Main;
/**