diff options
| author | Klaus Stranacher <kstranacher@iaik.tugraz.at> | 2014-03-10 15:48:06 +0100 | 
|---|---|---|
| committer | Klaus Stranacher <kstranacher@iaik.tugraz.at> | 2014-03-10 15:48:06 +0100 | 
| commit | 403896aef0f9d3c76bbfcf3e970ae7dbc983ffd4 (patch) | |
| tree | 39dafb34dcd6537069ed96f249410f592e4a461e /spss/server/serverws | |
| parent | 6cc5cd2311c9e6cde062fa4034444969f9c293e0 (diff) | |
| download | moa-id-spss-403896aef0f9d3c76bbfcf3e970ae7dbc983ffd4.tar.gz moa-id-spss-403896aef0f9d3c76bbfcf3e970ae7dbc983ffd4.tar.bz2 moa-id-spss-403896aef0f9d3c76bbfcf3e970ae7dbc983ffd4.zip | |
Update trustprofiles and certstore
Update TSL processing (working directory handling)
Update groupId of IAIK dependencies
Diffstat (limited to 'spss/server/serverws')
| -rw-r--r-- | spss/server/serverws/.settings/org.eclipse.wst.common.component | 3 | ||||
| -rw-r--r-- | spss/server/serverws/pom.xml | 17 | 
2 files changed, 10 insertions, 10 deletions
| diff --git a/spss/server/serverws/.settings/org.eclipse.wst.common.component b/spss/server/serverws/.settings/org.eclipse.wst.common.component index 463d07fe3..5efe131f3 100644 --- a/spss/server/serverws/.settings/org.eclipse.wst.common.component +++ b/spss/server/serverws/.settings/org.eclipse.wst.common.component @@ -2,6 +2,9 @@    <wb-module deploy-name="moa-spss-ws">
          <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
          <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
 +        <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 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>
 diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml index 0314cb454..a99a573c1 100644 --- a/spss/server/serverws/pom.xml +++ b/spss/server/serverws/pom.xml @@ -70,7 +70,7 @@  			<artifactId>iaik_ixsil</artifactId>  		</dependency>          <dependency> -			<groupId>iaik.prod</groupId> +			<groupId>iaik</groupId>  			<artifactId>iaik_tsl</artifactId>  		</dependency>  		<dependency> @@ -78,12 +78,12 @@  			<artifactId>log4j</artifactId>  		</dependency>  		<dependency> -			<groupId>iaik.prod</groupId> +			<groupId>iaik</groupId>  			<artifactId>iaik_util</artifactId>  		</dependency>  		<dependency> -			<groupId>iaik.prod</groupId> -			<artifactId>iaik_xsect</artifactId> +			<groupId>iaik</groupId> +			<artifactId>iaik_xsect_eval</artifactId>  		</dependency>  		<dependency>  			<groupId>javax.xml.bind</groupId> @@ -98,13 +98,10 @@  		  	<artifactId>sqlite-jdbc</artifactId>    		</dependency>  		<dependency> -			<groupId>iaik.prod</groupId> +			<groupId>iaik</groupId>  		  	<artifactId>iaik_jsse</artifactId> -  		</dependency>		 -		<dependency> -			<groupId>iaik.prod</groupId> -			<artifactId>iaik_util</artifactId> -		</dependency> +  		</dependency>	 +		          <!-- transitive dependencies we don't want to include into the war -->          <dependency>              <groupId>iaik.prod</groupId> | 
