Issue #4: checkpoint ...add default password entries; fine tune creat…

…e stone; implement destroy stone

bin/deleteStone.solo

@@ -0,0 +1,83 @@
+#!/usr/bin/env superdoit_solo
+options
+{
+SuperDoitRequiredOptionWithRequiredArg long: 'registry'.
+SuperDoitOptionalOptionWithNoArg long: 'verbose' short: 'v'.
+}
+%
+Usage
+-----
+USAGE $basename [--help | -h] [--debug | -D]  [--debugGem] [-v | --verbose] \
+                --registry=<registry-name> <stone-name>
+
+DESCRIPTION
+  Shut down stone and netldi. Delete the directory structure and meta data associated
+  with the stone.
+
+OPTIONS
+  -h, --help    display usage message
+  -D, --debug   bring up topaz debugger in the event of a script error
+  --debugGem    If terminal is connected to stdout, bring up debugger. If not,
+                dump stack to stdout and wait for topaz to attach using topaz
+                DEBUGGEM command.
+  -v, --verbose Verbose logging enabled.
+
+EXAMPLES
+  $basename --help
+  $basename -D
+  $basename --debugGem
+  $basename --registry=bosch  bosch_370 
+-----
+%
+specs
+[
+RwLoadSpecificationV2 {
+	#projectName : 'GsDevKit_stones',
+	#projectSpecFile : 'rowan/project.ston',
+	#componentNames : [
+		'Core',
+		'Solo'
+	],
+	#platformProperties : {
+		'gemstone' : {
+			'allusers' : {
+				#defaultSymbolDictName : 'Globals'
+			}
+		}
+	},
+	#comment : ''
+},
+RwLoadSpecificationV2 {
+	#projectName : 'GsCommands',
+	#projectSpecFile : 'rowan/project.ston',
+	#diskUrl : '$GEMSTONE/examples/GsCommands/projectsHome/GsCommands',
+	#componentNames : [
+		'Commands'
+	],
+	#platformProperties : {
+		'gemstone' : {
+			'allusers' : {
+				#defaultSymbolDictName : 'UserGlobals'
+			}
+		}
+	},
+	#comment : ''
+}
+]
+%
+doit
+	| registryClass stonesRegistry toneName stoneSpec |
+	self preDoitSpecLoad: [:spec | 
+		spec projectName = 'GsCommands'
+			ifTrue: [ spec projectsHome: '$GEMSTONE/examples/GsCommands/projectsHome' ]
+			ifFalse: [ spec projectsHome: self dirname asFileReference parent parent ] ].
+	registryClass := (self globalNamed: 'GDKRegistry').	
+	self verbose
+		ifTrue: [ (self globalNamed: 'GDKGsDevKit_stonesBase') verbose: true ].
+	stonesRegistry := registryClass stonesRegistryNamed: self registry.
+	self positionalArgs size ~= 1
+		ifTrue: [ self error: 'Expected a positional argument: <stone-name>' ].
+	stoneName := self positionalArgs at: 1.
+	stonesRegistry destroyStoneNamed: stoneName.
+	^ stonesRegistry
+%

src/GsDevKit_stones-Core.package/GDKStoneDirectorySpec.class/instance/createStoneStructure..st

@@ -1,11 +1,13 @@
 stone creation
 createStoneStructure: stoneSpec
-	| stoneRoot useCustomEnv exportDir gemstoneReference systemConfStream useTranlogDir useExtentDir |
+	| stoneRoot useCustomEnv exportDir gemstoneReference systemConfStream useTranlogDir useExtentDir userId password |
 	exportDir := Dictionary new.
 	stoneRoot := stoneSpec rootDir.
 	useTranlogDir := ''.
 	useExtentDir := '/'.
 	useCustomEnv := false.
+	userId := 'DataCurator'.
+	password := 'swordfish'.
 	gemstoneReference := stoneSpec gemstonePath asFileReference.
 	System gemEnvironmentVariable: 'GEMSTONE' put: gemstoneReference pathString.
 	self class symbolicLink: gemstoneReference linkName: stoneRoot / 'product'.
@@ -52,6 +54,10 @@ createStoneStructure: stoneSpec
 				ifTrue: [ (stoneRoot / value) ensureCreateDirectory ].
 			key = #'projectsHome'
 				ifTrue: [ (stoneRoot / value) ensureCreateDirectory ].
+			key = #'userId'
+				ifTrue: [ userId := value ].
+			key = #'password'
+				ifTrue: [ password := value ].
 			key = #'product'
 				ifTrue: [ 
 					"noop, as product symbolic link is created by default"
@@ -95,6 +101,6 @@ createStoneStructure: stoneSpec
 			fileStream
 				nextPutAll: 'set GEMSTONE ' , stoneSpec stoneName;
 				lf;
-				nextPutAll: 'set u DataCurator p swordfish';
+				nextPutAll: 'set u ', userId, ' p ', password;
 				lf ].
 	self class chmod: (stoneRoot / '.topazini') pathString fileMode: 'u+w,og-rw'

src/GsDevKit_stones-Core.package/GDKStoneSpec.class/instance/password..st

@@ -0,0 +1,3 @@
+accessing
+password: object
+	password := object

src/GsDevKit_stones-Core.package/GDKStoneSpec.class/instance/password.st

@@ -0,0 +1,3 @@
+accessing
+password
+	^password ifNil: [ ^ 'swordfish' ]

src/GsDevKit_stones-Core.package/GDKStoneSpec.class/properties.json

@@ -14,6 +14,7 @@
 		"netLdiPort",
 		"gemTask",
 		"userId",
+		"password",
 		"osUserId",
 		"stoneDirectorySpecName",
 		"stoneDirectorySpec",

src/GsDevKit_stones-Core.package/GDKStonesRegistry.class/instance/destroyStoneNamed..st

@@ -0,0 +1,6 @@
+stone management
+destroyStoneNamed: stoneName
+
+	| stoneSpec |
+	stoneSpec := self stoneNamed: stoneName.
+	stoneSpec destroyStoneStructure

templates/default.ston

@@ -2,11 +2,13 @@ GDKhomeStoneDirectorySpec{
 	#name : 'default',
 	#backups : 'backups',
 	#bin : 'bin',
+	#customenv: 'customenv',
 	#extents : 'extents',
 	#logs : 'logs',
 	#stats : 'stats',
 	#tranlogs : 'tranlogs',
 	#snapshots : 'snapshots',
 	#product : 'product'
-	#tode : 'tode'
+	#tode : 'tode',
+	#userId : 'DataCurator'
 }

templates/default_rowan.ston

@@ -2,11 +2,13 @@ GDKstonesStoneDirectorySpec {
 	#name : 'default_rowan',
 	#backups : 'backups',
 	#bin : 'bin',
+	#customenv: 'customenv',
 	#dbfSource : '$GEMSTONE/bin/extent0.rowan.dbf',
 	#extents : 'extents',
 	#logs : 'logs',
 	#stats : 'stats',
 	#tranlogs : 'tranlogs',
 	#snapshots : 'snapshots',
-	#product : 'product'
+	#product : 'product',
+	#userId : 'SystemUser'
 }

templates/default_seaside.ston

@@ -2,12 +2,14 @@ GDKhomeStoneDirectorySpec {
 	#name : 'default_seaside',
 	#backups : 'backups',
 	#bin : 'bin',
+	#customenv: 'customenv',
 	#dbfSource : '$GEMSTONE/bin/extent0.seaside.dbf',
 	#extents : 'extents',
 	#logs : 'logs',
 	#stats : 'stats',
 	#tranlogs : 'tranlogs',
 	#snapshots : 'snapshots',
 	#product : 'product',
-	#tode : 'tode'
+	#tode : 'tode',
+	#userId : 'DataCurator'
 }

templates/minimal.ston

@@ -2,5 +2,6 @@ GDKstonesStoneDirectorySpec {
 	#name : 'minimal',
 	#customenv: 'customenv',
 	#bin : 'bin',
-	#logs : 'logs'
+	#logs : 'logs',
+	#userId : 'SystemUser'
 }

templates/minimal_rowan.ston

@@ -3,5 +3,6 @@ GDKstonesStoneDirectorySpec {
 	#customenv: 'customenv',
 	#dbfSource : '$GEMSTONE/bin/extent0.rowan.dbf',
 	#bin : 'bin',
-	#logs : 'logs'
+	#logs : 'logs',
+	#userId : 'SystemUser'
 }

templates/minimal_seaside.ston

@@ -3,5 +3,6 @@ GDKstonesStoneDirectorySpec {
 	#customenv: 'customenv',
 	#dbfSource : '$GEMSTONE/bin/extent0.seaside.dbf',
 	#bin : 'bin',
-	#logs : 'logs'
+	#logs : 'logs',
+	#userId : 'DataCurator'
 }