diff options
| author | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-10-31 16:26:19 +0100 |
|---|---|---|
| committer | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-10-31 16:26:19 +0100 |
| commit | bce35f534b42d77cdaf1ab8e861237d1cf2f1191 (patch) | |
| tree | 4daf3b9a89647ff08ddd6414b7ccddd59db5e5d5 /spss/server | |
| parent | 9c6fece57add83ce29e6ba1acc55a11d2ed89fc0 (diff) | |
| parent | 2886006ba2ca141377e66a330df5fc52797c2755 (diff) | |
| download | moa-id-spss-bce35f534b42d77cdaf1ab8e861237d1cf2f1191.tar.gz moa-id-spss-bce35f534b42d77cdaf1ab8e861237d1cf2f1191.tar.bz2 moa-id-spss-bce35f534b42d77cdaf1ab8e861237d1cf2f1191.zip | |
Merge branch 'merge' into moa-2.1-Snapshot
Diffstat (limited to 'spss/server')
| -rw-r--r-- | spss/server/serverlib/.gitignore | 1 | ||||
| -rw-r--r-- | spss/server/serverlib/pom.xml | 6 | ||||
| -rw-r--r-- | spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/utils/TSLImportFromFileContext.java | 3 | ||||
| -rw-r--r-- | spss/server/serverws/.gitignore | 2 | ||||
| -rw-r--r-- | spss/server/serverws/pom.xml | 2 | ||||
| -rw-r--r-- | spss/server/serverws/resources/wsdl/MOA-SPSS-2.0.0.wsdl (renamed from spss/server/serverws/resources/wsdl/MOA-SPSS-1.5.2.wsdl) | 0 | ||||
| -rw-r--r-- | spss/server/serverws/resources/wsdl/MOA-SPSS-2.0.0.xsd (renamed from spss/server/serverws/resources/wsdl/MOA-SPSS-1.5.2.xsd) | 0 | ||||
| -rw-r--r-- | spss/server/serverws/src/main/webapp/WEB-INF/server-config.wsdd | 4 | ||||
| -rw-r--r-- | spss/server/tools/.gitignore | 1 |
9 files changed, 15 insertions, 4 deletions
diff --git a/spss/server/serverlib/.gitignore b/spss/server/serverlib/.gitignore new file mode 100644 index 000000000..ea8c4bf7f --- /dev/null +++ b/spss/server/serverlib/.gitignore @@ -0,0 +1 @@ +/target diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml index 7c11659e1..da78d3dc1 100644 --- a/spss/server/serverlib/pom.xml +++ b/spss/server/serverlib/pom.xml @@ -167,6 +167,12 @@ <version>2.2.11</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>2.2.11</version>
+ </dependency>
+
<!-- <dependency>
<groupId>iaik</groupId>
<artifactId>iaik_util</artifactId>
diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/utils/TSLImportFromFileContext.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/utils/TSLImportFromFileContext.java index 492d10eda..f8e8f608b 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/utils/TSLImportFromFileContext.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/tsl/utils/TSLImportFromFileContext.java @@ -726,7 +726,8 @@ public class TSLImportFromFileContext extends iaik.xml.crypto.tsl.TSLImportFromF } else if (e.getMessage().startsWith("cvc-datatype-valid.1.2.1: '") && e.getMessage().endsWith("' is not a valid value for 'NCName'.")){
- if (expectedTerritory_ == Countries.CY || expectedTerritory_ == Countries.LV){
+ if (expectedTerritory_ == Countries.CY || expectedTerritory_ == Countries.LV ||
+ expectedTerritory_ == Countries.HR || expectedTerritory_ == Countries.NL){
return new AttributeValueFixup("","Id","(.+)","x$1",e, this);
}
} else if (e.getMessage().startsWith("cvc-complex-type.2.3: Element '") && e.getMessage().endsWith("' cannot have character [children], because the type's content type is element-only.")) {
diff --git a/spss/server/serverws/.gitignore b/spss/server/serverws/.gitignore new file mode 100644 index 000000000..4dc009173 --- /dev/null +++ b/spss/server/serverws/.gitignore @@ -0,0 +1,2 @@ +/target +/bin diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml index 79a16cbb5..bbfb3c443 100644 --- a/spss/server/serverws/pom.xml +++ b/spss/server/serverws/pom.xml @@ -50,7 +50,7 @@ <webResources> <resource> <directory>${basedir}/resources/wsdl</directory> - <targetPath>resources/schemas</targetPath> + <targetPath>WEB-INF/classes/resources/schemas</targetPath> <includes> <include>*.xsd</include> <include>*.wsdl</include> diff --git a/spss/server/serverws/resources/wsdl/MOA-SPSS-1.5.2.wsdl b/spss/server/serverws/resources/wsdl/MOA-SPSS-2.0.0.wsdl index 4f9deee38..4f9deee38 100644 --- a/spss/server/serverws/resources/wsdl/MOA-SPSS-1.5.2.wsdl +++ b/spss/server/serverws/resources/wsdl/MOA-SPSS-2.0.0.wsdl diff --git a/spss/server/serverws/resources/wsdl/MOA-SPSS-1.5.2.xsd b/spss/server/serverws/resources/wsdl/MOA-SPSS-2.0.0.xsd index cc0a7c882..cc0a7c882 100644 --- a/spss/server/serverws/resources/wsdl/MOA-SPSS-1.5.2.xsd +++ b/spss/server/serverws/resources/wsdl/MOA-SPSS-2.0.0.xsd diff --git a/spss/server/serverws/src/main/webapp/WEB-INF/server-config.wsdd b/spss/server/serverws/src/main/webapp/WEB-INF/server-config.wsdd index 9ff243e5c..43e748734 100644 --- a/spss/server/serverws/src/main/webapp/WEB-INF/server-config.wsdd +++ b/spss/server/serverws/src/main/webapp/WEB-INF/server-config.wsdd @@ -16,7 +16,7 @@ <namespace>http://reference.e-government.gv.at/namespace/moa/20020822#</namespace>
<parameter name="allowedMethods" value="CreateCMSSignatureRequest CreateXMLSignatureRequest"/>
<parameter name="className" value="at.gv.egovernment.moa.spss.server.service.SignatureCreationService"/>
- <wsdlFile>webapps/moa-spss/resources/schemas/MOA-SPSS-2.0.0.wsdl</wsdlFile>
+ <wsdlFile>/resources/schemas/MOA-SPSS-2.0.0.wsdl</wsdlFile>
<requestFlow>
<handler type="MOAHandler"/>
@@ -30,7 +30,7 @@ <namespace>http://reference.e-government.gv.at/namespace/moa/20020822#</namespace>
<parameter name="allowedMethods" value="VerifyCMSSignatureRequest VerifyXMLSignatureRequest"/>
<parameter name="className" value="at.gv.egovernment.moa.spss.server.service.SignatureVerificationService"/>
- <wsdlFile>webapps/moa-spss/resources/schemas/MOA-SPSS-2.0.0.wsdl</wsdlFile>
+ <wsdlFile>/resources/schemas/MOA-SPSS-2.0.0.wsdl</wsdlFile>
<requestFlow>
<handler type="MOAHandler"/>
</requestFlow>
diff --git a/spss/server/tools/.gitignore b/spss/server/tools/.gitignore new file mode 100644 index 000000000..ea8c4bf7f --- /dev/null +++ b/spss/server/tools/.gitignore @@ -0,0 +1 @@ +/target |