merge

5 files changed, 15 insertions, 249 deletions

diff --git a/repository/eu/stork/Commons/1.2.0/Commons-1.2.0.jar b/repository/eu/stork/Commons/1.2.0/Commons-1.2.0.jar
deleted file mode 100644
index 4332a474d..000000000
--- a/repository/eu/stork/Commons/1.2.0/Commons-1.2.0.jar
+++ /dev/null
diff --git a/repository/eu/stork/Commons/1.2.0/Commons-1.2.0.pom b/repository/eu/stork/Commons/1.2.0/Commons-1.2.0.pom
deleted file mode 100644
index b658a8e12..000000000
--- a/repository/eu/stork/Commons/1.2.0/Commons-1.2.0.pom
+++ /dev/null
@@ -1,222 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>eu.stork</groupId>
-	<artifactId>Commons</artifactId>
-	<packaging>jar</packaging>
-	<name>Stork Commons</name>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<stork.version>1.2.0</stork.version>
-		<opensaml.version>2.6.0</opensaml.version>
-	</properties>
-	<version>${stork.version}</version>
-  <description>
-        The STORKCommons library provides beans, Java Interfaces and utility classes to integrate PEPS and SAML Engine.
-  </description>
-   
-  
-  <repositories>
-		<repository>
-			<id>shibboleth.internet2.edu</id>
-			<name>Internet2</name>
-			<url>https://build.shibboleth.net/nexus/content/groups/public/</url>
-		</repository>
-	</repositories>
-  
-	<dependencies>
-
-		<!-- Joda -->
-		<dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-			<version>2.3</version>
-		</dependency>
-
-		<!-- Log4J -->
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.17</version>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.jms</groupId>
-					<artifactId>jms</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jdmk</groupId>
-					<artifactId>jmxtools</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jmx</groupId>
-					<artifactId>jmxri</artifactId>
-				</exclusion>
-				<exclusion>
-					<artifactId>mail</artifactId>
-					<groupId>javax.mail</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>org.opensaml</groupId>
-			<artifactId>opensaml</artifactId>
-			<version>${opensaml.version}</version>
-			<exclusions>
-				<exclusion>
-				    <groupId>org.slf4j</groupId>
-				    <artifactId>slf4j-api</artifactId>
-				</exclusion>
-				<exclusion>
-				 	<groupId>org.slf4j</groupId>
-				    <artifactId>slf4j-simple</artifactId>
-				</exclusion>
-				<exclusion>
-				    <groupId>org.slf4j</groupId>
-				    <artifactId>jcl-over-slf4j</artifactId>
-				</exclusion>
-				<exclusion>
-				    <groupId>org.slf4j</groupId>
-				    <artifactId>log4j-over-slf4j</artifactId>
-				</exclusion>
-				<exclusion>
-				    <groupId>org.slf4j</groupId>
-				    <artifactId>jul-to-slf4j</artifactId>
-				</exclusion>
-			</exclusions>			
-		</dependency>
-
-		<!-- Bouncy Castle -->
-		<dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcprov-jdk16</artifactId>
-			<version>1.46</version>
-		</dependency>
-
-		<!-- Servlet API -->
-		<!-- provided by Application Server -->
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>2.6</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.11</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<finalName>commons</finalName>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.1</version>
-					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<configuration>
-            			<runOrder>reversealphabetical</runOrder>
-						<skip>false</skip>
-          				<includes>
-                            <runOrder>reversealphabetical</runOrder>
-				            <include>**/PEPSUtilTest.java</include>
-				            <include>**/PersonalAttributeTestCase.java</include>
-				            <include>**/PersonalAttributeListTestCase.java</include>
-            				<include>**/DateUtilTestCase.java</include>
-				            <include>**/AttributeUtilTest.java</include>
-          				</includes>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.9.1</version>
-				<configuration>
-					<links>
-						<link>http://commons.apache.org/lang/api/</link>
-						<link>http://java.sun.com/j2se/1.6.0/docs/api/</link>
-						<link>http://www.bouncycastle.org/docs/docs1.6/</link>
-						<link>http://docs.oracle.com/javase/6/docs/api/</link>
-					</links>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<version>2.2.1</version>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>jar-no-fork</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-		<testResources>
-			<testResource>
-				<directory>src/test/resources</directory>
-				<includes>
-					<include>log4j.xml</include>
-				</includes>
-			</testResource>
-		</testResources>
-	</build>
-	<profiles>
-		<profile>
-			<id>embedded</id>
-			<build>
-				<resources>
-					<resource>
-						<directory> ${project.basedir}/src/main/resources</directory>
-					</resource>
-					<resource>
-						<directory> ${project.basedir}/src/main/config/embedded</directory>
-					</resource>
-				</resources>
-			</build>
-		</profile>
-		<profile>
-			<id>metrics</id>
-			<build>
-			<plugins>
-				<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.5.1</version>
-					<configuration>
-						<formats>
-							<format>html</format>
-							<format>xml</format>
-							</formats>
-					</configuration>
-				</plugin>
-			</plugins>
-			</build>
-		</profile>
-		</profiles>
-</project>
diff --git a/repository/eu/stork/oasis-dss-api/1.0.0-RELEASE/oasis-dss-api-1.0.0-RELEASE.jar b/repository/eu/stork/oasis-dss-api/1.0.0-RELEASE/oasis-dss-api-1.0.0-RELEASE.jar
new file mode 100644
index 000000000..2943eac88
--- /dev/null
+++ b/repository/eu/stork/oasis-dss-api/1.0.0-RELEASE/oasis-dss-api-1.0.0-RELEASE.jar
diff --git a/repository/eu/stork/oasis-dss-api/1.0.0-SNAPSHOT/oasis-dss-api-1.0.0-SNAPSHOT.pom b/repository/eu/stork/oasis-dss-api/1.0.0-RELEASE/oasis-dss-api-1.0.0-RELEASE.pom
index ef04f07c4..7dab86ee0 100644
--- a/repository/eu/stork/oasis-dss-api/1.0.0-SNAPSHOT/oasis-dss-api-1.0.0-SNAPSHOT.pom
+++ b/repository/eu/stork/oasis-dss-api/1.0.0-RELEASE/oasis-dss-api-1.0.0-RELEASE.pom
@@ -3,32 +3,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>oasis-dss-api</artifactId>
 	<groupId>eu.stork</groupId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.0.0-RELEASE</version>
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>jaxb2-maven-plugin</artifactId>
-				<version>1.5</version>
-				<executions>
-					<execution>
-						<id>oasis-dss</id>
-						<goals>
-							<goal>xjc</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<args>
-						<arg>-npa</arg>
-					</args>
-					<schemaDirectory>${project.basedir}/src/main/resources/schema/oasis-dss</schemaDirectory>
-					<schemaFiles>oasis-dss-core-schema-v1.0-os.xsd</schemaFiles>
-					<packageName>eu.stork.oasisdss.profile</packageName>
-					<extension>true</extension>
-				</configuration>
-			</plugin>
-			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.0.2</version>
@@ -75,11 +53,21 @@
 			<artifactId>commons-io</artifactId>
 			<version>1.3.2</version>
 		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.jvnet.jaxb2_commons</groupId> -->
+<!-- 			<artifactId>jaxb2-namespace-prefix</artifactId> -->
+<!-- 			<version>1.1</version> -->
+<!-- 		</dependency> -->
 		<dependency>
-			<groupId>com.sun.xml.ws</groupId>
-			<artifactId>jaxws-rt</artifactId>
-			<version>2.1.7</version>
+			<groupId>eu.medsea.mimeutil</groupId>
+			<artifactId>mime-util</artifactId>
+			<version>2.1.3</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-log4j12</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
-
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/repository/eu/stork/oasis-dss-api/1.0.0-SNAPSHOT/oasis-dss-api-1.0.0-SNAPSHOT.jar b/repository/eu/stork/oasis-dss-api/1.0.0-SNAPSHOT/oasis-dss-api-1.0.0-SNAPSHOT.jar
deleted file mode 100644
index 5ad0cb42e..000000000
--- a/repository/eu/stork/oasis-dss-api/1.0.0-SNAPSHOT/oasis-dss-api-1.0.0-SNAPSHOT.jar
+++ /dev/null