Improved and updated maven build process.

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

1 files changed, 127 insertions, 70 deletions

diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index 50b6fc411..edf27d123 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -2,86 +2,70 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
 		<groupId>MOA.spss</groupId>
-		<artifactId>server</artifactId>
+		<artifactId>moa-spss</artifactId>
 		<version>1.4.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>MOA.spss.server</groupId>
-  <artifactId>serverlib</artifactId>
+  <artifactId>moa-spss-lib</artifactId>
   <packaging>jar</packaging>
   <version>1.4.0</version>
-  <name>MOA SPSS Serverlibrary</name>
+  <name>MOA SP/SS API</name>
 
-  <properties>
-  	<thirdPartyLib>${basedir}/../../../buildhelper</thirdPartyLib>
-  </properties>
+	<properties>
+		<repositoryPath>${basedir}/../../../repository</repositoryPath>
+	</properties>
   
   <dependencies>
     <dependency>
       <groupId>axis</groupId>
       <artifactId>axis</artifactId>
     </dependency>
-    <dependency>
-      <groupId>saaj</groupId>
-      <artifactId>saaj</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-discovery</groupId>
-      <artifactId>commons-discovery</artifactId>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>saaj</groupId>-->
+<!--      <artifactId>saaj</artifactId>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>commons-discovery</groupId>-->
+<!--      <artifactId>commons-discovery</artifactId>-->
+<!--    </dependency>-->
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
-<!--    <dependency>-->
-<!--      <groupId>iDoclet</groupId>-->
-<!--      <artifactId>iDoclet</artifactId>-->
-<!--    </dependency>-->
     <dependency>
       <groupId>javax.activation</groupId>
       <artifactId>activation</artifactId>
     </dependency>
-    <dependency>
-      <groupId>jaxen</groupId>
-      <artifactId>jaxen</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>dom</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>jaxp-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>sax</artifactId>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>jaxen</groupId>-->
+<!--      <artifactId>jaxen</artifactId>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>jaxp</groupId>-->
+<!--      <artifactId>dom</artifactId>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>jaxp</groupId>-->
+<!--      <artifactId>jaxp-api</artifactId>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>jaxp</groupId>-->
+<!--      <artifactId>sax</artifactId>-->
+<!--    </dependency>-->
 <!--    <dependency>-->
 <!--      <groupId>javaext</groupId>-->
 <!--      <artifactId>jaxrpc</artifactId>-->
 <!--    </dependency>-->
-    <dependency>
-      <groupId>org.w3c.dom</groupId>
-      <artifactId>dom</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>sax</groupId>
-      <artifactId>sax</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jsse</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jnet</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jsse</groupId>
-      <artifactId>jcert</artifactId>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>org.w3c.dom</groupId>-->
+<!--      <artifactId>dom</artifactId>-->
+<!--    </dependency>-->
+<!--    <dependency>-->
+<!--      <groupId>sax</groupId>-->
+<!--      <artifactId>sax</artifactId>-->
+<!--    </dependency>-->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -112,7 +96,7 @@
     </dependency>
     <dependency>
       <groupId>iaik.prod</groupId>
-      <artifactId>iaik_moa_full</artifactId>
+      <artifactId>iaik_moa</artifactId>
     </dependency>
     <dependency>
       <groupId>iaik.prod</groupId>
@@ -126,33 +110,106 @@
     <dependency>
       <groupId>iaik.prod</groupId>
       <artifactId>iaik_ecc</artifactId>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>iaik.prod</groupId>
       <artifactId>iaik_Pkcs11Provider</artifactId>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>iaik.prod</groupId>
       <artifactId>iaik_Pkcs11Wrapper</artifactId>
+      <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>iaik.win32</groupId>
-      <artifactId>Pkcs11Wrapper</artifactId>
-			<type>dll</type>
-			<version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>MOA</groupId>
-      <artifactId>common</artifactId>
-<!--      <scope>system</scope>-->
-<!--      <systemPath>${basedir}/../../../common/target</systemPath>-->
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>iaik.prod</groupId>-->
+<!--      <artifactId>iaik_Pkcs11Wrapper</artifactId>-->
+<!--			<classifier>win32</classifier>-->
+<!--			<type>dll</type>-->
+<!--			<version>1.0</version>-->
+<!--    </dependency>-->
     <dependency>
       <groupId>MOA</groupId>
-      <artifactId>common-test</artifactId>
-      <scope>system</scope>
-      <systemPath>${basedir}/../../../common-test/target</systemPath>
+      <artifactId>moa-common</artifactId>
     </dependency>
   </dependencies>
+  <build>
+      <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.2</version>
+        <configuration>
+        	<quiet>true</quiet>
+        	<author>false</author>
+        	<version>false</version>
+        	<use>true</use>
+        	<excludePackageNames>at.gv.egovernment.moa.spss.server.*;at.gv.egovernment.moa.spss.api.impl.*;at.gv.egovernment.moa.spss.impl.*</excludePackageNames>
+        	<tags>
+        		<tag>
+        			<name>pre</name>
+        			<placement>a</placement>
+        			<head>Preconditions:</head>
+        		</tag>
+        		<tag>
+        			<name>post</name>
+        			<placement>a</placement>
+        			<head>Postconfitions:</head>
+        		</tag>
+        	</tags>
+            <groups>
+	            <group>
+	              <title>API Factory and Services</title>
+	              <packages>at.gv.egovernment.moa.spss.api</packages>
+	            </group>
+	            <group>
+	              <title>Exceptions</title>
+	              <packages>at.gv.egovernment.moa.spss</packages>
+	            </group>
+	            <group>
+	              <title>API Objects for Signature Creation</title>
+	              <packages>at.gv.egovernment.moa.spss.api.xmlsign</packages>
+	            </group>
+	            <group>
+	              <title>API Objects for CMS Signature Verification</title>
+	              <packages>at.gv.egovernment.moa.spss.api.cmsverify</packages>
+	            </group>
+	            <group>
+	              <title>API Objects for XML Signature Verification</title>
+	              <packages>at.gv.egovernment.moa.spss.api.xmlverify</packages>
+	            </group>
+	            <group>
+	              <title>Common API Objects</title>
+	              <packages>at.gv.egovernment.moa.spss.api.common</packages>
+	            </group>
+	            <group>
+	              <title>Builders and Parsers to convert API Objects to and from XML</title>
+	              <packages>at.gv.egovernment.moa.spss.api.xmlbind</packages>
+	            </group>
+	            <group>
+	              <title>Utilities</title>
+	              <packages>at.gv.egovernment.moa.util</packages>
+	              <packages>at.gv.egovernment.moa.spss.util</packages>
+	            </group>
+	            <group>
+	              <title>Logging</title>
+	              <packages>at.gv.egovernment.moa.logging</packages>
+	            </group>
+	        </groups>
+	        <link>http://java.sun.com/j2se/1.4/docs/api/</link>
+        </configuration>
+		<executions>
+			<execution>
+				<id>generate-javadoc</id>
+				<phase>package</phase>
+				<goals>
+					<goal>jar</goal>
+				</goals>
+			</execution>
+		</executions>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>