diff --git a/solace-ep-eclipse-plugin-feature/feature.xml b/solace-ep-eclipse-plugin-feature/feature.xml index 5ec7ae4..2d4e3ab 100644 --- a/solace-ep-eclipse-plugin-feature/feature.xml +++ b/solace-ep-eclipse-plugin-feature/feature.xml @@ -2,7 +2,7 @@ @@ -218,9 +218,9 @@ limitations under the License. diff --git a/solace-ep-eclipse-plugin-view/.classpath b/solace-ep-eclipse-plugin-view/.classpath index a31d11e..3057908 100644 --- a/solace-ep-eclipse-plugin-view/.classpath +++ b/solace-ep-eclipse-plugin-view/.classpath @@ -1,43 +1,42 @@ + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - diff --git a/solace-ep-eclipse-plugin-view/META-INF/MANIFEST.MF b/solace-ep-eclipse-plugin-view/META-INF/MANIFEST.MF index 5f1aea4..d5417eb 100644 --- a/solace-ep-eclipse-plugin-view/META-INF/MANIFEST.MF +++ b/solace-ep-eclipse-plugin-view/META-INF/MANIFEST.MF @@ -3,47 +3,46 @@ Bundle-ManifestVersion: 2 Bundle-Name: Solace PubSub+ Event Portal plugin view Bundle-SymbolicName: com.solace.ep.eclipse.ui.EventPortal;singleton:=true Bundle-Vendor: Solace Inc. -Bundle-Version: 0.0.2.qualifier +Bundle-Version: 0.0.3 Bundle-Activator: com.solace.ep.eclipse.Activator Bundle-ClassPath: lib/aaron-solace-useful-utils-lib.jar, - lib/ep-openapi-java-0.2.1.jar, - lib/ep-wrapper-java-0.2.1-SNAPSHOT.jar, lib/annotations-13.0.jar, - lib/gson-fire-1.8.5.jar, lib/kotlin-stdlib-1.9.10.jar, lib/kotlin-stdlib-common-1.9.10.jar, lib/kotlin-stdlib-jdk7-1.9.10.jar, lib/kotlin-stdlib-jdk8-1.9.10.jar, lib/okhttp-4.12.0.jar, lib/okio-jvm-3.6.0.jar, - lib/sol-plat-openapi-java-0.2.0.jar, resources/, - lib/log4j-solace-appender-0.0.2.jar, - lib/sol-jcsmp-10.21.0.jar, ., - lib/commons-logging-1.2.jar, lib/gson-2.10.1.jar, lib/lombok-1.18.30.jar, lib/maven-model-3.9.6.jar, lib/plexus-utils-3.5.1.jar, - lib/stax2-api-4.2.1.jar, - lib/woodstox-core-6.5.1.jar, - lib/jackson-annotations-2.16.1.jar, - lib/jackson-core-2.16.1.jar, - lib/jackson-databind-2.16.1.jar, - lib/jackson-dataformat-xml-2.16.1.jar, lib/slf4j-api-2.0.12.jar, - lib/log4j-api-2.22.1.jar, - lib/log4j-core-2.22.1.jar, - lib/log4j-slf4j2-impl-2.22.1.jar, - lib/solace-ep-muleflow-1.0.4.jar, - lib/jackson-dataformat-yaml-2.17.0.jar, lib/snakeyaml-2.2.jar, lib/angus-activation-2.0.2.jar, lib/jakarta.activation-api-2.1.3.jar, lib/jakarta.xml.bind-api-4.0.2.jar, lib/jaxb-core-4.0.5.jar, - lib/jaxb-impl-4.0.5.jar + lib/jaxb-impl-4.0.5.jar, + lib/jackson-annotations-2.17.2.jar, + lib/jackson-core-2.17.2.jar, + lib/jackson-databind-2.17.2.jar, + lib/jackson-dataformat-xml-2.17.2.jar, + lib/jackson-dataformat-yaml-2.17.2.jar, + lib/stax2-api-4.2.2.jar, + lib/woodstox-core-6.7.0.jar, + lib/ep-openapi-java-0.3.0.jar, + lib/ep-wrapper-java-0.3.0-SNAPSHOT.jar, + lib/gson-fire-1.9.0.jar, + lib/solace-ep-codegen-1.1.1.jar, + lib/sol-plat-openapi-java-0.3.0.jar, + lib/log4j-api-2.24.1.jar, + lib/log4j-core-2.24.1.jar, + lib/log4j-jcl-2.24.1.jar, + lib/log4j-slf4j2-impl-2.24.1.jar, + lib/log4j-solace-appender-0.0.4-mega.jar Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, javax.annotation, diff --git a/solace-ep-eclipse-plugin-view/build.properties b/solace-ep-eclipse-plugin-view/build.properties index 2e7c3a7..1f2617b 100644 --- a/solace-ep-eclipse-plugin-view/build.properties +++ b/solace-ep-eclipse-plugin-view/build.properties @@ -6,39 +6,38 @@ bin.includes = plugin.xml,\ contexts.xml,\ lib/aaron-solace-useful-utils-lib.jar,\ lib/annotations-13.0.jar,\ - lib/gson-fire-1.8.5.jar,\ lib/kotlin-stdlib-1.9.10.jar,\ lib/kotlin-stdlib-common-1.9.10.jar,\ lib/kotlin-stdlib-jdk7-1.9.10.jar,\ lib/kotlin-stdlib-jdk8-1.9.10.jar,\ lib/okhttp-4.12.0.jar,\ lib/okio-jvm-3.6.0.jar,\ - lib/sol-plat-openapi-java-0.2.0.jar,\ - lib/ep-openapi-java-0.2.1.jar,\ - lib/ep-wrapper-java-0.2.1-SNAPSHOT.jar,\ resources/,\ - lib/sol-jcsmp-10.21.0.jar,\ - lib/log4j-solace-appender-0.0.2.jar,\ - lib/commons-logging-1.2.jar,\ lib/gson-2.10.1.jar,\ lib/lombok-1.18.30.jar,\ lib/maven-model-3.9.6.jar,\ lib/plexus-utils-3.5.1.jar,\ - lib/stax2-api-4.2.1.jar,\ - lib/woodstox-core-6.5.1.jar,\ - lib/jackson-annotations-2.16.1.jar,\ - lib/jackson-core-2.16.1.jar,\ - lib/jackson-databind-2.16.1.jar,\ - lib/jackson-dataformat-xml-2.16.1.jar,\ lib/slf4j-api-2.0.12.jar,\ - lib/log4j-api-2.22.1.jar,\ - lib/log4j-core-2.22.1.jar,\ - lib/log4j-slf4j2-impl-2.22.1.jar,\ - lib/solace-ep-muleflow-1.0.4.jar,\ - lib/jackson-dataformat-yaml-2.17.0.jar,\ lib/snakeyaml-2.2.jar,\ lib/angus-activation-2.0.2.jar,\ lib/jakarta.activation-api-2.1.3.jar,\ lib/jakarta.xml.bind-api-4.0.2.jar,\ lib/jaxb-core-4.0.5.jar,\ - lib/jaxb-impl-4.0.5.jar + lib/jaxb-impl-4.0.5.jar,\ + lib/jackson-annotations-2.17.2.jar,\ + lib/jackson-core-2.17.2.jar,\ + lib/jackson-databind-2.17.2.jar,\ + lib/jackson-dataformat-xml-2.17.2.jar,\ + lib/jackson-dataformat-yaml-2.17.2.jar,\ + lib/stax2-api-4.2.2.jar,\ + lib/woodstox-core-6.7.0.jar,\ + lib/ep-openapi-java-0.3.0.jar,\ + lib/ep-wrapper-java-0.3.0-SNAPSHOT.jar,\ + lib/gson-fire-1.9.0.jar,\ + lib/solace-ep-codegen-1.1.1.jar,\ + lib/sol-plat-openapi-java-0.3.0.jar,\ + lib/log4j-api-2.24.1.jar,\ + lib/log4j-core-2.24.1.jar,\ + lib/log4j-jcl-2.24.1.jar,\ + lib/log4j-slf4j2-impl-2.24.1.jar,\ + lib/log4j-solace-appender-0.0.4-mega.jar diff --git a/solace-ep-eclipse-plugin-view/lib/commons-logging-1.2.jar b/solace-ep-eclipse-plugin-view/lib/commons-logging-1.2.jar deleted file mode 100644 index 93a3b9f..0000000 Binary files a/solace-ep-eclipse-plugin-view/lib/commons-logging-1.2.jar and /dev/null differ diff --git a/solace-ep-eclipse-plugin-view/lib/ep-openapi-java-0.2.1.jar b/solace-ep-eclipse-plugin-view/lib/ep-openapi-java-0.2.1.jar deleted file mode 100644 index d65b0fa..0000000 Binary files a/solace-ep-eclipse-plugin-view/lib/ep-openapi-java-0.2.1.jar and /dev/null differ diff --git a/solace-ep-eclipse-plugin-view/lib/ep-openapi-java-0.3.0.jar b/solace-ep-eclipse-plugin-view/lib/ep-openapi-java-0.3.0.jar new file mode 100644 index 0000000..a4be785 Binary files /dev/null and b/solace-ep-eclipse-plugin-view/lib/ep-openapi-java-0.3.0.jar differ diff --git a/solace-ep-eclipse-plugin-view/lib/ep-wrapper-java-0.2.1-SNAPSHOT.jar b/solace-ep-eclipse-plugin-view/lib/ep-wrapper-java-0.2.1-SNAPSHOT.jar deleted file mode 100644 index 007f383..0000000 Binary files a/solace-ep-eclipse-plugin-view/lib/ep-wrapper-java-0.2.1-SNAPSHOT.jar and /dev/null differ diff --git a/solace-ep-eclipse-plugin-view/lib/ep-wrapper-java-0.3.0-SNAPSHOT.jar b/solace-ep-eclipse-plugin-view/lib/ep-wrapper-java-0.3.0-SNAPSHOT.jar new file mode 100644 index 0000000..e0cd2d0 Binary files /dev/null and b/solace-ep-eclipse-plugin-view/lib/ep-wrapper-java-0.3.0-SNAPSHOT.jar differ diff --git a/solace-ep-eclipse-plugin-view/lib/gson-fire-1.8.5.jar b/solace-ep-eclipse-plugin-view/lib/gson-fire-1.9.0.jar similarity index 74% rename from solace-ep-eclipse-plugin-view/lib/gson-fire-1.8.5.jar rename to solace-ep-eclipse-plugin-view/lib/gson-fire-1.9.0.jar index f600e87..f3d1be0 100644 Binary files a/solace-ep-eclipse-plugin-view/lib/gson-fire-1.8.5.jar and b/solace-ep-eclipse-plugin-view/lib/gson-fire-1.9.0.jar differ diff --git a/solace-ep-eclipse-plugin-view/lib/jackson-annotations-2.16.1.jar b/solace-ep-eclipse-plugin-view/lib/jackson-annotations-2.17.2.jar similarity index 77% rename from solace-ep-eclipse-plugin-view/lib/jackson-annotations-2.16.1.jar rename to solace-ep-eclipse-plugin-view/lib/jackson-annotations-2.17.2.jar index b9c48e6..c13bcb9 100644 Binary files a/solace-ep-eclipse-plugin-view/lib/jackson-annotations-2.16.1.jar and b/solace-ep-eclipse-plugin-view/lib/jackson-annotations-2.17.2.jar differ diff --git a/solace-ep-eclipse-plugin-view/lib/jackson-core-2.16.1.jar b/solace-ep-eclipse-plugin-view/lib/jackson-core-2.16.1.jar deleted file mode 100644 index a8ff5e3..0000000 Binary files a/solace-ep-eclipse-plugin-view/lib/jackson-core-2.16.1.jar and /dev/null differ diff --git a/solace-ep-eclipse-plugin-view/lib/jackson-core-2.17.2.jar b/solace-ep-eclipse-plugin-view/lib/jackson-core-2.17.2.jar new file mode 100644 index 0000000..34be902 Binary files /dev/null and b/solace-ep-eclipse-plugin-view/lib/jackson-core-2.17.2.jar differ diff --git a/solace-ep-eclipse-plugin-view/lib/jackson-databind-2.16.1.jar b/solace-ep-eclipse-plugin-view/lib/jackson-databind-2.17.2.jar similarity index 61% rename from solace-ep-eclipse-plugin-view/lib/jackson-databind-2.16.1.jar rename to solace-ep-eclipse-plugin-view/lib/jackson-databind-2.17.2.jar index 5171b7a..3750b8c 100644 Binary files a/solace-ep-eclipse-plugin-view/lib/jackson-databind-2.16.1.jar and b/solace-ep-eclipse-plugin-view/lib/jackson-databind-2.17.2.jar differ diff --git a/solace-ep-eclipse-plugin-view/lib/jackson-dataformat-xml-2.16.1.jar b/solace-ep-eclipse-plugin-view/lib/jackson-dataformat-xml-2.16.1.jar deleted file mode 100644 index 1cd03f2..0000000 Binary files a/solace-ep-eclipse-plugin-view/lib/jackson-dataformat-xml-2.16.1.jar and /dev/null differ diff --git a/solace-ep-eclipse-plugin-view/lib/jackson-dataformat-xml-2.17.2.jar b/solace-ep-eclipse-plugin-view/lib/jackson-dataformat-xml-2.17.2.jar new file mode 100644 index 0000000..aa865a3 Binary files /dev/null and b/solace-ep-eclipse-plugin-view/lib/jackson-dataformat-xml-2.17.2.jar differ diff --git a/solace-ep-eclipse-plugin-view/lib/jackson-dataformat-yaml-2.17.0.jar b/solace-ep-eclipse-plugin-view/lib/jackson-dataformat-yaml-2.17.2.jar similarity index 84% rename from solace-ep-eclipse-plugin-view/lib/jackson-dataformat-yaml-2.17.0.jar rename to solace-ep-eclipse-plugin-view/lib/jackson-dataformat-yaml-2.17.2.jar index 270349a..c47febc 100644 Binary files a/solace-ep-eclipse-plugin-view/lib/jackson-dataformat-yaml-2.17.0.jar and b/solace-ep-eclipse-plugin-view/lib/jackson-dataformat-yaml-2.17.2.jar differ diff --git a/solace-ep-eclipse-plugin-view/lib/log4j-api-2.22.1.jar b/solace-ep-eclipse-plugin-view/lib/log4j-api-2.22.1.jar deleted file mode 100644 index b77e55e..0000000 Binary files a/solace-ep-eclipse-plugin-view/lib/log4j-api-2.22.1.jar and /dev/null differ diff --git a/solace-ep-eclipse-plugin-view/lib/log4j-api-2.24.1.jar b/solace-ep-eclipse-plugin-view/lib/log4j-api-2.24.1.jar new file mode 100644 index 0000000..f9d5b43 Binary files /dev/null and b/solace-ep-eclipse-plugin-view/lib/log4j-api-2.24.1.jar differ diff --git a/solace-ep-eclipse-plugin-view/lib/log4j-core-2.22.1.jar b/solace-ep-eclipse-plugin-view/lib/log4j-core-2.24.1.jar similarity index 66% rename from solace-ep-eclipse-plugin-view/lib/log4j-core-2.22.1.jar rename to solace-ep-eclipse-plugin-view/lib/log4j-core-2.24.1.jar index 0be3f1f..ea8eefa 100644 Binary files a/solace-ep-eclipse-plugin-view/lib/log4j-core-2.22.1.jar and b/solace-ep-eclipse-plugin-view/lib/log4j-core-2.24.1.jar differ diff --git a/solace-ep-eclipse-plugin-view/lib/log4j-jcl-2.24.1.jar b/solace-ep-eclipse-plugin-view/lib/log4j-jcl-2.24.1.jar new file mode 100644 index 0000000..385ad6d Binary files /dev/null and b/solace-ep-eclipse-plugin-view/lib/log4j-jcl-2.24.1.jar differ diff --git a/solace-ep-eclipse-plugin-view/lib/log4j-slf4j2-impl-2.22.1.jar b/solace-ep-eclipse-plugin-view/lib/log4j-slf4j2-impl-2.24.1.jar similarity index 65% rename from solace-ep-eclipse-plugin-view/lib/log4j-slf4j2-impl-2.22.1.jar rename to solace-ep-eclipse-plugin-view/lib/log4j-slf4j2-impl-2.24.1.jar index 4767224..0a914b9 100644 Binary files a/solace-ep-eclipse-plugin-view/lib/log4j-slf4j2-impl-2.22.1.jar and b/solace-ep-eclipse-plugin-view/lib/log4j-slf4j2-impl-2.24.1.jar differ diff --git a/solace-ep-eclipse-plugin-view/lib/log4j-solace-appender-0.0.2.jar b/solace-ep-eclipse-plugin-view/lib/log4j-solace-appender-0.0.2.jar deleted file mode 100644 index 9c86bb0..0000000 Binary files a/solace-ep-eclipse-plugin-view/lib/log4j-solace-appender-0.0.2.jar and /dev/null differ diff --git a/solace-ep-eclipse-plugin-view/lib/log4j-solace-appender-0.0.4-mega.jar b/solace-ep-eclipse-plugin-view/lib/log4j-solace-appender-0.0.4-mega.jar new file mode 100644 index 0000000..1ec0358 Binary files /dev/null and b/solace-ep-eclipse-plugin-view/lib/log4j-solace-appender-0.0.4-mega.jar differ diff --git a/solace-ep-eclipse-plugin-view/lib/sol-jcsmp-10.21.0.jar b/solace-ep-eclipse-plugin-view/lib/sol-jcsmp-10.21.0.jar.bak similarity index 100% rename from solace-ep-eclipse-plugin-view/lib/sol-jcsmp-10.21.0.jar rename to solace-ep-eclipse-plugin-view/lib/sol-jcsmp-10.21.0.jar.bak diff --git a/solace-ep-eclipse-plugin-view/lib/sol-plat-openapi-java-0.2.0.jar b/solace-ep-eclipse-plugin-view/lib/sol-plat-openapi-java-0.2.0.jar deleted file mode 100644 index 7c4aee9..0000000 Binary files a/solace-ep-eclipse-plugin-view/lib/sol-plat-openapi-java-0.2.0.jar and /dev/null differ diff --git a/solace-ep-eclipse-plugin-view/lib/sol-plat-openapi-java-0.3.0.jar b/solace-ep-eclipse-plugin-view/lib/sol-plat-openapi-java-0.3.0.jar new file mode 100644 index 0000000..b5c8274 Binary files /dev/null and b/solace-ep-eclipse-plugin-view/lib/sol-plat-openapi-java-0.3.0.jar differ diff --git a/solace-ep-eclipse-plugin-view/lib/solace-ep-codegen-1.1.1.jar b/solace-ep-eclipse-plugin-view/lib/solace-ep-codegen-1.1.1.jar new file mode 100644 index 0000000..6254086 Binary files /dev/null and b/solace-ep-eclipse-plugin-view/lib/solace-ep-codegen-1.1.1.jar differ diff --git a/solace-ep-eclipse-plugin-view/lib/solace-ep-muleflow-1.0.4.jar b/solace-ep-eclipse-plugin-view/lib/solace-ep-muleflow-1.0.4.jar.bak similarity index 100% rename from solace-ep-eclipse-plugin-view/lib/solace-ep-muleflow-1.0.4.jar rename to solace-ep-eclipse-plugin-view/lib/solace-ep-muleflow-1.0.4.jar.bak diff --git a/solace-ep-eclipse-plugin-view/lib/stax2-api-4.2.1.jar b/solace-ep-eclipse-plugin-view/lib/stax2-api-4.2.2.jar similarity index 83% rename from solace-ep-eclipse-plugin-view/lib/stax2-api-4.2.1.jar rename to solace-ep-eclipse-plugin-view/lib/stax2-api-4.2.2.jar index 28c6a08..cc5844f 100644 Binary files a/solace-ep-eclipse-plugin-view/lib/stax2-api-4.2.1.jar and b/solace-ep-eclipse-plugin-view/lib/stax2-api-4.2.2.jar differ diff --git a/solace-ep-eclipse-plugin-view/lib/woodstox-core-6.5.1.jar b/solace-ep-eclipse-plugin-view/lib/woodstox-core-6.5.1.jar deleted file mode 100644 index b22b384..0000000 Binary files a/solace-ep-eclipse-plugin-view/lib/woodstox-core-6.5.1.jar and /dev/null differ diff --git a/solace-ep-eclipse-plugin-view/lib/woodstox-core-6.7.0.jar b/solace-ep-eclipse-plugin-view/lib/woodstox-core-6.7.0.jar new file mode 100644 index 0000000..a08cf71 Binary files /dev/null and b/solace-ep-eclipse-plugin-view/lib/woodstox-core-6.7.0.jar differ diff --git a/solace-ep-eclipse-plugin-view/src/com/solace/ep/eclipse/views/EventPortalView.java b/solace-ep-eclipse-plugin-view/src/com/solace/ep/eclipse/views/EventPortalView.java index ddb3759..5ad4628 100644 --- a/solace-ep-eclipse-plugin-view/src/com/solace/ep/eclipse/views/EventPortalView.java +++ b/solace-ep-eclipse-plugin-view/src/com/solace/ep/eclipse/views/EventPortalView.java @@ -534,6 +534,7 @@ public void run() { // System.err.println("chunk " + i + ": " + piece); // } EventPortalWrapper.INSTANCE.setToken(token); + EventPortalWrapper.INSTANCE.addUserAgentDetails("Eclipse/Mule plugin 20241014"); boolean success = EventPortalWrapper.INSTANCE.loadAll(executorService); // blocking call until all data loaded if (!success) { logger.warn("Could not load all Event Portal data! Ensure token has correct permissions."); diff --git a/solace-ep-eclipse-plugin-view/src/com/solace/ep/eclipse/views/SuperTabView.java b/solace-ep-eclipse-plugin-view/src/com/solace/ep/eclipse/views/SuperTabView.java index 82671e0..ab8ad06 100644 --- a/solace-ep-eclipse-plugin-view/src/com/solace/ep/eclipse/views/SuperTabView.java +++ b/solace-ep-eclipse-plugin-view/src/com/solace/ep/eclipse/views/SuperTabView.java @@ -32,18 +32,13 @@ import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CLabel; -import org.eclipse.swt.custom.CTabItem; import org.eclipse.swt.events.ControlEvent; import org.eclipse.swt.events.ControlListener; -import org.eclipse.swt.events.PaintEvent; -import org.eclipse.swt.events.PaintListener; -import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.Tree; @@ -55,9 +50,9 @@ import org.eclipse.ui.wizards.IWizardDescriptor; import org.eclipse.ui.wizards.IWizardRegistry; +import com.solace.ep.codegen.mule.eclipse.EclipseProjectGenerator; import com.solace.ep.eclipse.Activator; import com.solace.ep.eclipse.prefs.PreferenceConstants; -import com.solace.ep.muleflow.eclipse.EclipseProjectGenerator; import community.solace.ep.client.model.Application; import community.solace.ep.client.model.Application.BrokerTypeEnum; diff --git a/solace-ep-eclipse-plugin-view/src/com/solace/ep/eclipse/wizards/ImportAsyncAPIWizardHack.java b/solace-ep-eclipse-plugin-view/src/com/solace/ep/eclipse/wizards/ImportAsyncAPIWizardHack.java index f7222d5..0b21dc6 100644 --- a/solace-ep-eclipse-plugin-view/src/com/solace/ep/eclipse/wizards/ImportAsyncAPIWizardHack.java +++ b/solace-ep-eclipse-plugin-view/src/com/solace/ep/eclipse/wizards/ImportAsyncAPIWizardHack.java @@ -22,10 +22,10 @@ import org.eclipse.ui.wizards.IWizardDescriptor; import org.eclipse.ui.wizards.IWizardRegistry; +import com.solace.ep.codegen.mule.eclipse.EclipseProjectGenerator; import com.solace.ep.eclipse.prefs.PreferenceConstants; import com.solace.ep.eclipse.views.EventPortalView; import com.solace.ep.eclipse.views.UsefulUtils; -import com.solace.ep.muleflow.eclipse.EclipseProjectGenerator; import dev.solace.aaron.useful.FileUtils;