You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2012/07/28 06:33:11 UTC
svn commit: r1366593 - in /camel/branches/camel-2.9.x: ./
examples/camel-example-gae/
examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/
examples/camel-example-gae/src/main/webapp/WEB-INF/
Author: ningjiang
Date: Sat Jul 28 04:33:10 2012
New Revision: 1366593
URL: http://svn.apache.org/viewvc?rev=1366593&view=rev
Log:
Merged revisions 1366590 via svnmerge from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................
r1366590 | ningjiang | 2012-07-28 12:24:21 +0800 (Sat, 28 Jul 2012) | 13 lines
Merged revisions 1365917,1366272 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1365917 | ningjiang | 2012-07-26 17:11:01 +0800 (Thu, 26 Jul 2012) | 1 line
CAMEL-5454 Fixed camel-example-gae camel context load issue
........
r1366272 | ningjiang | 2012-07-27 12:17:17 +0800 (Fri, 27 Jul 2012) | 1 line
CAMEL-5454 revert the unintentional change of web.xml
........
................
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/examples/camel-example-gae/pom.xml
camel/branches/camel-2.9.x/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ReportGenerator.java
camel/branches/camel-2.9.x/examples/camel-example-gae/src/main/webapp/WEB-INF/appengine-web.xml
camel/branches/camel-2.9.x/examples/camel-example-gae/src/main/webapp/WEB-INF/web.xml
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1365917,1366272
Merged /camel/branches/camel-2.10.x:r1366590
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/examples/camel-example-gae/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/examples/camel-example-gae/pom.xml?rev=1366593&r1=1366592&r2=1366593&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/examples/camel-example-gae/pom.xml (original)
+++ camel/branches/camel-2.9.x/examples/camel-example-gae/pom.xml Sat Jul 28 04:33:10 2012
@@ -37,10 +37,21 @@
<artifactId>camel-gae</artifactId>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.google.appengine.orm</groupId>
<artifactId>datanucleus-appengine</artifactId>
<version>1.0.5</version>
</dependency>
+ <!-- Set up the log which will be used by camel -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>${slf4j-version}</version>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: camel/branches/camel-2.9.x/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ReportGenerator.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ReportGenerator.java?rev=1366593&r1=1366592&r2=1366593&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ReportGenerator.java (original)
+++ camel/branches/camel-2.9.x/examples/camel-example-gae/src/main/java/org/apache/camel/example/gae/ReportGenerator.java Sat Jul 28 04:33:10 2012
@@ -16,6 +16,8 @@
*/
package org.apache.camel.example.gae;
+import java.util.logging.Logger;
+
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathFactory;
@@ -23,6 +25,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
public class ReportGenerator implements Processor {
+ private static final Logger LOGGER = Logger.getLogger(RequestProcessor.class.getName());
public void process(Exchange exchange) throws Exception {
ReportData data = exchange.getIn().getBody(ReportData.class);
@@ -41,10 +44,13 @@ public class ReportGenerator implements
temp = "<error retrieving current temperature>";
}
- exchange.getIn().setBody(new StringBuilder()
+ String result = new StringBuilder()
.append("\n").append("Weather report for: ").append(city)
.append("\n").append("Current condition: ").append(cond)
- .append("\n").append("Current temperature: ").append(temp).append(" (Celsius)").toString());
+ .append("\n").append("Current temperature: ").append(temp).append(" (Celsius)").toString();
+
+ LOGGER.info("Get the result" + result);
+ exchange.getIn().setBody(result);
}
}
Modified: camel/branches/camel-2.9.x/examples/camel-example-gae/src/main/webapp/WEB-INF/appengine-web.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/examples/camel-example-gae/src/main/webapp/WEB-INF/appengine-web.xml?rev=1366593&r1=1366592&r2=1366593&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/examples/camel-example-gae/src/main/webapp/WEB-INF/appengine-web.xml (original)
+++ camel/branches/camel-2.9.x/examples/camel-example-gae/src/main/webapp/WEB-INF/appengine-web.xml Sat Jul 28 04:33:10 2012
@@ -22,6 +22,8 @@
<static-files>
<exclude path="/index.html" />
</static-files>
+
+ <threadsafe>true</threadsafe>
<system-properties>
<property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
Modified: camel/branches/camel-2.9.x/examples/camel-example-gae/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/examples/camel-example-gae/src/main/webapp/WEB-INF/web.xml?rev=1366593&r1=1366592&r2=1366593&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/examples/camel-example-gae/src/main/webapp/WEB-INF/web.xml (original)
+++ camel/branches/camel-2.9.x/examples/camel-example-gae/src/main/webapp/WEB-INF/web.xml Sat Jul 28 04:33:10 2012
@@ -21,14 +21,21 @@
xsi:schemaLocation="
http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
version="2.5">
+
+ <!-- tell Spring where it should load the XML file -->
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>classpath:context.xml</param-value>
+ </context-param>
+
+ <!-- spring context listener which loads the XML file -->
+ <listener>
+ <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+ </listener>
<servlet>
<servlet-name>CamelServlet</servlet-name>
<servlet-class>org.apache.camel.component.servlet.CamelHttpTransportServlet</servlet-class>
- <init-param>
- <param-name>contextConfigLocation</param-name>
- <param-value>context.xml</param-value>
- </init-param>
</servlet>
<servlet-mapping>