aboutsummaryrefslogtreecommitdiff
path: root/id
diff options
context:
space:
mode:
Diffstat (limited to 'id')
-rw-r--r--id/server/auth/pom.xml43
-rw-r--r--id/server/idserverlib/pom.xml5
-rw-r--r--id/server/proxy/assembly-war.xml86
-rw-r--r--id/server/proxy/pom.xml173
4 files changed, 86 insertions, 221 deletions
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 08:19:59 +0000