From f57b189815b6f26710071fe18bf858fdff4a63d1 Mon Sep 17 00:00:00 2001
From: Klaus Stranacher <kstranacher@iaik.tugraz.at>
Date: Wed, 25 Jun 2014 15:29:40 +0200
Subject: Exclude iaik_pki_module (from TSL library)

---
 spss/server/serverlib/pom.xml | 2 +-
 spss/server/serverws/.project | 7 +++++++
 spss/server/serverws/pom.xml  | 8 +++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'spss')

diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index 3c29cd88c..f762ecdf6 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -144,7 +144,7 @@
 		
 		<dependency>
 			<groupId>iaik</groupId>
-			<artifactId>iaik_tsl</artifactId>
+			<artifactId>iaik_tsl</artifactId>			
 		</dependency>
 		<dependency>
 			<groupId>iaik</groupId>
diff --git a/spss/server/serverws/.project b/spss/server/serverws/.project
index 4faa086c3..8150d984e 100644
--- a/spss/server/serverws/.project
+++ b/spss/server/serverws/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -27,9 +32,11 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
 </projectDescription>
diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml
index 56168a586..9159242ef 100644
--- a/spss/server/serverws/pom.xml
+++ b/spss/server/serverws/pom.xml
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>MOA.spss.server</groupId>
             <artifactId>moa-spss-lib</artifactId>
-            <!--version>${pom.version}</version-->
+            <!--version>${pom.version}</version-->            
         </dependency>
         <dependency>
             <groupId>MOA</groupId>
@@ -104,6 +104,12 @@
         <dependency>
 			<groupId>iaik</groupId>
 			<artifactId>iaik_tsl</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>iaik_pki_module</artifactId>
+					<groupId>iaik</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>
-- 
cgit v1.2.3