You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/07/20 09:02:01 UTC
[2/4] camel git commit: CAMEL-11059: camel-spring-dm - Should be
removed
CAMEL-11059: camel-spring-dm - Should be removed
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b0802ae1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b0802ae1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b0802ae1
Branch: refs/heads/master
Commit: b0802ae195e78dbd16ce7024e5581bd2f87e8703
Parents: 4c103d8
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jul 20 10:25:55 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 20 10:25:55 2017 +0200
----------------------------------------------------------------------
apache-camel/pom.xml | 4 -
.../src/main/descriptors/common-bin.xml | 1 -
components/camel-spring-dm/pom.xml | 210 -------------------
.../src/main/docs/spring-dm.adoc | 6 -
.../java/org/apache/camel/osgi/Activator.java | 45 ----
.../apache/camel/osgi/CamelContextFactory.java | 66 ------
.../camel/osgi/CamelContextFactoryBean.java | 74 -------
.../camel/osgi/CamelNamespaceHandler.java | 46 ----
.../camel/osgi/OsgiSpringCamelContext.java | 64 ------
.../camel/osgi/SpringCamelContextFactory.java | 36 ----
.../org/apache/camel/osgi/package-info.java | 22 --
.../src/main/resources/META-INF/LICENSE.TXT | 203 ------------------
.../src/main/resources/META-INF/NOTICE.txt | 11 -
.../src/main/resources/META-INF/spring.handlers | 20 --
.../src/main/resources/camel-osgi.xml | 39 ----
.../resources/org/apache/camel/osgi/jaxb.index | 17 --
components/camel-spring/pom.xml | 1 -
components/pom.xml | 1 -
examples/camel-example-osgi-rmi/README.md | 52 -----
examples/camel-example-osgi-rmi/pom.xml | 157 --------------
.../apache/camel/example/osgi/HelloClient.java | 46 ----
.../apache/camel/example/osgi/HelloService.java | 32 ---
.../camel/example/osgi/HelloServiceImpl.java | 30 ---
.../src/main/resources/META-INF/LICENSE.txt | 203 ------------------
.../src/main/resources/META-INF/NOTICE.txt | 11 -
.../resources/META-INF/spring/camelContext.xml | 54 -----
.../src/main/resources/features.xml | 30 ---
.../src/main/resources/log4j2.properties | 23 --
.../src/main/resources/myapp.properties | 19 --
.../org/apache/camel/example/osgi/RmiTest.java | 75 -------
examples/pom.xml | 1 -
parent/pom.xml | 7 -
platforms/karaf/features/pom.xml | 3 +-
.../features/src/main/resources/features.xml | 11 +-
.../org/apache/camel/itest/CamelSpringTest.java | 60 ------
.../packaging/PrepareCatalogKarafMojo.java | 13 --
.../maven/packaging/PrepareCatalogMojo.java | 8 -
.../packaging/PrepareCatalogSpringBootMojo.java | 18 --
.../maven/packaging/SpringBootStarterMojo.java | 2 +-
39 files changed, 3 insertions(+), 1718 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/apache-camel/pom.xml
----------------------------------------------------------------------
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index a61cdcc..6ea43df 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -943,10 +943,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring-dm</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-spring-integration</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/apache-camel/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 2fc2285..c17608e 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -244,7 +244,6 @@
<include>org.apache.camel:camel-spring-batch</include>
<include>org.apache.camel:camel-spring-cloud</include>
<include>org.apache.camel:camel-spring-cloud-netflix</include>
- <include>org.apache.camel:camel-spring-dm</include>
<include>org.apache.camel:camel-spring-integration</include>
<include>org.apache.camel:camel-spring-javaconfig</include>
<include>org.apache.camel:camel-spring-ldap</include>
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/components/camel-spring-dm/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-dm/pom.xml b/components/camel-spring-dm/pom.xml
deleted file mode 100644
index 320386b..0000000
--- a/components/camel-spring-dm/pom.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?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>components</artifactId>
- <version>2.20.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>camel-spring-dm</artifactId>
- <name>Camel :: Spring DM (deprecated)</name>
- <description>Camel SpringDM (OSGi) XML DSL</description>
- <packaging>jar</packaging>
-
- <properties>
- <!-- use by camel-catalog -->
- <firstVersion>2.18.0</firstVersion>
- <label>osgi,spring</label>
- <title>Spring DM</title>
-
- <!-- spring-dm only supports spring 3.x so we need to import that range -->
- <camel.osgi.import>
- !org.apache.camel.spring.*,
- !org.apache.camel.component,
- !org.apache.camel.component.event,
- !org.apache.camel.language.spel,
- !org.apache.camel.core.osgi*,
- !org.apache.camel.core.xml*,
- !org.apache.camel.osgi.*,
- !org.springframework.boot.*,
- org.apache.camel.*;${camel.osgi.import.strict.version},
- org.springframework.osgi.*;version="[1.2,2)",
- org.springframework*;version="${spring-dm-version-range}",
- org.osgi.service.event;resolution:=optional,
- ${camel.osgi.import.defaults},
- *
- </camel.osgi.import>
- <camel.osgi.export>
- org.apache.camel.spring.*;${camel.osgi.version},
- org.apache.camel.util.spring.*;${camel.osgi.version},
- org.apache.camel.component.event;${camel.osgi.split.pkg};${camel.osgi.version},
- org.apache.camel.language.spel;${camel.osgi.split.pkg};${camel.osgi.version}
- </camel.osgi.export>
- <camel.osgi.activator>
- org.apache.camel.osgi.Activator
- </camel.osgi.activator>
- <!-- do not skip any tests by default -->
- <platform.skip.tests/>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core-osgi</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-core</artifactId>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.aop</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.beans</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.context</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>org.springframework.core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>target/schema</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- </resources>
-
- <plugins>
-
- <!-- Inline the contents of camel-spring, camel-core-osgi, and camel-core-xml into this bundle. -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.10</version>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <version>${project.version}</version>
- <includes>org/apache/camel/**</includes>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- </artifactItem>
- <!-- include the embedded spring schemas descriptor -->
- <artifactItem>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <version>${project.version}</version>
- <includes>META-INF/spring.schemas</includes>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core-osgi</artifactId>
- <version>${project.version}</version>
- <includes>org/apache/camel/**</includes>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core-xml</artifactId>
- <version>${project.version}</version>
- <includes>org/apache/camel/**</includes>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!-- Push the execution order of the maven-bundle-plugin further to the end. That's why we add it here again. -->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>prepare-package</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- </build>
-
-
-</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/components/camel-spring-dm/src/main/docs/spring-dm.adoc
----------------------------------------------------------------------
diff --git a/components/camel-spring-dm/src/main/docs/spring-dm.adoc b/components/camel-spring-dm/src/main/docs/spring-dm.adoc
deleted file mode 100644
index 0144664..0000000
--- a/components/camel-spring-dm/src/main/docs/spring-dm.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-## Spring DM (deprecated)
-
-Spring Dynamic Modules for OSGi allows to use Spring XML files in OSGi containers such as Apache Karaf.
-
-However Spring DM is EOL and its highly recommended not to use.
-Use OSGi Blueprint instead which you can find in the `camel-blueprint` component.
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/Activator.java b/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/Activator.java
deleted file mode 100644
index c8b6aaa..0000000
--- a/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/Activator.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * 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.osgi;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
-
- private static BundleContext context;
- private static Bundle bundle;
-
- public static Bundle getBundle() {
- return bundle;
- }
-
- public static BundleContext getBundleContext() {
- return context;
- }
-
- public void start(BundleContext context) throws Exception {
- Activator.context = context;
- Activator.bundle = context.getBundle();
- }
-
- public void stop(BundleContext context) throws Exception {
- Activator.context = null;
- Activator.bundle = null;
- }
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/CamelContextFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/CamelContextFactory.java b/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/CamelContextFactory.java
deleted file mode 100644
index 7989bd9..0000000
--- a/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/CamelContextFactory.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * 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.osgi;
-
-import org.apache.camel.core.osgi.OsgiDefaultCamelContext;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.spi.Registry;
-import org.osgi.framework.BundleContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.osgi.context.BundleContextAware;
-
-/**
- * This factory just create a DefaultContext in OSGi without
- * any spring application context involved.
- */
-public class CamelContextFactory implements BundleContextAware {
- private static final Logger LOG = LoggerFactory.getLogger(CamelContextFactory.class);
- private BundleContext bundleContext;
- private Registry registry;
-
- public BundleContext getBundleContext() {
- return bundleContext;
- }
-
- public void setBundleContext(BundleContext bundleContext) {
- LOG.debug("Using BundleContext: {}", bundleContext);
- this.bundleContext = bundleContext;
- }
-
- public Registry getRegistry() {
- return registry;
- }
-
- public void setRegistry(Registry registry) {
- LOG.debug("Using Registry: {}", registry);
- this.registry = registry;
- }
-
- protected DefaultCamelContext newCamelContext() {
- if (registry != null) {
- return new OsgiDefaultCamelContext(bundleContext, registry);
- } else {
- return new OsgiDefaultCamelContext(bundleContext);
- }
- }
-
- public DefaultCamelContext createContext() {
- return newCamelContext();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java b/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java
deleted file mode 100644
index 068fc93..0000000
--- a/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/CamelContextFactoryBean.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * 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.osgi;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-
-import org.apache.camel.core.osgi.OsgiCamelContextPublisher;
-import org.apache.camel.core.osgi.OsgiEventAdminNotifier;
-import org.apache.camel.spring.SpringCamelContext;
-import org.osgi.framework.BundleContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.osgi.context.BundleContextAware;
-
-@XmlRootElement(name = "camelContext")
-@XmlAccessorType(XmlAccessType.FIELD)
-public class CamelContextFactoryBean extends org.apache.camel.spring.CamelContextFactoryBean implements BundleContextAware {
- private static final Logger LOG = LoggerFactory.getLogger(CamelContextFactoryBean.class);
-
- @XmlTransient
- private BundleContext bundleContext;
-
- public BundleContext getBundleContext() {
- return bundleContext;
- }
-
- public void setBundleContext(BundleContext bundleContext) {
- LOG.debug("Using BundleContext: {}", bundleContext);
- this.bundleContext = bundleContext;
- }
-
- protected SpringCamelContext createContext() {
- SpringCamelContext ctx = newCamelContext();
- // only set the name if its explicit (Camel will auto assign name if none explicit set)
- if (!isImplicitId()) {
- ctx.setName(getId());
- }
- return ctx;
- }
-
- protected SpringCamelContext newCamelContext() {
- return new OsgiSpringCamelContext(getApplicationContext(), getBundleContext());
- }
-
- @Override
- public void afterPropertiesSet() throws Exception {
- super.afterPropertiesSet();
- getContext().getManagementStrategy().addEventNotifier(new OsgiCamelContextPublisher(bundleContext));
- try {
- getClass().getClassLoader().loadClass("org.osgi.service.event.EventAdmin");
- getContext().getManagementStrategy().addEventNotifier(new OsgiEventAdminNotifier(bundleContext));
- } catch (Throwable t) {
- // Ignore, if the EventAdmin package is not available, just don't use it
- LOG.debug("EventAdmin package is not available, just don't use it");
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/CamelNamespaceHandler.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/CamelNamespaceHandler.java b/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/CamelNamespaceHandler.java
deleted file mode 100644
index 35d3511..0000000
--- a/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/CamelNamespaceHandler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * 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.osgi;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class CamelNamespaceHandler extends org.apache.camel.spring.handler.CamelNamespaceHandler {
-
- public void init() {
- super.init();
- registerParser("camelContext", new CamelContextBeanDefinitionParser(CamelContextFactoryBean.class));
- }
-
- // It just add the package of the class for initiate the JAXB context
- protected Set<Class<?>> getJaxbPackages() {
- Set<Class<?>> classes = new HashSet<Class<?>>();
- classes.add(CamelContextFactoryBean.class);
- classes.add(org.apache.camel.spring.CamelContextFactoryBean.class);
- classes.add(org.apache.camel.ExchangePattern.class);
- classes.add(org.apache.camel.model.RouteDefinition.class);
- classes.add(org.apache.camel.model.config.StreamResequencerConfig.class);
- classes.add(org.apache.camel.model.dataformat.DataFormatsDefinition.class);
- classes.add(org.apache.camel.model.language.ExpressionDefinition.class);
- classes.add(org.apache.camel.model.loadbalancer.RoundRobinLoadBalancerDefinition.class);
- classes.add(org.apache.camel.model.rest.RestDefinition.class);
- classes.add(org.apache.camel.model.cloud.ServiceCallDefinition.class);
- return classes;
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/OsgiSpringCamelContext.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/OsgiSpringCamelContext.java b/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/OsgiSpringCamelContext.java
deleted file mode 100644
index 52449bf..0000000
--- a/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/OsgiSpringCamelContext.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * 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.osgi;
-
-import org.apache.camel.TypeConverter;
-import org.apache.camel.core.osgi.OsgiCamelContextHelper;
-import org.apache.camel.core.osgi.OsgiFactoryFinderResolver;
-import org.apache.camel.core.osgi.OsgiTypeConverter;
-import org.apache.camel.core.osgi.utils.BundleContextUtils;
-import org.apache.camel.spi.FactoryFinder;
-import org.apache.camel.spi.Registry;
-import org.apache.camel.spring.SpringCamelContext;
-import org.osgi.framework.BundleContext;
-import org.springframework.context.ApplicationContext;
-
-public class OsgiSpringCamelContext extends SpringCamelContext {
-
- private final BundleContext bundleContext;
-
- public OsgiSpringCamelContext(ApplicationContext applicationContext, BundleContext bundleContext) {
- super(applicationContext);
- this.bundleContext = bundleContext;
- OsgiCamelContextHelper.osgiUpdate(this, bundleContext);
- }
-
- @Override
- protected TypeConverter createTypeConverter() {
- // CAMEL-3614: make sure we use a bundle context which imports org.apache.camel.impl.converter package
- BundleContext ctx = BundleContextUtils.getBundleContext(getClass());
- if (ctx == null) {
- ctx = bundleContext;
- }
- FactoryFinder finder = new OsgiFactoryFinderResolver(bundleContext).resolveDefaultFactoryFinder(getClassResolver());
- return new OsgiTypeConverter(ctx, this, getInjector(), finder);
- }
-
- @Override
- protected Registry createRegistry() {
- return OsgiCamelContextHelper.wrapRegistry(this, super.createRegistry(), bundleContext);
- }
-
- @Override
- public void setName(String name) {
- super.setName(name);
- // in OSGi prefix the bundle id to the management name so it will be unique in the JVM
- // and also nicely sorted based on bundle id
- super.setManagementName(bundleContext.getBundle().getBundleId() + "-" + name);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/SpringCamelContextFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/SpringCamelContextFactory.java b/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/SpringCamelContextFactory.java
deleted file mode 100644
index 8896edf..0000000
--- a/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/SpringCamelContextFactory.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * 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.osgi;
-
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.spring.SpringCamelContext;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-
-public class SpringCamelContextFactory extends CamelContextFactory implements ApplicationContextAware {
- private ApplicationContext applicationContext;
-
- public void setApplicationContext(ApplicationContext context) {
- this.applicationContext = context;
- }
-
- @Override
- protected DefaultCamelContext newCamelContext() {
- return new SpringCamelContext(applicationContext);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/package-info.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/package-info.java b/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/package-info.java
deleted file mode 100644
index 7a74aef..0000000
--- a/components/camel-spring-dm/src/main/java/org/apache/camel/osgi/package-info.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * 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.
- */
-
-/**
- * OSGi with Spring-DM (deprecated)
- */
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/osgi", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.apache.camel.osgi;
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/components/camel-spring-dm/src/main/resources/META-INF/LICENSE.TXT
----------------------------------------------------------------------
diff --git a/components/camel-spring-dm/src/main/resources/META-INF/LICENSE.TXT b/components/camel-spring-dm/src/main/resources/META-INF/LICENSE.TXT
deleted file mode 100644
index 6b0b127..0000000
--- a/components/camel-spring-dm/src/main/resources/META-INF/LICENSE.TXT
+++ /dev/null
@@ -1,203 +0,0 @@
-
- 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.
-
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/components/camel-spring-dm/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/components/camel-spring-dm/src/main/resources/META-INF/NOTICE.txt b/components/camel-spring-dm/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/components/camel-spring-dm/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- =========================================================================
- == 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.
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/components/camel-spring-dm/src/main/resources/META-INF/spring.handlers
----------------------------------------------------------------------
diff --git a/components/camel-spring-dm/src/main/resources/META-INF/spring.handlers b/components/camel-spring-dm/src/main/resources/META-INF/spring.handlers
deleted file mode 100644
index d534535..0000000
--- a/components/camel-spring-dm/src/main/resources/META-INF/spring.handlers
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# 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.
-#
-
-http\://camel.apache.org/schema/spring=org.apache.camel.spring.handler.CamelNamespaceHandler
-http\://camel.apache.org/schema/spring/v${camel.schema.version}=org.apache.camel.spring.handler.CamelNamespaceHandler
-http\://camel.apache.org/schema/osgi=org.apache.camel.osgi.CamelNamespaceHandler
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/components/camel-spring-dm/src/main/resources/camel-osgi.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring-dm/src/main/resources/camel-osgi.xml b/components/camel-spring-dm/src/main/resources/camel-osgi.xml
deleted file mode 100644
index 9b69680..0000000
--- a/components/camel-spring-dm/src/main/resources/camel-osgi.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- 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.
-
--->
-<xs:schema elementFormDefault="qualified" version="1.0"
- targetNamespace="http://camel.apache.org/schema/osgi"
- xmlns:tns="http://camel.apache.org/schema/osgi"
- xmlns:camel="http://camel.apache.org/schema/spring"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:import namespace="http://camel.apache.org/schema/spring"
- schemaLocation="http://camel.apache.org/schema/spring/camel-spring.xsd" />
-
- <xs:element name="camelContext" type="tns:camelContextFactoryBean"/>
-
- <xs:complexType name="camelContextFactoryBean">
- <xs:complexContent>
- <xs:extension base="camel:camelContextFactoryBean">
- <xs:sequence/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-</xs:schema>
-
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/components/camel-spring-dm/src/main/resources/org/apache/camel/osgi/jaxb.index
----------------------------------------------------------------------
diff --git a/components/camel-spring-dm/src/main/resources/org/apache/camel/osgi/jaxb.index b/components/camel-spring-dm/src/main/resources/org/apache/camel/osgi/jaxb.index
deleted file mode 100644
index 18674e4..0000000
--- a/components/camel-spring-dm/src/main/resources/org/apache/camel/osgi/jaxb.index
+++ /dev/null
@@ -1,17 +0,0 @@
-## ------------------------------------------------------------------------
-## 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.
-## ------------------------------------------------------------------------
-CamelContextFactoryBean
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/components/camel-spring/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 9e612e3..d18f3c0 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -32,7 +32,6 @@
<packaging>jar</packaging>
<properties>
- <!-- use spring-all-version-range to support camel-spring-dm also -->
<camel.osgi.import>
!org.springframework.boot.*,
!org.springframework.context.annotation.*;resolution:=optional,
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index f324870..72a1fd0 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -45,7 +45,6 @@
<module>camel-core-xml</module>
<module>camel-blueprint</module>
<module>camel-spring</module>
- <module>camel-spring-dm</module>
<module>camel-bam</module>
<module>camel-groovy</module>
<module>camel-groovy-dsl</module>
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/examples/camel-example-osgi-rmi/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-osgi-rmi/README.md b/examples/camel-example-osgi-rmi/README.md
deleted file mode 100644
index add7d99..0000000
--- a/examples/camel-example-osgi-rmi/README.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# Camel and RMI
-
-### Introduction
-
-This example shows how to work with the Camel-RMI Component.
-
-The example exposes a RMI service over port `37541` running as a Camel application.
-The Camel application must be running.
-
-The Client is standalone and run in a separate JVM. It invokes the RMI service and outputs the reply.
-
-### Build
-
-You will need to compile this example first:
-
- mvn install
-
-### Run from cmd line outside OSGi container
-
-To start the server
-
- mvn camel:run
-
-To run the client
-
- mvn exec:java -PClient
-
-To stop the example hit <kbd>ctrl</kbd>+<kbd>c</kbd>
-
-
-### Run inside OSGi container
-
-If using Apache Karaf / Apache ServiceMix you can install this example
-from the shell
-
-First the camel-rmi feature must be installed
-
- feature:repo-add camel ${version}
- feature:install camel-spring-dm
- feature:install camel-rmi
-
-Then install the example
-
- install -s mvn:org.apache.camel/camel-example-osgi-rmi/${version}
-
-### Forum, Help, etc
-
-If you hit an problems please let us know on the Camel Forums
- <http://camel.apache.org/discussion-forums.html>
-
-Please help us make Apache Camel better - we appreciate any feedback you may
-have. Enjoy!
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/examples/camel-example-osgi-rmi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-osgi-rmi/pom.xml b/examples/camel-example-osgi-rmi/pom.xml
deleted file mode 100644
index 53bd606..0000000
--- a/examples/camel-example-osgi-rmi/pom.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?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.example</groupId>
- <artifactId>examples</artifactId>
- <version>2.20.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>camel-example-osgi-rmi</artifactId>
- <packaging>jar</packaging>
- <name>Camel :: Example :: OSGi RMI (deprecated)</name>
- <description>A OSGi example which exposes a RMI service.</description>
-
- <properties>
- <category>OSGi</category>
- <title>OSGi RMI</title>
-
- <camel.osgi.export.pkg>org.apache.camel.example.osgi.*</camel.osgi.export.pkg>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-rmi</artifactId>
- </dependency>
-
- <!-- for unit testing -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- logging -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
-
- <!-- to run client from maven -->
- <profiles>
- <profile>
- <id>Client</id>
- <properties>
- <target.main.class>org.apache.camel.example.osgi.HelloClient</target.main.class>
- </properties>
- </profile>
- <profile>
- <id>jdk9-build</id>
- <activation>
- <jdk>9</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-modules java.xml.bind --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>target/classes/features.xml</file>
- <type>xml</type>
- <classifier>features</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!-- Allows the routes to be run via 'mvn camel:run' -->
- <plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-maven-plugin</artifactId>
- <version>${project.version}</version>
- </plugin>
-
- <!-- Allows the example to be run via 'mvn compile exec:java' -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <configuration>
- <mainClass>${target.main.class}</mainClass>
- <includePluginDependencies>false</includePluginDependencies>
- <commandlineArgs>${target.cmd.args}</commandlineArgs>
- </configuration>
- </plugin>
-
- </plugins>
-
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/examples/camel-example-osgi-rmi/src/main/java/org/apache/camel/example/osgi/HelloClient.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-osgi-rmi/src/main/java/org/apache/camel/example/osgi/HelloClient.java b/examples/camel-example-osgi-rmi/src/main/java/org/apache/camel/example/osgi/HelloClient.java
deleted file mode 100644
index 7d1dc7f..0000000
--- a/examples/camel-example-osgi-rmi/src/main/java/org/apache/camel/example/osgi/HelloClient.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * 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.example.osgi;
-
-import java.rmi.registry.LocateRegistry;
-import java.rmi.registry.Registry;
-
-/**
- * Client to invoke the RMI service hosted on another JVM running on localhost.
- *
- * @version
- */
-public final class HelloClient {
-
- private HelloClient() {
- // use Main
- }
-
- public static void main(String[] args) throws Exception {
- System.out.println("Getting registry");
- Registry registry = LocateRegistry.getRegistry("localhost", 37541);
-
- System.out.println("Lookup service");
- HelloService hello = (HelloService) registry.lookup("helloServiceBean");
-
- System.out.println("Invoking RMI ...");
- String out = hello.hello("Client");
-
- System.out.println(out);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/examples/camel-example-osgi-rmi/src/main/java/org/apache/camel/example/osgi/HelloService.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-osgi-rmi/src/main/java/org/apache/camel/example/osgi/HelloService.java b/examples/camel-example-osgi-rmi/src/main/java/org/apache/camel/example/osgi/HelloService.java
deleted file mode 100644
index e7ca804..0000000
--- a/examples/camel-example-osgi-rmi/src/main/java/org/apache/camel/example/osgi/HelloService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * 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.example.osgi;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- * Interface for the service to expose. Notice we must extend {@link Remote} which
- * is required when using RMI.
- *
- * @version
- */
-public interface HelloService extends Remote {
-
- String hello(String name) throws RemoteException;
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/examples/camel-example-osgi-rmi/src/main/java/org/apache/camel/example/osgi/HelloServiceImpl.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-osgi-rmi/src/main/java/org/apache/camel/example/osgi/HelloServiceImpl.java b/examples/camel-example-osgi-rmi/src/main/java/org/apache/camel/example/osgi/HelloServiceImpl.java
deleted file mode 100644
index 3255fe7..0000000
--- a/examples/camel-example-osgi-rmi/src/main/java/org/apache/camel/example/osgi/HelloServiceImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * 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.example.osgi;
-
-/**
- * Implementation of the service which returns a message.
- *
- * @version
- */
-public class HelloServiceImpl implements HelloService {
-
- public String hello(String name) {
- return "Hello " + name;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/examples/camel-example-osgi-rmi/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-osgi-rmi/src/main/resources/META-INF/LICENSE.txt b/examples/camel-example-osgi-rmi/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b127..0000000
--- a/examples/camel-example-osgi-rmi/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
- 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.
-
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/examples/camel-example-osgi-rmi/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-osgi-rmi/src/main/resources/META-INF/NOTICE.txt b/examples/camel-example-osgi-rmi/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf..0000000
--- a/examples/camel-example-osgi-rmi/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- =========================================================================
- == 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.
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/examples/camel-example-osgi-rmi/src/main/resources/META-INF/spring/camelContext.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-osgi-rmi/src/main/resources/META-INF/spring/camelContext.xml b/examples/camel-example-osgi-rmi/src/main/resources/META-INF/spring/camelContext.xml
deleted file mode 100644
index 27b57f5..0000000
--- a/examples/camel-example-osgi-rmi/src/main/resources/META-INF/spring/camelContext.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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"
- xmlns:camel="http://camel.apache.org/schema/spring"
- xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-
- <!-- spring property placeholder, ignore resource not found as the file resource is for unit testing -->
- <context:property-placeholder location="classpath:myapp.properties,file:target/custom.properties"
- ignore-resource-not-found="true"/>
-
- <!-- bean implementing logic -->
- <bean id="helloServiceBean" class="org.apache.camel.example.osgi.HelloServiceImpl"/>
-
- <!-- setup RMI server -->
- <bean id="rmiServer" class="java.rmi.registry.LocateRegistry" factory-method="createRegistry">
- <constructor-arg index="0" value="${port}"/>
- </bean>
-
- <camelContext xmlns="http://camel.apache.org/schema/spring" depends-on="rmiServer">
-
- <endpoint id="rmiService" uri="rmi://localhost:${port}/helloServiceBean?remoteInterfaces=org.apache.camel.example.osgi.HelloService"/>
-
- <!-- expose a RMI service as a Camel route -->
- <camel:route>
- <from ref="rmiService"/>
- <to uri="log:Incoming request on RMI"/>
- <to uri="bean:helloServiceBean"/>
- </camel:route>
-
- </camelContext>
-
-</beans>
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/examples/camel-example-osgi-rmi/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-osgi-rmi/src/main/resources/features.xml b/examples/camel-example-osgi-rmi/src/main/resources/features.xml
deleted file mode 100644
index ee5e51d..0000000
--- a/examples/camel-example-osgi-rmi/src/main/resources/features.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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.
-
--->
-<features>
- <repository>mvn:org.apache.camel.karaf/apache-camel/${project.version}/xml/features</repository>
-
- <feature name='camel-example-osgi-rmi' version='${project.version}'>
- <feature version="${project.version}">camel</feature>
- <feature version="${project.version}">camel-spring</feature>
- <feature version="${project.version}">camel-rmi</feature>
- <bundle>mvn:org.apache.camel/camel-example-osgi-rmi/${project.version}</bundle>
- </feature>
-
-</features>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/examples/camel-example-osgi-rmi/src/main/resources/log4j2.properties
----------------------------------------------------------------------
diff --git a/examples/camel-example-osgi-rmi/src/main/resources/log4j2.properties b/examples/camel-example-osgi-rmi/src/main/resources/log4j2.properties
deleted file mode 100644
index 9deb51c..0000000
--- a/examples/camel-example-osgi-rmi/src/main/resources/log4j2.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-## ---------------------------------------------------------------------------
-## 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.
-## ---------------------------------------------------------------------------
-
-appender.console.type = Console
-appender.console.name = console
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
-rootLogger.level = INFO
-rootLogger.appenderRef.console.ref = console
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/examples/camel-example-osgi-rmi/src/main/resources/myapp.properties
----------------------------------------------------------------------
diff --git a/examples/camel-example-osgi-rmi/src/main/resources/myapp.properties b/examples/camel-example-osgi-rmi/src/main/resources/myapp.properties
deleted file mode 100644
index ace7c4d..0000000
--- a/examples/camel-example-osgi-rmi/src/main/resources/myapp.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-## ---------------------------------------------------------------------------
-## 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.
-## ---------------------------------------------------------------------------
-
-# properties for the application
-port=37541
http://git-wip-us.apache.org/repos/asf/camel/blob/b0802ae1/examples/camel-example-osgi-rmi/src/test/java/org/apache/camel/example/osgi/RmiTest.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-osgi-rmi/src/test/java/org/apache/camel/example/osgi/RmiTest.java b/examples/camel-example-osgi-rmi/src/test/java/org/apache/camel/example/osgi/RmiTest.java
deleted file mode 100644
index 582cd12..0000000
--- a/examples/camel-example-osgi-rmi/src/test/java/org/apache/camel/example/osgi/RmiTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * 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.example.osgi;
-
-import java.io.File;
-import java.io.FileOutputStream;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.spring.CamelSpringTestSupport;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-/**
- * Unit test the example.
- *
- * @version
- */
-public class RmiTest extends CamelSpringTestSupport {
-
- private static int port;
-
- @BeforeClass
- public static void setupFreePort() throws Exception {
- // find a free port number, and write that in the custom.properties file
- // which we will use for the unit tests, to avoid port number in use problems
- port = AvailablePortFinder.getNextAvailable();
- String s = "port=" + port;
-
- File custom = new File("target/custom.properties");
- FileOutputStream fos = new FileOutputStream(custom);
- fos.write(s.getBytes());
- fos.close();
- }
-
- @Override
- protected AbstractApplicationContext createApplicationContext() {
- return new ClassPathXmlApplicationContext("META-INF/spring/camelContext.xml");
- }
-
- @Test
- public void testRmi() throws Exception {
- // Create a new camel context to send the request so we can test the service which is deployed into a container
- CamelContext myContext = new DefaultCamelContext();
- ProducerTemplate myTemplate = myContext.createProducerTemplate();
- myTemplate.start();
- try {
- System.out.println("Calling on port " + port);
- String out = myTemplate.requestBody("rmi://localhost:" + port + "/helloServiceBean", "Camel", String.class);
- assertEquals("Hello Camel", out);
- } finally {
- myTemplate.stop();
- myContext.stop();
- }
- }
-
-}