From e79c0fb91bbd824495e8c9045621968ea71fcc0a Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 6 Jun 2014 15:21:24 +0200 Subject: [PATCH 01/36] set DefaultCGIExecutor logger level to debug instead of trace --- scm-webapp/src/main/resources/logback.default.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scm-webapp/src/main/resources/logback.default.xml b/scm-webapp/src/main/resources/logback.default.xml index f11cabaf08..290a04a9d1 100644 --- a/scm-webapp/src/main/resources/logback.default.xml +++ b/scm-webapp/src/main/resources/logback.default.xml @@ -59,6 +59,8 @@ + + - 3.3.2.201404171909-r + 3.4.0.201406110918-r 1.8.5-scm1 diff --git a/scm-test/pom.xml b/scm-test/pom.xml index 85aab24199..ddfbba4f34 100644 --- a/scm-test/pom.xml +++ b/scm-test/pom.xml @@ -49,7 +49,7 @@ - org.eclipse.jgit + sonia.jgit org.eclipse.jgit ${jgit.version} From b696853d3125df89093ccfba7f0786f6593c6c88 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 17 Jun 2014 14:29:05 +0200 Subject: [PATCH 07/36] load facebook and twitter buttons asynchronous --- .../webapp/WEB-INF/ftl/template/footer.html | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/scm-plugin-backend/src/main/webapp/WEB-INF/ftl/template/footer.html b/scm-plugin-backend/src/main/webapp/WEB-INF/ftl/template/footer.html index a235efd5d9..1b4cb08212 100644 --- a/scm-plugin-backend/src/main/webapp/WEB-INF/ftl/template/footer.html +++ b/scm-plugin-backend/src/main/webapp/WEB-INF/ftl/template/footer.html @@ -37,22 +37,33 @@

Social

  • From 80a5aeddb4ee45b7a49af783707f075f0da28639 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 17 Jun 2014 14:38:54 +0200 Subject: [PATCH 08/36] use schemaless urls to fix https --- .../webapp/WEB-INF/ftl/template/footer.html | 8 ++++---- .../webapp/WEB-INF/ftl/template/header.html | 20 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/scm-plugin-backend/src/main/webapp/WEB-INF/ftl/template/footer.html b/scm-plugin-backend/src/main/webapp/WEB-INF/ftl/template/footer.html index 1b4cb08212..d511f70a38 100644 --- a/scm-plugin-backend/src/main/webapp/WEB-INF/ftl/template/footer.html +++ b/scm-plugin-backend/src/main/webapp/WEB-INF/ftl/template/footer.html @@ -8,7 +8,7 @@

    Links

    @@ -95,8 +95,8 @@ - - + + diff --git a/scm-plugin-backend/src/main/webapp/WEB-INF/ftl/template/header.html b/scm-plugin-backend/src/main/webapp/WEB-INF/ftl/template/header.html index 094f5a659b..a1817abde0 100644 --- a/scm-plugin-backend/src/main/webapp/WEB-INF/ftl/template/header.html +++ b/scm-plugin-backend/src/main/webapp/WEB-INF/ftl/template/header.html @@ -38,13 +38,13 @@ SCM-Manager Plugin-Backend - + - - - + + + @@ -88,22 +88,22 @@
    From cf87bdcc32fe6dda5f8e4821ee1788fd17ed8177 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 18 Jun 2014 11:12:11 +0200 Subject: [PATCH 09/36] added maven.scm-manager.org repository to pom of scm-client-impl --- scm-clients/scm-client-impl/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scm-clients/scm-client-impl/pom.xml b/scm-clients/scm-client-impl/pom.xml index af3e99d539..430b6b3bc0 100644 --- a/scm-clients/scm-client-impl/pom.xml +++ b/scm-clients/scm-client-impl/pom.xml @@ -103,6 +103,12 @@ Sonatype Release http://oss.sonatype.org/content/repositories/releases + + + maven.scm-manager.org + scm-manager release repository + http://maven.scm-manager.org/nexus/content/groups/public + From e313e58c69e40a580ab5448a263ff7bca0c3ec35 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 20 Jun 2014 16:24:04 +0200 Subject: [PATCH 10/36] rpm and deb packages should be part of the release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 28d64fdb0a..d35058ad50 100644 --- a/pom.xml +++ b/pom.xml @@ -259,7 +259,7 @@ false true - release,APIviz,doc + release,APIviz,doc,nativepkg @{project.version} true From c5b6e968caa7607dde74a51a1fe567846452c802 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 2 Jul 2014 14:58:09 +0200 Subject: [PATCH 11/36] [maven-release-plugin] prepare release 1.39 --- maven/pom.xml | 4 ++-- maven/scm-maven-plugin/pom.xml | 4 ++-- maven/scm-plugin-archetype/pom.xml | 4 ++-- pom.xml | 4 ++-- scm-clients/pom.xml | 6 +++--- scm-clients/scm-cli-client/pom.xml | 6 +++--- scm-clients/scm-client-api/pom.xml | 4 ++-- scm-clients/scm-client-impl/pom.xml | 8 ++++---- scm-core/pom.xml | 4 ++-- scm-dao-orientdb/pom.xml | 8 ++++---- scm-dao-xml/pom.xml | 8 ++++---- scm-plugin-backend/pom.xml | 6 +++--- scm-plugins/pom.xml | 8 ++++---- scm-plugins/scm-git-plugin/pom.xml | 6 +++--- scm-plugins/scm-hg-plugin/pom.xml | 6 +++--- scm-plugins/scm-svn-plugin/pom.xml | 6 +++--- scm-samples/pom.xml | 4 ++-- scm-samples/scm-sample-auth/pom.xml | 6 +++--- scm-samples/scm-sample-hello/pom.xml | 6 +++--- scm-server/pom.xml | 4 ++-- scm-test/pom.xml | 6 +++--- scm-webapp/pom.xml | 24 ++++++++++++------------ support/pom.xml | 4 ++-- support/scm-support-btrace/pom.xml | 6 +++--- 24 files changed, 76 insertions(+), 76 deletions(-) diff --git a/maven/pom.xml b/maven/pom.xml index 2273c9a88c..4d4a5c9b8e 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -6,13 +6,13 @@ sonia.scm scm - 1.39-SNAPSHOT + 1.39 sonia.scm.maven scm-maven-plugins pom - 1.39-SNAPSHOT + 1.39 scm-maven-plugins diff --git a/maven/scm-maven-plugin/pom.xml b/maven/scm-maven-plugin/pom.xml index 77eab0bb74..b2c3d58043 100644 --- a/maven/scm-maven-plugin/pom.xml +++ b/maven/scm-maven-plugin/pom.xml @@ -6,12 +6,12 @@ scm-maven-plugins sonia.scm.maven - 1.39-SNAPSHOT + 1.39 sonia.scm.maven scm-maven-plugin - 1.39-SNAPSHOT + 1.39 maven-plugin scm-maven-plugin diff --git a/maven/scm-plugin-archetype/pom.xml b/maven/scm-plugin-archetype/pom.xml index f2d787bb62..eb1ee6ff02 100644 --- a/maven/scm-plugin-archetype/pom.xml +++ b/maven/scm-plugin-archetype/pom.xml @@ -6,12 +6,12 @@ scm-maven-plugins sonia.scm.maven - 1.39-SNAPSHOT + 1.39 sonia.scm.maven scm-plugin-archetype - 1.39-SNAPSHOT + 1.39 scm-plugin-archetype diff --git a/pom.xml b/pom.xml index d35058ad50..0f4d9b9bac 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ sonia.scm scm pom - 1.39-SNAPSHOT + 1.39 The easiest way to share your Git, Mercurial and Subversion repositories over http. @@ -36,7 +36,7 @@ scm:hg:http://bitbucket.org/sdorra/scm-manager scm:hg:https://bitbucket.org/sdorra/scm-manager http://bitbucket.org/sdorra/scm-manager - HEAD + 1.39 diff --git a/scm-clients/pom.xml b/scm-clients/pom.xml index 53cedc1ceb..220235dea3 100644 --- a/scm-clients/pom.xml +++ b/scm-clients/pom.xml @@ -6,13 +6,13 @@ sonia.scm scm - 1.39-SNAPSHOT + 1.39 sonia.scm.clients scm-clients pom - 1.39-SNAPSHOT + 1.39 scm-clients @@ -32,7 +32,7 @@ scm-core sonia.scm jar - 1.39-SNAPSHOT + 1.39 shiro-core diff --git a/scm-clients/scm-cli-client/pom.xml b/scm-clients/scm-cli-client/pom.xml index 678ffee8a0..690341e557 100644 --- a/scm-clients/scm-cli-client/pom.xml +++ b/scm-clients/scm-cli-client/pom.xml @@ -6,12 +6,12 @@ scm-clients sonia.scm.clients - 1.39-SNAPSHOT + 1.39 sonia.scm.clients scm-cli-client - 1.39-SNAPSHOT + 1.39 scm-cli-client @@ -34,7 +34,7 @@ sonia.scm.clients scm-client-impl - 1.39-SNAPSHOT + 1.39 diff --git a/scm-clients/scm-client-api/pom.xml b/scm-clients/scm-client-api/pom.xml index 6357e5f647..99598790b2 100644 --- a/scm-clients/scm-client-api/pom.xml +++ b/scm-clients/scm-client-api/pom.xml @@ -6,13 +6,13 @@ sonia.scm.clients scm-clients - 1.39-SNAPSHOT + 1.39 sonia.scm.clients scm-client-api jar - 1.39-SNAPSHOT + 1.39 scm-client-api diff --git a/scm-clients/scm-client-impl/pom.xml b/scm-clients/scm-client-impl/pom.xml index 430b6b3bc0..b4aba44c4c 100644 --- a/scm-clients/scm-client-impl/pom.xml +++ b/scm-clients/scm-client-impl/pom.xml @@ -6,13 +6,13 @@ sonia.scm.clients scm-clients - 1.39-SNAPSHOT + 1.39 sonia.scm.clients scm-client-impl jar - 1.39-SNAPSHOT + 1.39 scm-client-impl @@ -36,7 +36,7 @@ sonia.scm.clients scm-client-api - 1.39-SNAPSHOT + 1.39 @@ -88,7 +88,7 @@ sonia.scm scm-test - 1.39-SNAPSHOT + 1.39 test diff --git a/scm-core/pom.xml b/scm-core/pom.xml index 6478cb65fe..7ca0600667 100644 --- a/scm-core/pom.xml +++ b/scm-core/pom.xml @@ -6,12 +6,12 @@ scm sonia.scm - 1.39-SNAPSHOT + 1.39 sonia.scm scm-core - 1.39-SNAPSHOT + 1.39 scm-core diff --git a/scm-dao-orientdb/pom.xml b/scm-dao-orientdb/pom.xml index 923d7cbe2f..919854ae29 100644 --- a/scm-dao-orientdb/pom.xml +++ b/scm-dao-orientdb/pom.xml @@ -6,12 +6,12 @@ sonia.scm scm - 1.39-SNAPSHOT + 1.39 sonia.scm scm-dao-orientdb - 1.39-SNAPSHOT + 1.39 scm-dao-orientdb @@ -26,7 +26,7 @@ sonia.scm scm-core - 1.39-SNAPSHOT + 1.39 @@ -52,7 +52,7 @@ sonia.scm scm-test - 1.39-SNAPSHOT + 1.39 test diff --git a/scm-dao-xml/pom.xml b/scm-dao-xml/pom.xml index 4957a33533..a5480a5267 100644 --- a/scm-dao-xml/pom.xml +++ b/scm-dao-xml/pom.xml @@ -6,12 +6,12 @@ sonia.scm scm - 1.39-SNAPSHOT + 1.39 sonia.scm scm-dao-xml - 1.39-SNAPSHOT + 1.39 scm-dao-xml @@ -26,7 +26,7 @@ sonia.scm scm-core - 1.39-SNAPSHOT + 1.39 @@ -34,7 +34,7 @@ sonia.scm scm-test - 1.39-SNAPSHOT + 1.39 test diff --git a/scm-plugin-backend/pom.xml b/scm-plugin-backend/pom.xml index f51cc9249d..4e482503c2 100644 --- a/scm-plugin-backend/pom.xml +++ b/scm-plugin-backend/pom.xml @@ -6,13 +6,13 @@ scm sonia.scm - 1.39-SNAPSHOT + 1.39 sonia.scm scm-plugin-backend war - 1.39-SNAPSHOT + 1.39 ${project.artifactId} @@ -62,7 +62,7 @@ sonia.scm scm-core - 1.39-SNAPSHOT + 1.39 diff --git a/scm-plugins/pom.xml b/scm-plugins/pom.xml index 3b4341b78b..c19ee11692 100644 --- a/scm-plugins/pom.xml +++ b/scm-plugins/pom.xml @@ -6,13 +6,13 @@ sonia.scm scm - 1.39-SNAPSHOT + 1.39 sonia.scm.plugins scm-plugins pom - 1.39-SNAPSHOT + 1.39 scm-plugins @@ -26,7 +26,7 @@ sonia.scm scm-core - 1.39-SNAPSHOT + 1.39 @@ -59,7 +59,7 @@ sonia.scm.maven scm-maven-plugin - 1.39-SNAPSHOT + 1.39 process-resources diff --git a/scm-plugins/scm-git-plugin/pom.xml b/scm-plugins/scm-git-plugin/pom.xml index cc5eb8bc7d..177e87e2a3 100644 --- a/scm-plugins/scm-git-plugin/pom.xml +++ b/scm-plugins/scm-git-plugin/pom.xml @@ -6,12 +6,12 @@ scm-plugins sonia.scm.plugins - 1.39-SNAPSHOT + 1.39 sonia.scm.plugins scm-git-plugin - 1.39-SNAPSHOT + 1.39 scm-git-plugin https://bitbucket.org/sdorra/scm-manager Plugin for the version control system Git @@ -48,7 +48,7 @@ sonia.scm scm-test - 1.39-SNAPSHOT + 1.39 test diff --git a/scm-plugins/scm-hg-plugin/pom.xml b/scm-plugins/scm-hg-plugin/pom.xml index 0dd4e228ee..ab18b52c8e 100644 --- a/scm-plugins/scm-hg-plugin/pom.xml +++ b/scm-plugins/scm-hg-plugin/pom.xml @@ -6,12 +6,12 @@ sonia.scm.plugins scm-plugins - 1.39-SNAPSHOT + 1.39 sonia.scm.plugins scm-hg-plugin - 1.39-SNAPSHOT + 1.39 scm-hg-plugin https://bitbucket.org/sdorra/scm-manager Plugin for the version control system Mercurial @@ -36,7 +36,7 @@ sonia.scm scm-test - 1.39-SNAPSHOT + 1.39 test diff --git a/scm-plugins/scm-svn-plugin/pom.xml b/scm-plugins/scm-svn-plugin/pom.xml index c2ccbc890e..50196fec24 100644 --- a/scm-plugins/scm-svn-plugin/pom.xml +++ b/scm-plugins/scm-svn-plugin/pom.xml @@ -6,12 +6,12 @@ scm-plugins sonia.scm.plugins - 1.39-SNAPSHOT + 1.39 sonia.scm.plugins scm-svn-plugin - 1.39-SNAPSHOT + 1.39 scm-svn-plugin https://bitbucket.org/sdorra/scm-manager Plugin for the version control system Subversion @@ -48,7 +48,7 @@ sonia.scm scm-test - 1.39-SNAPSHOT + 1.39 test diff --git a/scm-samples/pom.xml b/scm-samples/pom.xml index b88019f883..711d527a9b 100644 --- a/scm-samples/pom.xml +++ b/scm-samples/pom.xml @@ -6,13 +6,13 @@ sonia.scm scm - 1.39-SNAPSHOT + 1.39 sonia.scm.samples scm-samples pom - 1.39-SNAPSHOT + 1.39 scm-samples diff --git a/scm-samples/scm-sample-auth/pom.xml b/scm-samples/scm-sample-auth/pom.xml index 543ed7fc7a..3bc3732816 100644 --- a/scm-samples/scm-sample-auth/pom.xml +++ b/scm-samples/scm-sample-auth/pom.xml @@ -6,12 +6,12 @@ scm-samples sonia.scm.samples - 1.39-SNAPSHOT + 1.39 sonia.scm.sample scm-sample-auth - 1.39-SNAPSHOT + 1.39 scm-sample-auth Sample Authentication Plugin https://bitbucket.org/sdorra/scm-manager @@ -28,7 +28,7 @@ sonia.scm scm-core - 1.39-SNAPSHOT + 1.39 diff --git a/scm-samples/scm-sample-hello/pom.xml b/scm-samples/scm-sample-hello/pom.xml index 23f86e5d97..74af00a449 100644 --- a/scm-samples/scm-sample-hello/pom.xml +++ b/scm-samples/scm-sample-hello/pom.xml @@ -6,12 +6,12 @@ scm-samples sonia.scm.samples - 1.39-SNAPSHOT + 1.39 sonia.scm.sample scm-sample-hello - 1.39-SNAPSHOT + 1.39 scm-sample-hello A simple hello world plugin https://bitbucket.org/sdorra/scm-manager @@ -28,7 +28,7 @@ sonia.scm scm-core - 1.39-SNAPSHOT + 1.39 diff --git a/scm-server/pom.xml b/scm-server/pom.xml index e31d5173e9..5548c6e110 100644 --- a/scm-server/pom.xml +++ b/scm-server/pom.xml @@ -6,12 +6,12 @@ scm sonia.scm - 1.39-SNAPSHOT + 1.39 sonia.scm scm-server - 1.39-SNAPSHOT + 1.39 scm-server jar diff --git a/scm-test/pom.xml b/scm-test/pom.xml index ddfbba4f34..d6d2910f54 100644 --- a/scm-test/pom.xml +++ b/scm-test/pom.xml @@ -6,12 +6,12 @@ scm sonia.scm - 1.39-SNAPSHOT + 1.39 sonia.scm scm-test - 1.39-SNAPSHOT + 1.39 scm-test @@ -25,7 +25,7 @@ sonia.scm scm-core - 1.39-SNAPSHOT + 1.39 diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml index c93aae12a3..69ecceb2e7 100644 --- a/scm-webapp/pom.xml +++ b/scm-webapp/pom.xml @@ -6,13 +6,13 @@ sonia.scm scm - 1.39-SNAPSHOT + 1.39 sonia.scm scm-webapp war - 1.39-SNAPSHOT + 1.39 scm-webapp @@ -38,31 +38,31 @@ sonia.scm scm-core - 1.39-SNAPSHOT + 1.39 sonia.scm scm-dao-xml - 1.39-SNAPSHOT + 1.39 sonia.scm.plugins scm-hg-plugin - 1.39-SNAPSHOT + 1.39 sonia.scm.plugins scm-svn-plugin - 1.39-SNAPSHOT + 1.39 sonia.scm.plugins scm-git-plugin - 1.39-SNAPSHOT + 1.39 @@ -280,7 +280,7 @@ sonia.scm scm-test - 1.39-SNAPSHOT + 1.39 test @@ -293,7 +293,7 @@ sonia.scm.plugins scm-git-plugin - 1.39-SNAPSHOT + 1.39 tests test @@ -301,7 +301,7 @@ sonia.scm.plugins scm-hg-plugin - 1.39-SNAPSHOT + 1.39 tests test @@ -309,7 +309,7 @@ sonia.scm.plugins scm-svn-plugin - 1.39-SNAPSHOT + 1.39 tests test @@ -534,7 +534,7 @@ sonia.scm scm-dao-orientdb - 1.39-SNAPSHOT + 1.39 diff --git a/support/pom.xml b/support/pom.xml index fbfaa5fff4..2b4b584be1 100644 --- a/support/pom.xml +++ b/support/pom.xml @@ -6,13 +6,13 @@ sonia.scm scm - 1.39-SNAPSHOT + 1.39 sonia.scm.support scm-support pom - 1.39-SNAPSHOT + 1.39 scm-support diff --git a/support/scm-support-btrace/pom.xml b/support/scm-support-btrace/pom.xml index 8c6621da56..5c1efad447 100644 --- a/support/scm-support-btrace/pom.xml +++ b/support/scm-support-btrace/pom.xml @@ -4,12 +4,12 @@ sonia.scm.support scm-support - 1.39-SNAPSHOT + 1.39 sonia.scm scm-support-btrace - 1.39-SNAPSHOT + 1.39 jar scm-support-btrace @@ -18,7 +18,7 @@ sonia.scm scm-core - 1.39-SNAPSHOT + 1.39 From 0ef8f3b0855eb58e3e2eff8159808a3432d76fd4 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 2 Jul 2014 14:58:09 +0200 Subject: [PATCH 12/36] [maven-release-plugin] copy for tag 1.39 From 6d2b951a2fafd814ecf509be67487ba823773ff2 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 2 Jul 2014 14:58:10 +0200 Subject: [PATCH 13/36] [maven-release-plugin] prepare for next development iteration --- maven/pom.xml | 4 ++-- maven/scm-maven-plugin/pom.xml | 4 ++-- maven/scm-plugin-archetype/pom.xml | 4 ++-- pom.xml | 4 ++-- scm-clients/pom.xml | 6 +++--- scm-clients/scm-cli-client/pom.xml | 6 +++--- scm-clients/scm-client-api/pom.xml | 4 ++-- scm-clients/scm-client-impl/pom.xml | 8 ++++---- scm-core/pom.xml | 4 ++-- scm-dao-orientdb/pom.xml | 8 ++++---- scm-dao-xml/pom.xml | 8 ++++---- scm-plugin-backend/pom.xml | 6 +++--- scm-plugins/pom.xml | 8 ++++---- scm-plugins/scm-git-plugin/pom.xml | 6 +++--- scm-plugins/scm-hg-plugin/pom.xml | 6 +++--- scm-plugins/scm-svn-plugin/pom.xml | 6 +++--- scm-samples/pom.xml | 4 ++-- scm-samples/scm-sample-auth/pom.xml | 6 +++--- scm-samples/scm-sample-hello/pom.xml | 6 +++--- scm-server/pom.xml | 4 ++-- scm-test/pom.xml | 6 +++--- scm-webapp/pom.xml | 24 ++++++++++++------------ support/pom.xml | 4 ++-- support/scm-support-btrace/pom.xml | 6 +++--- 24 files changed, 76 insertions(+), 76 deletions(-) diff --git a/maven/pom.xml b/maven/pom.xml index 4d4a5c9b8e..bc79673847 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -6,13 +6,13 @@ sonia.scm scm - 1.39 + 1.40-SNAPSHOT sonia.scm.maven scm-maven-plugins pom - 1.39 + 1.40-SNAPSHOT scm-maven-plugins diff --git a/maven/scm-maven-plugin/pom.xml b/maven/scm-maven-plugin/pom.xml index b2c3d58043..de5692ec41 100644 --- a/maven/scm-maven-plugin/pom.xml +++ b/maven/scm-maven-plugin/pom.xml @@ -6,12 +6,12 @@ scm-maven-plugins sonia.scm.maven - 1.39 + 1.40-SNAPSHOT sonia.scm.maven scm-maven-plugin - 1.39 + 1.40-SNAPSHOT maven-plugin scm-maven-plugin diff --git a/maven/scm-plugin-archetype/pom.xml b/maven/scm-plugin-archetype/pom.xml index eb1ee6ff02..6a32a1a5b9 100644 --- a/maven/scm-plugin-archetype/pom.xml +++ b/maven/scm-plugin-archetype/pom.xml @@ -6,12 +6,12 @@ scm-maven-plugins sonia.scm.maven - 1.39 + 1.40-SNAPSHOT sonia.scm.maven scm-plugin-archetype - 1.39 + 1.40-SNAPSHOT scm-plugin-archetype diff --git a/pom.xml b/pom.xml index 0f4d9b9bac..1d739b92b6 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ sonia.scm scm pom - 1.39 + 1.40-SNAPSHOT The easiest way to share your Git, Mercurial and Subversion repositories over http. @@ -36,7 +36,7 @@ scm:hg:http://bitbucket.org/sdorra/scm-manager scm:hg:https://bitbucket.org/sdorra/scm-manager http://bitbucket.org/sdorra/scm-manager - 1.39 + HEAD diff --git a/scm-clients/pom.xml b/scm-clients/pom.xml index 220235dea3..e7cbc60dc0 100644 --- a/scm-clients/pom.xml +++ b/scm-clients/pom.xml @@ -6,13 +6,13 @@ sonia.scm scm - 1.39 + 1.40-SNAPSHOT sonia.scm.clients scm-clients pom - 1.39 + 1.40-SNAPSHOT scm-clients @@ -32,7 +32,7 @@ scm-core sonia.scm jar - 1.39 + 1.40-SNAPSHOT shiro-core diff --git a/scm-clients/scm-cli-client/pom.xml b/scm-clients/scm-cli-client/pom.xml index 690341e557..0f2f75bcfc 100644 --- a/scm-clients/scm-cli-client/pom.xml +++ b/scm-clients/scm-cli-client/pom.xml @@ -6,12 +6,12 @@ scm-clients sonia.scm.clients - 1.39 + 1.40-SNAPSHOT sonia.scm.clients scm-cli-client - 1.39 + 1.40-SNAPSHOT scm-cli-client @@ -34,7 +34,7 @@ sonia.scm.clients scm-client-impl - 1.39 + 1.40-SNAPSHOT diff --git a/scm-clients/scm-client-api/pom.xml b/scm-clients/scm-client-api/pom.xml index 99598790b2..61863d58f3 100644 --- a/scm-clients/scm-client-api/pom.xml +++ b/scm-clients/scm-client-api/pom.xml @@ -6,13 +6,13 @@ sonia.scm.clients scm-clients - 1.39 + 1.40-SNAPSHOT sonia.scm.clients scm-client-api jar - 1.39 + 1.40-SNAPSHOT scm-client-api diff --git a/scm-clients/scm-client-impl/pom.xml b/scm-clients/scm-client-impl/pom.xml index b4aba44c4c..1e66c7634a 100644 --- a/scm-clients/scm-client-impl/pom.xml +++ b/scm-clients/scm-client-impl/pom.xml @@ -6,13 +6,13 @@ sonia.scm.clients scm-clients - 1.39 + 1.40-SNAPSHOT sonia.scm.clients scm-client-impl jar - 1.39 + 1.40-SNAPSHOT scm-client-impl @@ -36,7 +36,7 @@ sonia.scm.clients scm-client-api - 1.39 + 1.40-SNAPSHOT @@ -88,7 +88,7 @@ sonia.scm scm-test - 1.39 + 1.40-SNAPSHOT test diff --git a/scm-core/pom.xml b/scm-core/pom.xml index 7ca0600667..dd4211131b 100644 --- a/scm-core/pom.xml +++ b/scm-core/pom.xml @@ -6,12 +6,12 @@ scm sonia.scm - 1.39 + 1.40-SNAPSHOT sonia.scm scm-core - 1.39 + 1.40-SNAPSHOT scm-core diff --git a/scm-dao-orientdb/pom.xml b/scm-dao-orientdb/pom.xml index 919854ae29..3548d0719a 100644 --- a/scm-dao-orientdb/pom.xml +++ b/scm-dao-orientdb/pom.xml @@ -6,12 +6,12 @@ sonia.scm scm - 1.39 + 1.40-SNAPSHOT sonia.scm scm-dao-orientdb - 1.39 + 1.40-SNAPSHOT scm-dao-orientdb @@ -26,7 +26,7 @@ sonia.scm scm-core - 1.39 + 1.40-SNAPSHOT @@ -52,7 +52,7 @@ sonia.scm scm-test - 1.39 + 1.40-SNAPSHOT test diff --git a/scm-dao-xml/pom.xml b/scm-dao-xml/pom.xml index a5480a5267..c6454bba7b 100644 --- a/scm-dao-xml/pom.xml +++ b/scm-dao-xml/pom.xml @@ -6,12 +6,12 @@ sonia.scm scm - 1.39 + 1.40-SNAPSHOT sonia.scm scm-dao-xml - 1.39 + 1.40-SNAPSHOT scm-dao-xml @@ -26,7 +26,7 @@ sonia.scm scm-core - 1.39 + 1.40-SNAPSHOT @@ -34,7 +34,7 @@ sonia.scm scm-test - 1.39 + 1.40-SNAPSHOT test diff --git a/scm-plugin-backend/pom.xml b/scm-plugin-backend/pom.xml index 4e482503c2..8c8380f81d 100644 --- a/scm-plugin-backend/pom.xml +++ b/scm-plugin-backend/pom.xml @@ -6,13 +6,13 @@ scm sonia.scm - 1.39 + 1.40-SNAPSHOT sonia.scm scm-plugin-backend war - 1.39 + 1.40-SNAPSHOT ${project.artifactId} @@ -62,7 +62,7 @@ sonia.scm scm-core - 1.39 + 1.40-SNAPSHOT diff --git a/scm-plugins/pom.xml b/scm-plugins/pom.xml index c19ee11692..4550640299 100644 --- a/scm-plugins/pom.xml +++ b/scm-plugins/pom.xml @@ -6,13 +6,13 @@ sonia.scm scm - 1.39 + 1.40-SNAPSHOT sonia.scm.plugins scm-plugins pom - 1.39 + 1.40-SNAPSHOT scm-plugins @@ -26,7 +26,7 @@ sonia.scm scm-core - 1.39 + 1.40-SNAPSHOT @@ -59,7 +59,7 @@ sonia.scm.maven scm-maven-plugin - 1.39 + 1.40-SNAPSHOT process-resources diff --git a/scm-plugins/scm-git-plugin/pom.xml b/scm-plugins/scm-git-plugin/pom.xml index 177e87e2a3..5d0762d4c9 100644 --- a/scm-plugins/scm-git-plugin/pom.xml +++ b/scm-plugins/scm-git-plugin/pom.xml @@ -6,12 +6,12 @@ scm-plugins sonia.scm.plugins - 1.39 + 1.40-SNAPSHOT sonia.scm.plugins scm-git-plugin - 1.39 + 1.40-SNAPSHOT scm-git-plugin https://bitbucket.org/sdorra/scm-manager Plugin for the version control system Git @@ -48,7 +48,7 @@ sonia.scm scm-test - 1.39 + 1.40-SNAPSHOT test diff --git a/scm-plugins/scm-hg-plugin/pom.xml b/scm-plugins/scm-hg-plugin/pom.xml index ab18b52c8e..97d7b2cffb 100644 --- a/scm-plugins/scm-hg-plugin/pom.xml +++ b/scm-plugins/scm-hg-plugin/pom.xml @@ -6,12 +6,12 @@ sonia.scm.plugins scm-plugins - 1.39 + 1.40-SNAPSHOT sonia.scm.plugins scm-hg-plugin - 1.39 + 1.40-SNAPSHOT scm-hg-plugin https://bitbucket.org/sdorra/scm-manager Plugin for the version control system Mercurial @@ -36,7 +36,7 @@ sonia.scm scm-test - 1.39 + 1.40-SNAPSHOT test diff --git a/scm-plugins/scm-svn-plugin/pom.xml b/scm-plugins/scm-svn-plugin/pom.xml index 50196fec24..c10f160a0b 100644 --- a/scm-plugins/scm-svn-plugin/pom.xml +++ b/scm-plugins/scm-svn-plugin/pom.xml @@ -6,12 +6,12 @@ scm-plugins sonia.scm.plugins - 1.39 + 1.40-SNAPSHOT sonia.scm.plugins scm-svn-plugin - 1.39 + 1.40-SNAPSHOT scm-svn-plugin https://bitbucket.org/sdorra/scm-manager Plugin for the version control system Subversion @@ -48,7 +48,7 @@ sonia.scm scm-test - 1.39 + 1.40-SNAPSHOT test diff --git a/scm-samples/pom.xml b/scm-samples/pom.xml index 711d527a9b..96e7d0246b 100644 --- a/scm-samples/pom.xml +++ b/scm-samples/pom.xml @@ -6,13 +6,13 @@ sonia.scm scm - 1.39 + 1.40-SNAPSHOT sonia.scm.samples scm-samples pom - 1.39 + 1.40-SNAPSHOT scm-samples diff --git a/scm-samples/scm-sample-auth/pom.xml b/scm-samples/scm-sample-auth/pom.xml index 3bc3732816..a18875372d 100644 --- a/scm-samples/scm-sample-auth/pom.xml +++ b/scm-samples/scm-sample-auth/pom.xml @@ -6,12 +6,12 @@ scm-samples sonia.scm.samples - 1.39 + 1.40-SNAPSHOT sonia.scm.sample scm-sample-auth - 1.39 + 1.40-SNAPSHOT scm-sample-auth Sample Authentication Plugin https://bitbucket.org/sdorra/scm-manager @@ -28,7 +28,7 @@ sonia.scm scm-core - 1.39 + 1.40-SNAPSHOT diff --git a/scm-samples/scm-sample-hello/pom.xml b/scm-samples/scm-sample-hello/pom.xml index 74af00a449..d1b6edc148 100644 --- a/scm-samples/scm-sample-hello/pom.xml +++ b/scm-samples/scm-sample-hello/pom.xml @@ -6,12 +6,12 @@ scm-samples sonia.scm.samples - 1.39 + 1.40-SNAPSHOT sonia.scm.sample scm-sample-hello - 1.39 + 1.40-SNAPSHOT scm-sample-hello A simple hello world plugin https://bitbucket.org/sdorra/scm-manager @@ -28,7 +28,7 @@ sonia.scm scm-core - 1.39 + 1.40-SNAPSHOT diff --git a/scm-server/pom.xml b/scm-server/pom.xml index 5548c6e110..b74b6a374d 100644 --- a/scm-server/pom.xml +++ b/scm-server/pom.xml @@ -6,12 +6,12 @@ scm sonia.scm - 1.39 + 1.40-SNAPSHOT sonia.scm scm-server - 1.39 + 1.40-SNAPSHOT scm-server jar diff --git a/scm-test/pom.xml b/scm-test/pom.xml index d6d2910f54..592051a975 100644 --- a/scm-test/pom.xml +++ b/scm-test/pom.xml @@ -6,12 +6,12 @@ scm sonia.scm - 1.39 + 1.40-SNAPSHOT sonia.scm scm-test - 1.39 + 1.40-SNAPSHOT scm-test @@ -25,7 +25,7 @@ sonia.scm scm-core - 1.39 + 1.40-SNAPSHOT diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml index 69ecceb2e7..63a7010d79 100644 --- a/scm-webapp/pom.xml +++ b/scm-webapp/pom.xml @@ -6,13 +6,13 @@ sonia.scm scm - 1.39 + 1.40-SNAPSHOT sonia.scm scm-webapp war - 1.39 + 1.40-SNAPSHOT scm-webapp @@ -38,31 +38,31 @@ sonia.scm scm-core - 1.39 + 1.40-SNAPSHOT sonia.scm scm-dao-xml - 1.39 + 1.40-SNAPSHOT sonia.scm.plugins scm-hg-plugin - 1.39 + 1.40-SNAPSHOT sonia.scm.plugins scm-svn-plugin - 1.39 + 1.40-SNAPSHOT sonia.scm.plugins scm-git-plugin - 1.39 + 1.40-SNAPSHOT @@ -280,7 +280,7 @@ sonia.scm scm-test - 1.39 + 1.40-SNAPSHOT test @@ -293,7 +293,7 @@ sonia.scm.plugins scm-git-plugin - 1.39 + 1.40-SNAPSHOT tests test @@ -301,7 +301,7 @@ sonia.scm.plugins scm-hg-plugin - 1.39 + 1.40-SNAPSHOT tests test @@ -309,7 +309,7 @@ sonia.scm.plugins scm-svn-plugin - 1.39 + 1.40-SNAPSHOT tests test @@ -534,7 +534,7 @@ sonia.scm scm-dao-orientdb - 1.39 + 1.40-SNAPSHOT diff --git a/support/pom.xml b/support/pom.xml index 2b4b584be1..2dc73b3ab4 100644 --- a/support/pom.xml +++ b/support/pom.xml @@ -6,13 +6,13 @@ sonia.scm scm - 1.39 + 1.40-SNAPSHOT sonia.scm.support scm-support pom - 1.39 + 1.40-SNAPSHOT scm-support diff --git a/support/scm-support-btrace/pom.xml b/support/scm-support-btrace/pom.xml index 5c1efad447..ca8511ba17 100644 --- a/support/scm-support-btrace/pom.xml +++ b/support/scm-support-btrace/pom.xml @@ -4,12 +4,12 @@ sonia.scm.support scm-support - 1.39 + 1.40-SNAPSHOT sonia.scm scm-support-btrace - 1.39 + 1.40-SNAPSHOT jar scm-support-btrace @@ -18,7 +18,7 @@ sonia.scm scm-core - 1.39 + 1.40-SNAPSHOT From 789f52399563e97d139b788a3fbe4af8490570fd Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 3 Jul 2014 15:07:03 +0200 Subject: [PATCH 14/36] use final version version of nativepkg-maven-plugin to fix missing scripts in rpm and deb packages --- scm-server/pom.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scm-server/pom.xml b/scm-server/pom.xml index b74b6a374d..d34413f923 100644 --- a/scm-server/pom.xml +++ b/scm-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + scm sonia.scm @@ -80,7 +80,7 @@ commons-daemon - + java.awt.headless=true @@ -167,18 +167,18 @@ scm-server - + nativepkg - + - + com.github.sdorra nativepkg-maven-plugin - 1.0.0-SNAPSHOT + 1.0.0 @@ -287,15 +287,15 @@ 0700 - + - + - + 1.0.15 ${project.build.directory}/appassembler/commons-daemon/scm-server From 9d45731a78bb788711fd908f328d9222e26ed821 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 3 Jul 2014 15:10:50 +0200 Subject: [PATCH 15/36] remove url parameters from base url --- scm-webapp/src/main/webapp/resources/js/util/sonia.util.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scm-webapp/src/main/webapp/resources/js/util/sonia.util.js b/scm-webapp/src/main/webapp/resources/js/util/sonia.util.js index d220bf7161..c61a0e5fad 100644 --- a/scm-webapp/src/main/webapp/resources/js/util/sonia.util.js +++ b/scm-webapp/src/main/webapp/resources/js/util/sonia.util.js @@ -66,6 +66,11 @@ Sonia.util.getBaseUrl = function(){ url = url.substring(0, i); } + i = url.indexOf('?'); + if ( i > 0 ){ + url = url.substring(0, i); + } + if ( url.endsWith('/index.html') ){ url = url.substring(0, url.length - '/index.html'.length); } else if ( url.endsWith('/') ){ From 7199e0f3e2ad5ce08d1ea64abbe42b83f113d3f0 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 3 Jul 2014 16:21:00 +0200 Subject: [PATCH 16/36] added display name to web.xml --- scm-webapp/pom.xml | 1 + scm-webapp/src/main/webapp/WEB-INF/web.xml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml index 63a7010d79..272abd44f8 100644 --- a/scm-webapp/pom.xml +++ b/scm-webapp/pom.xml @@ -442,6 +442,7 @@ maven-war-plugin 2.2 + true ${project.build.directory}/dependency-rewrite diff --git a/scm-webapp/src/main/webapp/WEB-INF/web.xml b/scm-webapp/src/main/webapp/WEB-INF/web.xml index b8a21e834f..877240f765 100644 --- a/scm-webapp/src/main/webapp/WEB-INF/web.xml +++ b/scm-webapp/src/main/webapp/WEB-INF/web.xml @@ -36,6 +36,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" metadata-complete="true"> + + SCM-Manager ${project.version} sonia.scm.boot.BootstrapListener From d370b632d13852498d3b133caaa7380d52784544 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 3 Jul 2014 17:04:21 +0200 Subject: [PATCH 17/36] fix wrong directory permissions on some rpm based systems --- scm-server/pom.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/scm-server/pom.xml b/scm-server/pom.xml index d34413f923..d819711919 100644 --- a/scm-server/pom.xml +++ b/scm-server/pom.xml @@ -178,7 +178,7 @@ com.github.sdorra nativepkg-maven-plugin - 1.0.0 + 1.0.1 @@ -268,23 +268,33 @@ /opt/scm-server/lib ${exploded.directory}/lib + + /var/cache/scm + scm + scm + 0700 + false + /var/cache/scm/work scm scm 0700 + false /var/log/scm scm scm 0770 + false /var/lib/scm scm scm 0700 + false From 25e55a44bb5d81ffe1294e1a91c8c47d4df344be Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 3 Jul 2014 17:46:56 +0200 Subject: [PATCH 18/36] update nativepkg-maven-plugin to version 1.1.0 --- scm-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm-server/pom.xml b/scm-server/pom.xml index d819711919..e057d5604e 100644 --- a/scm-server/pom.xml +++ b/scm-server/pom.xml @@ -178,7 +178,7 @@ com.github.sdorra nativepkg-maven-plugin - 1.0.1 + 1.1.0 From ec95bd977a210ac8c26e496724cd2cff63cba16f Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 4 Jul 2014 08:14:12 +0200 Subject: [PATCH 19/36] update args4j to version 2.0.28 --- scm-clients/scm-cli-client/pom.xml | 58 +++++++++++++++--------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/scm-clients/scm-cli-client/pom.xml b/scm-clients/scm-cli-client/pom.xml index 0f2f75bcfc..8ddfe4d97a 100644 --- a/scm-clients/scm-cli-client/pom.xml +++ b/scm-clients/scm-cli-client/pom.xml @@ -1,54 +1,54 @@ - + 4.0.0 - + scm-clients sonia.scm.clients 1.40-SNAPSHOT - + sonia.scm.clients scm-cli-client 1.40-SNAPSHOT scm-cli-client - + - + javax.servlet servlet-api ${servlet.version} - - + + javax.transaction jta 1.1 provided - + sonia.scm.clients scm-client-impl 1.40-SNAPSHOT - + args4j args4j - 2.0.26 + 2.0.28 - + ch.qos.logback logback-classic ${logback.version} - + org.freemarker freemarker @@ -56,10 +56,10 @@ - + - + com.mycila.maven-license-plugin maven-license-plugin @@ -78,7 +78,7 @@ true - + org.apache.maven.plugins maven-assembly-plugin @@ -102,18 +102,18 @@ - + - + - + it - + - + org.apache.maven.plugins maven-dependency-plugin @@ -139,7 +139,7 @@ - + org.apache.maven.plugins maven-failsafe-plugin @@ -164,7 +164,7 @@ - + org.mortbay.jetty jetty-maven-plugin @@ -216,22 +216,22 @@ - + - + - - + + - + maven.jenkins-ci.org jenkins release repository http://maven.jenkins-ci.org/content/repositories/releases/ - + - + From 2eaf1140b7ea1c8b8999047029dddc05832c4b8b Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 4 Jul 2014 08:18:16 +0200 Subject: [PATCH 20/36] [maven-release-plugin] prepare release 1.40 --- maven/pom.xml | 4 ++-- maven/scm-maven-plugin/pom.xml | 4 ++-- maven/scm-plugin-archetype/pom.xml | 4 ++-- pom.xml | 4 ++-- scm-clients/pom.xml | 6 +++--- scm-clients/scm-cli-client/pom.xml | 6 +++--- scm-clients/scm-client-api/pom.xml | 4 ++-- scm-clients/scm-client-impl/pom.xml | 8 ++++---- scm-core/pom.xml | 4 ++-- scm-dao-orientdb/pom.xml | 8 ++++---- scm-dao-xml/pom.xml | 8 ++++---- scm-plugin-backend/pom.xml | 6 +++--- scm-plugins/pom.xml | 8 ++++---- scm-plugins/scm-git-plugin/pom.xml | 6 +++--- scm-plugins/scm-hg-plugin/pom.xml | 6 +++--- scm-plugins/scm-svn-plugin/pom.xml | 6 +++--- scm-samples/pom.xml | 4 ++-- scm-samples/scm-sample-auth/pom.xml | 6 +++--- scm-samples/scm-sample-hello/pom.xml | 6 +++--- scm-server/pom.xml | 4 ++-- scm-test/pom.xml | 6 +++--- scm-webapp/pom.xml | 24 ++++++++++++------------ support/pom.xml | 4 ++-- support/scm-support-btrace/pom.xml | 6 +++--- 24 files changed, 76 insertions(+), 76 deletions(-) diff --git a/maven/pom.xml b/maven/pom.xml index bc79673847..0b6398df8e 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -6,13 +6,13 @@ sonia.scm scm - 1.40-SNAPSHOT + 1.40 sonia.scm.maven scm-maven-plugins pom - 1.40-SNAPSHOT + 1.40 scm-maven-plugins diff --git a/maven/scm-maven-plugin/pom.xml b/maven/scm-maven-plugin/pom.xml index de5692ec41..491de0e9d8 100644 --- a/maven/scm-maven-plugin/pom.xml +++ b/maven/scm-maven-plugin/pom.xml @@ -6,12 +6,12 @@ scm-maven-plugins sonia.scm.maven - 1.40-SNAPSHOT + 1.40 sonia.scm.maven scm-maven-plugin - 1.40-SNAPSHOT + 1.40 maven-plugin scm-maven-plugin diff --git a/maven/scm-plugin-archetype/pom.xml b/maven/scm-plugin-archetype/pom.xml index 6a32a1a5b9..7278e8abc8 100644 --- a/maven/scm-plugin-archetype/pom.xml +++ b/maven/scm-plugin-archetype/pom.xml @@ -6,12 +6,12 @@ scm-maven-plugins sonia.scm.maven - 1.40-SNAPSHOT + 1.40 sonia.scm.maven scm-plugin-archetype - 1.40-SNAPSHOT + 1.40 scm-plugin-archetype diff --git a/pom.xml b/pom.xml index 1d739b92b6..68f33344e2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ sonia.scm scm pom - 1.40-SNAPSHOT + 1.40 The easiest way to share your Git, Mercurial and Subversion repositories over http. @@ -36,7 +36,7 @@ scm:hg:http://bitbucket.org/sdorra/scm-manager scm:hg:https://bitbucket.org/sdorra/scm-manager http://bitbucket.org/sdorra/scm-manager - HEAD + 1.40 diff --git a/scm-clients/pom.xml b/scm-clients/pom.xml index e7cbc60dc0..a448c61444 100644 --- a/scm-clients/pom.xml +++ b/scm-clients/pom.xml @@ -6,13 +6,13 @@ sonia.scm scm - 1.40-SNAPSHOT + 1.40 sonia.scm.clients scm-clients pom - 1.40-SNAPSHOT + 1.40 scm-clients @@ -32,7 +32,7 @@ scm-core sonia.scm jar - 1.40-SNAPSHOT + 1.40 shiro-core diff --git a/scm-clients/scm-cli-client/pom.xml b/scm-clients/scm-cli-client/pom.xml index 8ddfe4d97a..cd3f95c7dd 100644 --- a/scm-clients/scm-cli-client/pom.xml +++ b/scm-clients/scm-cli-client/pom.xml @@ -6,12 +6,12 @@ scm-clients sonia.scm.clients - 1.40-SNAPSHOT + 1.40 sonia.scm.clients scm-cli-client - 1.40-SNAPSHOT + 1.40 scm-cli-client @@ -34,7 +34,7 @@ sonia.scm.clients scm-client-impl - 1.40-SNAPSHOT + 1.40 diff --git a/scm-clients/scm-client-api/pom.xml b/scm-clients/scm-client-api/pom.xml index 61863d58f3..4dbd3fd697 100644 --- a/scm-clients/scm-client-api/pom.xml +++ b/scm-clients/scm-client-api/pom.xml @@ -6,13 +6,13 @@ sonia.scm.clients scm-clients - 1.40-SNAPSHOT + 1.40 sonia.scm.clients scm-client-api jar - 1.40-SNAPSHOT + 1.40 scm-client-api diff --git a/scm-clients/scm-client-impl/pom.xml b/scm-clients/scm-client-impl/pom.xml index 1e66c7634a..7c0e75ccae 100644 --- a/scm-clients/scm-client-impl/pom.xml +++ b/scm-clients/scm-client-impl/pom.xml @@ -6,13 +6,13 @@ sonia.scm.clients scm-clients - 1.40-SNAPSHOT + 1.40 sonia.scm.clients scm-client-impl jar - 1.40-SNAPSHOT + 1.40 scm-client-impl @@ -36,7 +36,7 @@ sonia.scm.clients scm-client-api - 1.40-SNAPSHOT + 1.40 @@ -88,7 +88,7 @@ sonia.scm scm-test - 1.40-SNAPSHOT + 1.40 test diff --git a/scm-core/pom.xml b/scm-core/pom.xml index dd4211131b..d26f3dc46c 100644 --- a/scm-core/pom.xml +++ b/scm-core/pom.xml @@ -6,12 +6,12 @@ scm sonia.scm - 1.40-SNAPSHOT + 1.40 sonia.scm scm-core - 1.40-SNAPSHOT + 1.40 scm-core diff --git a/scm-dao-orientdb/pom.xml b/scm-dao-orientdb/pom.xml index 3548d0719a..4ae0b67b95 100644 --- a/scm-dao-orientdb/pom.xml +++ b/scm-dao-orientdb/pom.xml @@ -6,12 +6,12 @@ sonia.scm scm - 1.40-SNAPSHOT + 1.40 sonia.scm scm-dao-orientdb - 1.40-SNAPSHOT + 1.40 scm-dao-orientdb @@ -26,7 +26,7 @@ sonia.scm scm-core - 1.40-SNAPSHOT + 1.40 @@ -52,7 +52,7 @@ sonia.scm scm-test - 1.40-SNAPSHOT + 1.40 test diff --git a/scm-dao-xml/pom.xml b/scm-dao-xml/pom.xml index c6454bba7b..2c00861340 100644 --- a/scm-dao-xml/pom.xml +++ b/scm-dao-xml/pom.xml @@ -6,12 +6,12 @@ sonia.scm scm - 1.40-SNAPSHOT + 1.40 sonia.scm scm-dao-xml - 1.40-SNAPSHOT + 1.40 scm-dao-xml @@ -26,7 +26,7 @@ sonia.scm scm-core - 1.40-SNAPSHOT + 1.40 @@ -34,7 +34,7 @@ sonia.scm scm-test - 1.40-SNAPSHOT + 1.40 test diff --git a/scm-plugin-backend/pom.xml b/scm-plugin-backend/pom.xml index 8c8380f81d..781fa26288 100644 --- a/scm-plugin-backend/pom.xml +++ b/scm-plugin-backend/pom.xml @@ -6,13 +6,13 @@ scm sonia.scm - 1.40-SNAPSHOT + 1.40 sonia.scm scm-plugin-backend war - 1.40-SNAPSHOT + 1.40 ${project.artifactId} @@ -62,7 +62,7 @@ sonia.scm scm-core - 1.40-SNAPSHOT + 1.40 diff --git a/scm-plugins/pom.xml b/scm-plugins/pom.xml index 4550640299..e2f89970df 100644 --- a/scm-plugins/pom.xml +++ b/scm-plugins/pom.xml @@ -6,13 +6,13 @@ sonia.scm scm - 1.40-SNAPSHOT + 1.40 sonia.scm.plugins scm-plugins pom - 1.40-SNAPSHOT + 1.40 scm-plugins @@ -26,7 +26,7 @@ sonia.scm scm-core - 1.40-SNAPSHOT + 1.40 @@ -59,7 +59,7 @@ sonia.scm.maven scm-maven-plugin - 1.40-SNAPSHOT + 1.40 process-resources diff --git a/scm-plugins/scm-git-plugin/pom.xml b/scm-plugins/scm-git-plugin/pom.xml index 5d0762d4c9..52468d9fc4 100644 --- a/scm-plugins/scm-git-plugin/pom.xml +++ b/scm-plugins/scm-git-plugin/pom.xml @@ -6,12 +6,12 @@ scm-plugins sonia.scm.plugins - 1.40-SNAPSHOT + 1.40 sonia.scm.plugins scm-git-plugin - 1.40-SNAPSHOT + 1.40 scm-git-plugin https://bitbucket.org/sdorra/scm-manager Plugin for the version control system Git @@ -48,7 +48,7 @@ sonia.scm scm-test - 1.40-SNAPSHOT + 1.40 test diff --git a/scm-plugins/scm-hg-plugin/pom.xml b/scm-plugins/scm-hg-plugin/pom.xml index 97d7b2cffb..6fd460e06c 100644 --- a/scm-plugins/scm-hg-plugin/pom.xml +++ b/scm-plugins/scm-hg-plugin/pom.xml @@ -6,12 +6,12 @@ sonia.scm.plugins scm-plugins - 1.40-SNAPSHOT + 1.40 sonia.scm.plugins scm-hg-plugin - 1.40-SNAPSHOT + 1.40 scm-hg-plugin https://bitbucket.org/sdorra/scm-manager Plugin for the version control system Mercurial @@ -36,7 +36,7 @@ sonia.scm scm-test - 1.40-SNAPSHOT + 1.40 test diff --git a/scm-plugins/scm-svn-plugin/pom.xml b/scm-plugins/scm-svn-plugin/pom.xml index c10f160a0b..453f4669a4 100644 --- a/scm-plugins/scm-svn-plugin/pom.xml +++ b/scm-plugins/scm-svn-plugin/pom.xml @@ -6,12 +6,12 @@ scm-plugins sonia.scm.plugins - 1.40-SNAPSHOT + 1.40 sonia.scm.plugins scm-svn-plugin - 1.40-SNAPSHOT + 1.40 scm-svn-plugin https://bitbucket.org/sdorra/scm-manager Plugin for the version control system Subversion @@ -48,7 +48,7 @@ sonia.scm scm-test - 1.40-SNAPSHOT + 1.40 test diff --git a/scm-samples/pom.xml b/scm-samples/pom.xml index 96e7d0246b..ece827b20f 100644 --- a/scm-samples/pom.xml +++ b/scm-samples/pom.xml @@ -6,13 +6,13 @@ sonia.scm scm - 1.40-SNAPSHOT + 1.40 sonia.scm.samples scm-samples pom - 1.40-SNAPSHOT + 1.40 scm-samples diff --git a/scm-samples/scm-sample-auth/pom.xml b/scm-samples/scm-sample-auth/pom.xml index a18875372d..9bf30fac7d 100644 --- a/scm-samples/scm-sample-auth/pom.xml +++ b/scm-samples/scm-sample-auth/pom.xml @@ -6,12 +6,12 @@ scm-samples sonia.scm.samples - 1.40-SNAPSHOT + 1.40 sonia.scm.sample scm-sample-auth - 1.40-SNAPSHOT + 1.40 scm-sample-auth Sample Authentication Plugin https://bitbucket.org/sdorra/scm-manager @@ -28,7 +28,7 @@ sonia.scm scm-core - 1.40-SNAPSHOT + 1.40 diff --git a/scm-samples/scm-sample-hello/pom.xml b/scm-samples/scm-sample-hello/pom.xml index d1b6edc148..b7fa615323 100644 --- a/scm-samples/scm-sample-hello/pom.xml +++ b/scm-samples/scm-sample-hello/pom.xml @@ -6,12 +6,12 @@ scm-samples sonia.scm.samples - 1.40-SNAPSHOT + 1.40 sonia.scm.sample scm-sample-hello - 1.40-SNAPSHOT + 1.40 scm-sample-hello A simple hello world plugin https://bitbucket.org/sdorra/scm-manager @@ -28,7 +28,7 @@ sonia.scm scm-core - 1.40-SNAPSHOT + 1.40 diff --git a/scm-server/pom.xml b/scm-server/pom.xml index e057d5604e..57c083ad16 100644 --- a/scm-server/pom.xml +++ b/scm-server/pom.xml @@ -6,12 +6,12 @@ scm sonia.scm - 1.40-SNAPSHOT + 1.40 sonia.scm scm-server - 1.40-SNAPSHOT + 1.40 scm-server jar diff --git a/scm-test/pom.xml b/scm-test/pom.xml index 592051a975..5833da29c2 100644 --- a/scm-test/pom.xml +++ b/scm-test/pom.xml @@ -6,12 +6,12 @@ scm sonia.scm - 1.40-SNAPSHOT + 1.40 sonia.scm scm-test - 1.40-SNAPSHOT + 1.40 scm-test @@ -25,7 +25,7 @@ sonia.scm scm-core - 1.40-SNAPSHOT + 1.40 diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml index 272abd44f8..64c6b424e8 100644 --- a/scm-webapp/pom.xml +++ b/scm-webapp/pom.xml @@ -6,13 +6,13 @@ sonia.scm scm - 1.40-SNAPSHOT + 1.40 sonia.scm scm-webapp war - 1.40-SNAPSHOT + 1.40 scm-webapp @@ -38,31 +38,31 @@ sonia.scm scm-core - 1.40-SNAPSHOT + 1.40 sonia.scm scm-dao-xml - 1.40-SNAPSHOT + 1.40 sonia.scm.plugins scm-hg-plugin - 1.40-SNAPSHOT + 1.40 sonia.scm.plugins scm-svn-plugin - 1.40-SNAPSHOT + 1.40 sonia.scm.plugins scm-git-plugin - 1.40-SNAPSHOT + 1.40 @@ -280,7 +280,7 @@ sonia.scm scm-test - 1.40-SNAPSHOT + 1.40 test @@ -293,7 +293,7 @@ sonia.scm.plugins scm-git-plugin - 1.40-SNAPSHOT + 1.40 tests test @@ -301,7 +301,7 @@ sonia.scm.plugins scm-hg-plugin - 1.40-SNAPSHOT + 1.40 tests test @@ -309,7 +309,7 @@ sonia.scm.plugins scm-svn-plugin - 1.40-SNAPSHOT + 1.40 tests test @@ -535,7 +535,7 @@ sonia.scm scm-dao-orientdb - 1.40-SNAPSHOT + 1.40 diff --git a/support/pom.xml b/support/pom.xml index 2dc73b3ab4..5805bbedc7 100644 --- a/support/pom.xml +++ b/support/pom.xml @@ -6,13 +6,13 @@ sonia.scm scm - 1.40-SNAPSHOT + 1.40 sonia.scm.support scm-support pom - 1.40-SNAPSHOT + 1.40 scm-support diff --git a/support/scm-support-btrace/pom.xml b/support/scm-support-btrace/pom.xml index ca8511ba17..8ce079804c 100644 --- a/support/scm-support-btrace/pom.xml +++ b/support/scm-support-btrace/pom.xml @@ -4,12 +4,12 @@ sonia.scm.support scm-support - 1.40-SNAPSHOT + 1.40 sonia.scm scm-support-btrace - 1.40-SNAPSHOT + 1.40 jar scm-support-btrace @@ -18,7 +18,7 @@ sonia.scm scm-core - 1.40-SNAPSHOT + 1.40 From 6b141f9a4feba02466dfd27a65296dbff2a5d1c4 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 4 Jul 2014 08:18:16 +0200 Subject: [PATCH 21/36] [maven-release-plugin] copy for tag 1.40 From ae65fb68aec48e2bda0c65e5c2b6ea54141e0cf4 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 4 Jul 2014 08:18:17 +0200 Subject: [PATCH 22/36] [maven-release-plugin] prepare for next development iteration --- maven/pom.xml | 4 ++-- maven/scm-maven-plugin/pom.xml | 4 ++-- maven/scm-plugin-archetype/pom.xml | 4 ++-- pom.xml | 4 ++-- scm-clients/pom.xml | 6 +++--- scm-clients/scm-cli-client/pom.xml | 6 +++--- scm-clients/scm-client-api/pom.xml | 4 ++-- scm-clients/scm-client-impl/pom.xml | 8 ++++---- scm-core/pom.xml | 4 ++-- scm-dao-orientdb/pom.xml | 8 ++++---- scm-dao-xml/pom.xml | 8 ++++---- scm-plugin-backend/pom.xml | 6 +++--- scm-plugins/pom.xml | 8 ++++---- scm-plugins/scm-git-plugin/pom.xml | 6 +++--- scm-plugins/scm-hg-plugin/pom.xml | 6 +++--- scm-plugins/scm-svn-plugin/pom.xml | 6 +++--- scm-samples/pom.xml | 4 ++-- scm-samples/scm-sample-auth/pom.xml | 6 +++--- scm-samples/scm-sample-hello/pom.xml | 6 +++--- scm-server/pom.xml | 4 ++-- scm-test/pom.xml | 6 +++--- scm-webapp/pom.xml | 24 ++++++++++++------------ support/pom.xml | 4 ++-- support/scm-support-btrace/pom.xml | 6 +++--- 24 files changed, 76 insertions(+), 76 deletions(-) diff --git a/maven/pom.xml b/maven/pom.xml index 0b6398df8e..abfd06ef62 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -6,13 +6,13 @@ sonia.scm scm - 1.40 + 1.41-SNAPSHOT sonia.scm.maven scm-maven-plugins pom - 1.40 + 1.41-SNAPSHOT scm-maven-plugins diff --git a/maven/scm-maven-plugin/pom.xml b/maven/scm-maven-plugin/pom.xml index 491de0e9d8..d675e95acf 100644 --- a/maven/scm-maven-plugin/pom.xml +++ b/maven/scm-maven-plugin/pom.xml @@ -6,12 +6,12 @@ scm-maven-plugins sonia.scm.maven - 1.40 + 1.41-SNAPSHOT sonia.scm.maven scm-maven-plugin - 1.40 + 1.41-SNAPSHOT maven-plugin scm-maven-plugin diff --git a/maven/scm-plugin-archetype/pom.xml b/maven/scm-plugin-archetype/pom.xml index 7278e8abc8..818e5d5e55 100644 --- a/maven/scm-plugin-archetype/pom.xml +++ b/maven/scm-plugin-archetype/pom.xml @@ -6,12 +6,12 @@ scm-maven-plugins sonia.scm.maven - 1.40 + 1.41-SNAPSHOT sonia.scm.maven scm-plugin-archetype - 1.40 + 1.41-SNAPSHOT scm-plugin-archetype diff --git a/pom.xml b/pom.xml index 68f33344e2..29a5b70efb 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ sonia.scm scm pom - 1.40 + 1.41-SNAPSHOT The easiest way to share your Git, Mercurial and Subversion repositories over http. @@ -36,7 +36,7 @@ scm:hg:http://bitbucket.org/sdorra/scm-manager scm:hg:https://bitbucket.org/sdorra/scm-manager http://bitbucket.org/sdorra/scm-manager - 1.40 + HEAD diff --git a/scm-clients/pom.xml b/scm-clients/pom.xml index a448c61444..911d918a1c 100644 --- a/scm-clients/pom.xml +++ b/scm-clients/pom.xml @@ -6,13 +6,13 @@ sonia.scm scm - 1.40 + 1.41-SNAPSHOT sonia.scm.clients scm-clients pom - 1.40 + 1.41-SNAPSHOT scm-clients @@ -32,7 +32,7 @@ scm-core sonia.scm jar - 1.40 + 1.41-SNAPSHOT shiro-core diff --git a/scm-clients/scm-cli-client/pom.xml b/scm-clients/scm-cli-client/pom.xml index cd3f95c7dd..40044a745a 100644 --- a/scm-clients/scm-cli-client/pom.xml +++ b/scm-clients/scm-cli-client/pom.xml @@ -6,12 +6,12 @@ scm-clients sonia.scm.clients - 1.40 + 1.41-SNAPSHOT sonia.scm.clients scm-cli-client - 1.40 + 1.41-SNAPSHOT scm-cli-client @@ -34,7 +34,7 @@ sonia.scm.clients scm-client-impl - 1.40 + 1.41-SNAPSHOT diff --git a/scm-clients/scm-client-api/pom.xml b/scm-clients/scm-client-api/pom.xml index 4dbd3fd697..1d4f9396f5 100644 --- a/scm-clients/scm-client-api/pom.xml +++ b/scm-clients/scm-client-api/pom.xml @@ -6,13 +6,13 @@ sonia.scm.clients scm-clients - 1.40 + 1.41-SNAPSHOT sonia.scm.clients scm-client-api jar - 1.40 + 1.41-SNAPSHOT scm-client-api diff --git a/scm-clients/scm-client-impl/pom.xml b/scm-clients/scm-client-impl/pom.xml index 7c0e75ccae..85416382fd 100644 --- a/scm-clients/scm-client-impl/pom.xml +++ b/scm-clients/scm-client-impl/pom.xml @@ -6,13 +6,13 @@ sonia.scm.clients scm-clients - 1.40 + 1.41-SNAPSHOT sonia.scm.clients scm-client-impl jar - 1.40 + 1.41-SNAPSHOT scm-client-impl @@ -36,7 +36,7 @@ sonia.scm.clients scm-client-api - 1.40 + 1.41-SNAPSHOT @@ -88,7 +88,7 @@ sonia.scm scm-test - 1.40 + 1.41-SNAPSHOT test diff --git a/scm-core/pom.xml b/scm-core/pom.xml index d26f3dc46c..f27f3e1b79 100644 --- a/scm-core/pom.xml +++ b/scm-core/pom.xml @@ -6,12 +6,12 @@ scm sonia.scm - 1.40 + 1.41-SNAPSHOT sonia.scm scm-core - 1.40 + 1.41-SNAPSHOT scm-core diff --git a/scm-dao-orientdb/pom.xml b/scm-dao-orientdb/pom.xml index 4ae0b67b95..9fb21ee27d 100644 --- a/scm-dao-orientdb/pom.xml +++ b/scm-dao-orientdb/pom.xml @@ -6,12 +6,12 @@ sonia.scm scm - 1.40 + 1.41-SNAPSHOT sonia.scm scm-dao-orientdb - 1.40 + 1.41-SNAPSHOT scm-dao-orientdb @@ -26,7 +26,7 @@ sonia.scm scm-core - 1.40 + 1.41-SNAPSHOT @@ -52,7 +52,7 @@ sonia.scm scm-test - 1.40 + 1.41-SNAPSHOT test diff --git a/scm-dao-xml/pom.xml b/scm-dao-xml/pom.xml index 2c00861340..86536aede2 100644 --- a/scm-dao-xml/pom.xml +++ b/scm-dao-xml/pom.xml @@ -6,12 +6,12 @@ sonia.scm scm - 1.40 + 1.41-SNAPSHOT sonia.scm scm-dao-xml - 1.40 + 1.41-SNAPSHOT scm-dao-xml @@ -26,7 +26,7 @@ sonia.scm scm-core - 1.40 + 1.41-SNAPSHOT @@ -34,7 +34,7 @@ sonia.scm scm-test - 1.40 + 1.41-SNAPSHOT test diff --git a/scm-plugin-backend/pom.xml b/scm-plugin-backend/pom.xml index 781fa26288..d6f9e2c4da 100644 --- a/scm-plugin-backend/pom.xml +++ b/scm-plugin-backend/pom.xml @@ -6,13 +6,13 @@ scm sonia.scm - 1.40 + 1.41-SNAPSHOT sonia.scm scm-plugin-backend war - 1.40 + 1.41-SNAPSHOT ${project.artifactId} @@ -62,7 +62,7 @@ sonia.scm scm-core - 1.40 + 1.41-SNAPSHOT diff --git a/scm-plugins/pom.xml b/scm-plugins/pom.xml index e2f89970df..d7ee0f6d0d 100644 --- a/scm-plugins/pom.xml +++ b/scm-plugins/pom.xml @@ -6,13 +6,13 @@ sonia.scm scm - 1.40 + 1.41-SNAPSHOT sonia.scm.plugins scm-plugins pom - 1.40 + 1.41-SNAPSHOT scm-plugins @@ -26,7 +26,7 @@ sonia.scm scm-core - 1.40 + 1.41-SNAPSHOT @@ -59,7 +59,7 @@ sonia.scm.maven scm-maven-plugin - 1.40 + 1.41-SNAPSHOT process-resources diff --git a/scm-plugins/scm-git-plugin/pom.xml b/scm-plugins/scm-git-plugin/pom.xml index 52468d9fc4..4f501908e7 100644 --- a/scm-plugins/scm-git-plugin/pom.xml +++ b/scm-plugins/scm-git-plugin/pom.xml @@ -6,12 +6,12 @@ scm-plugins sonia.scm.plugins - 1.40 + 1.41-SNAPSHOT sonia.scm.plugins scm-git-plugin - 1.40 + 1.41-SNAPSHOT scm-git-plugin https://bitbucket.org/sdorra/scm-manager Plugin for the version control system Git @@ -48,7 +48,7 @@ sonia.scm scm-test - 1.40 + 1.41-SNAPSHOT test diff --git a/scm-plugins/scm-hg-plugin/pom.xml b/scm-plugins/scm-hg-plugin/pom.xml index 6fd460e06c..61014dfaa3 100644 --- a/scm-plugins/scm-hg-plugin/pom.xml +++ b/scm-plugins/scm-hg-plugin/pom.xml @@ -6,12 +6,12 @@ sonia.scm.plugins scm-plugins - 1.40 + 1.41-SNAPSHOT sonia.scm.plugins scm-hg-plugin - 1.40 + 1.41-SNAPSHOT scm-hg-plugin https://bitbucket.org/sdorra/scm-manager Plugin for the version control system Mercurial @@ -36,7 +36,7 @@ sonia.scm scm-test - 1.40 + 1.41-SNAPSHOT test diff --git a/scm-plugins/scm-svn-plugin/pom.xml b/scm-plugins/scm-svn-plugin/pom.xml index 453f4669a4..cc536e136c 100644 --- a/scm-plugins/scm-svn-plugin/pom.xml +++ b/scm-plugins/scm-svn-plugin/pom.xml @@ -6,12 +6,12 @@ scm-plugins sonia.scm.plugins - 1.40 + 1.41-SNAPSHOT sonia.scm.plugins scm-svn-plugin - 1.40 + 1.41-SNAPSHOT scm-svn-plugin https://bitbucket.org/sdorra/scm-manager Plugin for the version control system Subversion @@ -48,7 +48,7 @@ sonia.scm scm-test - 1.40 + 1.41-SNAPSHOT test diff --git a/scm-samples/pom.xml b/scm-samples/pom.xml index ece827b20f..d185a77dc5 100644 --- a/scm-samples/pom.xml +++ b/scm-samples/pom.xml @@ -6,13 +6,13 @@ sonia.scm scm - 1.40 + 1.41-SNAPSHOT sonia.scm.samples scm-samples pom - 1.40 + 1.41-SNAPSHOT scm-samples diff --git a/scm-samples/scm-sample-auth/pom.xml b/scm-samples/scm-sample-auth/pom.xml index 9bf30fac7d..8326546081 100644 --- a/scm-samples/scm-sample-auth/pom.xml +++ b/scm-samples/scm-sample-auth/pom.xml @@ -6,12 +6,12 @@ scm-samples sonia.scm.samples - 1.40 + 1.41-SNAPSHOT sonia.scm.sample scm-sample-auth - 1.40 + 1.41-SNAPSHOT scm-sample-auth Sample Authentication Plugin https://bitbucket.org/sdorra/scm-manager @@ -28,7 +28,7 @@ sonia.scm scm-core - 1.40 + 1.41-SNAPSHOT diff --git a/scm-samples/scm-sample-hello/pom.xml b/scm-samples/scm-sample-hello/pom.xml index b7fa615323..2e57f7f6f6 100644 --- a/scm-samples/scm-sample-hello/pom.xml +++ b/scm-samples/scm-sample-hello/pom.xml @@ -6,12 +6,12 @@ scm-samples sonia.scm.samples - 1.40 + 1.41-SNAPSHOT sonia.scm.sample scm-sample-hello - 1.40 + 1.41-SNAPSHOT scm-sample-hello A simple hello world plugin https://bitbucket.org/sdorra/scm-manager @@ -28,7 +28,7 @@ sonia.scm scm-core - 1.40 + 1.41-SNAPSHOT diff --git a/scm-server/pom.xml b/scm-server/pom.xml index 57c083ad16..c9f7e43447 100644 --- a/scm-server/pom.xml +++ b/scm-server/pom.xml @@ -6,12 +6,12 @@ scm sonia.scm - 1.40 + 1.41-SNAPSHOT sonia.scm scm-server - 1.40 + 1.41-SNAPSHOT scm-server jar diff --git a/scm-test/pom.xml b/scm-test/pom.xml index 5833da29c2..bb7c18e19e 100644 --- a/scm-test/pom.xml +++ b/scm-test/pom.xml @@ -6,12 +6,12 @@ scm sonia.scm - 1.40 + 1.41-SNAPSHOT sonia.scm scm-test - 1.40 + 1.41-SNAPSHOT scm-test @@ -25,7 +25,7 @@ sonia.scm scm-core - 1.40 + 1.41-SNAPSHOT diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml index 64c6b424e8..c03a6627f2 100644 --- a/scm-webapp/pom.xml +++ b/scm-webapp/pom.xml @@ -6,13 +6,13 @@ sonia.scm scm - 1.40 + 1.41-SNAPSHOT sonia.scm scm-webapp war - 1.40 + 1.41-SNAPSHOT scm-webapp @@ -38,31 +38,31 @@ sonia.scm scm-core - 1.40 + 1.41-SNAPSHOT sonia.scm scm-dao-xml - 1.40 + 1.41-SNAPSHOT sonia.scm.plugins scm-hg-plugin - 1.40 + 1.41-SNAPSHOT sonia.scm.plugins scm-svn-plugin - 1.40 + 1.41-SNAPSHOT sonia.scm.plugins scm-git-plugin - 1.40 + 1.41-SNAPSHOT @@ -280,7 +280,7 @@ sonia.scm scm-test - 1.40 + 1.41-SNAPSHOT test @@ -293,7 +293,7 @@ sonia.scm.plugins scm-git-plugin - 1.40 + 1.41-SNAPSHOT tests test @@ -301,7 +301,7 @@ sonia.scm.plugins scm-hg-plugin - 1.40 + 1.41-SNAPSHOT tests test @@ -309,7 +309,7 @@ sonia.scm.plugins scm-svn-plugin - 1.40 + 1.41-SNAPSHOT tests test @@ -535,7 +535,7 @@ sonia.scm scm-dao-orientdb - 1.40 + 1.41-SNAPSHOT diff --git a/support/pom.xml b/support/pom.xml index 5805bbedc7..99f56dd5d7 100644 --- a/support/pom.xml +++ b/support/pom.xml @@ -6,13 +6,13 @@ sonia.scm scm - 1.40 + 1.41-SNAPSHOT sonia.scm.support scm-support pom - 1.40 + 1.41-SNAPSHOT scm-support diff --git a/support/scm-support-btrace/pom.xml b/support/scm-support-btrace/pom.xml index 8ce079804c..602e1239a0 100644 --- a/support/scm-support-btrace/pom.xml +++ b/support/scm-support-btrace/pom.xml @@ -4,12 +4,12 @@ sonia.scm.support scm-support - 1.40 + 1.41-SNAPSHOT sonia.scm scm-support-btrace - 1.40 + 1.41-SNAPSHOT jar scm-support-btrace @@ -18,7 +18,7 @@ sonia.scm scm-core - 1.40 + 1.41-SNAPSHOT From 26070ba7778093518a6a1b142f1ceffbdbca8f8a Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sat, 5 Jul 2014 22:42:55 +0200 Subject: [PATCH 23/36] use default jersey client implementation instead of ahc --- scm-clients/scm-client-impl/pom.xml | 24 --- .../scm/client/JerseyClientProvider.java | 188 +++++++++++++----- 2 files changed, 136 insertions(+), 76 deletions(-) diff --git a/scm-clients/scm-client-impl/pom.xml b/scm-clients/scm-client-impl/pom.xml index 85416382fd..ee8f684717 100644 --- a/scm-clients/scm-client-impl/pom.xml +++ b/scm-clients/scm-client-impl/pom.xml @@ -45,30 +45,6 @@ ${jersey.version} - - sonia.net.ahc - jersey-ahc-client - 1.0.2.1 - - - jaxb-api - javax.xml.bind - - - jaxb-impl - com.sun.xml.bind - - - stax-api - stax - - - jersey-json - com.sun.jersey - - - - diff --git a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientProvider.java b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientProvider.java index 8c38f83eb1..48111de0d8 100644 --- a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientProvider.java +++ b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientProvider.java @@ -38,9 +38,6 @@ package sonia.scm.client; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.sonatype.spice.jersey.client.ahc.AhcHttpClient; -import org.sonatype.spice.jersey.client.ahc.config.DefaultAhcConfig; - import sonia.scm.ScmState; import sonia.scm.url.UrlProvider; import sonia.scm.url.UrlProviderFactory; @@ -49,11 +46,20 @@ import sonia.scm.util.Util; //~--- JDK imports ------------------------------------------------------------ +import com.sun.jersey.api.client.Client; +import com.sun.jersey.api.client.ClientHandlerException; +import com.sun.jersey.api.client.ClientRequest; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.WebResource; +import com.sun.jersey.api.client.filter.ClientFilter; import com.sun.jersey.core.util.MultivaluedMapImpl; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import javax.ws.rs.core.MultivaluedMap; +import javax.ws.rs.core.NewCookie; /** * @@ -100,7 +106,7 @@ public class JerseyClientProvider implements ScmClientProvider */ @Override public JerseyClientSession createSession(String url, String username, - String password) + String password) { AssertUtil.assertIsNotEmpty(url); @@ -111,59 +117,24 @@ public class JerseyClientProvider implements ScmClientProvider user = username; } - if (logger.isInfoEnabled()) - { - logger.info("create new session for {} with username {}", url, user); - } + logger.info("create new session for {} with username {}", url, user); UrlProvider urlProvider = UrlProviderFactory.createUrlProvider(url, UrlProviderFactory.TYPE_RESTAPI_XML); - DefaultAhcConfig config = new DefaultAhcConfig(); - AhcHttpClient client = AhcHttpClient.create(config); - ClientResponse response = null; + + Client client = Client.create(); + + client.addFilter(new CookieClientFilter()); + + ClientResponse response; if (Util.isNotEmpty(username) && Util.isNotEmpty(password)) { - String authUrl = urlProvider.getAuthenticationUrl(); - - if (logger.isDebugEnabled()) - { - logger.debug("try login at {}", authUrl); - } - - WebResource resource = ClientUtil.createResource(client, authUrl, - enableLogging); - - if (logger.isDebugEnabled()) - { - logger.debug("try login for {}", username); - } - - MultivaluedMap formData = new MultivaluedMapImpl(); - - formData.add("username", username); - formData.add("password", password); - response = resource.type("application/x-www-form-urlencoded").post( - ClientResponse.class, formData); + response = login(urlProvider, client, username, password); } else { - String stateUrl = urlProvider.getStateUrl(); - - if (logger.isDebugEnabled()) - { - logger.debug("retrive state from {}", stateUrl); - } - - WebResource resource = ClientUtil.createResource(client, stateUrl, - enableLogging); - - if (logger.isDebugEnabled()) - { - logger.debug("try anonymous login"); - } - - response = resource.get(ClientResponse.class); + response = state(urlProvider, client); } ClientUtil.checkResponse(response); @@ -172,10 +143,7 @@ public class JerseyClientProvider implements ScmClientProvider if (!state.isSuccess()) { - if (logger.isWarnEnabled()) - { - logger.warn("server returned state failed"); - } + logger.warn("server returned state failed"); throw new ScmClientException("create ScmClientSession failed"); } @@ -187,6 +155,122 @@ public class JerseyClientProvider implements ScmClientProvider return new JerseyClientSession(client, urlProvider, state); } + /** + * Method description + * + * + * @param urlProvider + * @param client + * @param username + * @param password + * + * @return + */ + private ClientResponse login(UrlProvider urlProvider, Client client, + String username, String password) + { + String authUrl = urlProvider.getAuthenticationUrl(); + + if (logger.isDebugEnabled()) + { + logger.debug("try login at {}", authUrl); + } + + WebResource resource = ClientUtil.createResource(client, authUrl, + enableLogging); + + if (logger.isDebugEnabled()) + { + logger.debug("try login for {}", username); + } + + MultivaluedMap formData = new MultivaluedMapImpl(); + + formData.add("username", username); + formData.add("password", password); + + return resource.type("application/x-www-form-urlencoded").post( + ClientResponse.class, formData); + } + + /** + * Method description + * + * + * @param urlProvider + * @param client + * + * @return + */ + private ClientResponse state(UrlProvider urlProvider, Client client) + { + String stateUrl = urlProvider.getStateUrl(); + + if (logger.isDebugEnabled()) + { + logger.debug("retrive state from {}", stateUrl); + } + + WebResource resource = ClientUtil.createResource(client, stateUrl, + enableLogging); + + if (logger.isDebugEnabled()) + { + logger.debug("try anonymous login"); + } + + return resource.get(ClientResponse.class); + } + + //~--- inner classes -------------------------------------------------------- + + /** + * Class description + * + * + * @version Enter version here..., 14/07/05 + * @author Enter your name here... + */ + private class CookieClientFilter extends ClientFilter + { + + /** + * Method description + * + * + * @param request + * + * @return + * + * @throws ClientHandlerException + */ + @Override + public ClientResponse handle(ClientRequest request) + throws ClientHandlerException + { + for (NewCookie c : cookies) + { + request.getHeaders().putSingle("Cookie", c); + } + + ClientResponse response = getNext().handle(request); + + if (response.getCookies() != null) + { + cookies.addAll(response.getCookies()); + } + + return response; + } + + //~--- fields ------------------------------------------------------------- + + /** Field description */ + private final List cookies = + Collections.synchronizedList(new ArrayList()); + } + + //~--- fields --------------------------------------------------------------- /** Field description */ From 290f0151e3b587b5b1f3bbb8161302e884e7eb52 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sun, 13 Jul 2014 17:10:45 +0200 Subject: [PATCH 24/36] added mdc logging variables username, client_ip and client_host --- .../main/java/sonia/scm/ScmServletModule.java | 4 + .../main/java/sonia/scm/filter/MDCFilter.java | 131 ++++++++++++++++++ 2 files changed, 135 insertions(+) create mode 100644 scm-webapp/src/main/java/sonia/scm/filter/MDCFilter.java diff --git a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java index 0f7fbbf822..1a11d56e6e 100644 --- a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java +++ b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java @@ -55,6 +55,7 @@ import sonia.scm.event.ScmEventBus; import sonia.scm.filter.AdminSecurityFilter; import sonia.scm.filter.BaseUrlFilter; import sonia.scm.filter.GZipFilter; +import sonia.scm.filter.MDCFilter; import sonia.scm.filter.SecurityFilter; import sonia.scm.group.DefaultGroupManager; import sonia.scm.group.GroupDAO; @@ -360,6 +361,9 @@ public class ScmServletModule extends ServletModule filter(PATTERN_RESTAPI, PATTERN_DEBUG).through(SecurityFilter.class); filter(PATTERN_CONFIG, PATTERN_ADMIN).through(AdminSecurityFilter.class); + // added mdcs for logging + filter(PATTERN_ALL).through(MDCFilter.class); + // debug servlet serve(PATTERN_DEBUG).with(DebugServlet.class); diff --git a/scm-webapp/src/main/java/sonia/scm/filter/MDCFilter.java b/scm-webapp/src/main/java/sonia/scm/filter/MDCFilter.java new file mode 100644 index 0000000000..6630543bc3 --- /dev/null +++ b/scm-webapp/src/main/java/sonia/scm/filter/MDCFilter.java @@ -0,0 +1,131 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. 2. Redistributions in + * binary form must reproduce the above copyright notice, this list of + * conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. 3. Neither the name of SCM-Manager; + * nor the names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + + +package sonia.scm.filter; + +//~--- non-JDK imports -------------------------------------------------------- + +import com.google.inject.Singleton; + +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.subject.Subject; + +import org.slf4j.MDC; + +import sonia.scm.SCMContext; +import sonia.scm.web.filter.HttpFilter; + +//~--- JDK imports ------------------------------------------------------------ + +import java.io.IOException; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * + * @author Sebastian Sdorra + */ +@Singleton +public class MDCFilter extends HttpFilter +{ + + /** Field description */ + private static final String MDC_CLIEN_HOST = "client_host"; + + /** Field description */ + private static final String MDC_CLIEN_IP = "client_ip"; + + /** Field description */ + private static final String MDC_USERNAME = "username"; + + //~--- methods -------------------------------------------------------------- + + /** + * Method description + * + * + * @param request + * @param response + * @param chain + * + * @throws IOException + * @throws ServletException + */ + @Override + protected void doFilter(HttpServletRequest request, + HttpServletResponse response, FilterChain chain) + throws IOException, ServletException + { + MDC.put(MDC_USERNAME, getUsername()); + MDC.put(MDC_CLIEN_IP, request.getRemoteAddr()); + MDC.put(MDC_CLIEN_HOST, request.getRemoteHost()); + + try + { + chain.doFilter(request, response); + } + finally + { + MDC.remove(MDC_USERNAME); + MDC.remove(MDC_CLIEN_IP); + MDC.remove(MDC_CLIEN_HOST); + } + } + + //~--- get methods ---------------------------------------------------------- + + /** + * Method description + * + * + * @return + */ + private String getUsername() + { + Subject subject = SecurityUtils.getSubject(); + String username; + Object principal = subject.getPrincipal(); + + if (principal == null) + { + username = SCMContext.USER_ANONYMOUS; + } + else + { + username = principal.toString(); + } + + return username; + } +} From 020370982111dcfcfd6aebed1604ea340e8fa238 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sun, 20 Jul 2014 12:15:17 +0200 Subject: [PATCH 25/36] added advanced configuration file to allow credentials for maven repositories --- .../plugin/AdvancedPluginConfiguration.java | 164 ++++++++++++++++++ .../main/java/sonia/scm/plugin/Aether.java | 2 + .../plugin/AetherAuthenticationSelector.java | 116 +++++++++++++ .../sonia/scm/plugin/AetherPluginHandler.java | 7 +- .../scm/plugin/DefaultPluginManager.java | 32 +++- 5 files changed, 311 insertions(+), 10 deletions(-) create mode 100644 scm-webapp/src/main/java/sonia/scm/plugin/AdvancedPluginConfiguration.java create mode 100644 scm-webapp/src/main/java/sonia/scm/plugin/AetherAuthenticationSelector.java diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/AdvancedPluginConfiguration.java b/scm-webapp/src/main/java/sonia/scm/plugin/AdvancedPluginConfiguration.java new file mode 100644 index 0000000000..2421432655 --- /dev/null +++ b/scm-webapp/src/main/java/sonia/scm/plugin/AdvancedPluginConfiguration.java @@ -0,0 +1,164 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. 2. Redistributions in + * binary form must reproduce the above copyright notice, this list of + * conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. 3. Neither the name of SCM-Manager; + * nor the names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + + +package sonia.scm.plugin; + +//~--- non-JDK imports -------------------------------------------------------- + +import com.google.common.collect.ImmutableSet; +import com.sun.xml.txw2.annotation.XmlCDATA; + +//~--- JDK imports ------------------------------------------------------------ + +import java.util.Set; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import sonia.scm.xml.XmlCipherStringAdapter; + +/** + * + * @author Sebastian Sdorra + * @since 1.41 + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlRootElement(name = "advanced-configuration") +public class AdvancedPluginConfiguration +{ + + /** + * Method description + * + * + * @return + */ + public Set getRepositories() + { + if (repositories == null) + { + repositories = ImmutableSet.of(); + } + + return repositories; + } + + /** + * Method description + * + * + * @return + */ + public Set getServers() + { + if (servers == null) + { + servers = ImmutableSet.of(); + } + + return servers; + } + + //~--- inner classes -------------------------------------------------------- + + /** + * Class description + * + * + * @version Enter version here..., 14/07/20 + * @author Enter your name here... + */ + @XmlAccessorType(XmlAccessType.FIELD) + public static class Server + { + + /** + * Method description + * + * + * @return + */ + public String getId() + { + return id; + } + + /** + * Method description + * + * + * @return + */ + public String getPassword() + { + return password; + } + + /** + * Method description + * + * + * @return + */ + public String getUsername() + { + return username; + } + + //~--- fields ------------------------------------------------------------- + + /** Field description */ + private String id; + + /** Field description */ + @XmlJavaTypeAdapter(XmlCipherStringAdapter.class) + private String password; + + /** Field description */ + private String username; + } + + + //~--- fields --------------------------------------------------------------- + + /** Field description */ + @XmlElement(name = "repository") + @XmlElementWrapper(name = "repositories") + private Set repositories; + + /** Field description */ + @XmlElement(name = "server") + @XmlElementWrapper(name = "servers") + private Set servers; +} diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/Aether.java b/scm-webapp/src/main/java/sonia/scm/plugin/Aether.java index 6a27d5758f..4cbd33185f 100644 --- a/scm-webapp/src/main/java/sonia/scm/plugin/Aether.java +++ b/scm-webapp/src/main/java/sonia/scm/plugin/Aether.java @@ -48,6 +48,8 @@ import org.sonatype.aether.collection.DependencyGraphTransformer; import org.sonatype.aether.graph.Dependency; import org.sonatype.aether.graph.DependencyFilter; import org.sonatype.aether.graph.DependencyNode; +import org.sonatype.aether.repository.Authentication; +import org.sonatype.aether.repository.AuthenticationSelector; import org.sonatype.aether.repository.LocalRepository; import org.sonatype.aether.repository.LocalRepositoryManager; import org.sonatype.aether.repository.Proxy; diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/AetherAuthenticationSelector.java b/scm-webapp/src/main/java/sonia/scm/plugin/AetherAuthenticationSelector.java new file mode 100644 index 0000000000..9bc1bdb892 --- /dev/null +++ b/scm-webapp/src/main/java/sonia/scm/plugin/AetherAuthenticationSelector.java @@ -0,0 +1,116 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. 2. Redistributions in + * binary form must reproduce the above copyright notice, this list of + * conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. 3. Neither the name of SCM-Manager; + * nor the names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + + +package sonia.scm.plugin; + +//~--- non-JDK imports -------------------------------------------------------- + +import com.google.common.base.Strings; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMap.Builder; + +import org.sonatype.aether.repository.Authentication; +import org.sonatype.aether.repository.AuthenticationSelector; +import org.sonatype.aether.repository.RemoteRepository; + +import sonia.scm.plugin.AdvancedPluginConfiguration.Server; + +//~--- JDK imports ------------------------------------------------------------ + +import java.util.Map; + +/** + * + * @author Sebastian Sdorra + * @since 1.41 + */ +public class AetherAuthenticationSelector implements AuthenticationSelector +{ + + /** + * Constructs ... + * + * + * @param configuration + */ + public AetherAuthenticationSelector(AdvancedPluginConfiguration configuration) + { + Builder builder = ImmutableMap.builder(); + + for (Server server : configuration.getServers()) + { + builder.put(server.getId(), server); + } + + servers = builder.build(); + } + + /** + * Constructs ... + * + * + * @param servers + */ + public AetherAuthenticationSelector(Map servers) + { + this.servers = servers; + } + + //~--- get methods ---------------------------------------------------------- + + /** + * Method description + * + * + * @param repository + * + * @return + */ + @Override + public Authentication getAuthentication(RemoteRepository repository) + { + Authentication authentication = null; + Server server = servers.get(Strings.nullToEmpty(repository.getId())); + + if (server != null) + { + authentication = new Authentication(server.getUsername(), + server.getPassword()); + } + + return authentication; + } + + //~--- fields --------------------------------------------------------------- + + /** Field description */ + private final Map servers; +} diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/AetherPluginHandler.java b/scm-webapp/src/main/java/sonia/scm/plugin/AetherPluginHandler.java index 7de5397a23..37c4c6235e 100644 --- a/scm-webapp/src/main/java/sonia/scm/plugin/AetherPluginHandler.java +++ b/scm-webapp/src/main/java/sonia/scm/plugin/AetherPluginHandler.java @@ -82,6 +82,8 @@ public class AetherPluginHandler //~--- constructors --------------------------------------------------------- + private final AdvancedPluginConfiguration advancedPluginConfiguration; + /** * Constructs ... * @@ -92,10 +94,11 @@ public class AetherPluginHandler * @param configuration */ public AetherPluginHandler(PluginManager pluginManager, - SCMContextProvider context, ScmConfiguration configuration) + SCMContextProvider context, ScmConfiguration configuration, AdvancedPluginConfiguration advancedPluginConfiguration) { this.pluginManager = pluginManager; this.configuration = configuration; + this.advancedPluginConfiguration = advancedPluginConfiguration; localRepositoryDirectory = new File(context.getBaseDirectory(), BootstrapListener.PLUGIN_DIRECTORY); @@ -124,7 +127,7 @@ public class AetherPluginHandler logger.error("could not read classpath file", ex); } } - + IOUtil.mkdirs(localRepositoryDirectory); repositorySystem = Aether.createRepositorySystem(); localRepository = new LocalRepository(localRepositoryDirectory); diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java index 4e75d5b84d..85c7eeef4e 100644 --- a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java +++ b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java @@ -35,6 +35,8 @@ package sonia.scm.plugin; //~--- non-JDK imports -------------------------------------------------------- +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet.Builder; import com.google.common.collect.Sets; import com.google.common.io.Files; import com.google.inject.Inject; @@ -104,17 +106,15 @@ public class DefaultPluginManager public static final PluginFilter FILTER_UPDATES = new StatePluginFilter(PluginState.UPDATE_AVAILABLE); + + private static final String ADVANCED_CONFIGURATION = "advanced-configuration.xml"; + //~--- constructors --------------------------------------------------------- /** * Constructs ... * - * - * - * - * * @param context - * @param securityContextProvicer * @param configuration * @param pluginLoader * @param cacheManager @@ -151,9 +151,21 @@ public class DefaultPluginManager { throw new ConfigurationException(ex); } + + File file = new File(context.getBaseDirectory(), ADVANCED_CONFIGURATION); + if (file.exists()) + { + advancedPluginConfiguration = JAXB.unmarshal(file, AdvancedPluginConfiguration.class); + } else { + advancedPluginConfiguration = new AdvancedPluginConfiguration(); + } this.configuration.addListener(this); } + + + private final AdvancedPluginConfiguration advancedPluginConfiguration; + //~--- methods -------------------------------------------------------------- @@ -246,7 +258,7 @@ public class DefaultPluginManager } AetherPluginHandler aph = new AetherPluginHandler(this, context, - configuration); + configuration, advancedPluginConfiguration); Collection repositories = Sets.newHashSet(new PluginRepository("package-repository", "file://".concat(tempDirectory.getAbsolutePath()))); @@ -638,10 +650,14 @@ public class DefaultPluginManager if (pluginHandler == null) { pluginHandler = new AetherPluginHandler(this, - SCMContext.getContext(), configuration); + SCMContext.getContext(), configuration, advancedPluginConfiguration); } + + Builder builder = ImmutableSet.builder(); + builder.addAll(advancedPluginConfiguration.getRepositories()); + builder.addAll(center.getRepositories()); - pluginHandler.setPluginRepositories(center.getRepositories()); + pluginHandler.setPluginRepositories(builder.build()); } catch (Exception ex) { From 1db4359cb9ab6664f193c8f6a4ef55dea2e3f1b4 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sun, 20 Jul 2014 13:48:06 +0200 Subject: [PATCH 26/36] added cli sub command to encrypt passwords --- .../sonia/scm/cli/cmd/EncryptSubCommand.java | 98 +++++++++++++++++++ .../services/sonia.scm.cli.cmd.SubCommand | 3 + .../resources/sonia/resources/i18n.properties | 7 +- .../sonia/scm/client/ScmClientSession.java | 8 ++ .../scm/client/SecurityClientHandler.java | 51 ++++++++++ .../sonia/scm/client/JerseyClientSession.java | 14 ++- .../client/JerseySecurityClientHandler.java | 75 ++++++++++++++ .../scm/url/RestSecurityUrlProvider.java | 80 +++++++++++++++ .../java/sonia/scm/url/RestUrlProvider.java | 12 +++ .../sonia/scm/url/SecurityUrlProvider.java | 49 ++++++++++ .../main/java/sonia/scm/url/UrlProvider.java | 10 ++ .../java/sonia/scm/url/WUIUrlProvider.java | 13 +++ .../api/rest/resources/CipherResource.java | 80 +++++++++++++++ 13 files changed, 498 insertions(+), 2 deletions(-) create mode 100644 scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/EncryptSubCommand.java create mode 100644 scm-clients/scm-client-api/src/main/java/sonia/scm/client/SecurityClientHandler.java create mode 100644 scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseySecurityClientHandler.java create mode 100644 scm-core/src/main/java/sonia/scm/url/RestSecurityUrlProvider.java create mode 100644 scm-core/src/main/java/sonia/scm/url/SecurityUrlProvider.java create mode 100644 scm-webapp/src/main/java/sonia/scm/api/rest/resources/CipherResource.java diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/EncryptSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/EncryptSubCommand.java new file mode 100644 index 0000000000..af76698062 --- /dev/null +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/EncryptSubCommand.java @@ -0,0 +1,98 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. 2. Redistributions in + * binary form must reproduce the above copyright notice, this list of + * conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. 3. Neither the name of SCM-Manager; + * nor the names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + + +package sonia.scm.cli.cmd; + +//~--- non-JDK imports -------------------------------------------------------- + +import org.kohsuke.args4j.Argument; + +/** + * + * @author Sebastian Sdorra + * @since 1.41 + */ +@Command( + name = "encrypt", + usage = "usageEncrypt", + group = "security" +) +public class EncryptSubCommand extends SubCommand +{ + + /** + * Method description + * + * + * @return + */ + public String getValue() + { + return value; + } + + //~--- set methods ---------------------------------------------------------- + + /** + * Method description + * + * + * @param value + */ + public void setValue(String value) + { + this.value = value; + } + + //~--- methods -------------------------------------------------------------- + + /** + * Method description + * + */ + @Override + protected void run() + { + String enc = createSession().getSecurityHandler().encrypt(value); + + output.println(enc); + } + + //~--- fields --------------------------------------------------------------- + + /** Field description */ + @Argument( + usage = "optionEncryptValue", + metaVar = "value", + required = true + ) + private String value; +} diff --git a/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.cmd.SubCommand b/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.cmd.SubCommand index 73e50f8940..e0d5d85e33 100644 --- a/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.cmd.SubCommand +++ b/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.cmd.SubCommand @@ -60,6 +60,9 @@ sonia.scm.cli.cmd.ModifyGroupSubCommand sonia.scm.cli.cmd.AddMembersSubCommand sonia.scm.cli.cmd.DeleteMembersSubCommand +# security +sonia.scm.cli.cmd.EncryptSubCommand + # misc sonia.scm.cli.cmd.VersionSubCommand sonia.scm.cli.cmd.ServerVersionSubCommand diff --git a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties index d5c707f090..ce0fde03e9 100644 --- a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties +++ b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties @@ -68,6 +68,8 @@ optionGroupDescription = Description optionGroupType = Type optionGroupMember = Member +optionEncryptValue = value to encrypt + repositoryNotFound = The repository is not available userNotFound = The user could not be found groupNotFoun = The group could not be found @@ -85,6 +87,7 @@ misc = Miscellaneous repository = Repository group = Group user = User +security = Security level = Logging-Level boolean = true or false @@ -114,4 +117,6 @@ usageModifyUser = Modify a user usageModifyRepository = Modify a repository usageStoreConfig = Stores the current configuration usageVersion = Show the version of scm-cli-client -usageServerVersion = Show the version of the scm-manager \ No newline at end of file +usageServerVersion = Show the version of the scm-manager + +usageEncrypt = Encrypts the given value \ No newline at end of file diff --git a/scm-clients/scm-client-api/src/main/java/sonia/scm/client/ScmClientSession.java b/scm-clients/scm-client-api/src/main/java/sonia/scm/client/ScmClientSession.java index 7e39258390..7f58a94852 100644 --- a/scm-clients/scm-client-api/src/main/java/sonia/scm/client/ScmClientSession.java +++ b/scm-clients/scm-client-api/src/main/java/sonia/scm/client/ScmClientSession.java @@ -73,6 +73,14 @@ public interface ScmClientSession extends Closeable */ public RepositoryClientHandler getRepositoryHandler(); + /** + * Method description + * + * + * @return + */ + public SecurityClientHandler getSecurityHandler(); + /** * Method description * diff --git a/scm-clients/scm-client-api/src/main/java/sonia/scm/client/SecurityClientHandler.java b/scm-clients/scm-client-api/src/main/java/sonia/scm/client/SecurityClientHandler.java new file mode 100644 index 0000000000..01d6305cb3 --- /dev/null +++ b/scm-clients/scm-client-api/src/main/java/sonia/scm/client/SecurityClientHandler.java @@ -0,0 +1,51 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. 2. Redistributions in + * binary form must reproduce the above copyright notice, this list of + * conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. 3. Neither the name of SCM-Manager; + * nor the names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + + +package sonia.scm.client; + +/** + * + * @author Sebastian Sdorra + * @since 1.41 + */ +public interface SecurityClientHandler +{ + + /** + * Method description + * + * + * @param value + * + * @return + */ + public String encrypt(String value); +} diff --git a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientSession.java b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientSession.java index 7e662bc938..46eeb7d222 100644 --- a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientSession.java +++ b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientSession.java @@ -67,7 +67,7 @@ public class JerseyClientSession implements ScmClientSession * @param state */ public JerseyClientSession(Client client, UrlProvider urlProvider, - ScmState state) + ScmState state) { this.client = client; this.urlProvider = urlProvider; @@ -129,6 +129,18 @@ public class JerseyClientSession implements ScmClientSession return new JerseyRepositoryClientHandler(this); } + /** + * Method description + * + * + * @return + */ + @Override + public SecurityClientHandler getSecurityHandler() + { + return new JerseySecurityClientHandler(this); + } + /** * Method description * diff --git a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseySecurityClientHandler.java b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseySecurityClientHandler.java new file mode 100644 index 0000000000..31d3728184 --- /dev/null +++ b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseySecurityClientHandler.java @@ -0,0 +1,75 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. 2. Redistributions in + * binary form must reproduce the above copyright notice, this list of + * conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. 3. Neither the name of SCM-Manager; + * nor the names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + + +package sonia.scm.client; + +/** + * + * @author Sebastian Sdorra + */ +public class JerseySecurityClientHandler implements SecurityClientHandler +{ + + /** + * Constructs ... + * + * + * @param session + */ + JerseySecurityClientHandler(JerseyClientSession session) + { + this.session = session; + } + + //~--- methods -------------------------------------------------------------- + + /** + * Method description + * + * + * @param value + * + * @return + */ + @Override + public String encrypt(String value) + { + String url = + session.getUrlProvider().getSecurityUrlProvider().getEncryptUrl(); + + return session.getClient().resource(url).post(String.class, value); + } + + //~--- fields --------------------------------------------------------------- + + /** Field description */ + private final JerseyClientSession session; +} diff --git a/scm-core/src/main/java/sonia/scm/url/RestSecurityUrlProvider.java b/scm-core/src/main/java/sonia/scm/url/RestSecurityUrlProvider.java new file mode 100644 index 0000000000..08bb2aff43 --- /dev/null +++ b/scm-core/src/main/java/sonia/scm/url/RestSecurityUrlProvider.java @@ -0,0 +1,80 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. 2. Redistributions in + * binary form must reproduce the above copyright notice, this list of + * conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. 3. Neither the name of SCM-Manager; + * nor the names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + + +package sonia.scm.url; + +//~--- non-JDK imports -------------------------------------------------------- + +import sonia.scm.util.HttpUtil; + +/** + * + * @author Sebastian Sdorra + * @since 1.41 + */ +public class RestSecurityUrlProvider implements SecurityUrlProvider +{ + + /** Field description */ + private static final String PATH_ENCRYPT = "security/cipher/encrypt"; + + //~--- constructors --------------------------------------------------------- + + /** + * Constructs ... + * + * + * @param baseUrl + */ + public RestSecurityUrlProvider(String baseUrl) + { + this.baseUrl = baseUrl; + } + + //~--- get methods ---------------------------------------------------------- + + /** + * Method description + * + * + * @return + */ + @Override + public String getEncryptUrl() + { + return HttpUtil.append(baseUrl, PATH_ENCRYPT); + } + + //~--- fields --------------------------------------------------------------- + + /** Field description */ + private final String baseUrl; +} diff --git a/scm-core/src/main/java/sonia/scm/url/RestUrlProvider.java b/scm-core/src/main/java/sonia/scm/url/RestUrlProvider.java index 1d60f2a91b..cb0b3de82d 100644 --- a/scm-core/src/main/java/sonia/scm/url/RestUrlProvider.java +++ b/scm-core/src/main/java/sonia/scm/url/RestUrlProvider.java @@ -130,6 +130,18 @@ public class RestUrlProvider implements UrlProvider return new RestRepositoryUrlProvider(baseUrl, PART_REPOSITORIES, extension); } + /** + * Method description + * + * + * @return + */ + @Override + public SecurityUrlProvider getSecurityUrlProvider() + { + return new RestSecurityUrlProvider(baseUrl); + } + /** * Method description * diff --git a/scm-core/src/main/java/sonia/scm/url/SecurityUrlProvider.java b/scm-core/src/main/java/sonia/scm/url/SecurityUrlProvider.java new file mode 100644 index 0000000000..69212ebd2d --- /dev/null +++ b/scm-core/src/main/java/sonia/scm/url/SecurityUrlProvider.java @@ -0,0 +1,49 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. 2. Redistributions in + * binary form must reproduce the above copyright notice, this list of + * conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. 3. Neither the name of SCM-Manager; + * nor the names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + + +package sonia.scm.url; + +/** + * + * @author Sebastian Sdorra + * @since 1.41 + */ +public interface SecurityUrlProvider +{ + + /** + * Method description + * + * + * @return + */ + public String getEncryptUrl(); +} diff --git a/scm-core/src/main/java/sonia/scm/url/UrlProvider.java b/scm-core/src/main/java/sonia/scm/url/UrlProvider.java index 694ea1b698..e6c3e4911a 100644 --- a/scm-core/src/main/java/sonia/scm/url/UrlProvider.java +++ b/scm-core/src/main/java/sonia/scm/url/UrlProvider.java @@ -72,6 +72,16 @@ public interface UrlProvider */ public RepositoryUrlProvider getRepositoryUrlProvider(); + /** + * Method description + * + * + * @return + * + * @since 1.41 + */ + public SecurityUrlProvider getSecurityUrlProvider(); + /** * Method description * diff --git a/scm-core/src/main/java/sonia/scm/url/WUIUrlProvider.java b/scm-core/src/main/java/sonia/scm/url/WUIUrlProvider.java index 0c92fcb406..e6a8388e0d 100644 --- a/scm-core/src/main/java/sonia/scm/url/WUIUrlProvider.java +++ b/scm-core/src/main/java/sonia/scm/url/WUIUrlProvider.java @@ -124,6 +124,19 @@ public class WUIUrlProvider implements UrlProvider return new WUIRepositoryUrlProvider(baseUrl, COMPONENT_REPOSITORY); } + /** + * Method description + * + * + * @return + */ + @Override + public SecurityUrlProvider getSecurityUrlProvider() + { + throw new UnsupportedOperationException( + "this provider does not support security url provider."); + } + /** * Returns the baseUrl, because there is no state url. * diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/CipherResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/CipherResource.java new file mode 100644 index 0000000000..d72c9ea6aa --- /dev/null +++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/CipherResource.java @@ -0,0 +1,80 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. 2. Redistributions in + * binary form must reproduce the above copyright notice, this list of + * conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. 3. Neither the name of SCM-Manager; + * nor the names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + + +package sonia.scm.api.rest.resources; + +//~--- non-JDK imports -------------------------------------------------------- + +import com.google.common.base.Preconditions; +import com.google.common.base.Strings; + +import org.apache.shiro.SecurityUtils; + +import sonia.scm.security.CipherUtil; +import sonia.scm.security.Role; + +//~--- JDK imports ------------------------------------------------------------ + +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; + +/** + * + * @author Sebastian Sdorra + * @since 1.41 + */ +@Path("security/cipher") +public class CipherResource +{ + + /** + * Method description + * + * + * @param value + * + * @return + */ + @POST + @Path("encrypt") + @Produces(MediaType.TEXT_PLAIN) + public String encrypt(String value) + { + SecurityUtils.getSubject().checkRole(Role.ADMIN); + + Preconditions.checkArgument(!Strings.isNullOrEmpty(value), + "value is required"); + + return CipherUtil.getInstance().encode(value); + } +} From 8d4a1419cf1443a36b621ba96927dc6f7415a90f Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sun, 20 Jul 2014 13:48:58 +0200 Subject: [PATCH 27/36] remove unused import --- .../java/sonia/scm/plugin/AdvancedPluginConfiguration.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/AdvancedPluginConfiguration.java b/scm-webapp/src/main/java/sonia/scm/plugin/AdvancedPluginConfiguration.java index 2421432655..88cde5e14c 100644 --- a/scm-webapp/src/main/java/sonia/scm/plugin/AdvancedPluginConfiguration.java +++ b/scm-webapp/src/main/java/sonia/scm/plugin/AdvancedPluginConfiguration.java @@ -34,7 +34,8 @@ package sonia.scm.plugin; //~--- non-JDK imports -------------------------------------------------------- import com.google.common.collect.ImmutableSet; -import com.sun.xml.txw2.annotation.XmlCDATA; + +import sonia.scm.xml.XmlCipherStringAdapter; //~--- JDK imports ------------------------------------------------------------ @@ -46,7 +47,6 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import sonia.scm.xml.XmlCipherStringAdapter; /** * @@ -97,7 +97,7 @@ public class AdvancedPluginConfiguration * * * @version Enter version here..., 14/07/20 - * @author Enter your name here... + * @author Enter your name here... */ @XmlAccessorType(XmlAccessType.FIELD) public static class Server From 15ac8740e622a2e758d36a8efcd8cd34ec66b25b Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sun, 20 Jul 2014 14:01:20 +0200 Subject: [PATCH 28/36] fix usage of AuthenticationSelector --- .../main/java/sonia/scm/plugin/Aether.java | 15 +++++---- .../scm/plugin/AetherDependencyResolver.java | 8 ++++- .../sonia/scm/plugin/AetherPluginHandler.java | 20 ++++++++---- .../scm/plugin/DefaultPluginManager.java | 32 ++++++++++++------- 4 files changed, 48 insertions(+), 27 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/Aether.java b/scm-webapp/src/main/java/sonia/scm/plugin/Aether.java index 4cbd33185f..0ad53e62c3 100644 --- a/scm-webapp/src/main/java/sonia/scm/plugin/Aether.java +++ b/scm-webapp/src/main/java/sonia/scm/plugin/Aether.java @@ -48,8 +48,6 @@ import org.sonatype.aether.collection.DependencyGraphTransformer; import org.sonatype.aether.graph.Dependency; import org.sonatype.aether.graph.DependencyFilter; import org.sonatype.aether.graph.DependencyNode; -import org.sonatype.aether.repository.Authentication; -import org.sonatype.aether.repository.AuthenticationSelector; import org.sonatype.aether.repository.LocalRepository; import org.sonatype.aether.repository.LocalRepositoryManager; import org.sonatype.aether.repository.Proxy; @@ -81,10 +79,8 @@ public final class Aether /** Field description */ private static final DependencyFilter FILTER = - new AndDependencyFilter( - new CoreDependencyFilter(), - new BlacklistDependencyFilter() - ); + new AndDependencyFilter(new CoreDependencyFilter(), + new BlacklistDependencyFilter()); /** * the logger for Aether @@ -176,12 +172,14 @@ public final class Aether * @param system * @param localRepository * @param configuration + * @param advancedPluginConfiguration * * @return */ public static RepositorySystemSession createRepositorySystemSession( RepositorySystem system, LocalRepository localRepository, - ScmConfiguration configuration) + ScmConfiguration configuration, + AdvancedPluginConfiguration advancedPluginConfiguration) { MavenRepositorySystemSession session = new MavenRepositorySystemSession(); @@ -197,6 +195,9 @@ public final class Aether system.newLocalRepositoryManager(localRepository); session.setLocalRepositoryManager(localRepositoryManager); + session.setAuthenticationSelector( + new AetherAuthenticationSelector(advancedPluginConfiguration) + ); // create graph transformer to resolve dependency conflicts //J- diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/AetherDependencyResolver.java b/scm-webapp/src/main/java/sonia/scm/plugin/AetherDependencyResolver.java index 67bf4e8a40..6505a8f5f2 100644 --- a/scm-webapp/src/main/java/sonia/scm/plugin/AetherDependencyResolver.java +++ b/scm-webapp/src/main/java/sonia/scm/plugin/AetherDependencyResolver.java @@ -77,15 +77,18 @@ public class AetherDependencyResolver * * * @param configuration + * @param advancedPluginConfiguration * @param system * @param localRepository * @param remoteRepositories */ public AetherDependencyResolver(ScmConfiguration configuration, + AdvancedPluginConfiguration advancedPluginConfiguration, RepositorySystem system, LocalRepository localRepository, List remoteRepositories) { this.configuration = configuration; + this.advancedPluginConfiguration = advancedPluginConfiguration; this.system = system; this.localRepository = localRepository; this.remoteRepositories = remoteRepositories; @@ -169,7 +172,7 @@ public class AetherDependencyResolver if (session == null) { session = Aether.createRepositorySystemSession(system, localRepository, - configuration); + configuration, advancedPluginConfiguration); } return session; @@ -177,6 +180,9 @@ public class AetherDependencyResolver //~--- fields --------------------------------------------------------------- + /** Field description */ + private final AdvancedPluginConfiguration advancedPluginConfiguration; + /** Field description */ private ScmConfiguration configuration; diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/AetherPluginHandler.java b/scm-webapp/src/main/java/sonia/scm/plugin/AetherPluginHandler.java index 37c4c6235e..b122463a24 100644 --- a/scm-webapp/src/main/java/sonia/scm/plugin/AetherPluginHandler.java +++ b/scm-webapp/src/main/java/sonia/scm/plugin/AetherPluginHandler.java @@ -82,8 +82,6 @@ public class AetherPluginHandler //~--- constructors --------------------------------------------------------- - private final AdvancedPluginConfiguration advancedPluginConfiguration; - /** * Constructs ... * @@ -92,9 +90,11 @@ public class AetherPluginHandler * @param pluginManager * @param context * @param configuration + * @param advancedPluginConfiguration */ public AetherPluginHandler(PluginManager pluginManager, - SCMContextProvider context, ScmConfiguration configuration, AdvancedPluginConfiguration advancedPluginConfiguration) + SCMContextProvider context, ScmConfiguration configuration, + AdvancedPluginConfiguration advancedPluginConfiguration) { this.pluginManager = pluginManager; this.configuration = configuration; @@ -127,7 +127,7 @@ public class AetherPluginHandler logger.error("could not read classpath file", ex); } } - + IOUtil.mkdirs(localRepositoryDirectory); repositorySystem = Aether.createRepositorySystem(); localRepository = new LocalRepository(localRepositoryDirectory); @@ -198,9 +198,12 @@ public class AetherPluginHandler { try { - AetherDependencyResolver resolver = - new AetherDependencyResolver(configuration, repositorySystem, - localRepository, remoteRepositories); + //J- + AetherDependencyResolver resolver = new AetherDependencyResolver( + configuration, advancedPluginConfiguration, repositorySystem, + localRepository, remoteRepositories + ); + //J+ resolver.resolveDependencies(dependency, localDependencies); @@ -340,6 +343,9 @@ public class AetherPluginHandler //~--- fields --------------------------------------------------------------- + /** Field description */ + private final AdvancedPluginConfiguration advancedPluginConfiguration; + /** Field description */ private Classpath classpath; diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java index 85c7eeef4e..98479f77ec 100644 --- a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java +++ b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java @@ -98,6 +98,10 @@ public class DefaultPluginManager /** Field description */ public static final String ENCODING = "UTF-8"; + /** Field description */ + private static final String ADVANCED_CONFIGURATION = + "advanced-configuration.xml"; + /** the logger for DefaultPluginManager */ private static final Logger logger = LoggerFactory.getLogger(DefaultPluginManager.class); @@ -106,9 +110,6 @@ public class DefaultPluginManager public static final PluginFilter FILTER_UPDATES = new StatePluginFilter(PluginState.UPDATE_AVAILABLE); - - private static final String ADVANCED_CONFIGURATION = "advanced-configuration.xml"; - //~--- constructors --------------------------------------------------------- /** @@ -151,21 +152,23 @@ public class DefaultPluginManager { throw new ConfigurationException(ex); } - + File file = new File(context.getBaseDirectory(), ADVANCED_CONFIGURATION); + if (file.exists()) { - advancedPluginConfiguration = JAXB.unmarshal(file, AdvancedPluginConfiguration.class); - } else { + logger.info("load advanced plugin configuration from {}", file); + advancedPluginConfiguration = JAXB.unmarshal(file, + AdvancedPluginConfiguration.class); + } + else + { + logger.debug("no advanced plugin configuration found"); advancedPluginConfiguration = new AdvancedPluginConfiguration(); } this.configuration.addListener(this); } - - - private final AdvancedPluginConfiguration advancedPluginConfiguration; - //~--- methods -------------------------------------------------------------- @@ -650,10 +653,12 @@ public class DefaultPluginManager if (pluginHandler == null) { pluginHandler = new AetherPluginHandler(this, - SCMContext.getContext(), configuration, advancedPluginConfiguration); + SCMContext.getContext(), configuration, + advancedPluginConfiguration); } - + Builder builder = ImmutableSet.builder(); + builder.addAll(advancedPluginConfiguration.getRepositories()); builder.addAll(center.getRepositories()); @@ -760,6 +765,9 @@ public class DefaultPluginManager //~--- fields --------------------------------------------------------------- + /** Field description */ + private final AdvancedPluginConfiguration advancedPluginConfiguration; + /** Field description */ private Cache cache; From 26746a2f77d377fd7cc6d9e9ef82291dd77eb7d2 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sun, 20 Jul 2014 14:22:36 +0200 Subject: [PATCH 29/36] added cli sub command to generate unique keys --- .../scm/cli/cmd/GenerateKeySubCommand.java | 55 +++++++++++ .../services/sonia.scm.cli.cmd.SubCommand | 1 + .../resources/sonia/resources/i18n.properties | 3 +- .../scm/client/SecurityClientHandler.java | 8 ++ .../client/JerseySecurityClientHandler.java | 15 +++ .../scm/url/RestSecurityUrlProvider.java | 15 +++ .../sonia/scm/url/SecurityUrlProvider.java | 10 ++ .../scm/api/rest/resources/KeyResource.java | 92 +++++++++++++++++++ 8 files changed, 198 insertions(+), 1 deletion(-) create mode 100644 scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GenerateKeySubCommand.java create mode 100644 scm-webapp/src/main/java/sonia/scm/api/rest/resources/KeyResource.java diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GenerateKeySubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GenerateKeySubCommand.java new file mode 100644 index 0000000000..b8658391b0 --- /dev/null +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GenerateKeySubCommand.java @@ -0,0 +1,55 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. 2. Redistributions in + * binary form must reproduce the above copyright notice, this list of + * conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. 3. Neither the name of SCM-Manager; + * nor the names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + + +package sonia.scm.cli.cmd; + +/** + * + * @author Sebastian Sdorra + */ +@Command( + name = "generate-key", + usage = "usageGenerateKey", + group = "security" +) +public class GenerateKeySubCommand extends SubCommand +{ + + /** + * Method description + * + */ + @Override + protected void run() + { + output.println(createSession().getSecurityHandler().generateKey()); + } +} diff --git a/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.cmd.SubCommand b/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.cmd.SubCommand index e0d5d85e33..b4d344adae 100644 --- a/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.cmd.SubCommand +++ b/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.cmd.SubCommand @@ -62,6 +62,7 @@ sonia.scm.cli.cmd.DeleteMembersSubCommand # security sonia.scm.cli.cmd.EncryptSubCommand +sonia.scm.cli.cmd.GenerateKeySubCommand # misc sonia.scm.cli.cmd.VersionSubCommand diff --git a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties index ce0fde03e9..69d88b2cfe 100644 --- a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties +++ b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/i18n.properties @@ -119,4 +119,5 @@ usageStoreConfig = Stores the current configuration usageVersion = Show the version of scm-cli-client usageServerVersion = Show the version of the scm-manager -usageEncrypt = Encrypts the given value \ No newline at end of file +usageEncrypt = Encrypts the given value +usageGenerateKey = Generates a unique key \ No newline at end of file diff --git a/scm-clients/scm-client-api/src/main/java/sonia/scm/client/SecurityClientHandler.java b/scm-clients/scm-client-api/src/main/java/sonia/scm/client/SecurityClientHandler.java index 01d6305cb3..a0131a7f1c 100644 --- a/scm-clients/scm-client-api/src/main/java/sonia/scm/client/SecurityClientHandler.java +++ b/scm-clients/scm-client-api/src/main/java/sonia/scm/client/SecurityClientHandler.java @@ -48,4 +48,12 @@ public interface SecurityClientHandler * @return */ public String encrypt(String value); + + /** + * Method description + * + * + * @return + */ + public String generateKey(); } diff --git a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseySecurityClientHandler.java b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseySecurityClientHandler.java index 31d3728184..5f24752078 100644 --- a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseySecurityClientHandler.java +++ b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseySecurityClientHandler.java @@ -68,6 +68,21 @@ public class JerseySecurityClientHandler implements SecurityClientHandler return session.getClient().resource(url).post(String.class, value); } + /** + * Method description + * + * + * @return + */ + @Override + public String generateKey() + { + String url = + session.getUrlProvider().getSecurityUrlProvider().getGenerateKeyUrl(); + + return session.getClient().resource(url).get(String.class); + } + //~--- fields --------------------------------------------------------------- /** Field description */ diff --git a/scm-core/src/main/java/sonia/scm/url/RestSecurityUrlProvider.java b/scm-core/src/main/java/sonia/scm/url/RestSecurityUrlProvider.java index 08bb2aff43..513f728708 100644 --- a/scm-core/src/main/java/sonia/scm/url/RestSecurityUrlProvider.java +++ b/scm-core/src/main/java/sonia/scm/url/RestSecurityUrlProvider.java @@ -46,6 +46,9 @@ public class RestSecurityUrlProvider implements SecurityUrlProvider /** Field description */ private static final String PATH_ENCRYPT = "security/cipher/encrypt"; + /** Field description */ + private static final String PATH_KEY = "security/key"; + //~--- constructors --------------------------------------------------------- /** @@ -73,6 +76,18 @@ public class RestSecurityUrlProvider implements SecurityUrlProvider return HttpUtil.append(baseUrl, PATH_ENCRYPT); } + /** + * Method description + * + * + * @return + */ + @Override + public String getGenerateKeyUrl() + { + return HttpUtil.append(baseUrl, PATH_KEY); + } + //~--- fields --------------------------------------------------------------- /** Field description */ diff --git a/scm-core/src/main/java/sonia/scm/url/SecurityUrlProvider.java b/scm-core/src/main/java/sonia/scm/url/SecurityUrlProvider.java index 69212ebd2d..e000c9b754 100644 --- a/scm-core/src/main/java/sonia/scm/url/SecurityUrlProvider.java +++ b/scm-core/src/main/java/sonia/scm/url/SecurityUrlProvider.java @@ -39,6 +39,16 @@ package sonia.scm.url; public interface SecurityUrlProvider { + /** + * Method description + * + * + * @return + */ + public String getGenerateKeyUrl(); + + //~--- get methods ---------------------------------------------------------- + /** * Method description * diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/KeyResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/KeyResource.java new file mode 100644 index 0000000000..91f2214cd2 --- /dev/null +++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/KeyResource.java @@ -0,0 +1,92 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. 2. Redistributions in + * binary form must reproduce the above copyright notice, this list of + * conditions and the following disclaimer in the documentation and/or other + * materials provided with the distribution. 3. Neither the name of SCM-Manager; + * nor the names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + + +package sonia.scm.api.rest.resources; + +//~--- non-JDK imports -------------------------------------------------------- + +import com.google.inject.Inject; + +import org.apache.shiro.SecurityUtils; + +import sonia.scm.security.KeyGenerator; +import sonia.scm.security.Role; + +//~--- JDK imports ------------------------------------------------------------ + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; + +/** + * + * @author Sebastian Sdorra + * @since 1.41 + */ +@Path("security/key") +public class KeyResource +{ + + /** + * Constructs ... + * + * + * @param keyGenerator + */ + @Inject + public KeyResource(KeyGenerator keyGenerator) + { + this.keyGenerator = keyGenerator; + } + + //~--- methods -------------------------------------------------------------- + + /** + * Method description + * + * + * @return + */ + @GET + @Produces(MediaType.TEXT_PLAIN) + public String generateKey() + { + SecurityUtils.getSubject().checkRole(Role.ADMIN); + + return keyGenerator.createKey(); + } + + //~--- fields --------------------------------------------------------------- + + /** Field description */ + private final KeyGenerator keyGenerator; +} From cd1a73ef619f0f40ea365e7e4d5c8741fd69425e Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sun, 20 Jul 2014 14:28:13 +0200 Subject: [PATCH 30/36] javadoc --- .../scm/api/rest/resources/CipherResource.java | 14 ++++++++++---- .../scm/api/rest/resources/KeyResource.java | 16 +++++++++++----- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/CipherResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/CipherResource.java index d72c9ea6aa..27de46ce03 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/CipherResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/CipherResource.java @@ -49,6 +49,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; /** + * Rest resource to encrypt values. * * @author Sebastian Sdorra * @since 1.41 @@ -58,12 +59,17 @@ public class CipherResource { /** - * Method description + * Encrypts the request body and returns an encrypted string. This method can + * only executed with administration privileges.
    + *
    + *
      + *
    • 200 success
      • + *
    • 500 internal server error
      • + *
    * + * @param value value to encrypt * - * @param value - * - * @return + * @return unique key */ @POST @Path("encrypt") diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/KeyResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/KeyResource.java index 91f2214cd2..619a8e9a2a 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/KeyResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/KeyResource.java @@ -48,6 +48,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; /** + * Rest resource to generate unique keys. * * @author Sebastian Sdorra * @since 1.41 @@ -57,10 +58,10 @@ public class KeyResource { /** - * Constructs ... + * Constructs a new KeyResource. * * - * @param keyGenerator + * @param keyGenerator key generator */ @Inject public KeyResource(KeyGenerator keyGenerator) @@ -71,10 +72,15 @@ public class KeyResource //~--- methods -------------------------------------------------------------- /** - * Method description + * Generates a unique key. This method can only executed with administration + * privileges.
    + *
    + *
      + *
    • 200 success
      • + *
    • 500 internal server error
      • + *
    * - * - * @return + * @return unique key */ @GET @Produces(MediaType.TEXT_PLAIN) From 1c7ad173597ec03499bfafb19f3aae3d315df219 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sun, 27 Jul 2014 16:42:50 +0200 Subject: [PATCH 31/36] update svnkit to version 1.8.5-scm2-SNAPSHOT --- pom.xml | 2 +- .../webapp/resources/js/repository/sonia.repository.grid.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 29a5b70efb..98b9e13eaa 100644 --- a/pom.xml +++ b/pom.xml @@ -440,7 +440,7 @@ 3.4.0.201406110918-r - 1.8.5-scm1 + 1.8.5-scm2-SNAPSHOT 15.0 diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.grid.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.grid.js index b22dd1a791..0003de58b0 100644 --- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.grid.js +++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.grid.js @@ -265,6 +265,7 @@ Sonia.repository.Grid = Ext.extend(Sonia.rest.Grid, { }, getTypeIcon: function(type){ + var result = ''; var icon = Sonia.repository.getTypeIcon(type); if ( icon ){ var displayName = type; From 43082fcfb66d0b1d36cc901fa2ab57cef4c339f3 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 29 Jul 2014 20:06:00 +0200 Subject: [PATCH 32/36] use final version 1.8.5-scm2 of svnkit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 98b9e13eaa..5de3ebcd21 100644 --- a/pom.xml +++ b/pom.xml @@ -440,7 +440,7 @@ 3.4.0.201406110918-r - 1.8.5-scm2-SNAPSHOT + 1.8.5-scm2 15.0 From 3efd1e39d547b917b8b13d0de44bd330144c8a2d Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 29 Jul 2014 20:06:35 +0200 Subject: [PATCH 33/36] close branch issue-606 From 675ee49a8d76fdcc81d0bf1112cbde3caa560b07 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 29 Jul 2014 22:09:38 +0200 Subject: [PATCH 34/36] update jgit to 3.4.1.201406201815-r --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5de3ebcd21..a3bd9a00b7 100644 --- a/pom.xml +++ b/pom.xml @@ -439,7 +439,7 @@ 1.2.3 - 3.4.0.201406110918-r + 3.4.1.201406201815-r 1.8.5-scm2 From 989a7595bd9240dcf67d76b5779d12739a00c747 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 12 Aug 2014 09:02:31 +0200 Subject: [PATCH 35/36] improve performance for simple subversion changeset paging --- .../scm/repository/spi/SvnLogCommand.java | 271 +++++++++++++----- 1 file changed, 201 insertions(+), 70 deletions(-) diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLogCommand.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLogCommand.java index df9fc9f76f..b17c507d5a 100644 --- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLogCommand.java +++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLogCommand.java @@ -41,6 +41,7 @@ import com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.tmatesoft.svn.core.ISVNLogEntryHandler; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.SVNLogEntry; import org.tmatesoft.svn.core.io.SVNRepository; @@ -114,21 +115,16 @@ public class SvnLogCommand extends AbstractSvnCommand implements LogCommand try { - long revisioNumber = Long.parseLong(revision); - SVNRepository repository = open(); - Collection entries = repository.log(null, null, - revisioNumber, revisioNumber, true, - true); + long revisioNumber = parseRevision(revision); + SVNRepository repo = open(); + Collection entries = repo.log(null, null, revisioNumber, + revisioNumber, true, true); if (Util.isNotEmpty(entries)) { changeset = SvnUtil.createChangeset(entries.iterator().next()); } } - catch (NumberFormatException ex) - { - throw new RepositoryException("could not convert revision", ex); - } catch (SVNException ex) { throw new RepositoryException("could not open repository", ex); @@ -158,75 +154,30 @@ public class SvnLogCommand extends AbstractSvnCommand implements LogCommand } ChangesetPagingResult changesets = null; - String startRevision = request.getStartChangeset(); - String endRevision = request.getEndChangeset(); + int start = request.getPagingStart(); + int limit = request.getPagingLimit(); + long startRevision = parseRevision(request.getStartChangeset()); + long endRevision = parseRevision(request.getEndChangeset()); + String[] pathArray = null; + + if (!Strings.isNullOrEmpty(request.getPath())) + { + pathArray = new String[] { request.getPath() }; + } try { - SVNRepository repository = open(); - long startRev = repository.getLatestRevision(); - long endRev = 0; - long maxRev = startRev; + SVNRepository repo = open(); - if (!Strings.isNullOrEmpty(startRevision)) + if ((startRevision > 0) || (pathArray != null)) { - startRev = Long.parseLong(startRevision); + changesets = getChangesets(repo, startRevision, endRevision, start, + limit, pathArray); } - - if (!Strings.isNullOrEmpty(endRevision)) + else { - endRev = Long.parseLong(endRevision); + changesets = getChangesets(repo, start, limit); } - - String[] pathArray = null; - - if (!Strings.isNullOrEmpty(request.getPath())) - { - pathArray = new String[] { request.getPath() }; - } - - List changesetList = Lists.newArrayList(); - Collection entries = repository.log(pathArray, null, - startRev, endRev, true, true); - - for (SVNLogEntry entry : entries) - { - if (entry.getRevision() <= maxRev) - { - changesetList.add(entry); - } - } - - int total = changesetList.size(); - int start = request.getPagingStart(); - int max = request.getPagingLimit() + start; - int end = total; - - if ((max > 0) && (end > max)) - { - end = max; - } - - if (start < 0) - { - start = 0; - } - - if (logger.isTraceEnabled()) - { - logger.trace( - "create sublist from {} to {} of total {} collected changesets", - start, end, total); - } - - changesetList = changesetList.subList(start, end); - changesets = new ChangesetPagingResult(total, - SvnUtil.createChangesets(changesetList)); - } - catch (NumberFormatException ex) - { - throw new RepositoryException( - "could not parse revision ".concat(startRevision), ex); } catch (SVNException ex) { @@ -235,4 +186,184 @@ public class SvnLogCommand extends AbstractSvnCommand implements LogCommand return changesets; } + + //~--- methods -------------------------------------------------------------- + + /** + * Method description + * + * + * @param v + * + * @return + * + * @throws RepositoryException + */ + private long parseRevision(String v) throws RepositoryException + { + long result = -1l; + + if (!Strings.isNullOrEmpty(v)) + { + try + { + result = Long.parseLong(v); + } + catch (NumberFormatException ex) + { + throw new RepositoryException( + String.format("could not convert revision %s", v), ex); + } + } + + return result; + } + + //~--- get methods ---------------------------------------------------------- + + /** + * Method description + * + * + * @param repo + * @param start + * @param limit + * + * @return + * + * @throws SVNException + */ + private ChangesetPagingResult getChangesets(SVNRepository repo, int start, + int limit) + throws SVNException + { + long latest = repo.getLatestRevision(); + long startRev = latest - start; + long endRev = Math.max(startRev - (limit - 1), 0); + + final List changesets = Lists.newArrayList(); + + if (startRev > 0) + { + logger.debug("fetch changeset from {} to {}", startRev, endRev); + repo.log(null, startRev, endRev, true, true, + new ChangesetCollector(changesets)); + } + + return new ChangesetPagingResult((int) (latest + 1l), changesets); + } + + /** + * Method description + * + * + * @param repo + * @param startRevision + * @param endRevision + * @param start + * @param limit + * @param path + * + * @return + * + * @throws SVNException + */ + private ChangesetPagingResult getChangesets(SVNRepository repo, + long startRevision, long endRevision, int start, int limit, String[] path) + throws SVNException + { + long startRev; + long endRev = Math.max(endRevision, 0); + long maxRev = repo.getLatestRevision(); + + if (startRevision >= 0l) + { + startRev = startRevision; + } + else + { + startRev = maxRev; + } + + List changesetList = Lists.newArrayList(); + + logger.debug("fetch changeset from {} to {} for path {}", startRev, endRev, + path); + + Collection entries = repo.log(path, null, startRev, endRev, + true, true); + + for (SVNLogEntry entry : entries) + { + if (entry.getRevision() <= maxRev) + { + changesetList.add(entry); + } + } + + int total = changesetList.size(); + int max = limit + start; + int end = total; + + if ((max > 0) && (end > max)) + { + end = max; + } + + if (start < 0) + { + start = 0; + } + + logger.trace( + "create sublist from {} to {} of total {} collected changesets", start, + end, total); + + changesetList = changesetList.subList(start, end); + + return new ChangesetPagingResult(total, + SvnUtil.createChangesets(changesetList)); + } + + //~--- inner classes -------------------------------------------------------- + + /** + * Collect and convert changesets. + * + */ + private static class ChangesetCollector implements ISVNLogEntryHandler + { + + /** + * Constructs ... + * + * + * @param changesets + */ + public ChangesetCollector(Collection changesets) + { + this.changesets = changesets; + } + + //~--- methods ------------------------------------------------------------ + + /** + * Method description + * + * + * @param logEntry + * + * @throws SVNException + */ + @Override + public void handleLogEntry(SVNLogEntry logEntry) throws SVNException + { + changesets.add(SvnUtil.createChangeset(logEntry)); + } + + //~--- fields ------------------------------------------------------------- + + /** Field description */ + private final Collection changesets; + } } From c3adfd49db06427791f24d046d44a34fc7e6859d Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Tue, 12 Aug 2014 20:05:30 +0200 Subject: [PATCH 36/36] close branch issue-610