Skip to content
This repository has been archived by the owner on Mar 11, 2021. It is now read-only.

Commit

Permalink
main
Browse files Browse the repository at this point in the history
  • Loading branch information
alexeykazakov committed Jul 15, 2017
1 parent 7582f8b commit 843e4a4
Show file tree
Hide file tree
Showing 27 changed files with 107 additions and 232 deletions.
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Contributing to fabric8-wit
# Contributing to fabric8-auth

You are welcome to contribute to this project. Here are few
suggestions to help you to contribute. You can contribute to this
Expand All @@ -12,7 +12,7 @@ or

## Reporting Issues

All the issues related to fabric8-wit should be reported in the
All the issues related to fabric8-auth should be reported in the
[GitHub issue tracker](https://github.com/fabric8-services/fabric8-auth/issues/new).

## Pull Requests
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ Please, make sure to provide all the information asked for below and then delete

## Steps to reproduce the problem

* *Please describe how a developer can reproduce the issue that you faced. Make sure you include information how you've configured, built, or started the fabric8-wit server.*
* *Please describe how a developer can reproduce the issue that you faced. Make sure you include information how you've configured, built, or started the fabric8-auth server.*

## Specifications

* Which version of fabric8-wit are you running?
* Which version of fabric8-auth are you running?
* Which operating system do you use?
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ _testmain.go
*.test
*.prof

# Fabric8-wit specific artifacts
# Fabric8-auth specific artifacts
/debug
**/debug.test

# Fabric8-wit binaries
# Fabric8-auth binaries
bin/

# Glide package manager
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ goTemplate{
goCI{
githubOrganisation = 'fabric8-services'
dockerOrganisation = 'fabric8'
project = 'fabric8-wit'
project = 'fabric8-auth'
dockerBuildOptions = '--file Dockerfile.deploy'
}
} else if (env.BRANCH_NAME.equals('master')) {
goRelease{
githubOrganisation = 'fabric8-services'
dockerOrganisation = 'fabric8'
project = 'fabric8-wit'
project = 'fabric8-auth'
dockerBuildOptions = '--file Dockerfile.deploy'
}
}
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PROJECT_NAME=fabric8-wit
PROJECT_NAME=fabric8-auth
CUR_DIR=$(shell pwd)
TMP_PATH=$(CUR_DIR)/tmp
INSTALL_PREFIX=$(CUR_DIR)/bin
Expand Down
4 changes: 2 additions & 2 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
:sectnums:
:experimental:

image:https://ci.centos.org/buildStatus/icon?job=devtools-fabric8-wit-build-master[Jenkins,link="https://ci.centos.org/view/Devtools/job/devtools-fabric8-wit-build-master/lastBuild/"]
image:https://ci.centos.org/buildStatus/icon?job=devtools-fabric8-auth-build-master[Jenkins,link="https://ci.centos.org/view/Devtools/job/devtools-fabric8-auth-build-master/lastBuild/"]
image:https://goreportcard.com/badge/github.com/fabric8-services/fabric8-auth[Go Report Card, link="https://goreportcard.com/report/github.com/fabric8-services/fabric8-auth"]
image:https://godoc.org/github.com/fabric8-services/fabric8-auth?status.png[GoDoc,link="https://godoc.org/github.com/fabric8-services/fabric8-auth"]
image:https://codecov.io/gh/fabric8-services/fabric8-auth/branch/master/graph/badge.svg[Codecov.io,link="https://codecov.io/gh/fabric8-services/fabric8-auth"]
Expand All @@ -13,7 +13,7 @@ image:https://codecov.io/gh/fabric8-services/fabric8-auth/branch/master/graph/ba

The following guide is mainly targeted towards a Linux or Mac OSX development
machine. If you are on Windows, we recommend to take a look at
link:docs/development/getting-started-win.adoc[Getting started with fabric8-wit development on Windows].
link:docs/development/getting-started-win.adoc[Getting started with fabric8-auth development on Windows].

=== Prerequisites [[prerequisites]]

Expand Down
2 changes: 1 addition & 1 deletion assets/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</head>
<body>
<div class="container-fluid">
<h1>Fabric8-wit tokens <small id="response">Loading..</small></h1>
<h1>Fabric8-auth tokens <small id="response">Loading..</small></h1>

<div id="tokens">
<div class="token" style="display:none">
Expand Down
2 changes: 1 addition & 1 deletion cico_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ function run_tests_with_coverage() {

function tag_push() {
TARGET=$1
docker tag fabric8-wit-deploy $TARGET
docker tag fabric8-auth-deploy $TARGET
docker push $TARGET
}

Expand Down
2 changes: 1 addition & 1 deletion configuration/configuration.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func NewConfigurationData(configFilePath string) (*ConfigurationData, error) {

func getConfigFilePath() string {
// This was either passed as a env var Or, set inside main.go from --config
envConfigPath, ok := os.LookupEnv("F8_CONFIG_FILE_PATH")
envConfigPath, ok := os.LookupEnv("F8_AUTH_CONFIG_FILE_PATH")
if !ok {
return ""
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"last_used_workspace": "my-last-used-workspace",
"stackId": "golang-default",
"type": "git",
"url": "https://github.com/fabric8-services/fabric8-wit.git"
"url": "https://github.com/fabric8-services/fabric8-auth.git"
},
"id": "d7a282f6-1c10-459e-bb44-55a1a6d48bdd",
"links": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"createdAt": "0001-01-01T00:00:00Z",
"last_used_workspace": "my-last-used-workspace",
"type": "git",
"url": "https://github.com/fabric8-services/fabric8-wit.git"
"url": "https://github.com/fabric8-services/fabric8-auth.git"
},
"id": "d7a282f6-1c10-459e-bb44-55a1a6d48bdd",
"links": {
Expand Down
4 changes: 2 additions & 2 deletions docs/development/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ if this type of contributing interests you.

=== How to use this guide?

The guide attempts to explain how to use the fabric8-wit development environment as precisely, predictably, and procedurally as possible.
The guide attempts to explain how to use the fabric8-auth development environment as precisely, predictably, and procedurally as possible.

=== How to get started?

Start by getting the software you require. If you are on Windows, see link:getting-started-win.adoc[Getting started with fabric8-wit development on Windows].
Start by getting the software you require. If you are on Windows, see link:getting-started-win.adoc[Getting started with fabric8-auth development on Windows].

If you are on Mac or Linux, consult the main link:../../README.adoc[README] as
many tools (like Git and Go) can most likely be installed via the system's
Expand Down
4 changes: 2 additions & 2 deletions docs/development/debugging.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Let's assume the binary `./bin/alm` is running.
=== Attach to program

To link:https://github.com/derekparker/delve/blob/master/Documentation/usage/dlv_attach.md#dlv-attach[*attach*]
the debugger to your running fabric8-wit server,run:
the debugger to your running fabric8-auth server,run:

----
$ dlv attach $(pidof ./bin/alm)
Expand All @@ -88,7 +88,7 @@ on the on the `WorkitemController.Show` function that is defined in `workitem.go
(dlv) break WorkitemController.Show
----

As mentioned before the fabric8-wit server is paused and we need to bring it
As mentioned before the fabric8-auth server is paused and we need to bring it
back into a *run* state. To do this, we let the program
link:https://github.com/derekparker/delve/tree/master/Documentation/cli#continue[*continue*]:

Expand Down
12 changes: 6 additions & 6 deletions docs/development/getting-started-win.adoc
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
= Getting started with fabric8-wit development on Windows
= Getting started with fabric8-auth development on Windows
:author: Konrad Kleine
:toc:
:toc-placement!:
:sectnums:
:experimental:

This page explains how to get the software you need to use a Windows 10 64 bit machine for fabric8-wit development. In addition to that this page lists steps how to configure your development environment in terms of setting Windows environment variables.
This page explains how to get the software you need to use a Windows 10 64 bit machine for fabric8-auth development. In addition to that this page lists steps how to configure your development environment in terms of setting Windows environment variables.

NOTE: In this guide we assume that the drive where your home folder is located is `c:`. Please adjust this to your needs whenever your home folder is on another drive.

Expand Down Expand Up @@ -190,7 +190,7 @@ setx PATH "%PATH%;%HOMEDRIVE%\%HOMEPATH%\glide\windows-amd64"

IMPORTANT: Before you continue, *close any existing Windows Command Prompt* (or at least close the one you've opened while working through this document). This is important because otherwise the environment variables that we have modified won't be available.

Typically, Go projects are checked out under a special directory which is commonly known as `GOPATH`. The fabric8-wit project makes not exception here. In most of the documentation that is written for Linux or MacOSX you will find us referencing this path as `$GOPATH`. On Windows this translates to `%GOPATH%`.
Typically, Go projects are checked out under a special directory which is commonly known as `GOPATH`. The fabric8-auth project makes not exception here. In most of the documentation that is written for Linux or MacOSX you will find us referencing this path as `$GOPATH`. On Windows this translates to `%GOPATH%`.

Now you may already have guessed this but `%GOPATH%` is also an environment variable that contains a path (sometimes a list of paths separated by semicolons) to various locations that will all be treated as `GOPATH`s by Go.

Expand Down Expand Up @@ -308,7 +308,7 @@ Build:
== Get the code

1. Hit the kbd:[Windows] key on your keyboard and type `cmd.exe` to start searching for the Windows Command Prompt. Hit kbd:[Enter].
1. Run this command to clone the fabric8-wit project into the correct folder that we've prepared in <<create-gopath>>.
1. Run this command to clone the fabric8-auth project into the correct folder that we've prepared in <<create-gopath>>.
+
[source]
----
Expand All @@ -323,7 +323,7 @@ git clone https://github.com/fabric8-services/fabric8-auth.git %HOMEDRIVE%\%HOME
+
[source]
----
cd %HOMEDRIVE\%HOMEPATH%\go\src\github.com\fabric8-services\fabric8-wit
cd %HOMEDRIVE\%HOMEPATH%\go\src\github.com\fabric8-services\fabric8-auth
----

1. Fetch the Go packages that this project depends on by running
Expand All @@ -333,7 +333,7 @@ cd %HOMEDRIVE\%HOMEPATH%\go\src\github.com\fabric8-services\fabric8-wit
glide install
----
+
This command could take a while to finish. After that, the dependencies are stored in `%HOMEDRIVE\%HOMEPATH%\go\src\github.com\fabric8-services\fabric8-wit\vendor`.
This command could take a while to finish. After that, the dependencies are stored in `%HOMEDRIVE\%HOMEPATH%\go\src\github.com\fabric8-services\fabric8-auth\vendor`.

[[build-from-source]]
== Build from source
Expand Down
4 changes: 2 additions & 2 deletions docs/development/ide-setup.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
= Setting up your IDE for Fabric8-wit Development
= Setting up your IDE for Fabric8-auth Development
:toc:
:toc-placement!:
:sectnums:
Expand All @@ -23,7 +23,7 @@ Download and install the appropriate distribution of Visual Studio Code from lin
====
If you are on Windows, `gometalinter --install` may fail. with a lot of erros about `cannot find package`. If this happens, use the File Explorer to navigate to the `src/github.com/alecthomas/gometalinter/vendor`. Delete the `src` file, and create a new folder called `src`. Copy the other folders in the `vendor` folder in to the `src` folder. Rerun `gometalinter --install` in the terminal window.
====
. Launch Visual Studio Code from a location where your `GOPATH` is correctly set. We recommend changing to the `src\github.com\fabric8-services\fabric8-wit` directory, and executing `code .` which will launch VS Code, with the FABRIC8-WIT project open.
. Launch Visual Studio Code from a location where your `GOPATH` is correctly set. We recommend changing to the `src\github.com\fabric8-services\fabric8-auth` directory, and executing `code .` which will launch VS Code, with the FABRIC8-WIT project open.
. Open any `.go` file by clicking on it. An info dialog box will open at the top of the screen. Click on _Show Recommendations_ and click on the green _Install_ button next to the _Go_ extension from `lukehoban`.
. Click the blue _Enable_ button, and then ok to restart Visual Studio Code.
. On restart, you will notice that a Yellow _Analysis Tools Missing_ warning appears in the status bar. Click it, and then click /Install/ to install the Go tools that Visual Studio Code calls out to in order to provide actions such as refactoring, autocomplete etc.
Expand Down
4 changes: 2 additions & 2 deletions jenkins/windows/make.bat
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ if not "%PROCESSOR_ARCHITECTURE%" == "AMD64" goto error_wrong_architecture

:: The workspace environment is set by Jenkins and defaults to %TEMP% if not set
if "%WORKSPACE%" == "" set WORKSPACE=%TEMP%
if "%BUILD_DIR%" == "" set "BUILD_DIR=%WORKSPACE%\fabric8-wit-windows-build"
if "%BUILD_DIR%" == "" set "BUILD_DIR=%WORKSPACE%\fabric8-auth-windows-build"
:: Create our build dir - see https://support.microsoft.com/en-us/kb/65994
if not exist %BUILD_DIR%\NUL (
mkdir %BUILD_DIR%
Expand All @@ -28,7 +28,7 @@ set POWERSHELL_BIN=%SystemRoot%\system32\WindowsPowerShell\v1.0\powershell.exe
set GOPATH=%BUILD_DIR%\gopath
set GOBIN=%GOPATH%\bin
set PATH=%PATH%;%GOBIN%
set PACKAGE_PATH=%GOPATH%\src\github.com\fabric8-services\fabric8-wit
set PACKAGE_PATH=%GOPATH%\src\github.com\fabric8-services\fabric8-auth

set GIT_DOWNLOAD_URL=https://github.com/git-for-windows/git/releases/download/v2.9.0.windows.1/Git-2.9.0-64-bit.exe
set GIT_INSTALLER_PATH=%BUILD_DIR%\git-installer.exe
Expand Down
Loading

0 comments on commit 843e4a4

Please sign in to comment.