Author: gnodet
Date: Thu Jul 3 12:51:35 2008
New Revision: 673780
URL: http://svn.apache.org/viewvc?rev=673780&view=rev
Log:
SM-1387: make servicemix-ftp osgi friendly
Added:
servicemix/components/bindings/servicemix-ftp/trunk/src/main/resources/META-INF/
servicemix/components/bindings/servicemix-ftp/trunk/src/main/resources/META-INF/spring/
servicemix/components/bindings/servicemix-ftp/trunk/src/main/resources/META-INF/spring/servicemix-ftp.xml
Modified:
servicemix/components/bindings/servicemix-ftp/trunk/pom.xml
servicemix/components/bindings/servicemix-ftp/trunk/src/main/java/org/apache/servicemix/ftp/FtpComponent.java
Modified: servicemix/components/bindings/servicemix-ftp/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-ftp/trunk/pom.xml?rev=673780&r1=673779&r2=673780&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-ftp/trunk/pom.xml (original)
+++ servicemix/components/bindings/servicemix-ftp/trunk/pom.xml Thu Jul 3
12:51:35 2008
@@ -42,6 +42,17 @@
<previous.releases>3.1.2,3.2,3.2.1</previous.releases>
<servicemix-version>3.2.1</servicemix-version>
<servicemix-shared-version>4.0-SNAPSHOT</servicemix-shared-version>
+
+ <servicemix.osgi.import>
+ org.apache.servicemix.common.osgi,
+ org.apache.xbean.spring.context.v2,
+ org.springframework.beans.factory.xml,
+ *
+ </servicemix.osgi.import>
+ <servicemix.osgi.export>
+ org.apache.servicemix*;version=${project.version},
+
META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.ftp
+ </servicemix.osgi.export>
</properties>
<dependencies>
Modified:
servicemix/components/bindings/servicemix-ftp/trunk/src/main/java/org/apache/servicemix/ftp/FtpComponent.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-ftp/trunk/src/main/java/org/apache/servicemix/ftp/FtpComponent.java?rev=673780&r1=673779&r2=673780&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-ftp/trunk/src/main/java/org/apache/servicemix/ftp/FtpComponent.java
(original)
+++
servicemix/components/bindings/servicemix-ftp/trunk/src/main/java/org/apache/servicemix/ftp/FtpComponent.java
Thu Jul 3 12:51:35 2008
@@ -24,8 +24,8 @@
import org.apache.servicemix.common.DefaultComponent;
import org.apache.servicemix.common.Endpoint;
-import org.apache.servicemix.jbi.util.IntrospectionSupport;
-import org.apache.servicemix.jbi.util.URISupport;
+import org.apache.servicemix.common.util.IntrospectionSupport;
+import org.apache.servicemix.common.util.URISupport;
/**
* An FTP based component
Added:
servicemix/components/bindings/servicemix-ftp/trunk/src/main/resources/META-INF/spring/servicemix-ftp.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-ftp/trunk/src/main/resources/META-INF/spring/servicemix-ftp.xml?rev=673780&view=auto
==============================================================================
---
servicemix/components/bindings/servicemix-ftp/trunk/src/main/resources/META-INF/spring/servicemix-ftp.xml
(added)
+++
servicemix/components/bindings/servicemix-ftp/trunk/src/main/resources/META-INF/spring/servicemix-ftp.xml
Thu Jul 3 12:51:35 2008
@@ -0,0 +1,52 @@
+<?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:osgi="http://www.springframework.org/schema/osgi";
+ xmlns:util="http://www.springframework.org/schema/util";
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util.xsd
+ http://www.springframework.org/schema/osgi
+ http://www.springframework.org/schema/osgi/spring-osgi.xsd";>
+
+ <bean id="servicemix-ftp" class="org.apache.servicemix.ftp.FtpComponent">
+ </bean>
+
+ <bean id="endpoint-tracker"
class="org.apache.servicemix.common.osgi.EndpointTracker">
+ <property name="component" ref="servicemix-ftp" />
+ </bean>
+
+ <osgi:list id="endpoints"
+ interface="org.apache.servicemix.common.osgi.EndpointWrapper"
+ cardinality="0..N">
+ <osgi:listener ref="endpoint-tracker" bind-method="register"
unbind-method="unregister" />
+ </osgi:list>
+
+ <osgi:service ref="servicemix-ftp"
interface="javax.jbi.component.Component">
+ <osgi:service-properties>
+ <entry key="NAME" value="servicemix-ftp" />
+ <entry key="TYPE" value="binding-component" />
+ </osgi:service-properties>
+ </osgi:service>
+
+</beans>
