Author: jstrachan
Date: Mon Feb 23 09:28:31 2009
New Revision: 746942
URL: http://svn.apache.org/viewvc?rev=746942&view=rev
Log:
CAMEL-1355 added version information to the home page
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelContextResource.java
camel/trunk/components/camel-web/src/main/webapp/org/apache/camel/web/resources/CamelContextResource/index.jsp
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java?rev=746942&r1=746941&r2=746942&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ServiceSupport.java
Mon Feb 23 09:28:31 2009
@@ -135,8 +135,11 @@
return false;
}
}
-
- protected synchronized String getVersion() {
+
+ /**
+ * Returns the version of this service
+ */
+ public synchronized String getVersion() {
if (ObjectHelper.isNotEmpty(version)) {
return version;
}
@@ -153,7 +156,6 @@
} else {
version = "";
}
-
return version;
}
}
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=746942&r1=746941&r2=746942&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
Mon Feb 23 09:28:31 2009
@@ -27,6 +27,8 @@
import com.sun.jersey.spi.resource.Singleton;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.web.model.Camel;
/**
@@ -61,6 +63,13 @@
return camelContext.getName();
}
+ public String getVersion() {
+ if (camelContext instanceof ServiceSupport) {
+ ServiceSupport serviceSupport = (ServiceSupport) camelContext;
+ return serviceSupport.getVersion();
+ }
+ return null;
+ }
@PreDestroy
public void close() throws Exception {
if (template != null) {
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=746942&r1=746941&r2=746942&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
Mon Feb 23 09:28:31 2009
@@ -1,11 +1,11 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>Apache Camel</title>
+ <title>Apache Camel ${it.version}</title>
</head>
<body>
-<h1>Welcome to Apache Camel</h1>
+<h1>Welcome to Apache Camel ${it.version}</h1>
<p>Welcome to the Web Console for instance <b>${it.name}</b>.</p>
<p>We hope you find the following links helpful</p>
