Author: ngn
Date: Sun Nov 16 12:32:55 2008
New Revision: 718109
URL: http://svn.apache.org/viewvc?rev=718109&view=rev
Log:
Clean up the dependencies
Modified:
mina/ftpserver/trunk/examples/ftpserver-osgi-spring-service/pom.xml
mina/ftpserver/trunk/examples/ftpserver-osgi-spring-service/src/main/java/org/apache/ftpserver/example/osgiservice/impl/FtpServerLifecycle.java
mina/ftpserver/trunk/examples/ftpserver-osgi-spring-service/src/main/resources/META-INF/spring/bundle-context.xml
Modified: mina/ftpserver/trunk/examples/ftpserver-osgi-spring-service/pom.xml
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/examples/ftpserver-osgi-spring-service/pom.xml?rev=718109&r1=718108&r2=718109&view=diff
==============================================================================
--- mina/ftpserver/trunk/examples/ftpserver-osgi-spring-service/pom.xml
(original)
+++ mina/ftpserver/trunk/examples/ftpserver-osgi-spring-service/pom.xml Sun Nov
16 12:32:55 2008
@@ -29,16 +29,6 @@
<packaging>bundle</packaging>
<version>1.0.0-M4-SNAPSHOT</version>
<dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-core</artifactId>
- <version>1.1.2</version>
- </dependency>
<dependency>
<groupId>org.apache.ftpserver</groupId>
<artifactId>ftpserver-core</artifactId>
@@ -59,7 +49,6 @@
<Export-Package>
org.apache.ftpserver.example.osgiservice</Export-Package>
<Private-Package>org.apache.ftpserver.example.osgiservice.impl</Private-Package>
<Import-Package>
-
org.springframework.beans.factory,
org.apache.ftpserver,
org.apache.ftpserver.ftplet
</Import-Package>
Modified:
mina/ftpserver/trunk/examples/ftpserver-osgi-spring-service/src/main/java/org/apache/ftpserver/example/osgiservice/impl/FtpServerLifecycle.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/examples/ftpserver-osgi-spring-service/src/main/java/org/apache/ftpserver/example/osgiservice/impl/FtpServerLifecycle.java?rev=718109&r1=718108&r2=718109&view=diff
==============================================================================
---
mina/ftpserver/trunk/examples/ftpserver-osgi-spring-service/src/main/java/org/apache/ftpserver/example/osgiservice/impl/FtpServerLifecycle.java
(original)
+++
mina/ftpserver/trunk/examples/ftpserver-osgi-spring-service/src/main/java/org/apache/ftpserver/example/osgiservice/impl/FtpServerLifecycle.java
Sun Nov 16 12:32:55 2008
@@ -21,10 +21,8 @@
package org.apache.ftpserver.example.osgiservice.impl;
import org.apache.ftpserver.FtpServer;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
-public class FtpServerLifecycle implements InitializingBean, DisposableBean {
+public class FtpServerLifecycle {
private FtpServer server;
@@ -36,8 +34,7 @@
this.server = server;
}
- public void afterPropertiesSet() throws Exception {
- server.start();
+ public void init() throws Exception {
System.out.println("Server started");
}
Modified:
mina/ftpserver/trunk/examples/ftpserver-osgi-spring-service/src/main/resources/META-INF/spring/bundle-context.xml
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/examples/ftpserver-osgi-spring-service/src/main/resources/META-INF/spring/bundle-context.xml?rev=718109&r1=718108&r2=718109&view=diff
==============================================================================
---
mina/ftpserver/trunk/examples/ftpserver-osgi-spring-service/src/main/resources/META-INF/spring/bundle-context.xml
(original)
+++
mina/ftpserver/trunk/examples/ftpserver-osgi-spring-service/src/main/resources/META-INF/spring/bundle-context.xml
Sun Nov 16 12:32:55 2008
@@ -43,7 +43,9 @@
<osgi:reference id="ftplet"
interface="org.apache.ftpserver.ftplet.Ftplet" />
<!-- Starts and stops the bean as the context is started and stopped -->
- <bean
class="org.apache.ftpserver.example.osgiservice.impl.FtpServerLifecycle">
+ <bean
class="org.apache.ftpserver.example.osgiservice.impl.FtpServerLifecycle"
+ init-method="init" destroy-method="destroy"
+ >
<property name="server" ref="server" />
</bean>
</beans>
\ No newline at end of file
