From 27be7994027944015c290e41e688e8723965bd48 Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 26 Aug 2009 11:00:54 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1139
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 spss/handbook/.settings/org.eclipse.jdt.core.prefs     |  8 ++++----
 spss/handbook/clients/referencedData/.project          |  5 -----
 .../.settings/org.eclipse.jdt.core.prefs               |  6 +++---
 .../moa/spss/server/invoke/DataObjectFactory.java      | 18 ++++++++++--------
 spss/server/serverws/.project                          |  5 -----
 5 files changed, 17 insertions(+), 25 deletions(-)

(limited to 'spss')

diff --git a/spss/handbook/.settings/org.eclipse.jdt.core.prefs b/spss/handbook/.settings/org.eclipse.jdt.core.prefs
index 93a06227e..af3df77d1 100644
--- a/spss/handbook/.settings/org.eclipse.jdt.core.prefs
+++ b/spss/handbook/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
-#Fri Aug 31 11:22:24 CEST 2007
+#Mon Aug 17 10:06:15 CEST 2009
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.3
-org.eclipse.jdt.core.compiler.compliance=1.3
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.source=1.4
diff --git a/spss/handbook/clients/referencedData/.project b/spss/handbook/clients/referencedData/.project
index e440a8d7a..23699368d 100644
--- a/spss/handbook/clients/referencedData/.project
+++ b/spss/handbook/clients/referencedData/.project
@@ -5,11 +5,6 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.wst.common.project.facet.core.builder</name>
 			<arguments>
diff --git a/spss/handbook/clients/referencedData/.settings/org.eclipse.jdt.core.prefs b/spss/handbook/clients/referencedData/.settings/org.eclipse.jdt.core.prefs
index fad2d811d..573b253b9 100644
--- a/spss/handbook/clients/referencedData/.settings/org.eclipse.jdt.core.prefs
+++ b/spss/handbook/clients/referencedData/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-#Tue Jul 07 16:07:24 CEST 2009
+#Mon Aug 17 10:06:17 CEST 2009
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
 org.eclipse.jdt.core.compiler.compliance=1.4
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.source=1.4
diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java
index fab8a6dd7..566784796 100644
--- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactory.java
@@ -210,19 +210,21 @@ public class DataObjectFactory {
 
     // For logging in Debug-Mode: Mask baseid with xxx
     String logString = new String(contentBytes);
+    // TODO use RegExp
     String startS = "<pr:Identification><pr:Value>";
     String endS = "</pr:Value><pr:Type>urn:publicid:gv.at:baseid</pr:Type>";
-    String logWithMaskedBaseid;
+    String logWithMaskedBaseid = logString;
     int start = logString.indexOf(startS);
     if (start > -1) {
-       int end = logString.indexOf(endS);    
-       logWithMaskedBaseid = logString.substring(0, start);
-       logWithMaskedBaseid += startS;
-       logWithMaskedBaseid += "xxxxxxxxxxxxxxxxxxxxxxxx";
-       logWithMaskedBaseid += logString.substring(end, logString.length());
+       int end = logString.indexOf(endS);
+       if (end > -1) {
+          logWithMaskedBaseid = logString.substring(0, start);
+          logWithMaskedBaseid += startS;
+          logWithMaskedBaseid += "xxxxxxxxxxxxxxxxxxxxxxxx";
+          logWithMaskedBaseid += logString.substring(end, logString.length());
+       }
     }
-    else
-       logWithMaskedBaseid = logString;
+    
     // try to parse validating
     Logger.trace(">>> parsing the following content: \n" + logWithMaskedBaseid);
     try {
diff --git a/spss/server/serverws/.project b/spss/server/serverws/.project
index a115e2dea..c7e484cc8 100644
--- a/spss/server/serverws/.project
+++ b/spss/server/serverws/.project
@@ -7,11 +7,6 @@
 		<project>moa-spss-lib</project>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
-- 
cgit v1.2.3