svn commit: r1055365 - in /mina/vysper/trunk/server/core/src/main: config/spring-config.xml java/org/apache/vysper/spring/SpringCompatibleXMPPServer.java

[be...@apache.org]

Author: berndf
Date: Wed Jan  5 09:16:29 2011
New Revision: 1055365

URL: http://svn.apache.org/viewvc?rev=1055365&view=rev
Log:
VYSPER-259: make spring-based distribution's config work again out-of-the-box

Modified:
    mina/vysper/trunk/server/core/src/main/config/spring-config.xml
    mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/spring/SpringCompatibleXMPPServer.java

Modified: mina/vysper/trunk/server/core/src/main/config/spring-config.xml
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/config/spring-config.xml?rev=1055365&r1=1055364&r2=1055365&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/config/spring-config.xml (original)
+++ mina/vysper/trunk/server/core/src/main/config/spring-config.xml Wed Jan  5 09:16:29 2011
@@ -71,7 +71,7 @@
             </list>
         </property>
         <property name="storageProviderRegistry" ref="storageRegistry" />
-        <property name="certificateFile" value="src/main/config/bogus_mina_tls.cert" />
+        <property name="certificateFile" value="classpath:bogus_mina_tls.cert" />
         <property name="certificatePassword" value="boguspw" />
         <property name="modules" >
             <list>

Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/spring/SpringCompatibleXMPPServer.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/spring/SpringCompatibleXMPPServer.java?rev=1055365&r1=1055364&r2=1055365&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/spring/SpringCompatibleXMPPServer.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/spring/SpringCompatibleXMPPServer.java Wed Jan  5 09:16:29 2011
@@ -22,8 +22,10 @@ package org.apache.vysper.spring;
 import org.apache.vysper.xmpp.modules.Module;
 import org.apache.vysper.xmpp.server.Endpoint;
 import org.apache.vysper.xmpp.server.XMPPServer;
+import org.springframework.core.io.Resource;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -37,15 +39,15 @@ import java.util.List;
 public class SpringCompatibleXMPPServer extends XMPPServer {
 
     protected final List<Module> listOfModules = new ArrayList<Module>();
-    protected String certificateFile = null;
+    protected File certificateFile = null;
     protected String certificatePassword = null;
 
     public SpringCompatibleXMPPServer(String domain) {
         super(domain);
     }
 
-    public void setCertificateFile(String certificateFile) {
-        this.certificateFile = certificateFile;
+    public void setCertificateFile(Resource certificateFile) throws IOException {
+        this.certificateFile = certificateFile.getFile();
     }
 
     public void setCertificatePassword(String certificatePassword) {
@@ -63,7 +65,7 @@ public class SpringCompatibleXMPPServer 
     }
     
     public void init() throws Exception {
-        setTLSCertificateInfo(new File(certificateFile), certificatePassword);
+        setTLSCertificateInfo(certificateFile, certificatePassword);
         start();
         if (listOfModules != null) {
             for (Module module : listOfModules) {