Merge pull request #13 from baymac/update-package

[JENKINS-57943] Rename package name

Author: baymac

README.md

@@ -12,10 +12,13 @@ To fully be able to run a Jenkins Continuous Integration on a GitLab repository
 
 1. [GitLab API Plugin](https://github.com/jenkinsci/gitlab-api-plugin) - Wraps GitHub Java API
 
-2. GitLab Plugin- Server configuration and web hooks Management 
+2. GitLab Plugin - Server configuration and web hooks Management 
 
 3. GitLab Branch Source Plugin - To support Multi Branch Pipeline Jobs (including Merge Requests) and Folder organisation
 
+This repository contains two packages `io.jenkins.plugins.gitlabserverconfig` and `io.jenkins.plugins.gitlabbranchsource`. Ideally
+the former package should reside inside another plugin with name `GitLab Plugin`. 
+
 ## Jenkins and GitLab Integration:
 
 This section contains information about Jenkins CI support for GitLab.
@@ -124,7 +127,7 @@ we use the `@Extension` annotation type. This annotation is picked up by Jenkins
 
 ### Running your Jenkins server:
 
-There are multiple ways to do it:
+Here are a few ways to setup your own Jenkins server:
 
 1. Using a Jenkins docker:
     
@@ -165,7 +168,7 @@ There are multiple ways to do it:
     
     iv. Browse to `http://localhost:8080/jenkins`
     
-3. Using a Jenkins Azure solution from marketplace:
+3. Using a Jenkins Azure solution:
 
     Refer to Azure [docs](https://docs.microsoft.com/en-us/azure/architecture/example-scenario/apps/jenkins).
    

src/main/java/io/jenkins/plugins/gitlabserver/credentials/PersonalAccessToken.java renamed to src/main/java/io/jenkins/plugins/gitlabserverconfig/credentials/PersonalAccessToken.java

@@ -1,4 +1,4 @@
-package io.jenkins.plugins.gitlabserver.credentials;
+package io.jenkins.plugins.gitlabserverconfig.credentials;
 
 import com.cloudbees.plugins.credentials.common.StandardCredentials;
 import edu.umd.cs.findbugs.annotations.NonNull;

src/main/java/io/jenkins/plugins/gitlabserver/credentials/PersonalAccessTokenImpl.java renamed to src/main/java/io/jenkins/plugins/gitlabserverconfig/credentials/PersonalAccessTokenImpl.java

@@ -1,4 +1,4 @@
-package io.jenkins.plugins.gitlabserver.credentials;
+package io.jenkins.plugins.gitlabserverconfig.credentials;
 
 import com.cloudbees.plugins.credentials.CredentialsDescriptor;
 import com.cloudbees.plugins.credentials.CredentialsProvider;

src/main/java/io/jenkins/plugins/gitlabserver/credentials/package-info.java renamed to src/main/java/io/jenkins/plugins/gitlabserverconfig/credentials/package-info.java

@@ -5,4 +5,4 @@
  * to lazily instantiate {@link hudson.util.Secret} properties on access.
  */
 
-package io.jenkins.plugins.gitlabserver.credentials;
+package io.jenkins.plugins.gitlabserverconfig.credentials;

src/main/java/io/jenkins/plugins/gitlabserver/servers/GitLabServer.java renamed to src/main/java/io/jenkins/plugins/gitlabserverconfig/servers/GitLabServer.java

@@ -1,4 +1,4 @@
-package io.jenkins.plugins.gitlabserver.servers;
+package io.jenkins.plugins.gitlabserverconfig.servers;
 
 import com.cloudbees.plugins.credentials.CredentialsMatchers;
 import com.cloudbees.plugins.credentials.common.StandardCredentials;
@@ -14,7 +14,7 @@
 import hudson.security.ACL;
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
-import io.jenkins.plugins.gitlabserver.credentials.PersonalAccessToken;
+import io.jenkins.plugins.gitlabserverconfig.credentials.PersonalAccessToken;
 import java.net.MalformedURLException;
 import java.net.URL;
 import jenkins.model.Jenkins;

src/main/java/io/jenkins/plugins/gitlabserver/servers/GitLabServers.java renamed to src/main/java/io/jenkins/plugins/gitlabserverconfig/servers/GitLabServers.java

@@ -1,11 +1,11 @@
-package io.jenkins.plugins.gitlabserver.servers;
+package io.jenkins.plugins.gitlabserverconfig.servers;
 
 import hudson.Extension;
 import hudson.ExtensionList;
 import hudson.Util;
 import hudson.model.Descriptor;
 import hudson.util.ListBoxModel;
-import io.jenkins.plugins.gitlabserver.servers.helpers.GitLabPersonalAccessTokenCreator;
+import io.jenkins.plugins.gitlabserverconfig.servers.helpers.GitLabPersonalAccessTokenCreator;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;

src/main/java/io/jenkins/plugins/gitlabserver/servers/helpers/GitLabPersonalAccessTokenCreator.java renamed to src/main/java/io/jenkins/plugins/gitlabserverconfig/servers/helpers/GitLabPersonalAccessTokenCreator.java

@@ -1,4 +1,4 @@
-package io.jenkins.plugins.gitlabserver.servers.helpers;
+package io.jenkins.plugins.gitlabserverconfig.servers.helpers;
 
 import com.cloudbees.plugins.credentials.CredentialsMatchers;
 import com.cloudbees.plugins.credentials.CredentialsScope;
@@ -21,9 +21,9 @@
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
 import hudson.util.Secret;
-import io.jenkins.plugins.gitlabserver.credentials.PersonalAccessToken;
-import io.jenkins.plugins.gitlabserver.credentials.PersonalAccessTokenImpl;
-import io.jenkins.plugins.gitlabserver.servers.GitLabServer;
+import io.jenkins.plugins.gitlabserverconfig.credentials.PersonalAccessToken;
+import io.jenkins.plugins.gitlabserverconfig.credentials.PersonalAccessTokenImpl;
+import io.jenkins.plugins.gitlabserverconfig.servers.GitLabServer;
 import java.io.IOException;
 import java.net.URI;
 import java.util.List;
@@ -169,7 +169,7 @@ public FormValidation doCreateTokenByPassword(
     }
 
     /**
-     * Creates {@link io.jenkins.plugins.gitlabserver.credentials.PersonalAccessToken}
+     * Creates {@link io.jenkins.plugins.gitlabserverconfig.credentials.PersonalAccessToken}
      * with previously created GitLab Personal Access Token.
      *
      * @param serverUrl to add to domain with host and scheme requirement from this url

src/main/java/io/jenkins/plugins/gitlabserver/servers/package-info.java renamed to src/main/java/io/jenkins/plugins/gitlabserverconfig/servers/package-info.java

@@ -3,4 +3,4 @@
  * Jenkins Global Configuration UI for managing the list of GitLab servers.
  */
 
-package io.jenkins.plugins.gitlabserver.servers;
+package io.jenkins.plugins.gitlabserverconfig.servers;