diff options
| -rw-r--r-- | common-test/pom.xml | 3 | ||||
| -rw-r--r-- | common/pom.xml | 1 | ||||
| -rw-r--r-- | id/server/auth/pom.xml | 43 | ||||
| -rw-r--r-- | id/server/idserverlib/pom.xml | 5 | ||||
| -rw-r--r-- | id/server/proxy/assembly-war.xml | 86 | ||||
| -rw-r--r-- | id/server/proxy/pom.xml | 173 | ||||
| -rw-r--r-- | spss/server/serverlib/pom.xml | 46 | ||||
| -rw-r--r-- | spss/server/serverws/pom.xml | 43 | ||||
| -rw-r--r-- | spss/server/tools/pom.xml | 62 |
9 files changed, 168 insertions, 294 deletions
diff --git a/common-test/pom.xml b/common-test/pom.xml index f50be285f..6c605f1b5 100644 --- a/common-test/pom.xml +++ b/common-test/pom.xml @@ -40,17 +40,14 @@ <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> - <optional>true</optional> </dependency> <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <optional>true</optional> </dependency> <dependency> <groupId>xerces</groupId> <artifactId>xmlParserAPIs</artifactId> - <optional>true</optional> </dependency> </dependencies> </project> diff --git a/common/pom.xml b/common/pom.xml index 5e860e659..85b206ee9 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -25,7 +25,6 @@ <dependency> <groupId>iaik.prod</groupId> <artifactId>iaik_jce_full</artifactId> - <optional>true</optional> </dependency> <dependency> <groupId>junit</groupId> diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index 8dd93220b..80eabe6d0 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -59,6 +59,49 @@ <artifactId>moa-id-lib</artifactId> <version>${project.version}</version> </dependency> + <!-- transitive dependencies we don't want to include into the war --> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_jce_full</artifactId> + <!-- should be in the ext directory of the jre --> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_ecc</artifactId> + <!-- should be in the ext directory of the jre --> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_Pkcs11Provider</artifactId> + <!-- should be in the ext directory of the jre --> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_Pkcs11Wrapper</artifactId> + <!-- should be in the ext directory of the jre --> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <!-- should be provided by the container or jre --> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <!-- should be provided by the container or jre --> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xmlParserAPIs</artifactId> + <!-- should be provided by the container or jre --> + <scope>provided</scope> + </dependency> </dependencies> </project> diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 6add66ebe..7c30ddbe2 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -38,17 +38,14 @@ <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> @@ -95,13 +92,11 @@ <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> diff --git a/id/server/proxy/assembly-war.xml b/id/server/proxy/assembly-war.xml deleted file mode 100644 index dba832a74..000000000 --- a/id/server/proxy/assembly-war.xml +++ /dev/null @@ -1,86 +0,0 @@ -<assembly>
- <id>web</id>
-
- <formats>
- <format>war</format>
- </formats>
-
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
- <directory>${basedir}/src/main/webapp</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${basedir}/../idserverlib/target/classes</directory>
- <outputDirectory>WEB-INF/classes</outputDirectory>
- <excludes>
- <exclude>**/auth/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${basedir}/src/main/webapp</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${basedir}/../../../common/target</directory>
- <outputDirectory>WEB-INF/lib</outputDirectory>
- <includes>
- <include>**/*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${basedir}/../../../spss/server/serverlib/target</directory>
- <outputDirectory>WEB-INF/lib</outputDirectory>
- <includes>
- <include>**/*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${basedir}/../resources</directory>
- <outputDirectory>WEB-INF/classes/resources</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${basedir}/../services</directory>
- <outputDirectory>WEB-INF/classes/META-INF/services</outputDirectory>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <includes>
- <include>javaext:activation</include>
- <include>axis:axis</include>
- <include>commons-discovery:commons-discovery</include>
- <include>commons-logging:commons-logging</include>
- <include>jaxp:dom</include>
- <include>iaik.prod:iaik_ixsil</include>
- <include>iaik.prod:iaik_moa</include>
- <include>iaik.prod:iaik_Pkcs11Wrapper</include>
- <include>iaik.prod:iaik_X509TrustManager</include>
- <include>jaxen:jaxen-core</include>
- <include>jaxen:jaxen-dom</include>
- <include>jaxp:jaxp-api</include>
- <include>javax.xml:jaxrpc</include>
- <include>mail:mail</include>
- <include>saaj:saaj</include>
- <include>jaxp:sax</include>
- <include>jaxen:saxpath</include>
- <include>wsdl4j:wsdl4j</include>
- <include>regexp:regexp</include>
- <include>log4j:log4j</include>
- <include>postgresql:postgresql</include>
- </includes>
- <outputDirectory>WEB-INF/lib</outputDirectory>
- </dependencySet>
- <dependencySet> - <includes> - <include>iaik.prod:iaik_Pkcs11Wrapper:dll:win32</include> - </includes> - <outputFileNameMapping>pkcs11wrapper.dll</outputFileNameMapping> - <outputDirectory>WEB-INF/lib/win32</outputDirectory> - </dependencySet> - </dependencySets>
-
- </assembly>
\ No newline at end of file diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml index db0897931..faffae81b 100644 --- a/id/server/proxy/pom.xml +++ b/id/server/proxy/pom.xml @@ -45,15 +45,6 @@ </webResources>
-->
</configuration>
- <executions>
- <execution>
- <id>test</id>
- <phase>package</phase>
- <goals>
- <goal>exploded</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
@@ -70,127 +61,49 @@ <artifactId>moa-id-lib</artifactId>
<version>${project.version}</version>
</dependency>
- <!-- <dependency>-->
- <!-- <groupId>javax.activation</groupId>-->
- <!-- <artifactId>activation</artifactId>-->
- <!-- </dependency>-->
- <!-- <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>jaxp</groupId>-->
- <!-- <artifactId>dom</artifactId>-->
- <!-- </dependency>-->
- <!-- <dependency>-->
- <!-- <groupId>iaik.prod</groupId>-->
- <!-- <artifactId>iaik_ixsil</artifactId>-->
- <!-- </dependency>-->
- <!-- <dependency>-->
- <!-- <groupId>iaik.prod</groupId>-->
- <!-- <artifactId>iaik_moa</artifactId>-->
- <!-- </dependency>-->
- <!-- <dependency>-->
- <!-- <groupId>iaik.prod</groupId>-->
- <!-- <artifactId>iaik_Pkcs11Wrapper</artifactId>-->
- <!-- <version>1.2.16</version>-->
- <!-- <scope>compile</scope>-->
- <!-- </dependency>-->
- <!-- <dependency>-->
- <!-- <groupId>iaik.prod</groupId>-->
- <!-- <artifactId>iaik_X509TrustManager</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>jaxp-api</artifactId>-->
- <!-- </dependency>-->
- <!-- <dependency>-->
- <!-- <groupId>javax.xml</groupId>-->
- <!-- <artifactId>jaxrpc-api</artifactId>-->
- <!-- </dependency>-->
- <!-- <dependency>-->
- <!-- <groupId>javax.mail</groupId>-->
- <!-- <artifactId>mail</artifactId>-->
- <!-- <version>1.5</version>-->
- <!-- </dependency>-->
- <!-- <dependency>-->
- <!-- <groupId>saaj</groupId>-->
- <!-- <artifactId>saaj</artifactId>-->
- <!-- </dependency>-->
- <!-- <dependency>-->
- <!-- <groupId>jaxp</groupId>-->
- <!-- <artifactId>sax</artifactId>-->
- <!-- </dependency>-->
- <!-- <dependency>-->
- <!-- <groupId>jaxen</groupId>-->
- <!-- <artifactId>saxpath</artifactId>-->
- <!-- </dependency>-->
- <!-- <dependency>-->
- <!-- <groupId>wsdl4j</groupId>-->
- <!-- <artifactId>wsdl4j</artifactId>-->
- <!-- </dependency>-->
- <!-- <dependency>-->
- <!-- <groupId>javax.xml</groupId>-->
- <!-- <artifactId>jaxrpc</artifactId>-->
- <!-- </dependency>-->
- <!-- -->
- <!-- <dependency>-->
- <!-- <groupId>postgresql</groupId>-->
- <!-- <artifactId>postgresql</artifactId>-->
- <!-- </dependency>-->
- <!-- <dependency>-->
- <!-- <groupId>log4j</groupId>-->
- <!-- <artifactId>log4j</artifactId>-->
- <!-- </dependency>-->
- <!-- <dependency>-->
- <!-- <groupId>regexp</groupId>-->
- <!-- <artifactId>regexp</artifactId>-->
- <!-- </dependency>-->
- <!-- -->
- <!-- <dependency>-->
- <!-- <groupId>iaik.prod</groupId>-->
- <!-- <artifactId>iaik_Pkcs11Wrapper</artifactId>-->
- <!-- <classifier>win32</classifier>-->
- <!-- <type>dll</type>-->
- <!-- <scope>runtime</scope>-->
- <!-- </dependency>-->
+ <!-- transitive dependencies we don't want to include into the war --> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_jce_full</artifactId> + <!-- should be in the ext directory of the jre --> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_ecc</artifactId> + <!-- should be in the ext directory of the jre --> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_Pkcs11Provider</artifactId> + <!-- should be in the ext directory of the jre --> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_Pkcs11Wrapper</artifactId> + <!-- should be in the ext directory of the jre --> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <!-- should be provided by the container or jre --> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <!-- should be provided by the container or jre --> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xmlParserAPIs</artifactId> + <!-- should be provided by the container or jre --> + <scope>provided</scope> + </dependency> </dependencies>
- <!-- <build>-->
- <!-- <plugins>-->
- <!-- <plugin>-->
- <!-- <artifactId>maven-assembly-plugin</artifactId>-->
- <!-- <configuration>-->
- <!-- <descriptors>-->
- <!-- <descriptor>${basedir}/assembly-war.xml</descriptor>-->
- <!-- </descriptors>-->
- <!-- </configuration>-->
- <!-- <executions>-->
- <!-- <execution>-->
- <!-- <id>make-assembly</id>-->
- <!-- <phase>package</phase>-->
- <!-- <goals>-->
- <!-- <goal>attached</goal>-->
- <!-- </goals>-->
- <!-- </execution>-->
- <!-- </executions>-->
- <!-- </plugin> -->
- <!-- </plugins> -->
- <!-- </build>-->
</project>
diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml index 25cb8bade..5264b0a86 100644 --- a/spss/server/serverlib/pom.xml +++ b/spss/server/serverlib/pom.xml @@ -22,10 +22,6 @@ <groupId>axis</groupId> <artifactId>axis</artifactId> </dependency> -<!-- <dependency>--> -<!-- <groupId>saaj</groupId>--> -<!-- <artifactId>saaj</artifactId>--> -<!-- </dependency>--> <dependency> <groupId>commons-discovery</groupId> <artifactId>commons-discovery</artifactId> @@ -38,34 +34,6 @@ <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>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>junit</groupId> <artifactId>junit</artifactId> @@ -81,22 +49,19 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <optional>true</optional> + <scope>provided</scope> </dependency> <dependency> <groupId>xalan</groupId> <artifactId>xalan</artifactId> - <optional>true</optional> </dependency> <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <optional>true</optional> </dependency> <dependency> <groupId>xerces</groupId> <artifactId>xmlParserAPIs</artifactId> - <optional>true</optional> </dependency> <dependency> <groupId>iaik.prod</groupId> @@ -110,25 +75,26 @@ <groupId>iaik.prod</groupId> <artifactId>iaik_jce_full</artifactId> <scope>compile</scope> - <optional>true</optional> </dependency> <dependency> <groupId>iaik.prod</groupId> <artifactId>iaik_ecc</artifactId> <scope>compile</scope> - <optional>true</optional> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_cms</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>iaik.prod</groupId> <artifactId>iaik_Pkcs11Provider</artifactId> <scope>runtime</scope> - <optional>true</optional> </dependency> <dependency> <groupId>iaik.prod</groupId> <artifactId>iaik_Pkcs11Wrapper</artifactId> <scope>runtime</scope> - <optional>true</optional> </dependency> <!-- <dependency>--> <!-- <groupId>iaik.prod</groupId>--> diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml index 382e19d46..b286db6a2 100644 --- a/spss/server/serverws/pom.xml +++ b/spss/server/serverws/pom.xml @@ -62,5 +62,48 @@ <groupId>MOA</groupId> <artifactId>moa-common</artifactId> </dependency> + <!-- transitive dependencies we don't want to include into the war --> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_jce_full</artifactId> + <!-- should be in the ext directory of the jre --> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_ecc</artifactId> + <!-- should be in the ext directory of the jre --> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_Pkcs11Provider</artifactId> + <!-- should be in the ext directory of the jre --> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_Pkcs11Wrapper</artifactId> + <!-- should be in the ext directory of the jre --> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <!-- should be provided by the container or jre --> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <!-- should be provided by the container or jre --> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xmlParserAPIs</artifactId> + <!-- should be provided by the container or jre --> + <scope>provided</scope> + </dependency> </dependencies> </project> diff --git a/spss/server/tools/pom.xml b/spss/server/tools/pom.xml index 9ecc2b240..184d67554 100644 --- a/spss/server/tools/pom.xml +++ b/spss/server/tools/pom.xml @@ -1,34 +1,38 @@ -<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>moa-spss</artifactId> - <version>1.4.0</version> - </parent> +<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>moa-spss</artifactId> + <version>1.4.0</version> + </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>MOA.spss.server</groupId> - <artifactId>moa-spss-tools</artifactId> - <packaging>jar</packaging> - <version>1.4.0</version> - <name>MOA SP/SS Tools</name> + <modelVersion>4.0.0</modelVersion> + <groupId>MOA.spss.server</groupId> + <artifactId>moa-spss-tools</artifactId> + <packaging>jar</packaging> + <version>1.4.0</version> + <name>MOA SP/SS Tools</name> - <properties> - <thirdPartyLib>${basedir}/../../../buildhelper</thirdPartyLib> - </properties> + <properties> + <thirdPartyLib>${basedir}/../../../buildhelper</thirdPartyLib> + </properties> - <dependencies> - <dependency> - <groupId>MOA.spss.server</groupId> - <artifactId>moa-spss-lib</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>iaik.prod</groupId> - <artifactId>iaik_ecc</artifactId> - <scope>compile</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>MOA.spss.server</groupId> + <artifactId>moa-spss-lib</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_jce_full</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_ecc</artifactId> + <scope>compile</scope> + </dependency> + </dependencies> </project> |