Author: reto
Date: Wed Aug 11 10:12:55 2010
New Revision: 984360
URL: http://svn.apache.org/viewvc?rev=984360&view=rev
Log:
CLEREZZA-243: applied patch Henry, compatibility with firefox/xhtml
Modified:
incubator/clerezza/issues/CLEREZZA-243/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/pom.xml
incubator/clerezza/issues/CLEREZZA-243/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/java/org/apache/clerezza/platform/accountcontrolpanel/ProfilePanel.java
Modified:
incubator/clerezza/issues/CLEREZZA-243/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-243/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/pom.xml?rev=984360&r1=984359&r2=984360&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-243/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/pom.xml
(original)
+++
incubator/clerezza/issues/CLEREZZA-243/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/pom.xml
Wed Aug 11 10:12:55 2010
@@ -107,7 +107,7 @@
<artifactId>org.apache.clerezza.permissiondescriptions</artifactId>
</dependency>
<dependency>
- <groupId>uk.ac.manchester.rcs.bruno.keygenapp</groupId>
+ <groupId>bblfish.net</groupId>
<artifactId>keygenapp-base</artifactId>
<version>0.3-SNAPSHOT</version>
</dependency>
Modified:
incubator/clerezza/issues/CLEREZZA-243/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/java/org/apache/clerezza/platform/accountcontrolpanel/ProfilePanel.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-243/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/java/org/apache/clerezza/platform/accountcontrolpanel/ProfilePanel.java?rev=984360&r1=984359&r2=984360&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-243/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/java/org/apache/clerezza/platform/accountcontrolpanel/ProfilePanel.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-243/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/java/org/apache/clerezza/platform/accountcontrolpanel/ProfilePanel.java
Wed Aug 11 10:12:55 2010
@@ -18,45 +18,19 @@
*/
package org.apache.clerezza.platform.accountcontrolpanel;
-import java.math.BigInteger;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.interfaces.RSAPublicKey;
-import java.util.logging.Level;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import javax.ws.rs.core.UriInfo;
-
import net.bblfish.dev.foafssl.keygen.CertSerialisation;
import net.bblfish.dev.foafssl.keygen.Certificate;
-import net.bblfish.dev.foafssl.keygen.RSAPubKey;
-import net.bblfish.dev.foafssl.keygen.impl.StaticKeygenService;
import org.apache.clerezza.foafssl.ontologies.CERT;
import org.apache.clerezza.foafssl.ontologies.RSA;
import org.apache.clerezza.jaxrs.utils.RedirectUtil;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
-
-
import org.apache.clerezza.jaxrs.utils.TrailingSlash;
import
org.apache.clerezza.platform.accountcontrolpanel.ontologies.CONTROLPANEL;
import org.apache.clerezza.platform.config.PlatformConfig;
-import org.apache.clerezza.platform.security.UserUtil;
import org.apache.clerezza.platform.typerendering.RenderletManager;
import
org.apache.clerezza.platform.typerendering.scalaserverpages.ScalaServerPagesRenderlet;
import org.apache.clerezza.platform.usermanager.UserManager;
import org.apache.clerezza.platform.users.WebIdGraphsService;
-import org.apache.clerezza.rdf.core.BNode;
-import org.apache.clerezza.rdf.core.LiteralFactory;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.NonLiteral;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.rdf.core.*;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.rdf.core.impl.TripleImpl;
@@ -64,14 +38,27 @@ import org.apache.clerezza.rdf.ontologie
import org.apache.clerezza.rdf.ontologies.FOAF;
import org.apache.clerezza.rdf.ontologies.PLATFORM;
import org.apache.clerezza.rdf.ontologies.RDF;
-import org.apache.clerezza.rdf.ontologies.RDFS;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.clerezza.rdf.utils.UnionMGraph;
import org.apache.clerezza.web.fileserver.FileServer;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import scala.math.BigInt;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+import java.math.BigInteger;
+import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.interfaces.RSAPublicKey;
/**
*
@@ -213,11 +200,18 @@ public class ProfilePanel extends FileSe
logger.info("hours={}", hours);
logger.info("days={}", days);
logger.info("spkac={}", spkac);
+ logger.info("crmf={}", crmf);
Certificate cert = null;
if (spkac != null && spkac.length() > 0) {
cert = keygenSrvc.createFromSpkac(spkac);
if (cert == null) {
- logger.warn("unable to create keygen from spkac
request");
+ logger.warn("unable to create certificate from
spkac request");
+ }
+ }
+ if (cert == null && crmf != null && crmf.length() > 0) {
+ cert = keygenSrvc.createFromCRMF(crmf);
+ if (cert == null) {
+ logger.warn("unable to create certificate from
crmf requrest :" + crmf);
}
}
if (cert == null) {
