You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@camel.apache.org by Christian Müller <ch...@gmail.com> on 2012/01/12 08:10:11 UTC
Re: svn commit: r1230346 - in /camel/trunk: components/
components/camel-test-blueprint/ components/camel-test-blueprint/src/
components/camel-test-blueprint/src/main/ components/camel-test-blueprint/src/main/java/
components/camel-test-blueprint/src
Good morning Guillaume,
your last commit breaks the build. Could you please have a look at it:
[ERROR] Failed to execute goal on project camel-test-blueprint: Could not
resolve dependencies for project
org.apache.camel:camel-test-blueprint:bundle:2.10-SNAPSHOT: Could not find
artifact
com.googlecode.pojosr:de.kalpatec.pojosr.framework:jar:0.1.7-SNAPSHOT in
apache.snapshots (http://repository.apache.org/snapshots/)
Best,
Christian
On Thu, Jan 12, 2012 at 2:10 AM, <gn...@apache.org> wrote:
> Author: gnodet
> Date: Thu Jan 12 01:10:12 2012
> New Revision: 1230346
>
> URL: http://svn.apache.org/viewvc?rev=1230346&view=rev
> Log:
> [CAMEL-4888] Test support classes for running junit tests with camel and
> blueprint
>
> Added:
> camel/trunk/components/camel-test-blueprint/
> camel/trunk/components/camel-test-blueprint/pom.xml
> camel/trunk/components/camel-test-blueprint/src/
> camel/trunk/components/camel-test-blueprint/src/main/
> camel/trunk/components/camel-test-blueprint/src/main/java/
> camel/trunk/components/camel-test-blueprint/src/main/java/org/
> camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/
>
> camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/
>
> camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/
>
> camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/
>
> camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
> camel/trunk/components/camel-test-blueprint/src/main/resources/
> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/
>
> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/LICENSE.txt
>
> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/NOTICE.txt
> camel/trunk/components/camel-test-blueprint/src/test/
> camel/trunk/components/camel-test-blueprint/src/test/java/
> camel/trunk/components/camel-test-blueprint/src/test/java/org/
> camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/
>
> camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/
>
> camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/
>
> camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/
>
> camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
> camel/trunk/components/camel-test-blueprint/src/test/resources/
>
> camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties
> camel/trunk/components/camel-test-blueprint/src/test/resources/org/
>
> camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/
>
> camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/
>
> camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/
>
> camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/
>
> camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelContext.xml
>
> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/
>
> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/
>
> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/RouteTest.java
>
> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/resources/
>
> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/resources/log4j.properties
> Modified:
>
> camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
>
> camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
> camel/trunk/components/pom.xml
>
> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
>
> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/blueprint.xml
>
> Added: camel/trunk/components/camel-test-blueprint/pom.xml
> URL:
> http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/pom.xml?rev=1230346&view=auto
>
> ==============================================================================
> --- camel/trunk/components/camel-test-blueprint/pom.xml (added)
> +++ camel/trunk/components/camel-test-blueprint/pom.xml Thu Jan 12
> 01:10:12 2012
> @@ -0,0 +1,127 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<!--
> + Licensed to the Apache Software Foundation (ASF) under one or more
> + contributor license agreements. See the NOTICE file distributed with
> + this work for additional information regarding copyright ownership.
> + The ASF licenses this file to You 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.
> +-->
> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
> ">
> +
> + <modelVersion>4.0.0</modelVersion>
> +
> + <parent>
> + <groupId>org.apache.camel</groupId>
> + <artifactId>camel-parent</artifactId>
> + <version>2.10-SNAPSHOT</version>
> + <relativePath>../../parent</relativePath>
> + </parent>
> +
> + <artifactId>camel-test-blueprint</artifactId>
> + <packaging>bundle</packaging>
> + <name>Camel :: Test Blueprint</name>
> + <description>Camel Testing Blueprint Library using JUnit</description>
> +
> + <properties>
> +
> <camel.osgi.export.pkg>org.apache.camel.test.blueprint*</camel.osgi.export.pkg>
> + </properties>
> +
> + <dependencies>
> +
> + <dependency>
> + <groupId>org.apache.camel</groupId>
> + <artifactId>camel-test</artifactId>
> + <exclusions>
> + <exclusion>
> + <groupId>org.springframework</groupId>
> + <artifactId>spring-core</artifactId>
> + </exclusion>
> + <exclusion>
> + <groupId>org.springframework</groupId>
> + <artifactId>spring-beans</artifactId>
> + </exclusion>
> + <exclusion>
> + <groupId>org.springframework</groupId>
> + <artifactId>spring-aop</artifactId>
> + </exclusion>
> + <exclusion>
> + <groupId>org.springframework</groupId>
> + <artifactId>spring-asm</artifactId>
> + </exclusion>
> + <exclusion>
> + <groupId>org.springframework</groupId>
> + <artifactId>spring-context</artifactId>
> + </exclusion>
> + <exclusion>
> + <groupId>org.springframework</groupId>
> + <artifactId>spring-tx</artifactId>
> + </exclusion>
> + </exclusions>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.camel</groupId>
> + <artifactId>camel-blueprint</artifactId>
> + <exclusions>
> + <exclusion>
> + <groupId>javax.xml.bind</groupId>
> + <artifactId>jaxb-api</artifactId>
> + </exclusion>
> + </exclusions>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.aries.blueprint</groupId>
> + <artifactId>org.apache.aries.blueprint</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.aries</groupId>
> + <artifactId>org.apache.aries.util</artifactId>
> + <version>0.3</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.aries.proxy</groupId>
> + <artifactId>org.apache.aries.proxy.impl</artifactId>
> + <version>0.3</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.aries.proxy</groupId>
> + <artifactId>org.apache.aries.proxy.api</artifactId>
> + <version>0.3</version>
> + </dependency>
> + <dependency>
> + <groupId>com.googlecode.pojosr</groupId>
> + <artifactId>de.kalpatec.pojosr.framework</artifactId>
> + <version>0.1.7-SNAPSHOT</version>
> + </dependency>
> + <dependency>
> + <groupId>org.ops4j.pax.swissbox</groupId>
> + <artifactId>pax-swissbox-tinybundles</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>junit</groupId>
> + <artifactId>junit</artifactId>
> + </dependency>
> +
> + <!-- optional dependencies for running tests -->
> + <dependency>
> + <groupId>org.slf4j</groupId>
> + <artifactId>slf4j-log4j12</artifactId>
> + <scope>test</scope>
> + </dependency>
> + <dependency>
> + <groupId>org.slf4j</groupId>
> + <artifactId>jcl-over-slf4j</artifactId>
> + <version>1.6.1</version>
> + </dependency>
> +
> + </dependencies>
> +
> +</project>
>
> Added:
> camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
> URL:
> http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java?rev=1230346&view=auto
>
> ==============================================================================
> ---
> camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
> (added)
> +++
> camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
> Thu Jan 12 01:10:12 2012
> @@ -0,0 +1,215 @@
> +/**
> + * Licensed to the Apache Software Foundation (ASF) under one or more
> + * contributor license agreements. See the NOTICE file distributed with
> + * this work for additional information regarding copyright ownership.
> + * The ASF licenses this file to You 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.
> + */
> +package org.apache.camel.test.blueprint;
> +
> +import java.io.File;
> +import java.io.FileInputStream;
> +import java.io.FileOutputStream;
> +import java.io.IOException;
> +import java.io.InputStream;
> +import java.io.OutputStream;
> +import java.net.URL;
> +import java.util.Collection;
> +import java.util.Dictionary;
> +import java.util.Enumeration;
> +import java.util.HashMap;
> +import java.util.LinkedList;
> +import java.util.List;
> +import java.util.Map;
> +import java.util.jar.JarInputStream;
> +
> +import de.kalpatec.pojosr.framework.PojoServiceRegistryFactoryImpl;
> +import de.kalpatec.pojosr.framework.launch.BundleDescriptor;
> +import de.kalpatec.pojosr.framework.launch.ClasspathScanner;
> +import de.kalpatec.pojosr.framework.launch.PojoServiceRegistry;
> +import de.kalpatec.pojosr.framework.launch.PojoServiceRegistryFactory;
> +import org.apache.camel.CamelContext;
> +import org.apache.camel.test.CamelTestSupport;
> +import org.ops4j.pax.swissbox.tinybundles.core.TinyBundle;
> +import org.ops4j.pax.swissbox.tinybundles.core.TinyBundles;
> +import org.osgi.framework.BundleContext;
> +import org.osgi.framework.Constants;
> +import org.osgi.framework.Filter;
> +import org.osgi.framework.FrameworkUtil;
> +import org.osgi.framework.InvalidSyntaxException;
> +import org.osgi.framework.ServiceReference;
> +import org.osgi.util.tracker.ServiceTracker;
> +
> +/**
> + * @version
> + */
> +public abstract class CamelBlueprintTestSupport extends CamelTestSupport {
> +
> + public static final long DEFAULT_TIMEOUT = 30000;
> +
> + private BundleContext bundleContext;
> +
> + @Override
> + protected void setUp() throws Exception {
> + System.setProperty("org.bundles.framework.storage",
> "target/bundles/" + System.currentTimeMillis());
> + List<BundleDescriptor> bundles = new
> ClasspathScanner().scanForBundles("(Bundle-SymbolicName=*)");
> + TinyBundle bundle = createTestBundle();
> + bundles.add(getBundleDescriptor("target/test-bundle.jar",
> bundle));
> + Map config = new HashMap();
> + config.put(PojoServiceRegistryFactory.BUNDLE_DESCRIPTORS,
> bundles);
> + PojoServiceRegistry reg = new
> PojoServiceRegistryFactoryImpl().newPojoServiceRegistry(config);
> + bundleContext = reg.getBundleContext();
> +
> + super.setUp();
> + }
> +
> + protected TinyBundle createTestBundle() {
> + TinyBundle bundle = TinyBundles.newBundle();
> + for (URL url : getBlueprintDescriptors()) {
> + bundle.add("OSGI-INF/blueprint/blueprint-" +
> url.getFile().replace("/", "-"), url);
> + }
> + bundle.set("Manifest-Version", "2")
> + .set("Bundle-ManifestVersion", "2")
> + .set("Bundle-SymbolicName", "test-bundle")
> + .set("Bundle-Version", "0.0.0");
> + return bundle;
> + }
> +
> + protected abstract Collection<URL> getBlueprintDescriptors();
> +
> + @Override
> + protected CamelContext createCamelContext() throws Exception {
> + return getOsgiService(CamelContext.class);
> + }
> +
> + @Override
> + protected void tearDown() throws Exception {
> + super.tearDown();
> + bundleContext.getBundle().stop();
> + }
> +
> + protected <T> T getOsgiService(Class<T> type, long timeout) {
> + return getOsgiService(type, null, timeout);
> + }
> +
> + protected <T> T getOsgiService(Class<T> type) {
> + return getOsgiService(type, null, DEFAULT_TIMEOUT);
> + }
> +
> + protected <T> T getOsgiService(Class<T> type, String filter) {
> + return getOsgiService(type, filter, DEFAULT_TIMEOUT);
> + }
> +
> + protected <T> T getOsgiService(Class<T> type, String filter, long
> timeout) {
> + ServiceTracker tracker = null;
> + try {
> + String flt;
> + if (filter != null) {
> + if (filter.startsWith("(")) {
> + flt = "(&(" + Constants.OBJECTCLASS + "=" +
> type.getName() + ")" + filter + ")";
> + } else {
> + flt = "(&(" + Constants.OBJECTCLASS + "=" +
> type.getName() + ")(" + filter + "))";
> + }
> + } else {
> + flt = "(" + Constants.OBJECTCLASS + "=" + type.getName()
> + ")";
> + }
> + Filter osgiFilter = FrameworkUtil.createFilter(flt);
> + tracker = new ServiceTracker(bundleContext, osgiFilter, null);
> + tracker.open(true);
> + // Note that the tracker is not closed to keep the reference
> + // This is buggy, as the service reference may change i think
> + Object svc = type.cast(tracker.waitForService(timeout));
> + if (svc == null) {
> + Dictionary dic = bundleContext.getBundle().getHeaders();
> + System.err.println("Test bundle headers: " +
> explode(dic));
> +
> + for (ServiceReference ref :
> asCollection(bundleContext.getAllServiceReferences(null, null))) {
> + System.err.println("ServiceReference: " + ref);
> + }
> +
> + for (ServiceReference ref :
> asCollection(bundleContext.getAllServiceReferences(null, flt))) {
> + System.err.println("Filtered ServiceReference: " +
> ref);
> + }
> +
> + throw new RuntimeException("Gave up waiting for service "
> + flt);
> + }
> + return type.cast(svc);
> + } catch (InvalidSyntaxException e) {
> + throw new IllegalArgumentException("Invalid filter", e);
> + } catch (InterruptedException e) {
> + throw new RuntimeException(e);
> + }
> + }
> +
> + /*
> + * Explode the dictionary into a ,-delimited list of key=value pairs
> + */
> + private static String explode(Dictionary dictionary) {
> + Enumeration keys = dictionary.keys();
> + StringBuffer result = new StringBuffer();
> + while (keys.hasMoreElements()) {
> + Object key = keys.nextElement();
> + result.append(String.format("%s=%s", key,
> dictionary.get(key)));
> + if (keys.hasMoreElements()) {
> + result.append(", ");
> + }
> + }
> + return result.toString();
> + }
> +
> + /*
> + * Provides an iterable collection of references, even if the
> original array is null
> + */
> + private static final Collection<ServiceReference>
> asCollection(ServiceReference[] references) {
> + List<ServiceReference> result = new
> LinkedList<ServiceReference>();
> + if (references != null) {
> + for (ServiceReference reference : references) {
> + result.add(reference);
> + }
> + }
> + return result;
> + }
> +
> + private BundleDescriptor getBundleDescriptor(String path, TinyBundle
> bundle) throws Exception {
> + File file = new File(path);
> + FileOutputStream fos = new FileOutputStream(file);
> + copy(bundle.build(), fos);
> + fos.close();
> + JarInputStream jis = new JarInputStream(new
> FileInputStream(file));
> + Map<String, String> headers = new HashMap<String, String>();
> + for (Map.Entry entry :
> jis.getManifest().getMainAttributes().entrySet()) {
> + headers.put(entry.getKey().toString(),
> entry.getValue().toString());
> + }
> + return new BundleDescriptor(
> + getClass().getClassLoader(),
> + new URL("jar:" + file.toURI().toString() + "!/"),
> + headers);
> + }
> +
> + public static long copy(final InputStream input, final OutputStream
> output) throws IOException {
> + return copy(input, output, 8024);
> + }
> +
> + public static long copy(final InputStream input, final OutputStream
> output, int buffersize) throws IOException {
> + final byte[] buffer = new byte[buffersize];
> + int n;
> + long count=0;
> + while (-1 != (n = input.read(buffer))) {
> + output.write(buffer, 0, n);
> + count += n;
> + }
> + return count;
> + }
> +
> +}
> +
> +
>
> Added:
> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/LICENSE.txt
> URL:
> http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/LICENSE.txt?rev=1230346&view=auto
>
> ==============================================================================
> ---
> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/LICENSE.txt
> (added)
> +++
> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/LICENSE.txt
> Thu Jan 12 01:10:12 2012
> @@ -0,0 +1,203 @@
> +
> + Apache License
> + Version 2.0, January 2004
> + http://www.apache.org/licenses/
> +
> +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
> +
> +1. Definitions.
> +
> + "License" shall mean the terms and conditions for use, reproduction,
> + and distribution as defined by Sections 1 through 9 of this document.
> +
> + "Licensor" shall mean the copyright owner or entity authorized by
> + the copyright owner that is granting the License.
> +
> + "Legal Entity" shall mean the union of the acting entity and all
> + other entities that control, are controlled by, or are under common
> + control with that entity. For the purposes of this definition,
> + "control" means (i) the power, direct or indirect, to cause the
> + direction or management of such entity, whether by contract or
> + otherwise, or (ii) ownership of fifty percent (50%) or more of the
> + outstanding shares, or (iii) beneficial ownership of such entity.
> +
> + "You" (or "Your") shall mean an individual or Legal Entity
> + exercising permissions granted by this License.
> +
> + "Source" form shall mean the preferred form for making modifications,
> + including but not limited to software source code, documentation
> + source, and configuration files.
> +
> + "Object" form shall mean any form resulting from mechanical
> + transformation or translation of a Source form, including but
> + not limited to compiled object code, generated documentation,
> + and conversions to other media types.
> +
> + "Work" shall mean the work of authorship, whether in Source or
> + Object form, made available under the License, as indicated by a
> + copyright notice that is included in or attached to the work
> + (an example is provided in the Appendix below).
> +
> + "Derivative Works" shall mean any work, whether in Source or Object
> + form, that is based on (or derived from) the Work and for which the
> + editorial revisions, annotations, elaborations, or other modifications
> + represent, as a whole, an original work of authorship. For the purposes
> + of this License, Derivative Works shall not include works that remain
> + separable from, or merely link (or bind by name) to the interfaces of,
> + the Work and Derivative Works thereof.
> +
> + "Contribution" shall mean any work of authorship, including
> + the original version of the Work and any modifications or additions
> + to that Work or Derivative Works thereof, that is intentionally
> + submitted to Licensor for inclusion in the Work by the copyright owner
> + or by an individual or Legal Entity authorized to submit on behalf of
> + the copyright owner. For the purposes of this definition, "submitted"
> + means any form of electronic, verbal, or written communication sent
> + to the Licensor or its representatives, including but not limited to
> + communication on electronic mailing lists, source code control systems,
> + and issue tracking systems that are managed by, or on behalf of, the
> + Licensor for the purpose of discussing and improving the Work, but
> + excluding communication that is conspicuously marked or otherwise
> + designated in writing by the copyright owner as "Not a Contribution."
> +
> + "Contributor" shall mean Licensor and any individual or Legal Entity
> + on behalf of whom a Contribution has been received by Licensor and
> + subsequently incorporated within the Work.
> +
> +2. Grant of Copyright License. Subject to the terms and conditions of
> + this License, each Contributor hereby grants to You a perpetual,
> + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
> + copyright license to reproduce, prepare Derivative Works of,
> + publicly display, publicly perform, sublicense, and distribute the
> + Work and such Derivative Works in Source or Object form.
> +
> +3. Grant of Patent License. Subject to the terms and conditions of
> + this License, each Contributor hereby grants to You a perpetual,
> + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
> + (except as stated in this section) patent license to make, have made,
> + use, offer to sell, sell, import, and otherwise transfer the Work,
> + where such license applies only to those patent claims licensable
> + by such Contributor that are necessarily infringed by their
> + Contribution(s) alone or by combination of their Contribution(s)
> + with the Work to which such Contribution(s) was submitted. If You
> + institute patent litigation against any entity (including a
> + cross-claim or counterclaim in a lawsuit) alleging that the Work
> + or a Contribution incorporated within the Work constitutes direct
> + or contributory patent infringement, then any patent licenses
> + granted to You under this License for that Work shall terminate
> + as of the date such litigation is filed.
> +
> +4. Redistribution. You may reproduce and distribute copies of the
> + Work or Derivative Works thereof in any medium, with or without
> + modifications, and in Source or Object form, provided that You
> + meet the following conditions:
> +
> + (a) You must give any other recipients of the Work or
> + Derivative Works a copy of this License; and
> +
> + (b) You must cause any modified files to carry prominent notices
> + stating that You changed the files; and
> +
> + (c) You must retain, in the Source form of any Derivative Works
> + that You distribute, all copyright, patent, trademark, and
> + attribution notices from the Source form of the Work,
> + excluding those notices that do not pertain to any part of
> + the Derivative Works; and
> +
> + (d) If the Work includes a "NOTICE" text file as part of its
> + distribution, then any Derivative Works that You distribute must
> + include a readable copy of the attribution notices contained
> + within such NOTICE file, excluding those notices that do not
> + pertain to any part of the Derivative Works, in at least one
> + of the following places: within a NOTICE text file distributed
> + as part of the Derivative Works; within the Source form or
> + documentation, if provided along with the Derivative Works; or,
> + within a display generated by the Derivative Works, if and
> + wherever such third-party notices normally appear. The contents
> + of the NOTICE file are for informational purposes only and
> + do not modify the License. You may add Your own attribution
> + notices within Derivative Works that You distribute, alongside
> + or as an addendum to the NOTICE text from the Work, provided
> + that such additional attribution notices cannot be construed
> + as modifying the License.
> +
> + You may add Your own copyright statement to Your modifications and
> + may provide additional or different license terms and conditions
> + for use, reproduction, or distribution of Your modifications, or
> + for any such Derivative Works as a whole, provided Your use,
> + reproduction, and distribution of the Work otherwise complies with
> + the conditions stated in this License.
> +
> +5. Submission of Contributions. Unless You explicitly state otherwise,
> + any Contribution intentionally submitted for inclusion in the Work
> + by You to the Licensor shall be under the terms and conditions of
> + this License, without any additional terms or conditions.
> + Notwithstanding the above, nothing herein shall supersede or modify
> + the terms of any separate license agreement you may have executed
> + with Licensor regarding such Contributions.
> +
> +6. Trademarks. This License does not grant permission to use the trade
> + names, trademarks, service marks, or product names of the Licensor,
> + except as required for reasonable and customary use in describing the
> + origin of the Work and reproducing the content of the NOTICE file.
> +
> +7. Disclaimer of Warranty. Unless required by applicable law or
> + agreed to in writing, Licensor provides the Work (and each
> + Contributor provides its Contributions) on an "AS IS" BASIS,
> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
> + implied, including, without limitation, any warranties or conditions
> + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
> + PARTICULAR PURPOSE. You are solely responsible for determining the
> + appropriateness of using or redistributing the Work and assume any
> + risks associated with Your exercise of permissions under this License.
> +
> +8. Limitation of Liability. In no event and under no legal theory,
> + whether in tort (including negligence), contract, or otherwise,
> + unless required by applicable law (such as deliberate and grossly
> + negligent acts) or agreed to in writing, shall any Contributor be
> + liable to You for damages, including any direct, indirect, special,
> + incidental, or consequential damages of any character arising as a
> + result of this License or out of the use or inability to use the
> + Work (including but not limited to damages for loss of goodwill,
> + work stoppage, computer failure or malfunction, or any and all
> + other commercial damages or losses), even if such Contributor
> + has been advised of the possibility of such damages.
> +
> +9. Accepting Warranty or Additional Liability. While redistributing
> + the Work or Derivative Works thereof, You may choose to offer,
> + and charge a fee for, acceptance of support, warranty, indemnity,
> + or other liability obligations and/or rights consistent with this
> + License. However, in accepting such obligations, You may act only
> + on Your own behalf and on Your sole responsibility, not on behalf
> + of any other Contributor, and only if You agree to indemnify,
> + defend, and hold each Contributor harmless for any liability
> + incurred by, or claims asserted against, such Contributor by reason
> + of your accepting any such warranty or additional liability.
> +
> +END OF TERMS AND CONDITIONS
> +
> +APPENDIX: How to apply the Apache License to your work.
> +
> + To apply the Apache License to your work, attach the following
> + boilerplate notice, with the fields enclosed by brackets "[]"
> + replaced with your own identifying information. (Don't include
> + the brackets!) The text should be enclosed in the appropriate
> + comment syntax for the file format. We also recommend that a
> + file or class name and description of purpose be included on the
> + same "printed page" as the copyright notice for easier
> + identification within third-party archives.
> +
> +Copyright [yyyy] [name of copyright owner]
> +
> +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.
> +
>
> Added:
> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/NOTICE.txt
> URL:
> http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/NOTICE.txt?rev=1230346&view=auto
>
> ==============================================================================
> ---
> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/NOTICE.txt
> (added)
> +++
> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/NOTICE.txt
> Thu Jan 12 01:10:12 2012
> @@ -0,0 +1,11 @@
> +=========================================================================
> +== NOTICE file corresponding to the section 4 d of ==
> +== the Apache License, Version 2.0, ==
> +== in this case for the Apache Camel distribution. ==
> +=========================================================================
> +
> +This product includes software developed by
> +The Apache Software Foundation (http://www.apache.org/).
> +
> +Please read the different LICENSE files present in the licenses directory
> of
> +this distribution.
>
> Added:
> camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
> URL:
> http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java?rev=1230346&view=auto
>
> ==============================================================================
> ---
> camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
> (added)
> +++
> camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
> Thu Jan 12 01:10:12 2012
> @@ -0,0 +1,44 @@
> +/**
> + * Licensed to the Apache Software Foundation (ASF) under one or more
> + * contributor license agreements. See the NOTICE file distributed with
> + * this work for additional information regarding copyright ownership.
> + * The ASF licenses this file to You 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.
> + */
> +package org.apache.camel.test.blueprint;
> +
> +import java.net.URL;
> +import java.util.Collection;
> +import java.util.Collections;
> +
> +import org.junit.Test;
> +
> +public class DebugBlueprintTest extends CamelBlueprintTestSupport {
> +
> + @Override
> + protected Collection<URL> getBlueprintDescriptors() {
> + return
> Collections.singleton(getClass().getResource("camelContext.xml"));
> + }
> +
> + @Test
> + public void testRoute() throws Exception {
> + // set mock expectations
> + getMockEndpoint("mock:a").expectedMessageCount(1);
> +
> + // send a message
> + template.sendBody("direct:start", "World");
> +
> + // assert mocks
> + assertMockEndpointsSatisfied();
> + }
> +
> +}
>
> Added:
> camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties
> URL:
> http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties?rev=1230346&view=auto
>
> ==============================================================================
> ---
> camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties
> (added)
> +++
> camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties
> Thu Jan 12 01:10:12 2012
> @@ -0,0 +1,37 @@
> +##
> ------------------------------------------------------------------------
> +## Licensed to the Apache Software Foundation (ASF) under one or more
> +## contributor license agreements. See the NOTICE file distributed with
> +## this work for additional information regarding copyright ownership.
> +## The ASF licenses this file to You 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.
> +##
> ------------------------------------------------------------------------
> +
> +#
> +# The logging properties used for testing
> +#
> +log4j.rootLogger=INFO, file
> +
> +log4j.logger.org.springframework=WARN
> +#log4j.logger.org.apache.camel=DEBUG
> +#log4j.logger.org.apache.camel.test.junit4=DEBUG
> +
> +# CONSOLE appender not used by default
> +log4j.appender.out=org.apache.log4j.ConsoleAppender
> +log4j.appender.out.layout=org.apache.log4j.PatternLayout
> +log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p
> %m%n
> +#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p
> %-30.30c{1} - %m%n
> +
> +# File appender
> +log4j.appender.file=org.apache.log4j.FileAppender
> +log4j.appender.file.layout=org.apache.log4j.PatternLayout
> +log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1} - %m %n
> +log4j.appender.file.file=target/camel-test.log
>
> Added:
> camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelContext.xml
> URL:
> http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelContext.xml?rev=1230346&view=auto
>
> ==============================================================================
> ---
> camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelContext.xml
> (added)
> +++
> camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelContext.xml
> Thu Jan 12 01:10:12 2012
> @@ -0,0 +1,32 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<!--
> + Licensed to the Apache Software Foundation (ASF) under one or more
> + contributor license agreements. See the NOTICE file distributed with
> + this work for additional information regarding copyright ownership.
> + The ASF licenses this file to You 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.
> +-->
> +<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
> +
> +
> + <camelContext id="camelContext" xmlns="
> http://camel.apache.org/schema/blueprint" trace="true" autoStartup="true"
> >
> +
> + <route>
> + <from uri="direct:start" />
> + <transform>
> + <simple>Hello ${body}</simple>
> + </transform>
> + <to uri="mock:a" />
> + </route>
> + </camelContext>
> +
> +</blueprint>
> \ No newline at end of file
>
> Modified:
> camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
> URL:
> http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java?rev=1230346&r1=1230345&r2=1230346&view=diff
>
> ==============================================================================
> ---
> camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
> (original)
> +++
> camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
> Thu Jan 12 01:10:12 2012
> @@ -27,6 +27,7 @@ import org.apache.camel.Route;
> import org.apache.camel.impl.DefaultPackageScanClassResolver;
> import org.apache.camel.impl.scan.AssignableToPackageScanFilter;
> import org.apache.camel.impl.scan.InvertingPackageScanFilter;
> +import org.apache.camel.spring.CamelBeanPostProcessor;
> import org.apache.camel.spring.SpringCamelContext;
> import org.apache.camel.util.CastUtils;
> import org.springframework.beans.factory.support.RootBeanDefinition;
> @@ -64,6 +65,17 @@ public abstract class CamelSpringTestSup
> }
> }
>
> + /**
> + * Lets post process this test instance to process any Camel
> annotations.
> + * Note that using Spring Test or Guice is a more powerful approach.
> + */
> + @Override
> + protected void postProcessTest() throws Exception {
> + CamelBeanPostProcessor processor = new CamelBeanPostProcessor();
> + processor.setCamelContext(context);
> + processor.postProcessBeforeInitialization(this, "this");
> + }
> +
> @SuppressWarnings("unchecked")
> private static class ExcludingPackageScanClassResolver extends
> DefaultPackageScanClassResolver {
>
>
> Modified:
> camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
> URL:
> http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java?rev=1230346&r1=1230345&r2=1230346&view=diff
>
> ==============================================================================
> ---
> camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
> (original)
> +++
> camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
> Thu Jan 12 01:10:12 2012
> @@ -241,14 +241,7 @@ public abstract class CamelTestSupport e
> return true;
> }
>
> - /**
> - * Lets post process this test instance to process any Camel
> annotations.
> - * Note that using Spring Test or Guice is a more powerful approach.
> - */
> protected void postProcessTest() throws Exception {
> - CamelBeanPostProcessor processor = new CamelBeanPostProcessor();
> - processor.setCamelContext(context);
> - processor.postProcessBeforeInitialization(this, "this");
> }
>
> protected void stopCamelContext() throws Exception {
>
> Modified: camel/trunk/components/pom.xml
> URL:
> http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=1230346&r1=1230345&r2=1230346&view=diff
>
> ==============================================================================
> --- camel/trunk/components/pom.xml (original)
> +++ camel/trunk/components/pom.xml Thu Jan 12 01:10:12 2012
> @@ -34,6 +34,7 @@
> <!-- we want to test these modules first to catch any errors early
> as possible -->
> <module>camel-test</module>
> <module>camel-testng</module>
> + <module>camel-test-blueprint</module>
> <module>camel-core-osgi</module>
> <module>camel-core-xml</module>
> <module>camel-blueprint</module>
>
> Modified:
> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
> URL:
> http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml?rev=1230346&r1=1230345&r2=1230346&view=diff
>
> ==============================================================================
> ---
> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
> (original)
> +++
> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
> Thu Jan 12 01:10:12 2012
> @@ -44,7 +44,7 @@
> <!-- for testing -->
> <dependency>
> <groupId>org.apache.camel</groupId>
> - <artifactId>camel-test</artifactId>
> + <artifactId>camel-test-blueprint</artifactId>
> <version>${camel-version}</version>
> <scope>test</scope>
> </dependency>
>
> Modified:
> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/blueprint.xml
> URL:
> http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1230346&r1=1230345&r2=1230346&view=diff
>
> ==============================================================================
> ---
> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/blueprint.xml
> (original)
> +++
> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/blueprint.xml
> Thu Jan 12 01:10:12 2012
> @@ -29,11 +29,12 @@
>
> <camelContext id="blueprintContext" trace="false" xmlns="
> http://camel.apache.org/schema/blueprint">
> <route id="timerToLog">
> - <from uri="timer:foo?period=5000"/>
> + <from uri="direct:start"/>
> <setBody>
> <method ref="helloBean" method="hello"/>
> </setBody>
> <log message="The message contains ${body}"/>
> + <to uri="mock:a" />
> </route>
> </camelContext>
>
>
> Added:
> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/RouteTest.java
> URL:
> http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/RouteTest.java?rev=1230346&view=auto
>
> ==============================================================================
> ---
> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/RouteTest.java
> (added)
> +++
> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/RouteTest.java
> Thu Jan 12 01:10:12 2012
> @@ -0,0 +1,46 @@
> +/**
> + * Licensed to the Apache Software Foundation (ASF) under one or more
> + * contributor license agreements. See the NOTICE file distributed with
> + * this work for additional information regarding copyright ownership.
> + * The ASF licenses this file to You 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.
> + */
> +package ${package};
> +
> +import java.net.URL;
> +import java.util.Collection;
> +import java.util.Collections;
> +
> +import org.apache.camel.test.blueprint.CamelBlueprintTestSupport;
> +
> +import org.junit.Test;
> +
> +public class RouteTest extends CamelBlueprintTestSupport {
> +
> + @Override
> + protected Collection<URL> getBlueprintDescriptors() {
> + return
> Collections.singleton(getClass().getResource("/OSGI-INF/blueprint/blueprint.xml"));
> + }
> +
> + @Test
> + public void testDebugger() throws Exception {
> + // set mock expectations
> + getMockEndpoint("mock:a").expectedMessageCount(1);
> +
> + // send a message
> + template.sendBody("direct:start", "World");
> +
> + // assert mocks
> + assertMockEndpointsSatisfied();
> + }
> +
> +}
>
> Added:
> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/resources/log4j.properties
> URL:
> http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/resources/log4j.properties?rev=1230346&view=auto
>
> ==============================================================================
> ---
> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/resources/log4j.properties
> (added)
> +++
> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/resources/log4j.properties
> Thu Jan 12 01:10:12 2012
> @@ -0,0 +1,37 @@
> +##
> ------------------------------------------------------------------------
> +## Licensed to the Apache Software Foundation (ASF) under one or more
> +## contributor license agreements. See the NOTICE file distributed with
> +## this work for additional information regarding copyright ownership.
> +## The ASF licenses this file to You 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.
> +##
> ------------------------------------------------------------------------
> +
> +#
> +# The logging properties used for testing
> +#
> +log4j.rootLogger=INFO, out
> +
> +log4j.logger.org.springframework=WARN
> +#log4j.logger.org.apache.camel=DEBUG
> +#log4j.logger.org.apache.camel.test.junit4=DEBUG
> +
> +# CONSOLE appender not used by default
> +log4j.appender.out=org.apache.log4j.ConsoleAppender
> +log4j.appender.out.layout=org.apache.log4j.PatternLayout
> +log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p
> %m%n
> +#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p
> %-30.30c{1} - %m%n
> +
> +# File appender
> +log4j.appender.file=org.apache.log4j.FileAppender
> +log4j.appender.file.layout=org.apache.log4j.PatternLayout
> +log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1} - %m %n
> +log4j.appender.file.file=target/camel-test.log
>
>
>
Re: svn commit: r1230346 - in /camel/trunk: components/
components/camel-test-blueprint/ components/camel-test-blueprint/src/
components/camel-test-blueprint/src/main/
components/camel-test-blueprint/src/main/java/
components/camel-test-blueprint/src
Posted by Babak Vahdat <ba...@swissonline.ch>.
Hi Guillaume,
there were also bunch of the checkstyle violations [1] by this new module
which I'm currently fixing (like in [2]) in parallel as I fix the
raw-type-avoidance there [3] as well.
[1] http://camel.apache.org/building.html
[2]
https://svn.apache.org/repos/asf/camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
[3] https://issues.apache.org/jira/browse/CAMEL-4796
Babak
--
View this message in context: http://camel.465427.n5.nabble.com/Re-svn-commit-r1230346-in-camel-trunk-components-components-camel-test-blueprint-components-camel-tec-tp5139199p5142182.html
Sent from the Camel Development mailing list archive at Nabble.com.
Re: svn commit: r1230346 - in /camel/trunk: components/
components/camel-test-blueprint/ components/camel-test-blueprint/src/
components/camel-test-blueprint/src/main/ components/camel-test-blueprint/src/main/java/
components/camel-test-blueprint/src
Posted by Guillaume Nodet <gn...@gmail.com>.
For the tests to run, we actually need the snapshot. I've submitted a
patch and hopefully it will be released next week or so.
I will be in the plane for the next day so can't really fix it, but in
the mean time, downgrading and disabling the tests should work (or
disabling the module).
We need to get that fixed anyway. I'll make sure we have a release asap.
Sorry about that.
On Thu, Jan 12, 2012 at 05:44, Hadrian Zbarcea <hz...@gmail.com> wrote:
> I fixed the build problem by downgrading to pojosr 0.1.6 available in public
> repos. We did discuss dependencies on snapshots a few times in the past. The
> tests fail though, I will look into it a bit later today if gnodet won't fix
> it.
>
> Hadrian
>
>
> On 01/12/2012 02:10 AM, Christian Müller wrote:
>>
>> Good morning Guillaume,
>>
>> your last commit breaks the build. Could you please have a look at it:
>>
>> [ERROR] Failed to execute goal on project camel-test-blueprint: Could not
>> resolve dependencies for project
>> org.apache.camel:camel-test-blueprint:bundle:2.10-SNAPSHOT: Could not find
>> artifact
>> com.googlecode.pojosr:de.kalpatec.pojosr.framework:jar:0.1.7-SNAPSHOT in
>> apache.snapshots (http://repository.apache.org/snapshots/)
>>
>> Best,
>> Christian
>>
>> On Thu, Jan 12, 2012 at 2:10 AM,<gn...@apache.org> wrote:
>>
>>> Author: gnodet
>>> Date: Thu Jan 12 01:10:12 2012
>>> New Revision: 1230346
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1230346&view=rev
>>> Log:
>>> [CAMEL-4888] Test support classes for running junit tests with camel and
>>> blueprint
>>>
>>> Added:
>>> camel/trunk/components/camel-test-blueprint/
>>> camel/trunk/components/camel-test-blueprint/pom.xml
>>> camel/trunk/components/camel-test-blueprint/src/
>>> camel/trunk/components/camel-test-blueprint/src/main/
>>> camel/trunk/components/camel-test-blueprint/src/main/java/
>>> camel/trunk/components/camel-test-blueprint/src/main/java/org/
>>> camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/
>>>
>>>
>>> camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/
>>>
>>>
>>> camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/
>>>
>>>
>>> camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/
>>>
>>>
>>> camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
>>> camel/trunk/components/camel-test-blueprint/src/main/resources/
>>>
>>> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/
>>>
>>>
>>> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/LICENSE.txt
>>>
>>>
>>> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/NOTICE.txt
>>> camel/trunk/components/camel-test-blueprint/src/test/
>>> camel/trunk/components/camel-test-blueprint/src/test/java/
>>> camel/trunk/components/camel-test-blueprint/src/test/java/org/
>>> camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/
>>>
>>>
>>> camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/
>>>
>>>
>>> camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/
>>>
>>>
>>> camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/
>>>
>>>
>>> camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
>>> camel/trunk/components/camel-test-blueprint/src/test/resources/
>>>
>>>
>>> camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties
>>> camel/trunk/components/camel-test-blueprint/src/test/resources/org/
>>>
>>>
>>> camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/
>>>
>>>
>>> camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/
>>>
>>>
>>> camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/
>>>
>>>
>>> camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/
>>>
>>>
>>> camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelContext.xml
>>>
>>>
>>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/
>>>
>>>
>>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/
>>>
>>>
>>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/RouteTest.java
>>>
>>>
>>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/resources/
>>>
>>>
>>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/resources/log4j.properties
>>> Modified:
>>>
>>>
>>> camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
>>>
>>>
>>> camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
>>> camel/trunk/components/pom.xml
>>>
>>>
>>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
>>>
>>>
>>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/blueprint.xml
>>>
>>> Added: camel/trunk/components/camel-test-blueprint/pom.xml
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/pom.xml?rev=1230346&view=auto
>>>
>>>
>>> ==============================================================================
>>> --- camel/trunk/components/camel-test-blueprint/pom.xml (added)
>>> +++ camel/trunk/components/camel-test-blueprint/pom.xml Thu Jan 12
>>> 01:10:12 2012
>>> @@ -0,0 +1,127 @@
>>> +<?xml version="1.0" encoding="UTF-8"?>
>>> +<!--
>>> + Licensed to the Apache Software Foundation (ASF) under one or more
>>> + contributor license agreements. See the NOTICE file distributed with
>>> + this work for additional information regarding copyright ownership.
>>> + The ASF licenses this file to You 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.
>>> +-->
>>> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
>>> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
>>> http://maven.apache.org/POM/4.0.0
>>> http://maven.apache.org/maven-v4_0_0.xsd
>>> ">
>>> +
>>> +<modelVersion>4.0.0</modelVersion>
>>> +
>>> +<parent>
>>> +<groupId>org.apache.camel</groupId>
>>> +<artifactId>camel-parent</artifactId>
>>> +<version>2.10-SNAPSHOT</version>
>>> +<relativePath>../../parent</relativePath>
>>> +</parent>
>>> +
>>> +<artifactId>camel-test-blueprint</artifactId>
>>> +<packaging>bundle</packaging>
>>> +<name>Camel :: Test Blueprint</name>
>>> +<description>Camel Testing Blueprint Library using JUnit</description>
>>> +
>>> +<properties>
>>> +
>>>
>>> <camel.osgi.export.pkg>org.apache.camel.test.blueprint*</camel.osgi.export.pkg>
>>> +</properties>
>>> +
>>> +<dependencies>
>>> +
>>> +<dependency>
>>> +<groupId>org.apache.camel</groupId>
>>> +<artifactId>camel-test</artifactId>
>>> +<exclusions>
>>> +<exclusion>
>>> +<groupId>org.springframework</groupId>
>>> +<artifactId>spring-core</artifactId>
>>> +</exclusion>
>>> +<exclusion>
>>> +<groupId>org.springframework</groupId>
>>> +<artifactId>spring-beans</artifactId>
>>> +</exclusion>
>>> +<exclusion>
>>> +<groupId>org.springframework</groupId>
>>> +<artifactId>spring-aop</artifactId>
>>> +</exclusion>
>>> +<exclusion>
>>> +<groupId>org.springframework</groupId>
>>> +<artifactId>spring-asm</artifactId>
>>> +</exclusion>
>>> +<exclusion>
>>> +<groupId>org.springframework</groupId>
>>> +<artifactId>spring-context</artifactId>
>>> +</exclusion>
>>> +<exclusion>
>>> +<groupId>org.springframework</groupId>
>>> +<artifactId>spring-tx</artifactId>
>>> +</exclusion>
>>> +</exclusions>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>org.apache.camel</groupId>
>>> +<artifactId>camel-blueprint</artifactId>
>>> +<exclusions>
>>> +<exclusion>
>>> +<groupId>javax.xml.bind</groupId>
>>> +<artifactId>jaxb-api</artifactId>
>>> +</exclusion>
>>> +</exclusions>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>org.apache.aries.blueprint</groupId>
>>> +<artifactId>org.apache.aries.blueprint</artifactId>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>org.apache.aries</groupId>
>>> +<artifactId>org.apache.aries.util</artifactId>
>>> +<version>0.3</version>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>org.apache.aries.proxy</groupId>
>>> +<artifactId>org.apache.aries.proxy.impl</artifactId>
>>> +<version>0.3</version>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>org.apache.aries.proxy</groupId>
>>> +<artifactId>org.apache.aries.proxy.api</artifactId>
>>> +<version>0.3</version>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>com.googlecode.pojosr</groupId>
>>> +<artifactId>de.kalpatec.pojosr.framework</artifactId>
>>> +<version>0.1.7-SNAPSHOT</version>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>org.ops4j.pax.swissbox</groupId>
>>> +<artifactId>pax-swissbox-tinybundles</artifactId>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>junit</groupId>
>>> +<artifactId>junit</artifactId>
>>> +</dependency>
>>> +
>>> +<!-- optional dependencies for running tests -->
>>> +<dependency>
>>> +<groupId>org.slf4j</groupId>
>>> +<artifactId>slf4j-log4j12</artifactId>
>>> +<scope>test</scope>
>>> +</dependency>
>>> +<dependency>
>>> +<groupId>org.slf4j</groupId>
>>> +<artifactId>jcl-over-slf4j</artifactId>
>>> +<version>1.6.1</version>
>>> +</dependency>
>>> +
>>> +</dependencies>
>>> +
>>> +</project>
>>>
>>> Added:
>>>
>>> camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java?rev=1230346&view=auto
>>>
>>>
>>> ==============================================================================
>>> ---
>>>
>>> camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
>>> (added)
>>> +++
>>>
>>> camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
>>> Thu Jan 12 01:10:12 2012
>>> @@ -0,0 +1,215 @@
>>> +/**
>>> + * Licensed to the Apache Software Foundation (ASF) under one or more
>>> + * contributor license agreements. See the NOTICE file distributed with
>>> + * this work for additional information regarding copyright ownership.
>>> + * The ASF licenses this file to You 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.
>>> + */
>>> +package org.apache.camel.test.blueprint;
>>> +
>>> +import java.io.File;
>>> +import java.io.FileInputStream;
>>> +import java.io.FileOutputStream;
>>> +import java.io.IOException;
>>> +import java.io.InputStream;
>>> +import java.io.OutputStream;
>>> +import java.net.URL;
>>> +import java.util.Collection;
>>> +import java.util.Dictionary;
>>> +import java.util.Enumeration;
>>> +import java.util.HashMap;
>>> +import java.util.LinkedList;
>>> +import java.util.List;
>>> +import java.util.Map;
>>> +import java.util.jar.JarInputStream;
>>> +
>>> +import de.kalpatec.pojosr.framework.PojoServiceRegistryFactoryImpl;
>>> +import de.kalpatec.pojosr.framework.launch.BundleDescriptor;
>>> +import de.kalpatec.pojosr.framework.launch.ClasspathScanner;
>>> +import de.kalpatec.pojosr.framework.launch.PojoServiceRegistry;
>>> +import de.kalpatec.pojosr.framework.launch.PojoServiceRegistryFactory;
>>> +import org.apache.camel.CamelContext;
>>> +import org.apache.camel.test.CamelTestSupport;
>>> +import org.ops4j.pax.swissbox.tinybundles.core.TinyBundle;
>>> +import org.ops4j.pax.swissbox.tinybundles.core.TinyBundles;
>>> +import org.osgi.framework.BundleContext;
>>> +import org.osgi.framework.Constants;
>>> +import org.osgi.framework.Filter;
>>> +import org.osgi.framework.FrameworkUtil;
>>> +import org.osgi.framework.InvalidSyntaxException;
>>> +import org.osgi.framework.ServiceReference;
>>> +import org.osgi.util.tracker.ServiceTracker;
>>> +
>>> +/**
>>> + * @version
>>> + */
>>> +public abstract class CamelBlueprintTestSupport extends CamelTestSupport
>>> {
>>> +
>>> + public static final long DEFAULT_TIMEOUT = 30000;
>>> +
>>> + private BundleContext bundleContext;
>>> +
>>> + @Override
>>> + protected void setUp() throws Exception {
>>> + System.setProperty("org.bundles.framework.storage",
>>> "target/bundles/" + System.currentTimeMillis());
>>> + List<BundleDescriptor> bundles = new
>>> ClasspathScanner().scanForBundles("(Bundle-SymbolicName=*)");
>>> + TinyBundle bundle = createTestBundle();
>>> + bundles.add(getBundleDescriptor("target/test-bundle.jar",
>>> bundle));
>>> + Map config = new HashMap();
>>> + config.put(PojoServiceRegistryFactory.BUNDLE_DESCRIPTORS,
>>> bundles);
>>> + PojoServiceRegistry reg = new
>>> PojoServiceRegistryFactoryImpl().newPojoServiceRegistry(config);
>>> + bundleContext = reg.getBundleContext();
>>> +
>>> + super.setUp();
>>> + }
>>> +
>>> + protected TinyBundle createTestBundle() {
>>> + TinyBundle bundle = TinyBundles.newBundle();
>>> + for (URL url : getBlueprintDescriptors()) {
>>> + bundle.add("OSGI-INF/blueprint/blueprint-" +
>>> url.getFile().replace("/", "-"), url);
>>> + }
>>> + bundle.set("Manifest-Version", "2")
>>> + .set("Bundle-ManifestVersion", "2")
>>> + .set("Bundle-SymbolicName", "test-bundle")
>>> + .set("Bundle-Version", "0.0.0");
>>> + return bundle;
>>> + }
>>> +
>>> + protected abstract Collection<URL> getBlueprintDescriptors();
>>> +
>>> + @Override
>>> + protected CamelContext createCamelContext() throws Exception {
>>> + return getOsgiService(CamelContext.class);
>>> + }
>>> +
>>> + @Override
>>> + protected void tearDown() throws Exception {
>>> + super.tearDown();
>>> + bundleContext.getBundle().stop();
>>> + }
>>> +
>>> + protected<T> T getOsgiService(Class<T> type, long timeout) {
>>> + return getOsgiService(type, null, timeout);
>>> + }
>>> +
>>> + protected<T> T getOsgiService(Class<T> type) {
>>> + return getOsgiService(type, null, DEFAULT_TIMEOUT);
>>> + }
>>> +
>>> + protected<T> T getOsgiService(Class<T> type, String filter) {
>>> + return getOsgiService(type, filter, DEFAULT_TIMEOUT);
>>> + }
>>> +
>>> + protected<T> T getOsgiService(Class<T> type, String filter, long
>>> timeout) {
>>> + ServiceTracker tracker = null;
>>> + try {
>>> + String flt;
>>> + if (filter != null) {
>>> + if (filter.startsWith("(")) {
>>> + flt = "(&(" + Constants.OBJECTCLASS + "=" +
>>> type.getName() + ")" + filter + ")";
>>> + } else {
>>> + flt = "(&(" + Constants.OBJECTCLASS + "=" +
>>> type.getName() + ")(" + filter + "))";
>>> + }
>>> + } else {
>>> + flt = "(" + Constants.OBJECTCLASS + "=" + type.getName()
>>> + ")";
>>> + }
>>> + Filter osgiFilter = FrameworkUtil.createFilter(flt);
>>> + tracker = new ServiceTracker(bundleContext, osgiFilter,
>>> null);
>>> + tracker.open(true);
>>> + // Note that the tracker is not closed to keep the reference
>>> + // This is buggy, as the service reference may change i
>>> think
>>> + Object svc = type.cast(tracker.waitForService(timeout));
>>> + if (svc == null) {
>>> + Dictionary dic = bundleContext.getBundle().getHeaders();
>>> + System.err.println("Test bundle headers: " +
>>> explode(dic));
>>> +
>>> + for (ServiceReference ref :
>>> asCollection(bundleContext.getAllServiceReferences(null, null))) {
>>> + System.err.println("ServiceReference: " + ref);
>>> + }
>>> +
>>> + for (ServiceReference ref :
>>> asCollection(bundleContext.getAllServiceReferences(null, flt))) {
>>> + System.err.println("Filtered ServiceReference: " +
>>> ref);
>>> + }
>>> +
>>> + throw new RuntimeException("Gave up waiting for service
>>> "
>>> + flt);
>>> + }
>>> + return type.cast(svc);
>>> + } catch (InvalidSyntaxException e) {
>>> + throw new IllegalArgumentException("Invalid filter", e);
>>> + } catch (InterruptedException e) {
>>> + throw new RuntimeException(e);
>>> + }
>>> + }
>>> +
>>> + /*
>>> + * Explode the dictionary into a ,-delimited list of key=value pairs
>>> + */
>>> + private static String explode(Dictionary dictionary) {
>>> + Enumeration keys = dictionary.keys();
>>> + StringBuffer result = new StringBuffer();
>>> + while (keys.hasMoreElements()) {
>>> + Object key = keys.nextElement();
>>> + result.append(String.format("%s=%s", key,
>>> dictionary.get(key)));
>>> + if (keys.hasMoreElements()) {
>>> + result.append(", ");
>>> + }
>>> + }
>>> + return result.toString();
>>> + }
>>> +
>>> + /*
>>> + * Provides an iterable collection of references, even if the
>>> original array is null
>>> + */
>>> + private static final Collection<ServiceReference>
>>> asCollection(ServiceReference[] references) {
>>> + List<ServiceReference> result = new
>>> LinkedList<ServiceReference>();
>>> + if (references != null) {
>>> + for (ServiceReference reference : references) {
>>> + result.add(reference);
>>> + }
>>> + }
>>> + return result;
>>> + }
>>> +
>>> + private BundleDescriptor getBundleDescriptor(String path, TinyBundle
>>> bundle) throws Exception {
>>> + File file = new File(path);
>>> + FileOutputStream fos = new FileOutputStream(file);
>>> + copy(bundle.build(), fos);
>>> + fos.close();
>>> + JarInputStream jis = new JarInputStream(new
>>> FileInputStream(file));
>>> + Map<String, String> headers = new HashMap<String, String>();
>>> + for (Map.Entry entry :
>>> jis.getManifest().getMainAttributes().entrySet()) {
>>> + headers.put(entry.getKey().toString(),
>>> entry.getValue().toString());
>>> + }
>>> + return new BundleDescriptor(
>>> + getClass().getClassLoader(),
>>> + new URL("jar:" + file.toURI().toString() + "!/"),
>>> + headers);
>>> + }
>>> +
>>> + public static long copy(final InputStream input, final OutputStream
>>> output) throws IOException {
>>> + return copy(input, output, 8024);
>>> + }
>>> +
>>> + public static long copy(final InputStream input, final OutputStream
>>> output, int buffersize) throws IOException {
>>> + final byte[] buffer = new byte[buffersize];
>>> + int n;
>>> + long count=0;
>>> + while (-1 != (n = input.read(buffer))) {
>>> + output.write(buffer, 0, n);
>>> + count += n;
>>> + }
>>> + return count;
>>> + }
>>> +
>>> +}
>>> +
>>> +
>>>
>>> Added:
>>>
>>> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/LICENSE.txt
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/LICENSE.txt?rev=1230346&view=auto
>>>
>>>
>>> ==============================================================================
>>> ---
>>>
>>> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/LICENSE.txt
>>> (added)
>>> +++
>>>
>>> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/LICENSE.txt
>>> Thu Jan 12 01:10:12 2012
>>> @@ -0,0 +1,203 @@
>>> +
>>> + Apache License
>>> + Version 2.0, January 2004
>>> + http://www.apache.org/licenses/
>>> +
>>> +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
>>> +
>>> +1. Definitions.
>>> +
>>> + "License" shall mean the terms and conditions for use, reproduction,
>>> + and distribution as defined by Sections 1 through 9 of this document.
>>> +
>>> + "Licensor" shall mean the copyright owner or entity authorized by
>>> + the copyright owner that is granting the License.
>>> +
>>> + "Legal Entity" shall mean the union of the acting entity and all
>>> + other entities that control, are controlled by, or are under common
>>> + control with that entity. For the purposes of this definition,
>>> + "control" means (i) the power, direct or indirect, to cause the
>>> + direction or management of such entity, whether by contract or
>>> + otherwise, or (ii) ownership of fifty percent (50%) or more of the
>>> + outstanding shares, or (iii) beneficial ownership of such entity.
>>> +
>>> + "You" (or "Your") shall mean an individual or Legal Entity
>>> + exercising permissions granted by this License.
>>> +
>>> + "Source" form shall mean the preferred form for making modifications,
>>> + including but not limited to software source code, documentation
>>> + source, and configuration files.
>>> +
>>> + "Object" form shall mean any form resulting from mechanical
>>> + transformation or translation of a Source form, including but
>>> + not limited to compiled object code, generated documentation,
>>> + and conversions to other media types.
>>> +
>>> + "Work" shall mean the work of authorship, whether in Source or
>>> + Object form, made available under the License, as indicated by a
>>> + copyright notice that is included in or attached to the work
>>> + (an example is provided in the Appendix below).
>>> +
>>> + "Derivative Works" shall mean any work, whether in Source or Object
>>> + form, that is based on (or derived from) the Work and for which the
>>> + editorial revisions, annotations, elaborations, or other
>>> modifications
>>> + represent, as a whole, an original work of authorship. For the
>>> purposes
>>> + of this License, Derivative Works shall not include works that remain
>>> + separable from, or merely link (or bind by name) to the interfaces
>>> of,
>>> + the Work and Derivative Works thereof.
>>> +
>>> + "Contribution" shall mean any work of authorship, including
>>> + the original version of the Work and any modifications or additions
>>> + to that Work or Derivative Works thereof, that is intentionally
>>> + submitted to Licensor for inclusion in the Work by the copyright
>>> owner
>>> + or by an individual or Legal Entity authorized to submit on behalf of
>>> + the copyright owner. For the purposes of this definition, "submitted"
>>> + means any form of electronic, verbal, or written communication sent
>>> + to the Licensor or its representatives, including but not limited to
>>> + communication on electronic mailing lists, source code control
>>> systems,
>>> + and issue tracking systems that are managed by, or on behalf of, the
>>> + Licensor for the purpose of discussing and improving the Work, but
>>> + excluding communication that is conspicuously marked or otherwise
>>> + designated in writing by the copyright owner as "Not a Contribution."
>>> +
>>> + "Contributor" shall mean Licensor and any individual or Legal Entity
>>> + on behalf of whom a Contribution has been received by Licensor and
>>> + subsequently incorporated within the Work.
>>> +
>>> +2. Grant of Copyright License. Subject to the terms and conditions of
>>> + this License, each Contributor hereby grants to You a perpetual,
>>> + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
>>> + copyright license to reproduce, prepare Derivative Works of,
>>> + publicly display, publicly perform, sublicense, and distribute the
>>> + Work and such Derivative Works in Source or Object form.
>>> +
>>> +3. Grant of Patent License. Subject to the terms and conditions of
>>> + this License, each Contributor hereby grants to You a perpetual,
>>> + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
>>> + (except as stated in this section) patent license to make, have made,
>>> + use, offer to sell, sell, import, and otherwise transfer the Work,
>>> + where such license applies only to those patent claims licensable
>>> + by such Contributor that are necessarily infringed by their
>>> + Contribution(s) alone or by combination of their Contribution(s)
>>> + with the Work to which such Contribution(s) was submitted. If You
>>> + institute patent litigation against any entity (including a
>>> + cross-claim or counterclaim in a lawsuit) alleging that the Work
>>> + or a Contribution incorporated within the Work constitutes direct
>>> + or contributory patent infringement, then any patent licenses
>>> + granted to You under this License for that Work shall terminate
>>> + as of the date such litigation is filed.
>>> +
>>> +4. Redistribution. You may reproduce and distribute copies of the
>>> + Work or Derivative Works thereof in any medium, with or without
>>> + modifications, and in Source or Object form, provided that You
>>> + meet the following conditions:
>>> +
>>> + (a) You must give any other recipients of the Work or
>>> + Derivative Works a copy of this License; and
>>> +
>>> + (b) You must cause any modified files to carry prominent notices
>>> + stating that You changed the files; and
>>> +
>>> + (c) You must retain, in the Source form of any Derivative Works
>>> + that You distribute, all copyright, patent, trademark, and
>>> + attribution notices from the Source form of the Work,
>>> + excluding those notices that do not pertain to any part of
>>> + the Derivative Works; and
>>> +
>>> + (d) If the Work includes a "NOTICE" text file as part of its
>>> + distribution, then any Derivative Works that You distribute must
>>> + include a readable copy of the attribution notices contained
>>> + within such NOTICE file, excluding those notices that do not
>>> + pertain to any part of the Derivative Works, in at least one
>>> + of the following places: within a NOTICE text file distributed
>>> + as part of the Derivative Works; within the Source form or
>>> + documentation, if provided along with the Derivative Works; or,
>>> + within a display generated by the Derivative Works, if and
>>> + wherever such third-party notices normally appear. The contents
>>> + of the NOTICE file are for informational purposes only and
>>> + do not modify the License. You may add Your own attribution
>>> + notices within Derivative Works that You distribute, alongside
>>> + or as an addendum to the NOTICE text from the Work, provided
>>> + that such additional attribution notices cannot be construed
>>> + as modifying the License.
>>> +
>>> + You may add Your own copyright statement to Your modifications and
>>> + may provide additional or different license terms and conditions
>>> + for use, reproduction, or distribution of Your modifications, or
>>> + for any such Derivative Works as a whole, provided Your use,
>>> + reproduction, and distribution of the Work otherwise complies with
>>> + the conditions stated in this License.
>>> +
>>> +5. Submission of Contributions. Unless You explicitly state otherwise,
>>> + any Contribution intentionally submitted for inclusion in the Work
>>> + by You to the Licensor shall be under the terms and conditions of
>>> + this License, without any additional terms or conditions.
>>> + Notwithstanding the above, nothing herein shall supersede or modify
>>> + the terms of any separate license agreement you may have executed
>>> + with Licensor regarding such Contributions.
>>> +
>>> +6. Trademarks. This License does not grant permission to use the trade
>>> + names, trademarks, service marks, or product names of the Licensor,
>>> + except as required for reasonable and customary use in describing the
>>> + origin of the Work and reproducing the content of the NOTICE file.
>>> +
>>> +7. Disclaimer of Warranty. Unless required by applicable law or
>>> + agreed to in writing, Licensor provides the Work (and each
>>> + Contributor provides its Contributions) on an "AS IS" BASIS,
>>> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
>>> + implied, including, without limitation, any warranties or conditions
>>> + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
>>> + PARTICULAR PURPOSE. You are solely responsible for determining the
>>> + appropriateness of using or redistributing the Work and assume any
>>> + risks associated with Your exercise of permissions under this
>>> License.
>>> +
>>> +8. Limitation of Liability. In no event and under no legal theory,
>>> + whether in tort (including negligence), contract, or otherwise,
>>> + unless required by applicable law (such as deliberate and grossly
>>> + negligent acts) or agreed to in writing, shall any Contributor be
>>> + liable to You for damages, including any direct, indirect, special,
>>> + incidental, or consequential damages of any character arising as a
>>> + result of this License or out of the use or inability to use the
>>> + Work (including but not limited to damages for loss of goodwill,
>>> + work stoppage, computer failure or malfunction, or any and all
>>> + other commercial damages or losses), even if such Contributor
>>> + has been advised of the possibility of such damages.
>>> +
>>> +9. Accepting Warranty or Additional Liability. While redistributing
>>> + the Work or Derivative Works thereof, You may choose to offer,
>>> + and charge a fee for, acceptance of support, warranty, indemnity,
>>> + or other liability obligations and/or rights consistent with this
>>> + License. However, in accepting such obligations, You may act only
>>> + on Your own behalf and on Your sole responsibility, not on behalf
>>> + of any other Contributor, and only if You agree to indemnify,
>>> + defend, and hold each Contributor harmless for any liability
>>> + incurred by, or claims asserted against, such Contributor by reason
>>> + of your accepting any such warranty or additional liability.
>>> +
>>> +END OF TERMS AND CONDITIONS
>>> +
>>> +APPENDIX: How to apply the Apache License to your work.
>>> +
>>> + To apply the Apache License to your work, attach the following
>>> + boilerplate notice, with the fields enclosed by brackets "[]"
>>> + replaced with your own identifying information. (Don't include
>>> + the brackets!) The text should be enclosed in the appropriate
>>> + comment syntax for the file format. We also recommend that a
>>> + file or class name and description of purpose be included on the
>>> + same "printed page" as the copyright notice for easier
>>> + identification within third-party archives.
>>> +
>>> +Copyright [yyyy] [name of copyright owner]
>>> +
>>> +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.
>>> +
>>>
>>> Added:
>>>
>>> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/NOTICE.txt
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/NOTICE.txt?rev=1230346&view=auto
>>>
>>>
>>> ==============================================================================
>>> ---
>>>
>>> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/NOTICE.txt
>>> (added)
>>> +++
>>>
>>> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/NOTICE.txt
>>> Thu Jan 12 01:10:12 2012
>>> @@ -0,0 +1,11 @@
>>>
>>> +=========================================================================
>>> +== NOTICE file corresponding to the section 4 d of
>>> ==
>>> +== the Apache License, Version 2.0,
>>> ==
>>> +== in this case for the Apache Camel distribution.
>>> ==
>>>
>>> +=========================================================================
>>> +
>>> +This product includes software developed by
>>> +The Apache Software Foundation (http://www.apache.org/).
>>> +
>>> +Please read the different LICENSE files present in the licenses
>>> directory
>>> of
>>> +this distribution.
>>>
>>> Added:
>>>
>>> camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java?rev=1230346&view=auto
>>>
>>>
>>> ==============================================================================
>>> ---
>>>
>>> camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
>>> (added)
>>> +++
>>>
>>> camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
>>> Thu Jan 12 01:10:12 2012
>>> @@ -0,0 +1,44 @@
>>> +/**
>>> + * Licensed to the Apache Software Foundation (ASF) under one or more
>>> + * contributor license agreements. See the NOTICE file distributed with
>>> + * this work for additional information regarding copyright ownership.
>>> + * The ASF licenses this file to You 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.
>>> + */
>>> +package org.apache.camel.test.blueprint;
>>> +
>>> +import java.net.URL;
>>> +import java.util.Collection;
>>> +import java.util.Collections;
>>> +
>>> +import org.junit.Test;
>>> +
>>> +public class DebugBlueprintTest extends CamelBlueprintTestSupport {
>>> +
>>> + @Override
>>> + protected Collection<URL> getBlueprintDescriptors() {
>>> + return
>>> Collections.singleton(getClass().getResource("camelContext.xml"));
>>> + }
>>> +
>>> + @Test
>>> + public void testRoute() throws Exception {
>>> + // set mock expectations
>>> + getMockEndpoint("mock:a").expectedMessageCount(1);
>>> +
>>> + // send a message
>>> + template.sendBody("direct:start", "World");
>>> +
>>> + // assert mocks
>>> + assertMockEndpointsSatisfied();
>>> + }
>>> +
>>> +}
>>>
>>> Added:
>>>
>>> camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties?rev=1230346&view=auto
>>>
>>>
>>> ==============================================================================
>>> ---
>>>
>>> camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties
>>> (added)
>>> +++
>>>
>>> camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties
>>> Thu Jan 12 01:10:12 2012
>>> @@ -0,0 +1,37 @@
>>> +##
>>> ------------------------------------------------------------------------
>>> +## Licensed to the Apache Software Foundation (ASF) under one or more
>>> +## contributor license agreements. See the NOTICE file distributed with
>>> +## this work for additional information regarding copyright ownership.
>>> +## The ASF licenses this file to You 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.
>>> +##
>>> ------------------------------------------------------------------------
>>> +
>>> +#
>>> +# The logging properties used for testing
>>> +#
>>> +log4j.rootLogger=INFO, file
>>> +
>>> +log4j.logger.org.springframework=WARN
>>> +#log4j.logger.org.apache.camel=DEBUG
>>> +#log4j.logger.org.apache.camel.test.junit4=DEBUG
>>> +
>>> +# CONSOLE appender not used by default
>>> +log4j.appender.out=org.apache.log4j.ConsoleAppender
>>> +log4j.appender.out.layout=org.apache.log4j.PatternLayout
>>> +log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p
>>> %m%n
>>> +#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p
>>> %-30.30c{1} - %m%n
>>> +
>>> +# File appender
>>> +log4j.appender.file=org.apache.log4j.FileAppender
>>> +log4j.appender.file.layout=org.apache.log4j.PatternLayout
>>> +log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1} - %m %n
>>> +log4j.appender.file.file=target/camel-test.log
>>>
>>> Added:
>>>
>>> camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelContext.xml
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelContext.xml?rev=1230346&view=auto
>>>
>>>
>>> ==============================================================================
>>> ---
>>>
>>> camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelContext.xml
>>> (added)
>>> +++
>>>
>>> camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelContext.xml
>>> Thu Jan 12 01:10:12 2012
>>> @@ -0,0 +1,32 @@
>>> +<?xml version="1.0" encoding="UTF-8"?>
>>> +<!--
>>> + Licensed to the Apache Software Foundation (ASF) under one or more
>>> + contributor license agreements. See the NOTICE file distributed
>>> with
>>> + this work for additional information regarding copyright ownership.
>>> + The ASF licenses this file to You 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.
>>> +-->
>>> +<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
>>> +
>>> +
>>> +<camelContext id="camelContext" xmlns="
>>> http://camel.apache.org/schema/blueprint" trace="true" autoStartup="true"
>>>>
>>>>
>>> +
>>> +<route>
>>> +<from uri="direct:start" />
>>> +<transform>
>>> +<simple>Hello ${body}</simple>
>>> +</transform>
>>> +<to uri="mock:a" />
>>> +</route>
>>> +</camelContext>
>>> +
>>> +</blueprint>
>>> \ No newline at end of file
>>>
>>> Modified:
>>>
>>> camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java?rev=1230346&r1=1230345&r2=1230346&view=diff
>>>
>>>
>>> ==============================================================================
>>> ---
>>>
>>> camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
>>> (original)
>>> +++
>>>
>>> camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
>>> Thu Jan 12 01:10:12 2012
>>> @@ -27,6 +27,7 @@ import org.apache.camel.Route;
>>> import org.apache.camel.impl.DefaultPackageScanClassResolver;
>>> import org.apache.camel.impl.scan.AssignableToPackageScanFilter;
>>> import org.apache.camel.impl.scan.InvertingPackageScanFilter;
>>> +import org.apache.camel.spring.CamelBeanPostProcessor;
>>> import org.apache.camel.spring.SpringCamelContext;
>>> import org.apache.camel.util.CastUtils;
>>> import org.springframework.beans.factory.support.RootBeanDefinition;
>>> @@ -64,6 +65,17 @@ public abstract class CamelSpringTestSup
>>> }
>>> }
>>>
>>> + /**
>>> + * Lets post process this test instance to process any Camel
>>> annotations.
>>> + * Note that using Spring Test or Guice is a more powerful approach.
>>> + */
>>> + @Override
>>> + protected void postProcessTest() throws Exception {
>>> + CamelBeanPostProcessor processor = new CamelBeanPostProcessor();
>>> + processor.setCamelContext(context);
>>> + processor.postProcessBeforeInitialization(this, "this");
>>> + }
>>> +
>>> @SuppressWarnings("unchecked")
>>> private static class ExcludingPackageScanClassResolver extends
>>> DefaultPackageScanClassResolver {
>>>
>>>
>>> Modified:
>>>
>>> camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java?rev=1230346&r1=1230345&r2=1230346&view=diff
>>>
>>>
>>> ==============================================================================
>>> ---
>>>
>>> camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
>>> (original)
>>> +++
>>>
>>> camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
>>> Thu Jan 12 01:10:12 2012
>>> @@ -241,14 +241,7 @@ public abstract class CamelTestSupport e
>>> return true;
>>> }
>>>
>>> - /**
>>> - * Lets post process this test instance to process any Camel
>>> annotations.
>>> - * Note that using Spring Test or Guice is a more powerful approach.
>>> - */
>>> protected void postProcessTest() throws Exception {
>>> - CamelBeanPostProcessor processor = new CamelBeanPostProcessor();
>>> - processor.setCamelContext(context);
>>> - processor.postProcessBeforeInitialization(this, "this");
>>> }
>>>
>>> protected void stopCamelContext() throws Exception {
>>>
>>> Modified: camel/trunk/components/pom.xml
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=1230346&r1=1230345&r2=1230346&view=diff
>>>
>>>
>>> ==============================================================================
>>> --- camel/trunk/components/pom.xml (original)
>>> +++ camel/trunk/components/pom.xml Thu Jan 12 01:10:12 2012
>>> @@ -34,6 +34,7 @@
>>> <!-- we want to test these modules first to catch any errors early
>>> as possible -->
>>> <module>camel-test</module>
>>> <module>camel-testng</module>
>>> +<module>camel-test-blueprint</module>
>>> <module>camel-core-osgi</module>
>>> <module>camel-core-xml</module>
>>> <module>camel-blueprint</module>
>>>
>>> Modified:
>>>
>>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml?rev=1230346&r1=1230345&r2=1230346&view=diff
>>>
>>>
>>> ==============================================================================
>>> ---
>>>
>>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
>>> (original)
>>> +++
>>>
>>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
>>> Thu Jan 12 01:10:12 2012
>>> @@ -44,7 +44,7 @@
>>> <!-- for testing -->
>>> <dependency>
>>> <groupId>org.apache.camel</groupId>
>>> -<artifactId>camel-test</artifactId>
>>> +<artifactId>camel-test-blueprint</artifactId>
>>> <version>${camel-version}</version>
>>> <scope>test</scope>
>>> </dependency>
>>>
>>> Modified:
>>>
>>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/blueprint.xml
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1230346&r1=1230345&r2=1230346&view=diff
>>>
>>>
>>> ==============================================================================
>>> ---
>>>
>>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/blueprint.xml
>>> (original)
>>> +++
>>>
>>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/blueprint.xml
>>> Thu Jan 12 01:10:12 2012
>>> @@ -29,11 +29,12 @@
>>>
>>> <camelContext id="blueprintContext" trace="false" xmlns="
>>> http://camel.apache.org/schema/blueprint">
>>> <route id="timerToLog">
>>> -<from uri="timer:foo?period=5000"/>
>>> +<from uri="direct:start"/>
>>> <setBody>
>>> <method ref="helloBean" method="hello"/>
>>> </setBody>
>>> <log message="The message contains ${body}"/>
>>> +<to uri="mock:a" />
>>> </route>
>>> </camelContext>
>>>
>>>
>>> Added:
>>>
>>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/RouteTest.java
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/RouteTest.java?rev=1230346&view=auto
>>>
>>>
>>> ==============================================================================
>>> ---
>>>
>>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/RouteTest.java
>>> (added)
>>> +++
>>>
>>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/RouteTest.java
>>> Thu Jan 12 01:10:12 2012
>>> @@ -0,0 +1,46 @@
>>> +/**
>>> + * Licensed to the Apache Software Foundation (ASF) under one or more
>>> + * contributor license agreements. See the NOTICE file distributed with
>>> + * this work for additional information regarding copyright ownership.
>>> + * The ASF licenses this file to You 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.
>>> + */
>>> +package ${package};
>>> +
>>> +import java.net.URL;
>>> +import java.util.Collection;
>>> +import java.util.Collections;
>>> +
>>> +import org.apache.camel.test.blueprint.CamelBlueprintTestSupport;
>>> +
>>> +import org.junit.Test;
>>> +
>>> +public class RouteTest extends CamelBlueprintTestSupport {
>>> +
>>> + @Override
>>> + protected Collection<URL> getBlueprintDescriptors() {
>>> + return
>>>
>>> Collections.singleton(getClass().getResource("/OSGI-INF/blueprint/blueprint.xml"));
>>> + }
>>> +
>>> + @Test
>>> + public void testDebugger() throws Exception {
>>> + // set mock expectations
>>> + getMockEndpoint("mock:a").expectedMessageCount(1);
>>> +
>>> + // send a message
>>> + template.sendBody("direct:start", "World");
>>> +
>>> + // assert mocks
>>> + assertMockEndpointsSatisfied();
>>> + }
>>> +
>>> +}
>>>
>>> Added:
>>>
>>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/resources/log4j.properties
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/resources/log4j.properties?rev=1230346&view=auto
>>>
>>>
>>> ==============================================================================
>>> ---
>>>
>>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/resources/log4j.properties
>>> (added)
>>> +++
>>>
>>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/resources/log4j.properties
>>> Thu Jan 12 01:10:12 2012
>>> @@ -0,0 +1,37 @@
>>> +##
>>> ------------------------------------------------------------------------
>>> +## Licensed to the Apache Software Foundation (ASF) under one or more
>>> +## contributor license agreements. See the NOTICE file distributed with
>>> +## this work for additional information regarding copyright ownership.
>>> +## The ASF licenses this file to You 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.
>>> +##
>>> ------------------------------------------------------------------------
>>> +
>>> +#
>>> +# The logging properties used for testing
>>> +#
>>> +log4j.rootLogger=INFO, out
>>> +
>>> +log4j.logger.org.springframework=WARN
>>> +#log4j.logger.org.apache.camel=DEBUG
>>> +#log4j.logger.org.apache.camel.test.junit4=DEBUG
>>> +
>>> +# CONSOLE appender not used by default
>>> +log4j.appender.out=org.apache.log4j.ConsoleAppender
>>> +log4j.appender.out.layout=org.apache.log4j.PatternLayout
>>> +log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p
>>> %m%n
>>> +#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p
>>> %-30.30c{1} - %m%n
>>> +
>>> +# File appender
>>> +log4j.appender.file=org.apache.log4j.FileAppender
>>> +log4j.appender.file.layout=org.apache.log4j.PatternLayout
>>> +log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1} - %m %n
>>> +log4j.appender.file.file=target/camel-test.log
>>>
>>>
>>>
>>
>
> --
> Hadrian Zbarcea
> Principal Software Architect
> Talend, Inc
> http://coders.talend.com/
> http://camelbot.blogspot.com/
--
------------------------
Guillaume Nodet
------------------------
Blog: http://gnodet.blogspot.com/
------------------------
FuseSource, Integration everywhere
http://fusesource.com
Re: svn commit: r1230346 - in /camel/trunk: components/ components/camel-test-blueprint/
components/camel-test-blueprint/src/ components/camel-test-blueprint/src/main/
components/camel-test-blueprint/src/main/java/ components/camel-test-blueprint/src
Posted by Hadrian Zbarcea <hz...@gmail.com>.
I fixed the build problem by downgrading to pojosr 0.1.6 available in
public repos. We did discuss dependencies on snapshots a few times in
the past. The tests fail though, I will look into it a bit later today
if gnodet won't fix it.
Hadrian
On 01/12/2012 02:10 AM, Christian Müller wrote:
> Good morning Guillaume,
>
> your last commit breaks the build. Could you please have a look at it:
>
> [ERROR] Failed to execute goal on project camel-test-blueprint: Could not
> resolve dependencies for project
> org.apache.camel:camel-test-blueprint:bundle:2.10-SNAPSHOT: Could not find
> artifact
> com.googlecode.pojosr:de.kalpatec.pojosr.framework:jar:0.1.7-SNAPSHOT in
> apache.snapshots (http://repository.apache.org/snapshots/)
>
> Best,
> Christian
>
> On Thu, Jan 12, 2012 at 2:10 AM,<gn...@apache.org> wrote:
>
>> Author: gnodet
>> Date: Thu Jan 12 01:10:12 2012
>> New Revision: 1230346
>>
>> URL: http://svn.apache.org/viewvc?rev=1230346&view=rev
>> Log:
>> [CAMEL-4888] Test support classes for running junit tests with camel and
>> blueprint
>>
>> Added:
>> camel/trunk/components/camel-test-blueprint/
>> camel/trunk/components/camel-test-blueprint/pom.xml
>> camel/trunk/components/camel-test-blueprint/src/
>> camel/trunk/components/camel-test-blueprint/src/main/
>> camel/trunk/components/camel-test-blueprint/src/main/java/
>> camel/trunk/components/camel-test-blueprint/src/main/java/org/
>> camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/
>>
>> camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/
>>
>> camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/
>>
>> camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/
>>
>> camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
>> camel/trunk/components/camel-test-blueprint/src/main/resources/
>> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/
>>
>> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/LICENSE.txt
>>
>> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/NOTICE.txt
>> camel/trunk/components/camel-test-blueprint/src/test/
>> camel/trunk/components/camel-test-blueprint/src/test/java/
>> camel/trunk/components/camel-test-blueprint/src/test/java/org/
>> camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/
>>
>> camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/
>>
>> camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/
>>
>> camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/
>>
>> camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
>> camel/trunk/components/camel-test-blueprint/src/test/resources/
>>
>> camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties
>> camel/trunk/components/camel-test-blueprint/src/test/resources/org/
>>
>> camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/
>>
>> camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/
>>
>> camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/
>>
>> camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/
>>
>> camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelContext.xml
>>
>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/
>>
>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/
>>
>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/RouteTest.java
>>
>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/resources/
>>
>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/resources/log4j.properties
>> Modified:
>>
>> camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
>>
>> camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
>> camel/trunk/components/pom.xml
>>
>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
>>
>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/blueprint.xml
>>
>> Added: camel/trunk/components/camel-test-blueprint/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/pom.xml?rev=1230346&view=auto
>>
>> ==============================================================================
>> --- camel/trunk/components/camel-test-blueprint/pom.xml (added)
>> +++ camel/trunk/components/camel-test-blueprint/pom.xml Thu Jan 12
>> 01:10:12 2012
>> @@ -0,0 +1,127 @@
>> +<?xml version="1.0" encoding="UTF-8"?>
>> +<!--
>> + Licensed to the Apache Software Foundation (ASF) under one or more
>> + contributor license agreements. See the NOTICE file distributed with
>> + this work for additional information regarding copyright ownership.
>> + The ASF licenses this file to You 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.
>> +-->
>> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
>> http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
>> http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd
>> ">
>> +
>> +<modelVersion>4.0.0</modelVersion>
>> +
>> +<parent>
>> +<groupId>org.apache.camel</groupId>
>> +<artifactId>camel-parent</artifactId>
>> +<version>2.10-SNAPSHOT</version>
>> +<relativePath>../../parent</relativePath>
>> +</parent>
>> +
>> +<artifactId>camel-test-blueprint</artifactId>
>> +<packaging>bundle</packaging>
>> +<name>Camel :: Test Blueprint</name>
>> +<description>Camel Testing Blueprint Library using JUnit</description>
>> +
>> +<properties>
>> +
>> <camel.osgi.export.pkg>org.apache.camel.test.blueprint*</camel.osgi.export.pkg>
>> +</properties>
>> +
>> +<dependencies>
>> +
>> +<dependency>
>> +<groupId>org.apache.camel</groupId>
>> +<artifactId>camel-test</artifactId>
>> +<exclusions>
>> +<exclusion>
>> +<groupId>org.springframework</groupId>
>> +<artifactId>spring-core</artifactId>
>> +</exclusion>
>> +<exclusion>
>> +<groupId>org.springframework</groupId>
>> +<artifactId>spring-beans</artifactId>
>> +</exclusion>
>> +<exclusion>
>> +<groupId>org.springframework</groupId>
>> +<artifactId>spring-aop</artifactId>
>> +</exclusion>
>> +<exclusion>
>> +<groupId>org.springframework</groupId>
>> +<artifactId>spring-asm</artifactId>
>> +</exclusion>
>> +<exclusion>
>> +<groupId>org.springframework</groupId>
>> +<artifactId>spring-context</artifactId>
>> +</exclusion>
>> +<exclusion>
>> +<groupId>org.springframework</groupId>
>> +<artifactId>spring-tx</artifactId>
>> +</exclusion>
>> +</exclusions>
>> +</dependency>
>> +<dependency>
>> +<groupId>org.apache.camel</groupId>
>> +<artifactId>camel-blueprint</artifactId>
>> +<exclusions>
>> +<exclusion>
>> +<groupId>javax.xml.bind</groupId>
>> +<artifactId>jaxb-api</artifactId>
>> +</exclusion>
>> +</exclusions>
>> +</dependency>
>> +<dependency>
>> +<groupId>org.apache.aries.blueprint</groupId>
>> +<artifactId>org.apache.aries.blueprint</artifactId>
>> +</dependency>
>> +<dependency>
>> +<groupId>org.apache.aries</groupId>
>> +<artifactId>org.apache.aries.util</artifactId>
>> +<version>0.3</version>
>> +</dependency>
>> +<dependency>
>> +<groupId>org.apache.aries.proxy</groupId>
>> +<artifactId>org.apache.aries.proxy.impl</artifactId>
>> +<version>0.3</version>
>> +</dependency>
>> +<dependency>
>> +<groupId>org.apache.aries.proxy</groupId>
>> +<artifactId>org.apache.aries.proxy.api</artifactId>
>> +<version>0.3</version>
>> +</dependency>
>> +<dependency>
>> +<groupId>com.googlecode.pojosr</groupId>
>> +<artifactId>de.kalpatec.pojosr.framework</artifactId>
>> +<version>0.1.7-SNAPSHOT</version>
>> +</dependency>
>> +<dependency>
>> +<groupId>org.ops4j.pax.swissbox</groupId>
>> +<artifactId>pax-swissbox-tinybundles</artifactId>
>> +</dependency>
>> +<dependency>
>> +<groupId>junit</groupId>
>> +<artifactId>junit</artifactId>
>> +</dependency>
>> +
>> +<!-- optional dependencies for running tests -->
>> +<dependency>
>> +<groupId>org.slf4j</groupId>
>> +<artifactId>slf4j-log4j12</artifactId>
>> +<scope>test</scope>
>> +</dependency>
>> +<dependency>
>> +<groupId>org.slf4j</groupId>
>> +<artifactId>jcl-over-slf4j</artifactId>
>> +<version>1.6.1</version>
>> +</dependency>
>> +
>> +</dependencies>
>> +
>> +</project>
>>
>> Added:
>> camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
>> URL:
>> http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java?rev=1230346&view=auto
>>
>> ==============================================================================
>> ---
>> camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
>> (added)
>> +++
>> camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
>> Thu Jan 12 01:10:12 2012
>> @@ -0,0 +1,215 @@
>> +/**
>> + * Licensed to the Apache Software Foundation (ASF) under one or more
>> + * contributor license agreements. See the NOTICE file distributed with
>> + * this work for additional information regarding copyright ownership.
>> + * The ASF licenses this file to You 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.
>> + */
>> +package org.apache.camel.test.blueprint;
>> +
>> +import java.io.File;
>> +import java.io.FileInputStream;
>> +import java.io.FileOutputStream;
>> +import java.io.IOException;
>> +import java.io.InputStream;
>> +import java.io.OutputStream;
>> +import java.net.URL;
>> +import java.util.Collection;
>> +import java.util.Dictionary;
>> +import java.util.Enumeration;
>> +import java.util.HashMap;
>> +import java.util.LinkedList;
>> +import java.util.List;
>> +import java.util.Map;
>> +import java.util.jar.JarInputStream;
>> +
>> +import de.kalpatec.pojosr.framework.PojoServiceRegistryFactoryImpl;
>> +import de.kalpatec.pojosr.framework.launch.BundleDescriptor;
>> +import de.kalpatec.pojosr.framework.launch.ClasspathScanner;
>> +import de.kalpatec.pojosr.framework.launch.PojoServiceRegistry;
>> +import de.kalpatec.pojosr.framework.launch.PojoServiceRegistryFactory;
>> +import org.apache.camel.CamelContext;
>> +import org.apache.camel.test.CamelTestSupport;
>> +import org.ops4j.pax.swissbox.tinybundles.core.TinyBundle;
>> +import org.ops4j.pax.swissbox.tinybundles.core.TinyBundles;
>> +import org.osgi.framework.BundleContext;
>> +import org.osgi.framework.Constants;
>> +import org.osgi.framework.Filter;
>> +import org.osgi.framework.FrameworkUtil;
>> +import org.osgi.framework.InvalidSyntaxException;
>> +import org.osgi.framework.ServiceReference;
>> +import org.osgi.util.tracker.ServiceTracker;
>> +
>> +/**
>> + * @version
>> + */
>> +public abstract class CamelBlueprintTestSupport extends CamelTestSupport {
>> +
>> + public static final long DEFAULT_TIMEOUT = 30000;
>> +
>> + private BundleContext bundleContext;
>> +
>> + @Override
>> + protected void setUp() throws Exception {
>> + System.setProperty("org.bundles.framework.storage",
>> "target/bundles/" + System.currentTimeMillis());
>> + List<BundleDescriptor> bundles = new
>> ClasspathScanner().scanForBundles("(Bundle-SymbolicName=*)");
>> + TinyBundle bundle = createTestBundle();
>> + bundles.add(getBundleDescriptor("target/test-bundle.jar",
>> bundle));
>> + Map config = new HashMap();
>> + config.put(PojoServiceRegistryFactory.BUNDLE_DESCRIPTORS,
>> bundles);
>> + PojoServiceRegistry reg = new
>> PojoServiceRegistryFactoryImpl().newPojoServiceRegistry(config);
>> + bundleContext = reg.getBundleContext();
>> +
>> + super.setUp();
>> + }
>> +
>> + protected TinyBundle createTestBundle() {
>> + TinyBundle bundle = TinyBundles.newBundle();
>> + for (URL url : getBlueprintDescriptors()) {
>> + bundle.add("OSGI-INF/blueprint/blueprint-" +
>> url.getFile().replace("/", "-"), url);
>> + }
>> + bundle.set("Manifest-Version", "2")
>> + .set("Bundle-ManifestVersion", "2")
>> + .set("Bundle-SymbolicName", "test-bundle")
>> + .set("Bundle-Version", "0.0.0");
>> + return bundle;
>> + }
>> +
>> + protected abstract Collection<URL> getBlueprintDescriptors();
>> +
>> + @Override
>> + protected CamelContext createCamelContext() throws Exception {
>> + return getOsgiService(CamelContext.class);
>> + }
>> +
>> + @Override
>> + protected void tearDown() throws Exception {
>> + super.tearDown();
>> + bundleContext.getBundle().stop();
>> + }
>> +
>> + protected<T> T getOsgiService(Class<T> type, long timeout) {
>> + return getOsgiService(type, null, timeout);
>> + }
>> +
>> + protected<T> T getOsgiService(Class<T> type) {
>> + return getOsgiService(type, null, DEFAULT_TIMEOUT);
>> + }
>> +
>> + protected<T> T getOsgiService(Class<T> type, String filter) {
>> + return getOsgiService(type, filter, DEFAULT_TIMEOUT);
>> + }
>> +
>> + protected<T> T getOsgiService(Class<T> type, String filter, long
>> timeout) {
>> + ServiceTracker tracker = null;
>> + try {
>> + String flt;
>> + if (filter != null) {
>> + if (filter.startsWith("(")) {
>> + flt = "(&(" + Constants.OBJECTCLASS + "=" +
>> type.getName() + ")" + filter + ")";
>> + } else {
>> + flt = "(&(" + Constants.OBJECTCLASS + "=" +
>> type.getName() + ")(" + filter + "))";
>> + }
>> + } else {
>> + flt = "(" + Constants.OBJECTCLASS + "=" + type.getName()
>> + ")";
>> + }
>> + Filter osgiFilter = FrameworkUtil.createFilter(flt);
>> + tracker = new ServiceTracker(bundleContext, osgiFilter, null);
>> + tracker.open(true);
>> + // Note that the tracker is not closed to keep the reference
>> + // This is buggy, as the service reference may change i think
>> + Object svc = type.cast(tracker.waitForService(timeout));
>> + if (svc == null) {
>> + Dictionary dic = bundleContext.getBundle().getHeaders();
>> + System.err.println("Test bundle headers: " +
>> explode(dic));
>> +
>> + for (ServiceReference ref :
>> asCollection(bundleContext.getAllServiceReferences(null, null))) {
>> + System.err.println("ServiceReference: " + ref);
>> + }
>> +
>> + for (ServiceReference ref :
>> asCollection(bundleContext.getAllServiceReferences(null, flt))) {
>> + System.err.println("Filtered ServiceReference: " +
>> ref);
>> + }
>> +
>> + throw new RuntimeException("Gave up waiting for service "
>> + flt);
>> + }
>> + return type.cast(svc);
>> + } catch (InvalidSyntaxException e) {
>> + throw new IllegalArgumentException("Invalid filter", e);
>> + } catch (InterruptedException e) {
>> + throw new RuntimeException(e);
>> + }
>> + }
>> +
>> + /*
>> + * Explode the dictionary into a ,-delimited list of key=value pairs
>> + */
>> + private static String explode(Dictionary dictionary) {
>> + Enumeration keys = dictionary.keys();
>> + StringBuffer result = new StringBuffer();
>> + while (keys.hasMoreElements()) {
>> + Object key = keys.nextElement();
>> + result.append(String.format("%s=%s", key,
>> dictionary.get(key)));
>> + if (keys.hasMoreElements()) {
>> + result.append(", ");
>> + }
>> + }
>> + return result.toString();
>> + }
>> +
>> + /*
>> + * Provides an iterable collection of references, even if the
>> original array is null
>> + */
>> + private static final Collection<ServiceReference>
>> asCollection(ServiceReference[] references) {
>> + List<ServiceReference> result = new
>> LinkedList<ServiceReference>();
>> + if (references != null) {
>> + for (ServiceReference reference : references) {
>> + result.add(reference);
>> + }
>> + }
>> + return result;
>> + }
>> +
>> + private BundleDescriptor getBundleDescriptor(String path, TinyBundle
>> bundle) throws Exception {
>> + File file = new File(path);
>> + FileOutputStream fos = new FileOutputStream(file);
>> + copy(bundle.build(), fos);
>> + fos.close();
>> + JarInputStream jis = new JarInputStream(new
>> FileInputStream(file));
>> + Map<String, String> headers = new HashMap<String, String>();
>> + for (Map.Entry entry :
>> jis.getManifest().getMainAttributes().entrySet()) {
>> + headers.put(entry.getKey().toString(),
>> entry.getValue().toString());
>> + }
>> + return new BundleDescriptor(
>> + getClass().getClassLoader(),
>> + new URL("jar:" + file.toURI().toString() + "!/"),
>> + headers);
>> + }
>> +
>> + public static long copy(final InputStream input, final OutputStream
>> output) throws IOException {
>> + return copy(input, output, 8024);
>> + }
>> +
>> + public static long copy(final InputStream input, final OutputStream
>> output, int buffersize) throws IOException {
>> + final byte[] buffer = new byte[buffersize];
>> + int n;
>> + long count=0;
>> + while (-1 != (n = input.read(buffer))) {
>> + output.write(buffer, 0, n);
>> + count += n;
>> + }
>> + return count;
>> + }
>> +
>> +}
>> +
>> +
>>
>> Added:
>> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/LICENSE.txt
>> URL:
>> http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/LICENSE.txt?rev=1230346&view=auto
>>
>> ==============================================================================
>> ---
>> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/LICENSE.txt
>> (added)
>> +++
>> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/LICENSE.txt
>> Thu Jan 12 01:10:12 2012
>> @@ -0,0 +1,203 @@
>> +
>> + Apache License
>> + Version 2.0, January 2004
>> + http://www.apache.org/licenses/
>> +
>> +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
>> +
>> +1. Definitions.
>> +
>> + "License" shall mean the terms and conditions for use, reproduction,
>> + and distribution as defined by Sections 1 through 9 of this document.
>> +
>> + "Licensor" shall mean the copyright owner or entity authorized by
>> + the copyright owner that is granting the License.
>> +
>> + "Legal Entity" shall mean the union of the acting entity and all
>> + other entities that control, are controlled by, or are under common
>> + control with that entity. For the purposes of this definition,
>> + "control" means (i) the power, direct or indirect, to cause the
>> + direction or management of such entity, whether by contract or
>> + otherwise, or (ii) ownership of fifty percent (50%) or more of the
>> + outstanding shares, or (iii) beneficial ownership of such entity.
>> +
>> + "You" (or "Your") shall mean an individual or Legal Entity
>> + exercising permissions granted by this License.
>> +
>> + "Source" form shall mean the preferred form for making modifications,
>> + including but not limited to software source code, documentation
>> + source, and configuration files.
>> +
>> + "Object" form shall mean any form resulting from mechanical
>> + transformation or translation of a Source form, including but
>> + not limited to compiled object code, generated documentation,
>> + and conversions to other media types.
>> +
>> + "Work" shall mean the work of authorship, whether in Source or
>> + Object form, made available under the License, as indicated by a
>> + copyright notice that is included in or attached to the work
>> + (an example is provided in the Appendix below).
>> +
>> + "Derivative Works" shall mean any work, whether in Source or Object
>> + form, that is based on (or derived from) the Work and for which the
>> + editorial revisions, annotations, elaborations, or other modifications
>> + represent, as a whole, an original work of authorship. For the purposes
>> + of this License, Derivative Works shall not include works that remain
>> + separable from, or merely link (or bind by name) to the interfaces of,
>> + the Work and Derivative Works thereof.
>> +
>> + "Contribution" shall mean any work of authorship, including
>> + the original version of the Work and any modifications or additions
>> + to that Work or Derivative Works thereof, that is intentionally
>> + submitted to Licensor for inclusion in the Work by the copyright owner
>> + or by an individual or Legal Entity authorized to submit on behalf of
>> + the copyright owner. For the purposes of this definition, "submitted"
>> + means any form of electronic, verbal, or written communication sent
>> + to the Licensor or its representatives, including but not limited to
>> + communication on electronic mailing lists, source code control systems,
>> + and issue tracking systems that are managed by, or on behalf of, the
>> + Licensor for the purpose of discussing and improving the Work, but
>> + excluding communication that is conspicuously marked or otherwise
>> + designated in writing by the copyright owner as "Not a Contribution."
>> +
>> + "Contributor" shall mean Licensor and any individual or Legal Entity
>> + on behalf of whom a Contribution has been received by Licensor and
>> + subsequently incorporated within the Work.
>> +
>> +2. Grant of Copyright License. Subject to the terms and conditions of
>> + this License, each Contributor hereby grants to You a perpetual,
>> + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
>> + copyright license to reproduce, prepare Derivative Works of,
>> + publicly display, publicly perform, sublicense, and distribute the
>> + Work and such Derivative Works in Source or Object form.
>> +
>> +3. Grant of Patent License. Subject to the terms and conditions of
>> + this License, each Contributor hereby grants to You a perpetual,
>> + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
>> + (except as stated in this section) patent license to make, have made,
>> + use, offer to sell, sell, import, and otherwise transfer the Work,
>> + where such license applies only to those patent claims licensable
>> + by such Contributor that are necessarily infringed by their
>> + Contribution(s) alone or by combination of their Contribution(s)
>> + with the Work to which such Contribution(s) was submitted. If You
>> + institute patent litigation against any entity (including a
>> + cross-claim or counterclaim in a lawsuit) alleging that the Work
>> + or a Contribution incorporated within the Work constitutes direct
>> + or contributory patent infringement, then any patent licenses
>> + granted to You under this License for that Work shall terminate
>> + as of the date such litigation is filed.
>> +
>> +4. Redistribution. You may reproduce and distribute copies of the
>> + Work or Derivative Works thereof in any medium, with or without
>> + modifications, and in Source or Object form, provided that You
>> + meet the following conditions:
>> +
>> + (a) You must give any other recipients of the Work or
>> + Derivative Works a copy of this License; and
>> +
>> + (b) You must cause any modified files to carry prominent notices
>> + stating that You changed the files; and
>> +
>> + (c) You must retain, in the Source form of any Derivative Works
>> + that You distribute, all copyright, patent, trademark, and
>> + attribution notices from the Source form of the Work,
>> + excluding those notices that do not pertain to any part of
>> + the Derivative Works; and
>> +
>> + (d) If the Work includes a "NOTICE" text file as part of its
>> + distribution, then any Derivative Works that You distribute must
>> + include a readable copy of the attribution notices contained
>> + within such NOTICE file, excluding those notices that do not
>> + pertain to any part of the Derivative Works, in at least one
>> + of the following places: within a NOTICE text file distributed
>> + as part of the Derivative Works; within the Source form or
>> + documentation, if provided along with the Derivative Works; or,
>> + within a display generated by the Derivative Works, if and
>> + wherever such third-party notices normally appear. The contents
>> + of the NOTICE file are for informational purposes only and
>> + do not modify the License. You may add Your own attribution
>> + notices within Derivative Works that You distribute, alongside
>> + or as an addendum to the NOTICE text from the Work, provided
>> + that such additional attribution notices cannot be construed
>> + as modifying the License.
>> +
>> + You may add Your own copyright statement to Your modifications and
>> + may provide additional or different license terms and conditions
>> + for use, reproduction, or distribution of Your modifications, or
>> + for any such Derivative Works as a whole, provided Your use,
>> + reproduction, and distribution of the Work otherwise complies with
>> + the conditions stated in this License.
>> +
>> +5. Submission of Contributions. Unless You explicitly state otherwise,
>> + any Contribution intentionally submitted for inclusion in the Work
>> + by You to the Licensor shall be under the terms and conditions of
>> + this License, without any additional terms or conditions.
>> + Notwithstanding the above, nothing herein shall supersede or modify
>> + the terms of any separate license agreement you may have executed
>> + with Licensor regarding such Contributions.
>> +
>> +6. Trademarks. This License does not grant permission to use the trade
>> + names, trademarks, service marks, or product names of the Licensor,
>> + except as required for reasonable and customary use in describing the
>> + origin of the Work and reproducing the content of the NOTICE file.
>> +
>> +7. Disclaimer of Warranty. Unless required by applicable law or
>> + agreed to in writing, Licensor provides the Work (and each
>> + Contributor provides its Contributions) on an "AS IS" BASIS,
>> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
>> + implied, including, without limitation, any warranties or conditions
>> + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
>> + PARTICULAR PURPOSE. You are solely responsible for determining the
>> + appropriateness of using or redistributing the Work and assume any
>> + risks associated with Your exercise of permissions under this License.
>> +
>> +8. Limitation of Liability. In no event and under no legal theory,
>> + whether in tort (including negligence), contract, or otherwise,
>> + unless required by applicable law (such as deliberate and grossly
>> + negligent acts) or agreed to in writing, shall any Contributor be
>> + liable to You for damages, including any direct, indirect, special,
>> + incidental, or consequential damages of any character arising as a
>> + result of this License or out of the use or inability to use the
>> + Work (including but not limited to damages for loss of goodwill,
>> + work stoppage, computer failure or malfunction, or any and all
>> + other commercial damages or losses), even if such Contributor
>> + has been advised of the possibility of such damages.
>> +
>> +9. Accepting Warranty or Additional Liability. While redistributing
>> + the Work or Derivative Works thereof, You may choose to offer,
>> + and charge a fee for, acceptance of support, warranty, indemnity,
>> + or other liability obligations and/or rights consistent with this
>> + License. However, in accepting such obligations, You may act only
>> + on Your own behalf and on Your sole responsibility, not on behalf
>> + of any other Contributor, and only if You agree to indemnify,
>> + defend, and hold each Contributor harmless for any liability
>> + incurred by, or claims asserted against, such Contributor by reason
>> + of your accepting any such warranty or additional liability.
>> +
>> +END OF TERMS AND CONDITIONS
>> +
>> +APPENDIX: How to apply the Apache License to your work.
>> +
>> + To apply the Apache License to your work, attach the following
>> + boilerplate notice, with the fields enclosed by brackets "[]"
>> + replaced with your own identifying information. (Don't include
>> + the brackets!) The text should be enclosed in the appropriate
>> + comment syntax for the file format. We also recommend that a
>> + file or class name and description of purpose be included on the
>> + same "printed page" as the copyright notice for easier
>> + identification within third-party archives.
>> +
>> +Copyright [yyyy] [name of copyright owner]
>> +
>> +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.
>> +
>>
>> Added:
>> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/NOTICE.txt
>> URL:
>> http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/NOTICE.txt?rev=1230346&view=auto
>>
>> ==============================================================================
>> ---
>> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/NOTICE.txt
>> (added)
>> +++
>> camel/trunk/components/camel-test-blueprint/src/main/resources/META-INF/NOTICE.txt
>> Thu Jan 12 01:10:12 2012
>> @@ -0,0 +1,11 @@
>> +=========================================================================
>> +== NOTICE file corresponding to the section 4 d of ==
>> +== the Apache License, Version 2.0, ==
>> +== in this case for the Apache Camel distribution. ==
>> +=========================================================================
>> +
>> +This product includes software developed by
>> +The Apache Software Foundation (http://www.apache.org/).
>> +
>> +Please read the different LICENSE files present in the licenses directory
>> of
>> +this distribution.
>>
>> Added:
>> camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
>> URL:
>> http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java?rev=1230346&view=auto
>>
>> ==============================================================================
>> ---
>> camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
>> (added)
>> +++
>> camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/DebugBlueprintTest.java
>> Thu Jan 12 01:10:12 2012
>> @@ -0,0 +1,44 @@
>> +/**
>> + * Licensed to the Apache Software Foundation (ASF) under one or more
>> + * contributor license agreements. See the NOTICE file distributed with
>> + * this work for additional information regarding copyright ownership.
>> + * The ASF licenses this file to You 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.
>> + */
>> +package org.apache.camel.test.blueprint;
>> +
>> +import java.net.URL;
>> +import java.util.Collection;
>> +import java.util.Collections;
>> +
>> +import org.junit.Test;
>> +
>> +public class DebugBlueprintTest extends CamelBlueprintTestSupport {
>> +
>> + @Override
>> + protected Collection<URL> getBlueprintDescriptors() {
>> + return
>> Collections.singleton(getClass().getResource("camelContext.xml"));
>> + }
>> +
>> + @Test
>> + public void testRoute() throws Exception {
>> + // set mock expectations
>> + getMockEndpoint("mock:a").expectedMessageCount(1);
>> +
>> + // send a message
>> + template.sendBody("direct:start", "World");
>> +
>> + // assert mocks
>> + assertMockEndpointsSatisfied();
>> + }
>> +
>> +}
>>
>> Added:
>> camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties
>> URL:
>> http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties?rev=1230346&view=auto
>>
>> ==============================================================================
>> ---
>> camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties
>> (added)
>> +++
>> camel/trunk/components/camel-test-blueprint/src/test/resources/log4j.properties
>> Thu Jan 12 01:10:12 2012
>> @@ -0,0 +1,37 @@
>> +##
>> ------------------------------------------------------------------------
>> +## Licensed to the Apache Software Foundation (ASF) under one or more
>> +## contributor license agreements. See the NOTICE file distributed with
>> +## this work for additional information regarding copyright ownership.
>> +## The ASF licenses this file to You 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.
>> +##
>> ------------------------------------------------------------------------
>> +
>> +#
>> +# The logging properties used for testing
>> +#
>> +log4j.rootLogger=INFO, file
>> +
>> +log4j.logger.org.springframework=WARN
>> +#log4j.logger.org.apache.camel=DEBUG
>> +#log4j.logger.org.apache.camel.test.junit4=DEBUG
>> +
>> +# CONSOLE appender not used by default
>> +log4j.appender.out=org.apache.log4j.ConsoleAppender
>> +log4j.appender.out.layout=org.apache.log4j.PatternLayout
>> +log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p
>> %m%n
>> +#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p
>> %-30.30c{1} - %m%n
>> +
>> +# File appender
>> +log4j.appender.file=org.apache.log4j.FileAppender
>> +log4j.appender.file.layout=org.apache.log4j.PatternLayout
>> +log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1} - %m %n
>> +log4j.appender.file.file=target/camel-test.log
>>
>> Added:
>> camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelContext.xml
>> URL:
>> http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelContext.xml?rev=1230346&view=auto
>>
>> ==============================================================================
>> ---
>> camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelContext.xml
>> (added)
>> +++
>> camel/trunk/components/camel-test-blueprint/src/test/resources/org/apache/camel/test/blueprint/camelContext.xml
>> Thu Jan 12 01:10:12 2012
>> @@ -0,0 +1,32 @@
>> +<?xml version="1.0" encoding="UTF-8"?>
>> +<!--
>> + Licensed to the Apache Software Foundation (ASF) under one or more
>> + contributor license agreements. See the NOTICE file distributed with
>> + this work for additional information regarding copyright ownership.
>> + The ASF licenses this file to You 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.
>> +-->
>> +<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
>> +
>> +
>> +<camelContext id="camelContext" xmlns="
>> http://camel.apache.org/schema/blueprint" trace="true" autoStartup="true"
>>>
>> +
>> +<route>
>> +<from uri="direct:start" />
>> +<transform>
>> +<simple>Hello ${body}</simple>
>> +</transform>
>> +<to uri="mock:a" />
>> +</route>
>> +</camelContext>
>> +
>> +</blueprint>
>> \ No newline at end of file
>>
>> Modified:
>> camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
>> URL:
>> http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java?rev=1230346&r1=1230345&r2=1230346&view=diff
>>
>> ==============================================================================
>> ---
>> camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
>> (original)
>> +++
>> camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
>> Thu Jan 12 01:10:12 2012
>> @@ -27,6 +27,7 @@ import org.apache.camel.Route;
>> import org.apache.camel.impl.DefaultPackageScanClassResolver;
>> import org.apache.camel.impl.scan.AssignableToPackageScanFilter;
>> import org.apache.camel.impl.scan.InvertingPackageScanFilter;
>> +import org.apache.camel.spring.CamelBeanPostProcessor;
>> import org.apache.camel.spring.SpringCamelContext;
>> import org.apache.camel.util.CastUtils;
>> import org.springframework.beans.factory.support.RootBeanDefinition;
>> @@ -64,6 +65,17 @@ public abstract class CamelSpringTestSup
>> }
>> }
>>
>> + /**
>> + * Lets post process this test instance to process any Camel
>> annotations.
>> + * Note that using Spring Test or Guice is a more powerful approach.
>> + */
>> + @Override
>> + protected void postProcessTest() throws Exception {
>> + CamelBeanPostProcessor processor = new CamelBeanPostProcessor();
>> + processor.setCamelContext(context);
>> + processor.postProcessBeforeInitialization(this, "this");
>> + }
>> +
>> @SuppressWarnings("unchecked")
>> private static class ExcludingPackageScanClassResolver extends
>> DefaultPackageScanClassResolver {
>>
>>
>> Modified:
>> camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
>> URL:
>> http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java?rev=1230346&r1=1230345&r2=1230346&view=diff
>>
>> ==============================================================================
>> ---
>> camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
>> (original)
>> +++
>> camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
>> Thu Jan 12 01:10:12 2012
>> @@ -241,14 +241,7 @@ public abstract class CamelTestSupport e
>> return true;
>> }
>>
>> - /**
>> - * Lets post process this test instance to process any Camel
>> annotations.
>> - * Note that using Spring Test or Guice is a more powerful approach.
>> - */
>> protected void postProcessTest() throws Exception {
>> - CamelBeanPostProcessor processor = new CamelBeanPostProcessor();
>> - processor.setCamelContext(context);
>> - processor.postProcessBeforeInitialization(this, "this");
>> }
>>
>> protected void stopCamelContext() throws Exception {
>>
>> Modified: camel/trunk/components/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=1230346&r1=1230345&r2=1230346&view=diff
>>
>> ==============================================================================
>> --- camel/trunk/components/pom.xml (original)
>> +++ camel/trunk/components/pom.xml Thu Jan 12 01:10:12 2012
>> @@ -34,6 +34,7 @@
>> <!-- we want to test these modules first to catch any errors early
>> as possible -->
>> <module>camel-test</module>
>> <module>camel-testng</module>
>> +<module>camel-test-blueprint</module>
>> <module>camel-core-osgi</module>
>> <module>camel-core-xml</module>
>> <module>camel-blueprint</module>
>>
>> Modified:
>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml?rev=1230346&r1=1230345&r2=1230346&view=diff
>>
>> ==============================================================================
>> ---
>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
>> (original)
>> +++
>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
>> Thu Jan 12 01:10:12 2012
>> @@ -44,7 +44,7 @@
>> <!-- for testing -->
>> <dependency>
>> <groupId>org.apache.camel</groupId>
>> -<artifactId>camel-test</artifactId>
>> +<artifactId>camel-test-blueprint</artifactId>
>> <version>${camel-version}</version>
>> <scope>test</scope>
>> </dependency>
>>
>> Modified:
>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/blueprint.xml
>> URL:
>> http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1230346&r1=1230345&r2=1230346&view=diff
>>
>> ==============================================================================
>> ---
>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/blueprint.xml
>> (original)
>> +++
>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/OSGI-INF/blueprint/blueprint.xml
>> Thu Jan 12 01:10:12 2012
>> @@ -29,11 +29,12 @@
>>
>> <camelContext id="blueprintContext" trace="false" xmlns="
>> http://camel.apache.org/schema/blueprint">
>> <route id="timerToLog">
>> -<from uri="timer:foo?period=5000"/>
>> +<from uri="direct:start"/>
>> <setBody>
>> <method ref="helloBean" method="hello"/>
>> </setBody>
>> <log message="The message contains ${body}"/>
>> +<to uri="mock:a" />
>> </route>
>> </camelContext>
>>
>>
>> Added:
>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/RouteTest.java
>> URL:
>> http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/RouteTest.java?rev=1230346&view=auto
>>
>> ==============================================================================
>> ---
>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/RouteTest.java
>> (added)
>> +++
>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/java/RouteTest.java
>> Thu Jan 12 01:10:12 2012
>> @@ -0,0 +1,46 @@
>> +/**
>> + * Licensed to the Apache Software Foundation (ASF) under one or more
>> + * contributor license agreements. See the NOTICE file distributed with
>> + * this work for additional information regarding copyright ownership.
>> + * The ASF licenses this file to You 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.
>> + */
>> +package ${package};
>> +
>> +import java.net.URL;
>> +import java.util.Collection;
>> +import java.util.Collections;
>> +
>> +import org.apache.camel.test.blueprint.CamelBlueprintTestSupport;
>> +
>> +import org.junit.Test;
>> +
>> +public class RouteTest extends CamelBlueprintTestSupport {
>> +
>> + @Override
>> + protected Collection<URL> getBlueprintDescriptors() {
>> + return
>> Collections.singleton(getClass().getResource("/OSGI-INF/blueprint/blueprint.xml"));
>> + }
>> +
>> + @Test
>> + public void testDebugger() throws Exception {
>> + // set mock expectations
>> + getMockEndpoint("mock:a").expectedMessageCount(1);
>> +
>> + // send a message
>> + template.sendBody("direct:start", "World");
>> +
>> + // assert mocks
>> + assertMockEndpointsSatisfied();
>> + }
>> +
>> +}
>>
>> Added:
>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/resources/log4j.properties
>> URL:
>> http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/resources/log4j.properties?rev=1230346&view=auto
>>
>> ==============================================================================
>> ---
>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/resources/log4j.properties
>> (added)
>> +++
>> camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/test/resources/log4j.properties
>> Thu Jan 12 01:10:12 2012
>> @@ -0,0 +1,37 @@
>> +##
>> ------------------------------------------------------------------------
>> +## Licensed to the Apache Software Foundation (ASF) under one or more
>> +## contributor license agreements. See the NOTICE file distributed with
>> +## this work for additional information regarding copyright ownership.
>> +## The ASF licenses this file to You 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.
>> +##
>> ------------------------------------------------------------------------
>> +
>> +#
>> +# The logging properties used for testing
>> +#
>> +log4j.rootLogger=INFO, out
>> +
>> +log4j.logger.org.springframework=WARN
>> +#log4j.logger.org.apache.camel=DEBUG
>> +#log4j.logger.org.apache.camel.test.junit4=DEBUG
>> +
>> +# CONSOLE appender not used by default
>> +log4j.appender.out=org.apache.log4j.ConsoleAppender
>> +log4j.appender.out.layout=org.apache.log4j.PatternLayout
>> +log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p
>> %m%n
>> +#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p
>> %-30.30c{1} - %m%n
>> +
>> +# File appender
>> +log4j.appender.file=org.apache.log4j.FileAppender
>> +log4j.appender.file.layout=org.apache.log4j.PatternLayout
>> +log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1} - %m %n
>> +log4j.appender.file.file=target/camel-test.log
>>
>>
>>
>
--
Hadrian Zbarcea
Principal Software Architect
Talend, Inc
http://coders.talend.com/
http://camelbot.blogspot.com/