Issue #2515 upgraded camel from 2.11.0 to 2.11.2

removed log showBody workaround


Former-commit-id: ea6b162369 [formerly 6f0630aa55 [formerly 4f374688c8] [formerly ea6b162369 [formerly afee27c0b6b574b7d664f47ca0f9369f2b920426]]]
Former-commit-id: 6f0630aa55 [formerly 4f374688c8]
Former-commit-id: 6f0630aa55
Former-commit-id: b21233ec65

cots/org.apache.camel/.classpath

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="camel-http-2.11.0.jar" sourcepath="apache-camel-2.11.0-src.zip"/>
+	<classpathentry exported="true" kind="lib" path="camel-core-2.11.2.jar" sourcepath="apache-camel-2.11.2-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-core-2.11.0.jar" sourcepath="apache-camel-2.11.0-src.zip"/>
+	<classpathentry exported="true" kind="lib" path="camel-http-2.11.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="camel-http4-2.11.0.jar" sourcepath="apache-camel-2.11.0-src.zip"/>
+	<classpathentry exported="true" kind="lib" path="camel-http4-2.11.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="camel-jetty-2.11.0.jar" sourcepath="apache-camel-2.11.0-src.zip"/>
+	<classpathentry exported="true" kind="lib" path="camel-jetty-2.11.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="camel-jms-2.11.0.jar" sourcepath="apache-camel-2.11.0-src.zip"/>
+	<classpathentry exported="true" kind="lib" path="camel-jms-2.11.2.jar" sourcepath="apache-camel-2.11.2-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="camel-quartz-2.11.0.jar" sourcepath="apache-camel-2.11.0-src.zip"/>
+	<classpathentry exported="true" kind="lib" path="camel-quartz-2.11.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="camel-spring-2.11.0.jar" sourcepath="apache-camel-2.11.0-src.zip"/>
+	<classpathentry exported="true" kind="lib" path="camel-spring-2.11.2.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>

cots/org.apache.camel/META-INF/MANIFEST.MF

@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Camel Plug-in
 Bundle-SymbolicName: org.apache.camel
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.11.2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: .,
- camel-core-2.11.0.jar,
+ camel-core-2.11.2.jar,
- camel-http4-2.11.0.jar,
+ camel-http-2.11.2.jar,
- camel-jetty-2.11.0.jar,
+ camel-http4-2.11.2.jar,
- camel-jms-2.11.0.jar,
+ camel-jetty-2.11.2.jar,
- camel-quartz-2.11.0.jar,
+ camel-jms-2.11.2.jar,
- camel-spring-2.11.0.jar,
+ camel-quartz-2.11.2.jar,
- camel-http-2.11.0.jar
+ camel-spring-2.11.2.jar
 Require-Bundle: org.springframework;bundle-version="3.1.4",
  org.apache.commons.management;bundle-version="1.0.0"
 Export-Package: org.apache.camel,

cots/org.apache.camel/build.properties

@@ -1,9 +1,9 @@
 bin.includes = META-INF/,\
                .,\
-               camel-core-2.11.0.jar,\
+               camel-core-2.11.2.jar,\
-               camel-http4-2.11.0.jar,\
+               camel-http-2.11.2.jar,\
-               camel-jetty-2.11.0.jar,\
+               camel-http4-2.11.2.jar,\
-               camel-jms-2.11.0.jar,\
+               camel-jetty-2.11.2.jar,\
-               camel-quartz-2.11.0.jar,\
+               camel-jms-2.11.2.jar,\
-               camel-spring-2.11.0.jar,\
+               camel-quartz-2.11.2.jar,\
-               camel-http-2.11.0.jar
+               camel-spring-2.11.2.jar

edexOsgi/build.edex/esb/conf/spring/edex.xml

@@ -183,25 +183,14 @@
     <bean id="errorHandler" class="org.apache.camel.builder.LoggingErrorHandlerBuilder"/>
     
     <!-- sets default settings of log component across all of edex -->
-    <bean id="defaultEdexLogFormatter" class="org.apache.camel.component.log.LogFormatter">
+    <!-- if log component beans are created and the exchangeFormatter property is set, they can't process URI parameters -->
+    <!-- this bean needs to be named 'logFormatter' for the log component to find it in the context -->
+    <bean id="logFormatter" class="org.apache.camel.component.log.LogFormatter" scope="prototype">
         <property name="maxChars" value="0" />
         <property name="showBody" value="false" />
         <property name="showCaughtException" value="true" />
         <property name="showStackTrace" value="true" />
     </bean>
-    <bean id="log" class="org.apache.camel.component.log.LogComponent">
-        <property name="exchangeFormatter" ref="defaultEdexLogFormatter" />        
-    </bean>
-    
-    <!--  for those special times when you really want to see the content of the message -->
-    <bean id="showBodyLogFormatter" class="org.apache.camel.component.log.LogFormatter">
-        <property name="maxChars" value="0" />        
-        <property name="showCaughtException" value="true" />
-        <property name="showStackTrace" value="true" />
-    </bean>
-    <bean id="log-showbody" class="org.apache.camel.component.log.LogComponent">
-        <property name="exchangeFormatter" ref="showBodyLogFormatter" />        
-    </bean>
 
     <bean id="serializationUtil" class="com.raytheon.uf.common.serialization.SerializationUtil" />    
 

edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml

@@ -76,7 +76,7 @@
 				</pipeline>
 				<doCatch>
 					<exception>java.lang.Throwable</exception>
-					<to uri="log-showbody:warning?level=ERROR" />
+					<to uri="log:warning?level=ERROR&amp;showBody=true" />
 				</doCatch>
 			</doTry>
 		</route>

edexOsgi/com.raytheon.uf.edex.dissemination/res/spring/dissemination-request.xml

@@ -43,7 +43,7 @@
 				<doCatch>
 					<exception>java.lang.Throwable</exception>
 					<to
-						uri="log-showbody:manual?level=ERROR" />
+						uri="log:manual?level=ERROR&amp;showBody=true" />
 				</doCatch>
 			</doTry>
 		</route>

edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-request.xml

@@ -15,7 +15,7 @@
 		        <to uri="jms-durable:queue:external.dropbox"/>
 				<doCatch>
 					<exception>java.lang.Throwable</exception>
-					<to uri="log-showbody:manual?level=ERROR" />
+					<to uri="log:manual?level=ERROR&amp;showBody=true" />
 				</doCatch>
 			</doTry>
 		</route>