diff options
Diffstat (limited to 'id/server/auth')
| -rw-r--r-- | id/server/auth/assembly-war.xml | 94 | ||||
| -rw-r--r-- | id/server/auth/assembly.xml | 7 | ||||
| -rw-r--r-- | id/server/auth/pom.xml | 204 |
3 files changed, 61 insertions, 244 deletions
diff --git a/id/server/auth/assembly-war.xml b/id/server/auth/assembly-war.xml deleted file mode 100644 index 15f10f4cb..000000000 --- a/id/server/auth/assembly-war.xml +++ /dev/null @@ -1,94 +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>**/proxy/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${basedir}/src/main/webapp</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${basedir}/../resources/wsdl</directory>
- <outputDirectory>resources/schema</outputDirectory>
- <excludes>
- <exclude>**/*.wsdl</exclude>
- </excludes>
- </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-fileupload:commons-fileupload</include>
- <include>commons-io:commons-io</include>
- <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_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.win32:Pkcs11Wrapper</include>
- </includes>
- <outputDirectory>WEB-INF/lib/win32</outputDirectory>
- </dependencySet>
- </dependencySets>
-
- </assembly>
\ No newline at end of file diff --git a/id/server/auth/assembly.xml b/id/server/auth/assembly.xml deleted file mode 100644 index 31709e6c5..000000000 --- a/id/server/auth/assembly.xml +++ /dev/null @@ -1,7 +0,0 @@ -<assembly>
- <id>auth</id>
- <formats>
- <format>war</format>
- </formats>
-
- </assembly>
\ No newline at end of file diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index d2adcedfc..405f6f390 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -1,144 +1,62 @@ -<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>
- <version>1.4.0</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>MOA.id.server</groupId>
- <artifactId>auth</artifactId>
- <packaging>pom</packaging>
- <version>1.4.0</version>
- <name>MOA Id Server Auth</name>
-
- <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-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</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>
+<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>moa-id</artifactId> + <version>1.4.0</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>MOA.id.server</groupId> + <artifactId>moa-id-auth</artifactId> + <packaging>war</packaging> + <version>1.4.0</version> + <name>MOA ID-Auth WebService</name> + + <properties> + <repositoryPath>${basedir}/../../../repository</repositoryPath> + </properties> + + <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> + </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> + </dependencies> + </project>
\ No newline at end of file |