You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2008/11/16 21:45:02 UTC
svn commit: r718110 - in
/mina/ftpserver/trunk/examples/ftpserver-osgi-spring-service: pom.xml
src/main/java/org/apache/ftpserver/example/osgiservice/impl/FtpServerLifecycle.java
src/main/resources/META-INF/spring/bundle-context.xml
Author: ngn
Date: Sun Nov 16 12:45:02 2008
New Revision: 718110
URL: http://svn.apache.org/viewvc?rev=718110&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=718110&r1=718109&r2=718110&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:45:02 2008
@@ -29,6 +29,11 @@
<packaging>bundle</packaging>
<version>1.0.0-M4-SNAPSHOT</version>
<dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>2.5.5</version>
+ </dependency>
<dependency>
<groupId>org.apache.ftpserver</groupId>
<artifactId>ftpserver-core</artifactId>
@@ -49,6 +54,7 @@
<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=718110&r1=718109&r2=718110&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:45:02 2008
@@ -21,8 +21,10 @@
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 {
+public class FtpServerLifecycle implements InitializingBean, DisposableBean {
private FtpServer server;
@@ -34,7 +36,8 @@
this.server = server;
}
- public void init() throws Exception {
+ public void afterPropertiesSet() throws Exception {
+ server.start();
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=718110&r1=718109&r2=718110&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:45:02 2008
@@ -43,9 +43,7 @@
<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"
- init-method="init" destroy-method="destroy"
- >
+ <bean class="org.apache.ftpserver.example.osgiservice.impl.FtpServerLifecycle">
<property name="server" ref="server" />
</bean>
</beans>
\ No newline at end of file