diff options
Diffstat (limited to 'id/server/proxy')
| -rw-r--r-- | id/server/proxy/assembly-war.xml | 15 | ||||
| -rw-r--r-- | id/server/proxy/pom.xml | 318 |
2 files changed, 196 insertions, 137 deletions
diff --git a/id/server/proxy/assembly-war.xml b/id/server/proxy/assembly-war.xml index b9f84d762..dba832a74 100644 --- a/id/server/proxy/assembly-war.xml +++ b/id/server/proxy/assembly-war.xml @@ -56,7 +56,7 @@ <include>commons-logging:commons-logging</include>
<include>jaxp:dom</include>
<include>iaik.prod:iaik_ixsil</include>
- <include>iaik.prod:iaik_moa_full</include>
+ <include>iaik.prod:iaik_moa</include>
<include>iaik.prod:iaik_Pkcs11Wrapper</include>
<include>iaik.prod:iaik_X509TrustManager</include>
<include>jaxen:jaxen-core</include>
@@ -74,12 +74,13 @@ </includes>
<outputDirectory>WEB-INF/lib</outputDirectory>
</dependencySet>
- <dependencySet>
- <includes>
- <include>iaik.win32:Pkcs11Wrapper</include>
- </includes>
- <outputDirectory>WEB-INF/lib/win32</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 0ca85d599..eb912c659 100644 --- a/id/server/proxy/pom.xml +++ b/id/server/proxy/pom.xml @@ -1,136 +1,194 @@ -<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>
+<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>
- <artifactId>server</artifactId>
+ <artifactId>moa-id</artifactId>
<version>1.4.0</version>
- </parent>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>MOA.id.server</groupId>
- <artifactId>proxy</artifactId>
- <packaging>pom</packaging>
- <version>1.4.0</version>
- <name>MOA Id Server Proxy</name>
+ <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> + <dependencies>
- <dependency>
- <groupId>javaext</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_full</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>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>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.win32</groupId>
- <artifactId>Pkcs11Wrapper</artifactId>
- <version>1.0</version>
- <type>dll</type>
- <scope>runtime</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>
+ <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>-->
+ <!-- </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>--> + </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>
\ No newline at end of file |