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/23 10:31:07 UTC
svn commit: r746943 - in
/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web:
model/Camel.java resources/CamelContextResource.java
Author: jstrachan
Date: Mon Feb 23 09:31:03 2009
New Revision: 746943
URL: http://svn.apache.org/viewvc?rev=746943&view=rev
Log:
CAMEL-1355 added version information to the XML/JSON API
Modified:
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/resources/CamelContextResource.java
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=746943&r1=746942&r2=746943&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 Mon Feb 23 09:31:03 2009
@@ -31,6 +31,8 @@
public class Camel {
@XmlAttribute
private String name;
+ @XmlAttribute
+ private String version;
public Camel() {
}
@@ -39,6 +41,12 @@
setName(camelContext.getName());
}
+ public Camel(CamelContext camelContext, String version) {
+ setName(camelContext.getName());
+ setVersion(version);
+ }
+
+
@Override
public String toString() {
return "CamelContext: " + getName();
@@ -52,4 +60,12 @@
public void setName(String name) {
this.name = name;
}
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
}
\ No newline at end of file
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=746943&r1=746942&r2=746943&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:31:03 2009
@@ -88,7 +88,7 @@
// when Jersey supports JAX-RS 1.1
@Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public Camel getCamel() {
- return new Camel(camelContext);
+ return new Camel(camelContext, getVersion());
}
/**