Author: jstrachan Date: Thu Mar 12 17:59:30 2009 New Revision: 752954 URL: http://svn.apache.org/viewvc?rev=752954&view=rev Log: allow components to be viewed for CAMEL-1355 along with sorting component and language IDs
Added: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ComponentResource.java - copied, changed from r752938, camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguageResource.java camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ComponentsResource.java - copied, changed from r752938, camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguagesResource.java camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/ComponentResource/ camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/ComponentResource/index.jsp - copied, changed from r752938, camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/LanguageResource/index.jsp camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/ComponentsResource/ camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/ComponentsResource/index.jsp - copied, changed from r752938, camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/LanguagesResource/index.jsp Modified: 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/ConvertersFromResource.java camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ConvertersResource.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/LanguageResource.java camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguagesResource.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/RouteStatusResource.java camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/CamelContextResource/index.jsp 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=752954&r1=752953&r2=752954&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 Thu Mar 12 17:59:30 2009 @@ -16,24 +16,22 @@ */ package org.apache.camel.web.resources; -import java.util.Map; -import java.util.TreeMap; - -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; import com.sun.jersey.spi.resource.Singleton; - import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.apache.camel.impl.ServiceSupport; 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; +import java.util.Map; +import java.util.TreeMap; + /** * The root Camel resource from which all other resources can be navigated such as for <code>endpoints</code> * or <code>routes</code> @@ -103,30 +101,44 @@ } /** - * Returns the active endpoints + * Returns the active components */ - @Path("endpoints") - public EndpointsResource getEndpointsResource() { - return new EndpointsResource(this); + @Path("components") + public ComponentsResource getComponents() { + return new ComponentsResource(this); } /** - * Returns the active routes + * Returns the active type converters */ - @Path("routes") - public RoutesResource getRoutesResource() { - return new RoutesResource(this); - } - @Path("converters") public ConvertersResource getConvertersResource() { return new ConvertersResource(this); } + /** + * Returns the active endpoints + */ + @Path("endpoints") + public EndpointsResource getEndpointsResource() { + return new EndpointsResource(this); + } + + /** + * Returns the active languages + */ @Path("languages") public LanguagesResource getLanguages() { return new LanguagesResource(this); } + /** + * Returns the active routes + */ + @Path("routes") + public RoutesResource getRoutesResource() { + return new RoutesResource(this); + } + } Copied: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ComponentResource.java (from r752938, camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguageResource.java) URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ComponentResource.java?p2=camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ComponentResource.java&p1=camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguageResource.java&r1=752938&r2=752954&rev=752954&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguageResource.java (original) +++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ComponentResource.java Thu Mar 12 17:59:30 2009 @@ -16,25 +16,17 @@ */ package org.apache.camel.web.resources; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; - -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; - -import org.apache.camel.impl.converter.DefaultTypeConverter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; /** * @version $Revision: 1.1 $ */ -public class LanguageResource extends CamelChildResourceSupport { - private static final transient Log LOG = LogFactory.getLog(LanguageResource.class); +public class ComponentResource extends CamelChildResourceSupport { + private static final transient Log LOG = LogFactory.getLog(ComponentResource.class); private String id; - public LanguageResource(CamelContextResource contextResource, String id) { + public ComponentResource(CamelContextResource contextResource, String id) { super(contextResource); this.id = id; } Copied: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ComponentsResource.java (from r752938, camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguagesResource.java) URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ComponentsResource.java?p2=camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ComponentsResource.java&p1=camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguagesResource.java&r1=752938&r2=752954&rev=752954&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguagesResource.java (original) +++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ComponentsResource.java Thu Mar 12 17:59:30 2009 @@ -16,42 +16,42 @@ */ package org.apache.camel.web.resources; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; -import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import javax.ws.rs.Path; import javax.ws.rs.PathParam; - -import org.apache.camel.impl.converter.DefaultTypeConverter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; /** - * Represents the list of languages available in the current camel context + * Represents the list of the currently active <a href="http://camel.apache.org/component.html">components</a> + * in the current camel context * * @version $Revision: 1.1 $ */ -public class LanguagesResource extends CamelChildResourceSupport { - private static final transient Log LOG = LogFactory.getLog(LanguagesResource.class); +public class ComponentsResource extends CamelChildResourceSupport { + private static final transient Log LOG = LogFactory.getLog(ComponentsResource.class); - public LanguagesResource(CamelContextResource contextResource) { + public ComponentsResource(CamelContextResource contextResource) { super(contextResource); } - public List<String> getLanguageIds() { - return getCamelContext().getLanguageNames(); + public List<String> getComponentIds() { + List<String> answer = new ArrayList<String>(getCamelContext().getComponentNames()); + Collections.sort(answer); + return answer; } /** - * Returns a specific language + * Returns a specific component */ @Path("{id}") - public LanguageResource getLanguage(@PathParam("id") String id) { + public ComponentResource getLanguage(@PathParam("id") String id) { if (id == null) { return null; } - return new LanguageResource(getContextResource(), id); + return new ComponentResource(getContextResource(), id); } } \ No newline at end of file Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ConvertersFromResource.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ConvertersFromResource.java?rev=752954&r1=752953&r2=752954&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ConvertersFromResource.java (original) +++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ConvertersFromResource.java Thu Mar 12 17:59:30 2009 @@ -16,12 +16,12 @@ */ package org.apache.camel.web.resources; -import java.util.Map; -import java.util.TreeMap; - import org.apache.camel.TypeConverter; import org.apache.camel.impl.converter.DefaultTypeConverter; +import java.util.Map; +import java.util.TreeMap; + /** * @version $Revision: 1.1 $ */ Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ConvertersResource.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ConvertersResource.java?rev=752954&r1=752953&r2=752954&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ConvertersResource.java (original) +++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/ConvertersResource.java Thu Mar 12 17:59:30 2009 @@ -16,17 +16,16 @@ */ package org.apache.camel.web.resources; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; - -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; - import org.apache.camel.impl.converter.DefaultTypeConverter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; + /** * @version $Revision: 1.1 $ */ @@ -61,7 +60,7 @@ public ConvertersFromResource getConvertersFrom(@PathParam("type") Class type) { */ - public ConvertersFromResource getConvertersFrom(@PathParam("type") String typeName) { +public ConvertersFromResource getConvertersFrom(@PathParam("type") String typeName) { Class type = getCamelContext().getClassResolver().resolveClass(typeName, getClass().getClassLoader()); if (type == null) { return null; 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=752954&r1=752953&r2=752954&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 Thu Mar 12 17:59:30 2009 @@ -16,11 +16,15 @@ */ package org.apache.camel.web.resources; -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; + import javax.ws.rs.Consumes; import javax.ws.rs.POST; import javax.ws.rs.Path; @@ -30,15 +34,11 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; - -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; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * 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=752954&r1=752953&r2=752954&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 Thu Mar 12 17:59:30 2009 @@ -16,9 +16,12 @@ */ package org.apache.camel.web.resources; -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; + import javax.ws.rs.Consumes; import javax.ws.rs.GET; import javax.ws.rs.POST; @@ -29,12 +32,9 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; - -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; /** * The active endpoints in Camel 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=752954&r1=752953&r2=752954&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 Thu Mar 12 17:59:30 2009 @@ -16,10 +16,6 @@ */ package org.apache.camel.web.resources; -import java.util.Map; -import java.util.SortedMap; -import java.util.TreeMap; - import com.sun.jersey.api.view.ImplicitProduces; import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; @@ -28,6 +24,9 @@ import org.apache.camel.Message; import org.apache.camel.spi.UnitOfWork; +import java.util.Map; +import java.util.TreeMap; + /** * A Camel <a href="http://camel.apache.org/exchange.html">message exchange</a> * Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguageResource.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguageResource.java?rev=752954&r1=752953&r2=752954&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguageResource.java (original) +++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguageResource.java Thu Mar 12 17:59:30 2009 @@ -16,14 +16,6 @@ */ package org.apache.camel.web.resources; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; - -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; - -import org.apache.camel.impl.converter.DefaultTypeConverter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguagesResource.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguagesResource.java?rev=752954&r1=752953&r2=752954&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguagesResource.java (original) +++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/LanguagesResource.java Thu Mar 12 17:59:30 2009 @@ -16,20 +16,18 @@ */ package org.apache.camel.web.resources; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; -import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import javax.ws.rs.Path; import javax.ws.rs.PathParam; - -import org.apache.camel.impl.converter.DefaultTypeConverter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; /** - * Represents the list of languages available in the current camel context + * Represents the list of the currently active <a href="http://camel.apache.org/languages.html">languages</a> + * in the current camel context * * @version $Revision: 1.1 $ */ @@ -41,7 +39,9 @@ } public List<String> getLanguageIds() { - return getCamelContext().getLanguageNames(); + List<String> answer = new ArrayList<String>(getCamelContext().getLanguageNames()); + Collections.sort(answer); + return answer; } /** 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=752954&r1=752953&r2=752954&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 Thu Mar 12 17:59:30 2009 @@ -16,8 +16,8 @@ */ package org.apache.camel.web.resources; -import java.io.IOException; -import java.io.StringWriter; +import org.apache.camel.model.RouteDefinition; +import org.apache.camel.view.RouteDotGenerator; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -26,9 +26,8 @@ import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; - -import org.apache.camel.model.RouteDefinition; -import org.apache.camel.view.RouteDotGenerator; +import java.io.IOException; +import java.io.StringWriter; /** * A single Camel Route which is used to implement one or more Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteStatusResource.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteStatusResource.java?rev=752954&r1=752953&r2=752954&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteStatusResource.java (original) +++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteStatusResource.java Thu Mar 12 17:59:30 2009 @@ -16,7 +16,10 @@ */ package org.apache.camel.web.resources; -import java.net.URI; +import com.sun.jersey.api.representation.Form; +import org.apache.camel.CamelContext; +import org.apache.camel.ServiceStatus; +import org.apache.camel.model.RouteDefinition; import javax.ws.rs.Consumes; import javax.ws.rs.GET; @@ -24,12 +27,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; - -import com.sun.jersey.api.representation.Form; - -import org.apache.camel.CamelContext; -import org.apache.camel.ServiceStatus; -import org.apache.camel.model.RouteDefinition; +import java.net.URI; /** * Represents the status of a single single Camel Route which is used to implement one or more 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=752954&r1=752953&r2=752954&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 Thu Mar 12 17:59:30 2009 @@ -16,18 +16,18 @@ */ package org.apache.camel.web.resources; -import java.io.IOException; -import java.util.List; +import org.apache.camel.CamelContext; +import org.apache.camel.model.RouteDefinition; +import org.apache.camel.model.RoutesDefinition; +import org.apache.camel.view.RouteDotGenerator; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; - -import org.apache.camel.CamelContext; -import org.apache.camel.model.RouteDefinition; -import org.apache.camel.model.RoutesDefinition; -import org.apache.camel.view.RouteDotGenerator; +import java.io.IOException; +import java.util.List; /** * The active routes in Camel which are used to implement one or more Modified: camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/CamelContextResource/index.jsp URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/CamelContextResource/index.jsp?rev=752954&r1=752953&r2=752954&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/CamelContextResource/index.jsp (original) +++ camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/CamelContextResource/index.jsp Thu Mar 12 17:59:30 2009 @@ -27,6 +27,9 @@ <ul> <li> + <a href="<c:url value='/components'/>" title="View the available components you can use with Camel">Components</a> + </li> + <li> <a href="<c:url value='/languages'/>" title="View the available languages you can use with Camel">Languages</a> </li> <li> Copied: camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/ComponentResource/index.jsp (from r752938, camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/LanguageResource/index.jsp) URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/ComponentResource/index.jsp?p2=camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/ComponentResource/index.jsp&p1=camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/LanguageResource/index.jsp&r1=752938&r2=752954&rev=752954&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/LanguageResource/index.jsp (original) +++ camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/ComponentResource/index.jsp Thu Mar 12 17:59:30 2009 @@ -8,7 +8,7 @@ <h1>${it.id}</h1> <p> - Welcome to the ${it.id} language. + Welcome to the ${it.id} component. </p> <p> For more information see the <a href="http://camel.apache.org/${it.id}.html">documentation</a> Copied: camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/ComponentsResource/index.jsp (from r752938, camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/LanguagesResource/index.jsp) URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/ComponentsResource/index.jsp?p2=camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/ComponentsResource/index.jsp&p1=camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/LanguagesResource/index.jsp&r1=752938&r2=752954&rev=752954&view=diff ============================================================================== --- camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/LanguagesResource/index.jsp (original) +++ camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/ComponentsResource/index.jsp Thu Mar 12 17:59:30 2009 @@ -1,21 +1,21 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>Languages</title> + <title>Components</title> </head> <body> -<h1>Languages</h1> +<h1>Components</h1> <table> <tr> - <th>Language</th> + <th>Component</th> <th>Documentation</th> </tr> - <c:forEach items="${it.languageIds}" var="id"> + <c:forEach items="${it.componentIds}" var="id"> <tr> - <td><a href="languages/${id}">${id}</a></td> + <td><a href="components/${id}">${id}</a></td> <td><a href="http://camel.apache.org/${id}.html">documentation</a></td> </tr> </c:forEach>