moved test classes, cashing of resolved entities

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

4 files changed, 201 insertions, 193 deletions

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 869d94c2e..57aea5ac4 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -4,14 +4,14 @@
     <parent>
         <groupId>MOA.id</groupId>
         <artifactId>moa-id</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>MOA.id.server</groupId>
     <artifactId>moa-id-auth</artifactId>
     <packaging>war</packaging>
-    <version>1.4.1</version>
+    <version>1.4.2</version>
     <name>MOA ID-Auth WebService</name>
 
     <properties>
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 9e673f6f5..0eb0451e5 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -1,168 +1,176 @@
 <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.id</groupId>
-        <artifactId>moa-id</artifactId>
-        <version>1.4.1</version>
-    </parent>
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>MOA.id</groupId>
+    <artifactId>moa-id</artifactId>
+    <version>1.4.2</version>
+  </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>MOA.id.server</groupId>
-    <artifactId>moa-id-lib</artifactId>
-    <packaging>jar</packaging>
-    <version>1.4.1</version>
-    <name>MOA ID API</name>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>MOA.id.server</groupId>
+  <artifactId>moa-id-lib</artifactId>
+  <packaging>jar</packaging>
+  <version>1.4.2</version>
+  <name>MOA ID API</name>
 
-    <properties>
-        <repositoryPath>${basedir}/../../../repository</repositoryPath>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>axis</groupId>
-            <artifactId>axis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</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>xalan</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>xalan-bin-dist</groupId>
-            <artifactId>serializer</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-discovery</groupId>
-            <artifactId>commons-discovery</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>dav4j</groupId>
-            <artifactId>dav4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>httpsclient</groupId>
-            <artifactId>httpsclient</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>MOA</groupId>
-            <artifactId>moa-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>MOA</groupId>
-            <artifactId>moa-common-test</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>MOA.spss.server</groupId>
-            <artifactId>moa-spss-lib</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_moa</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_ecc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_jce_full</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_ixsil</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_X509TrustManager</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>regexp</groupId>
-            <artifactId>regexp</artifactId>
-        </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>
-                    <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>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>axis</groupId>
+      <artifactId>axis</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>provided</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>xalan</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>xalan-bin-dist</groupId>
+      <artifactId>serializer</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-discovery</groupId>
+      <artifactId>commons-discovery</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>dav4j</groupId>
+      <artifactId>dav4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>httpsclient</groupId>
+      <artifactId>httpsclient</artifactId>
+    </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>
+    </dependency>
+    <dependency>
+      <groupId>MOA.spss.server</groupId>
+      <artifactId>moa-spss-lib</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>iaik.prod</groupId>
+      <artifactId>iaik_moa</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>iaik.prod</groupId>
+      <artifactId>iaik_ecc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>iaik.prod</groupId>
+      <artifactId>iaik_jce_full</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>iaik.prod</groupId>
+      <artifactId>iaik_ixsil</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>iaik.prod</groupId>
+      <artifactId>iaik_X509TrustManager</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>regexp</groupId>
+      <artifactId>regexp</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <addMavenDescriptor>false</addMavenDescriptor>
+          </archive>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </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>
+          <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/id/server/pom.xml b/id/server/pom.xml
index fffc8d266..2173b97c4 100644
--- a/id/server/pom.xml
+++ b/id/server/pom.xml
@@ -1,27 +1,27 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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</groupId>

         <artifactId>id</artifactId>

-        <version>1.4.1</version>

+        <version>1.4.2</version>

     </parent>

 

-    <modelVersion>4.0.0</modelVersion>
-    <groupId>MOA.id</groupId>
-    <artifactId>moa-id</artifactId>
-    <packaging>pom</packaging>
-    <version>1.4.1</version>
-    <name>MOA ID Server</name>
-
-    <modules>
-        <module>idserverlib</module>
-        <module>proxy</module>
-        <module>auth</module>
-    </modules>
-
-    <properties>
-        <repositoryPath>${basedir}/../../repository</repositoryPath>
-    </properties>
-
+    <modelVersion>4.0.0</modelVersion>

+    <groupId>MOA.id</groupId>

+    <artifactId>moa-id</artifactId>

+    <packaging>pom</packaging>

+    <version>1.4.2</version>

+    <name>MOA ID Server</name>

+

+    <modules>

+        <module>idserverlib</module>

+        <module>proxy</module>

+        <module>auth</module>

+    </modules>

+

+    <properties>

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

+    </properties>

+

 </project>

diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 2cb7fedbd..72397b959 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -4,7 +4,7 @@
 	<parent>

 		<groupId>MOA.id</groupId>

 		<artifactId>moa-id</artifactId>

-		<version>1.4.1</version>

+		<version>1.4.2</version>

 	</parent>

 

 	<properties>

@@ -16,7 +16,7 @@
 	<groupId>MOA.id.server</groupId>

 	<artifactId>moa-id-proxy</artifactId>

 	<packaging>war</packaging>

-	<version>1.4.1</version>

+	<version>1.4.2</version>

 	<name>MOA ID-Proxy WebService</name>

 

 	<build>

@@ -105,12 +105,12 @@
             <!-- should be provided by the container or jre -->

             <scope>provided</scope>

         </dependency>

-        <dependency>
-            <groupId>xalan-bin-dist</groupId>
-            <artifactId>serializer</artifactId>
-            <!-- should be provided by the container or jre -->
-            <scope>provided</scope>
-        </dependency>
+        <dependency>

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

+            <artifactId>serializer</artifactId>

+            <!-- should be provided by the container or jre -->

+            <scope>provided</scope>

+        </dependency>

 	</dependencies>

 

 </project>