diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..517bc0c --- /dev/null +++ b/.travis.yml @@ -0,0 +1,22 @@ +language: java +jdk: openjdk7 +branches: +only: +- master +cache: + directories: + - "$HOME/.m2" +after_success: +- openssl aes-256-cbc -pass pass:$ENCRYPTION_PASSWORD -in $GPG_DIR/pubring.gpg.enc + -out $GPG_DIR/pubring.gpg -d +- openssl aes-256-cbc -pass pass:$ENCRYPTION_PASSWORD -in $GPG_DIR/secring.gpg.enc + -out $GPG_DIR/secring.gpg -d +- "$GPG_DIR/publish.sh" +env: + global: + - GPG_DIR="`pwd`/deploy" + - secure: PughDfl3usvB295Pn+GNEhAfWrs51SpNsTeQGjUQWxbzjygKOV39aFtkJfE8uPR4z1Rf4WCcvOBFpHBhgSzOH+RPv8U01f5baqWXrAPP+V2/XwmaTNH0XpR1ipeDl+huu4v9WnRrbOlG40i7HP49sCPl88SWxUIoZJUFXR1z3wj/D13YK5UW8SswYQsuqf11ze6buynl7i2/c+5W3sjeKVqOtoIkw+291JtNce/07y7DD2dt5/f3ScKWQ/s+OODHlImo3NxFeYjNYcvcKO1wpcA6O+Oiu2dSa/94EmytA1JkHnhmf2UJhVokmwLZKwGifSQM+sEc2wEY+jdUjZESpF789YtXOGvf1R2PO80xehDjW5cYihn03Zw7AWx99g0v+sAUF1qsPfff07/7dOO/pEWgij7KqazOxgmGN28ofHIrMOHho+QW/VaxpYBFyWYYRuEMwBNiAazJyQOtCihg6vthGfUHOdQdx9TifcilStiLnrt3JU4N+LSNtpfU2nRNPSPK0gF6jIaIvn1exjvxFgO3wDk98fL981mDILIOorOf6kJeTufuJJZemtIuveC8awLD/IX0BIh/DqikBp+/WAgDckKjNc9etLwRkdN3lWWtht66Qj1i2h/P/5ylfejsofimju+xPlG2xgbNhoZFb5rK4cmBBAIIVltTtxnm+xg= + - secure: irIkiB5l9Q4x5h628jTmf0ZV6JGkNWwamQdRpiBzkZgqiIHuV1pYVUNFeIBiQ39iwY5Est0fjfaZ5DSy96VmnA6ZfHhcYngN9BnRRLLmARLcpTq9YVF9zrQtKjFFb/xVpAmKKsnFaczJQch4tBvZkSkP8O82gQzU9nMU7yCR1S80Pau8vNu3slRY1fV6l9IS2Qr96CIU8B3GAynR7AgVfSNrerjK2D32JBobdltd1Njhg0wqFA1lIn/MKLo4JZteYoU869aRPZliXVXYnK8TixvFQIPVUrAV3rpYrIzVgPeI5tTVgIDRBXt6JsuJy1tFT0JbxexdAzbrwxAWls7dg+hOtrW49ppdC2LZ0PhC6XHxyWB1RVX4g9DmjV3WattLscpESTRZXTKQ6wmm8eXhgLvbw6n8xr+xMRmjlp30y3/0HVwMqdXNOFqvotAOTEHyogld8GX6dACMC5ifbE5/WcKnoyA93Rzx0kUkWLR+jqNtN+711lNhVxbhzdXSKIOC2+WiOoXD3kGg0UU469IgMd9QZGHs1S924rC6Ff+FbROpm9GEfMdjyqGKpmATeJLTyjieacwvHviSktzN+eEC1HFvULYsDwUmAdtQC3Hsuxfo1AZo8g8pOypcu5sVwKkai3FyXgdbE9/s1ZeEBleHtmF9clFDfVtX1SDiryjyO4w= + - secure: rCW+pYQ5P25uuWDjm9ekgJhX9M++hCZn53SaYo0xw9y2YUHYm3Ux70AK2eMAWmD8ng4tj7JIRI0gkxJ3yrrta5BQzmIQ0ixu//rKTnjqQ0Vj9lgQptNvO7wVqzILj9dfBQCrwtKqskncjNht+n7EDiEFYj94JL6UGeJDE1CGCYTRNcTgc3zx9YYz6hzI2Ae9iJRtWXwwb5KuKK9FNC5xXP0MSuqGS3fWWF7DDpc2gSMMyzq75ibBr7rfH8WD4aOCSw59JKCy6+Kp0aZPwef2n1/rW9g/Ok+A5Crhua1sOGCBVBPqmIqldI6sLPcBRhN+8hlHd1ejR8HQiASFIlgTIn9cHBKUJ9txp4Oa99OVzpcC7MTfKqDONDg3paQwAFkE1TCsniewR86Qj8k0eReTgk3uk5AbPLnffMM7xsjxONAOO+1u0rLZlltUxKbBHJJgtqtnzdccxktq8ndF2067z6QVuc+SYnhWYXhxQ3PesQytfrGZ/EoUAcXbdyDiCK082uOM0ficsoFOlxEZjGmUnuRt4fMmpo2GtKDN8hnLXamSt6LAYqbMVsaKjSHxNNtVGY9/y2rzrR1QQvskQgkoCjIZw7/2Y3TsG1gRYs9oGlB9BGOB70MB32dSli2HyNJ/fE6fSJfZYDD+mFCGjQfym69Gl0YvURMaehRhcwGt3dU= + - secure: qMPwp8ipq2a9NHKbqzJ6Ca6Av958L8kRT8gp9aF5sJ11wXyAzBFdnQbcuZ+bMFRFo54arjvDJSz9Cqk6TExB+89RthU3LYUHQ7Y1b2DxYioqajMVrcno9yB7v6DMF7EbFoYv/xYDW46i30fGXS6EKpjEox7YgIsB/Q1zEkDn3Y3b/KXQJuR3SYRLQW9ZJX2jx0Aw4F/Qx9NNE5D3xYO8o2fTAZpQlMcYf0sZ1CH/tVz6kOmltiBmNyDAfI4V7OEpKwEs6mTabCaM11k59Mxn7GEQuLSG/N4ARzDUyS68jWDwbdaV9rLZZTDXqEcvYII53x5plCmG31Lo0WX2p/APDzeyh7v76PPHgxrrf4L1EKJH6SWizN2N/4g003Yrwc+vcc5QsdrVCgArO4YLZf7dboZLu2gFgXKDN02hhlZgP9jvuRJYrR++4Bo+mW5IaYTFXxTumjKsW65iFxJ4kAhIqQ8gz+JLC4n4K829avugpkszL2k2e9iIojtKfT+t7YMgIqDj6m5HCS7MjbJo1qDcagJXqp+DdRMA4SjS0KUVuZdCJ9aFLAhDdEJGsrcSwjoaIq2lwS0b57Zs9FD+TtUqErBNlw+hy8tdOoidt5oM/q2CzBcNrG7VQ24CyT1nNwItbX1xbLMDx/G0ze7EEFqS1Nq90Umm0p6FHRHvSsyT/ZI= + - secure: IDkfb8h6+ZTGMpIEcvdm01w4nGVVs86KpKSYX4+tyUMNxS/jqahrjLJyeYCiuTTnwio6xwnh5xMzCfL2WbVTpMeCPi8OylB31mH7a36lil9juMiJRqb0NbPrEfTGxN7C5UAy77qTOWfrY/4fba1R09xSSLlvWdLCYHJQ2pSpicT+GfKy7qinMu5KX0DO0rg2cg1BhTwRgdr2GOkKBXohgbtU8bhQje1MOisHTFIeTHx78awrnQl1FHrZNg2aEAJiFHRmDysdPMGwFkSAIqbI687bnpfad5kj+ACpdBlB64sVNB2GJfWpN/tnzfejZARP6xb6y3X69vF01icOSv7hyeoVnQ5b18jFNiy2ePHxVP4kMuK5sQ8gBXzX0e3TZB+AhGTDByuIQtvTFYzbjEeYshwT59gcTU4RKDJVJmHWS/xhgV+jwJyoEV7ZYBFzRL58f4QojDPHxBK7oQ6T5QGbTB/90FPcJ88jYLpzocZfVvYNmcHjKBmWdEr9/8uzR5ObYppwzCh0Qtc0KvLW7AFMDw72r2t2jea/aF8C6qN70/VXcEkfbnh2+//0GKXE+akXWJIPVyOdoYhgT/aLqWOD8gZPV55KFelCH67xFFWIsMeXl5LiijpT5YvHVoUiimSjiUYpkBTx6jXNjY3vl3U9oMAikRekmEM5P9hB5U174yw= diff --git a/README.md b/README.md index 7c38203..02a9cf2 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ represent an "On-demand Grid" (which explains the reason behind the name **just- * Build the code using `mvn clean package` * Drop the built jar in the directory that contains the selenium server standalone. - * Start the selenium hub using the command `java -cp selenium-server-standalone-3.0.1.jar:just-ask-1.0-SNAPSHOT.jar org.openqa.grid.selenium.GridLauncherV3 -role hub -servlets com.github.rationaleemotions.servlets.EnrollServlet` + * Start the selenium hub using the command `java -cp selenium-server-standalone-3.0.1.jar:just-ask-1.0-SNAPSHOT.jar org.openqa.grid.selenium.GridLauncherV3 -role hub -servlets com.rationaleemotions.servlets.EnrollServlet` * Explicitly register the *ghost node* by loading the URL `http://localhost:4444/grid/admin/EnrollServlet` in a browser. Now the **On-demand Grid** is ready for use. diff --git a/deploy/publish.sh b/deploy/publish.sh new file mode 100755 index 0000000..9d26a6b --- /dev/null +++ b/deploy/publish.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +if [[ $TRAVIS_PULL_REQUEST == "false" ]]; then + mvn deploy --settings $GPG_DIR/settings.xml -DperformRelease=true -DskipTests=true + exit $? +fi \ No newline at end of file diff --git a/deploy/pubring.gpg.enc b/deploy/pubring.gpg.enc new file mode 100644 index 0000000..91df6ad Binary files /dev/null and b/deploy/pubring.gpg.enc differ diff --git a/deploy/secring.gpg.enc b/deploy/secring.gpg.enc new file mode 100644 index 0000000..8e96dc0 Binary files /dev/null and b/deploy/secring.gpg.enc differ diff --git a/deploy/settings.xml b/deploy/settings.xml new file mode 100644 index 0000000..b436a96 --- /dev/null +++ b/deploy/settings.xml @@ -0,0 +1,9 @@ + + + + ossrh + ${env.SONATYPE_USERNAME} + ${env.SONATYPE_PASSWORD} + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index c7f7f55..4aba93e 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.github.rationaleemotions + com.rationaleemotions just-ask 1.0-SNAPSHOT jar @@ -70,11 +70,6 @@ org.apache.maven.plugins maven-surefire-plugin 2.19.1 - - - - - diff --git a/src/main/java/com/github/rationaleemotions/servlets/package-info.java b/src/main/java/com/github/rationaleemotions/servlets/package-info.java deleted file mode 100644 index 8c974d3..0000000 --- a/src/main/java/com/github/rationaleemotions/servlets/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * This package houses the servlets. - */ -package com.github.rationaleemotions.servlets; diff --git a/src/main/java/com/github/rationaleemotions/proxy/DecoratedProxy.java b/src/main/java/com/rationaleemotions/proxy/DecoratedProxy.java similarity index 98% rename from src/main/java/com/github/rationaleemotions/proxy/DecoratedProxy.java rename to src/main/java/com/rationaleemotions/proxy/DecoratedProxy.java index 3eaaf49..8bd5c3f 100644 --- a/src/main/java/com/github/rationaleemotions/proxy/DecoratedProxy.java +++ b/src/main/java/com/rationaleemotions/proxy/DecoratedProxy.java @@ -1,4 +1,4 @@ -package com.github.rationaleemotions.proxy; +package com.rationaleemotions.proxy; import com.google.gson.JsonObject; import org.openqa.grid.common.RegistrationRequest; diff --git a/src/main/java/com/github/rationaleemotions/proxy/OndemandServerProxy.java b/src/main/java/com/rationaleemotions/proxy/OndemandServerProxy.java similarity index 98% rename from src/main/java/com/github/rationaleemotions/proxy/OndemandServerProxy.java rename to src/main/java/com/rationaleemotions/proxy/OndemandServerProxy.java index 2d30893..f714866 100644 --- a/src/main/java/com/github/rationaleemotions/proxy/OndemandServerProxy.java +++ b/src/main/java/com/rationaleemotions/proxy/OndemandServerProxy.java @@ -1,6 +1,6 @@ -package com.github.rationaleemotions.proxy; +package com.rationaleemotions.proxy; -import com.github.rationaleemotions.server.SpawnedServer; +import com.rationaleemotions.server.SpawnedServer; import com.google.common.collect.Maps; import com.google.gson.JsonObject; import org.openqa.grid.common.RegistrationRequest; diff --git a/src/main/java/com/github/rationaleemotions/proxy/package-info.java b/src/main/java/com/rationaleemotions/proxy/package-info.java similarity index 55% rename from src/main/java/com/github/rationaleemotions/proxy/package-info.java rename to src/main/java/com/rationaleemotions/proxy/package-info.java index 9cdafc5..b2307b1 100644 --- a/src/main/java/com/github/rationaleemotions/proxy/package-info.java +++ b/src/main/java/com/rationaleemotions/proxy/package-info.java @@ -1,4 +1,4 @@ /** * This package houses the proxy definitions. */ -package com.github.rationaleemotions.proxy; +package com.rationaleemotions.proxy; diff --git a/src/main/java/com/github/rationaleemotions/server/JvmBasedSeleniumServer.java b/src/main/java/com/rationaleemotions/server/JvmBasedSeleniumServer.java similarity index 98% rename from src/main/java/com/github/rationaleemotions/server/JvmBasedSeleniumServer.java rename to src/main/java/com/rationaleemotions/server/JvmBasedSeleniumServer.java index e20bcfa..b8ddcd2 100644 --- a/src/main/java/com/github/rationaleemotions/server/JvmBasedSeleniumServer.java +++ b/src/main/java/com/rationaleemotions/server/JvmBasedSeleniumServer.java @@ -1,4 +1,4 @@ -package com.github.rationaleemotions.server; +package com.rationaleemotions.server; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; diff --git a/src/main/java/com/github/rationaleemotions/server/ServerTraits.java b/src/main/java/com/rationaleemotions/server/ServerTraits.java similarity index 95% rename from src/main/java/com/github/rationaleemotions/server/ServerTraits.java rename to src/main/java/com/rationaleemotions/server/ServerTraits.java index c4f2f64..f1581d9 100644 --- a/src/main/java/com/github/rationaleemotions/server/ServerTraits.java +++ b/src/main/java/com/rationaleemotions/server/ServerTraits.java @@ -1,4 +1,4 @@ -package com.github.rationaleemotions.server; +package com.rationaleemotions.server; /** * Represents the capabilities of a Server [ can be remote or local ] diff --git a/src/main/java/com/github/rationaleemotions/server/SpawnedServer.java b/src/main/java/com/rationaleemotions/server/SpawnedServer.java similarity index 97% rename from src/main/java/com/github/rationaleemotions/server/SpawnedServer.java rename to src/main/java/com/rationaleemotions/server/SpawnedServer.java index 78696aa..26fc269 100644 --- a/src/main/java/com/github/rationaleemotions/server/SpawnedServer.java +++ b/src/main/java/com/rationaleemotions/server/SpawnedServer.java @@ -1,4 +1,4 @@ -package com.github.rationaleemotions.server; +package com.rationaleemotions.server; import org.openqa.grid.common.exception.GridException; diff --git a/src/main/java/com/github/rationaleemotions/server/package-info.java b/src/main/java/com/rationaleemotions/server/package-info.java similarity index 56% rename from src/main/java/com/github/rationaleemotions/server/package-info.java rename to src/main/java/com/rationaleemotions/server/package-info.java index c8407a9..dcedd20 100644 --- a/src/main/java/com/github/rationaleemotions/server/package-info.java +++ b/src/main/java/com/rationaleemotions/server/package-info.java @@ -1,4 +1,4 @@ /** * This package houses the server implementations. */ -package com.github.rationaleemotions.server; +package com.rationaleemotions.server; diff --git a/src/main/java/com/github/rationaleemotions/servlets/EnrollServlet.java b/src/main/java/com/rationaleemotions/servlets/EnrollServlet.java similarity index 98% rename from src/main/java/com/github/rationaleemotions/servlets/EnrollServlet.java rename to src/main/java/com/rationaleemotions/servlets/EnrollServlet.java index bfcd933..3fd6c23 100644 --- a/src/main/java/com/github/rationaleemotions/servlets/EnrollServlet.java +++ b/src/main/java/com/rationaleemotions/servlets/EnrollServlet.java @@ -1,4 +1,4 @@ -package com.github.rationaleemotions.servlets; +package com.rationaleemotions.servlets; import com.google.common.base.Preconditions; import org.apache.commons.io.IOUtils; @@ -42,6 +42,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se private void addProxy() { //After the construction is finished, lets wrap up. + HttpClientFactory httpClientFactory = new HttpClientFactory(); try { final int port = getRegistry().getHub().getConfiguration().port; diff --git a/src/main/java/com/rationaleemotions/servlets/package-info.java b/src/main/java/com/rationaleemotions/servlets/package-info.java new file mode 100644 index 0000000..a446e4c --- /dev/null +++ b/src/main/java/com/rationaleemotions/servlets/package-info.java @@ -0,0 +1,4 @@ +/** + * This package houses the servlets. + */ +package com.rationaleemotions.servlets;