Version update to 2.0.0

17 files changed, 57 insertions, 61 deletions

diff --git a/common/pom.xml b/common/pom.xml
index 054eb4843..913a3783a 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -2,12 +2,12 @@
   <parent>
     <groupId>MOA</groupId>
     <artifactId>MOA</artifactId>
-    <version>1.5.2</version>
+    <version>2.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>MOA</groupId>
   <artifactId>moa-common</artifactId>
-  <version>1.5.2</version>
+  <version>2.0.0</version>
   <packaging>jar</packaging>
   <name>MOA common library</name>
 
diff --git a/id/server/auth/.settings/org.eclipse.wst.common.component b/id/server/auth/.settings/org.eclipse.wst.common.component
index 9725f5b61..6299c8d17 100644
--- a/id/server/auth/.settings/org.eclipse.wst.common.component
+++ b/id/server/auth/.settings/org.eclipse.wst.common.component
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
   <wb-module deploy-name="moa-id-auth">
-        <dependent-module archiveName="moa-spss-lib-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="moa-common-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <dependent-module archiveName="moa-id-lib-1.9.90-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
             <dependency-type>uses</dependency-type>
         </dependent-module>
diff --git a/id/server/auth/src/main/webapp/iframeHandyBKU.html b/id/server/auth/src/main/webapp/iframeHandyBKU.html
index 0f6e1e282..b5936679f 100644
--- a/id/server/auth/src/main/webapp/iframeHandyBKU.html
+++ b/id/server/auth/src/main/webapp/iframeHandyBKU.html
@@ -8,11 +8,11 @@
     	<script type="text/javascript">

 			// [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an

            	// z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at

-			var MOA_ID_STARTAUTHENTICATION = "[MOA_ID_STARTAUTHENTICATION]";

+			var MOA_ID_STARTAUTHENTICATION = "https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample";

 				

 			// [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Handy Signatur an -->

 			<!-- z.B.: value="https://yoururl.at/moa-id-auth/template_handyBKU.html"-->

-			var URL_TO_HANDYSIGNATUR_TEMPLATE = "[URL_TO_HANDYSIGNATUR_TEMPLATE]";

+			var URL_TO_HANDYSIGNATUR_TEMPLATE = "https://localhost:8443/moa-id-auth/template_handyBKU.html";

 				

 				

 			window.onload=function() {

@@ -49,7 +49,8 @@
 	    Bitte warten...

 		<form name="moaidform" method="post" id="moaidform">

 			<input type="hidden" name="Template" id="Template">

-			<input type="hidden" name="bkuURI" value="https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx">

+			<!--  <input type="hidden" name="bkuURI" value="https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx"> -->

+			 <input type="hidden" name="bkuURI" value="https://test1.a-trust.at/https-security-layer-request/default.aspx"> 

 			<input type="hidden" name="useMandate" id="useMandate">

 		</form>		

 		<hr>

diff --git a/id/server/auth/src/main/webapp/iframeOnlineBKU.html b/id/server/auth/src/main/webapp/iframeOnlineBKU.html
index 3ff0dac89..0b6e7d71f 100644
--- a/id/server/auth/src/main/webapp/iframeOnlineBKU.html
+++ b/id/server/auth/src/main/webapp/iframeOnlineBKU.html
@@ -8,16 +8,19 @@
 	    <script type="text/javascript">

 			// [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an

             // z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at

-			var MOA_ID_STARTAUTHENTICATION = "[MOA_ID_STARTAUTHENTICATION]";

+			//var MOA_ID_STARTAUTHENTICATION = "https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample?locale=de&test=123";

+			// OA URL encoded (um parameter in OA URL zu uebergeben)

+			var MOA_ID_STARTAUTHENTICATION = "https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https%3A%2F%2Flocalhost%3A8443%2FTestMOAID_OA%2FLoginServletExample%3Flocale%3Dde%26test%3D123";

+			

 			

 			// [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die Online BKU an

 			// z.B.: "https://yoururl.at/moa-id-auth/template_onlineBKU.html"

-			var URL_TO_ONLINEBKU_TEMPLATE = "[URL_TO_ONLINEBKU_TEMPLATE]";

+			var URL_TO_ONLINEBKU_TEMPLATE = "https://localhost:8443/moa-id-auth/template_onlineBKU.html";

 			

 			// [MUSS] Geben Sie hier die URL zur Online BKU an

 			// z.B.: value="https://yoururl.at/bkuonline/https-security-layer-request"

 			// Hinweis: Diese URL muss auch bei den vertrauenswürdigen BKUs in der MOA-ID Konfiguration angegeben werden (siehe Element MOA-IDConfiguration/TrustedBKUs/BKUURL)

-			var URL_TO_ONLINEBKU = "[URL_TO_ONLINEBKU]";

+			var URL_TO_ONLINEBKU = "https://localhost:8444/bkuonline/https-security-layer-request";

 				

 			window.onload=function() {

 				document.getElementById('moaidform').action = MOA_ID_STARTAUTHENTICATION;

diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html
index 83b4ee418..03123c2a7 100644
--- a/id/server/auth/src/main/webapp/index.html
+++ b/id/server/auth/src/main/webapp/index.html
@@ -11,11 +11,11 @@
         <script type="text/javascript">

 			// [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an

             // z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at

-			var MOA_ID_STARTAUTHENTICATION = "[MOA_ID_STARTAUTHENTICATION]";			

+			var MOA_ID_STARTAUTHENTICATION = "https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample";	

 			

 			// [MUSS] Geben Sie hier die URL zum MOA-ID Template fuer die lokale BKU an

             // z.B.: https://yoururl.at/moa-id-auth/template_localBKU.html

-			var URL_TO_LOKALBKU_TEMPLATE = "[URL_TO_LOKALBKU_TEMPLATE]";

+			var URL_TO_LOKALBKU_TEMPLATE = "https://localhost:8443/moa-id-auth/template_localBKU.html";

 			

 			

 			window.onload=function() {

@@ -109,7 +109,7 @@
         		var parent = el.parentNode;

 

 				var iFrameURL = "iframeOnlineBKU.html" + "?";

-				iFrameURL += "use=" + document.getElementById("useMandate").value + "&";

+				iFrameURL += "useMandate=" + document.getElementById("useMandate").value + "&";

 				iFrameURL += "ccc=" + ccc;

 

 				var iframe = document.createElement("iframe");

@@ -156,7 +156,7 @@
                 	        <!-- Block "KARTE": Anmeldung mit lokaler BKU *ohne* Vollmacht (No-Script Variante) -->

                     	    <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an (inkl. Template-URL, bkuURI und useMandate Parameter!) -->			         

                         	<!-- z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at&Template=https://yoururl.at/moa-id-auth/template_localBKU.html&bkuURI=https://127.0.0.1:3496/https-security-layer-request&useMandate=false -->

-			                <a href="[MOA_ID_STARTAUTHENTICATION]&Template=[URL_TO_LOKALBKU_TEMPLATE]&bkuURI=https://127.0.0.1:3496/https-security-layer-request&useMandate=false">					

+			                <a href="https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample&Template=https://localhost:8443/moa-id-auth/template_localBKU.html&bkuURI=https://127.0.0.1:3496/https-security-layer-request&useMandate=false">					

     	                    	<div id="bkukarte" class="hell">

         	                		<button name="bkuButton" type="button">KARTE</button>

 	        	                </div>

@@ -166,7 +166,7 @@
                     	    <!-- Block "KARTE+Vollmacht": Anmeldung mit lokaler BKU *mit* Vollmacht (No-Script Variante) -->

                         	<!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an (inkl. Template-URL, bkuURI und useMandate Parameter!) -->

 		                    <!-- z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at&Template=https://yoururl.at/moa-id-auth/template_localBKU.html&bkuURI=https://127.0.0.1:3496/https-security-layer-request&useMandate=true -->

-		                    <!-- <a href="[MOA_ID_STARTAUTHENTICATION]&Template=[URL_TO_LOKALBKU_TEMPLATE]&bkuURI=https://127.0.0.1:3496/https-security-layer-request&useMandate=true">					

+		                    <!-- <a href="https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample&Template=https://localhost:8443/moa-id-auth/template_localBKU.html&bkuURI=https://127.0.0.1:3496/https-security-layer-request&useMandate=true">					

         	                	<div id="bkukarte" class="hell">

             	            		<button name="bkuButton" type="button">KARTE+<br>Vollmacht</button>

 	            	            </div>

@@ -176,7 +176,7 @@
 							<!-- Block "HANDY": Anmeldung mit Handysignatur *ohne* Vollmacht (No-Script Variante) -->

 		                    <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an (inkl. Template-URL, bkuURI und useMandate Parameter!) -->

    		                    <!-- z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at&Template=https://yoururl.at/moa-id-auth/template_handyBKU.html&bkuURI=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx&useMandate=false -->

-							<a href="[MOA_ID_STARTAUTHENTICATION]&Template=[URL_TO_HANDYSIGNATUR_TEMPLATE]&bkuURI=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx&useMandate=false">

+							<a href="https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample&Template=https://localhost:8443/moa-id-auth/template_localBKU.html&bkuURI=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx&useMandate=false">

 								<div id="bkuhandy" class="hell">

 		                          	<button name="bkuButton" type="button">HANDY</button>

 								</div>

@@ -185,7 +185,7 @@
 	                        <!-- Block "HANDY+Vollnacht": Anmeldung mit Handysignatur *mit* Vollmacht (No-Script Variante) -->

 		                    <!-- [MUSS] Geben Sie hier die URL zum Aufruf von MOA-ID an (inkl. Template-URL, bkuURI und useMandate Parameter!) -->

    	    	                <!-- z.B.: https://yoururl.at/moa-id-auth/StartAuthentication?Target=IT&OA=https://youronlineapplication.at&Template=https://yoururl.at/moa-id-auth/template_handyBKU.html&bkuURI=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx&useMandate=true -->

-							<!-- <a href="[MOA_ID_STARTAUTHENTICATION]&Template=[URL_TO_HANDYSIGNATUR_TEMPLATE]&bkuURI=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx&useMandate=true">

+							<!-- <a href="https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample&Template=https://localhost:8443/moa-id-auth/template_localBKU.html&bkuURI=https://www.handy-signatur.at/mobile/https-security-layer-request/default.aspx&useMandate=true">

 								<div id="bkuhandy" class="hell">

 		                          	<button name="bkuButton" type="button">HANDY</button>

 								</div>

@@ -202,7 +202,7 @@
     	            	    </div>

         	                <div id="stork" class="hell" align="center"> 

                            		<p>

-            	                	<form name="storkForm" method="POST" action="[MOA_ID_STARTAUTHENTICATION]&Template=[URL_TO_LOKALBKU_TEMPLATE]&bkuURI=https://127.0.0.1:3496/https-security-layer-request">

+            	                	<form name="storkForm" method="POST" action="https://localhost:8443/moa-id-auth/StartAuthentication?Target=ZU&OA=https://localhost:8443/TestMOAID_OA/LoginServletExample&Template=https://localhost:8443/moa-id-auth/template_localBKU.html&bkuURI=https://127.0.0.1:3496/https-security-layer-request">

        	    	                		<select name="CCC" size="1" style="width:120px">

            		                			<option value="BE">België/Belgique</option>

 											<option value="EE">Eesti</option>

@@ -224,24 +224,22 @@
 							

                    		</noscript>

                     <script>

-                    	<!-- [OPTIONAL] Um die Anmeldung mit Vollmachten auszublenden, kommentieren Sie folgende fünf Zeilen aus -->

-						document.write("<div id=\"mandate\">");

-                    		document.write("<input tabindex=\"1\" type=\"checkbox\" name=\"Mandate\" style=\"vertical-align: middle; margin-right: 5px;\" id=\"mandateCheckBox\">");

-								document.write("<label>in Vertretung anmelden</label>");

-                      	document.write(" <a href=\"info_mandates.html\" target=\"_blank\" class=\"infobutton\" style=\"color:#FFF\">i</a>");

-                    	document.write("</div> ");

-                    

-                    	<!-- [OPTIONAL] Um die Online BKU auszublenden, kommentieren sie folgende drei Zeilen aus aus -->

+						<!-- [OPTIONAL] Um die Online BKU auszublenden, kommentieren sie folgende drei Zeilen aus aus -->

                         document.write("<div id=\"bkukarte\" class=\"hell\">");     

-                            document.write("<button name=\"bkuButton\" type=\"button\" onClick=\"bkuOnlineClicked();\" tabindex=\"2\">KARTE</button>");

+                            document.write("<button name=\"bkuButton\" type=\"button\" onClick=\"bkuOnlineClicked();\">KARTE</button>");

                         document.write("</div>");

 						

 						<!-- [OPTIONAL] Um die Handysignatur auszublenden, kommentieren sie folgende drei Zeilen aus aus -->

                         document.write("<div id=\"bkuhandy\" class=\"hell\">");

-                            document.write("<button name=\"bkuButton\" type=\"button\" onClick=\"bkuHandyClicked();\" tabindex=\"3\">HANDY</button>");

+                            document.write("<button name=\"bkuButton\" type=\"button\" onClick=\"bkuHandyClicked();\">HANDY</button>");

                         document.write("</div>");

                         

-                       

+                        <!-- [OPTIONAL] Um die Anmeldung mit Vollmachten auszublenden, kommentieren Sie folgende fünf Zeilen aus -->

+						document.write("<div id=\"mandate\">");

+                        	document.write("<input type=\"checkbox\" name=\"Mandate\" style=\"vertical-align: middle; margin-right: 5px;\" id=\"mandateCheckBox\">");

+								document.write("<label>in Vertretung anmelden</label>");

+                          document.write(" <a href=\"info_mandates.html\" target=\"_blank\" class=\"infobutton\" style=\"color:#FFF\">i</a>");

+                        document.write("</div> ");

 						

                         <!-- [OPTIONAL] Um die Anmeldung von ausländischen Identitäten auszublenden, kommentieren Sie folgende Zeilen aus -->

 						document.write("<div id=\"leftcontent\" style=\"margin-bottom:10px\">");

@@ -274,7 +272,7 @@
 

                     

                     

-s

+

                     <div id="localBKU" style="display:none" class="hell">

                         <hr>

                         <form method="post" id="moaidform">

diff --git a/pom.xml b/pom.xml
index b1f0faf97..4e8c21a13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>MOA</groupId>

     <artifactId>MOA</artifactId>

     <packaging>pom</packaging>

-    <version>1.5.2</version>

+    <version>2.0.0</version>

     <name>MOA</name>

 

     <properties>

@@ -180,7 +180,7 @@
             <dependency>

                 <groupId>MOA</groupId>

                 <artifactId>moa-common</artifactId>

-                <version>1.5.2</version>

+                <version>2.0.0</version>

                 <scope>compile</scope>

             </dependency>

             <dependency>

@@ -192,20 +192,20 @@
             <dependency>

                 <groupId>MOA.spss.server</groupId>

                 <artifactId>moa-spss-lib</artifactId>

-                <version>1.5.2</version>

+                <version>2.0.0</version>

                 <scope>compile</scope>

             </dependency>

             <dependency>

                 <groupId>MOA</groupId>

                 <artifactId>moa-common</artifactId>

-                <version>1.5.2</version>

+                <version>2.0.0</version>

                 <type>test-jar</type>

                 <scope>test</scope>

             </dependency>

             <dependency>

                 <groupId>MOA.spss.server</groupId>

                 <artifactId>moa-spss-tools</artifactId>

-                <version>1.5</version>

+                <version>2.0.0</version>

                 <scope>test</scope>

              </dependency>

             <dependency>

diff --git a/spss/handbook/clients/api/pom.xml b/spss/handbook/clients/api/pom.xml
index 5a978964b..442d4fdb7 100644
--- a/spss/handbook/clients/api/pom.xml
+++ b/spss/handbook/clients/api/pom.xml
@@ -2,14 +2,14 @@
 	<parent>

 		<groupId>MOA.spss.handbook.clients</groupId>

 		<artifactId>moa-spss-handbook-clients</artifactId>

-		<version>1.5</version>

+		<version>2.0</version>

 	</parent>

 	

 	<modelVersion>4.0.0</modelVersion>

 	<groupId>MOA.spss.handbook</groupId>

 	<artifactId>moa-spss-handbook-apiClient</artifactId>

 	<packaging>jar</packaging>

-	<version>1.5</version>

+	<version>2.0</version>

 	<name>MOA SP/SS Handbook API Client</name>

 

 	<properties>

diff --git a/spss/handbook/clients/pom.xml b/spss/handbook/clients/pom.xml
index 5a4ab81c8..3b3bfd6b2 100644
--- a/spss/handbook/clients/pom.xml
+++ b/spss/handbook/clients/pom.xml
@@ -3,14 +3,14 @@
   <parent>

     <groupId>MOA.spss.handbook</groupId>

     <artifactId>moa-spss-handbook</artifactId>

-    <version>1.5</version>

+    <version>2.0</version>

   </parent>

 

   <modelVersion>4.0.0</modelVersion>

   <groupId>MOA.spss.handbook.clients</groupId>

   <artifactId>moa-spss-handbook-clients</artifactId>

   <packaging>pom</packaging>

-  <version>1.5</version>

+  <version>2.0</version>

   <name>MOA SP/SS Handbook Clients</name>

 

   <modules>

diff --git a/spss/handbook/clients/referencedData/pom.xml b/spss/handbook/clients/referencedData/pom.xml
index 9a8a3b68e..8e0378bd6 100644
--- a/spss/handbook/clients/referencedData/pom.xml
+++ b/spss/handbook/clients/referencedData/pom.xml
@@ -3,14 +3,14 @@
   <parent>

     <groupId>MOA.spss.handbook.clients</groupId>

     <artifactId>moa-spss-handbook-clients</artifactId>

-    <version>1.5</version>

+    <version>2.0</version>

   </parent>

 

   <modelVersion>4.0.0</modelVersion>

   <groupId>MOA.spss.handbook</groupId>

   <artifactId>moa-spss-handbook-referencedData</artifactId>

   <packaging>war</packaging>

-  <version>1.5</version>

+  <version>2.0</version>

   <name>MOA SP/SS Handbook Referenced Data</name>

 

   <properties>

diff --git a/spss/handbook/clients/webservice/pom.xml b/spss/handbook/clients/webservice/pom.xml
index 4221e6cc1..bc1859408 100644
--- a/spss/handbook/clients/webservice/pom.xml
+++ b/spss/handbook/clients/webservice/pom.xml
@@ -2,14 +2,14 @@
 	<parent>

 		<groupId>MOA.spss.handbook.clients</groupId>

 		<artifactId>moa-spss-handbook-clients</artifactId>

-		<version>1.5</version>

+		<version>2.0</version>

 	</parent>

 	

 	<modelVersion>4.0.0</modelVersion>

 	<groupId>MOA.spss.handbook.clients</groupId>

 	<artifactId>moa-spss-handbook-webserviceClient</artifactId>

 	<packaging>jar</packaging>

-	<version>1.5</version>

+	<version>2.0</version>

 	<name>MOA SP/SS Handbook WebService Client</name>

 	

 	<properties>

diff --git a/spss/handbook/pom.xml b/spss/handbook/pom.xml
index 9caf5c181..5e476d5c1 100644
--- a/spss/handbook/pom.xml
+++ b/spss/handbook/pom.xml
@@ -3,14 +3,14 @@
   <parent>

     <groupId>MOA</groupId>

     <artifactId>spss</artifactId>

-    <version>1.5.x</version>

+    <version>2.0.x</version>

   </parent>

 

   <modelVersion>4.0.0</modelVersion>

   <groupId>MOA.spss.handbook</groupId>

   <artifactId>moa-spss-handbook</artifactId>

   <packaging>pom</packaging>

-  <version>1.5</version>

+  <version>2.0</version>

   <name>MOA SP/SS Handbook</name>

 

   <modules>

diff --git a/spss/pom.xml b/spss/pom.xml
index 936c800e4..799286889 100644
--- a/spss/pom.xml
+++ b/spss/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <groupId>MOA</groupId>
         <artifactId>MOA</artifactId>
-        <version>1.5.2</version>
+        <version>2.0.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>MOA</groupId>
     <artifactId>spss</artifactId>
     <packaging>pom</packaging>
-    <version>1.5.x</version>
+    <version>2.0.x</version>
     <name>MOA SP/SS</name>
 
     <properties>
diff --git a/spss/server/pom.xml b/spss/server/pom.xml
index a78496017..b5e1b32c1 100644
--- a/spss/server/pom.xml
+++ b/spss/server/pom.xml
@@ -3,14 +3,14 @@
     <parent>

         <groupId>MOA</groupId>

         <artifactId>spss</artifactId>

-        <version>1.5.x</version>

+        <version>2.0.x</version>

     </parent>

 

     <modelVersion>4.0.0</modelVersion>

     <groupId>MOA.spss</groupId>

     <artifactId>moa-spss</artifactId>

     <packaging>pom</packaging>

-    <version>1.5.x</version>

+    <version>2.0.x</version>

     <name>MOA SP/SS Server</name>

 

     <modules>

diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index 2a6fd382f..1c756d4d4 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -2,14 +2,14 @@
 	<parent>

 		<groupId>MOA.spss</groupId>

 		<artifactId>moa-spss</artifactId>

-		<version>1.5.x</version>

+		<version>2.0.x</version>

 	</parent>

 

 	<modelVersion>4.0.0</modelVersion>

 	<groupId>MOA.spss.server</groupId>

 	<artifactId>moa-spss-lib</artifactId>

 	<packaging>jar</packaging>

-	<version>1.5.2</version>

+	<version>2.0.0</version>

 	<name>MOA SP/SS API</name>

 

 	<properties>

diff --git a/spss/server/serverws/.settings/org.eclipse.wst.common.component b/spss/server/serverws/.settings/org.eclipse.wst.common.component
index 35e6b5187..a6f423da2 100644
--- a/spss/server/serverws/.settings/org.eclipse.wst.common.component
+++ b/spss/server/serverws/.settings/org.eclipse.wst.common.component
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">

   <wb-module deploy-name="moa-spss-ws">

-        <dependent-module archiveName="moa-spss-lib-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">

+        <dependent-module archiveName="moa-spss-lib-2.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">

             <dependency-type>uses</dependency-type>

         </dependent-module>

-        <dependent-module archiveName="moa-common-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">

+        <dependent-module archiveName="moa-common-2.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">

             <dependency-type>uses</dependency-type>

         </dependent-module>

     <property name="context-root" value="moa-spss-ws"/>

diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml
index 4372c76d0..b8a04eba4 100644
--- a/spss/server/serverws/pom.xml
+++ b/spss/server/serverws/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <groupId>MOA.spss</groupId>
         <artifactId>moa-spss</artifactId>
-        <version>1.5.x</version>
+        <version>2.0.x</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>MOA.spss.server</groupId>
     <artifactId>moa-spss-ws</artifactId>
     <packaging>war</packaging>
-    <version>1.5.2</version>
+    <version>2.0.0</version>
     <name>MOA SP/SS WebService</name>
 
     <properties>
diff --git a/spss/server/tools/pom.xml b/spss/server/tools/pom.xml
index b276e5441..48e0a998c 100644
--- a/spss/server/tools/pom.xml
+++ b/spss/server/tools/pom.xml
@@ -2,14 +2,14 @@
   <parent>
     <groupId>MOA.spss</groupId>
     <artifactId>moa-spss</artifactId>
-    <version>1.5.x</version>
+    <version>2.0.x</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>MOA.spss.server</groupId>
   <artifactId>moa-spss-tools</artifactId>
   <packaging>jar</packaging>
-  <version>1.5</version>
+  <version>2.0.0</version>
   <name>MOA SP/SS Tools</name>
 
   <properties>