Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D15B470B7 for ; Sun, 7 Aug 2011 18:24:31 +0000 (UTC) Received: (qmail 83490 invoked by uid 500); 7 Aug 2011 18:24:31 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 83446 invoked by uid 500); 7 Aug 2011 18:24:31 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 83439 invoked by uid 99); 7 Aug 2011 18:24:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Aug 2011 18:24:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Aug 2011 18:24:29 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B51182388A68 for ; Sun, 7 Aug 2011 18:24:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1154743 [3/3] - in /camel/trunk: camel-core/src/main/java/org/apache/camel/component/ camel-core/src/main/java/org/apache/camel/component/validator/ camel-core/src/main/java/org/apache/camel/component/xslt/ camel-core/src/main/java/org/apa... Date: Sun, 07 Aug 2011 18:24:05 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110807182409.B51182388A68@eris.apache.org> Copied: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/SpringXsltRouteTest.java (from r1154680, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java) URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/SpringXsltRouteTest.java?p2=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/SpringXsltRouteTest.java&p1=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java&r1=1154680&r2=1154743&rev=1154743&view=diff ============================================================================== --- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java (original) +++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/SpringXsltRouteTest.java Sun Aug 7 18:24:01 2011 @@ -16,48 +16,16 @@ */ package org.apache.camel.component.xslt; -import java.util.List; +import org.apache.camel.CamelContext; -import org.apache.camel.Exchange; -import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.spring.SpringTestSupport; -import org.springframework.context.support.AbstractXmlApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext; /** - * @version + * @version */ -public class XsltRouteTest extends SpringTestSupport { +public class SpringXsltRouteTest extends XsltRouteTest { - public void testSendMessageAndHaveItTransformed() throws Exception { - MockEndpoint endpoint = getMockEndpoint("mock:result"); - endpoint.expectedMessageCount(1); - - template.sendBody("direct:start", - "HeyHello world!"); - - assertMockEndpointsSatisfied(); - - List list = endpoint.getReceivedExchanges(); - Exchange exchange = list.get(0); - String xml = exchange.getIn().getBody(String.class); - - assertNotNull("The transformed XML should not be null", xml); - assertTrue(xml.indexOf("transformed") > -1); - // the cheese tag is in the transform.xsl - assertTrue(xml.indexOf("cheese") > -1); - assertTrue(xml.indexOf("Hey") > -1); - assertTrue(xml.indexOf("Hello world!") > -1); - - TestBean bean = getMandatoryBean(TestBean.class, "testBean"); - assertEquals("bean.subject", "Hey", bean.getSubject()); - } - - protected int getExpectedRouteCount() { - return 0; - } - - protected AbstractXmlApplicationContext createApplicationContext() { - return new ClassPathXmlApplicationContext("org/apache/camel/component/xslt/camelContext.xml"); + protected CamelContext createCamelContext() throws Exception { + return createSpringCamelContext(this, "org/apache/camel/component/xslt/SpringXsltRouteTest.xml"); } } Propchange: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/SpringXsltRouteTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/SpringXsltRouteTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/xslt/SpringXsltRouteFileTest.xml (from r1154680, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/xslt/XsltRouteFileTest.xml) URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/xslt/SpringXsltRouteFileTest.xml?p2=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/xslt/SpringXsltRouteFileTest.xml&p1=camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/xslt/XsltRouteFileTest.xml&r1=1154680&r2=1154743&rev=1154743&view=diff ============================================================================== --- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/xslt/XsltRouteFileTest.xml (original) +++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/xslt/SpringXsltRouteFileTest.xml Sun Aug 7 18:24:01 2011 @@ -26,7 +26,7 @@ - + Propchange: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/xslt/SpringXsltRouteFileTest.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/xslt/SpringXsltRouteFileTest.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/xslt/SpringXsltRouteFileTest.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/xslt/SpringXsltRouteTest.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/xslt/SpringXsltRouteTest.xml?rev=1154743&view=auto ============================================================================== --- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/xslt/SpringXsltRouteTest.xml (added) +++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/xslt/SpringXsltRouteTest.xml Sun Aug 7 18:24:01 2011 @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + Added: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/xslt/mytransform.xsl URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/xslt/mytransform.xsl?rev=1154743&view=auto ============================================================================== --- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/xslt/mytransform.xsl (added) +++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/xslt/mytransform.xsl Sun Aug 7 18:24:01 2011 @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + Modified: camel/trunk/components/camel-stringtemplate/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stringtemplate/pom.xml?rev=1154743&r1=1154742&r2=1154743&view=diff ============================================================================== --- camel/trunk/components/camel-stringtemplate/pom.xml (original) +++ camel/trunk/components/camel-stringtemplate/pom.xml Sun Aug 7 18:24:01 2011 @@ -42,10 +42,6 @@ camel-core - org.apache.camel - camel-spring - - org.antlr stringtemplate ${stringtemplate-version} Modified: camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateComponent.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateComponent.java?rev=1154743&r1=1154742&r2=1154743&view=diff ============================================================================== --- camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateComponent.java (original) +++ camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateComponent.java Sun Aug 7 18:24:01 2011 @@ -19,14 +19,16 @@ package org.apache.camel.component.strin import java.util.Map; import org.apache.camel.Endpoint; -import org.apache.camel.component.ResourceBasedComponent; +import org.apache.camel.impl.DefaultComponent; /** * @version */ -public class StringTemplateComponent extends ResourceBasedComponent { +public class StringTemplateComponent extends DefaultComponent { protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception { - return new StringTemplateEndpoint(uri, this, remaining, parameters); + Endpoint answer = new StringTemplateEndpoint(uri, this, remaining); + setProperties(answer, parameters); + return answer; } } \ No newline at end of file Modified: camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateConstants.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateConstants.java?rev=1154743&r1=1154742&r2=1154743&view=diff ============================================================================== --- camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateConstants.java (original) +++ camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateConstants.java Sun Aug 7 18:24:01 2011 @@ -21,7 +21,7 @@ package org.apache.camel.component.strin */ public final class StringTemplateConstants { - public static final String STRINGTEMPLATE_RESOURCE = "CamelStringTemplateResource"; + public static final String STRINGTEMPLATE_RESOURCE_URI = "CamelStringTemplateResourceUri"; private StringTemplateConstants() { // Utility class Modified: camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java?rev=1154743&r1=1154742&r2=1154743&view=diff ============================================================================== --- camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java (original) +++ camel/trunk/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java Sun Aug 7 18:24:01 2011 @@ -22,10 +22,10 @@ import java.util.Map.Entry; import org.antlr.stringtemplate.AutoIndentWriter; import org.antlr.stringtemplate.StringTemplate; +import org.apache.camel.Component; import org.apache.camel.Exchange; import org.apache.camel.ExchangePattern; import org.apache.camel.Message; -import org.apache.camel.Processor; import org.apache.camel.component.ResourceBasedEndpoint; import org.apache.camel.util.ExchangeHelper; @@ -34,12 +34,11 @@ import org.apache.camel.util.ExchangeHel */ public class StringTemplateEndpoint extends ResourceBasedEndpoint { - public StringTemplateEndpoint(String uri, StringTemplateComponent component, String resourceUri, Map parameters) { - super(uri, component, resourceUri, null); + public StringTemplateEndpoint() { } - public StringTemplateEndpoint(String endpointUri, Processor processor, String resourceUri) { - super(endpointUri, processor, resourceUri); + public StringTemplateEndpoint(String endpointUri, Component component, String resourceUri) { + super(endpointUri, component, resourceUri); } @Override @@ -68,7 +67,7 @@ public class StringTemplateEndpoint exte // now lets output the results to the exchange Message out = exchange.getOut(); out.setBody(buffer.toString()); - out.setHeader(StringTemplateConstants.STRINGTEMPLATE_RESOURCE, getResource()); + out.setHeader(StringTemplateConstants.STRINGTEMPLATE_RESOURCE_URI, getResourceUri()); Map headers = (Map) variableMap.get("headers"); for (Entry entry : headers.entrySet()) { out.setHeader(entry.getKey(), entry.getValue()); Modified: camel/trunk/components/camel-velocity/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-velocity/pom.xml?rev=1154743&r1=1154742&r2=1154743&view=diff ============================================================================== --- camel/trunk/components/camel-velocity/pom.xml (original) +++ camel/trunk/components/camel-velocity/pom.xml Sun Aug 7 18:24:01 2011 @@ -42,10 +42,6 @@ camel-core - org.apache.camel - camel-spring - - org.apache.velocity velocity ${velocity-version} Modified: camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/CamelVelocityClasspathResourceLoader.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/CamelVelocityClasspathResourceLoader.java?rev=1154743&r1=1154742&r2=1154743&view=diff ============================================================================== --- camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/CamelVelocityClasspathResourceLoader.java (original) +++ camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/CamelVelocityClasspathResourceLoader.java Sun Aug 7 18:24:01 2011 @@ -26,7 +26,7 @@ import org.apache.velocity.runtime.resou /** * Camel specific {@link ClasspathResourceLoader} that loads resources using the - * Camel {@link ClassResolver} + * Camel {@link ClassResolver} used by the Velocity. */ public class CamelVelocityClasspathResourceLoader extends ClasspathResourceLoader { Modified: camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityComponent.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityComponent.java?rev=1154743&r1=1154742&r2=1154743&view=diff ============================================================================== --- camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityComponent.java (original) +++ camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityComponent.java Sun Aug 7 18:24:01 2011 @@ -19,14 +19,14 @@ package org.apache.camel.component.veloc import java.util.Map; import org.apache.camel.Endpoint; -import org.apache.camel.component.ResourceBasedComponent; +import org.apache.camel.impl.DefaultComponent; import org.apache.camel.util.ObjectHelper; import org.apache.velocity.app.VelocityEngine; /** * @version */ -public class VelocityComponent extends ResourceBasedComponent { +public class VelocityComponent extends DefaultComponent { private VelocityEngine velocityEngine; public VelocityEngine getVelocityEngine() { Modified: camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityConstants.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityConstants.java?rev=1154743&r1=1154742&r2=1154743&view=diff ============================================================================== --- camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityConstants.java (original) +++ camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityConstants.java Sun Aug 7 18:24:01 2011 @@ -21,8 +21,6 @@ package org.apache.camel.component.veloc */ public final class VelocityConstants { - public static final String VELOCITY_RESOURCE = "CamelVelocityResource"; - public static final String VELOCITY_RESOURCE_URI = "CamelVelocityResourceUri"; public static final String VELOCITY_TEMPLATE = "CamelVelocityTemplate"; Modified: camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java?rev=1154743&r1=1154742&r2=1154743&view=diff ============================================================================== --- camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java (original) +++ camel/trunk/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java Sun Aug 7 18:24:01 2011 @@ -30,13 +30,14 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.Message; import org.apache.camel.component.ResourceBasedEndpoint; import org.apache.camel.util.ExchangeHelper; +import org.apache.camel.util.IOHelper; import org.apache.camel.util.ObjectHelper; +import org.apache.camel.util.ResourceHelper; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.context.Context; import org.apache.velocity.runtime.log.CommonsLogLogChute; -import org.springframework.core.io.Resource; /** * @version @@ -51,7 +52,7 @@ public class VelocityEndpoint extends Re } public VelocityEndpoint(String uri, VelocityComponent component, String resourceUri) { - super(uri, component, resourceUri, null); + super(uri, component, resourceUri); } @Override @@ -73,12 +74,16 @@ public class VelocityEndpoint extends Re if (velocityEngine == null) { velocityEngine = new VelocityEngine(); Properties properties = new Properties(); + // load the velocity properties from property file if (ObjectHelper.isNotEmpty(getPropertiesFile())) { - Resource resource = getResourceLoader().getResource(getPropertiesFile()); - InputStream reader = resource.getInputStream(); - properties.load(reader); - log.info("Loaded the velocity configuration file " + getPropertiesFile()); + InputStream reader = ResourceHelper.resolveMandatoryResourceAsInputStream(getCamelContext().getClassResolver(), getPropertiesFile()); + try { + properties.load(reader); + log.info("Loaded the velocity configuration file " + getPropertiesFile()); + } finally { + IOHelper.close(reader, getPropertiesFile(), log); + } } // set the class resolver as a property so we can access it from CamelVelocityClasspathResourceLoader @@ -153,7 +158,6 @@ public class VelocityEndpoint extends Re return; } - Resource resource; Reader reader; String content = exchange.getIn().getHeader(VelocityConstants.VELOCITY_TEMPLATE, String.class); if (content != null) { @@ -165,11 +169,8 @@ public class VelocityEndpoint extends Re // remove the header to avoid it being propagated in the routing exchange.getIn().removeHeader(VelocityConstants.VELOCITY_TEMPLATE); } else { - // use resource from endpoint configuration - resource = getResource(); - ObjectHelper.notNull(resource, "resource"); if (log.isDebugEnabled()) { - log.debug("Velocity content read from resource {} with resourceUri: {} for endpoint {}", new Object[]{resource, path, getEndpointUri()}); + log.debug("Velocity content read from resource {} with resourceUri: {} for endpoint {}", new Object[]{getResourceUri(), path, getEndpointUri()}); } reader = getEncoding() != null ? new InputStreamReader(getResourceAsInputStream(), getEncoding()) : new InputStreamReader(getResourceAsInputStream()); } Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1154743&r1=1154742&r2=1154743&view=diff ============================================================================== --- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original) +++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Sun Aug 7 18:24:01 2011 @@ -273,14 +273,14 @@ mvn:org.apache.camel/camel-exec/${pom.version} - camel-spring + camel-core mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jexcelapi/${jexcelapi-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.flatpack/${flatpack-bundle-version} mvn:org.apache.camel/camel-flatpack/${pom.version} - camel-spring + camel-core mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.freemarker/${freemarker-bundle-version} mvn:org.apache.camel/camel-freemarker/${pom.version} @@ -355,7 +355,7 @@ mvn:org.apache.camel/camel-hl7/${pom.version} - camel-spring + camel-core mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version} mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version} @@ -391,7 +391,7 @@ mvn:org.apache.camel/camel-jcr/${pom.version} - camel-spring + camel-core mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/${isorelax-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jing/${jing-bundle-version} @@ -479,7 +479,7 @@ mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/${isorelax-bundle-version} mvn:org.apache.camel/camel-msv/${pom.version} - camel-spring + camel-core mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mvel/${mvel-bundle-version} @@ -563,7 +563,7 @@ mvn:org.apache.camel/camel-rss/${pom.version} - camel-spring + camel-core mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon-bundle-version} mvn:org.apache.camel/camel-saxon/${pom.version} @@ -649,7 +649,7 @@ mvn:org.apache.camel/camel-stream/${pom.version} - camel-spring + camel-core mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.stringtemplate/${stringtemplate-bundle-version} mvn:org.apache.camel/camel-stringtemplate/${pom.version} @@ -673,7 +673,7 @@ mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.werken-xpath/${werken-xpath-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity-bundle-version} - camel-spring + camel-core mvn:org.apache.camel/camel-velocity/${pom.version} Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/validator/ValidatorRouteTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/validator/ValidatorRouteTest.java?rev=1154743&r1=1154680&r2=1154743&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/validator/ValidatorRouteTest.java (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/validator/ValidatorRouteTest.java Sun Aug 7 18:24:01 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.itest.osgi.spring.validator; +package org.apache.camel.itest.osgi.core.validator; import org.apache.camel.ValidationException; import org.apache.camel.builder.RouteBuilder; @@ -57,7 +57,7 @@ public class ValidatorRouteTest extends public void configure() throws Exception { from("direct:start") .doTry() - .to("validator:org/apache/camel/itest/osgi/spring/validator/schema.xsd") + .to("validator:org/apache/camel/itest/osgi/core/validator/schema.xsd") .to("mock:valid") .doCatch(ValidationException.class) .to("mock:invalid") Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltRouteTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltRouteTest.java?rev=1154743&r1=1154680&r2=1154743&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltRouteTest.java (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltRouteTest.java Sun Aug 7 18:24:01 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.itest.osgi.spring.xslt; +package org.apache.camel.itest.osgi.core.xslt; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; @@ -45,7 +45,7 @@ public class XsltRouteTest extends OSGiI @Override public void configure() throws Exception { from("direct:start") - .to("xslt:org/apache/camel/itest/osgi/spring/xslt/example.xsl") + .to("xslt:org/apache/camel/itest/osgi/core/xslt/example.xsl") .to("log:result") .to("mock:result"); }