From 868b44cfa0b086710dcaf49e9b029a0b05bc8826 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Fri, 17 Jan 2014 15:46:22 +0100
Subject: fixing maven errors

---
 id/oa/moa-id-oa.iml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 id/oa/moa-id-oa.iml

(limited to 'id/oa')

diff --git a/id/oa/moa-id-oa.iml b/id/oa/moa-id-oa.iml
new file mode 100644
index 000000000..a87a36773
--- /dev/null
+++ b/id/oa/moa-id-oa.iml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="web" name="Web">
+      <configuration>
+        <descriptors>
+          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
+        </descriptors>
+        <webroots>
+          <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
+        </webroots>
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
-- 
cgit v1.2.3


From 37be718068ed2c9c3e26a79d2deba88b33655f30 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Fri, 17 Jan 2014 17:29:51 +0100
Subject: copying old changes

---
 id/oa/moa-id-oa.iml | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 id/oa/moa-id-oa.iml

(limited to 'id/oa')

diff --git a/id/oa/moa-id-oa.iml b/id/oa/moa-id-oa.iml
deleted file mode 100644
index a87a36773..000000000
--- a/id/oa/moa-id-oa.iml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="web" name="Web">
-      <configuration>
-        <descriptors>
-          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
-        </descriptors>
-        <webroots>
-          <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
-        </webroots>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-
-- 
cgit v1.2.3


From 5a929406263d98b140af591ca33ef5ecc1222284 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Fri, 17 Jan 2014 17:31:42 +0100
Subject: copying old changes

---
 id/oa/moa-id-oa.iml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 id/oa/moa-id-oa.iml

(limited to 'id/oa')

diff --git a/id/oa/moa-id-oa.iml b/id/oa/moa-id-oa.iml
new file mode 100644
index 000000000..a87a36773
--- /dev/null
+++ b/id/oa/moa-id-oa.iml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="web" name="Web">
+      <configuration>
+        <descriptors>
+          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
+        </descriptors>
+        <webroots>
+          <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
+        </webroots>
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
-- 
cgit v1.2.3


From f5c184fb20f87732030868e58653fdf68113f05a Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Mon, 27 Jan 2014 18:33:39 +0100
Subject: fix version for oa lib

---
 id/oa/moa-id-oa.iml |  4 +++-
 id/oa/pom.xml       | 25 +++++++++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

(limited to 'id/oa')

diff --git a/id/oa/moa-id-oa.iml b/id/oa/moa-id-oa.iml
index 6fc69d99c..412cad133 100644
--- a/id/oa/moa-id-oa.iml
+++ b/id/oa/moa-id-oa.iml
@@ -12,7 +12,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <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" />
     <content url="file://$MODULE_DIR$">
@@ -32,6 +32,8 @@
     <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.santuario:xmlsec:1.5.4" level="project" />
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.4" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: xerces:xercesImpl:2.10.0" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: xml-resolver:xml-resolver:1.2" level="project" />
diff --git a/id/oa/pom.xml b/id/oa/pom.xml
index 3b507a223..254b9e119 100644
--- a/id/oa/pom.xml
+++ b/id/oa/pom.xml
@@ -18,10 +18,25 @@
 				<name>Internet2</name>
 				<url>https://build.shibboleth.net/nexus/content/groups/public/</url>
 			</repository>
+            <repository>
+                <id>IAIK Local</id>
+                <name>iaik/libs</name>
+                <url>http://nexus.iaik.tugraz.at/nexus/content/repositories/iaik/</url>
+            </repository>
 		</repositories>
     
     <build>
         <finalName>oa</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
     
     <dependencies>
@@ -35,8 +50,13 @@
 				<artifactId>xmltooling</artifactId>
 				<version>1.4.0</version>
 			</dependency>
-
-			<dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <scope>provided</scope>
+            <version>2.4</version>
+        </dependency>
+        <dependency>
 				<groupId>jstl</groupId>
 			  <artifactId>jstl</artifactId>
 			  <version>1.2</version>
@@ -67,4 +87,5 @@
 			</dependency>
   		
     </dependencies>
+
 </project>
-- 
cgit v1.2.3


From 791615f1f887f81ade19a374e2552f3cb1be89ab Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Mon, 3 Feb 2014 19:04:01 +0100
Subject: merging again

---
 id/oa/moa-id-oa.iml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'id/oa')

diff --git a/id/oa/moa-id-oa.iml b/id/oa/moa-id-oa.iml
index 2167d3b37..0b7bf00de 100644
--- a/id/oa/moa-id-oa.iml
+++ b/id/oa/moa-id-oa.iml
@@ -51,6 +51,11 @@
     <orderEntry type="library" name="Maven: iaik:commons-iaik:0.7.1" level="project" />
     <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
     <orderEntry type="module" module-name="moa-common" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_jce_full:5.101" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_moa:1.5" level="project" />
+    <orderEntry type="library" name="Maven: jaxen:jaxen:1.0-FCS" level="project" />
+    <orderEntry type="library" name="Maven: saxpath:saxpath:1.0-FCS" level="project" />
   </component>
 </module>
 
-- 
cgit v1.2.3


From 4c104d5d8349195007d19a13ed54426f9fe7b49a Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Thu, 6 Feb 2014 18:29:23 +0100
Subject: iml

---
 id/oa/moa-id-oa.iml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/oa')

diff --git a/id/oa/moa-id-oa.iml b/id/oa/moa-id-oa.iml
index 0b7bf00de..6d9905e25 100644
--- a/id/oa/moa-id-oa.iml
+++ b/id/oa/moa-id-oa.iml
@@ -13,8 +13,8 @@
     </facet>
   </component>
   <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" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-- 
cgit v1.2.3


From cd0887a43b0b4350e736433c2b513901a2151601 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Tue, 4 Mar 2014 17:51:06 +0100
Subject: after merge, having problem

---
 id/oa/moa-id-oa.iml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'id/oa')

diff --git a/id/oa/moa-id-oa.iml b/id/oa/moa-id-oa.iml
index 6d9905e25..0b7bf00de 100644
--- a/id/oa/moa-id-oa.iml
+++ b/id/oa/moa-id-oa.iml
@@ -13,8 +13,8 @@
     </facet>
   </component>
   <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" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-- 
cgit v1.2.3