aboutsummaryrefslogtreecommitdiff
path: root/spss/handbook/clients/api/moa-spss-handbook-apiClient.iml
diff options
context:
space:
mode:
authorBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-03-05 21:27:55 +0100
committerBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-03-05 21:27:55 +0100
commitd828b0b377a1bd61a04f0886c9d24aa1eb19c025 (patch)
treeac7f578e5cf6f4840eb5c6f662b3b6cf96a6a40e /spss/handbook/clients/api/moa-spss-handbook-apiClient.iml
parent0499a41a86a6b44092eb6ad356858cd36a3d19c0 (diff)
parent19e164874ea92d51f9df12f56047d77db9683091 (diff)
downloadmoa-id-spss-d828b0b377a1bd61a04f0886c9d24aa1eb19c025.tar.gz
moa-id-spss-d828b0b377a1bd61a04f0886c9d24aa1eb19c025.tar.bz2
moa-id-spss-d828b0b377a1bd61a04f0886c9d24aa1eb19c025.zip
Merge branch 'moa2_0_tlenz_bs_3' into moa2_0_tlenz_bs_3_ar
Conflicts: 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/protocols/stork2/AttributeCollector.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOASTORKAuthnRequest.java
Diffstat (limited to 'spss/handbook/clients/api/moa-spss-handbook-apiClient.iml')
-rw-r--r--spss/handbook/clients/api/moa-spss-handbook-apiClient.iml10
1 files changed, 8 insertions, 2 deletions
diff --git a/spss/handbook/clients/api/moa-spss-handbook-apiClient.iml b/spss/handbook/clients/api/moa-spss-handbook-apiClient.iml
index c9c03b243..fdffc1a0f 100644
--- a/spss/handbook/clients/api/moa-spss-handbook-apiClient.iml
+++ b/spss/handbook/clients/api/moa-spss-handbook-apiClient.iml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/../../../target/classes" />
- <output-test url="file://$MODULE_DIR$/../../../target/test-classes" />
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
@@ -38,6 +38,12 @@
<orderEntry type="library" name="Maven: jaxen:jaxen:1.0-FCS" level="project" />
<orderEntry type="library" name="Maven: saxpath:saxpath:1.0-FCS" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:1.6.2" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.5" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.5" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.5" level="project" />
+ <orderEntry type="library" name="Maven: commons-io:commons-io:1.3.2" level="project" />
<orderEntry type="module" module-name="moa-spss-lib" />
<orderEntry type="library" name="Maven: iaik.prod:iaik_tsl:1.0" level="project" />
<orderEntry type="library" name="Maven: iaik:iaik_xsect_eval:1.1709142" level="project" />