went back to axis 1.0 in SP/SS (dsig-Namespaceproblem on provided Stylesheets), fixed bug in transactions entity-cache

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1008 d688527b-c9ab-4aba-bd8d-4036d912da1d

8 files changed, 270 insertions, 235 deletions

diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index 2f4999825..514b43b82 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -1,220 +1,240 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-  <parent>

-    <groupId>MOA.spss</groupId>

-    <artifactId>moa-spss</artifactId>

-    <version>1.4.x</version>

-  </parent>

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

+	<parent>

+		<groupId>MOA.spss</groupId>

+		<artifactId>moa-spss</artifactId>

+		<version>1.4.x</version>

+	</parent>

 

-  <modelVersion>4.0.0</modelVersion>

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

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

-  <packaging>jar</packaging>

-  <version>1.4.2</version>

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

+	<modelVersion>4.0.0</modelVersion>

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

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

+	<packaging>jar</packaging>

+	<version>1.4.2beta1</version>

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

 

-  <properties>

-    <repositoryPath>${basedir}/../../../repository</repositoryPath>

-  </properties>

-  

-  <dependencies>

-    <dependency>

-      <groupId>axis</groupId>

-      <artifactId>axis</artifactId>

-    </dependency>

-    <dependency>

-      <groupId>commons-discovery</groupId>

-      <artifactId>commons-discovery</artifactId>

-    </dependency>

-    <dependency>

-      <groupId>commons-logging</groupId>

-      <artifactId>commons-logging</artifactId>

-    </dependency>

-    <dependency>

-      <groupId>javax.activation</groupId>

-      <artifactId>activation</artifactId>

-    </dependency>

-    <dependency>

-      <groupId>javax.mail</groupId>

-      <artifactId>mail</artifactId>

-    </dependency>

-    <dependency>

-      <groupId>junit</groupId>

-      <artifactId>junit</artifactId>

-    </dependency>

-    <dependency>

-      <groupId>log4j</groupId>

-      <artifactId>log4j</artifactId>

-    </dependency>

-    <dependency>

-      <groupId>postgresql</groupId>

-      <artifactId>postgresql</artifactId>

-    </dependency>

-    <dependency>

-      <groupId>javax.servlet</groupId>

-      <artifactId>servlet-api</artifactId>

-      <scope>provided</scope>

-    </dependency>

-    <dependency>

-      <groupId>xalan-bin-dist</groupId>

-      <artifactId>xalan</artifactId>

-      <scope>compile</scope>

-    </dependency>

-    <dependency>

-      <groupId>xerces</groupId>

-      <artifactId>xercesImpl</artifactId>

-    </dependency>

-    <dependency>

-      <groupId>xalan-bin-dist</groupId>

-      <artifactId>xml-apis</artifactId>

-    </dependency>

-    <dependency>

-      <groupId>xalan-bin-dist</groupId>

-      <artifactId>serializer</artifactId>

-    </dependency>

-    <dependency>

-      <groupId>iaik.prod</groupId>

-      <artifactId>iaik_moa</artifactId>

-    </dependency>

-    <dependency>

-      <groupId>iaik.prod</groupId>

-      <artifactId>iaik_ixsil</artifactId>

-    </dependency>

-    <dependency>

-      <groupId>iaik.prod</groupId>

-      <artifactId>iaik_jce_full</artifactId>

-      <scope>compile</scope>

-    </dependency>

-    <dependency>

-      <groupId>iaik.prod</groupId>

-      <artifactId>iaik_ecc</artifactId>

-      <scope>compile</scope>

-    </dependency>

-    <dependency>

-      <groupId>iaik.prod</groupId>

-      <artifactId>iaik_cms</artifactId>

-      <scope>runtime</scope>

-    </dependency>

-    <dependency>

-      <groupId>iaik.prod</groupId>

-      <artifactId>iaik_Pkcs11Provider</artifactId>

-      <scope>runtime</scope>

-    </dependency>

-    <dependency>

-      <groupId>iaik.prod</groupId>

-      <artifactId>iaik_Pkcs11Wrapper</artifactId>

-      <scope>runtime</scope>

-    </dependency>

-    <dependency>

-      <groupId>iaik.prod</groupId>

-      <artifactId>iaik_Pkcs11Wrapper</artifactId>

-      <classifier>win32</classifier>

-      <type>dll</type>

-      <scope>runtime</scope>

-      <optional>true</optional>

-    </dependency>

-    <dependency>

-      <groupId>MOA</groupId>

-      <artifactId>moa-common</artifactId>

-      <type>jar</type>

-    </dependency>

-    <dependency>

-      <groupId>MOA</groupId>

-      <artifactId>moa-common</artifactId>

-      <type>test-jar</type>

-      <scope>test</scope>

-    </dependency>

-    <dependency>

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

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

-      <scope>test</scope>

-    </dependency>

-  </dependencies>

-  <build>

-    <plugins>

-      <plugin>

-        <groupId>org.apache.maven.plugins</groupId>

-        <artifactId>maven-jar-plugin</artifactId>

-        <configuration>

-          <archive>

-            <addMavenDescriptor>false</addMavenDescriptor>

-          </archive>

-        </configuration>

-      </plugin>

-      <plugin>

-        <groupId>org.apache.maven.plugins</groupId>

-        <artifactId>maven-javadoc-plugin</artifactId>

-        <version>2.2</version>

-        <configuration>

-        	<quiet>true</quiet>

-        	<author>false</author>

-        	<version>false</version>

-        	<use>true</use>

-        	<excludePackageNames>at.gv.egovernment.moa.spss.server.*;at.gv.egovernment.moa.spss.api.impl.*;at.gv.egovernment.moa.spss.impl.*</excludePackageNames>

-        	<tags>

-        		<tag>

-        			<name>pre</name>

-        			<placement>a</placement>

-        			<head>Preconditions:</head>

-        		</tag>

-        		<tag>

-        			<name>post</name>

-        			<placement>a</placement>

-        			<head>Postconditions:</head>

-        		</tag>

-        	</tags>

-            <groups>

-	            <group>

-	              <title>API Factory and Services</title>

-	              <packages>at.gv.egovernment.moa.spss.api</packages>

-	            </group>

-	            <group>

-	              <title>Exceptions</title>

-	              <packages>at.gv.egovernment.moa.spss</packages>

-	            </group>

-	            <group>

-	              <title>API Objects for Signature Creation</title>

-	              <packages>at.gv.egovernment.moa.spss.api.xmlsign</packages>

-	            </group>

-	            <group>

-	              <title>API Objects for CMS Signature Verification</title>

-	              <packages>at.gv.egovernment.moa.spss.api.cmsverify</packages>

-	            </group>

-	            <group>

-	              <title>API Objects for XML Signature Verification</title>

-	              <packages>at.gv.egovernment.moa.spss.api.xmlverify</packages>

-	            </group>

-	            <group>

-	              <title>Common API Objects</title>

-	              <packages>at.gv.egovernment.moa.spss.api.common</packages>

-	            </group>

-	            <group>

-	              <title>Builders and Parsers to convert API Objects to and from XML</title>

-	              <packages>at.gv.egovernment.moa.spss.api.xmlbind</packages>

-	            </group>

-	            <group>

-	              <title>Utilities</title>

-	              <packages>at.gv.egovernment.moa.util</packages>

-	              <packages>at.gv.egovernment.moa.spss.util</packages>

-	            </group>

-	            <group>

-	              <title>Logging</title>

-	              <packages>at.gv.egovernment.moa.logging</packages>

-	            </group>

-	        </groups>

-	        <link>http://java.sun.com/j2se/1.4/docs/api/</link>

-        </configuration>

-    		<executions>

-    			<execution>

-    				<id>generate-javadoc</id>

-    				<phase>package</phase>

-    				<goals>

-    					<goal>jar</goal>

-    				</goals>

-    			</execution>

-    		</executions>

-      </plugin>

-    </plugins>

-  </build>

+	<properties>

+		<repositoryPath>${basedir}/../../../repository</repositoryPath>

+	</properties>

+

+	<dependencies>

+		<dependency>

+			<groupId>axis</groupId>

+			<artifactId>axis</artifactId>

+		</dependency>

+		<dependency>

+			<groupId>axis</groupId>

+			<artifactId>axis-jaxrpc</artifactId>

+		</dependency>

+		<dependency>

+			<groupId>axis</groupId>

+			<artifactId>axis-saaj</artifactId>

+		</dependency>

+		<dependency>

+			<groupId>axis</groupId>

+			<artifactId>axis-wsdl4j</artifactId>

+		</dependency>

+		<dependency>

+			<groupId>commons-discovery</groupId>

+			<artifactId>commons-discovery</artifactId>

+		</dependency>

+		<dependency>

+			<groupId>commons-logging</groupId>

+			<artifactId>commons-logging</artifactId>

+		</dependency>

+		<dependency>

+			<groupId>javax.activation</groupId>

+			<artifactId>activation</artifactId>

+		</dependency>

+		<dependency>

+			<groupId>javax.mail</groupId>

+			<artifactId>mail</artifactId>

+		</dependency>

+		<dependency>

+			<groupId>junit</groupId>

+			<artifactId>junit</artifactId>

+		</dependency>

+		<dependency>

+			<groupId>log4j</groupId>

+			<artifactId>log4j</artifactId>

+		</dependency>

+		<dependency>

+			<groupId>postgresql</groupId>

+			<artifactId>postgresql</artifactId>

+		</dependency>

+		<dependency>

+			<groupId>javax.servlet</groupId>

+			<artifactId>servlet-api</artifactId>

+			<scope>provided</scope>

+		</dependency>

+		<dependency>

+			<groupId>xalan-bin-dist</groupId>

+			<artifactId>xalan</artifactId>

+			<scope>compile</scope>

+		</dependency>

+		<dependency>

+			<groupId>xerces</groupId>

+			<artifactId>xercesImpl</artifactId>

+		</dependency>

+		<dependency>

+			<groupId>xalan-bin-dist</groupId>

+			<artifactId>xml-apis</artifactId>

+		</dependency>

+		<dependency>

+			<groupId>xalan-bin-dist</groupId>

+			<artifactId>serializer</artifactId>

+		</dependency>

+		<dependency>

+			<groupId>iaik.prod</groupId>

+			<artifactId>iaik_moa</artifactId>

+		</dependency>

+		<dependency>

+			<groupId>iaik.prod</groupId>

+			<artifactId>iaik_ixsil</artifactId>

+		</dependency>

+		<dependency>

+			<groupId>iaik.prod</groupId>

+			<artifactId>iaik_jce_full</artifactId>

+			<scope>compile</scope>

+		</dependency>

+		<dependency>

+			<groupId>iaik.prod</groupId>

+			<artifactId>iaik_ecc</artifactId>

+			<scope>compile</scope>

+		</dependency>

+		<dependency>

+			<groupId>iaik.prod</groupId>

+			<artifactId>iaik_cms</artifactId>

+			<scope>runtime</scope>

+		</dependency>

+		<dependency>

+			<groupId>iaik.prod</groupId>

+			<artifactId>iaik_Pkcs11Provider</artifactId>

+			<scope>runtime</scope>

+		</dependency>

+		<dependency>

+			<groupId>iaik.prod</groupId>

+			<artifactId>iaik_Pkcs11Wrapper</artifactId>

+			<scope>runtime</scope>

+		</dependency>

+		<dependency>

+			<groupId>iaik.prod</groupId>

+			<artifactId>iaik_Pkcs11Wrapper</artifactId>

+			<classifier>win32</classifier>

+			<type>dll</type>

+			<scope>runtime</scope>

+			<optional>true</optional>

+		</dependency>

+		<dependency>

+			<groupId>MOA</groupId>

+			<artifactId>moa-common</artifactId>

+			<type>jar</type>

+		</dependency>

+		

+		<dependency>

+			<groupId>MOA</groupId>

+			<artifactId>moa-common</artifactId>

+			<type>test-jar</type>

+			<scope>test</scope>

+		</dependency>

+		<dependency>

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

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

+			<scope>test</scope>

+		</dependency>

+	</dependencies>

+

+	<build>

+		<plugins>

+			<plugin>

+				<groupId>org.apache.maven.plugins</groupId>

+				<artifactId>maven-jar-plugin</artifactId>

+				<configuration>

+					<archive>

+						<addMavenDescriptor>false</addMavenDescriptor>

+					</archive>

+					<executions>

+						<execution>

+							<goals>

+								<goal>test-jar</goal>

+							</goals>

+						</execution>

+					</executions>

+				</configuration>

+			</plugin>

+			<plugin>

+				<groupId>org.apache.maven.plugins</groupId>

+				<artifactId>maven-javadoc-plugin</artifactId>

+				<version>2.2</version>

+				<configuration>

+					<quiet>true</quiet>

+					<author>false</author>

+					<version>false</version>

+					<use>true</use>

+					<excludePackageNames>at.gv.egovernment.moa.spss.server.*;at.gv.egovernment.moa.spss.api.impl.*;at.gv.egovernment.moa.spss.impl.*</excludePackageNames>

+					<tags>

+						<tag>

+							<name>pre</name>

+							<placement>a</placement>

+							<head>Preconditions:</head>

+						</tag>

+						<tag>

+							<name>post</name>

+							<placement>a</placement>

+							<head>Postconditions:</head>

+						</tag>

+					</tags>

+					<groups>

+						<group>

+							<title>API Factory and Services</title>

+							<packages>at.gv.egovernment.moa.spss.api</packages>

+						</group>

+						<group>

+							<title>Exceptions</title>

+							<packages>at.gv.egovernment.moa.spss</packages>

+						</group>

+						<group>

+							<title>API Objects for Signature Creation</title>

+							<packages>at.gv.egovernment.moa.spss.api.xmlsign</packages>

+						</group>

+						<group>

+							<title>API Objects for CMS Signature Verification</title>

+							<packages>at.gv.egovernment.moa.spss.api.cmsverify</packages>

+						</group>

+						<group>

+							<title>API Objects for XML Signature Verification</title>

+							<packages>at.gv.egovernment.moa.spss.api.xmlverify</packages>

+						</group>

+						<group>

+							<title>Common API Objects</title>

+							<packages>at.gv.egovernment.moa.spss.api.common</packages>

+						</group>

+						<group>

+							<title>Builders and Parsers to convert API Objects to and from XML</title>

+							<packages>at.gv.egovernment.moa.spss.api.xmlbind</packages>

+						</group>

+						<group>

+							<title>Utilities</title>

+							<packages>at.gv.egovernment.moa.util</packages>

+							<packages>at.gv.egovernment.moa.spss.util</packages>

+						</group>

+						<group>

+							<title>Logging</title>

+							<packages>at.gv.egovernment.moa.logging</packages>

+						</group>

+					</groups>

+					<link>http://java.sun.com/j2se/1.4/docs/api/</link>

+				</configuration>

+				<executions>

+					<execution>

+						<id>generate-javadoc</id>

+						<phase>package</phase>

+						<goals>

+							<goal>jar</goal>

+						</goals>

+					</execution>

+				</executions>

+			</plugin>

+		</plugins>

+	</build>

 

 </project>

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 ad0da28f4..0abd80944 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
@@ -191,6 +191,7 @@ public class DataObjectFactory {
     }
 
     // try to parse validating
+    Logger.trace(">>> parsing the following content: \n" + new String(contentBytes));
     try {
       ByteArrayInputStream is = new ByteArrayInputStream(contentBytes);
       Document doc =
@@ -201,6 +202,7 @@ public class DataObjectFactory {
           null,
           entityResolver,
           new MOAErrorHandler());
+      Logger.trace("<<< parsed");
 
       return new XMLDataObjectImpl(doc.getDocumentElement());
     } catch (Exception e) {
@@ -304,18 +306,12 @@ public class DataObjectFactory {
           }
         case Content.LOCREF_CONTENT:
           {
-            InputStream contentIS = null;
         	String locRefURI = ((ContentLocRef) content).getLocationReferenceURI();
-
         	
             TransactionContext context = TransactionContextManager.getInstance().getTransactionContext();
-        	Vector entity = context.FindResolvedEntity(locRefURI);
-        	if (entity!=null) {
-        		contentIS = (InputStream) entity.get(0);
-        	} else {
+        	if (context.FindResolvedEntity(locRefURI)==null) {
 	
 	            ExternalURIResolver uriResolver = new ExternalURIResolver();
-	            
 	            InputStream uriStream = null;
 	            byte[] contentBytes;
 	            String contentType = null;
@@ -323,7 +319,6 @@ public class DataObjectFactory {
 	            {
 	              uriStream = uriResolver.resolve(locRefURI);
 	              contentBytes = StreamUtils.readStream(uriStream);
-	              contentIS = new ByteArrayInputStream(contentBytes);
 	              contentType = uriResolver.getContentType();
 	            }
 	            catch (Exception e)
@@ -334,9 +329,10 @@ public class DataObjectFactory {
 	            {
 	              closeInputStream(uriStream);
 	            }
-	            entities.put(locRefURI, contentIS);
 	            context.PutResolvedEntity(locRefURI, contentBytes, contentType);
         	}
+        	InputStream contentIS = context.ResolveURI(locRefURI);
+        	entities.put(reference, contentIS);
             break;
           }
         case Content.XML_CONTENT :
diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/AxisHandler.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/AxisHandler.java
index f5f77ff50..8e5c8a49b 100644
--- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/AxisHandler.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/AxisHandler.java
@@ -1,6 +1,7 @@
 package at.gv.egovernment.moa.spss.server.service;
 
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -18,6 +19,8 @@ import org.apache.axis.handlers.BasicHandler;
 import org.apache.axis.transport.http.HTTPConstants;
 import org.apache.axis.utils.Messages;
 import org.apache.axis.utils.XMLUtils;
+import org.apache.xml.serialize.OutputFormat;
+import org.apache.xml.serialize.XMLSerializer;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -27,7 +30,6 @@ import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.logging.LoggingContext;
 import at.gv.egovernment.moa.logging.LoggingContextManager;
 import at.gv.egovernment.moa.spss.MOASystemException;
-import at.gv.egovernment.moa.spss.api.common.Content;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContext;
 import at.gv.egovernment.moa.spss.server.transaction.TransactionContextManager;
@@ -105,7 +107,11 @@ public class AxisHandler extends BasicHandler {
         (X509Certificate[]) request.getAttribute(X509_CERTIFICATE_PROPERTY);
 
       //Configure Axis
+//      AxisProperties.setProperty(AxisEngine.PROP_ENABLE_NAMESPACE_PREFIX_OPTIMIZATION,"false");
+//      AxisProperties.setProperty(AxisEngine.PROP_DOMULTIREFS,"false");
+//      AxisProperties.setProperty(AxisEngine.PROP_SEND_XSI,"true");
       //msgContext.setProperty(org.apache.axis.SOAPPart.ALLOW_FORM_OPTIMIZATION, Boolean.FALSE);
+      //msgContext.setProperty(org.apache.axis. AxisEngine.PROP_ENABLE_NAMESPACE_PREFIX_OPTIMIZATION,"false");      
       
       Message soapMessage = msgContext.getCurrentMessage();
       
@@ -201,9 +207,21 @@ public class AxisHandler extends BasicHandler {
         info("handler.03", null);
       }
       if (Logger.isDebugEnabled()) {
-        String msg = soapMessage.getSOAPPartAsString();
-        Logger.debug(new LogMsg(msg));
-      }
+//	      OutputFormat format = new OutputFormat((Document) xmlRequest.getOwnerDocument());
+//	      format.setLineSeparator("\n");
+//	      format.setIndenting(false);
+//	      format.setPreserveSpace(true);
+//	      format.setOmitXMLDeclaration(false);
+//	      format.setEncoding("UTF-8");
+//	      ByteArrayOutputStream baos = new ByteArrayOutputStream();
+//          XMLSerializer conSerializer = new XMLSerializer(baos, format);
+//          conSerializer.serialize(xmlRequest);
+//          Logger.debug(new LogMsg("Request:" + baos.toString()));
+          
+	        
+          String msg = soapMessage.getSOAPPartAsString();
+          Logger.debug(new LogMsg(msg));
+      } 
     } catch (MOASystemException e) {
       MOASystemException se = new MOASystemException("2900", null, e);
       AxisFault fault = AxisFault.makeFault(se);
diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java
index c173625f8..8fceb6fb6 100644
--- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureCreationService.java
@@ -70,7 +70,7 @@ public class SignatureCreationService {
       //since Axis (1.1 ff) has problem with namespaces we take the raw request stored by the Axishandler.
       TransactionContext context = TransactionContextManager.getInstance().getTransactionContext();
       // validate the request
-      reparsedReq = ServiceUtils.reparseRequest(context.getRequest());
+      reparsedReq = ServiceUtils.reparseRequest(request[0]);//context.getRequest());
 
       // convert to API objects
 	  Logger.trace(">>> preparsing Request");
diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureVerificationService.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureVerificationService.java
index b335a6e23..feb49ffbf 100644
--- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureVerificationService.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/service/SignatureVerificationService.java
@@ -56,7 +56,7 @@ public class SignatureVerificationService {
       //since Axis (1.1 ff) has problem with namespaces we take the raw request stored by the Axishandler.
       TransactionContext context = TransactionContextManager.getInstance().getTransactionContext();
       // validate the request
-      reparsedReq = ServiceUtils.reparseRequest(context.getRequest());
+      reparsedReq = ServiceUtils.reparseRequest(request[0]);//context.getRequest());
       
       // convert to API objects
       requestObj = requestParser.parse(reparsedReq);
diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/transaction/TransactionContext.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/transaction/TransactionContext.java
index 5c1e35a95..62db42674 100644
--- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/transaction/TransactionContext.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/transaction/TransactionContext.java
@@ -273,8 +273,9 @@ public void cleanAttachmentCache() {
 	        if (mmds!=null) {
 	          InputStream is = mmds.getInputStream();
 	          if (is!=null) is.close();
-	          File f = mmds.getDiskCacheFile();
-	          if (f!=null) f.delete();
+// not available in Axis 1.0 to 1.1	          
+//	          File f = mmds.getDiskCacheFile();
+//	          if (f!=null) f.delete();
 	          mmds.delete();
 	        }
 	      } catch (IOException e) {
diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml
index aed4e8cc1..82293df82 100644
--- a/spss/server/serverws/pom.xml
+++ b/spss/server/serverws/pom.xml
@@ -10,7 +10,7 @@
     <groupId>MOA.spss.server</groupId>
     <artifactId>moa-spss-ws</artifactId>
     <packaging>war</packaging>
-    <version>1.4.2</version>
+    <version>1.4.2beta1</version>
     <name>MOA SP/SS WebService</name>
 
     <properties>
diff --git a/spss/server/tools/pom.xml b/spss/server/tools/pom.xml
index dc6a5f84f..a9c9c374f 100644
--- a/spss/server/tools/pom.xml
+++ b/spss/server/tools/pom.xml
@@ -9,7 +9,7 @@
   <groupId>MOA.spss.server</groupId>
   <artifactId>moa-spss-tools</artifactId>
   <packaging>jar</packaging>
-  <version>1.4.2</version>
+  <version>1.4</version>
   <name>MOA SP/SS Tools</name>
 
   <properties>