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
---
 spss/server/serverws/assembly.xml |  71 --------------
 spss/server/serverws/pom.xml      | 199 ++++++++++++--------------------------
 2 files changed, 60 insertions(+), 210 deletions(-)
 delete mode 100644 spss/server/serverws/assembly.xml

(limited to 'spss/server/serverws')

diff --git a/spss/server/serverws/assembly.xml b/spss/server/serverws/assembly.xml
deleted file mode 100644
index a28fbfecf..000000000
--- a/spss/server/serverws/assembly.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<assembly>
-  <id>ws</id>
-  <formats>
-    <format>war</format>
-  </formats>
-
-	<includeBaseDirectory>false</includeBaseDirectory>
-
-	<files>
-		<file>
-			<source>${basedir}/resources/wsdl/MOA-SPSS-1.3.xsd</source>
-			<outputDirectory>/resources/schemas</outputDirectory>
-		</file>
-	</files>
-
-  <fileSets>
-    <fileSet>
-      <directory>${basedir}/../../handbook/conf/moa-spss</directory>
-	  	<outputDirectory>/WEB-INF/conf/moa-spss</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>${basedir}/src/main/webapp/WEB-INF</directory>
-	  	<outputDirectory>/WEB-INF</outputDirectory>
-    </fileSet>
-
-    <fileSet>
-      <directory>additional/licenses</directory>
-	  	<outputDirectory>/dist/ws/licenses</outputDirectory>
-    </fileSet>
-
-    <fileSet>
-      <directory>${basedir}/../../../common/target</directory>
-	  	<outputDirectory>/WEB-INF/lib</outputDirectory>
-			<includes>
-				<include>**/*.jar</include>
-			</includes>
-    </fileSet>
-
-  </fileSets>
-
-  <dependencySets>
-		<dependencySet>
-			<includes>
-				<include>axis:axis</include>
-				<include>commons-discovery:commons-discovery</include>
-				<include>commons-logging:commons-logging</include>
-				<include>iaik.prod:iaik_cms</include>
-				<include>iaik.prod:iaik_ixsil</include>
-				<include>iaik.prod:iaik_moa_full</include>
-				<include>iaik.prod:iaik_Pkcs11Wrapper</include>
-				<include>jaxen:jaxen-core</include>
-				<include>jaxen:jaxen-dom</include>
-				<include>jaxp:dom</include>
-				<include>jaxp:jaxp-api</include>
-				<include>javaext:jaxrpc</include>
-				<include>log4j:log4j</include>
-				<include>postgresql:postgresql</include>
-				<include>saaj:saaj</include>
-				<include>sax:sax</include>
-				<include>saxpath:saxpath</include>
-				<include>wsdl4j:wsdl4j</include>
-				<include>xalan:xalan</include>
-				<include>xerces:xercesImpl</include>
-				<include>xerces:xmlParserAPIs</include>
-				<include>MOA.spss.server:serverlib</include>
-			</includes>
-			<outputDirectory>/WEB-INF/lib</outputDirectory>
-		</dependencySet>
-	</dependencySets>
-
- </assembly>
\ No newline at end of file
diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml
index 8fb467bb2..382e19d46 100644
--- a/spss/server/serverws/pom.xml
+++ b/spss/server/serverws/pom.xml
@@ -1,145 +1,66 @@
 <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.spss</groupId>
-		<artifactId>server</artifactId>
-		<version>1.4.0</version>
-  </parent>
+    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>moa-spss</artifactId>
+        <version>1.4.0</version>
+    </parent>
 
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>MOA.spss.server</groupId>
-  <artifactId>serverweb</artifactId>
-  <packaging>pom</packaging>
-  <version>1.4.0</version>
-  <name>MOA SPSS Server-Web</name>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>MOA.spss.server</groupId>
+    <artifactId>moa-spss-ws</artifactId>
+    <packaging>war</packaging>
+    <version>1.4.0</version>
+    <name>MOA SP/SS WebService</name>
 
-  <properties>
-  	<thirdPartyLib>${basedir}/../../../buildhelper</thirdPartyLib>
-  </properties>
- 
-  <build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-	        <configuration>
-	          <descriptors>
-	            <descriptor>${basedir}/assembly.xml</descriptor>
-	          </descriptors>
-	        </configuration>
-	        <executions>
-	          <execution>
-	            <id>mk</id>
-	            <phase>package</phase>
-	            <goals>
-	              <goal>attached</goal>
-	            </goals>
-	          </execution>
-	        </executions>
-			</plugin>  
-		</plugins>  
-	</build>
-	
-  <dependencies>
-    <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>jaxen</groupId>
-      <artifactId>jaxen-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxen</groupId>
-      <artifactId>jaxen-dom</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>dom</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jaxp</groupId>
-      <artifactId>jaxp-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>javaext</groupId>
-      <artifactId>jaxrpc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>postgresql</groupId>
-      <artifactId>postgresql</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>saaj</groupId>
-      <artifactId>saaj</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>sax</groupId>
-      <artifactId>sax</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>saxpath</groupId>
-      <artifactId>saxpath</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>wsdl4j</groupId>
-      <artifactId>wsdl4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xmlParserAPIs</artifactId>
-    </dependency>
+    <properties>
+        <repositoryPath>${basedir}/../../../repository</repositoryPath>
+    </properties>
 
-    <dependency>
-      <groupId>MOA.spss.server</groupId>
-      <artifactId>serverlib</artifactId>
-			<version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>MOA</groupId>
-      <artifactId>common</artifactId>
-    </dependency>
+    <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>
+                    <warName>moa-spss</warName>
+                    <webResources>
+                        <resource>
+                            <directory>${basedir}/resources/wsdl</directory>
+                            <targetPath>resources/schemas</targetPath>
+                            <includes>
+                                <inclulde>*.xsd</inclulde>
+                            </includes>
+                        </resource>
+                        <resource>
+                            <directory>${basedir}/../../handbook</directory>
+                            <targetPath>WEB-INF</targetPath>
+                            <includes>
+                                <include>conf/**</include>
+                            </includes>
+                        </resource>
+                    </webResources>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_cms</artifactId>
-			<scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_moa_full</artifactId>
-			<scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_ixsil</artifactId>
-			<scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>iaik.prod</groupId>
-      <artifactId>iaik_Pkcs11Wrapper</artifactId>
-			<scope>runtime</scope>
-    </dependency>
-  </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>MOA.spss.server</groupId>
+            <artifactId>moa-spss-lib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>MOA</groupId>
+            <artifactId>moa-common</artifactId>
+        </dependency>
+    </dependencies>
 </project>
-- 
cgit v1.2.3