You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ma...@apache.org on 2021/11/03 17:27:58 UTC
[camel-karavan] branch main updated: Fixed #70 (#71)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 5927bc2 Fixed #70 (#71)
5927bc2 is described below
commit 5927bc2593453eab1407e5f45ce7235d11060798
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Wed Nov 3 13:27:34 2021 -0400
Fixed #70 (#71)
---
karavan-app/pom.xml | 2 +-
karavan-app/src/main/webapp/package.json | 2 +-
karavan-designer/package.json | 2 +-
karavan-generator/pom.xml | 2 +-
karavan-vscode/package.json | 18 +++++++++++++++++-
karavan-vscode/src/extension.ts | 12 +++++++++---
6 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml
index d127a42..6ba32f4 100644
--- a/karavan-app/pom.xml
+++ b/karavan-app/pom.xml
@@ -18,7 +18,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.camel.karavan</groupId>
- <version>0.0.5</version>
+ <version>0.0.6</version>
<artifactId>karavan</artifactId>
<properties>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
diff --git a/karavan-app/src/main/webapp/package.json b/karavan-app/src/main/webapp/package.json
index 8b1842c..22facc4 100644
--- a/karavan-app/src/main/webapp/package.json
+++ b/karavan-app/src/main/webapp/package.json
@@ -1,6 +1,6 @@
{
"name": "karavan",
- "version": "0.0.5",
+ "version": "0.0.6",
"private": true,
"dependencies": {
"@patternfly/patternfly": "^4.132.2",
diff --git a/karavan-designer/package.json b/karavan-designer/package.json
index 8518071..4470227 100644
--- a/karavan-designer/package.json
+++ b/karavan-designer/package.json
@@ -1,6 +1,6 @@
{
"name": "karavan-designer",
- "version": "0.0.5",
+ "version": "0.0.6",
"private": true,
"dependencies": {
"@patternfly/patternfly": "^4.132.2",
diff --git a/karavan-generator/pom.xml b/karavan-generator/pom.xml
index 007c78f..d187ce0 100644
--- a/karavan-generator/pom.xml
+++ b/karavan-generator/pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.camel.karavan</groupId>
<artifactId>karavan-generator</artifactId>
- <version>0.0.5</version>
+ <version>0.0.6</version>
<properties>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<maven.compiler.parameters>true</maven.compiler.parameters>
diff --git a/karavan-vscode/package.json b/karavan-vscode/package.json
index 7c6eba4..a585c12 100644
--- a/karavan-vscode/package.json
+++ b/karavan-vscode/package.json
@@ -4,7 +4,7 @@
"displayName": "Camel Karavan Designer",
"icon": "icons/icon.png",
"description": "Integration Designer for Apache Camel",
- "version": "0.0.5",
+ "version": "0.0.6",
"license": "Apache-2.0",
"preview": true,
"bugs": {
@@ -48,6 +48,22 @@
],
"main": "./dist/extension.js",
"contributes": {
+ "configuration": {
+ "title": "Karavan",
+ "properties": {
+ "CamelJBang.maxMessages": {
+ "type": "integer",
+ "default": 10,
+ "description": "CamelJBang: Max number of messages to process before stopping"
+ },
+ "CamelJBang.debugLevel": {
+ "type": "string",
+ "default": "info",
+ "enum": ["info", "error", "debug", "trace"],
+ "description": "Default debug level"
+ }
+ }
+ },
"commands": [
{
"command": "karavan.create-crd",
diff --git a/karavan-vscode/src/extension.ts b/karavan-vscode/src/extension.ts
index 4c4c962..93b4bbe 100644
--- a/karavan-vscode/src/extension.ts
+++ b/karavan-vscode/src/extension.ts
@@ -24,6 +24,7 @@ import { Integration } from "../designer/model/CamelModel";
const KARAVAN_LOADED = "karavan:loaded";
const KARAVAN_PANELS: Map<any, string> = new Map<string, string>();
+const TERMINALS: Map<string, vscode.Terminal> = new Map<string, vscode.Terminal>();
export function activate(context: vscode.ExtensionContext) {
const webviewContent = fs
@@ -47,7 +48,7 @@ export function activate(context: vscode.ExtensionContext) {
// Create new Camel-K Integration CRD command
const createCrd = vscode.commands.registerCommand("karavan.create-crd", () => createIntegration(context, webviewContent, true));
context.subscriptions.push(createCrd);
-
+
// Create new Camel Integration YAML command
const createYaml = vscode.commands.registerCommand("karavan.create-yaml", () => createIntegration(context, webviewContent, false));
context.subscriptions.push(createYaml);
@@ -197,9 +198,14 @@ function parceYaml(filename: string, yaml: string): [boolean, string?] {
}
function runCamelJbang(filename: string) {
- const terminal = vscode.window.createTerminal('Karavan: ' + filename);
+ const maxMessages = vscode.workspace.getConfiguration().get("CamelJBang.maxMessages");
+ const debugLevel = vscode.workspace.getConfiguration().get("CamelJBang.debugLevel");
+ const existTerminal = TERMINALS.get(filename);
+ if (existTerminal) existTerminal.dispose();
+ const terminal = vscode.window.createTerminal('CamelJBang: ' + filename);
+ TERMINALS.set(filename, terminal);
terminal.show();
- terminal.sendText("CamelJBang run " + filename);
+ terminal.sendText("CamelJBang run " + filename + " --max-messages=" + maxMessages + " --debug-level=" + debugLevel);
}
export function deactivate() {