summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2010-02-01 15:50:28 +0000
committermcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2010-02-01 15:50:28 +0000
commitacf7dec147118b9a6055a92a0b4b10d678dd42ca (patch)
treee386004ed71b7c66d384d69ce782c33817cb6664
parentd370f68a9e011108656bc2c1c0b6647d3d69aa65 (diff)
downloadmocca-acf7dec147118b9a6055a92a0b4b10d678dd42ca.tar.gz
mocca-acf7dec147118b9a6055a92a0b4b10d678dd42ca.tar.bz2
mocca-acf7dec147118b9a6055a92a0b4b10d678dd42ca.zip
Added 'text/html' as valid to be signed data.
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@617 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
-rw-r--r--BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java1
-rw-r--r--BKUViewer/src/main/resources/META-INF/services/at.gv.egiz.bku.viewer.Validator3
-rw-r--r--bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java3
3 files changed, 5 insertions, 2 deletions
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
index 7db70c46..b0c8ecd4 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java
@@ -75,6 +75,7 @@ public class SecureViewerDialog extends JDialog {
static {
SUPPORTED_MIME_TYPES.add("text/plain");
SUPPORTED_MIME_TYPES.add("application/xhtml+xml");
+ SUPPORTED_MIME_TYPES.add("text/html");
}
protected static final Log log = LogFactory.getLog(SecureViewerDialog.class);
// private static SecureViewerDialog dialog;
diff --git a/BKUViewer/src/main/resources/META-INF/services/at.gv.egiz.bku.viewer.Validator b/BKUViewer/src/main/resources/META-INF/services/at.gv.egiz.bku.viewer.Validator
index 0004949b..bcd1fc03 100644
--- a/BKUViewer/src/main/resources/META-INF/services/at.gv.egiz.bku.viewer.Validator
+++ b/BKUViewer/src/main/resources/META-INF/services/at.gv.egiz.bku.viewer.Validator
@@ -1,2 +1,3 @@
application/xhtml+xml at.gv.egiz.bku.slxhtml.SLXHTMLValidator
-text/plain at.gv.egiz.bku.text.TextValidator \ No newline at end of file
+text/html at.gv.egiz.bku.slxhtml.SLXHTMLValidator
+text/plain at.gv.egiz.bku.text.TextValidator
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java
index a57a11dd..2cae41d6 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/DataObject.java
@@ -110,7 +110,8 @@ public class DataObject {
private static final String[] DEFAULT_PREFFERED_MIME_TYPES =
new String[] {
"text/plain",
- "application/xhtml+xml"
+ "application/xhtml+xml",
+ "text/html"
};
/**