From 43e57a42832ea8b4ceb0317f3c9028a4174ffa7b Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 8 Aug 2007 07:25:32 +0000
Subject: Adapted project directory structure to suit the new maven based build
 process.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@909 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/proxy/src/main/webapp/WEB-INF/web.xml    | 82 ++++++++++++++++++++++
 .../proxy/src/main/webapp/errorpage-proxy.jsp      | 50 +++++++++++++
 id/server/proxy/src/main/webapp/message-proxy.jsp  | 20 ++++++
 3 files changed, 152 insertions(+)
 create mode 100644 id/server/proxy/src/main/webapp/WEB-INF/web.xml
 create mode 100644 id/server/proxy/src/main/webapp/errorpage-proxy.jsp
 create mode 100644 id/server/proxy/src/main/webapp/message-proxy.jsp

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/src/main/webapp/WEB-INF/web.xml b/id/server/proxy/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..b11606fe0
--- /dev/null
+++ b/id/server/proxy/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN' 'http://java.sun.com/dtd/web-app_2_3.dtd'>
+<web-app>
+	<display-name>MOA ID Proxy</display-name>
+	<description>MOA ID Proxy Service</description>
+
+	<filter>
+		<filter-name>ParameterInOrder Filter</filter-name>
+		<filter-class>at.gv.egovernment.moa.id.util.ParameterInOrderFilter</filter-class>
+	</filter>
+	<filter-mapping>
+		<filter-name>ParameterInOrder Filter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+	<servlet>
+		<servlet-name>Proxy</servlet-name>
+		<display-name>Proxy</display-name>
+		<description>Forwards requests to the online application</description>
+		<servlet-class>at.gv.egovernment.moa.id.proxy.servlet.ProxyServlet</servlet-class>
+		<load-on-startup>0</load-on-startup>
+	</servlet>
+	<servlet>
+		<servlet-name>ConfigurationUpdate</servlet-name>
+		<display-name>ConfigurationUpdate</display-name>
+		<description>Update MOA-ID Proxy configuration from the configuration file</description>
+		<servlet-class>at.gv.egovernment.moa.id.proxy.servlet.ConfigurationServlet</servlet-class>
+	</servlet>
+	
+	<!-- JSP servlet -->
+	<servlet>
+        <servlet-name>jspservlet</servlet-name>
+        <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
+    </servlet>
+    
+	<!-- servlet mapping for jsp pages -->
+	<!-- errorpage.jsp (customizeable) -->
+	<servlet-mapping>
+        <servlet-name>jspservlet</servlet-name>
+        <url-pattern>/errorpage-proxy.jsp</url-pattern>
+    </servlet-mapping>		
+    <!-- message-proxy.jsp (customizeable) used for non error messages (e.g. ConfigurationUpdate) -->
+	<servlet-mapping>
+        <servlet-name>jspservlet</servlet-name>
+        <url-pattern>/message-proxy.jsp</url-pattern>
+    </servlet-mapping>		
+
+	<servlet-mapping>
+		<servlet-name>ConfigurationUpdate</servlet-name>
+		<url-pattern>/ConfigurationUpdate</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>Proxy</servlet-name>
+		<url-pattern>/*</url-pattern>
+	</servlet-mapping>
+	<session-config>
+		<session-timeout>30</session-timeout>
+	</session-config>
+	<error-page>
+		<error-code>500</error-code>
+		<location>/errorpage.jsp</location>
+	</error-page>
+	<security-constraint>
+		<web-resource-collection>
+			<web-resource-name>ConfigurationUpdate</web-resource-name>
+			<url-pattern>/ConfigurationUpdate</url-pattern>
+		</web-resource-collection>
+		<auth-constraint>
+			<role-name>moa-admin</role-name>
+		</auth-constraint>
+	</security-constraint>
+	<login-config>
+		<auth-method>BASIC</auth-method>
+		<realm-name>UserDatabase</realm-name>
+	</login-config>
+	<security-role>
+		<description>
+		    The role that is required to log in to the moa Application
+  		</description>
+		<role-name>moa-admin</role-name>
+	</security-role>
+</web-app>
diff --git a/id/server/proxy/src/main/webapp/errorpage-proxy.jsp b/id/server/proxy/src/main/webapp/errorpage-proxy.jsp
new file mode 100644
index 000000000..07f3e7f69
--- /dev/null
+++ b/id/server/proxy/src/main/webapp/errorpage-proxy.jsp
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<%@ page contentType="text/html; charset=UTF-8" %>
+<html>
+<head>
+<title>Ein Fehler ist aufgetreten</title>
+</head>
+<% Throwable exceptionThrown = (Throwable)request.getAttribute("ExceptionThrown");
+   String errorMessage = (String)request.getAttribute("ErrorMessage");
+   String wrongParameters = (String)request.getAttribute("WrongParameters");
+%>
+
+<body>
+<h1>Fehler bei der Anmeldung</h1>
+<p>Bei der Anmeldung ist ein Fehler aufgetreten.</p>
+
+<% if (errorMessage != null) { %>
+<p>
+<%= errorMessage%><br>
+</p>
+<% } %>
+<% if (exceptionThrown != null) { %>
+<p> 
+<%= exceptionThrown.getMessage()%>
+</p>
+<% } %>
+<% if (wrongParameters != null) { %>
+<p>Die Angabe der Parameter ist unvollst&auml;ndig.<br></p>
+<b> <%= wrongParameters %> </b><br>
+<p>
+   Beispiele f&uuml;r korrekte Links zur MOA-ID Authentisierung sind:
+</p>
+<p>
+<tt>&lt;a href="https://&lt;MOA-URL&gt;/StartAuthentication?Target=&lt;Gesch&auml;ftsbereich&gt;&amp;OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&quot;&gt;</tt>
+</p>
+<p>
+<tt>&lt;a href="https://&lt;MOA-URL&gt;/SelectBKU?Target=&lt;Gesch&auml;ftsbereich&gt;&amp;OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&amp;BKUSelectionTemplate=&lt;BKU-Template-URL&gt;&quot;&gt;</tt>
+</p>
+<p>
+Im Falle einer Applikation aus dem privatwirtschaftlichen Bereich (type="businessService") entf&auml;llt die Angabe des <i>Target</i> Parameters:
+</p>
+<p>
+<tt>&lt;a href="https://&lt;MOA-URL&gt;/StartAuthentication?OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&quot;&gt;</tt>
+</p>
+<p>
+<tt>&lt;a href="https://&lt;MOA-URL&gt;/SelectBKU?OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&amp;BKUSelectionTemplate=&lt;BKU-Template-URL&gt;&quot;&gt;</tt>
+</p>
+<p>Die Angabe der Parameter <tt>&quot;Template&quot;</tt> und <tt>&quot;BKUSelectionTemplate&quot;</tt> ist optional.</p>
+<% } %>
+</body>
+</html>
\ No newline at end of file
diff --git a/id/server/proxy/src/main/webapp/message-proxy.jsp b/id/server/proxy/src/main/webapp/message-proxy.jsp
new file mode 100644
index 000000000..0d970898a
--- /dev/null
+++ b/id/server/proxy/src/main/webapp/message-proxy.jsp
@@ -0,0 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<%@ page contentType="text/html; charset=UTF-8" %>
+<html>
+<head>
+<title>MOA-ID Proxy</title>
+</head>
+<% String message = (String)request.getAttribute("Message");
+%>
+
+<body>
+<h1>MOA-ID Proxy</h1>
+
+<% if (message != null) { %>
+<p>
+<%= message%><br>
+</p>
+<% } %>
+
+</body>
+</html>
\ No newline at end of file
-- 
cgit v1.2.3


From bb444223c1b737319f473f6816566fa28b658cf5 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 8 Aug 2007 14:06:55 +0000
Subject: id mavenized

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@917 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/proxy/assembly-war.xml |  85 ++++++++++++++++++++++++
 id/server/proxy/pom.xml          | 136 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 221 insertions(+)
 create mode 100644 id/server/proxy/assembly-war.xml
 create mode 100644 id/server/proxy/pom.xml

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/assembly-war.xml b/id/server/proxy/assembly-war.xml
new file mode 100644
index 000000000..b9f84d762
--- /dev/null
+++ b/id/server/proxy/assembly-war.xml
@@ -0,0 +1,85 @@
+<assembly>
+  <id>web</id>
+
+  <formats>
+    <format>war</format>
+  </formats>
+
+	<includeBaseDirectory>false</includeBaseDirectory>
+
+	<fileSets>
+		<fileSet>
+			<directory>${basedir}/src/main/webapp</directory>
+			<outputDirectory>/</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/../idserverlib/target/classes</directory>
+			<outputDirectory>WEB-INF/classes</outputDirectory>
+			<excludes>
+				<exclude>**/auth/**</exclude>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/src/main/webapp</directory>
+			<outputDirectory>/</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/../../../common/target</directory>
+			<outputDirectory>WEB-INF/lib</outputDirectory>
+			<includes>
+				<include>**/*.jar</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/../../../spss/server/serverlib/target</directory>
+			<outputDirectory>WEB-INF/lib</outputDirectory>
+			<includes>
+				<include>**/*.jar</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/../resources</directory>
+			<outputDirectory>WEB-INF/classes/resources</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/../services</directory>
+			<outputDirectory>WEB-INF/classes/META-INF/services</outputDirectory>
+		</fileSet>
+	</fileSets>
+
+	<dependencySets>
+	<dependencySet>
+		<includes>
+			<include>javaext:activation</include>
+			<include>axis:axis</include>
+			<include>commons-discovery:commons-discovery</include>
+			<include>commons-logging:commons-logging</include>
+			<include>jaxp:dom</include>
+			<include>iaik.prod:iaik_ixsil</include>
+			<include>iaik.prod:iaik_moa_full</include>
+			<include>iaik.prod:iaik_Pkcs11Wrapper</include>
+			<include>iaik.prod:iaik_X509TrustManager</include>
+			<include>jaxen:jaxen-core</include>
+			<include>jaxen:jaxen-dom</include>
+			<include>jaxp:jaxp-api</include>
+			<include>javax.xml:jaxrpc</include>
+			<include>mail:mail</include>
+			<include>saaj:saaj</include>
+			<include>jaxp:sax</include>
+			<include>jaxen:saxpath</include>
+			<include>wsdl4j:wsdl4j</include>
+			<include>regexp:regexp</include>
+			<include>log4j:log4j</include>
+			<include>postgresql:postgresql</include>
+	</includes>
+		<outputDirectory>WEB-INF/lib</outputDirectory>
+	</dependencySet>
+	<dependencySet>
+		<includes>
+			<include>iaik.win32:Pkcs11Wrapper</include>
+	</includes>
+		<outputDirectory>WEB-INF/lib/win32</outputDirectory>
+	</dependencySet>
+	</dependencySets>
+
+ </assembly>
\ No newline at end of file
diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
new file mode 100644
index 000000000..0ca85d599
--- /dev/null
+++ b/id/server/proxy/pom.xml
@@ -0,0 +1,136 @@
+<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>server</artifactId>
+		<version>1.4.0</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>MOA.id.server</groupId>
+  <artifactId>proxy</artifactId>
+  <packaging>pom</packaging>
+  <version>1.4.0</version>
+  <name>MOA Id Server Proxy</name>
+
+	<dependencies>
+    <dependency>
+      <groupId>javaext</groupId>
+      <artifactId>activation</artifactId>
+    </dependency>
+    <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>jaxp</groupId>
+      <artifactId>dom</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>iaik.prod</groupId>
+      <artifactId>iaik_ixsil</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>iaik.prod</groupId>
+      <artifactId>iaik_moa_full</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>iaik.prod</groupId>
+      <artifactId>iaik_Pkcs11Wrapper</artifactId>
+      <version>1.2.16</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>iaik.prod</groupId>
+      <artifactId>iaik_X509TrustManager</artifactId>
+    </dependency>
+	    <dependency>
+	      <groupId>jaxen</groupId>
+	      <artifactId>jaxen-core</artifactId>
+	    </dependency>
+	    <dependency>
+	      <groupId>jaxen</groupId>
+	      <artifactId>jaxen-dom</artifactId>
+	    </dependency>
+    <dependency>
+      <groupId>jaxp</groupId>
+      <artifactId>jaxp-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.xml</groupId>
+      <artifactId>jaxrpc-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>mail</groupId>
+      <artifactId>mail</artifactId>
+<!--      <version>1.5</version>-->
+    </dependency>
+    <dependency>
+      <groupId>saaj</groupId>
+      <artifactId>saaj</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jaxp</groupId>
+      <artifactId>sax</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jaxen</groupId>
+      <artifactId>saxpath</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>wsdl4j</groupId>
+      <artifactId>wsdl4j</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>regexp</groupId>
+      <artifactId>regexp</artifactId>
+    </dependency>
+ 
+    <dependency>
+      <groupId>iaik.win32</groupId>
+      <artifactId>Pkcs11Wrapper</artifactId>
+      <version>1.0</version>
+			<type>dll</type>
+      <scope>runtime</scope>
+    </dependency>
+	</dependencies>
+	
+  <build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+	        <configuration>
+	          <descriptors>
+	            <descriptor>${basedir}/assembly-war.xml</descriptor>
+	          </descriptors>
+	        </configuration>
+	        <executions>
+	          <execution>
+	            <id>make-assembly</id>
+	            <phase>package</phase>
+	            <goals>
+	              <goal>attached</goal>
+	            </goals>
+	          </execution>
+	        </executions>
+			</plugin>  
+		</plugins>  
+	</build>
+</project>
\ No newline at end of file
-- 
cgit v1.2.3


From 9b787d3409e629f292a98d0b5a0aad036b7421c7 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Fri, 17 Aug 2007 08:47:35 +0000
Subject: Improved and updated maven build process.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@919 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/proxy/assembly-war.xml |  15 +-
 id/server/proxy/pom.xml          | 318 +++++++++++++++++++++++----------------
 2 files changed, 196 insertions(+), 137 deletions(-)

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/assembly-war.xml b/id/server/proxy/assembly-war.xml
index b9f84d762..dba832a74 100644
--- a/id/server/proxy/assembly-war.xml
+++ b/id/server/proxy/assembly-war.xml
@@ -56,7 +56,7 @@
 			<include>commons-logging:commons-logging</include>
 			<include>jaxp:dom</include>
 			<include>iaik.prod:iaik_ixsil</include>
-			<include>iaik.prod:iaik_moa_full</include>
+			<include>iaik.prod:iaik_moa</include>
 			<include>iaik.prod:iaik_Pkcs11Wrapper</include>
 			<include>iaik.prod:iaik_X509TrustManager</include>
 			<include>jaxen:jaxen-core</include>
@@ -74,12 +74,13 @@
 	</includes>
 		<outputDirectory>WEB-INF/lib</outputDirectory>
 	</dependencySet>
-	<dependencySet>
-		<includes>
-			<include>iaik.win32:Pkcs11Wrapper</include>
-	</includes>
-		<outputDirectory>WEB-INF/lib/win32</outputDirectory>
-	</dependencySet>
+		<dependencySet>
+			<includes>
+				<include>iaik.prod:iaik_Pkcs11Wrapper:dll:win32</include>
+			</includes>
+			<outputFileNameMapping>pkcs11wrapper.dll</outputFileNameMapping>
+			<outputDirectory>WEB-INF/lib/win32</outputDirectory>
+		</dependencySet>
 	</dependencySets>
 
  </assembly>
\ No newline at end of file
diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 0ca85d599..eb912c659 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -1,136 +1,194 @@
-<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>
+<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>server</artifactId>
+		<artifactId>moa-id</artifactId>
 		<version>1.4.0</version>
-  </parent>
+	</parent>
 
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>MOA.id.server</groupId>
-  <artifactId>proxy</artifactId>
-  <packaging>pom</packaging>
-  <version>1.4.0</version>
-  <name>MOA Id Server Proxy</name>
+	<properties>
+		<repositoryPath>${basedir}/../../../repository</repositoryPath>
+	</properties>
+
+
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>MOA.id.server</groupId>
+	<artifactId>moa-id-proxy</artifactId>
+	<packaging>war</packaging>
+	<version>1.4.0</version>
+	<name>MOA ID-Proxy WebService</name>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>2.0.2</version>
+				<configuration>
+					<archive>
+						<manifest>
+							<addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+					</archive>
+					<webResources>
+						<resource>
+							<directory>${basedir}/../resources</directory>
+							<targetPath>WEB-INF/classes/resources</targetPath>
+						</resource>
+						<resource>
+							<directory>${basedir}/../services</directory>
+							<targetPath>WEB-INF/classes/META-INF/services</targetPath>
+						</resource>
+					</webResources>
+				</configuration>
+				<executions>
+					<execution>
+						<id>test</id>
+						<phase>package</phase>
+						<goals>
+							<goal>exploded</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
 
 	<dependencies>
-    <dependency>
-      <groupId>javaext</groupId>
-      <artifactId>activation</artifactId>
-    </dependency>
-    <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>jaxp</groupId>
-      <artifactId>dom</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_ixsil</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_moa_full</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_Pkcs11Wrapper</artifactId>
-      <version>1.2.16</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_X509TrustManager</artifactId>
-    </dependency>
-	    <dependency>
-	      <groupId>jaxen</groupId>
-	      <artifactId>jaxen-core</artifactId>
-	    </dependency>
-	    <dependency>
-	      <groupId>jaxen</groupId>
-	      <artifactId>jaxen-dom</artifactId>
-	    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>jaxp-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>javax.xml</groupId>
-      <artifactId>jaxrpc-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>mail</groupId>
-      <artifactId>mail</artifactId>
-<!--      <version>1.5</version>-->
-    </dependency>
-    <dependency>
-      <groupId>saaj</groupId>
-      <artifactId>saaj</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>sax</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxen</groupId>
-      <artifactId>saxpath</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>wsdl4j</groupId>
-      <artifactId>wsdl4j</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>postgresql</groupId>
-      <artifactId>postgresql</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>regexp</groupId>
-      <artifactId>regexp</artifactId>
-    </dependency>
- 
-    <dependency>
-      <groupId>iaik.win32</groupId>
-      <artifactId>Pkcs11Wrapper</artifactId>
-      <version>1.0</version>
-			<type>dll</type>
-      <scope>runtime</scope>
-    </dependency>
-	</dependencies>
-	
-  <build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-	        <configuration>
-	          <descriptors>
-	            <descriptor>${basedir}/assembly-war.xml</descriptor>
-	          </descriptors>
-	        </configuration>
-	        <executions>
-	          <execution>
-	            <id>make-assembly</id>
-	            <phase>package</phase>
-	            <goals>
-	              <goal>attached</goal>
-	            </goals>
-	          </execution>
-	        </executions>
-			</plugin>  
-		</plugins>  
-	</build>
+		<dependency>
+			<groupId>MOA.spss.server</groupId>
+			<artifactId>moa-spss-lib</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>MOA.id.server</groupId>
+			<artifactId>moa-id-lib</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	<!--    <dependency>-->
+	<!--      <groupId>javax.activation</groupId>-->
+	<!--      <artifactId>activation</artifactId>-->
+	<!--    </dependency>-->
+	<!--    <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>jaxp</groupId>-->
+	<!--      <artifactId>dom</artifactId>-->
+	<!--    </dependency>-->
+	<!--    <dependency>-->
+	<!--      <groupId>iaik.prod</groupId>-->
+	<!--      <artifactId>iaik_ixsil</artifactId>-->
+	<!--    </dependency>-->
+	<!--    <dependency>-->
+	<!--      <groupId>iaik.prod</groupId>-->
+	<!--      <artifactId>iaik_moa</artifactId>-->
+	<!--    </dependency>-->
+	<!--    <dependency>-->
+	<!--      <groupId>iaik.prod</groupId>-->
+	<!--      <artifactId>iaik_Pkcs11Wrapper</artifactId>-->
+	<!--      <version>1.2.16</version>-->
+	<!--      <scope>compile</scope>-->
+	<!--    </dependency>-->
+	<!--    <dependency>-->
+	<!--      <groupId>iaik.prod</groupId>-->
+	<!--      <artifactId>iaik_X509TrustManager</artifactId>-->
+	<!--    </dependency>-->
+	<!--	    <dependency>-->
+	<!--	      <groupId>jaxen</groupId>-->
+	<!--	      <artifactId>jaxen-core</artifactId>-->
+	<!--	    </dependency>-->
+	<!--	    <dependency>-->
+	<!--	      <groupId>jaxen</groupId>-->
+	<!--	      <artifactId>jaxen-dom</artifactId>-->
+	<!--	    </dependency>-->
+	<!--    <dependency>-->
+	<!--      <groupId>jaxp</groupId>-->
+	<!--      <artifactId>jaxp-api</artifactId>-->
+	<!--    </dependency>-->
+	<!--    <dependency>-->
+	<!--      <groupId>javax.xml</groupId>-->
+	<!--      <artifactId>jaxrpc-api</artifactId>-->
+	<!--    </dependency>-->
+	<!--    <dependency>-->
+	<!--      <groupId>javax.mail</groupId>-->
+	<!--      <artifactId>mail</artifactId>-->
+	<!--      <version>1.5</version>-->
+	<!--    </dependency>-->
+	<!--    <dependency>-->
+	<!--      <groupId>saaj</groupId>-->
+	<!--      <artifactId>saaj</artifactId>-->
+	<!--    </dependency>-->
+	<!--    <dependency>-->
+	<!--      <groupId>jaxp</groupId>-->
+	<!--      <artifactId>sax</artifactId>-->
+	<!--    </dependency>-->
+	<!--    <dependency>-->
+	<!--      <groupId>jaxen</groupId>-->
+	<!--      <artifactId>saxpath</artifactId>-->
+	<!--    </dependency>-->
+	<!--    <dependency>-->
+	<!--      <groupId>wsdl4j</groupId>-->
+	<!--      <artifactId>wsdl4j</artifactId>-->
+	<!--    </dependency>-->
+	<!--    <dependency>-->
+	<!--      <groupId>javax.xml</groupId>-->
+	<!--      <artifactId>jaxrpc</artifactId>-->
+	<!--    </dependency>-->
+	<!--    -->
+	<!--    <dependency>-->
+	<!--      <groupId>postgresql</groupId>-->
+	<!--      <artifactId>postgresql</artifactId>-->
+	<!--    </dependency>-->
+	<!--    <dependency>-->
+	<!--      <groupId>log4j</groupId>-->
+	<!--      <artifactId>log4j</artifactId>-->
+	<!--    </dependency>-->
+	<!--    <dependency>-->
+	<!--      <groupId>regexp</groupId>-->
+	<!--      <artifactId>regexp</artifactId>-->
+	<!--    </dependency>-->
+	<!-- -->
+	<!--    <dependency>-->
+	<!--      <groupId>iaik.prod</groupId>-->
+	<!--      <artifactId>iaik_Pkcs11Wrapper</artifactId>-->
+	<!--      <classifier>win32</classifier>-->
+	<!--	  <type>dll</type>-->
+	<!--      <scope>runtime</scope>-->
+	<!--    </dependency>-->
+	</dependencies>
+
+	<!--  <build>-->
+	<!--		<plugins>-->
+	<!--			<plugin>-->
+	<!--				<artifactId>maven-assembly-plugin</artifactId>-->
+	<!--	        <configuration>-->
+	<!--	          <descriptors>-->
+	<!--	            <descriptor>${basedir}/assembly-war.xml</descriptor>-->
+	<!--	          </descriptors>-->
+	<!--	        </configuration>-->
+	<!--	        <executions>-->
+	<!--	          <execution>-->
+	<!--	            <id>make-assembly</id>-->
+	<!--	            <phase>package</phase>-->
+	<!--	            <goals>-->
+	<!--	              <goal>attached</goal>-->
+	<!--	            </goals>-->
+	<!--	          </execution>-->
+	<!--	        </executions>-->
+	<!--			</plugin>  -->
+	<!--		</plugins>  -->
+	<!--	</build>-->
 </project>
\ No newline at end of file
-- 
cgit v1.2.3


From 7537351b14d0738d9e16bef4fad8380c3a0b0f21 Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 22 Aug 2007 18:54:53 +0000
Subject: minor build fixes/improvements

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@934 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/proxy/pom.xml | 140 ++++++++++++++++++++++++------------------------
 1 file changed, 71 insertions(+), 69 deletions(-)

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index eb912c659..db0897931 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -1,5 +1,5 @@
-<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.id</groupId>
@@ -7,67 +7,69 @@
 		<version>1.4.0</version>
 	</parent>
 
-	<properties>
-		<repositoryPath>${basedir}/../../../repository</repositoryPath>
-	</properties>
-
-
+	<properties>
+		<repositoryPath>${basedir}/../../../repository</repositoryPath>
+	</properties>
+
+
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-proxy</artifactId>
 	<packaging>war</packaging>
 	<version>1.4.0</version>
 	<name>MOA ID-Proxy WebService</name>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>2.0.2</version>
-				<configuration>
-					<archive>
-						<manifest>
-							<addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
-							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-						</manifest>
-					</archive>
-					<webResources>
-						<resource>
-							<directory>${basedir}/../resources</directory>
-							<targetPath>WEB-INF/classes/resources</targetPath>
-						</resource>
-						<resource>
-							<directory>${basedir}/../services</directory>
-							<targetPath>WEB-INF/classes/META-INF/services</targetPath>
-						</resource>
-					</webResources>
-				</configuration>
-				<executions>
-					<execution>
-						<id>test</id>
-						<phase>package</phase>
-						<goals>
-							<goal>exploded</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>2.0.2</version>
+				<configuration>
+					<archive>
+						<manifest>
+							<addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+					</archive>
+<!--
+					<webResources>
+						<resource>
+							<directory>${basedir}/../resources</directory>
+							<targetPath>WEB-INF/classes/resources</targetPath>
+						</resource>
+						<resource>
+							<directory>${basedir}/../services</directory>
+							<targetPath>WEB-INF/classes/META-INF/services</targetPath>
+						</resource>
+					</webResources>
+-->
+				</configuration>
+				<executions>
+					<execution>
+						<id>test</id>
+						<phase>package</phase>
+						<goals>
+							<goal>exploded</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
 
 	<dependencies>
-		<dependency>
-			<groupId>MOA.spss.server</groupId>
-			<artifactId>moa-spss-lib</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>MOA.id.server</groupId>
-			<artifactId>moa-id-lib</artifactId>
-			<version>${project.version}</version>
-		</dependency>
+		<dependency>
+			<groupId>MOA.spss.server</groupId>
+			<artifactId>moa-spss-lib</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>MOA.id.server</groupId>
+			<artifactId>moa-id-lib</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 	<!--    <dependency>-->
 	<!--      <groupId>javax.activation</groupId>-->
 	<!--      <artifactId>activation</artifactId>-->
@@ -143,10 +145,10 @@
 	<!--      <groupId>wsdl4j</groupId>-->
 	<!--      <artifactId>wsdl4j</artifactId>-->
 	<!--    </dependency>-->
-	<!--    <dependency>-->
-	<!--      <groupId>javax.xml</groupId>-->
-	<!--      <artifactId>jaxrpc</artifactId>-->
-	<!--    </dependency>-->
+	<!--    <dependency>-->
+	<!--      <groupId>javax.xml</groupId>-->
+	<!--      <artifactId>jaxrpc</artifactId>-->
+	<!--    </dependency>-->
 	<!--    -->
 	<!--    <dependency>-->
 	<!--      <groupId>postgresql</groupId>-->
@@ -161,15 +163,15 @@
 	<!--      <artifactId>regexp</artifactId>-->
 	<!--    </dependency>-->
 	<!-- -->
-	<!--    <dependency>-->
-	<!--      <groupId>iaik.prod</groupId>-->
-	<!--      <artifactId>iaik_Pkcs11Wrapper</artifactId>-->
-	<!--      <classifier>win32</classifier>-->
-	<!--	  <type>dll</type>-->
-	<!--      <scope>runtime</scope>-->
-	<!--    </dependency>-->
-	</dependencies>
-
+	<!--    <dependency>-->
+	<!--      <groupId>iaik.prod</groupId>-->
+	<!--      <artifactId>iaik_Pkcs11Wrapper</artifactId>-->
+	<!--      <classifier>win32</classifier>-->
+	<!--	  <type>dll</type>-->
+	<!--      <scope>runtime</scope>-->
+	<!--    </dependency>-->
+	</dependencies>
+
 	<!--  <build>-->
 	<!--		<plugins>-->
 	<!--			<plugin>-->
@@ -191,4 +193,4 @@
 	<!--			</plugin>  -->
 	<!--		</plugins>  -->
 	<!--	</build>-->
-</project>
\ No newline at end of file
+</project>
-- 
cgit v1.2.3


From fd99a8b31a752135c8e2f16041ba35da70c7b2dc Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Thu, 23 Aug 2007 08:38:49 +0000
Subject: Updated dependency declarations to omit certain transitive
 dependencies from being included into war-files.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@936 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/proxy/assembly-war.xml |  86 -------------------
 id/server/proxy/pom.xml          | 173 ++++++++++-----------------------------
 2 files changed, 43 insertions(+), 216 deletions(-)
 delete mode 100644 id/server/proxy/assembly-war.xml

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/assembly-war.xml b/id/server/proxy/assembly-war.xml
deleted file mode 100644
index dba832a74..000000000
--- a/id/server/proxy/assembly-war.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<assembly>
-  <id>web</id>
-
-  <formats>
-    <format>war</format>
-  </formats>
-
-	<includeBaseDirectory>false</includeBaseDirectory>
-
-	<fileSets>
-		<fileSet>
-			<directory>${basedir}/src/main/webapp</directory>
-			<outputDirectory>/</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../idserverlib/target/classes</directory>
-			<outputDirectory>WEB-INF/classes</outputDirectory>
-			<excludes>
-				<exclude>**/auth/**</exclude>
-			</excludes>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/src/main/webapp</directory>
-			<outputDirectory>/</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../../../common/target</directory>
-			<outputDirectory>WEB-INF/lib</outputDirectory>
-			<includes>
-				<include>**/*.jar</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../../../spss/server/serverlib/target</directory>
-			<outputDirectory>WEB-INF/lib</outputDirectory>
-			<includes>
-				<include>**/*.jar</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../resources</directory>
-			<outputDirectory>WEB-INF/classes/resources</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/../services</directory>
-			<outputDirectory>WEB-INF/classes/META-INF/services</outputDirectory>
-		</fileSet>
-	</fileSets>
-
-	<dependencySets>
-	<dependencySet>
-		<includes>
-			<include>javaext:activation</include>
-			<include>axis:axis</include>
-			<include>commons-discovery:commons-discovery</include>
-			<include>commons-logging:commons-logging</include>
-			<include>jaxp:dom</include>
-			<include>iaik.prod:iaik_ixsil</include>
-			<include>iaik.prod:iaik_moa</include>
-			<include>iaik.prod:iaik_Pkcs11Wrapper</include>
-			<include>iaik.prod:iaik_X509TrustManager</include>
-			<include>jaxen:jaxen-core</include>
-			<include>jaxen:jaxen-dom</include>
-			<include>jaxp:jaxp-api</include>
-			<include>javax.xml:jaxrpc</include>
-			<include>mail:mail</include>
-			<include>saaj:saaj</include>
-			<include>jaxp:sax</include>
-			<include>jaxen:saxpath</include>
-			<include>wsdl4j:wsdl4j</include>
-			<include>regexp:regexp</include>
-			<include>log4j:log4j</include>
-			<include>postgresql:postgresql</include>
-	</includes>
-		<outputDirectory>WEB-INF/lib</outputDirectory>
-	</dependencySet>
-		<dependencySet>
-			<includes>
-				<include>iaik.prod:iaik_Pkcs11Wrapper:dll:win32</include>
-			</includes>
-			<outputFileNameMapping>pkcs11wrapper.dll</outputFileNameMapping>
-			<outputDirectory>WEB-INF/lib/win32</outputDirectory>
-		</dependencySet>
-	</dependencySets>
-
- </assembly>
\ No newline at end of file
diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index db0897931..faffae81b 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -45,15 +45,6 @@
 					</webResources>
 -->
 				</configuration>
-				<executions>
-					<execution>
-						<id>test</id>
-						<phase>package</phase>
-						<goals>
-							<goal>exploded</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
 		</plugins>
 	</build>
@@ -70,127 +61,49 @@
 			<artifactId>moa-id-lib</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-	<!--    <dependency>-->
-	<!--      <groupId>javax.activation</groupId>-->
-	<!--      <artifactId>activation</artifactId>-->
-	<!--    </dependency>-->
-	<!--    <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>jaxp</groupId>-->
-	<!--      <artifactId>dom</artifactId>-->
-	<!--    </dependency>-->
-	<!--    <dependency>-->
-	<!--      <groupId>iaik.prod</groupId>-->
-	<!--      <artifactId>iaik_ixsil</artifactId>-->
-	<!--    </dependency>-->
-	<!--    <dependency>-->
-	<!--      <groupId>iaik.prod</groupId>-->
-	<!--      <artifactId>iaik_moa</artifactId>-->
-	<!--    </dependency>-->
-	<!--    <dependency>-->
-	<!--      <groupId>iaik.prod</groupId>-->
-	<!--      <artifactId>iaik_Pkcs11Wrapper</artifactId>-->
-	<!--      <version>1.2.16</version>-->
-	<!--      <scope>compile</scope>-->
-	<!--    </dependency>-->
-	<!--    <dependency>-->
-	<!--      <groupId>iaik.prod</groupId>-->
-	<!--      <artifactId>iaik_X509TrustManager</artifactId>-->
-	<!--    </dependency>-->
-	<!--	    <dependency>-->
-	<!--	      <groupId>jaxen</groupId>-->
-	<!--	      <artifactId>jaxen-core</artifactId>-->
-	<!--	    </dependency>-->
-	<!--	    <dependency>-->
-	<!--	      <groupId>jaxen</groupId>-->
-	<!--	      <artifactId>jaxen-dom</artifactId>-->
-	<!--	    </dependency>-->
-	<!--    <dependency>-->
-	<!--      <groupId>jaxp</groupId>-->
-	<!--      <artifactId>jaxp-api</artifactId>-->
-	<!--    </dependency>-->
-	<!--    <dependency>-->
-	<!--      <groupId>javax.xml</groupId>-->
-	<!--      <artifactId>jaxrpc-api</artifactId>-->
-	<!--    </dependency>-->
-	<!--    <dependency>-->
-	<!--      <groupId>javax.mail</groupId>-->
-	<!--      <artifactId>mail</artifactId>-->
-	<!--      <version>1.5</version>-->
-	<!--    </dependency>-->
-	<!--    <dependency>-->
-	<!--      <groupId>saaj</groupId>-->
-	<!--      <artifactId>saaj</artifactId>-->
-	<!--    </dependency>-->
-	<!--    <dependency>-->
-	<!--      <groupId>jaxp</groupId>-->
-	<!--      <artifactId>sax</artifactId>-->
-	<!--    </dependency>-->
-	<!--    <dependency>-->
-	<!--      <groupId>jaxen</groupId>-->
-	<!--      <artifactId>saxpath</artifactId>-->
-	<!--    </dependency>-->
-	<!--    <dependency>-->
-	<!--      <groupId>wsdl4j</groupId>-->
-	<!--      <artifactId>wsdl4j</artifactId>-->
-	<!--    </dependency>-->
-	<!--    <dependency>-->
-	<!--      <groupId>javax.xml</groupId>-->
-	<!--      <artifactId>jaxrpc</artifactId>-->
-	<!--    </dependency>-->
-	<!--    -->
-	<!--    <dependency>-->
-	<!--      <groupId>postgresql</groupId>-->
-	<!--      <artifactId>postgresql</artifactId>-->
-	<!--    </dependency>-->
-	<!--    <dependency>-->
-	<!--      <groupId>log4j</groupId>-->
-	<!--      <artifactId>log4j</artifactId>-->
-	<!--    </dependency>-->
-	<!--    <dependency>-->
-	<!--      <groupId>regexp</groupId>-->
-	<!--      <artifactId>regexp</artifactId>-->
-	<!--    </dependency>-->
-	<!-- -->
-	<!--    <dependency>-->
-	<!--      <groupId>iaik.prod</groupId>-->
-	<!--      <artifactId>iaik_Pkcs11Wrapper</artifactId>-->
-	<!--      <classifier>win32</classifier>-->
-	<!--	  <type>dll</type>-->
-	<!--      <scope>runtime</scope>-->
-	<!--    </dependency>-->
+        <!-- transitive dependencies we don't want to include into the war -->
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_jce_full</artifactId>
+            <!-- should be in the ext directory of the jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_ecc</artifactId>
+            <!-- should be in the ext directory of the jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_Pkcs11Provider</artifactId>
+            <!-- should be in the ext directory of the jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_Pkcs11Wrapper</artifactId>
+            <!-- should be in the ext directory of the jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+            <!-- should be provided by the container or jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <!-- should be provided by the container or jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xmlParserAPIs</artifactId>
+            <!-- should be provided by the container or jre -->
+            <scope>provided</scope>
+        </dependency>
 	</dependencies>
 
-	<!--  <build>-->
-	<!--		<plugins>-->
-	<!--			<plugin>-->
-	<!--				<artifactId>maven-assembly-plugin</artifactId>-->
-	<!--	        <configuration>-->
-	<!--	          <descriptors>-->
-	<!--	            <descriptor>${basedir}/assembly-war.xml</descriptor>-->
-	<!--	          </descriptors>-->
-	<!--	        </configuration>-->
-	<!--	        <executions>-->
-	<!--	          <execution>-->
-	<!--	            <id>make-assembly</id>-->
-	<!--	            <phase>package</phase>-->
-	<!--	            <goals>-->
-	<!--	              <goal>attached</goal>-->
-	<!--	            </goals>-->
-	<!--	          </execution>-->
-	<!--	        </executions>-->
-	<!--			</plugin>  -->
-	<!--		</plugins>  -->
-	<!--	</build>-->
 </project>
-- 
cgit v1.2.3


From 189f12c42b38d58d1b324daa573153111bd2f7a4 Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Fri, 24 Aug 2007 11:52:28 +0000
Subject: build optimizations, updated documentation and sample configuration

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@953 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/proxy/pom.xml | 87 +++++++++++++++++++++++++------------------------
 1 file changed, 44 insertions(+), 43 deletions(-)

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index faffae81b..ee8c38c29 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -31,6 +31,7 @@
 							<addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
 							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
 						</manifest>
+            <addMavenDescriptor>false</addMavenDescriptor>
 					</archive>
 <!--
 					<webResources>
@@ -61,49 +62,49 @@
 			<artifactId>moa-id-lib</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-        <!-- transitive dependencies we don't want to include into the war -->
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_jce_full</artifactId>
-            <!-- should be in the ext directory of the jre -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_ecc</artifactId>
-            <!-- should be in the ext directory of the jre -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_Pkcs11Provider</artifactId>
-            <!-- should be in the ext directory of the jre -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_Pkcs11Wrapper</artifactId>
-            <!-- should be in the ext directory of the jre -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>xalan</groupId>
-            <artifactId>xalan</artifactId>
-            <!-- should be provided by the container or jre -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <!-- should be provided by the container or jre -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xmlParserAPIs</artifactId>
-            <!-- should be provided by the container or jre -->
-            <scope>provided</scope>
-        </dependency>
+        <!-- transitive dependencies we don't want to include into the war -->
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_jce_full</artifactId>
+            <!-- should be in the ext directory of the jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_ecc</artifactId>
+            <!-- should be in the ext directory of the jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_Pkcs11Provider</artifactId>
+            <!-- should be in the ext directory of the jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>iaik.prod</groupId>
+            <artifactId>iaik_Pkcs11Wrapper</artifactId>
+            <!-- should be in the ext directory of the jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+            <!-- should be provided by the container or jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <!-- should be provided by the container or jre -->
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xmlParserAPIs</artifactId>
+            <!-- should be provided by the container or jre -->
+            <scope>provided</scope>
+        </dependency>
 	</dependencies>
 
 </project>
-- 
cgit v1.2.3


From ef5f57de87191f8296359c4141d562453d15ca20 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Tue, 28 Aug 2007 07:35:22 +0000
Subject: The xalan.jar of the official xalan distribution and the one in the
 central repository differ. So, we are going to include the official one in
 our own distribution to prevent from problems with different versions in the
 endorsed directory of the servlet container or jre.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@966 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/proxy/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index ee8c38c29..24024c9c7 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -88,7 +88,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>xalan</groupId>
+            <groupId>xalan-bin-dist</groupId>
             <artifactId>xalan</artifactId>
             <!-- should be provided by the container or jre -->
             <scope>provided</scope>
-- 
cgit v1.2.3


From 6be52df44678056f95d36f08361b94e2befeb044 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Tue, 28 Aug 2007 11:53:33 +0000
Subject: Xalan artifact serializer.jar added.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@968 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/proxy/pom.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 24024c9c7..3c29d62b5 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -100,11 +100,17 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xmlParserAPIs</artifactId>
+            <groupId>xalan-bin-dist</groupId>
+            <artifactId>xml-apis</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>
-- 
cgit v1.2.3


From 74a6925a47adaac292b3e2da326b08adc0239235 Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Tue, 4 Sep 2007 13:55:12 +0000
Subject: version change to 1.4.1

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@985 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/proxy/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 3c29d62b5..2cb7fedbd 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.0</version>
+		<version>1.4.1</version>
 	</parent>
 
 	<properties>
@@ -16,7 +16,7 @@
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-proxy</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.0</version>
+	<version>1.4.1</version>
 	<name>MOA ID-Proxy WebService</name>
 
 	<build>
-- 
cgit v1.2.3


From 4e12d1df5daab1f7600fa3a58e6fc535375224ff Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Mon, 10 Sep 2007 15:16:34 +0000
Subject: 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
---
 id/server/proxy/pom.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'id/server/proxy')

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>
-- 
cgit v1.2.3


From b33fd8084f4ea1562c9056422ebc111b4a92f2a6 Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Mon, 10 Sep 2007 18:08:08 +0000
Subject: moved test classes, fixed spss-tools build

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1003 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/proxy/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 72397b959..103393d53 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -55,12 +55,12 @@
 		<dependency>
 			<groupId>MOA.spss.server</groupId>
 			<artifactId>moa-spss-lib</artifactId>
-			<version>${project.version}</version>
+			<!--version>${project.version}</version-->
 		</dependency>
 		<dependency>
 			<groupId>MOA.id.server</groupId>
 			<artifactId>moa-id-lib</artifactId>
-			<version>${project.version}</version>
+			<!--version>${project.version}</version-->
 		</dependency>
         <!-- transitive dependencies we don't want to include into the war -->
         <dependency>
-- 
cgit v1.2.3


From 20689558ce4a30b369644e9cf31619237490517f Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Thu, 13 Sep 2007 09:36:37 +0000
Subject: 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
---
 id/server/proxy/pom.xml | 122 ++++++++++++++++++++++++------------------------
 1 file changed, 62 insertions(+), 60 deletions(-)

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 103393d53..218ee02f9 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -1,24 +1,21 @@
-<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">
+<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.2</version>
+		<version>1.4.2beta1</version>
 	</parent>
-
+	
 	<properties>
 		<repositoryPath>${basedir}/../../../repository</repositoryPath>
 	</properties>
-
-
+	
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-proxy</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.2</version>
+	<version>1.4.2beta1</version>
 	<name>MOA ID-Proxy WebService</name>
-
+	
 	<build>
 		<plugins>
 			<plugin>
@@ -31,7 +28,7 @@
 							<addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
 							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
 						</manifest>
-            <addMavenDescriptor>false</addMavenDescriptor>
+						<addMavenDescriptor>false</addMavenDescriptor>
 					</archive>
 <!--
 					<webResources>
@@ -50,8 +47,13 @@
 		</plugins>
 	</build>
 
-
 	<dependencies>
+		<!-- we need Axis 1.4 here because 1.0 is in SPSS included -->
+		<dependency>
+			<groupId>axis</groupId>
+			<artifactId>axis</artifactId>
+			<version>1.4</version>
+		</dependency>
 		<dependency>
 			<groupId>MOA.spss.server</groupId>
 			<artifactId>moa-spss-lib</artifactId>
@@ -62,55 +64,55 @@
 			<artifactId>moa-id-lib</artifactId>
 			<!--version>${project.version}</version-->
 		</dependency>
-        <!-- transitive dependencies we don't want to include into the war -->
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_jce_full</artifactId>
-            <!-- should be in the ext directory of the jre -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_ecc</artifactId>
-            <!-- should be in the ext directory of the jre -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_Pkcs11Provider</artifactId>
-            <!-- should be in the ext directory of the jre -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_Pkcs11Wrapper</artifactId>
-            <!-- should be in the ext directory of the jre -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>xalan-bin-dist</groupId>
-            <artifactId>xalan</artifactId>
-            <!-- should be provided by the container or jre -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <!-- should be provided by the container or jre -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>xalan-bin-dist</groupId>
-            <artifactId>xml-apis</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>
+		<!-- transitive dependencies we don't want to include into the war -->
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_jce_full</artifactId>
+			<!-- should be in the ext directory of the jre -->
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_ecc</artifactId>
+			<!-- should be in the ext directory of the jre -->
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_Pkcs11Provider</artifactId>
+			<!-- should be in the ext directory of the jre -->
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_Pkcs11Wrapper</artifactId>
+			<!-- should be in the ext directory of the jre -->
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>xalan-bin-dist</groupId>
+			<artifactId>xalan</artifactId>
+			<!-- should be provided by the container or jre -->
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<!-- should be provided by the container or jre -->
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>xalan-bin-dist</groupId>
+			<artifactId>xml-apis</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>
-- 
cgit v1.2.3


From 83f01ddf24d98dbb5df41fb627a14edee2d57df7 Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 17 Oct 2007 16:18:44 +0000
Subject: Implemented and integrated party representation and integrated
 mandates as per default available Now Eclipse projects are available. The Web
 Tools Platform can be used to run the web applications

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1014 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/proxy/.classpath                           |  4 ++++
 id/server/proxy/.project                             | 14 ++++++++++++++
 id/server/proxy/.settings/org.eclipse.jdt.core.prefs |  5 +++++
 id/server/proxy/pom.xml                              |  4 ++--
 4 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 id/server/proxy/.classpath
 create mode 100644 id/server/proxy/.project
 create mode 100644 id/server/proxy/.settings/org.eclipse.jdt.core.prefs

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/.classpath b/id/server/proxy/.classpath
new file mode 100644
index 000000000..5d93de69c
--- /dev/null
+++ b/id/server/proxy/.classpath
@@ -0,0 +1,4 @@
+<classpath>
+  <classpathentry kind="output" path="target/classes"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
\ No newline at end of file
diff --git a/id/server/proxy/.project b/id/server/proxy/.project
new file mode 100644
index 000000000..4e175804c
--- /dev/null
+++ b/id/server/proxy/.project
@@ -0,0 +1,14 @@
+<projectDescription>
+  <name>moa-id-proxy</name>
+  <comment/>
+  <projects/>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+      <arguments/>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+  </natures>
+</projectDescription>
\ No newline at end of file
diff --git a/id/server/proxy/.settings/org.eclipse.jdt.core.prefs b/id/server/proxy/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..5ffa1b7e5
--- /dev/null
+++ b/id/server/proxy/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+#Wed Aug 22 09:50:03 CEST 2007
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.3
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.compliance=1.3
diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 218ee02f9..172bb99b5 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.4.2beta1</version>
+		<version>1.4.2beta2</version>
 	</parent>
 	
 	<properties>
@@ -13,7 +13,7 @@
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-proxy</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.2beta1</version>
+	<version>1.4.2beta2</version>
 	<name>MOA ID-Proxy WebService</name>
 	
 	<build>
-- 
cgit v1.2.3


From eaeae88fff31b34a75fff38fb7f08c6c6415aa3d Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 7 Nov 2007 09:55:40 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1035
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 id/server/proxy/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 172bb99b5..0a75d8bdb 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.4.2beta2</version>
+		<version>1.4.2</version>
 	</parent>
 	
 	<properties>
@@ -13,7 +13,7 @@
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-proxy</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.2beta2</version>
+	<version>1.4.2</version>
 	<name>MOA ID-Proxy WebService</name>
 	
 	<build>
-- 
cgit v1.2.3


From 8a0a31c377fbf2873714df580e7ddf8e248e2011 Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 16 Jan 2008 13:36:18 +0000
Subject: Preparation for 1.4.3 release (changed project version)

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1058 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/proxy/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 0a75d8bdb..68e915f6b 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.4.2</version>
+		<version>1.4.3</version>
 	</parent>
 	
 	<properties>
@@ -13,7 +13,7 @@
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-proxy</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.2</version>
+	<version>1.4.3</version>
 	<name>MOA ID-Proxy WebService</name>
 	
 	<build>
-- 
cgit v1.2.3


From 1b3b500b3fbf6a759dc42783f82b202674341564 Mon Sep 17 00:00:00 2001
From: pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Thu, 10 Apr 2008 08:25:10 +0000
Subject: fixed usage of axis (now 1.1)

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1068 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/proxy/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 68e915f6b..906024d5b 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -48,11 +48,11 @@
 	</build>
 
 	<dependencies>
-		<!-- we need Axis 1.4 here because 1.0 is in SPSS included -->
+		<!-- we need Axis 1.1 here, 1.0 is included in SPSS -->
 		<dependency>
 			<groupId>axis</groupId>
 			<artifactId>axis</artifactId>
-			<version>1.4</version>
+			<version>1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>MOA.spss.server</groupId>
-- 
cgit v1.2.3


From 527f2ec316c6d67498ed6dfe37a95218a2ab6f54 Mon Sep 17 00:00:00 2001
From: spuchmann <spuchmann@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Mon, 15 Sep 2008 07:33:53 +0000
Subject: raised version to 1.4.4 moved licenses to root folder fixed Bug 332
 and 333 slVersion changed from 1.1 to 1.2 (MOA-ID-Configuration-1.4.4.xsd)

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1091 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/proxy/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 906024d5b..2255d6c01 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.4.3</version>
+		<version>1.4.4</version>
 	</parent>
 	
 	<properties>
@@ -13,7 +13,7 @@
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-proxy</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.3</version>
+	<version>1.4.4</version>
 	<name>MOA ID-Proxy WebService</name>
 	
 	<build>
-- 
cgit v1.2.3


From aebb5cd04d43b25b8d65237ba49fddf5f5dd1a8c Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Tue, 7 Jul 2009 14:27:40 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1114
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 id/server/proxy/.classpath | 16 +++++++++----
 id/server/proxy/.project   | 56 ++++++++++++++++++++++++++++++++++------------
 id/server/proxy/pom.xml    |  4 ++--
 3 files changed, 56 insertions(+), 20 deletions(-)

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/.classpath b/id/server/proxy/.classpath
index 5d93de69c..af4743f8a 100644
--- a/id/server/proxy/.classpath
+++ b/id/server/proxy/.classpath
@@ -1,4 +1,12 @@
-<classpath>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-</classpath>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/id/server/proxy/.project b/id/server/proxy/.project
index 4e175804c..d58c7c25c 100644
--- a/id/server/proxy/.project
+++ b/id/server/proxy/.project
@@ -1,14 +1,42 @@
-<projectDescription>
-  <name>moa-id-proxy</name>
-  <comment/>
-  <projects/>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-      <arguments/>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-</projectDescription>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>moa-id-proxy</name>
+	<comment></comment>
+	<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>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>
diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 2255d6c01..da63b2d55 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.4.4</version>
+		<version>1.4.5</version>
 	</parent>
 	
 	<properties>
@@ -13,7 +13,7 @@
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-proxy</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.4</version>
+	<version>1.4.5</version>
 	<name>MOA ID-Proxy WebService</name>
 	
 	<build>
-- 
cgit v1.2.3


From 4c7661af6d16a8b598a11548a1df61d526b86b4d Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Thu, 9 Jul 2009 12:52:53 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1115
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 .../src/main/webapp/errorpage-proxy_debug.jsp      | 53 ++++++++++++++++++++++
 .../src/main/webapp/errorpage-proxy_empty.jsp      | 13 ++++++
 2 files changed, 66 insertions(+)
 create mode 100644 id/server/proxy/src/main/webapp/errorpage-proxy_debug.jsp
 create mode 100644 id/server/proxy/src/main/webapp/errorpage-proxy_empty.jsp

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/src/main/webapp/errorpage-proxy_debug.jsp b/id/server/proxy/src/main/webapp/errorpage-proxy_debug.jsp
new file mode 100644
index 000000000..8e1e331d6
--- /dev/null
+++ b/id/server/proxy/src/main/webapp/errorpage-proxy_debug.jsp
@@ -0,0 +1,53 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<%@ page contentType="text/html; charset=UTF-8" %>
+<html>
+<head>
+<title>Ein Fehler ist aufgetreten</title>
+</head>
+<% Throwable exceptionThrown = (Throwable)request.getAttribute("ExceptionThrown");
+   String errorMessage = (String)request.getAttribute("ErrorMessage");
+   String wrongParameters = (String)request.getAttribute("WrongParameters");
+   String logLevel = (String)request.getAttribute("LogLevel");
+%>
+
+<body>
+<h1>Fehler bei der Anmeldung</h1>
+<p>Bei der Anmeldung ist ein Fehler aufgetreten.</p>
+
+<% if (logLevel != null) { %>
+<% if (errorMessage != null) { %>
+<p>
+<%= errorMessage%><br>
+</p>
+<% } %>
+<% if (exceptionThrown != null) { %>
+<p> 
+<%= exceptionThrown.getMessage()%>
+</p>
+<% } %>
+<% if (wrongParameters != null) { %>
+<p>Die Angabe der Parameter ist unvollst&auml;ndig.<br></p>
+<b> <%= wrongParameters %> </b><br>
+<p>
+   Beispiele f&uuml;r korrekte Links zur MOA-ID Authentisierung sind:
+</p>
+<p>
+<tt>&lt;a href="https://&lt;MOA-URL&gt;/StartAuthentication?Target=&lt;Gesch&auml;ftsbereich&gt;&amp;OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&quot;&gt;</tt>
+</p>
+<p>
+<tt>&lt;a href="https://&lt;MOA-URL&gt;/SelectBKU?Target=&lt;Gesch&auml;ftsbereich&gt;&amp;OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&amp;BKUSelectionTemplate=&lt;BKU-Template-URL&gt;&quot;&gt;</tt>
+</p>
+<p>
+Im Falle einer Applikation aus dem privatwirtschaftlichen Bereich (type="businessService") entf&auml;llt die Angabe des <i>Target</i> Parameters:
+</p>
+<p>
+<tt>&lt;a href="https://&lt;MOA-URL&gt;/StartAuthentication?OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&quot;&gt;</tt>
+</p>
+<p>
+<tt>&lt;a href="https://&lt;MOA-URL&gt;/SelectBKU?OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&amp;BKUSelectionTemplate=&lt;BKU-Template-URL&gt;&quot;&gt;</tt>
+</p>
+<p>Die Angabe der Parameter <tt>&quot;Template&quot;</tt> und <tt>&quot;BKUSelectionTemplate&quot;</tt> ist optional.</p>
+<% } %>
+<% } %>
+</body>
+</html>
\ No newline at end of file
diff --git a/id/server/proxy/src/main/webapp/errorpage-proxy_empty.jsp b/id/server/proxy/src/main/webapp/errorpage-proxy_empty.jsp
new file mode 100644
index 000000000..40739efea
--- /dev/null
+++ b/id/server/proxy/src/main/webapp/errorpage-proxy_empty.jsp
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<%@ page contentType="text/html; charset=UTF-8" %>
+<html>
+<head>
+<title>Ein Fehler ist aufgetreten</title>
+</head>
+
+<body>
+<h1>Fehler bei der Anmeldung</h1>
+<p>Bei der Anmeldung ist ein Fehler aufgetreten.</p>
+
+</body>
+</html>
\ No newline at end of file
-- 
cgit v1.2.3


From 86cbff480108f28e40b8ef2896fbf4b4c2b07bea Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Mon, 13 Jul 2009 09:25:22 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1118
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 .../src/main/webapp/errorpage-proxy_debug.jsp      | 53 ----------------------
 .../src/main/webapp/errorpage-proxy_empty.jsp      | 13 ------
 2 files changed, 66 deletions(-)
 delete mode 100644 id/server/proxy/src/main/webapp/errorpage-proxy_debug.jsp
 delete mode 100644 id/server/proxy/src/main/webapp/errorpage-proxy_empty.jsp

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/src/main/webapp/errorpage-proxy_debug.jsp b/id/server/proxy/src/main/webapp/errorpage-proxy_debug.jsp
deleted file mode 100644
index 8e1e331d6..000000000
--- a/id/server/proxy/src/main/webapp/errorpage-proxy_debug.jsp
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<%@ page contentType="text/html; charset=UTF-8" %>
-<html>
-<head>
-<title>Ein Fehler ist aufgetreten</title>
-</head>
-<% Throwable exceptionThrown = (Throwable)request.getAttribute("ExceptionThrown");
-   String errorMessage = (String)request.getAttribute("ErrorMessage");
-   String wrongParameters = (String)request.getAttribute("WrongParameters");
-   String logLevel = (String)request.getAttribute("LogLevel");
-%>
-
-<body>
-<h1>Fehler bei der Anmeldung</h1>
-<p>Bei der Anmeldung ist ein Fehler aufgetreten.</p>
-
-<% if (logLevel != null) { %>
-<% if (errorMessage != null) { %>
-<p>
-<%= errorMessage%><br>
-</p>
-<% } %>
-<% if (exceptionThrown != null) { %>
-<p> 
-<%= exceptionThrown.getMessage()%>
-</p>
-<% } %>
-<% if (wrongParameters != null) { %>
-<p>Die Angabe der Parameter ist unvollst&auml;ndig.<br></p>
-<b> <%= wrongParameters %> </b><br>
-<p>
-   Beispiele f&uuml;r korrekte Links zur MOA-ID Authentisierung sind:
-</p>
-<p>
-<tt>&lt;a href="https://&lt;MOA-URL&gt;/StartAuthentication?Target=&lt;Gesch&auml;ftsbereich&gt;&amp;OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&quot;&gt;</tt>
-</p>
-<p>
-<tt>&lt;a href="https://&lt;MOA-URL&gt;/SelectBKU?Target=&lt;Gesch&auml;ftsbereich&gt;&amp;OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&amp;BKUSelectionTemplate=&lt;BKU-Template-URL&gt;&quot;&gt;</tt>
-</p>
-<p>
-Im Falle einer Applikation aus dem privatwirtschaftlichen Bereich (type="businessService") entf&auml;llt die Angabe des <i>Target</i> Parameters:
-</p>
-<p>
-<tt>&lt;a href="https://&lt;MOA-URL&gt;/StartAuthentication?OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&quot;&gt;</tt>
-</p>
-<p>
-<tt>&lt;a href="https://&lt;MOA-URL&gt;/SelectBKU?OA=&lt;OA-URL&gt;&amp;Template=&lt;Template-URL&gt;&amp;BKUSelectionTemplate=&lt;BKU-Template-URL&gt;&quot;&gt;</tt>
-</p>
-<p>Die Angabe der Parameter <tt>&quot;Template&quot;</tt> und <tt>&quot;BKUSelectionTemplate&quot;</tt> ist optional.</p>
-<% } %>
-<% } %>
-</body>
-</html>
\ No newline at end of file
diff --git a/id/server/proxy/src/main/webapp/errorpage-proxy_empty.jsp b/id/server/proxy/src/main/webapp/errorpage-proxy_empty.jsp
deleted file mode 100644
index 40739efea..000000000
--- a/id/server/proxy/src/main/webapp/errorpage-proxy_empty.jsp
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<%@ page contentType="text/html; charset=UTF-8" %>
-<html>
-<head>
-<title>Ein Fehler ist aufgetreten</title>
-</head>
-
-<body>
-<h1>Fehler bei der Anmeldung</h1>
-<p>Bei der Anmeldung ist ein Fehler aufgetreten.</p>
-
-</body>
-</html>
\ No newline at end of file
-- 
cgit v1.2.3


From b96b2ef653f6bc62ca8a7880dde525dc44d9a8b7 Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Mon, 10 Aug 2009 09:23:17 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1123
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 id/server/proxy/.settings/.jsdtscope                    | 11 +++++++++++
 .../proxy/.settings/org.eclipse.wst.common.component    | 17 +++++++++++++++++
 .../org.eclipse.wst.common.project.facet.core.xml       |  5 +++++
 .../org.eclipse.wst.jsdt.ui.superType.container         |  1 +
 .../.settings/org.eclipse.wst.jsdt.ui.superType.name    |  1 +
 id/server/proxy/.settings/org.maven.ide.eclipse.prefs   |  9 +++++++++
 id/server/proxy/src/main/webapp/META-INF/MANIFEST.MF    |  3 +++
 7 files changed, 47 insertions(+)
 create mode 100644 id/server/proxy/.settings/.jsdtscope
 create mode 100644 id/server/proxy/.settings/org.eclipse.wst.common.component
 create mode 100644 id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml
 create mode 100644 id/server/proxy/.settings/org.eclipse.wst.jsdt.ui.superType.container
 create mode 100644 id/server/proxy/.settings/org.eclipse.wst.jsdt.ui.superType.name
 create mode 100644 id/server/proxy/.settings/org.maven.ide.eclipse.prefs
 create mode 100644 id/server/proxy/src/main/webapp/META-INF/MANIFEST.MF

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/.settings/.jsdtscope b/id/server/proxy/.settings/.jsdtscope
new file mode 100644
index 000000000..f40dd98e2
--- /dev/null
+++ b/id/server/proxy/.settings/.jsdtscope
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+		<attributes>
+			<attribute name="hide" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/id/server/proxy/.settings/org.eclipse.wst.common.component b/id/server/proxy/.settings/org.eclipse.wst.common.component
new file mode 100644
index 000000000..fad3275dd
--- /dev/null
+++ b/id/server/proxy/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="moa-id-proxy">
+        <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <property name="context-root" value="moa-id-proxy"/>
+        <property name="java-output-path"/>
+    </wb-module>
+</project-modules>
diff --git a/id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 000000000..f30a1de6e
--- /dev/null
+++ b/id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="jst.java" version="1.4"/>
+  <installed facet="jst.web" version="2.3"/>
+</faceted-project>
diff --git a/id/server/proxy/.settings/org.eclipse.wst.jsdt.ui.superType.container b/id/server/proxy/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 000000000..3bd5d0a48
--- /dev/null
+++ b/id/server/proxy/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/id/server/proxy/.settings/org.eclipse.wst.jsdt.ui.superType.name b/id/server/proxy/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 000000000..05bd71b6e
--- /dev/null
+++ b/id/server/proxy/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Window
\ No newline at end of file
diff --git a/id/server/proxy/.settings/org.maven.ide.eclipse.prefs b/id/server/proxy/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 000000000..3f907cfa1
--- /dev/null
+++ b/id/server/proxy/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,9 @@
+#Tue Jul 07 16:06:59 CEST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
diff --git a/id/server/proxy/src/main/webapp/META-INF/MANIFEST.MF b/id/server/proxy/src/main/webapp/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..5e9495128
--- /dev/null
+++ b/id/server/proxy/src/main/webapp/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+
-- 
cgit v1.2.3


From 1b31446e98307fb58120ea32d9ca6b449bceb8fa Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Mon, 17 Aug 2009 06:11:43 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1134
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 .../proxy/.settings/org.eclipse.jdt.core.prefs.merge-left.r1113    | 5 +++++
 .../proxy/.settings/org.eclipse.jdt.core.prefs.merge-right.r1113   | 7 +++++++
 id/server/proxy/.settings/org.eclipse.jdt.core.prefs.working       | 7 +++++++
 3 files changed, 19 insertions(+)
 create mode 100644 id/server/proxy/.settings/org.eclipse.jdt.core.prefs.merge-left.r1113
 create mode 100644 id/server/proxy/.settings/org.eclipse.jdt.core.prefs.merge-right.r1113
 create mode 100644 id/server/proxy/.settings/org.eclipse.jdt.core.prefs.working

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/.settings/org.eclipse.jdt.core.prefs.merge-left.r1113 b/id/server/proxy/.settings/org.eclipse.jdt.core.prefs.merge-left.r1113
new file mode 100644
index 000000000..5ffa1b7e5
--- /dev/null
+++ b/id/server/proxy/.settings/org.eclipse.jdt.core.prefs.merge-left.r1113
@@ -0,0 +1,5 @@
+#Wed Aug 22 09:50:03 CEST 2007
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.3
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.compliance=1.3
diff --git a/id/server/proxy/.settings/org.eclipse.jdt.core.prefs.merge-right.r1113 b/id/server/proxy/.settings/org.eclipse.jdt.core.prefs.merge-right.r1113
new file mode 100644
index 000000000..88af5dc39
--- /dev/null
+++ b/id/server/proxy/.settings/org.eclipse.jdt.core.prefs.merge-right.r1113
@@ -0,0 +1,7 @@
+#Thu May 28 10:03:21 CEST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+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
diff --git a/id/server/proxy/.settings/org.eclipse.jdt.core.prefs.working b/id/server/proxy/.settings/org.eclipse.jdt.core.prefs.working
new file mode 100644
index 000000000..53bd4313d
--- /dev/null
+++ b/id/server/proxy/.settings/org.eclipse.jdt.core.prefs.working
@@ -0,0 +1,7 @@
+#Tue Jul 07 16:07:23 CEST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+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
-- 
cgit v1.2.3


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

---
 id/server/proxy/.project                             | 5 -----
 id/server/proxy/.settings/org.eclipse.jdt.core.prefs | 8 ++++----
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/.project b/id/server/proxy/.project
index d58c7c25c..5aa808c31 100644
--- a/id/server/proxy/.project
+++ b/id/server/proxy/.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/id/server/proxy/.settings/org.eclipse.jdt.core.prefs b/id/server/proxy/.settings/org.eclipse.jdt.core.prefs
index 5ffa1b7e5..d70bf9268 100644
--- a/id/server/proxy/.settings/org.eclipse.jdt.core.prefs
+++ b/id/server/proxy/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
-#Wed Aug 22 09:50:03 CEST 2007
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.3
+#Mon Aug 17 10:06:16 CEST 2009
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.compiler.compliance=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
-- 
cgit v1.2.3


From afa2a5ca9f92e81b594e8f29d9588d5e8690fba8 Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Thu, 17 Sep 2009 09:45:46 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1145
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 id/server/proxy/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index da63b2d55..5bc7f77ae 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.4.5</version>
+		<version>1.4.6</version>
 	</parent>
 	
 	<properties>
@@ -13,7 +13,7 @@
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-proxy</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.5</version>
+	<version>1.4.6</version>
 	<name>MOA ID-Proxy WebService</name>
 	
 	<build>
-- 
cgit v1.2.3


From 68af85701b6f797b0d662b89b95e043ee949defd Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Fri, 2 Jul 2010 07:14:41 +0000
Subject: Merged branch 1.4.7_MOASP_TSL back into trunk.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1165 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 .../.settings/org.eclipse.wst.common.component     | 34 +++++++++++-----------
 id/server/proxy/pom.xml                            |  4 +--
 2 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/.settings/org.eclipse.wst.common.component b/id/server/proxy/.settings/org.eclipse.wst.common.component
index fad3275dd..a934dee5b 100644
--- a/id/server/proxy/.settings/org.eclipse.wst.common.component
+++ b/id/server/proxy/.settings/org.eclipse.wst.common.component
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="moa-id-proxy">
-        <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
-        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <property name="context-root" value="moa-id-proxy"/>
-        <property name="java-output-path"/>
-    </wb-module>
-</project-modules>
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="moa-id-proxy">
+        <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <property name="context-root" value="moa-id-proxy"/>
+        <property name="java-output-path"/>
+    </wb-module>
+</project-modules>
diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 5bc7f77ae..754381607 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.4.6</version>
+		<version>1.4.7</version>
 	</parent>
 	
 	<properties>
@@ -13,7 +13,7 @@
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-proxy</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.6</version>
+	<version>1.4.7</version>
 	<name>MOA ID-Proxy WebService</name>
 	
 	<build>
-- 
cgit v1.2.3


From fa30b5b2a26a6df4e56a81283761c35ef81770e3 Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Tue, 13 Jul 2010 06:25:09 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1166
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 .../.settings/org.eclipse.wst.common.component     | 34 +++++++++++-----------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/.settings/org.eclipse.wst.common.component b/id/server/proxy/.settings/org.eclipse.wst.common.component
index a934dee5b..fad3275dd 100644
--- a/id/server/proxy/.settings/org.eclipse.wst.common.component
+++ b/id/server/proxy/.settings/org.eclipse.wst.common.component
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="moa-id-proxy">
-        <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
-        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <property name="context-root" value="moa-id-proxy"/>
-        <property name="java-output-path"/>
-    </wb-module>
-</project-modules>
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="moa-id-proxy">
+        <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <property name="context-root" value="moa-id-proxy"/>
+        <property name="java-output-path"/>
+    </wb-module>
+</project-modules>
-- 
cgit v1.2.3


From 63994a018a74808e6124e45e32a970c9a24410ee Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Thu, 26 Aug 2010 13:49:48 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1186
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 id/server/proxy/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 754381607..739424fc4 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.4.7</version>
+		<version>1.4.8</version>
 	</parent>
 	
 	<properties>
@@ -13,7 +13,7 @@
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-proxy</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.7</version>
+	<version>1.4.8</version>
 	<name>MOA ID-Proxy WebService</name>
 	
 	<build>
-- 
cgit v1.2.3


From 9419526705fcc60555a686c3c91bc45d06efe739 Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Mon, 24 Jan 2011 13:51:25 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1194
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 id/server/proxy/src/main/webapp/WEB-INF/web.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/src/main/webapp/WEB-INF/web.xml b/id/server/proxy/src/main/webapp/WEB-INF/web.xml
index b11606fe0..57926f207 100644
--- a/id/server/proxy/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/proxy/src/main/webapp/WEB-INF/web.xml
@@ -58,7 +58,7 @@
 	</session-config>
 	<error-page>
 		<error-code>500</error-code>
-		<location>/errorpage.jsp</location>
+		<location>/errorpage-proxy.jsp</location>
 	</error-page>
 	<security-constraint>
 		<web-resource-collection>
-- 
cgit v1.2.3


From ff023754e7ac46af874d00458840f50976fb7b38 Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Wed, 16 Mar 2011 12:20:24 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1195
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 id/server/proxy/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 739424fc4..14f0f8d54 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.4.8</version>
+		<version>1.5.0</version>
 	</parent>
 	
 	<properties>
@@ -13,7 +13,7 @@
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-proxy</artifactId>
 	<packaging>war</packaging>
-	<version>1.4.8</version>
+	<version>1.5.0</version>
 	<name>MOA ID-Proxy WebService</name>
 	
 	<build>
-- 
cgit v1.2.3


From 22597803f471751da6ecef1cb66fca8b833a69ec Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Fri, 30 Sep 2011 07:39:29 +0000
Subject: Update Versionsnummer auf 1.5.1

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1215 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/proxy/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml
index 14f0f8d54..50cb3e054 100644
--- a/id/server/proxy/pom.xml
+++ b/id/server/proxy/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>MOA.id</groupId>
 		<artifactId>moa-id</artifactId>
-		<version>1.5.0</version>
+		<version>1.5.1</version>
 	</parent>
 	
 	<properties>
@@ -13,7 +13,7 @@
 	<groupId>MOA.id.server</groupId>
 	<artifactId>moa-id-proxy</artifactId>
 	<packaging>war</packaging>
-	<version>1.5.0</version>
+	<version>1.5.1</version>
 	<name>MOA ID-Proxy WebService</name>
 	
 	<build>
-- 
cgit v1.2.3


From 8c8ddf0a97c65b1b39dad580c45e19cfa7e20a7e Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Fri, 17 Feb 2012 18:41:30 +0000
Subject: Update libs (iaik_moa-1.32.jar und iaik_ixsil-1.2.2.5.jar)

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1251 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/server/proxy/.classpath | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/.classpath b/id/server/proxy/.classpath
index af4743f8a..df4174ed6 100644
--- a/id/server/proxy/.classpath
+++ b/id/server/proxy/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
@@ -8,5 +7,6 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
-- 
cgit v1.2.3


From 301d79362bb1844629f4a25dbbefd216edcd68ef Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Fri, 17 Feb 2012 18:48:41 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1256
 d688527b-c9ab-4aba-bd8d-4036d912da1d

---
 id/server/proxy/.classpath | 12 ------------
 id/server/proxy/.project   | 37 -------------------------------------
 2 files changed, 49 deletions(-)
 delete mode 100644 id/server/proxy/.classpath
 delete mode 100644 id/server/proxy/.project

(limited to 'id/server/proxy')

diff --git a/id/server/proxy/.classpath b/id/server/proxy/.classpath
deleted file mode 100644
index df4174ed6..000000000
--- a/id/server/proxy/.classpath
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/id/server/proxy/.project b/id/server/proxy/.project
deleted file mode 100644
index 5aa808c31..000000000
--- a/id/server/proxy/.project
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>moa-id-proxy</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
-	</natures>
-</projectDescription>
-- 
cgit v1.2.3