diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-03-21 14:45:05 +0100 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-03-21 14:45:05 +0100 |
commit | f3f35663f362ce6722eaa26598fb5aa8c4c6d962 (patch) | |
tree | bc9d66ebe1b5b840c6e3bf0087a8dd58040528a1 /repository/iaik/prod/iaik_jce_full | |
parent | 05212e955f2c44bd3150b47d9d534c5a73eb71d1 (diff) | |
parent | 658cb68c445d5b73815c43b66dd717483a425ea5 (diff) | |
download | moa-id-spss-f3f35663f362ce6722eaa26598fb5aa8c4c6d962.tar.gz moa-id-spss-f3f35663f362ce6722eaa26598fb5aa8c4c6d962.tar.bz2 moa-id-spss-f3f35663f362ce6722eaa26598fb5aa8c4c6d962.zip |
Merge remote-tracking branch 'remotes/origin/vidp' into moa2_0_tlenz
Conflicts:
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.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/config/stork/STORKConfig.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
id/server/moa-id-commons/pom.xml
id/server/stork2-saml-engine/pom.xml
pom.xml
repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.jar
repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.pom
Diffstat (limited to 'repository/iaik/prod/iaik_jce_full')
8 files changed, 10 insertions, 34 deletions
diff --git a/repository/iaik/prod/iaik_jce_full/4.0_MOA/iaik_jce_full-4.0_MOA.jar.sha1 b/repository/iaik/prod/iaik_jce_full/4.0_MOA/iaik_jce_full-4.0_MOA.jar.sha1 new file mode 100644 index 000000000..0248d3cbe --- /dev/null +++ b/repository/iaik/prod/iaik_jce_full/4.0_MOA/iaik_jce_full-4.0_MOA.jar.sha1 @@ -0,0 +1 @@ +4a893ba4503786d33bbca85b82d16927adc6d6a6
\ No newline at end of file diff --git a/repository/iaik/prod/iaik_jce_full/4.0_MOA/iaik_jce_full-4.0_MOA.pom.sha1 b/repository/iaik/prod/iaik_jce_full/4.0_MOA/iaik_jce_full-4.0_MOA.pom.sha1 new file mode 100644 index 000000000..33eae7f2e --- /dev/null +++ b/repository/iaik/prod/iaik_jce_full/4.0_MOA/iaik_jce_full-4.0_MOA.pom.sha1 @@ -0,0 +1 @@ +567fb4bf4a266d5b4eafbbc582972dbc2fad7195
\ No newline at end of file diff --git a/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.jar.lastUpdated b/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.jar.lastUpdated deleted file mode 100644 index 42ff556c7..000000000 --- a/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.jar.lastUpdated +++ /dev/null @@ -1,22 +0,0 @@ -#NOTE: This is an internal implementation file, its format can be changed without prior notice. -#Wed May 15 13:18:02 CEST 2013 -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\handbook\\clients\\api/../../../../../repository/.lastUpdated=1368616682476 -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\idserverlib/../../../repository/.lastUpdated=1368616682207 -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\common/../repository/.lastUpdated=1368616681300 -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\serverlib/../../../repository/.lastUpdated=1368616681996 -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\serverws/../../../repository/.lastUpdated=1368616682060 -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\serverws/../../../repository/.error= -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\auth/../../../repository/.lastUpdated=1368616682416 -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\auth/../../../repository/.error= -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\handbook\\clients\\webservice/../../../../../repository/.lastUpdated=1368616682584 -http\://repo.maven.apache.org/maven2/.lastUpdated=1368616681623 -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\serverlib/../../../repository/.error= -http\://repo.maven.apache.org/maven2/.error= -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\tools/../../../repository/.error= -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\proxy/../../../repository/.lastUpdated=1368616682294 -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\tools/../../../repository/.lastUpdated=1368616681780 -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\proxy/../../../repository/.error= -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\idserverlib/../../../repository/.error= -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\handbook\\clients\\api/../../../../../repository/.error= -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\common/../repository/.error= -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\handbook\\clients\\webservice/../../../../../repository/.error= diff --git a/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.pom.lastUpdated b/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.pom.lastUpdated deleted file mode 100644 index 65ee40f75..000000000 --- a/repository/iaik/prod/iaik_jce_full/5.101/iaik_jce_full-5.101.pom.lastUpdated +++ /dev/null @@ -1,12 +0,0 @@ -#NOTE: This is an internal implementation file, its format can be changed without prior notice. -#Wed May 15 13:18:07 CEST 2013 -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\common/../repository/.error= -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\serverws/../../../repository/.error= -http\://repo.maven.apache.org/maven2/.lastUpdated=1368616681271 -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\proxy/../../../repository/.lastUpdated=1368616685249 -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\serverws/../../../repository/.lastUpdated=1368616687679 -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\auth/../../../repository/.error= -http\://repo.maven.apache.org/maven2/.error= -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\common/../repository/.lastUpdated=1368616680663 -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\proxy/../../../repository/.error= -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\auth/../../../repository/.lastUpdated=1368616687203 diff --git a/repository/iaik/prod/iaik_jce_full/iaik_jce_full-4.0_MOA.jar b/repository/iaik/prod/iaik_jce_full/iaik_jce_full-4.0_MOA.jar Binary files differnew file mode 100644 index 000000000..bacb70edc --- /dev/null +++ b/repository/iaik/prod/iaik_jce_full/iaik_jce_full-4.0_MOA.jar diff --git a/repository/iaik/prod/iaik_jce_full/iaik_jce_full-4.0_MOA.jar.sha1 b/repository/iaik/prod/iaik_jce_full/iaik_jce_full-4.0_MOA.jar.sha1 new file mode 100644 index 000000000..0248d3cbe --- /dev/null +++ b/repository/iaik/prod/iaik_jce_full/iaik_jce_full-4.0_MOA.jar.sha1 @@ -0,0 +1 @@ +4a893ba4503786d33bbca85b82d16927adc6d6a6
\ No newline at end of file diff --git a/repository/iaik/prod/iaik_jce_full/iaik_jce_full-4.0_MOA.pom b/repository/iaik/prod/iaik_jce_full/iaik_jce_full-4.0_MOA.pom new file mode 100644 index 000000000..4e0b27a6c --- /dev/null +++ b/repository/iaik/prod/iaik_jce_full/iaik_jce_full-4.0_MOA.pom @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?><project> + <modelVersion>4.0.0</modelVersion> + <groupId>iaik.prod</groupId> + <artifactId>iaik_jce_full</artifactId> + <version>4.0_MOA</version> +</project>
\ No newline at end of file diff --git a/repository/iaik/prod/iaik_jce_full/iaik_jce_full-4.0_MOA.pom.sha1 b/repository/iaik/prod/iaik_jce_full/iaik_jce_full-4.0_MOA.pom.sha1 new file mode 100644 index 000000000..33eae7f2e --- /dev/null +++ b/repository/iaik/prod/iaik_jce_full/iaik_jce_full-4.0_MOA.pom.sha1 @@ -0,0 +1 @@ +567fb4bf4a266d5b4eafbbc582972dbc2fad7195
\ No newline at end of file |