diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-02-03 08:06:55 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-02-03 08:06:55 +0100 |
| commit | 04ba04826a5f88e0459b7a47a55118933d929cc6 (patch) | |
| tree | 7f5083300ac4026bbf06b51ac8c3ba01423bbd29 /repository | |
| parent | 080e499cc22a0065ea7f47e04b6c0f336533e21e (diff) | |
| parent | 3c1884ee275350e7b2a78256342d9610b1766898 (diff) | |
| download | moa-id-spss-04ba04826a5f88e0459b7a47a55118933d929cc6.tar.gz moa-id-spss-04ba04826a5f88e0459b7a47a55118933d929cc6.tar.bz2 moa-id-spss-04ba04826a5f88e0459b7a47a55118933d929cc6.zip | |
Merge remote-tracking branch 'remotes/origin/outgoingstork' into moa2_0_tlenz
Conflicts:
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/StorkAttributes.java
id/oa/src/main/java/at/gv/egovernment/moa/id/demoOA/servlet/pvp2/BuildMetadata.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKAuthnRequestProcessor.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClient.java
id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
Diffstat (limited to 'repository')
4 files changed, 109 insertions, 0 deletions
diff --git a/repository/eu/stork/oasis-dss-api/1.0.0-SNAPSHOT/maven-metadata-local.xml b/repository/eu/stork/oasis-dss-api/1.0.0-SNAPSHOT/maven-metadata-local.xml new file mode 100644 index 000000000..99d92cd77 --- /dev/null +++ b/repository/eu/stork/oasis-dss-api/1.0.0-SNAPSHOT/maven-metadata-local.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<metadata> + <groupId>eu.stork</groupId> + <artifactId>oasis-dss-api</artifactId> + <version>1.0.0-SNAPSHOT</version> + <versioning> + <snapshot> + <localCopy>true</localCopy> + </snapshot> + <lastUpdated>20140130171508</lastUpdated> + </versioning> +</metadata> diff --git a/repository/eu/stork/oasis-dss-api/1.0.0-SNAPSHOT/oasis-dss-api-1.0.0-SNAPSHOT.jar b/repository/eu/stork/oasis-dss-api/1.0.0-SNAPSHOT/oasis-dss-api-1.0.0-SNAPSHOT.jar Binary files differnew file mode 100644 index 000000000..5ad0cb42e --- /dev/null +++ b/repository/eu/stork/oasis-dss-api/1.0.0-SNAPSHOT/oasis-dss-api-1.0.0-SNAPSHOT.jar diff --git a/repository/eu/stork/oasis-dss-api/1.0.0-SNAPSHOT/oasis-dss-api-1.0.0-SNAPSHOT.pom b/repository/eu/stork/oasis-dss-api/1.0.0-SNAPSHOT/oasis-dss-api-1.0.0-SNAPSHOT.pom new file mode 100644 index 000000000..ef04f07c4 --- /dev/null +++ b/repository/eu/stork/oasis-dss-api/1.0.0-SNAPSHOT/oasis-dss-api-1.0.0-SNAPSHOT.pom @@ -0,0 +1,85 @@ +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <artifactId>oasis-dss-api</artifactId> + <groupId>eu.stork</groupId> + <version>1.0.0-SNAPSHOT</version> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jaxb2-maven-plugin</artifactId> + <version>1.5</version> + <executions> + <execution> + <id>oasis-dss</id> + <goals> + <goal>xjc</goal> + </goals> + </execution> + </executions> + <configuration> + <args> + <arg>-npa</arg> + </args> + <schemaDirectory>${project.basedir}/src/main/resources/schema/oasis-dss</schemaDirectory> + <schemaFiles>oasis-dss-core-schema-v1.0-os.xsd</schemaFiles> + <packageName>eu.stork.oasisdss.profile</packageName> + <extension>true</extension> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + <encoding>${project.build.sourceEncoding}</encoding> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.4</version> + <configuration> + <encoding>${project.build.sourceEncoding}</encoding> + </configuration> + </plugin> + + </plugins> + </build> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + <dependencies> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.11.0</version> + + <scope>provided</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.11</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-io</artifactId> + <version>1.3.2</version> + </dependency> + <dependency> + <groupId>com.sun.xml.ws</groupId> + <artifactId>jaxws-rt</artifactId> + <version>2.1.7</version> + </dependency> + + </dependencies> +</project>
\ No newline at end of file diff --git a/repository/eu/stork/oasis-dss-api/maven-metadata-local.xml b/repository/eu/stork/oasis-dss-api/maven-metadata-local.xml new file mode 100644 index 000000000..8c8297768 --- /dev/null +++ b/repository/eu/stork/oasis-dss-api/maven-metadata-local.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<metadata> + <groupId>eu.stork</groupId> + <artifactId>oasis-dss-api</artifactId> + <version>1.0.0-SNAPSHOT</version> + <versioning> + <versions> + <version>1.0.0-SNAPSHOT</version> + </versions> + <lastUpdated>20140130171508</lastUpdated> + </versioning> +</metadata> |