You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2013/03/20 12:01:40 UTC
svn commit: r1458763 - in /clerezza/trunk:
platform.security.foafssl/core/pom.xml
platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/ssl/Activator.scala
platform.security.foafssl/pom.xml pom.xml
Author: reto
Date: Wed Mar 20 11:01:40 2013
New Revision: 1458763
URL: http://svn.apache.org/r1458763
Log:
CLEREZZA-751: added modules to reactor again, removing test module which no longer compiles (scala version?)
Modified:
clerezza/trunk/platform.security.foafssl/core/pom.xml
clerezza/trunk/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/ssl/Activator.scala
clerezza/trunk/platform.security.foafssl/pom.xml
clerezza/trunk/pom.xml
Modified: clerezza/trunk/platform.security.foafssl/core/pom.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/platform.security.foafssl/core/pom.xml?rev=1458763&r1=1458762&r2=1458763&view=diff
==============================================================================
--- clerezza/trunk/platform.security.foafssl/core/pom.xml (original)
+++ clerezza/trunk/platform.security.foafssl/core/pom.xml Wed Mar 20 11:01:40 2013
@@ -44,30 +44,37 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
+ <version>0.13-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform</artifactId>
+ <version>0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typerendering.core</artifactId>
+ <version>0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typerendering.scalaserverpages</artifactId>
+ <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.scala.utils</artifactId>
+ <version>0.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.security</artifactId>
+ <version>0.8-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.users.core</artifactId>
+ <version>0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
@@ -84,6 +91,7 @@
<dependency>
<groupId>org.wymiwyg</groupId>
<artifactId>jetty-osgi-httpservice</artifactId>
+ <version>0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: clerezza/trunk/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/ssl/Activator.scala
URL: http://svn.apache.org/viewvc/clerezza/trunk/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/ssl/Activator.scala?rev=1458763&r1=1458762&r2=1458763&view=diff
==============================================================================
--- clerezza/trunk/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/ssl/Activator.scala (original)
+++ clerezza/trunk/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/ssl/Activator.scala Wed Mar 20 11:01:40 2013
@@ -55,9 +55,9 @@ class Activator() {
sslContextFactory
.setTrustManagerWrapper(x509TrustManagerWrapperService);
-
+ val properties = new Hashtable[String, Any]();
bundleContext.registerService(classOf[SSLContext].getName,
- sslContextFactory.buildSSLContext("TLS"), new Properties())
+ sslContextFactory.buildSSLContext("TLS"), properties)
println("Registered SSLContext+")
}
}
Modified: clerezza/trunk/platform.security.foafssl/pom.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/platform.security.foafssl/pom.xml?rev=1458763&r1=1458762&r2=1458763&view=diff
==============================================================================
--- clerezza/trunk/platform.security.foafssl/pom.xml (original)
+++ clerezza/trunk/platform.security.foafssl/pom.xml Wed Mar 20 11:01:40 2013
@@ -35,6 +35,5 @@
<modules>
<module>ontologies</module>
<module>core</module>
- <module>test</module>
</modules>
-</project>
\ No newline at end of file
+</project>
Modified: clerezza/trunk/pom.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/pom.xml?rev=1458763&r1=1458762&r2=1458763&view=diff
==============================================================================
--- clerezza/trunk/pom.xml (original)
+++ clerezza/trunk/pom.xml Wed Mar 20 11:01:40 2013
@@ -115,8 +115,7 @@
<module>platform.mail</module>
<module>platform.scripting</module>
<module>platform.scripting.scriptmanager</module>
- <!-- <module>platform.security.foafssl</module> -->
- <module>platform.security.foafssl/ontologies</module>
+ <module>platform.security.foafssl</module>
<module>platform.security.conditions</module>
<module>platform.shellcustomizer</module>
<module>platform.typehandlerspace</module>
@@ -441,4 +440,4 @@
</plugin> -->
</plugins>
</reporting>
-</project>
\ No newline at end of file
+</project>