Remove Software AG references from source code (#61)

This is a BREAKING change. Due to the unofficial nature of this plugin, no official migration path will be offered.

README.md

@@ -32,7 +32,7 @@ Based on the theme you choose the EPL code will be highlighted and easier to rea
 
 ## Settings
 
-There are various settings available for the extension now. All the Apama configuration entries are prefixed 'SoftwareAG.Apama', and searching for 'Apama' will show all of them.
+There are various settings available for the extension now. All the Apama configuration entries are prefixed 'Apama', and searching for 'Apama' will show all of them.
 
 * ApamaHome contains the path to the installation directory of the version you wish to use.
 * DebugHost is the default host for a correlator started for debug (allowing remote instance).
@@ -42,8 +42,6 @@ There are various settings available for the extension now. All the Apama config
   * Langserver.Port is the port the Langserver is running on.
   * Langserver.MaxErrors is the maximum number of diagnostics that should be returned by the LSP (INACTIVE)
 
-There are also some placeholders for using EPL with [Cumulocity IoT](https://www.softwareag.cloud/site/product/cumulocity-iot.html). these will become active in a later release (>v1.0).
-
 ![settings](images/settings.png)
 
 ## Diagnostics
@@ -80,7 +78,7 @@ The animation below shows how to create a non-default tasks (allowing multiple c
 
 ## Create Project
 
-The apama_project tool can be used to create projects which are compatible with the eclipse-based 'Software Ag Designer' IDE, and will also allow you to edit Designer created projects in vscode.
+The apama_project tool can be used to create projects which are compatible with the eclipse-based IDE, and will also allow you to edit Designer created projects in vscode.
 
 ![project support](images/4-project-create.gif)
 
@@ -125,6 +123,7 @@ To use the diagnostics capability you must have version 10.5.3 or later of Apama
 ## v2.0.0
 
 * Stops the extension startup from stealing application focus.
+* Changes all extension preferences: the "softwareag" prefixed has been removed. No migration path is provided.
 
 ## v1.2.1
 

package.json

@@ -24,22 +24,22 @@
     "configuration": {
       "title": "Apama",
       "properties": {
-        "softwareag.apama.apamahome": {
+        "apama.apamahome": {
           "type": "string",
-          "default": "c:\\softwareag\\apama",
+          "default": "c:\\apama",
           "description": "Home directory for the Apama installation."
         },
-        "softwareag.apama.debugport": {
+        "apama.debugport": {
           "type": "integer",
           "default": "15904",
           "description": "Default port for correlator debugging."
         },
-        "softwareag.apama.debughost": {
+        "apama.debughost": {
           "type": "string",
           "default": "127.0.0.1",
           "description": "Default host for correlator debugging."
         },
-        "softwareag.apama.langserver.type": {
+        "apama.langserver.type": {
           "type": "string",
           "enum": [
             "local",
@@ -49,37 +49,37 @@
           "default": "local",
           "description": "Whether vscode should start the language server locally."
         },
-        "softwareag.apama.langserver.port": {
+        "apama.langserver.port": {
           "type": "integer",
           "default": "30030",
           "description": "The Apama language server port."
         },
-        "softwareag.apama.langserver.host": {
+        "apama.langserver.host": {
           "type": "string",
           "default": "127.0.0.1",
           "description": "Default host the Apama langserver will listen for connections on."
         },
-        "softwareag.apama.langserver.maxErrors": {
+        "apama.langserver.maxErrors": {
           "type": "integer",
           "default": "100",
           "description": "The maximum number of diagnostics that the Apama language server will return."
         },
-        "softwareag.c8y.url": {
+        "apama.c8y.url": {
           "type": "string",
           "default": "https://demos.cumulocity.com/",
           "description": "Url of the cumulocity instance."
         },
-        "softwareag.c8y.tenant": {
+        "apama.c8y.tenant": {
           "type": "string",
           "default": "demos",
           "description": "Tenant Id: click on user at the top right of the cumulocity application."
         },
-        "softwareag.c8y.user": {
+        "apama.c8y.user": {
           "type": "string",
           "default": "user",
           "description": "User name you log in as."
         },
-        "softwareag.c8y.password": {
+        "apama.c8y.password": {
           "type": "string",
           "default": "pw",
           "description": "password for cumulocity."

src/apama_debug/apamadebugconfig.ts

@@ -18,7 +18,7 @@ export class ApamaDebugConfigurationProvider implements DebugConfigurationProvid
      *  Return an initial debug configuration
      */
     provideDebugConfigurations(folder: WorkspaceFolder | undefined, token?: CancellationToken): ProviderResult<DebugConfiguration[]> {
-        const config = workspace.getConfiguration("softwareag.apama");
+        const config = workspace.getConfiguration("apama");
         return [ {
             type: "apama",
             name: "Debug Apama Application",
@@ -59,7 +59,7 @@ export class ApamaDebugConfigurationProvider implements DebugConfigurationProvid
         config.injectionList = getInjectionList(this.apamaEnv, folder.uri.fsPath);
         config.correlator =  {};
         config.correlator.host = "127.0.0.1";
-        config.correlator.port = workspace.getConfiguration("softwareag.apama").get("debugport");
+        config.correlator.port = workspace.getConfiguration("apama").get("debugport");
         config.correlator.args = ["-g"];
     }
 

src/apama_util/apamaenvironment.ts

@@ -4,7 +4,7 @@ import { join } from 'path';
 
 
 
-const confignode = 'softwareag.apama';
+const confignode = 'apama';
 const default_linux_correlator = 'correlator';
 const default_windows_correlator = 'correlator.exe';
 const default_linux_deploy = 'engine_deploy';

src/apama_util/commands.ts

@@ -24,7 +24,7 @@ export class ApamaCommandProvider {
   registerCommands(): void {
 
     if (this.context !== undefined) {
-      const port: any = workspace.getConfiguration("softwareag.apama").get("debugport");
+      const port: any = workspace.getConfiguration("apama").get("debugport");
       this.context.subscriptions.push.apply(this.context.subscriptions,
         [
           //

src/c8y/cumulocityView.ts

@@ -68,7 +68,7 @@ export class CumulocityView implements vscode.TreeDataProvider<EPLApplication> {
 				// inventory using sdk
 				//
 				vscode.commands.registerCommand('extension.c8y.login', async () => {
-					const config: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration('softwareag.c8y');
+					const config: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration('apama.c8y');
 
 					if( config ) {
 						const tenant:string = config.get('tenant',"");
@@ -107,7 +107,7 @@ export class CumulocityView implements vscode.TreeDataProvider<EPLApplication> {
 							appname = appname.slice(0, -4);
 						}
 
-						const config: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration('softwareag.c8y');
+						const config: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration('apama.c8y');
 						let url: string = config.get('url',""); // C8Y host
 						if (!url.endsWith("/")) {
 							url += "/";
@@ -172,7 +172,7 @@ export class CumulocityView implements vscode.TreeDataProvider<EPLApplication> {
 	async refresh(): Promise<void> {
 		this.filelist = [];
 		try {
-			const config: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration('softwareag.c8y');
+			const config: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration('apama.c8y');
 			const url: string = config.get('url',"") + "service/cep/eplfiles?contents=true";
 			const options: AxiosRequestConfig = {
 				auth: {

src/extension.ts

@@ -75,7 +75,7 @@ export async function activate(context: ExtensionContext): Promise<void> {
 			logger.appendLine(`Version: ${corrVersion} doesn't support the Apama Language Server - Skipping`);
 		}
 		else {
-			const config = workspace.getConfiguration("softwareag.apama.langserver");
+			const config = workspace.getConfiguration("apama.langserver");
 			createLangServerTCP(apamaEnv, config, logger);
 		}
 	})