From a9a7f62fff39e64904111e1650399245d1869f5d Mon Sep 17 00:00:00 2001
From: Matija Obreza <matija.obreza@croptrust.org>
Date: Sun, 15 Oct 2017 18:47:31 +0200
Subject: [PATCH] Updated references to git repository and public issue tracker
 on Bitbucket

- Closes #196
---
 pom.xml                                        | 8 ++++----
 src/main/asciidoc/api/security.adoc            | 2 +-
 src/main/asciidoc/genesys-properties.adoc      | 7 +++----
 src/main/asciidoc/index.adoc                   | 2 +-
 src/main/asciidoc/running-genesys.adoc         | 2 +-
 src/main/webapp/WEB-INF/decorator/1/footer.jsp | 4 ++--
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6a7bd0123..9714ccbe0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,9 +35,9 @@
 	</licenses>
 
 	<scm>
-		<connection>https://bitbucket.org/genesys2/genesys2-server.git</connection>
-		<developerConnection>scm:git:git@bitbucket.org:genesys2/genesys2-server.git</developerConnection>
-		<url>git@bitbucket.org:genesys2/genesys2-server.git</url>
+		<connection>https://gitlab.croptrust.org/genesys-pgr/genesys-server.git</connection>
+		<developerConnection>scm:git:git@gitlab.croptrust.org:genesys-pgr/genesys-server.git</developerConnection>
+		<url>git@gitlab.croptrust.org:genesys-pgr/genesys-server.git</url>
 		<tag>genesys2-server-2.1</tag>
 	</scm>
 
@@ -47,7 +47,7 @@
 	</organization>
 
 	<issueManagement>
-		<url>https://bitbucket.org/genesys2/genesys2-server/issues</url>
+		<url>https://bitbucket.org/genesys2/issues/issues</url>
 	</issueManagement>
 
 	<properties>
diff --git a/src/main/asciidoc/api/security.adoc b/src/main/asciidoc/api/security.adoc
index 77caf8090..591c0343f 100644
--- a/src/main/asciidoc/api/security.adoc
+++ b/src/main/asciidoc/api/security.adoc
@@ -41,7 +41,7 @@ when using `curl` in the examples in this manual.
 
 === Obtaining the access token
 
-Most OAuth libraries, including https://bitbucket.org/genesys2/genesys-client-api[genesys-client-api]
+Most OAuth libraries, including https://gitlab.croptrust.org/genesys-pgr/genesys-client-api[genesys-client-api]
 Java library, will automatically obtain the access token following the OAuth protocol. This
 section describes how to manually obtain the tokens.
 
diff --git a/src/main/asciidoc/genesys-properties.adoc b/src/main/asciidoc/genesys-properties.adoc
index 740f81ecd..a8e9f06d7 100644
--- a/src/main/asciidoc/genesys-properties.adoc
+++ b/src/main/asciidoc/genesys-properties.adoc
@@ -24,13 +24,12 @@ Do not modify!
 ==== spring.properties
 
 `spring.properties` contains the default configuration options for any Genesys Server instance.
-You can access its contents directly at
-https://bitbucket.org/genesys2/genesys2-server/src/{buildNumber}/src/main/resources/spring/spring.properties[spring.properties on Bitbucket.org]  
+You can access its contents directly at https://gitlab.croptrust.org/genesys-pgr/genesys-server/blob/{buildNumber}/src/main/resources/application.properties[application.properties] 
 
 ==== genesys.properties
 
-Configuration for your instance of the server belong to `genesys.properties` file. This file is not
-required and does not come with any Genesys distribution (not even source code).
+Configuration for your instance of the server belong to `genesys.properties` file. This file **is
+required** and does not come with Genesys source code.
 
 This file needs to be created in a location that is included on the webapplication's CLASSPATH.
 
diff --git a/src/main/asciidoc/index.adoc b/src/main/asciidoc/index.adoc
index 28cf5dd1b..319c8ebce 100644
--- a/src/main/asciidoc/index.adoc
+++ b/src/main/asciidoc/index.adoc
@@ -45,7 +45,7 @@ Binary *genesys2-server* distribution packages are available on request. Please
 *genesys2-server* is licensed under link:$$http://www.apache.org/licenses/LICENSE-2.0.html$$[the Apache V2 license].
 
 The source code of *genesys2-server* can be found on
-  link:$$https://bitbucket.org/genesys2/genesys2-server$$[https://bitbucket.org/genesys2/genesys2-server]
+  link:$$https://gitlab.croptrust.org/genesys-pgr/genesys-server$$[https://gitlab.croptrust.org/genesys-pgr/genesys-server]
 
 
 
diff --git a/src/main/asciidoc/running-genesys.adoc b/src/main/asciidoc/running-genesys.adoc
index 7bcbb0660..da1f31f56 100644
--- a/src/main/asciidoc/running-genesys.adoc
+++ b/src/main/asciidoc/running-genesys.adoc
@@ -104,7 +104,7 @@ All available configuration options and their default values are listed in <<gen
 Building and running the server requires https://docs.oracle.com/javase/8/docs/technotes/guides/install/install_overview.html[Java 8 SDK],
 https://maven.apache.org/[maven] and http://compass-style.org/install/[compass].
 
-. Clone https://bitbucket.org/genesys2/genesys2-server.git[genesys2-server] to your computer
+. Clone https://gitlab.croptrust.org/genesys-pgr/genesys-server.git[genesys2-server] to your computer
 . Create a blank mysql database <<creating-a-mysql-database>>
 . Configure database connection settings <<database-configuration>> in `src/main/resources/genesys.properties`
 . Start Jetty with `mvn -Dspring.profiles.active=dev jetty:run`
diff --git a/src/main/webapp/WEB-INF/decorator/1/footer.jsp b/src/main/webapp/WEB-INF/decorator/1/footer.jsp
index 10565eec1..27ee24759 100644
--- a/src/main/webapp/WEB-INF/decorator/1/footer.jsp
+++ b/src/main/webapp/WEB-INF/decorator/1/footer.jsp
@@ -24,10 +24,10 @@
 					<a href="<c:url value="/content/legal/disclaimer" />"><spring:message code="menu.disclaimer" /></a>
 				</li>
 				<li>
-					<a target="_blank" href="https://bitbucket.org/genesys2/genesys2-server/issues/new"><spring:message code="menu.report-an-issue" /></a>
+					<a target="_blank" href="https://bitbucket.org/genesys2/issues/issues/new"><spring:message code="menu.report-an-issue" /></a>
 				</li>
 				<li class="notimportant">
-					<a target="_blank" href="https://bitbucket.org/genesys2/genesys2-server.git"><spring:message code="menu.scm" /></a>
+					<a target="_blank" href="https://gitlab.croptrust.org/genesys-pgr/genesys-server"><spring:message code="menu.scm" /></a>
 				</li>
 				<li class="notimportant">
 					<a target="_blank" href="https://www.transifex.com/crop-trust/genesys/"><spring:message code="menu.translate" /></a>
-- 
GitLab