diff options
| author | pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d> | 2007-08-22 18:54:53 +0000 |
|---|---|---|
| committer | pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d> | 2007-08-22 18:54:53 +0000 |
| commit | 7537351b14d0738d9e16bef4fad8380c3a0b0f21 (patch) | |
| tree | 9ac2a7c3d2f4bf5f10d3127592c1e7074fb75c13 /id | |
| parent | 61480a264a69a8c4ae2d445722fc53533f0249bd (diff) | |
| download | moa-id-spss-7537351b14d0738d9e16bef4fad8380c3a0b0f21.tar.gz moa-id-spss-7537351b14d0738d9e16bef4fad8380c3a0b0f21.tar.bz2 moa-id-spss-7537351b14d0738d9e16bef4fad8380c3a0b0f21.zip | |
minor build fixes/improvements
git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@934 d688527b-c9ab-4aba-bd8d-4036d912da1d
Diffstat (limited to 'id')
| -rw-r--r-- | id/assembly-auth.xml | 168 | ||||
| -rw-r--r-- | id/assembly-proxy.xml | 124 | ||||
| -rw-r--r-- | id/server/auth/pom.xml | 4 | ||||
| -rw-r--r-- | id/server/idserverlib/pom.xml | 10 | ||||
| -rw-r--r-- | id/server/proxy/pom.xml | 140 |
5 files changed, 232 insertions, 214 deletions
diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml index 0dd875720..986c4c44a 100644 --- a/id/assembly-auth.xml +++ b/id/assembly-auth.xml @@ -2,34 +2,35 @@ <id>ID-auth</id>
<formats>
- <format>zip</format> + <format>zip</format>
<!-- <format>tar.gz</format>-->
</formats>
- <baseDirectory>moa-id-auth-${project.version}</baseDirectory> + <baseDirectory>moa-id-auth-${project.version}</baseDirectory>
<fileSets>
<fileSet>
<directory>${basedir}/id/server/data/deploy</directory>
- <outputDirectory>/</outputDirectory> - <excludes> - <exclude>**/conf/moa-id/oa/**</exclude> - </excludes> + <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>**/conf/moa-id/oa/**</exclude>
+ <exclude>**/conf/Catalina/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/spss/handbook/conf/moa-spss/certstore</directory>
+ <outputDirectory>/conf/moa-id/certs/certstore</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/spss/handbook/conf/moa-spss/certstore</directory>
+ <outputDirectory>/conf/moa-spss/certstore</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
</fileSet>
- <fileSet> - <directory>${basedir}/spss/handbook/conf/moa-spss/certstore</directory> - <outputDirectory>/conf/moa-id/certs/certstore</outputDirectory> - <includes> - <include>**/*</include> - </includes> - </fileSet> - <fileSet> - <directory>${basedir}/spss/handbook/conf/moa-spss/certstore</directory> - <outputDirectory>/conf/moa-spss/certstore</outputDirectory> - <includes> - <include>**/*</include> - </includes> - </fileSet> <fileSet>
<directory>${basedir}/id/server/doc</directory>
<outputDirectory>/doc</outputDirectory>
@@ -44,62 +45,71 @@ <include>readme_1.4.0.txt</include>
</includes>
</fileSet>
- </fileSets> - - <moduleSets> - <moduleSet> - <includes> - <include>MOA.id.server:moa-id-auth</include> - </includes> - <binaries> - <includeDependencies>true</includeDependencies> - <outputDirectory>/</outputDirectory> - <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> - <dependencySets> - <dependencySet> - <includes> - <include>xalan:xalan</include> - <include>xerces:xercesImpl</include> - <include>xerces:xmlParserAPIs</include> - </includes> - <outputDirectory>/endorsed</outputDirectory> - </dependencySet> - <dependencySet> - <includes> - <include>iaik.prod:iaik_ecc</include> - <include>iaik.prod:iaik_jce_full</include> - <include>iaik.prod:iaik_Pkcs11Provider</include> - <include>iaik.prod:iaik_Pkcs11Wrapper</include> - </includes> - <outputDirectory>/ext</outputDirectory> - </dependencySet> - </dependencySets> - <unpack>false</unpack> - </binaries> - </moduleSet> - <moduleSet> - <includes> - <include>MOA.id.server:moa-id-lib</include> - </includes> - <binaries> - <attachmentClassifier>javadoc</attachmentClassifier> - <includeDependencies>false</includeDependencies> - <outputFileNameMapping>api-doc</outputFileNameMapping> - <outputDirectory>/moa-id/doc</outputDirectory> - <unpack>true</unpack> - </binaries> - </moduleSet> - <moduleSet> - <includes> - <include>MOA.id:moa-id-templates</include> - </includes> - <binaries> - <includeDependencies>false</includeDependencies> - <outputFileNameMapping>moaid-templates.war</outputFileNameMapping> - <outputDirectory>/templates</outputDirectory> - <unpack>false</unpack> - </binaries> - </moduleSet> - </moduleSets> - -</assembly>
\ No newline at end of file + <fileSet>
+ <outputDirectory>/ext</outputDirectory>
+ <includes>
+ <include>iaik.prod:iaik_ecc</include>
+ <include>iaik.prod:iaik_jce_full</include>
+ <include>iaik.prod:iaik_Pkcs11Provider</include>
+ <include>iaik.prod:iaik_Pkcs11Wrapper</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>MOA.id.server:moa-id-auth</include>
+ </includes>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputDirectory>/</outputDirectory>
+ <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>xalan:xalan</include>
+ <include>xerces:xercesImpl</include>
+ <include>xerces:xmlParserAPIs</include>
+ </includes>
+ <outputDirectory>/endorsed</outputDirectory>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>iaik.prod:iaik_ecc</include>
+ <include>iaik.prod:iaik_jce_full</include>
+ <include>iaik.prod:iaik_Pkcs11Provider</include>
+ <include>iaik.prod:iaik_Pkcs11Wrapper</include>
+ </includes>
+ <outputDirectory>/ext</outputDirectory>
+ </dependencySet>
+ </dependencySets>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <includes>
+ <include>MOA.id.server:moa-id-lib</include>
+ </includes>
+ <binaries>
+ <attachmentClassifier>javadoc</attachmentClassifier>
+ <includeDependencies>false</includeDependencies>
+ <outputFileNameMapping>api-doc</outputFileNameMapping>
+ <outputDirectory>/doc</outputDirectory>
+ <unpack>true</unpack>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <includes>
+ <include>MOA.id:moa-id-templates</include>
+ </includes>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputFileNameMapping>moaid-templates.war</outputFileNameMapping>
+ <outputDirectory>/templates</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+
+</assembly>
diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml index 03cdd837c..cd84be4bc 100644 --- a/id/assembly-proxy.xml +++ b/id/assembly-proxy.xml @@ -2,18 +2,18 @@ <id>ID-proxy</id>
<formats>
- <format>zip</format> + <format>zip</format>
<!-- <format>tar.gz</format>-->
</formats>
- <baseDirectory>moa-id-proxy-${project.version}</baseDirectory> + <baseDirectory>moa-id-proxy-${project.version}</baseDirectory>
- <fileSets> + <fileSets>
<fileSet>
<directory>${basedir}/id/server/data/deploy</directory>
<outputDirectory>/</outputDirectory>
<excludes>
- <exclude>**/conf/moa-spss/**</exclude> + <exclude>**/conf/moa-spss/**</exclude>
<exclude>**/conf/moa-id/transforms/**</exclude>
</excludes>
</fileSet>
@@ -33,61 +33,61 @@ </fileSet>
</fileSets>
- <moduleSets> - <moduleSet> - <includes> - <include>MOA.id.server:moa-id-proxy</include> - </includes> - <binaries> - <includeDependencies>true</includeDependencies> - <outputDirectory>/</outputDirectory> - <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> - <dependencySets> - <dependencySet> - <includes> - <include>xalan:xalan</include> - <include>xerces:xercesImpl</include> - <include>xerces:xmlParserAPIs</include> - </includes> - <outputDirectory>/endorsed</outputDirectory> - </dependencySet> - <dependencySet> - <includes> - <include>iaik.prod:iaik_ecc</include> - <include>iaik.prod:iaik_jce_full</include> - <include>iaik.prod:iaik_Pkcs11Provider</include> - <include>iaik.prod:iaik_Pkcs11Wrapper</include> - </includes> - <outputDirectory>/ext</outputDirectory> - </dependencySet> - </dependencySets> - <unpack>false</unpack> - </binaries> - </moduleSet> - <moduleSet> - <includes> - <include>MOA.id.server:moa-id-lib</include> - </includes> - <binaries> - <attachmentClassifier>javadoc</attachmentClassifier> - <includeDependencies>false</includeDependencies> - <outputFileNameMapping>api-doc</outputFileNameMapping> - <outputDirectory>/moa-id/doc</outputDirectory> - <unpack>true</unpack> - </binaries> - </moduleSet> - <moduleSet> - <includes> - <include>MOA.id:moa-id-templates</include> - </includes> - <binaries> - <includeDependencies>false</includeDependencies> - <outputFileNameMapping>moaid-templates.war</outputFileNameMapping> - <outputDirectory>/templates</outputDirectory> - <unpack>false</unpack> - </binaries> - </moduleSet> - </moduleSets> - - -</assembly>
\ No newline at end of file + <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>MOA.id.server:moa-id-proxy</include>
+ </includes>
+ <binaries>
+ <includeDependencies>true</includeDependencies>
+ <outputDirectory>/</outputDirectory>
+ <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>xalan:xalan</include>
+ <include>xerces:xercesImpl</include>
+ <include>xerces:xmlParserAPIs</include>
+ </includes>
+ <outputDirectory>/endorsed</outputDirectory>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>iaik.prod:iaik_ecc</include>
+ <include>iaik.prod:iaik_jce_full</include>
+ <include>iaik.prod:iaik_Pkcs11Provider</include>
+ <include>iaik.prod:iaik_Pkcs11Wrapper</include>
+ </includes>
+ <outputDirectory>/ext</outputDirectory>
+ </dependencySet>
+ </dependencySets>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <includes>
+ <include>MOA.id.server:moa-id-lib</include>
+ </includes>
+ <binaries>
+ <attachmentClassifier>javadoc</attachmentClassifier>
+ <includeDependencies>false</includeDependencies>
+ <outputFileNameMapping>api-doc</outputFileNameMapping>
+ <outputDirectory>/doc</outputDirectory>
+ <unpack>true</unpack>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <includes>
+ <include>MOA.id:moa-id-templates</include>
+ </includes>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputFileNameMapping>moaid-templates.war</outputFileNameMapping>
+ <outputDirectory>/templates</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+
+
+</assembly>
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index 405f6f390..8dd93220b 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -31,6 +31,7 @@ <addDefaultImplementationEntries>true</addDefaultImplementationEntries> </manifest> </archive> +<!-- <webResources> <resource> <directory>${basedir}/../resources</directory> @@ -41,6 +42,7 @@ <targetPath>WEB-INF/classes/META-INF/services</targetPath> </resource> </webResources> +--> </configuration> </plugin> </plugins> @@ -59,4 +61,4 @@ </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 357ec0750..6add66ebe 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -25,7 +25,6 @@ <dependency> <groupId>axis</groupId> <artifactId>axis</artifactId> - <version>1.4</version> </dependency> <dependency> <groupId>javax.mail</groupId> @@ -39,14 +38,17 @@ <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> + <optional>true</optional> </dependency> <dependency> <groupId>xerces</groupId> <artifactId>xmlParserAPIs</artifactId> + <optional>true</optional> </dependency> <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> + <optional>true</optional> </dependency> <dependency> <groupId>junit</groupId> @@ -93,11 +95,13 @@ <dependency> <groupId>iaik.prod</groupId> <artifactId>iaik_ecc</artifactId> + <optional>true</optional> </dependency> <dependency> <groupId>iaik.prod</groupId> <artifactId>iaik_jce_full</artifactId> <scope>provided</scope> + <optional>true</optional> </dependency> <dependency> <groupId>iaik.prod</groupId> @@ -108,8 +112,8 @@ <artifactId>iaik_X509TrustManager</artifactId> </dependency> <dependency> - <groupId>regexp</groupId> - <artifactId>regexp</artifactId> + <groupId>regexp</groupId> + <artifactId>regexp</artifactId> </dependency> </dependencies> <build> diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml index eb912c659..db0897931 100644 --- a/id/server/proxy/pom.xml +++ b/id/server/proxy/pom.xml @@ -1,5 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<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.id</groupId>
@@ -7,67 +7,69 @@ <version>1.4.0</version>
</parent>
- <properties> - <repositoryPath>${basedir}/../../../repository</repositoryPath> - </properties> - - + <properties>
+ <repositoryPath>${basedir}/../../../repository</repositoryPath>
+ </properties>
+
+
<modelVersion>4.0.0</modelVersion>
<groupId>MOA.id.server</groupId>
<artifactId>moa-id-proxy</artifactId>
<packaging>war</packaging>
<version>1.4.0</version>
<name>MOA ID-Proxy WebService</name>
- - <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> - <webResources> - <resource> - <directory>${basedir}/../resources</directory> - <targetPath>WEB-INF/classes/resources</targetPath> - </resource> - <resource> - <directory>${basedir}/../services</directory> - <targetPath>WEB-INF/classes/META-INF/services</targetPath> - </resource> - </webResources> - </configuration> - <executions> - <execution> - <id>test</id> - <phase>package</phase> - <goals> - <goal>exploded</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - +
+ <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>
+<!--
+ <webResources>
+ <resource>
+ <directory>${basedir}/../resources</directory>
+ <targetPath>WEB-INF/classes/resources</targetPath>
+ </resource>
+ <resource>
+ <directory>${basedir}/../services</directory>
+ <targetPath>WEB-INF/classes/META-INF/services</targetPath>
+ </resource>
+ </webResources>
+-->
+ </configuration>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>package</phase>
+ <goals>
+ <goal>exploded</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
- <dependency> - <groupId>MOA.spss.server</groupId> - <artifactId>moa-spss-lib</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>MOA.id.server</groupId> - <artifactId>moa-id-lib</artifactId> - <version>${project.version}</version> - </dependency> + <dependency>
+ <groupId>MOA.spss.server</groupId>
+ <artifactId>moa-spss-lib</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>MOA.id.server</groupId>
+ <artifactId>moa-id-lib</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- <dependency>-->
<!-- <groupId>javax.activation</groupId>-->
<!-- <artifactId>activation</artifactId>-->
@@ -143,10 +145,10 @@ <!-- <groupId>wsdl4j</groupId>-->
<!-- <artifactId>wsdl4j</artifactId>-->
<!-- </dependency>-->
- <!-- <dependency>--> - <!-- <groupId>javax.xml</groupId>--> - <!-- <artifactId>jaxrpc</artifactId>--> - <!-- </dependency>--> + <!-- <dependency>-->
+ <!-- <groupId>javax.xml</groupId>-->
+ <!-- <artifactId>jaxrpc</artifactId>-->
+ <!-- </dependency>-->
<!-- -->
<!-- <dependency>-->
<!-- <groupId>postgresql</groupId>-->
@@ -161,15 +163,15 @@ <!-- <artifactId>regexp</artifactId>-->
<!-- </dependency>-->
<!-- -->
- <!-- <dependency>--> - <!-- <groupId>iaik.prod</groupId>--> - <!-- <artifactId>iaik_Pkcs11Wrapper</artifactId>--> - <!-- <classifier>win32</classifier>--> - <!-- <type>dll</type>--> - <!-- <scope>runtime</scope>--> - <!-- </dependency>--> - </dependencies> - + <!-- <dependency>-->
+ <!-- <groupId>iaik.prod</groupId>-->
+ <!-- <artifactId>iaik_Pkcs11Wrapper</artifactId>-->
+ <!-- <classifier>win32</classifier>-->
+ <!-- <type>dll</type>-->
+ <!-- <scope>runtime</scope>-->
+ <!-- </dependency>-->
+ </dependencies>
+
<!-- <build>-->
<!-- <plugins>-->
<!-- <plugin>-->
@@ -191,4 +193,4 @@ <!-- </plugin> -->
<!-- </plugins> -->
<!-- </build>-->
-</project>
\ No newline at end of file +</project>
|