You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2009/02/20 12:16:32 UTC
svn commit: r746209 - in /camel/trunk/components/camel-web/src/main:
java/org/apache/camel/web/util/
webapp/org/apache/camel/web/resources/EndpointResource/
webapp/org/apache/camel/web/resources/EndpointsResource/
webapp/org/apache/camel/web/resources/...
Author: jstrachan
Date: Fri Feb 20 11:16:32 2009
New Revision: 746209
URL: http://svn.apache.org/viewvc?rev=746209&view=rev
Log:
CAMEL-1355 fixed broken test - whoops, bad James!
Modified:
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/main/webapp/org/apache/camel/web/resources/EndpointResource/index.jsp
camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/EndpointResource/send.jsp
camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/EndpointsResource/index.jsp
camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/RoutesResource/index.jsp
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=746209&r1=746208&r2=746209&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 Fri Feb 20 11:16:32 2009
@@ -22,7 +22,6 @@
import com.sun.jersey.server.wadl.generators.WadlGeneratorApplicationDoc;
import com.sun.jersey.server.wadl.generators.WadlGeneratorGrammarsSupport;
import com.sun.jersey.server.wadl.generators.resourcedoc.WadlGeneratorResourceDocSupport;
-import org.apache.camel.web.resources.CamelContextResource;
import org.apache.camel.web.resources.Constants;
import javax.ws.rs.core.MediaType;
@@ -40,7 +39,7 @@
protected static Map<String, Object> createProperties() {
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(PackagesResourceConfig.PROPERTY_PACKAGES, CamelContextResource.class.getPackage().getName());
+ properties.put(PackagesResourceConfig.PROPERTY_PACKAGES, "org.apache.camel.web");
WadlGeneratorConfig config = WadlGeneratorConfig
.generator(WadlGeneratorApplicationDoc.class)
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=746209&r1=746208&r2=746209&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 Fri Feb 20 11:16:32 2009
@@ -40,6 +40,8 @@
//JSONConfiguration.Builder builder = JSONConfiguration.natural();
//this.context = new JSONJAXBContext(builder.build(), cTypes);
this.packages = Constants.JAXB_CONTEXT_PACKAGES + ":org.apache.camel.web.model";
+
+ System.out.println(">>> Creating a JAXBJSON context with packages " + packages);
this.context = new JSONJAXBContext(builder.build(), packages);
}
Modified: camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/EndpointResource/index.jsp
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/EndpointResource/index.jsp?rev=746209&r1=746208&r2=746209&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/EndpointResource/index.jsp (original)
+++ camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/EndpointResource/index.jsp Fri Feb 20 11:16:32 2009
@@ -8,7 +8,7 @@
<h1>Endpoint: ${it.uri}</h1>
<ul>
- <li><a href="${it.href}/send">Send to this endpoint</a></li>
+ <li><a href='<c:url value="${it.href}/send"/>'>Send to this endpoint</a></li>
</ul>
<c:if test="${it.browsableEndpoint != null}">
@@ -18,7 +18,7 @@
</tr>
<c:forEach items="${it.browsableEndpoint.exchanges}" var="exchange">
<tr>
- <td><a href="${it.href}/messages/${exchange.exchangeId}" title="View this message">${exchange.exchangeId}</a></td>
+ <td><a href='<c:url value="${it.href}/messages/${exchange.exchangeId}"/>' title="View this message">${exchange.exchangeId}</a></td>
</tr>
</c:forEach>
</table>
Modified: camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/EndpointResource/send.jsp
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/EndpointResource/send.jsp?rev=746209&r1=746208&r2=746209&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/EndpointResource/send.jsp (original)
+++ camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/EndpointResource/send.jsp Fri Feb 20 11:16:32 2009
@@ -7,7 +7,7 @@
<h1>Endpoint: ${it.uri}</h1>
-<form action="${it.href}" method="post">
+<form action='<c:url value="${it.href}"/>' method="post">
<input type="submit" value="Send"> <input type="reset"> <br>
<textarea name="body" rows="30" cols="80"></textarea>
</form>
Modified: camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/EndpointsResource/index.jsp
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/EndpointsResource/index.jsp?rev=746209&r1=746208&r2=746209&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/EndpointsResource/index.jsp (original)
+++ camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/EndpointsResource/index.jsp Fri Feb 20 11:16:32 2009
@@ -9,13 +9,13 @@
<ul>
<c:forEach var="i" items="${it.endpoints}">
- <li><a href="${i.href}">${i.uri}</a>
+ <li><a href='<c:url value="${i.href}"/>'>${i.uri}</a>
</c:forEach>
</ul>
<h2>Create New Endpoint</h2>
-<form action="/endpoints" method="post">
+<form action="<c:url value="/endpoints"/>" method="post">
<table>
<c:if test="${not empty it.error}">
<tr>
Modified: camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/RoutesResource/index.jsp
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/RoutesResource/index.jsp?rev=746209&r1=746208&r2=746209&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/RoutesResource/index.jsp (original)
+++ camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/RoutesResource/index.jsp Fri Feb 20 11:16:32 2009
@@ -9,7 +9,7 @@
<ul>
<c:forEach var="i" items="${it.routes}">
- <li><a href="/routes/${i.id}">${i.shortName}</a> ${i.description}
+ <li><a href='<c:url value="/routes/${i.id}"/>'>${i.shortName}</a> ${i.description}
</c:forEach>
</ul>