svn commit: r1207766 - in /camel/branches/camel-2.8.x: ./ examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/ examples/camel-example-reportincident-wssecurity/src/main/resources/META-I
Author: ningjiang Date: Tue Nov 29 06:38:12 2011 New Revision: 1207766 URL: http://svn.apache.org/viewvc?rev=1207766&view=rev Log: Merged revisions 1207743 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk r1207743 | ningjiang | 2011-11-29 11:42:12 +0800 (Tue, 29 Nov 2011) | 1 line CAMEL-4723 clean up the imports of cxf extension xml in the examples Modified: camel/branches/camel-2.8.x/ (props changed) camel/branches/camel-2.8.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml camel/branches/camel-2.8.x/examples/camel-example-reportincident-wssecurity/src/main/resources/META-INF/spring/camel-context.xml camel/branches/camel-2.8.x/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml camel/branches/camel-2.8.x/examples/camel-example-reportincident/src/main/resources/camel-config.xml Propchange: camel/branches/camel-2.8.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Nov 29 06:38:12 2011 @@ -1 +1 @@ -/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414 +/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743 Propchange: camel/branches/camel-2.8.x/ -- Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.8.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml?rev=1207766&r1=1207765&r2=1207766&view=diff == --- camel/branches/camel-2.8.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml (original) +++ camel/branches/camel-2.8.x/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml Tue Nov 29 06:38:12 2011 @@ -26,8 +26,6 @@ http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd";> - - http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-reportincident-wssecurity/src/main/resources/META-INF/spring/camel-context.xml?rev=1207766&r1=1207765&r2=1207766&view=diff == --- camel/branches/camel-2.8.x/examples/camel-example-reportincident-wssecurity/src/main/resources/META-INF/spring/camel-context.xml (original) +++ camel/branches/camel-2.8.x/examples/camel-example-reportincident-wssecurity/src/main/resources/META-INF/spring/camel-context.xml Tue Nov 29 06:38:12 2011 @@ -25,15 +25,11 @@ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd";> + - - - - - - - - + + + Modified: camel/branches/camel-2.8.x/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml?rev=1207766&r1=1207765&r2=1207766&view=diff == --- camel/branches/camel-2.8.x/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml (original) +++ camel/branches/camel-2.8.x/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml Tue Nov 29 06:38:12 2011 @@ -25,10 +25,9 @@ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd";> + - - - + http://localhost:9080/camel-example-reportincident/webservices/incident"; wsdlURL="etc/report_incident.wsdl" Modified: camel/branches/camel-2.8.x/examples/camel-example-reportincident/src/main/resources/camel-config.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-reportincident/src/main/resources/camel-config.xml?rev=1207766&r1=1207765&r2=1207766&view=diff == --- camel/branches/camel-2.8.x/examples/camel-example-reportincident/src/main/resources/camel-config.xml (original) +++ camel/branches/camel-2.8.x/examples/camel-example-reportincident/sr
svn commit: r1207743 - in /camel/trunk/examples: camel-example-cxf-osgi/src/main/resources/META-INF/spring/ camel-example-reportincident-wssecurity/src/main/resources/META-INF/spring/ camel-example-re
Author: ningjiang Date: Tue Nov 29 03:42:12 2011 New Revision: 1207743 URL: http://svn.apache.org/viewvc?rev=1207743&view=rev Log: CAMEL-4723 clean up the imports of cxf extension xml in the examples Modified: camel/trunk/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml camel/trunk/examples/camel-example-reportincident-wssecurity/src/main/resources/META-INF/spring/camel-context.xml camel/trunk/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml camel/trunk/examples/camel-example-reportincident/src/main/resources/camel-config.xml Modified: camel/trunk/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml?rev=1207743&r1=1207742&r2=1207743&view=diff == --- camel/trunk/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml (original) +++ camel/trunk/examples/camel-example-cxf-osgi/src/main/resources/META-INF/spring/camel-context.xml Tue Nov 29 03:42:12 2011 @@ -26,8 +26,7 @@ http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd";> - - + http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident-wssecurity/src/main/resources/META-INF/spring/camel-context.xml?rev=1207743&r1=1207742&r2=1207743&view=diff == --- camel/trunk/examples/camel-example-reportincident-wssecurity/src/main/resources/META-INF/spring/camel-context.xml (original) +++ camel/trunk/examples/camel-example-reportincident-wssecurity/src/main/resources/META-INF/spring/camel-context.xml Tue Nov 29 03:42:12 2011 @@ -27,14 +27,9 @@ - - - - - - - + + Modified: camel/trunk/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml?rev=1207743&r1=1207742&r2=1207743&view=diff == --- camel/trunk/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml (original) +++ camel/trunk/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml Tue Nov 29 03:42:12 2011 @@ -27,9 +27,7 @@ - - - + http://localhost:9080/camel-example-reportincident/webservices/incident"; wsdlURL="etc/report_incident.wsdl" Modified: camel/trunk/examples/camel-example-reportincident/src/main/resources/camel-config.xml URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident/src/main/resources/camel-config.xml?rev=1207743&r1=1207742&r2=1207743&view=diff == --- camel/trunk/examples/camel-example-reportincident/src/main/resources/camel-config.xml (original) +++ camel/trunk/examples/camel-example-reportincident/src/main/resources/camel-config.xml Tue Nov 29 03:42:12 2011 @@ -24,8 +24,6 @@ - - http://camel.apache.org/schema/spring";>
svn commit: r1207742 - /camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java
Author: ningjiang
Date: Tue Nov 29 03:24:01 2011
New Revision: 1207742
URL: http://svn.apache.org/viewvc?rev=1207742&view=rev
Log:
Fixed the test failure of CxfEndpointBeanWithBusTest
Modified:
camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java
Modified:
camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java?rev=1207742&r1=1207741&r2=1207742&view=diff
==
---
camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java
(original)
+++
camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java
Tue Nov 29 03:24:01 2011
@@ -28,11 +28,10 @@ import org.springframework.context.suppo
*
* @version
*/
-public class CxfEndpointBeanWithBusTest extends CxfEndpointBeanTest {
+public class CxfEndpointBeanWithBusTest extends AbstractSpringBeanTestSupport {
-@Before
-public void setUp() throws Exception {
-ctx = new ClassPathXmlApplicationContext(new
String[]{"org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterWithBus.xml"});
+protected String[] getApplicationContextFiles() {
+return new
String[]{"org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterWithBus.xml"};
}
@Test
[CONF] Apache Camel > Camel 2.9.0 Release
Camel 2.9.0 Release
Page edited by Christian Mueller
Changes (1)
...
* AHC 1.6.4 to 1.6.5 * CometD Java Server 2.1.1 to 2.3.1
* Commons-pool 1.5.4 to 1.5.6
* CXF 2.4.1 to 2.5.0 * Dozer 5.3.1 to 5.3.2
...
Full Content
Camel 2.9.0 release (currently in progress)
New and Noteworthy
Welcome to the 2.9.0 release which approx XXX issues resolved (new features, improvements and bug fixes such as...)
Introduced ThreadPoolFactory with a simpler API for 3rd party SPI. See Threading Model for more details.
The SOAP data format now supports using multiple parameters on the JAXB objects.
The Bean component now supports specifying parameter values to use directly in the method syntax. See more details at Bean Binding. For example to invoke a bean with body as first parameter, and a boolean true as second you can now do: .to("bean:myBean?method=myMethod(body, true)")
The Bean component supports binding to private class beans by fallback to use interface methods.
Improved labels of all model definitions which appear in Tracer output
Reduced dependency for camel-core to not require commons-management JAR anymore
Added blueprint support of cxfrs endpoint.
Camel no longer depend on using Spring JARs for having Camel enlisted in JMX.
Introduced a set of Camel JMX annotations in org.apache.camel.api.management that can be used to easily instrument Camel Components, EIPs, custom Processors, Beans etc. for being managed in JMX. Using the Spring JMX annotations is still supported (you would need camel-spring on the classpath).
Updated the Aggregator2 to allow for manually completing all exchange groups by sending a message containing the header Exchange.AGGREGATION_COMPLETE_ALL_GROUPS set to true.
Updated the Aggregator2 to support forceCompletionOnStop option to complete all current aggregated exchanges when the context is stopped.
Removed dependency on Spring JARs in the following components: Validation, XSLT, Velocity, FreeMarker, Flatpack, StringTemplate, iBATIS, Jing, MSV, XQuery, Test, Groovy, Scripting Languages, Mail and Quickfix.
Using pollEnrich with a file/ftp endpoint will now only poll on demand, beforehand the polling could be started when the route started.
Added option ReplyToType on JMS to allow people to control which kind of reply queue they are using (temporary, shared, exclusive). Added support for exclusive reply queues. Mind they have some limitations, by which the shared dont have. So use exclusive with a bit caution.
Added wereSentTo to NotifyBuilder allowing to set expectation that Exchanges was sent to the given endpoint uri.
Bindy in CSV format now uses trim, clip, and length attributes on @DataField when marshalling.
Improved managed browsable endpoints (JMX) so you can browse all/range messages and whether to include message body or not.
File and FTP endpoints is now browsable endpoints. For example using JMX people can browse the endpoint listing available files. The returned data does not contain the actual file body to avoid loading big data into memory.
Added replaceFromWith to AdviceWith making it easy to swap a route input endpoint with something else, for easier unit testing.
Added Java DSL support for route autoStartup(String) and autoStartup(boolean)
Switched to a better performing non locking endpoint cache based on Google's ConcurrentLinkedHashMap.
Added isUseAdviceWith to Camel Test which allows end users to tell Camel that the unit tests uses AdviceWith which allows you to defer starting CamelContext until after the adviceWith has been executed.
Added filtersRef option to Jetty endpoint, and it supports to setup the Filters on the Jetty endpoints.
Added ciphers option to the SFTP endpoint to allow configuration of the ciphers used by default.
Added fastExitsCheck option to the SFTP FTP endpoint to check the file exits fast.
Added errorHandler option to the JMS component which allows you to set a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions thrown while processing a Message.
Added idleConsumerLimit option to the JMS component which sets the limit for the number of consumers that are allowed to be idle at any given time.
Simple language has a much better syntax parser, being able to report what and where syntax errors are. Added unary operators, which for example can be used to increment counters.
Simple language now supports nested functions, so you can do "${header.${header.bar}}", for example to refer to a header key from another header.
Simple language can now configure custom start/end tokens for its built-in functions.
The JPA component has been upgraded from using the JPA1 spec to use JPA2 spec.
The CSV component now always returns a
svn commit: r1207635 - in /camel/branches/camel-2.7.x: parent/pom.xml platforms/karaf/features/pom.xml platforms/karaf/features/src/main/resources/features.xml
Author: cmueller
Date: Mon Nov 28 21:40:50 2011
New Revision: 1207635
URL: http://svn.apache.org/viewvc?rev=1207635&view=rev
Log:
CAMEL-4623: Upgrade commons-pool:commons-pool 1.5.4 -> 1.5.6
Modified:
camel/branches/camel-2.7.x/parent/pom.xml
camel/branches/camel-2.7.x/platforms/karaf/features/pom.xml
camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/branches/camel-2.7.x/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/parent/pom.xml?rev=1207635&r1=1207634&r2=1207635&view=diff
==
--- camel/branches/camel-2.7.x/parent/pom.xml (original)
+++ camel/branches/camel-2.7.x/parent/pom.xml Mon Nov 28 21:40:50 2011
@@ -49,7 +49,7 @@
2.4
1.1.1
3.2.1
-1.5.4
+1.5.6
1.3
2.3.7
2.3.2
Modified: camel/branches/camel-2.7.x/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/platforms/karaf/features/pom.xml?rev=1207635&r1=1207634&r2=1207635&view=diff
==
--- camel/branches/camel-2.7.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-2.7.x/platforms/karaf/features/pom.xml Mon Nov 28
21:40:50 2011
@@ -52,7 +52,6 @@
2.4
2.0
1.0
- 1.5.4_3
1.6.1_4
1.0.1
1.2.7_2
Modified:
camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml?rev=1207635&r1=1207634&r2=1207635&view=diff
==
---
camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml
(original)
+++
camel/branches/camel-2.7.x/platforms/karaf/features/src/main/resources/features.xml
Mon Nov 28 21:40:50 2011
@@ -149,7 +149,7 @@
mvn:org.springframework/spring-context/${spring-version}
mvn:org.springframework/spring-tx/${spring-version}
mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}
+mvn:commons-pool/commons-pool/${commons-pool-version}
mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}
mvn:org.springframework/spring-jms/${spring-version}
camel-core
@@ -304,7 +304,7 @@
camel-spring
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}
+mvn:commons-pool/commons-pool/${commons-pool-version}
mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}
mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}
@@ -436,7 +436,7 @@
camel-spring
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}
+mvn:commons-pool/commons-pool/${commons-pool-version}
mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}
mvn:commons-dbcp/commons-dbcp/${commons-dbcp-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}
svn commit: r1207625 - in /camel/branches/camel-2.8.x: parent/pom.xml platforms/karaf/features/pom.xml platforms/karaf/features/src/main/resources/features.xml
Author: cmueller
Date: Mon Nov 28 21:28:50 2011
New Revision: 1207625
URL: http://svn.apache.org/viewvc?rev=1207625&view=rev
Log:
CAMEL-4623: Upgrade commons-pool:commons-pool 1.5.4 -> 1.5.6
Modified:
camel/branches/camel-2.8.x/parent/pom.xml
camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/branches/camel-2.8.x/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/parent/pom.xml?rev=1207625&r1=1207624&r2=1207625&view=diff
==
--- camel/branches/camel-2.8.x/parent/pom.xml (original)
+++ camel/branches/camel-2.8.x/parent/pom.xml Mon Nov 28 21:28:50 2011
@@ -54,7 +54,7 @@
2.6
1.1.1
2.2
-1.5.4
+1.5.6
1.2
Modified: camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml?rev=1207625&r1=1207624&r2=1207625&view=diff
==
--- camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml Mon Nov 28
21:28:50 2011
@@ -55,7 +55,6 @@
2.2
1.0
2.2
- 1.5.4_3
1.4_1
1.6.1_4
1.0.1
Modified:
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml?rev=1207625&r1=1207624&r2=1207625&view=diff
==
---
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
(original)
+++
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Mon Nov 28 21:28:50 2011
@@ -165,7 +165,7 @@
spring-web
mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}
spring-jdbc
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}
+mvn:commons-pool/commons-pool/${commons-pool-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}
mvn:commons-lang/commons-lang/${commons-lang-version}
mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}
@@ -311,7 +311,7 @@
camel-spring
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}
+mvn:commons-pool/commons-pool/${commons-pool-version}
mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}
@@ -379,7 +379,7 @@
spring-jdbc
mvn:commons-lang/commons-lang/${commons-lang-version}
mvn:commons-collections/commons-collections/${commons-collections-version}
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}
+mvn:commons-pool/commons-pool/${commons-pool-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp-bundle-version}
@@ -442,7 +442,7 @@
camel-spring
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}
+mvn:commons-pool/commons-pool/${commons-pool-version}
mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}
@@ -480,7 +480,7 @@
mvn:commons-collections/commons-collections/${commons-collections-version}
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}
+mvn:commons-pool/commons-pool/${commons-pool-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}
mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-bundle-version}
svn commit: r1207615 - in /camel/trunk: parent/pom.xml platforms/karaf/features/pom.xml platforms/karaf/features/src/main/resources/features.xml
Author: cmueller
Date: Mon Nov 28 21:18:31 2011
New Revision: 1207615
URL: http://svn.apache.org/viewvc?rev=1207615&view=rev
Log:
CAMEL-4623: Upgrade commons-pool:commons-pool 1.5.4 -> 1.5.6
Modified:
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1207615&r1=1207614&r2=1207615&view=diff
==
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Mon Nov 28 21:18:31 2011
@@ -55,7 +55,7 @@
2.6
1.1.1
2.2
-1.5.4
+1.5.6
1.2
2.5.0
2.4.0
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1207615&r1=1207614&r2=1207615&view=diff
==
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Mon Nov 28 21:18:31 2011
@@ -55,7 +55,6 @@
1.3
2.2
2.2
- 1.5.4_3
1.4_1
1.6.1_4
1.0.1
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1207615&r1=1207614&r2=1207615&view=diff
==
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Mon
Nov 28 21:18:31 2011
@@ -113,7 +113,7 @@
spring
mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}
+mvn:commons-pool/commons-pool/${commons-pool-version}
mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}
spring-jms
camel-core
@@ -172,7 +172,7 @@
spring-web
mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}
spring-jdbc
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}
+mvn:commons-pool/commons-pool/${commons-pool-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}
mvn:commons-lang/commons-lang/${commons-lang-version}
mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}
@@ -317,7 +317,7 @@
camel-core
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}
+mvn:commons-pool/commons-pool/${commons-pool-version}
mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}
@@ -393,7 +393,7 @@
spring-jdbc
mvn:commons-lang/commons-lang/${commons-lang-version}
mvn:commons-collections/commons-collections/${commons-collections-version}
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}
+mvn:commons-pool/commons-pool/${commons-pool-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.serp/${serp-bundle-version}
@@ -460,7 +460,7 @@
camel-core
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}
+mvn:commons-pool/commons-pool/${commons-pool-version}
mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}
@@ -498,7 +498,7 @@
mvn:commons-collections/commons-collections/${commons-collections-version}
-mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}
+mvn:commons-pool/commons-pool/${commons-pool-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}
mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}
mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${
svn commit: r1207287 - in /camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala: converter/ dsl/ dsl/builder/ dsl/builder/scan/
Author: ningjiang Date: Mon Nov 28 15:16:45 2011 New Revision: 1207287 URL: http://svn.apache.org/viewvc?rev=1207287&view=rev Log: Clean up the camel-scala unit tests Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/converter/ScalaTypeConverterTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/BasicRouteBuilderTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentBasedRouterTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ContentEnricherTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DataFormatTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/DelayerTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/EnricherTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ExceptionHandlerTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ExchangePatternTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/FilterRouteBuilderTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/HeaderContentBasedRouterTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/IdTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/IdempotentConsumerTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/InterceptSendToTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoadBalancerTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoopCopyTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/LoopNoCopyTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/MulticastTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/OnExceptionTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineAndMulticastTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineRouteBuilderTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/PipelineTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RecipientListRouteTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ResequencerTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RollbackTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteErrorHandlerTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/RouteIdTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ScalaTestSupport.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetBodyTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetExchangePatternTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SetHeaderTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SimpleBeanTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/SplitterRouteBuilderTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/ThrottlerTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/TryCatchFinallyTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/WiretapTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/XPathContentBasedRouterTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/builder/RouteBuilderUnwrapTest.scala camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/builder/scan/DiscoverRouteBuilderTest.scala Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/converter/ScalaTypeConverterTest.scala URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/converter/ScalaTypeConverterTest.scala?rev=1207287&r1=1207286&r2=1207287&view=diff == --- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/converter/ScalaTypeConverterTest.scala (original) +++ camel/t
svn commit: r1207097 - in /camel/trunk/components/camel-web/src/main/webapp/WEB-INF: scalate/error.scaml scalate/layouts/default.scaml web.xml
Author: jstrachan
Date: Mon Nov 28 12:12:10 2011
New Revision: 1207097
URL: http://svn.apache.org/viewvc?rev=1207097&view=rev
Log:
Fixes CAMEL-4719 so camel-web works better inside WebLogic; avoiding the use of
the scalate console unless its present and in debig mode and having a
precompiled error page to avoid unnecessary runtime compilation of scalate
templates. Also used the simpler scalate filter which adds support for jade,
markdown, confluence etc easier with less boilerplate XML in web.xml
Added:
camel/trunk/components/camel-web/src/main/webapp/WEB-INF/scalate/error.scaml
Modified:
camel/trunk/components/camel-web/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
camel/trunk/components/camel-web/src/main/webapp/WEB-INF/web.xml
Added:
camel/trunk/components/camel-web/src/main/webapp/WEB-INF/scalate/error.scaml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/webapp/WEB-INF/scalate/error.scaml?rev=1207097&view=auto
==
---
camel/trunk/components/camel-web/src/main/webapp/WEB-INF/scalate/error.scaml
(added)
+++
camel/trunk/components/camel-web/src/main/webapp/WEB-INF/scalate/error.scaml
Mon Nov 28 12:12:10 2011
@@ -0,0 +1,212 @@
+-#
+-# Copyright (C) 2009-2011 the original author or authors.
+-# See the notice.md file distributed with this work for additional
+-# information regarding copyright ownership.
+-#
+-# Licensed under the Apache License, Version 2.0 (the "License");
+-# you may not use this file except in compliance with the License.
+-# You may obtain a copy of the License at
+-#
+-# http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the License is distributed on an "AS IS" BASIS,
+-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-# See the License for the specific language governing permissions and
+-# limitations under the License.
+-#
+- if ( !engine.isDevelopmentMode )
+ .scalate-error-500
+%h1 Server Error: We're sorry, but something went wrong.
+%p We've been notified about this issue and we'll take a look at it
shortly.
+
+- else
+ - import util.parsing.input.Position
+ - import org.fusesource.scalate._
+ - import org.fusesource.scalate.console._
+ - val consoleHelper = new ConsoleHelper(context)
+ - import consoleHelper._
+ - response.setContentType("text/html")
+ - attributes("layout") = ""
+ !!! Basic
+ %html(lang="en")
+%head
+ %meta(http-equiv="Content-Type" content="text/html; charset=utf-8")
+ %meta(name="keywords" content="error")
+ %title Unexpected Failure
+ %style(type="text/css")
+:plain
+ html, body {
+ margin: 0;
+ padding: 0;
+ font-family: Helvetica, Arial, Sans;
+ background: #EE;
+ }
+ .block {
+ padding: 20px;
+ border-bottom: 1px solid #aaa;
+ }
+ #scalate-error .header h1 {
+ font-weight: normal;
+ font-size: 28px;
+ margin: 0;
+ }
+ #scalate-error .more {
+ color: #666;
+ font-size: 80%;
+ border: none;
+ }
+ #scalate-error .header {
+ background: #fcd2da;
+ }
+ #scalate-error .header p {
+ color: #333;
+ }
+ #scalate-error .details {
+ background: #f6f6f6;
+ }
+ #scalate-error .details h2 {
+ font-weight: normal;
+ font-size: 18px;
+ margin: 0 0 10px 0;
+ }
+ #scalate-error .details .lineNumber {
+ float: left;
+ display: block;
+ width: 40px;
+ text-align: right;
+ margin-right: 10px;
+ font-size: 14px;
+ font-family: monospace;
+ background: #333;
+ color: #fff;
+ }
+ #scalate-error .details .line {
+ clear: both;
+ color: #333;
+ margin-bottom: 1px;
+ }
+ #scalate-error .details pre {
+ font-size: 14px;
+ margin: 0;
+ overflow-x: hidden;
+ }
+ #scalate-error .details .error {
+ color: #c00 !important;
+ }
+ #scalate-error .details .error .lineNumber {
+ background: #c00;
+ }
+ #scalate-error .details .errorCol {
+ background: #c00;
+ color:#fff;
+ }
+ #scalate-error .details a {
+ text-decoration: none;
+ }
+ #scalate-error .details a:hover * {
+ cursor: pointer !important;
+ }
+ #scalate-error .details a:hover pre {
+ background: #FAFFCF !important;
+
svn commit: r1207082 - in /camel/branches/camel-2.8.x: ./ examples/camel-example-reportincident-wssecurity/pom.xml
Author: ffang Date: Mon Nov 28 11:21:13 2011 New Revision: 1207082 URL: http://svn.apache.org/viewvc?rev=1207082&view=rev Log: Merged revisions 1207068 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk r1207068 | ffang | 2011-11-28 18:59:36 +0800 (δΈ€, 28 11 2011) | 1 line [CAMEL-4718]camel-example-reportincident-wssecurity shouldn't import org.apache.cxf.transport.http_osgi package anymore Modified: camel/branches/camel-2.8.x/ (props changed) camel/branches/camel-2.8.x/examples/camel-example-reportincident-wssecurity/pom.xml Propchange: camel/branches/camel-2.8.x/ -- Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.8.x/examples/camel-example-reportincident-wssecurity/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/examples/camel-example-reportincident-wssecurity/pom.xml?rev=1207082&r1=1207081&r2=1207082&view=diff == --- camel/branches/camel-2.8.x/examples/camel-example-reportincident-wssecurity/pom.xml (original) +++ camel/branches/camel-2.8.x/examples/camel-example-reportincident-wssecurity/pom.xml Mon Nov 28 11:21:13 2011 @@ -226,7 +226,6 @@ org.apache.cxf.transport.http, org.apache.cxf.transport.http.policy, org.apache.cxf.transport.http_jetty, - org.apache.cxf.transport.http_osgi, org.apache.cxf.transport.jms, org.apache.cxf.transports.http, org.apache.cxf.workqueue,
svn commit: r1207068 - /camel/trunk/examples/camel-example-reportincident-wssecurity/pom.xml
Author: ffang Date: Mon Nov 28 10:59:36 2011 New Revision: 1207068 URL: http://svn.apache.org/viewvc?rev=1207068&view=rev Log: [CAMEL-4718]camel-example-reportincident-wssecurity shouldn't import org.apache.cxf.transport.http_osgi package anymore Modified: camel/trunk/examples/camel-example-reportincident-wssecurity/pom.xml Modified: camel/trunk/examples/camel-example-reportincident-wssecurity/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident-wssecurity/pom.xml?rev=1207068&r1=1207067&r2=1207068&view=diff == --- camel/trunk/examples/camel-example-reportincident-wssecurity/pom.xml (original) +++ camel/trunk/examples/camel-example-reportincident-wssecurity/pom.xml Mon Nov 28 10:59:36 2011 @@ -226,7 +226,6 @@ org.apache.cxf.transport.http, org.apache.cxf.transport.http.policy, org.apache.cxf.transport.http_jetty, - org.apache.cxf.transport.http_osgi, org.apache.cxf.transport.jms, org.apache.cxf.transports.http, org.apache.cxf.workqueue,
