You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by be...@apache.org on 2013/06/09 18:13:47 UTC
[1/2] git commit: fast fail if TLS certificate password is given,
but certificate not loaded
Updated Branches:
refs/heads/master b07fd4682 -> 2ba3d39be
fast fail if TLS certificate password is given, but certificate not loaded
Project: http://git-wip-us.apache.org/repos/asf/mina-vysper/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-vysper/commit/f41fb02a
Tree: http://git-wip-us.apache.org/repos/asf/mina-vysper/tree/f41fb02a
Diff: http://git-wip-us.apache.org/repos/asf/mina-vysper/diff/f41fb02a
Branch: refs/heads/master
Commit: f41fb02a380816d0dc4ebc54226912ab30c27454
Parents: b07fd46
Author: Bernd Fondermann <be...@brainlounge.de>
Authored: Sun Jun 9 18:03:29 2013 +0200
Committer: Bernd Fondermann <be...@brainlounge.de>
Committed: Sun Jun 9 18:03:29 2013 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/vysper/xmpp/server/XMPPServer.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-vysper/blob/f41fb02a/server/core/src/main/java/org/apache/vysper/xmpp/server/XMPPServer.java
----------------------------------------------------------------------
diff --git a/server/core/src/main/java/org/apache/vysper/xmpp/server/XMPPServer.java b/server/core/src/main/java/org/apache/vysper/xmpp/server/XMPPServer.java
index 290fdcb..e8f27e4 100644
--- a/server/core/src/main/java/org/apache/vysper/xmpp/server/XMPPServer.java
+++ b/server/core/src/main/java/org/apache/vysper/xmpp/server/XMPPServer.java
@@ -26,6 +26,7 @@ import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.lang.StringUtils;
import org.apache.vysper.storage.StorageProviderRegistry;
import org.apache.vysper.storage.logstanzas.LogStorageProvider;
import org.apache.vysper.xmpp.addressing.EntityImpl;
@@ -134,6 +135,9 @@ public class XMPPServer {
public void start() throws Exception {
BogusTrustManagerFactory bogusTrustManagerFactory = new BogusTrustManagerFactory();
+ if (StringUtils.isNotEmpty(tlsCertificatePassword) && tlsCertificate == null) {
+ throw new IllegalStateException("no TLS certificate loaded for the configured password");
+ }
InputStreamBasedTLSContextFactory tlsContextFactory = new InputStreamBasedTLSContextFactory(tlsCertificate);
tlsContextFactory.setPassword(tlsCertificatePassword);
tlsContextFactory.setTrustManagerFactory(bogusTrustManagerFactory);
[2/2] git commit: Vysper embedded in WAR: + fix loading of
certificate + allow starting WAR easily and support 'mvn jetty:run' by adding
jetty maven plugin
Posted by be...@apache.org.
Vysper embedded in WAR:
+ fix loading of certificate
+ allow starting WAR easily and support 'mvn jetty:run' by adding jetty maven plugin
Project: http://git-wip-us.apache.org/repos/asf/mina-vysper/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-vysper/commit/2ba3d39b
Tree: http://git-wip-us.apache.org/repos/asf/mina-vysper/tree/2ba3d39b
Diff: http://git-wip-us.apache.org/repos/asf/mina-vysper/diff/2ba3d39b
Branch: refs/heads/master
Commit: 2ba3d39becd5b53e99b1e6c4f691d0e76690eebf
Parents: f41fb02
Author: Bernd Fondermann <be...@brainlounge.de>
Authored: Sun Jun 9 18:08:05 2013 +0200
Committer: Bernd Fondermann <be...@brainlounge.de>
Committed: Sun Jun 9 18:08:05 2013 +0200
----------------------------------------------------------------------
examples/embedded-war/pom.xml | 17 +++++++++++++++++
.../xmpp/exemples/embeddedwar/VysperListener.java | 5 +++--
2 files changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-vysper/blob/2ba3d39b/examples/embedded-war/pom.xml
----------------------------------------------------------------------
diff --git a/examples/embedded-war/pom.xml b/examples/embedded-war/pom.xml
index 8ead1f7..50e6065 100644
--- a/examples/embedded-war/pom.xml
+++ b/examples/embedded-war/pom.xml
@@ -95,4 +95,21 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>8.0.0.RC0</version>
+ <configuration>
+ <connectors>
+ <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+ <port>8080</port>
+ <maxIdleTime>2000</maxIdleTime>
+ </connector>
+ </connectors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/mina-vysper/blob/2ba3d39b/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/VysperListener.java
----------------------------------------------------------------------
diff --git a/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/VysperListener.java b/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/VysperListener.java
index 3d20cdf..0c990bb 100644
--- a/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/VysperListener.java
+++ b/examples/embedded-war/src/main/java/org/apache/vysper/xmpp/exemples/embeddedwar/VysperListener.java
@@ -55,8 +55,9 @@ public class VysperListener implements ServletContextListener {
server = new XMPPServer(domain);
server.addEndpoint(new C2SEndpoint());
server.setStorageProviderRegistry(providerRegistry);
-
- server.setTLSCertificateInfo(sce.getServletContext().getResourceAsStream("WEB-INF/bogus_mina_tls.cert"), "boguspw");
+
+ final String pathToTLSCertificate = "/WEB-INF/bogus_mina_tls.cert";
+ server.setTLSCertificateInfo(sce.getServletContext().getResourceAsStream(pathToTLSCertificate), "boguspw");
try {
server.start();