diff options
21 files changed, 354 insertions, 78 deletions
| @@ -25,8 +25,14 @@  			<arguments>
  			</arguments>
  		</buildCommand>
 +		<buildCommand>
 +			<name>org.eclipse.m2e.core.maven2Builder</name>
 +			<arguments>
 +			</arguments>
 +		</buildCommand>
  	</buildSpec>
  	<natures>
 +		<nature>org.eclipse.m2e.core.maven2Nature</nature>
  		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
  		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
  		<nature>org.eclipse.jdt.core.javanature</nature>
 diff --git a/common/.settings/org.eclipse.wst.common.component b/common/.settings/org.eclipse.wst.common.component index 4dd7e3409..386d0ebba 100644 --- a/common/.settings/org.eclipse.wst.common.component +++ b/common/.settings/org.eclipse.wst.common.component @@ -1,7 +1,6 @@ -<?xml version="1.0" encoding="UTF-8"?>
 -<project-modules id="moduleCoreId" project-version="2.0">
 +<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
    <wb-module deploy-name="moa-common">
      <wb-resource deploy-path="/" source-path="src/main/java"/>
      <wb-resource deploy-path="/" source-path="src/main/resources"/>
    </wb-module>
 -</project-modules>
\ No newline at end of file +</project-modules>
 diff --git a/id/oa/.settings/org.eclipse.jdt.core.prefs b/id/oa/.settings/org.eclipse.jdt.core.prefs index f2c34578f..dc0892a32 100644 --- a/id/oa/.settings/org.eclipse.jdt.core.prefs +++ b/id/oa/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ -#Tue Jul 17 08:40:59 CEST 2012
  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.codegen.inlineJsrBytecode=enabled
 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 +org.eclipse.jdt.core.compiler.compliance=1.5
 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
  org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 -org.eclipse.jdt.core.compiler.source=1.3
 +org.eclipse.jdt.core.compiler.source=1.5
 diff --git a/id/oa/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/oa/.settings/org.eclipse.wst.common.project.facet.core.xml index a801c94a0..73c938daf 100644 --- a/id/oa/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/id/oa/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -3,5 +3,5 @@    <fixed facet="jst.java"/>
    <fixed facet="jst.web"/>
    <installed facet="jst.web" version="2.4"/>
 -  <installed facet="jst.java" version="1.4"/>
 -</faceted-project>
\ No newline at end of file +  <installed facet="jst.java" version="1.5"/>
 +</faceted-project>
 diff --git a/id/oa/.settings/org.maven.ide.eclipse.prefs b/id/oa/.settings/org.maven.ide.eclipse.prefs index b6ca61b99..7f28ca3cd 100644 --- a/id/oa/.settings/org.maven.ide.eclipse.prefs +++ b/id/oa/.settings/org.maven.ide.eclipse.prefs @@ -1,4 +1,3 @@ -#Tue Jul 07 16:06:56 CEST 2009
  activeProfiles=
  eclipse.preferences.version=1
  fullBuildGoals=process-test-resources
 diff --git a/id/server/auth/.settings/org.eclipse.wst.common.component b/id/server/auth/.settings/org.eclipse.wst.common.component index d9c09d9ad..fa80111cf 100644 --- a/id/server/auth/.settings/org.eclipse.wst.common.component +++ b/id/server/auth/.settings/org.eclipse.wst.common.component @@ -1,19 +1,15 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project-modules id="moduleCoreId" project-version="1.5.0"> +<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">    <wb-module deploy-name="moa-id-auth"> -        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib"> +        <dependent-module archiveName="moa-common-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">              <dependency-type>uses</dependency-type>          </dependent-module> -        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common"> +        <dependent-module archiveName="moa-id-lib-1.9.90-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">              <dependency-type>uses</dependency-type>          </dependent-module> -        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib"> +        <dependent-module archiveName="stork-saml-engine-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/stork-saml-engine/stork-saml-engine">              <dependency-type>uses</dependency-type>          </dependent-module> -        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/stork-saml-engine/stork-saml-engine"> -            <dependency-type>uses</dependency-type> -        </dependent-module> -        <dependent-module archiveName="moa-id-commons.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-commons/moa-id-commons"> +        <dependent-module archiveName="moa-id-commons-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-commons/moa-id-commons">              <dependency-type>uses</dependency-type>          </dependent-module>      <property name="context-root" value="moa-id-auth"/> diff --git a/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml index 564572b10..ac59587b0 100644 --- a/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/id/server/auth/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -2,6 +2,6 @@  <faceted-project>
    <fixed facet="jst.java"/>
    <fixed facet="jst.web"/>
 -  <installed facet="jst.web" version="2.4"/>
    <installed facet="jst.java" version="5.0"/>
 -</faceted-project>
\ No newline at end of file +  <installed facet="jst.web" version="2.3"/>
 +</faceted-project>
 diff --git a/id/server/auth/.settings/org.maven.ide.eclipse.prefs b/id/server/auth/.settings/org.maven.ide.eclipse.prefs index a45f64227..7f28ca3cd 100644 --- a/id/server/auth/.settings/org.maven.ide.eclipse.prefs +++ b/id/server/auth/.settings/org.maven.ide.eclipse.prefs @@ -1,4 +1,3 @@ -#Tue Jul 07 16:07:00 CEST 2009
  activeProfiles=
  eclipse.preferences.version=1
  fullBuildGoals=process-test-resources
 diff --git a/id/server/idserverlib/.settings/org.eclipse.wst.common.component b/id/server/idserverlib/.settings/org.eclipse.wst.common.component index de749d201..8f3380621 100644 --- a/id/server/idserverlib/.settings/org.eclipse.wst.common.component +++ b/id/server/idserverlib/.settings/org.eclipse.wst.common.component @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?>
 -<project-modules id="moduleCoreId" project-version="1.5.0">
 +<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
    <wb-module deploy-name="moa-id-lib">
      <wb-resource deploy-path="/" source-path="src/main/java"/>
      <wb-resource deploy-path="/" source-path="src/main/resources"/>
 -    <wb-resource deploy-path="/" source-path="/src/test/java"/>    
 +        <wb-resource deploy-path="/" source-path="/src/main/java"/>
 +        <wb-resource deploy-path="/" source-path="/src/main/resources"/>
    </wb-module>
 -</project-modules>
\ No newline at end of file +</project-modules>
 diff --git a/id/server/idserverlib/.settings/org.maven.ide.eclipse.prefs b/id/server/idserverlib/.settings/org.maven.ide.eclipse.prefs index 3f907cfa1..7f28ca3cd 100644 --- a/id/server/idserverlib/.settings/org.maven.ide.eclipse.prefs +++ b/id/server/idserverlib/.settings/org.maven.ide.eclipse.prefs @@ -1,4 +1,3 @@ -#Tue Jul 07 16:06:59 CEST 2009
  activeProfiles=
  eclipse.preferences.version=1
  fullBuildGoals=process-test-resources
 diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java index ba66041d7..19af66150 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java @@ -2269,17 +2269,17 @@ public class AuthenticationServer implements MOAIDAuthConstants {  	 * @return SAML artifact needed for retrieving authentication data, encoded  	 *         BASE64  	 */ -	public String getForeignAuthenticationData(String sessionID) +	public String getForeignAuthenticationData(AuthenticationSession session)  			throws AuthenticationException, BuildException, ParseException,  			ConfigurationException, ServiceException, ValidateException {  		//TODO: CHECK if STORK parts works correct!!!! -		if (isEmpty(sessionID)) +		if (session == null)  			throw new AuthenticationException("auth.10", new Object[] {  					REQ_VERIFY_AUTH_BLOCK, PARAM_SESSIONID }); -		AuthenticationSession session = getSession(sessionID); +		//AuthenticationSession session = getSession(sessionID);  		// AuthConfigurationProvider authConf =  		// AuthConfigurationProvider.getInstance(); @@ -2348,12 +2348,7 @@ public class AuthenticationServer implements MOAIDAuthConstants {  		vsresp.setX509certificate(null);  		session.setForeigner(true); -		//session is implicit stored in changeSessionID!!!!  -		String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(session); -		 -		Logger.info("Changed MOASession " + sessionID + " to Session " + newMOASessionID); -		Logger.info("Daten angelegt zu MOASession " + newMOASessionID); -		return newMOASessionID; +		return "new Session";  		//TODO: regenerate MOASession ID!  		/* diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java index 935edb557..d49f4e215 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java @@ -179,7 +179,15 @@ public class GetForeignIDServlet extends AuthServlet {  		    	session.setIdentityLink(identitylink);
  		    	String samlArtifactBase64 = 
 -		    		AuthenticationServer.getInstance().getForeignAuthenticationData(sessionID); +		    		AuthenticationServer.getInstance().getForeignAuthenticationData(session); +		    	 +		    	 +	    		//session is implicit stored in changeSessionID!!!!  +	    		String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(session); +	    		 +	    		Logger.info("Changed MOASession " + sessionID + " to Session " + newMOASessionID); +	    		Logger.info("Daten angelegt zu MOASession " + newMOASessionID); +		    	  		    	if (!samlArtifactBase64.equals("Redirect to Input Processor")) {  		    		/*redirectURL = session.getOAURLRequested();  		    		if (!session.getBusinessService()) { @@ -188,11 +196,12 @@ public class GetForeignIDServlet extends AuthServlet {  		    		redirectURL = addURLParameter(redirectURL, PARAM_SAMLARTIFACT, URLEncoder.encode(samlArtifactBase64, "UTF-8"));  		    		redirectURL = resp.encodeRedirectURL(redirectURL);*/  		    		redirectURL = new DataURLBuilder().buildDataURL(session.getAuthURL(),  -							ModulUtils.buildAuthURL(session.getModul(), session.getAction()), samlArtifactBase64); +							ModulUtils.buildAuthURL(session.getModul(), session.getAction()), newMOASessionID);  		    		redirectURL = resp.encodeRedirectURL(redirectURL); -		    	} else { -		    		redirectURL = new DataURLBuilder().buildDataURL(session.getAuthURL(), AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, session.getSessionID()); +		    	} else {				    		 +		    		redirectURL = new DataURLBuilder().buildDataURL(session.getAuthURL(), AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, newMOASessionID); +		    		  		    	}
  		    	try { diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java index 3c8892e33..63bc2a8cc 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java @@ -196,9 +196,15 @@ public class PEPSConnectorServlet extends AuthServlet {  			Logger.debug("Starting to assemble MOA assertion");
  			//produce MOA-Assertion and artifact			
  			String samlArtifactBase64 = 
 -	    		AuthenticationServer.getInstance().getForeignAuthenticationData(moaSessionID);
 +	    		AuthenticationServer.getInstance().getForeignAuthenticationData(moaSession);
  			Logger.info("MOA assertion assembled and SAML Artifact generated.");
 +    		//session is implicit stored in changeSessionID!!!! 
 +    		String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(moaSession);
 +    		
 +    		Logger.info("Changed MOASession " + moaSessionID + " to Session " + newMOASessionID);
 +    		Logger.info("Daten angelegt zu MOASession " + newMOASessionID);
 +			
  			//redirect
  			String redirectURL = null;
  	    	if (!samlArtifactBase64.equals("Redirect to Input Processor")) {
 @@ -209,10 +215,11 @@ public class PEPSConnectorServlet extends AuthServlet {  	    		redirectURL = addURLParameter(redirectURL, PARAM_SAMLARTIFACT, URLEncoder.encode(samlArtifactBase64, "UTF-8"));
  	    		redirectURL = response.encodeRedirectURL(redirectURL);*/
  	    		redirectURL = new DataURLBuilder().buildDataURL(moaSession.getAuthURL(), 
 -						ModulUtils.buildAuthURL(moaSession.getModul(), moaSession.getAction()), samlArtifactBase64);
 +						ModulUtils.buildAuthURL(moaSession.getModul(), moaSession.getAction()), newMOASessionID);
  	    		redirectURL = response.encodeRedirectURL(redirectURL);
  	    	} else {
 -	    		redirectURL = new DataURLBuilder().buildDataURL(moaSession.getAuthURL(), AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, moaSession.getSessionID());
 +	    		
 +	    		redirectURL = new DataURLBuilder().buildDataURL(moaSession.getAuthURL(), AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, newMOASessionID);
  	    	}
  	        try {
 diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java index 7b5c1513a..e07be8420 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java @@ -144,6 +144,12 @@ public class VerifyCertificateServlet extends AuthServlet {  	    		// verify certificate for OrganWalter  	    		String createXMLSignatureRequestOrRedirect = AuthenticationServer.getInstance().verifyCertificate(session, cert); +		    	try { +					AuthenticationSessionStoreage.storeSession(session); +				} catch (MOADatabaseException e) { +					throw new MOAIDException("session store error", null); +				} +	    		  	    		ServletUtils.writeCreateXMLSignatureRequestOrRedirect(resp, session, createXMLSignatureRequestOrRedirect, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "VerifyIdentityLink");
  	    	}
  	    	else {
 @@ -156,19 +162,19 @@ public class VerifyCertificateServlet extends AuthServlet {  	               session.getAuthURL(),
  	               REQ_GET_FOREIGN_ID,
  	               session.getSessionID());
 -	       
 +	        +		    	try { +					AuthenticationSessionStoreage.storeSession(session); +				} catch (MOADatabaseException e) { +					throw new MOAIDException("session store error", null); +				} +		    	
  		    	ServletUtils.writeCreateXMLSignatureRequest(resp, session, createXMLSignatureRequest, AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, "GetForeignID", dataurl);
  		    	Logger.debug("Send CreateXMLSignatureRequest to BKU");
  	    	} -	    	 -	    	try { -				AuthenticationSessionStoreage.storeSession(session); -			} catch (MOADatabaseException e) { -				throw new MOAIDException("session store error", null); -			}
 -	    	   		      
 +	    		    	 
  	    }
  	    catch (MOAIDException ex) {
  	      handleError(null, ex, req, resp);
 diff --git a/id/server/moa-id-commons/.classpath b/id/server/moa-id-commons/.classpath index a3f1bdc53..8b5a9fa96 100644 --- a/id/server/moa-id-commons/.classpath +++ b/id/server/moa-id-commons/.classpath @@ -25,8 +25,8 @@  	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">  		<attributes>  			<attribute name="maven.pomderived" value="true"/> +			<attribute name="org.eclipse.jst.component.nondependency" value=""/>  		</attributes>  	</classpathentry> -	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>  	<classpathentry kind="output" path="target/classes"/>  </classpath> diff --git a/id/server/proxy/.settings/org.eclipse.wst.common.component b/id/server/proxy/.settings/org.eclipse.wst.common.component index fa97f3880..6570beb50 100644 --- a/id/server/proxy/.settings/org.eclipse.wst.common.component +++ b/id/server/proxy/.settings/org.eclipse.wst.common.component @@ -1,20 +1,287 @@  <?xml version="1.0" encoding="UTF-8"?>
 -<project-modules id="moduleCoreId" project-version="1.5.0">
 +<project-modules id="moduleCoreId" project-version="2.0">
    <wb-module deploy-name="moa-id-proxy">
 -        <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>
 -        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/stork-saml-engine/stork-saml-engine">
 -            <dependency-type>uses</dependency-type>
 -        </dependent-module>
      <property name="context-root" value="moa-id-proxy"/>
      <wb-resource deploy-path="/" source-path="src/main/webapp"/>
      <property name="java-output-path" value="/target/classes"/>
 +    <dependent-module archiveName="axis-1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/axis/axis/1.1/axis-1.1.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="moa-spss-lib.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="axis-jaxrpc-1.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/axis/axis-jaxrpc/1.4/axis-jaxrpc-1.4.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="axis-saaj-1.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/axis/axis-saaj/1.4/axis-saaj-1.4.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="axis-wsdl4j-1.5.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/axis/axis-wsdl4j/1.5.1/axis-wsdl4j-1.5.1.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="commons-discovery-0.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="commons-logging-1.0.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="activation-1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/activation/activation/1.1/activation-1.1.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="mail-1.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/mail/mail/1.4/mail-1.4.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="log4j-1.2.14.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="postgresql-7.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/postgresql/postgresql/7.2/postgresql-7.2.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="iaik_moa-1.32.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_moa/1.32/iaik_moa-1.32.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="iaik_ixsil-1.2.2.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_ixsil/1.2.2.5/iaik_ixsil-1.2.2.5.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="iaik_cms-4.1_MOA.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_cms/4.1_MOA/iaik_cms-4.1_MOA.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="moa-common.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="jaxen-1.0-FCS.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/jaxen/jaxen/1.0-FCS/jaxen-1.0-FCS.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="saxpath-1.0-FCS.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/saxpath/saxpath/1.0-FCS/saxpath-1.0-FCS.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="joda-time-1.6.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/joda-time/joda-time/1.6.2/joda-time-1.6.2.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="iaik_tsl-0.0.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_tsl/0.0.2-SNAPSHOT/iaik_tsl-0.0.2-SNAPSHOT.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="iaik_util-0.23.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_util/0.23/iaik_util-0.23.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="iaik_xsect-1.1709142.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_xsect/1.1709142/iaik_xsect-1.1709142.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="jaxb-api-2.2.6.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/javax/xml/bind/jaxb-api/2.2.6/jaxb-api-2.2.6.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="jaxb-impl-2.2.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/com/sun/xml/bind/jaxb-impl/2.2.5/jaxb-impl-2.2.5.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="sqlite-jdbc-3.7.8-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/xerial/sqlite-jdbc/3.7.8-SNAPSHOT/sqlite-jdbc-3.7.8-SNAPSHOT.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="iaik_jsse-4.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_jsse/4.4/iaik_jsse-4.4.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="moa-id-lib.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="commons-fileupload-1.1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="commons-io-1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="commons-httpclient-3.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="commons-codec-1.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="dav4j-0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/dav4j/dav4j/0.1/dav4j-0.1.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="httpsclient-JSSE-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/httpsclient/httpsclient/JSSE-1.0/httpsclient-JSSE-1.0.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="iaik_X509TrustManager-0.3.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/iaik/prod/iaik_X509TrustManager/0.3/iaik_X509TrustManager-0.3.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="shibboleth-common-1.4.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/edu/internet2/middleware/shibboleth-common/1.4.0/shibboleth-common-1.4.0.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="opensaml-2.6.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/opensaml/opensaml/2.6.0/opensaml-2.6.0.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="openws-1.4.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/opensaml/openws/1.4.4/openws-1.4.4.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="xmltooling-1.3.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/opensaml/xmltooling/1.3.4/xmltooling-1.3.4.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="bcprov-jdk15-1.46.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/bouncycastle/bcprov-jdk15/1.46/bcprov-jdk15-1.46.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="not-yet-commons-ssl-0.3.9.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/ca/juliusdavies/not-yet-commons-ssl/0.3.9/not-yet-commons-ssl-0.3.9.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="xmlsec-1.4.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/santuario/xmlsec/1.4.5/xmlsec-1.4.5.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="xml-apis-2.10.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/xerces/xml-apis/2.10.0/xml-apis-2.10.0.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="xercesImpl-2.10.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="serializer-2.10.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/xerces/serializer/2.10.0/serializer-2.10.0.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="xml-resolver-1.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/xml-resolver/xml-resolver/1.2/xml-resolver-1.2.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="xalan-2.7.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="jcl-over-slf4j-1.7.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/slf4j/jcl-over-slf4j/1.7.5/jcl-over-slf4j-1.7.5.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="slf4j-api-1.7.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="jul-to-slf4j-1.7.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/slf4j/jul-to-slf4j/1.7.5/jul-to-slf4j-1.7.5.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="log4j-over-slf4j-1.7.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/slf4j/log4j-over-slf4j/1.7.5/log4j-over-slf4j-1.7.5.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="commons-collections-3.2.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="commons-lang-2.6.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="velocity-1.7.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/velocity/velocity/1.7/velocity-1.7.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="esapi-2.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/owasp/esapi/esapi/2.0.1/esapi-2.0.1.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="jgrapht-0.8.3.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/net/sf/jgrapht/jgrapht/0.8.3/jgrapht-0.8.3.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="ehcache-core-1.7.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/net/sf/ehcache/ehcache-core/1.7.2/ehcache-core-1.7.2.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="c3p0-0.9.1.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/c3p0/c3p0/0.9.1.2/c3p0-0.9.1.2.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="vt-ldap-3.3.6.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/edu/vt/middleware/vt-ldap/3.3.6/vt-ldap-3.3.6.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="commons-cli-1.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="dom4j-1.6.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="spring-context-support-2.5.6.SEC03.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-context-support/2.5.6.SEC03/spring-context-support-2.5.6.SEC03.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="spring-beans-2.5.6.SEC03.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-beans/2.5.6.SEC03/spring-beans-2.5.6.SEC03.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="spring-core-2.5.6.SEC03.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-core/2.5.6.SEC03/spring-core-2.5.6.SEC03.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="spring-context-2.5.6.SEC03.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-context/2.5.6.SEC03/spring-context-2.5.6.SEC03.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="spring-web-2.5.6.SEC03.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-web/2.5.6.SEC03/spring-web-2.5.6.SEC03.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="svnkit-1.3.8.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/tmatesoft/svnkit/svnkit/1.3.8/svnkit-1.3.8.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="sequence-library-1.0.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/de/regnis/q/sequence/sequence-library/1.0.2/sequence-library-1.0.2.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="jna-3.4.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="trilead-ssh2-1.0.0-build215.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/com/trilead/trilead-ssh2/1.0.0-build215/trilead-ssh2-1.0.0-build215.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="sqljet-1.1.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/tmatesoft/sqljet/sqljet/1.1.2/sqljet-1.1.2.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="antlr-runtime-3.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/antlr/antlr-runtime/3.4/antlr-runtime-3.4.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="jargs-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/jargs/jargs/1.0/jargs-1.0.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="logback-classic-1.0.11.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/ch/qos/logback/logback-classic/1.0.11/logback-classic-1.0.11.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="logback-core-1.0.11.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/ch/qos/logback/logback-core/1.0.11/logback-core-1.0.11.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="janino-2.6.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/codehaus/janino/janino/2.6.1/janino-2.6.1.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="commons-compiler-2.6.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/codehaus/janino/commons-compiler/2.6.1/commons-compiler-2.6.1.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="ant-nodeps-1.7.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/ant/ant-nodeps/1.7.1/ant-nodeps-1.7.1.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="ant-1.7.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/ant/ant/1.7.1/ant-1.7.1.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="ant-launcher-1.7.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="ant-contrib-1.0b2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/ant-contrib/ant-contrib/1.0b2/ant-contrib-1.0b2.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="regexp-1.3.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/regexp/regexp/1.3/regexp-1.3.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="stork-saml-engine.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/stork-saml-engine/stork-saml-engine">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="slf4j-log4j12-1.6.4.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="moa-id-commons.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-commons/moa-id-commons">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="hibernate-core-4.2.1.Final.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/hibernate/hibernate-core/4.2.1.Final/hibernate-core-4.2.1.Final.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="antlr-2.7.7.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="jboss-logging-3.1.0.GA.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/jboss/logging/jboss-logging/3.1.0.GA/jboss-logging-3.1.0.GA.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="jboss-transaction-api_1.1_spec-1.0.1.Final.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/jboss/spec/javax/transaction/jboss-transaction-api_1.1_spec/1.0.1.Final/jboss-transaction-api_1.1_spec-1.0.1.Final.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="hibernate-jpa-2.0-api-1.0.1.Final.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.1.Final/hibernate-jpa-2.0-api-1.0.1.Final.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="javassist-3.15.0-GA.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/javassist/javassist/3.15.0-GA/javassist-3.15.0-GA.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="hibernate-commons-annotations-4.0.1.Final.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/hibernate/common/hibernate-commons-annotations/4.0.1.Final/hibernate-commons-annotations-4.0.1.Final.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="commons-lang3-3.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="hibernate-c3p0-4.2.1.Final.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/hibernate/hibernate-c3p0/4.2.1.Final/hibernate-c3p0-4.2.1.Final.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
 +    <dependent-module archiveName="mysql-connector-java-5.1.25.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/mysql/mysql-connector-java/5.1.25/mysql-connector-java-5.1.25.jar">
 +      <dependency-type>uses</dependency-type>
 +    </dependent-module>
    </wb-module>
 -</project-modules>
 +</project-modules>
\ 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 index 3f907cfa1..7f28ca3cd 100644 --- a/id/server/proxy/.settings/org.maven.ide.eclipse.prefs +++ b/id/server/proxy/.settings/org.maven.ide.eclipse.prefs @@ -1,4 +1,3 @@ -#Tue Jul 07 16:06:59 CEST 2009
  activeProfiles=
  eclipse.preferences.version=1
  fullBuildGoals=process-test-resources
 diff --git a/spss/server/.settings/org.maven.ide.eclipse.prefs b/spss/server/.settings/org.maven.ide.eclipse.prefs index c76587513..7f28ca3cd 100644 --- a/spss/server/.settings/org.maven.ide.eclipse.prefs +++ b/spss/server/.settings/org.maven.ide.eclipse.prefs @@ -1,4 +1,3 @@ -#Tue Jul 07 16:06:49 CEST 2009
  activeProfiles=
  eclipse.preferences.version=1
  fullBuildGoals=process-test-resources
 diff --git a/spss/server/serverlib/.settings/org.eclipse.wst.common.component b/spss/server/serverlib/.settings/org.eclipse.wst.common.component index feb12899a..fe4fd3290 100644 --- a/spss/server/serverlib/.settings/org.eclipse.wst.common.component +++ b/spss/server/serverlib/.settings/org.eclipse.wst.common.component @@ -1,9 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?>
 -<project-modules id="moduleCoreId" project-version="1.5.0">
 +<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
    <wb-module deploy-name="moa-spss-lib">
      <wb-resource deploy-path="/" source-path="src/main/java"/>
      <wb-resource deploy-path="/" source-path="src/main/resources"/>
 -        <wb-resource deploy-path="/" source-path="/src/test/java"/>
          <wb-resource deploy-path="/" source-path="/src/main/java"/>
          <wb-resource deploy-path="/" source-path="/src/main/resources"/>
    </wb-module>
 diff --git a/spss/server/serverlib/.settings/org.maven.ide.eclipse.prefs b/spss/server/serverlib/.settings/org.maven.ide.eclipse.prefs index 373d31d5c..7f28ca3cd 100644 --- a/spss/server/serverlib/.settings/org.maven.ide.eclipse.prefs +++ b/spss/server/serverlib/.settings/org.maven.ide.eclipse.prefs @@ -1,4 +1,3 @@ -#Tue Jul 07 16:06:50 CEST 2009
  activeProfiles=
  eclipse.preferences.version=1
  fullBuildGoals=process-test-resources
 diff --git a/spss/server/serverws/.settings/org.eclipse.wst.common.component b/spss/server/serverws/.settings/org.eclipse.wst.common.component index b8a1c3877..0ebba2a3d 100644 --- a/spss/server/serverws/.settings/org.eclipse.wst.common.component +++ b/spss/server/serverws/.settings/org.eclipse.wst.common.component @@ -1,11 +1,10 @@ -<?xml version="1.0" encoding="UTF-8"?>
 -<project-modules id="moduleCoreId" project-version="1.5.0">
 +<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
    <wb-module deploy-name="moa-spss-ws">
          <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">
 +        <dependent-module archiveName="moa-spss-lib-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib">
              <dependency-type>uses</dependency-type>
          </dependent-module>
 -        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
 +        <dependent-module archiveName="moa-common-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
              <dependency-type>uses</dependency-type>
          </dependent-module>
      <property name="context-root" value="moa-spss-ws"/>
 | 
