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",
- "<mail><subject>Hey</subject><body>Hello
world!</body></mail>");
-
- assertMockEndpointsSatisfied();
-
- List<Exchange> 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("<subject>Hey</subject>") > -1);
- assertTrue(xml.indexOf("<body>Hello world!</body>") > -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 @@
<camelContext xmlns="http://camel.apache.org/schema/spring";>
<route>
<from uri="direct:start"/>
- <to
uri="xslt:file:src/test/resources/org/apache/camel/component/xslt/transform.xsl"/>
+ <to
uri="xslt:file:src/test/resources/org/apache/camel/component/xslt/mytransform.xsl"/>
<multicast>
<bean ref="testBean"/>
<to uri="mock:result"/>
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 @@
+<?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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
+ ">
+
+ <!-- START SNIPPET: example -->
+ <camelContext xmlns="http://camel.apache.org/schema/spring";>
+ <route>
+ <from uri="direct:start"/>
+ <to uri="xslt:org/apache/camel/component/xslt/transform.xsl"/>
+ <multicast>
+ <bean ref="testBean"/>
+ <to uri="mock:result"/>
+ </multicast>
+ </route>
+ </camelContext>
+ <!-- END SNIPPET: example -->
+
+ <bean id="testBean" class="org.apache.camel.component.xslt.TestBean"
scope="singleton"/>
+</beans>
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 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
+<xsl:stylesheet
+ xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
+ version='1.0'>
+
+ <xsl:output method="xml" indent="yes" encoding="ISO-8859-1"/>
+
+ <xsl:template match="/">
+ <transformed subject="{/mail/subject}">
+ <cheese>
+ <xsl:apply-templates select="*|@*"/>
+ </cheese>
+ </transformed>
+ </xsl:template>
+
+ <xsl:template match="*">
+ <xsl:copy>
+ <xsl:copy-of select="attribute::*"/>
+ <xsl:apply-templates/>
+ </xsl:copy>
+ </xsl:template>
+
+</xsl:stylesheet>
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 @@
<artifactId>camel-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- </dependency>
- <dependency>
<groupId>org.antlr</groupId>
<artifactId>stringtemplate</artifactId>
<version>${stringtemplate-version}</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<String, Object> 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<String, Object> headers = (Map<String, Object>)
variableMap.get("headers");
for (Entry<String, Object> 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 @@
<artifactId>camel-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>${velocity-version}</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 @@
<bundle>mvn:org.apache.camel/camel-exec/${pom.version}</bundle>
</feature>
<feature name='camel-flatpack' version='${pom.version}' resolver='(obr)'
start-level='50'>
- <feature version='${pom.version}'>camel-spring</feature>
+ <feature version='${pom.version}'>camel-core</feature>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jexcelapi/${jexcelapi-bundle-version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.flatpack/${flatpack-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-flatpack/${pom.version}</bundle>
</feature>
<feature name='camel-freemarker' version='${pom.version}' resolver='(obr)'
start-level='50'>
- <feature version='${pom.version}'>camel-spring</feature>
+ <feature version='${pom.version}'>camel-core</feature>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.freemarker/${freemarker-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-freemarker/${pom.version}</bundle>
</feature>
@@ -355,7 +355,7 @@
<bundle>mvn:org.apache.camel/camel-hl7/${pom.version}</bundle>
</feature>
<feature name='camel-ibatis' version='${pom.version}' resolver='(obr)'
start-level='50'>
- <feature version='${pom.version}'>camel-spring</feature>
+ <feature version='${pom.version}'>camel-core</feature>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool-bundle-version}</bundle>
<bundle
dependency="true">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}</bundle>
@@ -391,7 +391,7 @@
<bundle>mvn:org.apache.camel/camel-jcr/${pom.version}</bundle>
</feature>
<feature name='camel-jing' version='${pom.version}' resolver='(obr)'
start-level='50'>
- <feature version='${pom.version}'>camel-spring</feature>
+ <feature version='${pom.version}'>camel-core</feature>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/${isorelax-bundle-version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jing/${jing-bundle-version}</bundle>
@@ -479,7 +479,7 @@
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/${isorelax-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-msv/${pom.version}</bundle>
- <feature version='${pom.version}'>camel-spring</feature>
+ <feature version='${pom.version}'>camel-core</feature>
</feature>
<feature name='camel-mvel' version='${pom.version}' resolver='(obr)'
start-level='50'>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mvel/${mvel-bundle-version}</bundle>
@@ -563,7 +563,7 @@
<bundle>mvn:org.apache.camel/camel-rss/${pom.version}</bundle>
</feature>
<feature name='camel-saxon' version='${pom.version}' resolver='(obr)'
start-level='50'>
- <feature version='${pom.version}'>camel-spring</feature>
+ <feature version='${pom.version}'>camel-core</feature>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-saxon/${pom.version}</bundle>
</feature>
@@ -649,7 +649,7 @@
<bundle>mvn:org.apache.camel/camel-stream/${pom.version}</bundle>
</feature>
<feature name='camel-string-template' version='${pom.version}'
resolver='(obr)' start-level='50'>
- <feature version='${pom.version}'>camel-spring</feature>
+ <feature version='${pom.version}'>camel-core</feature>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.stringtemplate/${stringtemplate-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-stringtemplate/${pom.version}</bundle>
@@ -673,7 +673,7 @@
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.werken-xpath/${werken-xpath-bundle-version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version}</bundle>
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity-bundle-version}</bundle>
- <feature version='${pom.version}'>camel-spring</feature>
+ <feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-velocity/${pom.version}</bundle>
</feature>
<feature name='camel-xmlbeans' version='${pom.version}' resolver='(obr)'
start-level='50'>
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");
}
