Author: jstrachan
Date: Wed Aug 11 11:41:14 2010
New Revision: 984381
URL: http://svn.apache.org/viewvc?rev=984381&view=rev
Log:
moved the templates inside WEB-INF so they are not visible outside of the web
application; fixed up some bad HTML links in a template and fixed a failing
test that ningjiang seems to have reverted a previous fix on :)
Added:
camel/trunk/components/camel-web/src/main/webapp/WEB-INF/com/
- copied from r984346,
camel/trunk/components/camel-web/src/main/webapp/com/
camel/trunk/components/camel-web/src/main/webapp/WEB-INF/org/
- copied from r984346,
camel/trunk/components/camel-web/src/main/webapp/org/
camel/trunk/components/camel-web/src/main/webapp/WEB-INF/snippets/
camel/trunk/components/camel-web/src/main/webapp/WEB-INF/snippets/camelContextLinks.ssp
Removed:
camel/trunk/components/camel-web/src/main/webapp/com/
camel/trunk/components/camel-web/src/main/webapp/org/
Modified:
camel/trunk/components/camel-web/src/main/webapp/WEB-INF/org/apache/camel/web/resources/CamelContextResource.index.ssp
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/spring/CamelRouteTest.java
Modified:
camel/trunk/components/camel-web/src/main/webapp/WEB-INF/org/apache/camel/web/resources/CamelContextResource.index.ssp
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/webapp/WEB-INF/org/apache/camel/web/resources/CamelContextResource.index.ssp?rev=984381&r1=984346&r2=984381&view=diff
==============================================================================
---
camel/trunk/components/camel-web/src/main/webapp/WEB-INF/org/apache/camel/web/resources/CamelContextResource.index.ssp
(original)
+++
camel/trunk/components/camel-web/src/main/webapp/WEB-INF/org/apache/camel/web/resources/CamelContextResource.index.ssp
Wed Aug 11 11:41:14 2010
@@ -8,34 +8,6 @@
<p>Welcome to the Web Console for instance <b>${it.getName}</b>.</p>
<p>We hope you find the following links helpful</p>
-<ul>
- <li>
- <a href="${uri("/endpoints")}" attributes("title") = "View current
endpoints or create new ones">Endpoints</a>
- </li>
- <li>
- <a href="${uri("/routes")}" attributes("title") = "View current
routes">Routes</a>
- </li>
- <li>
- <a href="${uri("/api")}" attributes("title") = "Documentation on the REST
API to Camel">API</a>
- </li>
-</ul>
-
-<p>The following diagnostic links might be useful too...
-</p>
-
-<ul>
- <li>
- <a href="${uri("/components")}" attributes("title") = "View the available
components you can use with Camel">Components</a>
- </li>
- <li>
- <a href="${uri("/languages")}" attributes("title") = "View the available
languages you can use with Camel">Languages</a>
- </li>
- <li>
- <a href="${uri("/converters")}" attributes("title") = "View the available
type converters currently registered with Camel">Type Converters</a>
- </li>
- <li>
- <a href="${uri("/systemProperties")}" attributes("title") = "View the
System Properties used to create this service">System Properties</a>
- </li>
-</ul>
+#{ include("/WEB-INF/snippets/camelContextLinks.ssp") }#
<p>Lets take it for a ride!</p>
\ No newline at end of file
Added:
camel/trunk/components/camel-web/src/main/webapp/WEB-INF/snippets/camelContextLinks.ssp
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/webapp/WEB-INF/snippets/camelContextLinks.ssp?rev=984381&view=auto
==============================================================================
---
camel/trunk/components/camel-web/src/main/webapp/WEB-INF/snippets/camelContextLinks.ssp
(added)
+++
camel/trunk/components/camel-web/src/main/webapp/WEB-INF/snippets/camelContextLinks.ssp
Wed Aug 11 11:41:14 2010
@@ -0,0 +1,30 @@
+
+<ul>
+ <li>
+ <a href='${uri("/endpoints")}' title="View current endpoints or create new
ones">Endpoints</a>
+ </li>
+ <li>
+ <a href='${uri("/routes")}' title="View current routes">Routes</a>
+ </li>
+ <li>
+ <a href='${uri("/api")}' title="Documentation on the REST API to
Camel">API</a>
+ </li>
+</ul>
+
+<p>The following diagnostic links might be useful too...
+</p>
+
+<ul>
+ <li>
+ <a href='${uri("/components")}' title="View the available components you
can use with Camel">Components</a>
+ </li>
+ <li>
+ <a href='${uri("/languages")}' title="View the available languages you can
use with Camel">Languages</a>
+ </li>
+ <li>
+ <a href='${uri("/converters")}' title="View the available type converters
currently registered with Camel">Type Converters</a>
+ </li>
+ <li>
+ <a href='${uri("/systemProperties")}' title="View the System Properties
used to create this service">System Properties</a>
+ </li>
+</ul>
\ No newline at end of file
Modified:
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/spring/CamelRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/spring/CamelRouteTest.java?rev=984381&r1=984380&r2=984381&view=diff
==============================================================================
---
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/spring/CamelRouteTest.java
(original)
+++
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/spring/CamelRouteTest.java
Wed Aug 11 11:41:14 2010
@@ -58,7 +58,7 @@ public class CamelRouteTest extends Asse
public void setUp() throws Exception {
applicationContext = new
FileSystemXmlApplicationContext("src/main/webapp/WEB-INF/applicationContext.xml");
applicationContext.start();
- camelContext =
(CamelContext)applicationContext.getBean("camelContext", CamelContext.class);
+ camelContext = applicationContext.getBean(CamelContext.class);
assertNotNull("camelContext", camelContext);
}
