Rename token into password
MODIFY
src/PharoLauncher-Core/PhLJenkins2Entity.class.st
src/PharoLauncher-Core/PhLJenkins2Entity.class.st
@@ -113,6 +113,11 @@ PhLJenkins2Entity >> parent: aPhLEntity [
parent := aPhLEntity
]
+{ #category : #accessing }
+PhLJenkins2Entity >> password [
+ ^ parent password
+]
+
{ #category : #accessing }
PhLJenkins2Entity >> properties [
^ properties
@@ -144,11 +149,6 @@ PhLJenkins2Entity >> shouldComputeChildrenLazily [
^ true
]
-{ #category : #accessing }
-PhLJenkins2Entity >> token [
- ^ parent token
-]
-
{ #category : #accessing }
PhLJenkins2Entity >> url [
"We get the URL from the json sent by Jenkins. In case of a secure Jenkins, we need to set the username and token to the URL we get."
@@ -156,7 +156,7 @@ PhLJenkins2Entity >> url [
| url |
url := (properties at: 'url') asUrl.
self username ifNotNil: [ :username | url username: username ].
- self token ifNotNil: [ :token | url password: token ].
+ self password ifNotNil: [ :token | url password: token ].
^ url
]

MODIFY
src/PharoLauncher-Core/PhLJenkins2Server.class.st
src/PharoLauncher-Core/PhLJenkins2Server.class.st
@@ -20,10 +20,10 @@ PhLJenkins2Server class >> name: aString url: anUrl [
]
{ #category : #'instance creation' }
-PhLJenkins2Server class >> name: aString url: anUrl username: anotherString token: yetAnotherString [
+PhLJenkins2Server class >> name: aString url: anUrl username: anotherString password: yetAnotherString [
^ (self name: aString url: anUrl)
username: anotherString;
- token: yetAnotherString;
+ password: yetAnotherString;
yourself
]
@@ -37,6 +37,16 @@ PhLJenkins2Server >> name [
^ name
]
+{ #category : #accessing }
+PhLJenkins2Server >> password [
+ ^ url password
+]
+
+{ #category : #accessing }
+PhLJenkins2Server >> password: aString [
+ url password: aString
+]
+
{ #category : #initialization }
PhLJenkins2Server >> setName: aString url: aZnUrl [
name := aString.
@@ -48,16 +58,6 @@ PhLJenkins2Server >> templatesAndGroups [
^ self jobs
]
-{ #category : #accessing }
-PhLJenkins2Server >> token [
- ^ url password
-]
-
-{ #category : #accessing }
-PhLJenkins2Server >> token: aString [
- url password: aString
-]
-
{ #category : #accessing }
PhLJenkins2Server >> url [
^ url

MODIFY
src/PharoLauncher-Core/PhLTemplateSource.class.st
src/PharoLauncher-Core/PhLTemplateSource.class.st
@@ -15,7 +15,7 @@ Class {
'templates',
'expanded',
'username',
- 'token'
+ 'password'
],
#category : #'PharoLauncher-Core-Model'
}
@@ -276,7 +276,7 @@ PhLTemplateSource >> asBasicTemplateGroup [
url: url asZnUrl
filterPattern: pattern ].
type == self class jenkinsServerType
- ifTrue: [ ^ PhLJenkins2Server name: name url: url asZnUrl username: username token: token ].
+ ifTrue: [ ^ PhLJenkins2Server name: name url: url asZnUrl username: username password: password ].
type == self class urlGroupType
ifTrue: [ ^ PhLFixedURLsTemplateGroup new
setName: name Templates: OrderedCollection new;
@@ -335,6 +335,16 @@ PhLTemplateSource >> name: aString [
name := aString
]
+{ #category : #accessing }
+PhLTemplateSource >> password [
+ ^ password
+]
+
+{ #category : #accessing }
+PhLTemplateSource >> password: anObject [
+ password := anObject
+]
+
{ #category : #printing }
PhLTemplateSource >> printOn: aStream [
super printOn: aStream.
@@ -359,16 +369,6 @@ PhLTemplateSource >> templatesDo: aBlockClosure [
templates ifNotNil: [ templates do: aBlockClosure ]
]
-{ #category : #accessing }
-PhLTemplateSource >> token [
- ^ token
-]
-
-{ #category : #accessing }
-PhLTemplateSource >> token: anObject [
- token := anObject
-]
-
{ #category : #accessing }
PhLTemplateSource >> type [
^ type

Rename token into password