[
https://issues.apache.org/activemq/browse/CAMEL-2781?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Guillaume Nodet resolved CAMEL-2781.
------------------------------------
Resolution: Fixed
Deleting components/camel-osgi/src/test/java/org/apache/camel/core
Deleting components/camel-osgi/src/test/java/org/apache/camel/osgi
Deleting components/camel-osgi/src/test/resources/META-INF/services
Deleting components/camel-osgi/src/test/resources/org/apache/camel/osgi
Sending components/camel-spring/pom.xml
Adding components/camel-spring/src/main/java/org/apache/camel/osgi
Sending
components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
Sending
components/camel-spring/src/main/resources/META-INF/spring.handlers
Sending
components/camel-spring/src/main/resources/META-INF/spring.schemas
Adding components/camel-spring/src/main/resources/camel-osgi.xsd
Adding components/camel-spring/src/main/resources/org/apache/camel/osgi
Adding components/camel-spring/src/test/java/org/apache/camel/core
Adding components/camel-spring/src/test/java/org/apache/camel/osgi
Adding components/camel-spring/src/test/resources/META-INF/services
Adding components/camel-spring/src/test/resources/org/apache/camel/osgi
Deleting components/camel-spring-osgi
Sending components/pom.xml
Sending platforms/karaf/features/src/main/resources/features-spring3.xml
Sending platforms/karaf/features/src/main/resources/features.xml
Sending
tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java
Sending
tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
Sending
tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/VelocityTest.java
Sending
tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterSpringTest.java
Sending
tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java
Sending
tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java
Sending
tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java
Sending
tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java
Sending tests/pom.xml
Transmitting file data ................
Committed revision 950563.
> Merge camel-osgi and camel-spring-osgi into camel-spring
> --------------------------------------------------------
>
> Key: CAMEL-2781
> URL: https://issues.apache.org/activemq/browse/CAMEL-2781
> Project: Apache Camel
> Issue Type: Improvement
> Components: camel-spring, osgi
> Reporter: Guillaume Nodet
> Assignee: Guillaume Nodet
> Fix For: 2.4.0
>
>
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
