Merge branch 'datentechnik_modularization' into moa-id-2.2-merge

Conflicts:
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
	id/server/stork2-commons/pom.xml
	id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/entries
	id/server/stork2-commons/src/main/resources/.svn/entries
	id/server/stork2-saml-engine/pom.xml
	pom.xml

1 files changed, 100 insertions, 12 deletions

diff --git a/pom.xml b/pom.xml
index ef0b95c8a..c3d6f9630 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,13 +10,27 @@
     <properties>

         <repositoryPath>${basedir}/repository</repositoryPath>

         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

-        

-        <moa-commons-version>2.0.2</moa-commons-version>

-				<moa-id-version>2.1.2.3</moa-id-version>

-				<moa-id-proxy-version>2.0.0</moa-id-proxy-version>

-        <moa-spss-version>2.0.3</moa-spss-version>

-				<configtool-version>1.1.5.1</configtool-version>

-				<demo-oa-version>2.0.2</demo-oa-version>

+

+		<!--

+		<moa-commons-version>2.0.1</moa-commons-version>

+		<moa-id-version>2.1.2</moa-id-version>

+		<moa-id-proxy-version>2.0.0</moa-id-proxy-version>

+		<moa-spss-version>2.0.3</moa-spss-version>

+		<configtool-version>1.1.4</configtool-version>

+		<demo-oa-version>2.0.2</demo-oa-version>

+		<moa-commons-version>2.0.1</moa-commons-version>

+		-->

+		

+		<moa-commons-version>2.0.2-SNAPSHOT</moa-commons-version>

+		<moa-id-version>2.2.0-SNAPSHOT</moa-id-version>

+		<moa-id-proxy-version>2.0.1-SNAPSHOT</moa-id-proxy-version>

+		<moa-spss-version>2.0.4-SNAPSHOT</moa-spss-version>

+		<configtool-version>1.1.5-SNAPSHOT</configtool-version>

+		<demo-oa-version>2.0.3-SNAPSHOT</demo-oa-version>

+		

+		<org.springframework.version>4.1.4.RELEASE</org.springframework.version>

+		<surefire.version>2.18.1</surefire.version>

+

     </properties>

 

     <profiles>

@@ -56,8 +70,16 @@
             </repositories>

         </profile>

     </profiles>

-

+    

     <build>

+    	<pluginManagement>

+    		<plugins>

+    			<plugin>

+    				<artifactId>maven-release-plugin</artifactId>

+    				<version>2.5.1</version>

+    			</plugin>

+    		</plugins>

+    	</pluginManagement>

         <plugins>

 <!--         		<plugin>

             		<groupId>org.codehaus.mojo</groupId>

@@ -80,8 +102,57 @@
         		<plugin>

                 <groupId>org.apache.maven.plugins</groupId>

                 <artifactId>maven-surefire-plugin</artifactId>

+                <version>${surefire.version}</version>

                 <configuration>

-                    <skip>true</skip>

+                	<excludes>

+                		<exclude>eu/stork/peps/test/simple/SimpleBaseTest.java</exclude>

+                		<exclude>eu/stork/peps/test/simple/StorkAttrQueryRequestTest.java</exclude>

+                		<exclude>eu/stork/peps/test/simple/StorkAttrQueryResponseTest.java</exclude>

+                		<exclude>eu/stork/peps/test/simple/StorkAuthRequestTest.java</exclude>

+                		<exclude>eu/stork/peps/test/simple/StorkLogoutRequestTest.java</exclude>

+                		<exclude>eu/stork/peps/test/simple/StorkLogoutResponseTest.java</exclude>

+                		<exclude>eu/stork/peps/test/simple/StorkNewResponseTest.java</exclude>

+                		<exclude>eu/stork/peps/test/simple/StorkResponseTest.java</exclude>

+                		<exclude>test/MOAIDTestCase.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/MOATestCase.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/id/UnitTestCase.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/id/auth/MOAIDAuthInitialiserTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilderTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilderTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilderTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilderTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilderTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/id/auth/invoke/IdentityLinkAssertionParserTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/id/auth/invoke/MOASPSSTestCase.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/id/auth/oauth/CertTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParserTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParserTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/id/auth/parser/SAMLArtifactParserTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/id/proxy/builder/SAMLArtifactBuilderTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestBuilderTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParserTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/spss/SPSSTestCase.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfiguratorTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/util/DOMUtilsTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/util/SSLUtilsTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/util/URLDecoderTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/util/URLEncoderTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java</exclude>

+                		<exclude>test/at/gv/egovernment/moa/util/XPathUtilsTest.java</exclude>

+                	</excludes>

                 </configuration>

             </plugin>

             <plugin>

@@ -92,8 +163,8 @@
                     <fork>true</fork>

                     <executable>${env.BUILD_EXECUTEABLE}</executable>

                     <compilerVersion>${env.BUILD_VERSION}</compilerVersion>

-                    <source>1.6</source>

-                    <target>1.6</target>

+                    <source>1.7</source>

+                    <target>1.7</target>

                 </configuration>

             </plugin>

             <plugin>

@@ -258,7 +329,17 @@
             	<artifactId>moa-id-commons</artifactId>

             	<version>${moa-id-version}</version>

               <scope>compile</scope>

-        		</dependency>            

+        		</dependency>

+			<dependency>

+				<groupId>MOA.id.server.modules</groupId>

+				<artifactId>moa-id-module-stork</artifactId>

+				<version>${moa-id-version}</version>

+			</dependency>            

+			<dependency>

+				<groupId>MOA.id.server.modules</groupId>

+				<artifactId>moa-id-module-monitoring</artifactId>

+				<version>${moa-id-version}</version>

+			</dependency>            

             <dependency>

                 <groupId>MOA.spss.server</groupId>

                 <artifactId>moa-spss-lib</artifactId>

@@ -483,6 +564,13 @@
                 <version>2.7.2</version><!-- xalan version -->

                 <scope>runtime</scope>

             </dependency>

+            

+			<dependency>

+				<groupId>org.springframework</groupId>

+				<artifactId>spring-webmvc</artifactId>

+				<version>${org.springframework.version}</version>

+			</dependency>

+			

         </dependencies>

     </dependencyManagement>