You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by bb...@apache.org on 2011/07/09 18:59:28 UTC
svn commit: r1144707 - in /incubator/clerezza/trunk/parent:
platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/auth/
platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/ssl/
platform.security.foafssl/test/sr...
Author: bblfish
Date: Sat Jul 9 16:59:27 2011
New Revision: 1144707
URL: http://svn.apache.org/viewvc?rev=1144707&view=rev
Log:
CLEREZZA-601 changed hjs to bblfish
Modified:
incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/auth/FoafSslAuthentication.scala
incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/auth/WebIDClaim.scala
incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/auth/X509Claim.scala
incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/ssl/Activator.scala
incubator/clerezza/trunk/parent/platform.security.foafssl/test/src/main/scala/org/apache/clerezza/foafssl/test/WebIDTester.scala
incubator/clerezza/trunk/parent/platform.security.foafssl/test/src/main/scala/org/apache/clerezza/foafssl/test/pages/WebIDClaimPg.scala
incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzLiteral.scala
incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Preamble.scala
incubator/clerezza/trunk/parent/rdf.scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EzMGraphTest.scala
incubator/clerezza/trunk/parent/ssl.keygen/base/src/test/java/org/apache/clerezza/ssl/keygen/bouncy/DefaultRSAPubKeyTest.java
Modified: incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/auth/FoafSslAuthentication.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/auth/FoafSslAuthentication.scala?rev=1144707&r1=1144706&r2=1144707&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/auth/FoafSslAuthentication.scala (original)
+++ incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/auth/FoafSslAuthentication.scala Sat Jul 9 16:59:27 2011
@@ -55,6 +55,7 @@ object FoafSslAuthentication {
/**
* Here we no longer care about verifying the web-id claims as this should
* already have been done by X509TrustManagerWrapperService
+ * @author reto, bblfish
*/
class FoafSslAuthentication extends WeightedAuthenticationMethod {
Modified: incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/auth/WebIDClaim.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/auth/WebIDClaim.scala?rev=1144707&r1=1144706&r2=1144707&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/auth/WebIDClaim.scala (original)
+++ incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/auth/WebIDClaim.scala Sat Jul 9 16:59:27 2011
@@ -39,7 +39,7 @@ import scala.None
*
* todo: think of what this would look like for a chain of certificates
*
- * @author hjs
+ * @author bblfish
* @created 30/03/2011
*/
class WebIDClaim(val webId: UriRef, val key: PublicKey) {
Modified: incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/auth/X509Claim.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/auth/X509Claim.scala?rev=1144707&r1=1144706&r2=1144707&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/auth/X509Claim.scala (original)
+++ incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/auth/X509Claim.scala Sat Jul 9 16:59:27 2011
@@ -32,6 +32,7 @@ import org.apache.clerezza.rdf.scala.uti
/**
* Static methods for X509Claim. It makes it easier to read code when one knows which methods
* have no need of any object state and which do. These methods could be moved to a library.
+ * @author bblfish
*/
object X509Claim {
final val logger = LoggerFactory.getLogger(classOf[X509Claim])
@@ -214,7 +215,7 @@ object X509Claim {
*
* todo: think of what this would look like for a chain of certificates
*
- * @author hjs
+ * @author bblfish
* @created: 30/03/2011
*/
class X509Claim(val cert: X509Certificate) extends Refreshable {
Modified: incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/ssl/Activator.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/ssl/Activator.scala?rev=1144707&r1=1144706&r2=1144707&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/ssl/Activator.scala (original)
+++ incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/ssl/Activator.scala Sat Jul 9 16:59:27 2011
@@ -28,7 +28,9 @@ import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext
import org.wymiwyg.jetty.httpservice.{Activator => ServiceActivator}
-
+/**
+ * @author reto
+ */
class Activator() {
Modified: incubator/clerezza/trunk/parent/platform.security.foafssl/test/src/main/scala/org/apache/clerezza/foafssl/test/WebIDTester.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.security.foafssl/test/src/main/scala/org/apache/clerezza/foafssl/test/WebIDTester.scala?rev=1144707&r1=1144706&r2=1144707&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.security.foafssl/test/src/main/scala/org/apache/clerezza/foafssl/test/WebIDTester.scala (original)
+++ incubator/clerezza/trunk/parent/platform.security.foafssl/test/src/main/scala/org/apache/clerezza/foafssl/test/WebIDTester.scala Sat Jul 9 16:59:27 2011
@@ -49,6 +49,8 @@ import org.apache.clerezza.rdf.scala.uti
* can be checked.
*
* http://lists.w3.org/Archives/Public/public-xg-webid/2011Jan/0107.html
+ *
+ * @author bblfish
*/
object WebIDTester {
@@ -752,4 +754,4 @@ class Assertor {
}
-}
\ No newline at end of file
+}
Modified: incubator/clerezza/trunk/parent/platform.security.foafssl/test/src/main/scala/org/apache/clerezza/foafssl/test/pages/WebIDClaimPg.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.security.foafssl/test/src/main/scala/org/apache/clerezza/foafssl/test/pages/WebIDClaimPg.scala?rev=1144707&r1=1144706&r2=1144707&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.security.foafssl/test/src/main/scala/org/apache/clerezza/foafssl/test/pages/WebIDClaimPg.scala (original)
+++ incubator/clerezza/trunk/parent/platform.security.foafssl/test/src/main/scala/org/apache/clerezza/foafssl/test/pages/WebIDClaimPg.scala Sat Jul 9 16:59:27 2011
@@ -37,7 +37,7 @@ import org.apache.clerezza.rdf.ontologie
import org.apache.clerezza.platform.users.WebIdGraphsService
/**
- * @author hjs
+ * @author bblfish
* @created: 01/04/2011
*/
@@ -237,4 +237,4 @@ class XhtmlWebIDClaimPg(arguments: XmlRe
return modWarn ++ expWarn
}
-}
\ No newline at end of file
+}
Modified: incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzLiteral.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzLiteral.scala?rev=1144707&r1=1144706&r2=1144707&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzLiteral.scala (original)
+++ incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzLiteral.scala Sat Jul 9 16:59:27 2011
@@ -43,7 +43,7 @@ trait EzLiteralImplicits {
* "1234"^^XSD.int -- a number
* </code>
*
- * @author hjs
+ * @author bblfish
* @created: 07/07/2011
*/
class EzLiteral(string: String) extends TypedLiteralImpl(string,XSD.string) {
@@ -68,4 +68,4 @@ class EzLiteral(string: String) extends
*/
def uri = new UriRef(string)
-}
\ No newline at end of file
+}
Modified: incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Preamble.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Preamble.scala?rev=1144707&r1=1144706&r2=1144707&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Preamble.scala (original)
+++ incubator/clerezza/trunk/parent/rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Preamble.scala Sat Jul 9 16:59:27 2011
@@ -34,7 +34,7 @@ import org.apache.clerezza.rdf.core._
* }}} near the top of the
* file using SCB Utilities for Scala
*
-* @author hjs, reto
+* @author bblfish, reto
*/
object Preamble extends TcIndependentConversions {
@@ -54,7 +54,7 @@ object Preamble extends TcIndependentCon
* before the
* code section using the conversions
*
-* @author hjs, reto
+* @author bblfish, reto
*/
class Preamble(val baseTc: TripleCollection) extends TcDependentConversions with TcIndependentConversions
@@ -111,4 +111,4 @@ protected object TcIndependentConversion
val emptyGraph = new impl.SimpleGraph(new impl.SimpleMGraph)
val emptyLiteral = new RichGraphNode(new GraphNode(new impl.PlainLiteralImpl(""), emptyGraph))
-}
\ No newline at end of file
+}
Modified: incubator/clerezza/trunk/parent/rdf.scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EzMGraphTest.scala
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/rdf.scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EzMGraphTest.scala?rev=1144707&r1=1144706&r2=1144707&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/rdf.scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EzMGraphTest.scala (original)
+++ incubator/clerezza/trunk/parent/rdf.scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EzMGraphTest.scala Sat Jul 9 16:59:27 2011
@@ -23,18 +23,21 @@ import org.apache.clerezza.rdf.core._
import impl._
import org.apache.clerezza.rdf.ontologies._
+/**
+ * @author bblfish, reto
+ */
class EzMGraphTest {
val bblfishModulus = """
- 9D â® 79 â® BF â® E2 â® F4 â® 98 â® BC â® 79 â® 6D â® AB â® 73 â® E2 â® 8B â® 39 â® 4D â® B5 26 â 68 â 49 â EE â 71 â 87 â
- 06 â 32 â C9 â 9F â 3F â 94 â E5 â CB â 4D â B5 12 â® 35 â® 13 â® 69 â® 60 â® 81 â® 58 â® 79 â® 66 â® F3 â® 79 â® 20 â®
- 91 â® 6A â® 3F â® 42 5A â F6 â 54 â 42 â 88 â B2 â E9 â 19 â 4A â 79 â 87 â 2E â 62 â 44 â 2D â 7C 06 â½ 78 â½ F8
- â½ FD â½ 52 â½ 92 â½ 6D â½ CD â½ D6 â½ F3 â½ 28 â½ 6B â½ 1F â½ DB â½ CB â½ D3 F2 â® 08 â® 34 â® 72 â® A2 â® 12 â® 75 â® AE â® D1
- â® 09 â® 17 â® D0 â® 88 â® 4C â® 04 â® 8E 04 â¾ E5 â¾ BF â¾ D1 â¾ 41 â¾ 64 â¾ D1 â¾ F7 â¾ 89 â¾ 6D â¾ 8B â¾ B2 â¾ F2 â¾ 46 â¾ C0
- â¾ 56 87 â® 8D â® B8 â® 7C â® C6 â® FE â® E9 â® 61 â® 88 â® 08 â® 61 â® DD â® E3 â® B8 â® B5 â® 47 â¥
- """
+ 9D â® 79 â® BF â® E2 â® F4 â® 98 â® BC â® 79 â® 6D â® AB â® 73 â® E2 â® 8B â® 39 â® 4D â® B5 26 â 68 â 49 â EE â 71 â 87 â
+ 06 â 32 â C9 â 9F â 3F â 94 â E5 â CB â 4D â B5 12 â® 35 â® 13 â® 69 â® 60 â® 81 â® 58 â® 79 â® 66 â® F3 â® 79 â® 20 â®
+ 91 â® 6A â® 3F â® 42 5A â F6 â 54 â 42 â 88 â B2 â E9 â 19 â 4A â 79 â 87 â 2E â 62 â 44 â 2D â 7C 06 â½ 78 â½ F8
+ â½ FD â½ 52 â½ 92 â½ 6D â½ CD â½ D6 â½ F3 â½ 28 â½ 6B â½ 1F â½ DB â½ CB â½ D3 F2 â® 08 â® 34 â® 72 â® A2 â® 12 â® 75 â® AE â® D1
+ â® 09 â® 17 â® D0 â® 88 â® 4C â® 04 â® 8E 04 â¾ E5 â¾ BF â¾ D1 â¾ 41 â¾ 64 â¾ D1 â¾ F7 â¾ 89 â¾ 6D â¾ 8B â¾ B2 â¾ F2 â¾ 46 â¾ C0
+ â¾ 56 87 â® 8D â® B8 â® 7C â® C6 â® FE â® E9 â® 61 â® 88 â® 08 â® 61 â® DD â® E3 â® B8 â® B5 â® 47 â¥
+ """
- /** import some references in order to reduce dependencies */
+ /**import some references in order to reduce dependencies */
final val hex: UriRef = new UriRef("http://www.w3.org/ns/auth/cert#hex")
final val identity: UriRef = new UriRef("http://www.w3.org/ns/auth/cert#identity")
@@ -49,34 +52,34 @@ class EzMGraphTest {
private val tinyGraph: Graph = {
val gr = new SimpleMGraph
- val reto= new BNode()
+ val reto = new BNode()
val danny = new BNode()
val henry = new UriRef(henryUri)
- gr.add(new TripleImpl(reto,RDF.`type`, FOAF.Person))
- gr.add(new TripleImpl(reto,FOAF.name, new PlainLiteralImpl("Reto Bachman-Gmür", new Language("rm"))))
+ gr.add(new TripleImpl(reto, RDF.`type`, FOAF.Person))
+ gr.add(new TripleImpl(reto, FOAF.name, new PlainLiteralImpl("Reto Bachman-Gmür", new Language("rm"))))
//it is difficult to remember that one needs to put a string literal if one does not want to specify a language
- gr.add(new TripleImpl(reto,FOAF.title, new TypedLiteralImpl("Mr",XSD.string)))
- gr.add(new TripleImpl(reto,FOAF.currentProject, new UriRef("http://clerezza.org/")))
- gr.add(new TripleImpl(reto,FOAF.knows, henry))
- gr.add(new TripleImpl(reto,FOAF.knows, danny))
-
- gr.add(new TripleImpl(danny,FOAF.name,new PlainLiteralImpl("Danny Ayers", new Language("en"))))
- gr.add(new TripleImpl(danny,RDF.`type`, FOAF.Person))
- gr.add(new TripleImpl(danny,FOAF.knows, henry))
- gr.add(new TripleImpl(danny,FOAF.knows, reto))
-
- gr.add(new TripleImpl(henry,FOAF.name,new TypedLiteralImpl("Henry Story",XSD.string))) //It is tricky to remember that one needs this for pure strings
- gr.add(new TripleImpl(henry,FOAF.currentProject,new UriRef("http://webid.info/")))
- gr.add(new TripleImpl(henry,RDF.`type`, FOAF.Person))
- gr.add(new TripleImpl(henry,FOAF.knows, danny))
- gr.add(new TripleImpl(henry,FOAF.knows, reto))
+ gr.add(new TripleImpl(reto, FOAF.title, new TypedLiteralImpl("Mr", XSD.string)))
+ gr.add(new TripleImpl(reto, FOAF.currentProject, new UriRef("http://clerezza.org/")))
+ gr.add(new TripleImpl(reto, FOAF.knows, henry))
+ gr.add(new TripleImpl(reto, FOAF.knows, danny))
+
+ gr.add(new TripleImpl(danny, FOAF.name, new PlainLiteralImpl("Danny Ayers", new Language("en"))))
+ gr.add(new TripleImpl(danny, RDF.`type`, FOAF.Person))
+ gr.add(new TripleImpl(danny, FOAF.knows, henry))
+ gr.add(new TripleImpl(danny, FOAF.knows, reto))
+
+ gr.add(new TripleImpl(henry, FOAF.name, new TypedLiteralImpl("Henry Story", XSD.string))) //It is tricky to remember that one needs this for pure strings
+ gr.add(new TripleImpl(henry, FOAF.currentProject, new UriRef("http://webid.info/")))
+ gr.add(new TripleImpl(henry, RDF.`type`, FOAF.Person))
+ gr.add(new TripleImpl(henry, FOAF.knows, danny))
+ gr.add(new TripleImpl(henry, FOAF.knows, reto))
val pk = new BNode()
- gr.add(new TripleImpl(pk,RDF.`type`,RSAPublicKey))
- gr.add(new TripleImpl(pk,identity,henry))
- gr.add(new TripleImpl(pk,modulus,LiteralFactory.getInstance().createTypedLiteral(65537)))
- gr.add(new TripleImpl(pk,public_exponent,new TypedLiteralImpl(bblfishModulus,hex)))
+ gr.add(new TripleImpl(pk, RDF.`type`, RSAPublicKey))
+ gr.add(new TripleImpl(pk, identity, henry))
+ gr.add(new TripleImpl(pk, modulus, LiteralFactory.getInstance().createTypedLiteral(65537)))
+ gr.add(new TripleImpl(pk, public_exponent, new TypedLiteralImpl(bblfishModulus, hex)))
gr.getGraph
}
Modified: incubator/clerezza/trunk/parent/ssl.keygen/base/src/test/java/org/apache/clerezza/ssl/keygen/bouncy/DefaultRSAPubKeyTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/ssl.keygen/base/src/test/java/org/apache/clerezza/ssl/keygen/bouncy/DefaultRSAPubKeyTest.java?rev=1144707&r1=1144706&r2=1144707&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/ssl.keygen/base/src/test/java/org/apache/clerezza/ssl/keygen/bouncy/DefaultRSAPubKeyTest.java (original)
+++ incubator/clerezza/trunk/parent/ssl.keygen/base/src/test/java/org/apache/clerezza/ssl/keygen/bouncy/DefaultRSAPubKeyTest.java Sat Jul 9 16:59:27 2011
@@ -40,7 +40,7 @@ import java.io.StringReader;
/**
* Test cases always useful
* <p/>
- * User: hjs
+ * User: bblfish
* Date: Feb 18, 2010
* Time: 3:59:02 PM
*/