Author: tommaso
Date: Sun Oct 31 15:41:17 2010
New Revision: 1029385
URL: http://svn.apache.org/viewvc?rev=1029385&view=rev
Log:
[CLEREZZA-284] - added condition to control over https parameter being set to
true to avoid unwanted activation
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/Main.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/ssl/Activator.scala
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/Main.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/Main.java?rev=1029385&r1=1029384&r2=1029385&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/Main.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/Main.java
Sun Oct 31 15:41:17 2010
@@ -273,7 +273,7 @@ public class Main implements BundleActiv
{
final String httpsPort = arguments.getSecurePort();
- if (httpsPort != null) {
+ if (httpsPort != null && !"".equals(httpsPort)) {
configProps.put("org.osgi.service.http.port.secure", httpsPort);
httpsEnabled = true;
}
@@ -281,7 +281,7 @@ public class Main implements BundleActiv
{
final String keyStorePath = arguments.getKeyStorePath();
- if (keyStorePath != null) {
+ if (keyStorePath != null && !"".equals(keyStorePath)) {
configProps.put("org.wymiwyg.jetty.httpservice.https.keystore.path",
keyStorePath);
httpsEnabled = true;
}
@@ -289,7 +289,7 @@ public class Main implements BundleActiv
{
final String keyStorePassword =
arguments.getKeyStorePassword();
- if (keyStorePassword != null) {
+ if (keyStorePassword != null &&
!"".equals(keyStorePassword)) {
configProps.put("org.wymiwyg.jetty.httpservice.https.keystore.password",
keyStorePassword);
httpsEnabled = true;
}
@@ -297,7 +297,7 @@ public class Main implements BundleActiv
{
final String keyStoreType = arguments.getKeyStoreType();
- if (keyStoreType != null) {
+ if (keyStoreType != null && !"".equals(keyStoreType)) {
configProps.put("org.wymiwyg.jetty.httpservice.https.keystore.type",
keyStoreType);
httpsEnabled = true;
}
@@ -306,7 +306,7 @@ public class Main implements BundleActiv
{
final String clientAuth = arguments.getClientAuth();
- if (clientAuth != null) {
+ if (clientAuth != null && !"".equals(clientAuth)) {
configProps.put("org.wymiwyg.jetty.httpservice.clientauth", clientAuth);
httpsEnabled = true;
}
@@ -315,7 +315,6 @@ public class Main implements BundleActiv
if (httpsEnabled) {
configProps.put("org.osgi.service.http.secure.enabled",
"true");
}
-
return configProps;
}
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/ssl/Activator.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/ssl/Activator.scala?rev=1029385&r1=1029384&r2=1029385&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/ssl/Activator.scala
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/ssl/Activator.scala
Sun Oct 31 15:41:17 2010
@@ -21,20 +21,9 @@ package org.apache.clerezza.foafssl.ssl
import java.security.KeyStore
import java.util._
import java.io._
-import javax.imageio._
import javax.net.ssl.SSLContext
-import javax.ws.rs._
-import javax.ws.rs.core._
-import org.apache.clerezza.rdf.core._
-import org.apache.clerezza.rdf.core.access._
-import org.apache.clerezza.rdf.core.impl._
-import org.apache.clerezza.rdf.utils._
-import org.apache.clerezza.rdf.ontologies._
-import org.apache.clerezza.platform.graphprovider.content._
-import org.apache.clerezza.platform.typerendering.scalaserverpages._
import org.jsslutils.keystores.KeyStoreLoader
import org.jsslutils.sslcontext.X509SSLContextFactory
-import org.jsslutils.sslcontext.trustmanagers._
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext
import org.wymiwyg.jetty.httpservice.{Activator => ServiceActivator}
@@ -51,19 +40,27 @@ class Activator() {
x509TrustManagerWrapperService = null
}
- protected def activate(context: ComponentContext) = {
- val bundleContext = context.getBundleContext
- //TODO set jvm default ca-store
- val sslContextFactory = new X509SSLContextFactory(
- getServerCertKeyStore(context),
getKeyStorePassword(bundleContext),
- getServerCertKeyStore(context));//getCaKeyStore());
- sslContextFactory
- .setTrustManagerWrapper(x509TrustManagerWrapperService);
-
-
- bundleContext.registerService(classOf[SSLContext].getName,
-
sslContextFactory.buildSSLContext("TLS"), new Properties())
- println("Registered SSLContext+")
+ protected def activate(context: ComponentContext) = {
+ try{
+ val bundleContext = context.getBundleContext
+ //TODO set jvm default ca-store
+ val http =
bundleContext.getProperty("org.osgi.service.http.secure.enabled")
+ if (http!=null && "true".equals(http)) {
+ val sslContextFactory = new X509SSLContextFactory(
+ getServerCertKeyStore(context),
getKeyStorePassword(bundleContext),
+ getServerCertKeyStore(context));//getCaKeyStore());
+ sslContextFactory
+ .setTrustManagerWrapper(x509TrustManagerWrapperService);
+
+
+ bundleContext.registerService(classOf[SSLContext].getName,
+ sslContextFactory.buildSSLContext("TLS"), new
Properties())
+ println("Registered SSLContext+")
+ }
+ }
+ catch{
+ case e : Exception => println("unable to activate FOAF+SSL")
+ }
}
