From ed19c3b21b338e05efae1067216a5bbb7d60efe4 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Fri, 17 Jan 2014 16:09:46 +0100
Subject: changing chars to reflect utf8

---
 spss/server/serverws/moa-spss-ws.iml | 63 ++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 spss/server/serverws/moa-spss-ws.iml

(limited to 'spss/server/serverws')

diff --git a/spss/server/serverws/moa-spss-ws.iml b/spss/server/serverws/moa-spss-ws.iml
new file mode 100644
index 000000000..6617a0a9c
--- /dev/null
+++ b/spss/server/serverws/moa-spss-ws.iml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="web" name="Web">
+      <configuration>
+        <descriptors>
+          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
+        </descriptors>
+        <webroots>
+          <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
+          <root url="file://$MODULE_DIR$/resources/wsdl" relative="resources/schemas" />
+          <root url="file://$MODULE_DIR$/../../handbook" relative="WEB-INF" />
+        </webroots>
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="moa-spss-lib" />
+    <orderEntry type="library" name="Maven: axis:axis:1.0_IAIK" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.axis:axis-saaj:1.4" level="project" />
+    <orderEntry type="library" name="Maven: axis:axis-wsdl4j:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-discovery:commons-discovery:0.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: postgresql:postgresql:7.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xalan-bin-dist:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xml-apis:xml-apis:1.3.04" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xerces:xercesImpl:2.9.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xalan-bin-dist:xml-apis:2.7.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xalan-bin-dist:serializer:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_moa:1.5" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_ixsil:1.2.2.5" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: iaik.prod:iaik_jce_full:5.101" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: iaik.prod:iaik_ecc:2.19" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_cms:4.1_MOA" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: iaik.prod:iaik_Pkcs11Provider:1.2.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: iaik.prod:iaik_Pkcs11Wrapper:1.2.17" level="project" />
+    <orderEntry type="module" module-name="moa-common" />
+    <orderEntry type="library" name="Maven: jaxen:jaxen:1.0-FCS" level="project" />
+    <orderEntry type="library" name="Maven: saxpath:saxpath:1.0-FCS" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_tsl:0.0.2-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_util:0.23" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_xsect:1.1709142" level="project" />
+    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.5" level="project" />
+    <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.7.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_jsse:4.4" level="project" />
+  </component>
+</module>
+
-- 
cgit v1.2.3


From 791615f1f887f81ade19a374e2552f3cb1be89ab Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Mon, 3 Feb 2014 19:04:01 +0100
Subject: merging again

---
 spss/server/serverws/pom.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'spss/server/serverws')

diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml
index b8a04eba4..4dc5319ec 100644
--- a/spss/server/serverws/pom.xml
+++ b/spss/server/serverws/pom.xml
@@ -17,6 +17,20 @@
         <repositoryPath>${basedir}/../../../repository</repositoryPath>
     </properties>
 
+
+    <repositories>
+        <repository>
+            <id>JBoss IAIK</id>
+            <url>http://nexus.iaik.tugraz.at/nexus/content/repositories/nexus/</url>
+            <!-- <releases><enabled>true</enabled></releases> -->
+        </repository>
+        <repository>
+            <id>IAIK libs</id>
+            <url>http://nexus.iaik.tugraz.at/nexus/content/repositories/iaik/</url>
+            <!-- <releases><enabled>true</enabled></releases> -->
+        </repository>
+    </repositories>
+
     <build>
         <plugins>
             <plugin>
-- 
cgit v1.2.3


From 65fb688c9323696fcc12e1c049a2b6a75d6ff1e5 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Tue, 4 Feb 2014 17:25:09 +0100
Subject: merging with other code

---
 spss/server/serverws/moa-spss-ws.iml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spss/server/serverws')

diff --git a/spss/server/serverws/moa-spss-ws.iml b/spss/server/serverws/moa-spss-ws.iml
index b90669e54..80378b441 100644
--- a/spss/server/serverws/moa-spss-ws.iml
+++ b/spss/server/serverws/moa-spss-ws.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="web" name="Web">
       <configuration>
-- 
cgit v1.2.3


From c3745720650268de1f1b06e2b3dc891122ace9bb Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Wed, 5 Feb 2014 12:38:45 +0100
Subject: changing some stork parameters; adjusting spss maven config

---
 spss/server/serverws/moa-spss-ws.iml | 52 +++++++++++++++++++++++++++++++++---
 1 file changed, 49 insertions(+), 3 deletions(-)

(limited to 'spss/server/serverws')

diff --git a/spss/server/serverws/moa-spss-ws.iml b/spss/server/serverws/moa-spss-ws.iml
index 80378b441..45ebf8969 100644
--- a/spss/server/serverws/moa-spss-ws.iml
+++ b/spss/server/serverws/moa-spss-ws.iml
@@ -14,14 +14,60 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../target/classes" />
-    <output-test url="file://$MODULE_DIR$/../../target/test-classes" />
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="moa-spss-lib" />
+    <orderEntry type="library" name="Maven: axis:axis:1.0_IAIK" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.axis:axis-saaj:1.4" level="project" />
+    <orderEntry type="library" name="Maven: axis:axis-wsdl4j:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-discovery:commons-discovery:0.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: postgresql:postgresql:7.2" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xalan-bin-dist:xalan:2.7.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xml-apis:xml-apis:1.3.04" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xerces:xercesImpl:2.9.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xalan-bin-dist:xml-apis:2.7.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xalan-bin-dist:serializer:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_moa:1.5" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_ixsil:1.2.2.5" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: iaik.prod:iaik_jce_full:5.101" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: iaik.prod:iaik_ecc:2.19" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_cms:4.1_MOA" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: iaik.prod:iaik_Pkcs11Provider:1.2.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: iaik.prod:iaik_Pkcs11Wrapper:1.2.17" level="project" />
+    <orderEntry type="module" module-name="moa-common" />
+    <orderEntry type="library" name="Maven: jaxen:jaxen:1.0-FCS" level="project" />
+    <orderEntry type="library" name="Maven: saxpath:saxpath:1.0-FCS" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_tsl:1.0" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_xsect_eval:1.1709142" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_ecc_signed:2.19" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_jce_eval_signed:3.181" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_pki_module:1.0" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_javax_crypto:1.0" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_util:0.23" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_jsse:4.4" level="project" />
+    <orderEntry type="library" name="Maven: iaik:iaik_ssl:4.4" level="project" />
+    <orderEntry type="library" name="Maven: iaik:w3c_http:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.7.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.5" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_util:0.23" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_xsect:1.1709142" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_jsse:4.4" level="project" />
   </component>
 </module>
 
-- 
cgit v1.2.3


From 4c104d5d8349195007d19a13ed54426f9fe7b49a Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Thu, 6 Feb 2014 18:29:23 +0100
Subject: iml

---
 spss/server/serverws/moa-spss-ws.iml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'spss/server/serverws')

diff --git a/spss/server/serverws/moa-spss-ws.iml b/spss/server/serverws/moa-spss-ws.iml
index 45ebf8969..60f6d1803 100644
--- a/spss/server/serverws/moa-spss-ws.iml
+++ b/spss/server/serverws/moa-spss-ws.iml
@@ -15,8 +15,8 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <output url="file://$MODULE_DIR$/../../target/classes" />
+    <output-test url="file://$MODULE_DIR$/../../target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-- 
cgit v1.2.3


From cd0887a43b0b4350e736433c2b513901a2151601 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Tue, 4 Mar 2014 17:51:06 +0100
Subject: after merge, having problem

---
 spss/server/serverws/moa-spss-ws.iml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'spss/server/serverws')

diff --git a/spss/server/serverws/moa-spss-ws.iml b/spss/server/serverws/moa-spss-ws.iml
index 60f6d1803..45ebf8969 100644
--- a/spss/server/serverws/moa-spss-ws.iml
+++ b/spss/server/serverws/moa-spss-ws.iml
@@ -15,8 +15,8 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/../../target/classes" />
-    <output-test url="file://$MODULE_DIR$/../../target/test-classes" />
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-- 
cgit v1.2.3


From 7f1c5affaa9358bef6995371dc08c8f0c981a849 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Tue, 4 Mar 2014 20:06:41 +0100
Subject: resolving problems related to commons and slf4j libraries

---
 spss/server/serverws/moa-spss-ws.iml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'spss/server/serverws')

diff --git a/spss/server/serverws/moa-spss-ws.iml b/spss/server/serverws/moa-spss-ws.iml
index 45ebf8969..ae8f03a70 100644
--- a/spss/server/serverws/moa-spss-ws.iml
+++ b/spss/server/serverws/moa-spss-ws.iml
@@ -51,6 +51,11 @@
     <orderEntry type="library" name="Maven: jaxen:jaxen:1.0-FCS" level="project" />
     <orderEntry type="library" name="Maven: saxpath:saxpath:1.0-FCS" level="project" />
     <orderEntry type="library" name="Maven: joda-time:joda-time:1.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.5" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.5" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.5" level="project" />
     <orderEntry type="library" name="Maven: iaik.prod:iaik_tsl:1.0" level="project" />
     <orderEntry type="library" name="Maven: iaik:iaik_xsect_eval:1.1709142" level="project" />
     <orderEntry type="library" name="Maven: iaik:iaik_ecc_signed:2.19" level="project" />
-- 
cgit v1.2.3


From eb32824288778c0fd427dbcbf826c8d9c16596b2 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Tue, 4 Mar 2014 20:26:15 +0100
Subject: after merge ap

---
 spss/server/serverws/moa-spss-ws.iml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'spss/server/serverws')

diff --git a/spss/server/serverws/moa-spss-ws.iml b/spss/server/serverws/moa-spss-ws.iml
index ae8f03a70..7943aa854 100644
--- a/spss/server/serverws/moa-spss-ws.iml
+++ b/spss/server/serverws/moa-spss-ws.iml
@@ -22,6 +22,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="moa-common" />
     <orderEntry type="module" module-name="moa-spss-lib" />
     <orderEntry type="library" name="Maven: axis:axis:1.0_IAIK" level="project" />
     <orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" />
-- 
cgit v1.2.3


From 458a579978fa4fd0718c754bb8b6ca41f82d8145 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Tue, 4 Mar 2014 20:33:36 +0100
Subject: after chaning

---
 spss/server/serverws/moa-spss-ws.iml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'spss/server/serverws')

diff --git a/spss/server/serverws/moa-spss-ws.iml b/spss/server/serverws/moa-spss-ws.iml
index 7943aa854..ae8f03a70 100644
--- a/spss/server/serverws/moa-spss-ws.iml
+++ b/spss/server/serverws/moa-spss-ws.iml
@@ -22,7 +22,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="moa-common" />
     <orderEntry type="module" module-name="moa-spss-lib" />
     <orderEntry type="library" name="Maven: axis:axis:1.0_IAIK" level="project" />
     <orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" />
-- 
cgit v1.2.3


From 19e164874ea92d51f9df12f56047d77db9683091 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Wed, 5 Mar 2014 20:57:05 +0100
Subject: storkid derivation pro country

---
 spss/server/serverws/moa-spss-ws.iml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'spss/server/serverws')

diff --git a/spss/server/serverws/moa-spss-ws.iml b/spss/server/serverws/moa-spss-ws.iml
index ae8f03a70..0714500d5 100644
--- a/spss/server/serverws/moa-spss-ws.iml
+++ b/spss/server/serverws/moa-spss-ws.iml
@@ -56,6 +56,7 @@
     <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.5" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.5" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.5" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:1.3.2" level="project" />
     <orderEntry type="library" name="Maven: iaik.prod:iaik_tsl:1.0" level="project" />
     <orderEntry type="library" name="Maven: iaik:iaik_xsect_eval:1.1709142" level="project" />
     <orderEntry type="library" name="Maven: iaik:iaik_ecc_signed:2.19" level="project" />
-- 
cgit v1.2.3