diff --git a/build/.gitignore b/build/.gitignore new file mode 100644 index 0000000000..1521c8b765 --- /dev/null +++ b/build/.gitignore @@ -0,0 +1 @@ +dist diff --git a/build/build.properties b/build/build.properties index 2d228b2348..0361cefc53 100644 --- a/build/build.properties +++ b/build/build.properties @@ -6,9 +6,9 @@ major-number: 2 minor-number: 4 # the last figure of the real release number: e.g. 1 in "2.2m1", "2.3rc1", "2.4.1" -release-number:4 +release-number: 0.syn6 # choose among: final, snapshot, rc, milestone -meta.release-type: snapshot +meta.release-type: final version-minor: ${major-number}.${minor-number} # Version of JDK required @@ -53,7 +53,7 @@ nsis-makensis-path: /usr/bin verbose: false # Indicates if the Maven distribution should be regenerated. -maven: false +maven: true # Indicates if the P2 distribution should be regenerated. p2: false @@ -68,7 +68,7 @@ eclipse-pde-require-bundle: true verify: true # Indicates if the final packaging phase should be done. -package: false +package: true # Port number to use for JUnit tests port-number: 30000 diff --git a/build/uploadToNexus.sh b/build/uploadToNexus.sh new file mode 100755 index 0000000000..41fa280740 --- /dev/null +++ b/build/uploadToNexus.sh @@ -0,0 +1,39 @@ +#!/bin/bash + +user=$1 +password=$2 +releaseNumber=`grep release-number build.properties | sed -nE 's/^release-number:\s*([a-zA-Z0-9\.]+).*$/\1/p'` +version="2.4.${releaseNumber}" + +if [ -z ${user} ] || [ -z ${password} ]; then + echo "Usage: $0 " + exit 1 +fi + +baseDirectory=dist/maven2/restlet-${version}/org/restlet/jse +if ! [ -d ${baseDirectory} ]; then + echo "${baseDirectory} does not exist. Did you specify the correct version?" + exit 1 +fi + +for i in `ls ${baseDirectory}`; do + fileBase=${baseDirectory}/${i}/${version}/${i}-${version} + echo "uploading ${fileBase}.*" + + if [ -f "${fileBase}.jar" ]; then + curl -u${user}:${password} -XPOST 'http://nexus.synedra.lan:8081/service/rest/v1/components?repository=thirdparty' \ + -Fmaven2.generate-pom=false \ + -Fmaven2.asset1=@${fileBase}.pom \ + -Fmaven2.asset1.extension=pom \ + -Fmaven2.asset2=@${fileBase}.jar \ + -Fmaven2.asset2.extension=jar \ + -Fmaven2.asset3=@${fileBase}-sources.jar \ + -Fmaven2.asset3.extension=jar \ + -Fmaven2.asset3.classifier=sources + else + curl -u${user}:${password} -XPOST 'http://nexus.synedra.lan:8081/service/rest/v1/components?repository=thirdparty' \ + -Fmaven2.generate-pom=false \ + -Fmaven2.asset1=@${fileBase}.pom \ + -Fmaven2.asset1.extension=pom + fi +done diff --git a/incubator/org.restlet.ext.webdav/pom.xml b/incubator/org.restlet.ext.webdav/pom.xml index cb34592e68..747f1a1ac6 100644 --- a/incubator/org.restlet.ext.webdav/pom.xml +++ b/incubator/org.restlet.ext.webdav/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.incubator 2.2-SNAPSHOT @@ -13,9 +13,9 @@ Support for WebDAV. - org.restlet.dev + org.restlet.jse org.restlet - ${project.version} + 2.4_syn4 diff --git a/incubator/pom.xml b/incubator/pom.xml index f4a910fd9c..4650a19ce3 100644 --- a/incubator/pom.xml +++ b/incubator/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.incubator 2.2-SNAPSHOT pom @@ -32,7 +32,6 @@ maven1-java Java.net repository (Maven 1) http://download.java.net/maven/1 - legacy maven2-jboss @@ -52,7 +51,6 @@ - org.restlet.ext.guice org.restlet.ext.webdav @@ -94,9 +92,10 @@ org.apache.maven.plugins maven-compiler-plugin + 3.10.1 - 1.5 - 1.5 + 1.7 + 1.7 diff --git a/libraries/org.apache.commons.io_2.6/.classpath b/libraries/org.apache.commons.io_2.6/.classpath deleted file mode 100644 index 5c043ca8de..0000000000 --- a/libraries/org.apache.commons.io_2.6/.classpath +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/libraries/org.apache.commons.io_2.6/.project b/libraries/org.apache.commons.io_2.6/.project deleted file mode 100644 index 354a75f787..0000000000 --- a/libraries/org.apache.commons.io_2.6/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - org.apache.commons.io - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/modules/org.restlet.example/pom.xml b/modules/org.restlet.example/pom.xml index 9bce381991..f5ed838eb2 100644 --- a/modules/org.restlet.example/pom.xml +++ b/modules/org.restlet.example/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.example @@ -32,123 +32,123 @@ - org.restlet.dev + org.restlet.jse org.restlet.ext.atom - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.crypto - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.fileupload - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.freemarker - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.guice - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.jaas - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.jackson - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.jaxb - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.jaxrs - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.jetty - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.jibx - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.json - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.oauth - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.openid - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.rdf - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.spring - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.velocity - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.xml - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.wadl - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.atom/pom.xml b/modules/org.restlet.ext.atom/pom.xml index db3d47ad48..e88edf4415 100644 --- a/modules/org.restlet.ext.atom/pom.xml +++ b/modules/org.restlet.ext.atom/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.atom @@ -14,15 +14,15 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.xml - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.crypto/pom.xml b/modules/org.restlet.ext.crypto/pom.xml index e88863a5e4..50fe138697 100644 --- a/modules/org.restlet.ext.crypto/pom.xml +++ b/modules/org.restlet.ext.crypto/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.crypto @@ -14,9 +14,9 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.emf/pom.xml b/modules/org.restlet.ext.emf/pom.xml index f2439bf5de..752e69079f 100644 --- a/modules/org.restlet.ext.emf/pom.xml +++ b/modules/org.restlet.ext.emf/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.emf @@ -32,9 +32,9 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.fileupload/pom.xml b/modules/org.restlet.ext.fileupload/pom.xml index b9156cec85..6b65c3aed1 100644 --- a/modules/org.restlet.ext.fileupload/pom.xml +++ b/modules/org.restlet.ext.fileupload/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.fileupload @@ -26,9 +26,9 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.freemarker/pom.xml b/modules/org.restlet.ext.freemarker/pom.xml index 78d8796d75..0fb2ab4ace 100644 --- a/modules/org.restlet.ext.freemarker/pom.xml +++ b/modules/org.restlet.ext.freemarker/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.freemarker @@ -20,9 +20,9 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.gae/pom.xml b/modules/org.restlet.ext.gae/pom.xml index e00853008b..9a9bee7180 100644 --- a/modules/org.restlet.ext.gae/pom.xml +++ b/modules/org.restlet.ext.gae/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.gae @@ -20,9 +20,9 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.gson/pom.xml b/modules/org.restlet.ext.gson/pom.xml index 073520368c..13d2886e42 100644 --- a/modules/org.restlet.ext.gson/pom.xml +++ b/modules/org.restlet.ext.gson/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.gson @@ -26,9 +26,9 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.guice/pom.xml b/modules/org.restlet.ext.guice/pom.xml index 90e80f45fa..82b712e70c 100644 --- a/modules/org.restlet.ext.guice/pom.xml +++ b/modules/org.restlet.ext.guice/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.guice @@ -32,9 +32,9 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.gwt/pom.xml b/modules/org.restlet.ext.gwt/pom.xml index 09d14c59c9..f086f03529 100644 --- a/modules/org.restlet.ext.gwt/pom.xml +++ b/modules/org.restlet.ext.gwt/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.gwt @@ -20,9 +20,9 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.html/pom.xml b/modules/org.restlet.ext.html/pom.xml index 8dd0d05b79..1ee3e22017 100644 --- a/modules/org.restlet.ext.html/pom.xml +++ b/modules/org.restlet.ext.html/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.html @@ -14,9 +14,9 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.httpclient/pom.xml b/modules/org.restlet.ext.httpclient/pom.xml index 9b34bfb766..5f3e18808d 100644 --- a/modules/org.restlet.ext.httpclient/pom.xml +++ b/modules/org.restlet.ext.httpclient/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.httpclient @@ -56,9 +56,9 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.jaas/pom.xml b/modules/org.restlet.ext.jaas/pom.xml index cec1a0beba..de23e9c361 100644 --- a/modules/org.restlet.ext.jaas/pom.xml +++ b/modules/org.restlet.ext.jaas/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.jaas @@ -14,9 +14,9 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.jackson/pom.xml b/modules/org.restlet.ext.jackson/pom.xml index 76b7c47d7d..27a64d9099 100644 --- a/modules/org.restlet.ext.jackson/pom.xml +++ b/modules/org.restlet.ext.jackson/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.jackson @@ -86,9 +86,9 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.javamail/pom.xml b/modules/org.restlet.ext.javamail/pom.xml index 6f5a6bb27c..27968e607d 100644 --- a/modules/org.restlet.ext.javamail/pom.xml +++ b/modules/org.restlet.ext.javamail/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.javamail @@ -20,15 +20,15 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.xml - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.jaxb/pom.xml b/modules/org.restlet.ext.jaxb/pom.xml index f1228693c7..9e6f90531f 100644 --- a/modules/org.restlet.ext.jaxb/pom.xml +++ b/modules/org.restlet.ext.jaxb/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.jaxb @@ -20,9 +20,9 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.jaxrs/pom.xml b/modules/org.restlet.ext.jaxrs/pom.xml index af3547a91c..d1f50ec396 100644 --- a/modules/org.restlet.ext.jaxrs/pom.xml +++ b/modules/org.restlet.ext.jaxrs/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.jaxrs @@ -68,9 +68,9 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.jetty/pom.xml b/modules/org.restlet.ext.jetty/pom.xml index 6b98e9d639..67642dcbc5 100644 --- a/modules/org.restlet.ext.jetty/pom.xml +++ b/modules/org.restlet.ext.jetty/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.jetty @@ -44,9 +44,9 @@ ${lib-servlet-version} - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.jibx/pom.xml b/modules/org.restlet.ext.jibx/pom.xml index c44ba6dcc5..a931f62077 100644 --- a/modules/org.restlet.ext.jibx/pom.xml +++ b/modules/org.restlet.ext.jibx/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.jibx @@ -20,9 +20,9 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.json/pom.xml b/modules/org.restlet.ext.json/pom.xml index 90ce41c8c4..d5cbd1ea48 100644 --- a/modules/org.restlet.ext.json/pom.xml +++ b/modules/org.restlet.ext.json/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.json @@ -20,9 +20,9 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.lucene/pom.xml b/modules/org.restlet.ext.lucene/pom.xml index 29dfa6fc97..66d5a5aad8 100644 --- a/modules/org.restlet.ext.lucene/pom.xml +++ b/modules/org.restlet.ext.lucene/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.lucene @@ -14,15 +14,15 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.xml - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.nio/pom.xml b/modules/org.restlet.ext.nio/pom.xml index d4e04d7636..ba0ec4e729 100644 --- a/modules/org.restlet.ext.nio/pom.xml +++ b/modules/org.restlet.ext.nio/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.nio @@ -14,9 +14,9 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.oauth/pom.xml b/modules/org.restlet.ext.oauth/pom.xml index 6d199d9733..c082a4c83f 100644 --- a/modules/org.restlet.ext.oauth/pom.xml +++ b/modules/org.restlet.ext.oauth/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.oauth @@ -51,27 +51,27 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.crypto - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.freemarker - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.json - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.odata/pom.xml b/modules/org.restlet.ext.odata/pom.xml index cc3737f9a0..eaf7974134 100644 --- a/modules/org.restlet.ext.odata/pom.xml +++ b/modules/org.restlet.ext.odata/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.odata @@ -20,27 +20,27 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.atom - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.freemarker - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.xml - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.openid/pom.xml b/modules/org.restlet.ext.openid/pom.xml index 80b3b7658b..357b1964ba 100644 --- a/modules/org.restlet.ext.openid/pom.xml +++ b/modules/org.restlet.ext.openid/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.openid @@ -43,21 +43,21 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.xml - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.json - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.osgi/pom.xml b/modules/org.restlet.ext.osgi/pom.xml index e1903c97ed..85bb1db513 100644 --- a/modules/org.restlet.ext.osgi/pom.xml +++ b/modules/org.restlet.ext.osgi/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.osgi @@ -38,9 +38,9 @@ compile - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.platform/pom.xml b/modules/org.restlet.ext.platform/pom.xml index 1e6498b818..5a88c19ea5 100644 --- a/modules/org.restlet.ext.platform/pom.xml +++ b/modules/org.restlet.ext.platform/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.platform @@ -50,15 +50,15 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.jackson - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.raml/pom.xml b/modules/org.restlet.ext.raml/pom.xml index 65e1037d52..463c34f5eb 100644 --- a/modules/org.restlet.ext.raml/pom.xml +++ b/modules/org.restlet.ext.raml/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.raml @@ -80,21 +80,21 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.jackson - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.platform - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.rdf/pom.xml b/modules/org.restlet.ext.rdf/pom.xml index a4a0d571a4..b0dd00801a 100644 --- a/modules/org.restlet.ext.rdf/pom.xml +++ b/modules/org.restlet.ext.rdf/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.rdf @@ -14,15 +14,15 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.xml - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.servlet/pom.xml b/modules/org.restlet.ext.servlet/pom.xml index 9733e182c4..b6cfce63b9 100644 --- a/modules/org.restlet.ext.servlet/pom.xml +++ b/modules/org.restlet.ext.servlet/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.servlet @@ -20,15 +20,15 @@ provided - org.restlet.dev + org.restlet.jse org.restlet.ext.osgi - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.simple/pom.xml b/modules/org.restlet.ext.simple/pom.xml index 66f9a28d41..f382ec756e 100644 --- a/modules/org.restlet.ext.simple/pom.xml +++ b/modules/org.restlet.ext.simple/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.simple @@ -20,9 +20,9 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.slf4j/pom.xml b/modules/org.restlet.ext.slf4j/pom.xml index 991b7c9125..fbad3e6d2f 100644 --- a/modules/org.restlet.ext.slf4j/pom.xml +++ b/modules/org.restlet.ext.slf4j/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.slf4j @@ -20,9 +20,9 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.spring/pom.xml b/modules/org.restlet.ext.spring/pom.xml index 82d49e852b..4cf0660946 100644 --- a/modules/org.restlet.ext.spring/pom.xml +++ b/modules/org.restlet.ext.spring/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.spring @@ -69,15 +69,15 @@ - org.restlet.dev + org.restlet.jse org.restlet.ext.servlet - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.swagger/pom.xml b/modules/org.restlet.ext.swagger/pom.xml index 7646152cac..73029e815c 100644 --- a/modules/org.restlet.ext.swagger/pom.xml +++ b/modules/org.restlet.ext.swagger/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.swagger @@ -98,27 +98,27 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.jackson - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.jaxrs - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.platform - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.thymeleaf/pom.xml b/modules/org.restlet.ext.thymeleaf/pom.xml index 6b7f054114..7fc6dd975d 100644 --- a/modules/org.restlet.ext.thymeleaf/pom.xml +++ b/modules/org.restlet.ext.thymeleaf/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.thymeleaf @@ -20,9 +20,9 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.velocity/pom.xml b/modules/org.restlet.ext.velocity/pom.xml index a9b145723b..40a2be417e 100644 --- a/modules/org.restlet.ext.velocity/pom.xml +++ b/modules/org.restlet.ext.velocity/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.velocity @@ -32,9 +32,9 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.wadl/pom.xml b/modules/org.restlet.ext.wadl/pom.xml index c00849d583..d414a7f736 100644 --- a/modules/org.restlet.ext.wadl/pom.xml +++ b/modules/org.restlet.ext.wadl/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.wadl @@ -14,15 +14,15 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.xml - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.ext.xml/pom.xml b/modules/org.restlet.ext.xml/pom.xml index 5e219e0d67..163c2a5d6f 100644 --- a/modules/org.restlet.ext.xml/pom.xml +++ b/modules/org.restlet.ext.xml/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.ext.xml @@ -14,9 +14,9 @@ - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.test/pom.xml b/modules/org.restlet.test/pom.xml index d8c95c6db4..5edd1ad5bb 100644 --- a/modules/org.restlet.test/pom.xml +++ b/modules/org.restlet.test/pom.xml @@ -3,16 +3,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet.test Restlet Unit Tests All Restlet unit tests. - ${basedir}/src + ${basedir}/src/main/java @@ -41,183 +41,183 @@ - org.restlet.dev + org.restlet.jse org.restlet.ext.atom - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.crypto - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.emf - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.example - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.freemarker - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.gson - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.guice - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.gwt - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.html - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.httpclient - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.jackson - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.jaxb - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.jaxrs - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.jetty - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.json - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.lucene - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.oauth - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.odata - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.rdf - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.simple - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.spring - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.thymeleaf - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.velocity - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.wadl - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.xml - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.platform - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.raml - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.swagger - 2.4-SNAPSHOT + 2.4_syn4 - org.restlet.dev + org.restlet.jse org.restlet.ext.nio - 2.4-SNAPSHOT + 2.4_syn4 diff --git a/modules/org.restlet.test/src/main/java/org/restlet/test/engine/header/CookieSettingReaderTestCase.java b/modules/org.restlet.test/src/main/java/org/restlet/test/engine/header/CookieSettingReaderTestCase.java new file mode 100644 index 0000000000..56f1d52ace --- /dev/null +++ b/modules/org.restlet.test/src/main/java/org/restlet/test/engine/header/CookieSettingReaderTestCase.java @@ -0,0 +1,31 @@ +package org.restlet.test.engine.header; + +import org.restlet.data.CookieSetting; +import org.restlet.data.CookieSetting.SameSite; +import org.restlet.engine.header.CookieSettingReader; +import org.restlet.test.RestletTestCase; + +public class CookieSettingReaderTestCase extends RestletTestCase { + + public void testReadingWithoutSameSite() { + CookieSetting readSetting = CookieSettingReader.read("cookie=value"); + assertNull(readSetting.getSameSite()); + } + + public void testReadingOfSameSite() { + for(SameSite sameSite : SameSite.values()) { + CookieSetting readSetting = CookieSettingReader.read("cookie=value; SameSite=" + sameSite); + assertEquals(sameSite, readSetting.getSameSite()); + } + } + + public void testReadingOfInvalidSameSite() { + CookieSetting readSetting = CookieSettingReader.read("cookie=value; SameSite=InvalidSameSiteValue"); + assertNull( readSetting.getSameSite()); + } + + public void testReadingOfEmptySameSite() { + CookieSetting readSetting = CookieSettingReader.read("cookie=value; SameSite="); + assertNull( readSetting.getSameSite()); + } +} diff --git a/modules/org.restlet.test/src/main/java/org/restlet/test/engine/header/CookieSettingWriterTestCase.java b/modules/org.restlet.test/src/main/java/org/restlet/test/engine/header/CookieSettingWriterTestCase.java new file mode 100644 index 0000000000..7a214275be --- /dev/null +++ b/modules/org.restlet.test/src/main/java/org/restlet/test/engine/header/CookieSettingWriterTestCase.java @@ -0,0 +1,24 @@ +package org.restlet.test.engine.header; + +import org.restlet.data.CookieSetting; +import org.restlet.data.CookieSetting.SameSite; +import org.restlet.engine.header.CookieSettingWriter; +import org.restlet.test.RestletTestCase; + +public class CookieSettingWriterTestCase extends RestletTestCase { + + public void testWritingOfUnsetSameSite() { + CookieSetting testSetting = new CookieSetting("cookie", "value"); + assertEquals("cookie=value", CookieSettingWriter.write(testSetting)); + + assertEquals("cookie=value", CookieSettingWriter.write(testSetting)); + } + + public void testWritingOfSameSite() { + for(SameSite sameSite : SameSite.values()) { + CookieSetting testSetting = new CookieSetting("cookie", "value"); + testSetting.setSameSite(sameSite); + assertEquals("cookie=value; SameSite=" + sameSite, CookieSettingWriter.write(testSetting)); + } + } +} diff --git a/modules/org.restlet.test/src/main/java/org/restlet/test/gwt/.gitignore b/modules/org.restlet.test/src/main/java/org/restlet/test/gwt/.gitignore new file mode 100644 index 0000000000..89e08e6059 --- /dev/null +++ b/modules/org.restlet.test/src/main/java/org/restlet/test/gwt/.gitignore @@ -0,0 +1 @@ +*.launch diff --git a/modules/org.restlet.test/src/main/java/org/restlet/test/gwt/TestClient_linux.launch b/modules/org.restlet.test/src/main/java/org/restlet/test/gwt/TestClient_linux.launch deleted file mode 100644 index 6411b1b4b5..0000000000 --- a/modules/org.restlet.test/src/main/java/org/restlet/test/gwt/TestClient_linux.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/org.restlet.test/src/main/java/org/restlet/test/gwt/TestClient_mac.launch b/modules/org.restlet.test/src/main/java/org/restlet/test/gwt/TestClient_mac.launch deleted file mode 100644 index 7d45c192bc..0000000000 --- a/modules/org.restlet.test/src/main/java/org/restlet/test/gwt/TestClient_mac.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/org.restlet.test/src/main/java/org/restlet/test/gwt/TestClient_windows.launch b/modules/org.restlet.test/src/main/java/org/restlet/test/gwt/TestClient_windows.launch deleted file mode 100644 index c16ca18fa0..0000000000 --- a/modules/org.restlet.test/src/main/java/org/restlet/test/gwt/TestClient_windows.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/org.restlet/pom.xml b/modules/org.restlet/pom.xml index c034d1d1ee..dd68fe59cd 100644 --- a/modules/org.restlet/pom.xml +++ b/modules/org.restlet/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 org.restlet diff --git a/modules/org.restlet/src/main/java/org/restlet/data/CookieSetting.java b/modules/org.restlet/src/main/java/org/restlet/data/CookieSetting.java index c529e2c9de..4823ae1598 100644 --- a/modules/org.restlet/src/main/java/org/restlet/data/CookieSetting.java +++ b/modules/org.restlet/src/main/java/org/restlet/data/CookieSetting.java @@ -58,6 +58,24 @@ public final class CookieSetting extends Cookie { /** Indicates if cookie should only be transmitted by secure means. */ private volatile boolean secure; + /** Explicitly specifies a same site policy for browsers. */ + private volatile SameSite sameSite; + + public enum SameSite { + LAX("Lax"), + STRICT("Strict"), + NONE("None"); + + final String value; + SameSite(String value) { + this.value = value; + } + + public String toString() { + return value; + } + } + /** * Default constructor. */ @@ -164,6 +182,47 @@ public CookieSetting(int version, String name, String value, String path, this.secure = secure; this.accessRestricted = accessRestricted; } + + /** + * Constructor. + * + * @param version + * The cookie's version. + * @param name + * The cookie's name. + * @param value + * The cookie's value. + * @param path + * The cookie's path. + * @param domain + * The cookie's domain name. + * @param comment + * The cookie's comment. + * @param maxAge + * Sets the maximum age in seconds.
+ * Use 0 to immediately discard an existing cookie.
+ * Use -1 to discard the cookie at the end of the session + * (default). + * @param secure + * Indicates if cookie should only be transmitted by secure + * means. + * @param accessRestricted + * Indicates whether to restrict cookie access to untrusted + * parties. Currently this toggles the non-standard but widely + * supported HttpOnly cookie parameter. + * @param sameSite + * The cookie's same site policy. + */ + public CookieSetting(int version, String name, String value, String path, + String domain, String comment, int maxAge, boolean secure, + boolean accessRestricted, SameSite sameSite) { + super(version, name, value, path, domain); + this.comment = comment; + this.maxAge = maxAge; + this.secure = secure; + this.accessRestricted = accessRestricted; + this.sameSite = sameSite; + } /** * Preferred constructor. @@ -192,7 +251,8 @@ public boolean equals(Object obj) { return super.equals(obj) && this.maxAge == that.maxAge && this.secure == that.secure - && Objects.equals(this.comment, that.comment); + && Objects.equals(this.comment, that.comment) + && Objects.equals(this.sameSite, that.sameSite); } /** @@ -228,7 +288,7 @@ public int getMaxAge() { @Override public int hashCode() { return SystemUtils.hashCode(super.hashCode(), getComment(), - getMaxAge(), isSecure()); + getMaxAge(), isSecure(), getSameSite()); } /** @@ -251,6 +311,17 @@ public boolean isSecure() { return this.secure; } + + /** + * Returns the currently set same site policy. + * + * @return sameSite + * The currently set same site attribute setting. + */ + public SameSite getSameSite() { + return this.sameSite; + } + /** * Indicates whether to restrict cookie access to untrusted parties. * Currently this toggles the non-standard but widely supported HttpOnly @@ -293,6 +364,16 @@ public void setMaxAge(int maxAge) { public void setSecure(boolean secure) { this.secure = secure; } + + /** + * Sets the same site policy for the browser to apply to this cookie. + * + * @param sameSite + * The new same site policy to set. + */ + public void setSameSite(SameSite sameSite) { + this.sameSite = sameSite; + } @Override public String toString() { @@ -300,7 +381,8 @@ public String toString() { + ", comment=" + comment + ", maxAge=" + maxAge + ", secure=" + secure + ", domain=" + getDomain() + ", name=" + getName() + ", path=" + getPath() + ", value=" + getValue() - + ", version=" + getVersion() + "]"; + + ", version=" + getVersion() + +", sameSite=" + "]"; } } diff --git a/modules/org.restlet/src/main/java/org/restlet/engine/header/CookieSettingReader.java b/modules/org.restlet/src/main/java/org/restlet/engine/header/CookieSettingReader.java index ce7adb49c9..7c739bdf1d 100644 --- a/modules/org.restlet/src/main/java/org/restlet/engine/header/CookieSettingReader.java +++ b/modules/org.restlet/src/main/java/org/restlet/engine/header/CookieSettingReader.java @@ -34,6 +34,7 @@ import org.restlet.Context; import org.restlet.data.CookieSetting; import org.restlet.data.Parameter; +import org.restlet.data.CookieSetting.SameSite; import org.restlet.engine.util.DateUtils; import org.restlet.engine.util.StringUtils; @@ -65,6 +66,8 @@ public class CookieSettingReader extends HeaderReader { private static final String NAME_SET_SECURE = "secure"; private static final String NAME_SET_VERSION = "version"; + + private static final String NAME_SET_SAME_SITE ="samesite"; /** * Parses the given String to a CookieSetting @@ -243,6 +246,16 @@ public CookieSetting readValue() throws IOException { } } else if (pair.getName().equalsIgnoreCase(NAME_SET_VERSION)) { result.setVersion(Integer.valueOf(pair.getValue())); + } else if(pair.getName().equalsIgnoreCase(NAME_SET_SAME_SITE) && !"".equals(pair.getValue())) { + SameSite sameSite = null; + try { + sameSite = SameSite.valueOf(pair.getValue().toUpperCase()); + } catch(IllegalArgumentException illigalArgumentException) { + Context.getCurrentLogger() + .warning("Unable to parse cookie setting same-site value \"" + pair.getValue() + + "\". Not setting same-site attribute."); + } + result.setSameSite(sameSite); } else { // Unexpected special attribute // Silently ignore it as it may have been introduced by new specifications diff --git a/modules/org.restlet/src/main/java/org/restlet/engine/header/CookieSettingWriter.java b/modules/org.restlet/src/main/java/org/restlet/engine/header/CookieSettingWriter.java index 72ba546056..6c09abb447 100644 --- a/modules/org.restlet/src/main/java/org/restlet/engine/header/CookieSettingWriter.java +++ b/modules/org.restlet/src/main/java/org/restlet/engine/header/CookieSettingWriter.java @@ -28,6 +28,7 @@ import java.util.List; import org.restlet.data.CookieSetting; +import org.restlet.data.CookieSetting.SameSite; import org.restlet.engine.util.DateUtils; /** @@ -142,6 +143,13 @@ public CookieSettingWriter append(CookieSetting cookieSetting) if (cookieSetting.isAccessRestricted()) { append("; HttpOnly"); } + + // Append the same site attribute if it is set. + SameSite sameSite = cookieSetting.getSameSite(); + if(sameSite != null) { + append("; SameSite="); + appendValue(sameSite.toString(), version); + } // Append the comment if (version > 0) { diff --git a/modules/org.restlet/src/main/java/org/restlet/engine/ssl/DefaultSslContextFactory.java b/modules/org.restlet/src/main/java/org/restlet/engine/ssl/DefaultSslContextFactory.java index 0430abcce6..1d409656ab 100644 --- a/modules/org.restlet/src/main/java/org/restlet/engine/ssl/DefaultSslContextFactory.java +++ b/modules/org.restlet/src/main/java/org/restlet/engine/ssl/DefaultSslContextFactory.java @@ -29,6 +29,7 @@ import java.security.SecureRandom; import java.util.Arrays; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Set; import javax.net.ssl.SSLContext; @@ -503,25 +504,15 @@ public String getSecureRandomAlgorithm() { * The initial cipher suites to restrict. * @return The selected cipher suites. */ - public String[] getSelectedCipherSuites(String[] supportedCipherSuites) { - Set resultSet = new HashSet(); - - if (supportedCipherSuites != null) { - for (String supportedCipherSuite : supportedCipherSuites) { - if (((getEnabledCipherSuites() == null) || Arrays.asList( - getEnabledCipherSuites()) - .contains(supportedCipherSuite)) - && ((getDisabledCipherSuites() == null) || !Arrays - .asList(getDisabledCipherSuites()).contains( - supportedCipherSuite))) { - resultSet.add(supportedCipherSuite); - } - } - } - - String[] result = new String[resultSet.size()]; - return resultSet.toArray(result); - } + public String[] getSelectedCipherSuites(String[] supportedCipherSuites) { + if (supportedCipherSuites != null) { + String[] enabledSuites = getEnabledCipherSuites(); + String[] disabledSuites = getDisabledCipherSuites(); + return selectStrings(new HashSet<>(Arrays.asList(supportedCipherSuites)), enabledSuites, disabledSuites); + } else { + return new String[0]; + } + } /** * Returns the selected SSL protocols. The selection is the subset of @@ -533,22 +524,34 @@ public String[] getSelectedCipherSuites(String[] supportedCipherSuites) { * @return The selected SSL protocols. */ public String[] getSelectedSslProtocols(String[] supportedProtocols) { - Set resultSet = new HashSet(); - - if (supportedProtocols != null) { - for (String supportedProtocol : supportedProtocols) { - if (((getEnabledProtocols() == null) || Arrays.asList( - getEnabledProtocols()).contains(supportedProtocol)) - && ((getDisabledProtocols() == null) || !Arrays.asList( - getDisabledProtocols()).contains( - supportedProtocol))) { - resultSet.add(supportedProtocol); - } - } - } + if (supportedProtocols != null) { + String[] enabledProtocols = getEnabledProtocols(); + String[] disabledProtocols = getDisabledProtocols(); + return selectStrings(new HashSet<>(Arrays.asList(supportedProtocols)), enabledProtocols, disabledProtocols); + } else { + return new String[0]; + } + } + + private String[] selectStrings(Set supportedStrings, String[] whitelist, String[] blacklist) { + Set selectedStrings = new LinkedHashSet(); + + if (whitelist != null) { + for (String whitelistedString : whitelist) { + if (supportedStrings.contains(whitelistedString)) { + selectedStrings.add(whitelistedString); + } + } + } else { + // no whitelist was set => select all supported suites + selectedStrings.addAll(supportedStrings); + } - String[] result = new String[resultSet.size()]; - return resultSet.toArray(result); + if (blacklist != null) { + selectedStrings.removeAll(Arrays.asList(blacklist)); + } + + return selectedStrings.toArray(new String[selectedStrings.size()]); } /** @@ -607,84 +610,34 @@ public String getTrustStoreType() { */ @Override public void init(Series helperParameters) { - // Parses and set the disabled cipher suites - String[] disabledCipherSuitesArray = helperParameters - .getValuesArray("disabledCipherSuites"); - Set disabledCipherSuites = new HashSet(); - - for (String disabledCipherSuiteSeries : disabledCipherSuitesArray) { - for (String disabledCipherSuite : disabledCipherSuiteSeries - .split(" ")) { - disabledCipherSuites.add(disabledCipherSuite); - } - } - - if (disabledCipherSuites.size() > 0) { - disabledCipherSuitesArray = new String[disabledCipherSuites.size()]; - disabledCipherSuites.toArray(disabledCipherSuitesArray); - setDisabledCipherSuites(disabledCipherSuitesArray); + String[] disabledCipherSuites = splitAndRemoveDuplicates(helperParameters.getValuesArray("disabledCipherSuites"), " "); + if (disabledCipherSuites.length > 0) { + setDisabledCipherSuites(disabledCipherSuites); } else { setDisabledCipherSuites(null); } - // Parses and set the disabled protocols - String[] disabledProtocolsArray = helperParameters - .getValuesArray("disabledProtocols"); - Set disabledProtocols = new HashSet(); - - for (String disabledProtocolsSeries : disabledProtocolsArray) { - for (String disabledProtocol : disabledProtocolsSeries.split(" ")) { - disabledProtocols.add(disabledProtocol); - } - } - - if (disabledProtocols.size() > 0) { - disabledProtocolsArray = new String[disabledProtocols.size()]; - disabledProtocols.toArray(disabledProtocolsArray); - setDisabledProtocols(disabledProtocolsArray); + String[] disabledProtocols = splitAndRemoveDuplicates(helperParameters.getValuesArray("disabledProtocols"), " "); + if (disabledProtocols.length > 0) { + setDisabledProtocols(disabledProtocols); } else { - setDisabledProtocols(null); - } - - // Parses and set the enabled cipher suites - String[] enabledCipherSuitesArray = helperParameters - .getValuesArray("enabledCipherSuites"); - Set enabledCipherSuites = new HashSet(); - - for (String enabledCipherSuiteSeries : enabledCipherSuitesArray) { - for (String enabledCipherSuite : enabledCipherSuiteSeries - .split(" ")) { - enabledCipherSuites.add(enabledCipherSuite); - } + setDisabledProtocols(null); } - if (enabledCipherSuites.size() > 0) { - enabledCipherSuitesArray = new String[enabledCipherSuites.size()]; - enabledCipherSuites.toArray(enabledCipherSuitesArray); - setEnabledCipherSuites(enabledCipherSuitesArray); + String[] enabledCipherSuites = splitAndRemoveDuplicates(helperParameters.getValuesArray("enabledCipherSuites"), " "); + if (enabledCipherSuites.length > 0) { + setEnabledCipherSuites(enabledCipherSuites); } else { - setEnabledCipherSuites(null); + setEnabledCipherSuites(null); } - - // Parses and set the enabled protocols - String[] enabledProtocolsArray = helperParameters - .getValuesArray("enabledProtocols"); - Set enabledProtocols = new HashSet(); - - for (String enabledProtocolSeries : enabledProtocolsArray) { - for (String enabledProtocol : enabledProtocolSeries.split(" ")) { - enabledProtocols.add(enabledProtocol); - } - } - - if (enabledProtocols.size() > 0) { - enabledProtocolsArray = new String[enabledProtocols.size()]; - enabledProtocols.toArray(enabledProtocolsArray); - setEnabledProtocols(enabledProtocolsArray); + + String[] enabledProtocols = splitAndRemoveDuplicates(helperParameters.getValuesArray("enabledProtocols"), " "); + if (enabledCipherSuites.length > 0) { + setEnabledProtocols(enabledProtocols); } else { - setEnabledProtocols(null); + setEnabledProtocols(null); } - + setKeyManagerAlgorithm(helperParameters.getFirstValue( "keyManagerAlgorithm", true, System.getProperty( "ssl.KeyManagerFactory.algorithm", "SunX509"))); @@ -720,6 +673,17 @@ public void init(Series helperParameters) { .getFirstValue("wantClientAuthentication", true, "false"))); } + private String[] splitAndRemoveDuplicates(String[] strings, String delimiter) { + Set set = new LinkedHashSet(); + for (String string : strings) { + for (String token : string.split(delimiter)) { + set.add(token); + } + } + return set.toArray(new String[set.size()]); + } + + /** * Indicates if we require client certificate authentication. * diff --git a/modules/pom.xml b/modules/pom.xml index edd0a12e9e..4ffed9a653 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -3,9 +3,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.restlet.dev + org.restlet.jse org.restlet.parent - 2.4-SNAPSHOT + 2.4_syn4 pom Restlet project @@ -16,6 +16,13 @@ http://restlet.tigris.org/svn/restlet/modules/ + + + + nexus-thirdparty + http://nexus.synedra.lan:8081/repository/thirdparty/ + + @@ -31,7 +38,6 @@ maven1-java http://download.java.net/maven/1 - legacy maven-restlet @@ -213,6 +219,7 @@ junit junit ${lib-junit-version} + test org.osgi @@ -257,7 +264,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.7.0 + 3.10.1 1.8 1.8 @@ -266,7 +273,7 @@ org.owasp dependency-check-maven - 3.3.1 + 8.0.1