From e0f2c64ad6360e2ecec983cb5e0a60f812672106 Mon Sep 17 00:00:00 2001 From: wbauer Date: Thu, 4 Sep 2008 14:56:54 +0000 Subject: finished access controller, accessed it from command invoker and configured everything within onlinebku git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@14 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- .../java/at/gv/egiz/bku/slcommands/InfoboxReadCommand.java | 10 +++++++++- .../java/at/gv/egiz/bku/slcommands/SLCommandInvoker.java | 7 ++++--- .../java/at/gv/egiz/bku/slcommands/SLSourceContext.java | 11 ++++++----- .../java/at/gv/egiz/bku/slcommands/SLTargetContext.java | 13 +++++++------ .../gv/egiz/bku/slcommands/impl/InfoboxReadCommandImpl.java | 7 ++++++- 5 files changed, 32 insertions(+), 16 deletions(-) (limited to 'bkucommon/src/main/java/at/gv/egiz/bku/slcommands') diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/InfoboxReadCommand.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/InfoboxReadCommand.java index 77529a36..73fddf1f 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/InfoboxReadCommand.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/InfoboxReadCommand.java @@ -16,5 +16,13 @@ */ package at.gv.egiz.bku.slcommands; -public interface InfoboxReadCommand extends SLCommand { +public interface InfoboxReadCommand extends SLCommand { + public String getInfoboxIdentifier(); + + /** + * Convenience method to get the domain identifier if the infobox + * referes to a Identitylink. + * @return the domain id or null if the Infobox is not of type Identitylink or no domain parameter was specified + */ + public String getIdentityLinkDomainId(); } \ No newline at end of file diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandInvoker.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandInvoker.java index 30c6b68f..c28288c9 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandInvoker.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLCommandInvoker.java @@ -16,7 +16,8 @@ */ package at.gv.egiz.bku.slcommands; -import at.gv.egiz.bku.slexceptions.SLCanceledException; +import at.gv.egiz.bku.slexceptions.SLCanceledException; +import at.gv.egiz.bku.slexceptions.SLException; public interface SLCommandInvoker { @@ -25,7 +26,7 @@ public interface SLCommandInvoker { * @param aContext * @throws SLCanceledException if the security management prevents execution of this command */ - public void invoke(SLSourceContext aContext) throws SLCanceledException; + public void invoke(SLSourceContext aContext) throws SLException; /** * @@ -33,7 +34,7 @@ public interface SLCommandInvoker { * @return * @throws SLCanceledException if the security management prevents execution of this command */ - public SLResult getResult(SLTargetContext aContext) throws SLCanceledException; + public SLResult getResult(SLTargetContext aContext) throws SLException; public void setCommand(at.gv.egiz.bku.slcommands.SLCommand aCmd); diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLSourceContext.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLSourceContext.java index ded55b2a..f25a0ea4 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLSourceContext.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLSourceContext.java @@ -16,6 +16,7 @@ */ package at.gv.egiz.bku.slcommands; +import java.net.URL; import java.security.cert.X509Certificate; import at.gv.egiz.bku.utils.binding.Protocol; @@ -23,17 +24,17 @@ import at.gv.egiz.bku.utils.binding.Protocol; public class SLSourceContext { - private Protocol sourceProtocol; + private URL sourceUrl; private boolean sourceIsDataURL; private X509Certificate sourceCertificate; private String sourceHTTPReferer; - public Protocol getSourceProtocol() { - return sourceProtocol; + public URL getSourceUrl() { + return sourceUrl; } - public void setSourceProtocol(Protocol sourceProtocol) { - this.sourceProtocol = sourceProtocol; + public void setSourceUrl(URL sourceProtocol) { + this.sourceUrl = sourceProtocol; } public boolean isSourceIsDataURL() { diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLTargetContext.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLTargetContext.java index cf800406..f9df3ced 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLTargetContext.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/SLTargetContext.java @@ -16,19 +16,20 @@ */ package at.gv.egiz.bku.slcommands; -import java.security.cert.X509Certificate; +import java.net.URL; +import java.security.cert.X509Certificate; public class SLTargetContext { - private String targetProtocol; + private URL targetUrl; private boolean targetIsDataURL; private X509Certificate targetCertificate; - public String getTargetProtocol() { - return targetProtocol; + public URL getTargetUrl() { + return targetUrl; } - public void setTargetProtocol(String targetProtocol) { - this.targetProtocol = targetProtocol; + public void setTargetUrl(URL targetUrl) { + this.targetUrl = targetUrl; } public boolean isTargetIsDataURL() { diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadCommandImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadCommandImpl.java index 93131cf4..b6745e1f 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadCommandImpl.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/InfoboxReadCommandImpl.java @@ -405,5 +405,10 @@ public class InfoboxReadCommandImpl extends SLCommandImpl