Author: bblfish
Date: Thu Feb 24 13:41:52 2011
New Revision: 1074147
URL: http://svn.apache.org/viewvc?rev=1074147&view=rev
Log:
Spelling mistakes, code simplification, and fix null pointer exception when
database is missing certain fields.
Modified:
incubator/clerezza/trunk/parent/platform.security.foafssl/core/pom.xml
incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/Utilities.scala
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/ssl/X509TrustManagerWrapperService.scala
Modified: incubator/clerezza/trunk/parent/platform.security.foafssl/core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.security.foafssl/core/pom.xml?rev=1074147&r1=1074146&r2=1074147&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.security.foafssl/core/pom.xml
(original)
+++ incubator/clerezza/trunk/parent/platform.security.foafssl/core/pom.xml Thu
Feb 24 13:41:52 2011
@@ -100,7 +100,7 @@
<Service-Component>OSGI-INF/serviceComponents.xml</Service-Component>
<Export-Package>!org.apache.clerezza.foafssl.ontologies,
org.apache.clerezza.foafssl.*</Export-Package>
-
<Bundle-SymbolicName>org.apache.clerezza.foafssl</Bundle-SymbolicName>
+
<Bundle-SymbolicName>{groupId}.${artifactId}</Bundle-SymbolicName>
</instructions>
</configuration>
</plugin>
Modified:
incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/Utilities.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/Utilities.scala?rev=1074147&r1=1074146&r2=1074147&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/Utilities.scala
(original)
+++
incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/Utilities.scala
Thu Feb 24 13:41:52 2011
@@ -66,14 +66,14 @@ object Utilities {
val altNme = it.next()
val altTpe = altNme.get(0);
val altObj = altNme.get(1);
- if ((altTpe.asInstanceOf[Integer] == 6) &&
altObj.isInstanceOf[String]) {
+ if ((altTpe.asInstanceOf[Int] == 6) &&
altObj.isInstanceOf[String]) {
result = new
UriRef(altObj.asInstanceOf[String]) :: result;
}
}
return result
}
- def cretateUsernameForWebId(webId: UriRef) = {
+ def createUsernameForWebId(webId: UriRef) = {
webId.getUnicodeString.replace(":", "");
}
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=1074147&r1=1074146&r2=1074147&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
Thu Feb 24 13:41:52 2011
@@ -49,13 +49,15 @@ class FoafSslAuthentication extends Weig
if ((certificates == null) || (certificates.length == 0)) {
return null
} else {
+ //TODO: not all the WebIDs below may have been verified
(in cases of multiple SANs)
+ //in fact we only currently verify the first, but as
soon as we verify more then
+ //a solution will need to be put in place for this.
val webIdUriRefs =
Utilities.getClaimedWebIds(certificates)
if (webIdUriRefs.size > 0) {
-
Utilities.cretateUsernameForWebId(webIdUriRefs(0))
+ return
Utilities.createUsernameForWebId(webIdUriRefs(0))
} else {
- null
+ return null
}
-
}
}
Modified:
incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/ssl/X509TrustManagerWrapperService.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/ssl/X509TrustManagerWrapperService.scala?rev=1074147&r1=1074146&r2=1074147&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/ssl/X509TrustManagerWrapperService.scala
(original)
+++
incubator/clerezza/trunk/parent/platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/ssl/X509TrustManagerWrapperService.scala
Thu Feb 24 13:41:52 2011
@@ -133,7 +133,7 @@ class X509TrustManagerWrapperService() e
val result = new SimpleMGraph()
val webId = webDescription.getNode.asInstanceOf[UriRef]
result.add(new TripleImpl(webId, PLATFORM.userName,
- new
PlainLiteralImpl(Utilities.cretateUsernameForWebId(webId))))
+ new
PlainLiteralImpl(Utilities.createUsernameForWebId(webId))))
result.add(new TripleImpl(webId, RDF.`type` ,
FOAF.Agent))
result
