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_moa/1.5 | |
| 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_moa/1.5')
3 files changed, 9 insertions, 34 deletions
diff --git a/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.jar.lastUpdated b/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.jar.lastUpdated deleted file mode 100644 index 39508d157..000000000 --- a/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.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:18 CEST 2013 -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\handbook\\clients\\api/../../../../../repository/.lastUpdated=1368616698028 -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\idserverlib/../../../repository/.lastUpdated=1368616697758 -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\common/../repository/.lastUpdated=1368616696933 -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\serverlib/../../../repository/.lastUpdated=1368616697582 -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\serverws/../../../repository/.lastUpdated=1368616697635 -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=1368616697964 -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=1368616698288 -http\://repo.maven.apache.org/maven2/.lastUpdated=1368616697395 -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=1368616697883 -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\tools/../../../repository/.lastUpdated=1368616697505 -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_moa/1.5/iaik_moa-1.5.pom.lastUpdated b/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.pom.lastUpdated deleted file mode 100644 index 728b1a824..000000000 --- a/repository/iaik/prod/iaik_moa/1.5/iaik_moa-1.5.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:20 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=1368616696896 -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\id\\server\\proxy/../../../repository/.lastUpdated=1368616698745 -file\://C\:\\eclipse_workspaces\\MOA_Git01\\moa-idspss\\spss\\server\\serverws/../../../repository/.lastUpdated=1368616700109 -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=1368616696561 -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=1368616699566 diff --git a/repository/iaik/prod/iaik_moa/1.5/m2e-lastUpdated.properties b/repository/iaik/prod/iaik_moa/1.5/m2e-lastUpdated.properties new file mode 100644 index 000000000..1c0e7bd32 --- /dev/null +++ b/repository/iaik/prod/iaik_moa/1.5/m2e-lastUpdated.properties @@ -0,0 +1,9 @@ +#Wed Sep 04 11:14:45 CEST 2013 +java.net-Public|https\://maven.java.net/content/groups/public/|sources=1378286085859 +iaikLibs|tlenz|http\://nexus/nexus/content/repositories/iaik|sources=1378286085859 +iaik3rd\ Party|tlenz|http\://nexus/nexus/content/repositories/thirdparty|sources=1378286085859 +iaikPublic|tlenz|http\://nexus.iaik.tugraz.at/nexus/content/groups/public|sources=1378286085859 +shibboleth.internet2.edu|https\://build.shibboleth.net/nexus/content/groups/public/|sources=1378286085859 +central|http\://repo1.maven.org/maven2/|sources=1378286085859 +hyberjaxb|http\://repository.highsource.org/maven2/releases/|sources=1378286085859 +iaikInternal|tlenz|http\://nexus.iaik.tugraz.at/nexus/content/groups/internal|sources=1378286085859 |