aboutsummaryrefslogtreecommitdiff
path: root/moaSig/moa-sig/src/main/resources
diff options
context:
space:
mode:
Diffstat (limited to 'moaSig/moa-sig/src/main/resources')
-rw-r--r--moaSig/moa-sig/src/main/resources/log4j.properties38
-rw-r--r--moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SIG-3.0.0.xsd26
-rw-r--r--moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.wsdl16
-rw-r--r--moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.xsd5
4 files changed, 72 insertions, 13 deletions
diff --git a/moaSig/moa-sig/src/main/resources/log4j.properties b/moaSig/moa-sig/src/main/resources/log4j.properties
new file mode 100644
index 0000000..7beb0c5
--- /dev/null
+++ b/moaSig/moa-sig/src/main/resources/log4j.properties
@@ -0,0 +1,38 @@
+#
+# Sample log4j configuration for the MOA-SPSS web service
+#
+
+# commons-logging setup
+org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFactory
+
+# Configure root logger and loggers for moa-spss
+log4j.rootLogger=TRACE, stdout
+log4j.logger.moa.spss.server=TRACE, stdout, moaspss
+log4j.logger.iaik.server=TRACE, stdout, moaspss
+log4j.logger.at.gv.egovernment.moa.spss=TRACE, stdout, moaspss
+
+# Configure the 'stdout' appender to write logging output to the console
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %C{1} | %20c | %10t | %m%n
+
+# Configure the 'moaspss' appender to write moa-spss related logging output
+# to the file '${catalina.base}/logs/moa-spss.log'. The file is rolled over every 1000KB,
+# and a maximum history of 10 log files is being kept.
+log4j.appender.moaspss=org.apache.log4j.RollingFileAppender
+log4j.appender.moaspss.File=${catalina.base}/logs/moa-spss.log
+log4j.appender.moaspss.MaxFileSize=1000KB
+log4j.appender.moaspss.MaxBackupIndex=10
+log4j.appender.moaspss.layout=org.apache.log4j.PatternLayout
+log4j.appender.moaspss.layout.ConversionPattern=%5p | %d{dd HH:mm:ss,SSS} | %C{1} | %20c | %10t | %m%n
+
+# Configure the jdbc appender 'JDBC' to write logging output
+# to the given PostgreSQL database
+# a suitable table called 'spss_log' must have been created in the
+# database using the command:
+# create table spss_log (log_time timestamp, log_level char(5), log_msg text)
+#log4j.appender.JDBC=org.apache.log4j.jdbc.JDBCAppender
+#log4j.appender.JDBC.driver=org.postgresql.Driver
+#log4j.appender.JDBC.URL=jdbc:postgresql://10.16.46.108/moa?user=moa&password=moatest
+#log4j.appender.JDBC.layout=org.apache.log4j.PatternLayout
+#log4j.appender.JDBC.sql=INSERT INTO spss_log (log_time, log_level, log_msg) VALUES ('%d{ yyyy-MM-dd HH:mm:ss.SSS}', '%5p', '%m')
diff --git a/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SIG-3.0.0.xsd b/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SIG-3.0.0.xsd
index 63e82a2..55f0259 100644
--- a/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SIG-3.0.0.xsd
+++ b/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SIG-3.0.0.xsd
@@ -133,7 +133,7 @@
<xsd:element name="CreateXMLSignatureResponse" type="CreateXMLSignatureResponseType" />
<!--########## Create PDF Signature ### -->
<!--### Create PDF Signature Request ### -->
- <xsd:element name="CreatePDFSignatureRequest">
+ <!--xsd:element name="CreatePDFSignatureRequest">
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="CreatePDFSignatureRequestType" />
@@ -161,15 +161,15 @@
</xsd:complexType>
</xsd:element>
</xsd:sequence>
- </xsd:complexType>
+ </xsd:complexType-->
<!--### Create PDF Signature Response ### -->
- <xsd:element name="CreatePDFSignatureResponse" type="CreatePDFSignatureResponseType" />
+ <!--xsd:element name="CreatePDFSignatureResponse" type="CreatePDFSignatureResponseType" />
<xsd:complexType name="CreatePDFSignatureResponseType">
<xsd:sequence>
<xsd:element name="PDFSignature" type="PDFSignedRepsonse"
maxOccurs="unbounded" />
</xsd:sequence>
- </xsd:complexType>
+ </xsd:complexType-->
<!--########## Verify CMS Signature ### -->
<!--### Verifiy CMS Signature Request ### -->
<xsd:element name="VerifyCMSSignatureRequest">
@@ -186,6 +186,7 @@
<xsd:sequence>
<xsd:element name="DateTime" type="xsd:dateTime"
minOccurs="0" />
+ <xsd:element name="ExtendedValidation" type="xsd:boolean" minOccurs="0" default="false"/>
<xsd:element name="CMSSignature" type="xsd:base64Binary" />
<xsd:element name="DataObject" type="CMSDataObjectOptionalMetaType"
minOccurs="0" />
@@ -230,6 +231,7 @@
<xsd:sequence>
<xsd:element name="DateTime" type="xsd:dateTime"
minOccurs="0" />
+ <xsd:element name="ExtendedValidation" type="xsd:boolean" minOccurs="0" default="false"/>
<xsd:element name="PDFSignature" type="xsd:base64Binary" />
<xsd:element name="TrustProfileID" type="xsd:token">
<xsd:annotation>
@@ -277,11 +279,12 @@
<xsd:sequence>
<xsd:element name="DateTime" type="xsd:dateTime"
minOccurs="0" />
+ <xsd:element name="ExtendedValidation" type="xsd:boolean" minOccurs="0" default="false"/>
<xsd:element name="VerifySignatureInfo">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="VerifySignatureEnvironment" type="ContentOptionalRefType" />
- <xsd:element name="VerifySignatureLocation" type="xsd:token" />
+ <xsd:element name="VerifySignatureLocation" type="XMLSignatureLocationType" />
</xsd:sequence>
</xsd:complexType>
</xsd:element>
@@ -648,6 +651,19 @@
</xsd:attribute>
</xsd:complexType>
</xsd:element>
+ <xsd:complexType name="XMLSignatureLocationType">
+ <xsd:sequence>
+ <xsd:element name="NamespaceDeclaration" type="NamespaceDeclarationType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="XPathExpression" type="xsd:token" minOccurs="1" maxOccurs="1"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="NamespaceDeclarationType">
+ <xsd:simpleContent>
+ <xsd:extension base="xsd:token">
+ <xsd:attribute name="prefix" use="required" type="xsd:string"/>
+ </xsd:extension>
+ </xsd:simpleContent>
+ </xsd:complexType>
<xsd:element name="SecureSignatureCreationDevice">
<xsd:complexType>
<xsd:attribute name="source" use="optional">
diff --git a/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.wsdl b/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.wsdl
index 03b14ba..00bf4c5 100644
--- a/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.wsdl
+++ b/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.wsdl
@@ -10,12 +10,12 @@
<message name="CreateCMSSignatureOutput">
<part name="body" element="moa:CreateCMSSignatureResponse"/>
</message>
- <message name="CreatePDFSignatureInput">
+ <!-- message name="CreatePDFSignatureInput">
<part name="body" element="moa:CreatePDFSignatureRequest"/>
</message>
<message name="CreatePDFSignatureOutput">
<part name="body" element="moa:CreatePDFSignatureResponse"/>
- </message>
+ </message-->
<message name="CreateXMLSignatureInput">
<part name="body" element="moa:CreateXMLSignatureRequest"/>
</message>
@@ -54,11 +54,11 @@
<output message="tns:CreateCMSSignatureOutput"/>
<fault name="MOAFault" message="tns:MOAFault"/>
</operation>
- <operation name="createPDFSignature">
+ <!-- operation name="createPDFSignature">
<input message="tns:CreatePDFSignatureInput"/>
<output message="tns:CreatePDFSignatureOutput"/>
<fault name="MOAFault" message="tns:MOAFault"/>
- </operation>
+ </operation-->
</portType>
<portType name="SignatureVerificationPortType">
<operation name="verifyCMSSignature">
@@ -103,7 +103,7 @@
<!-- soap:fault name="" use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/-->
</fault>
</operation>
- <operation name="createPDFSignature">
+ <!-- operation name="createPDFSignature">
<soap:operation soapAction="urn:CreatePDFSignatureAction"/>
<input>
<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
@@ -111,10 +111,10 @@
<output>
<soap:body use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/>
</output>
- <fault name="MOAFault">
+ <fault name="MOAFault"-->
<!-- soap:fault name="" use="literal" namespace="http://reference.e-government.gv.at/namespace/moa/20020822#"/-->
- </fault>
- </operation>
+ <!-- /fault>
+ </operation-->
</binding>
<binding name="SignatureVerificationBinding" type="tns:SignatureVerificationPortType">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
diff --git a/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.xsd b/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.xsd
index 67a897c..a12dc09 100644
--- a/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.xsd
+++ b/moaSig/moa-sig/src/main/resources/resources/schemas/MOA-SPSS-2.0.0.xsd
@@ -166,6 +166,7 @@
<xsd:complexType name="VerifyCMSSignatureRequestType">
<xsd:sequence>
<xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
+ <xsd:element name="ExtendedValidation" type="xsd:boolean" minOccurs="0" default="false"/>
<xsd:element name="CMSSignature" type="xsd:base64Binary"/>
<xsd:element name="DataObject" type="CMSDataObjectOptionalMetaType" minOccurs="0"/>
<xsd:element name="TrustProfileID" type="xsd:token">
@@ -186,6 +187,7 @@
</xsd:element>
<xsd:element name="SignatureCheck" type="CheckResultType"/>
<xsd:element name="CertificateCheck" type="CheckResultType"/>
+ <xsd:element name="FormCheckResult" type="FormResultType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
<!--########## Verify PDF Signature ###-->
@@ -200,6 +202,7 @@
<xsd:complexType name="VerifyPDFSignatureRequestType">
<xsd:sequence>
<xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
+ <xsd:element name="ExtendedValidation" type="xsd:boolean" minOccurs="0" default="false"/>
<xsd:element name="PDFSignature" type="xsd:base64Binary"/>
<xsd:element name="TrustProfileID" type="xsd:token">
<xsd:annotation>
@@ -224,6 +227,7 @@
</xsd:element>
<xsd:element name="SignatureCheck" type="CheckResultType"/>
<xsd:element name="CertificateCheck" type="CheckResultType"/>
+ <xsd:element name="FormCheckResult" type="FormResultType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
<!--########## Verify XML Signature ###-->
@@ -232,6 +236,7 @@
<xsd:complexType name="VerifyXMLSignatureRequestType">
<xsd:sequence>
<xsd:element name="DateTime" type="xsd:dateTime" minOccurs="0"/>
+ <xsd:element name="ExtendedValidation" type="xsd:boolean" minOccurs="0" default="false"/>
<xsd:element name="VerifySignatureInfo">
<xsd:complexType>
<xsd:sequence>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 20:01:01 +0000