aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-03-05 21:28:25 +0100
committerBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-03-05 21:28:25 +0100
commited54650118390e2747dece3bad6bd74b6eefec7a (patch)
tree11a5cc18cda92396d2b344c22ee0f2943cf4cb7b
parentd828b0b377a1bd61a04f0886c9d24aa1eb19c025 (diff)
downloadmoa-id-spss-ed54650118390e2747dece3bad6bd74b6eefec7a.tar.gz
moa-id-spss-ed54650118390e2747dece3bad6bd74b6eefec7a.tar.bz2
moa-id-spss-ed54650118390e2747dece3bad6bd74b6eefec7a.zip
merge ar-bs
-rw-r--r--id/ConfigWebTool/ConfigurationInterface.iml1
-rw-r--r--id/server/auth/moa-id-auth.iml1
-rw-r--r--id/server/idserverlib/moa-id-lib.iml1
-rw-r--r--id/server/proxy/moa-id-proxy.iml1
4 files changed, 4 insertions, 0 deletions
diff --git a/id/ConfigWebTool/ConfigurationInterface.iml b/id/ConfigWebTool/ConfigurationInterface.iml
index f6325d7c7..13c327c84 100644
--- a/id/ConfigWebTool/ConfigurationInterface.iml
+++ b/id/ConfigWebTool/ConfigurationInterface.iml
@@ -35,6 +35,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.6.6" level="project" />
+ <orderEntry type="library" name="Maven: eu.medsea.mimeutil:mime-util:2.1.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:jstl:1.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.4" level="project" />
<orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
diff --git a/id/server/auth/moa-id-auth.iml b/id/server/auth/moa-id-auth.iml
index bf76e8805..815c21ef2 100644
--- a/id/server/auth/moa-id-auth.iml
+++ b/id/server/auth/moa-id-auth.iml
@@ -23,6 +23,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.6.6" level="project" />
+ <orderEntry type="library" name="Maven: eu.medsea.mimeutil:mime-util:2.1.3" level="project" />
<orderEntry type="library" name="Maven: axis:axis:1.0_IAIK" level="project" />
<orderEntry type="library" name="Maven: org.tuckey:urlrewritefilter:4.0.3" level="project" />
<orderEntry type="module" module-name="moa-spss-lib" />
diff --git a/id/server/idserverlib/moa-id-lib.iml b/id/server/idserverlib/moa-id-lib.iml
index 91b3617ad..47c38c069 100644
--- a/id/server/idserverlib/moa-id-lib.iml
+++ b/id/server/idserverlib/moa-id-lib.iml
@@ -13,6 +13,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: eu.stork.mw.core:stork-saml-engine:2.0" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.6.6" level="project" />
+ <orderEntry type="library" name="Maven: eu.medsea.mimeutil:mime-util:2.1.3" level="project" />
<orderEntry type="module" module-name="SamlEngine" />
<orderEntry type="library" name="Maven: eu.stork:Commons:1.2.0" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.3" level="project" />
diff --git a/id/server/proxy/moa-id-proxy.iml b/id/server/proxy/moa-id-proxy.iml
index 279d544b1..d0e7de0b2 100644
--- a/id/server/proxy/moa-id-proxy.iml
+++ b/id/server/proxy/moa-id-proxy.iml
@@ -21,6 +21,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.6.6" level="project" />
+ <orderEntry type="library" name="Maven: eu.medsea.mimeutil:mime-util:2.1.3" level="project" />
<orderEntry type="library" name="Maven: axis:axis:1.0_IAIK" level="project" />
<orderEntry type="module" module-name="moa-spss-lib" />
<orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" />