Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ Also, a [nightly build](https://download.jboss.org/jbosstools/photon/snapshots/b
* Download and install Red Hat CodeReady Studio [installer 12.13.0.GA](https://tools.jboss.org/downloads/devstudio/2019-09/12.13.0.GA.html#direct_download)
* Download the latest release of the MTA [plugin](https://download.jboss.org/jbosstools/photon/stable/updates/mta).

## Latest Release

* 5.3.0.Alpha3

## Get the code

Expand Down
2 changes: 1 addition & 1 deletion features/org.jboss.tools.windup.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.windup.feature"
label="%featureName"
version="5.3.1.Alpha"
version="5.3.1.qualifier"
plugin="org.jboss.tools.windup.ui"
license-feature="org.jboss.tools.foundation.license.feature"
provider-name="%providerName"
Expand Down
2 changes: 1 addition & 1 deletion features/org.jboss.tools.windup.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.windup</groupId>
<artifactId>features</artifactId>
<version>5.3.1.Alpha</version>
<version>5.3.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.windup.features</groupId>
<artifactId>org.jboss.tools.windup.feature</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>windup</artifactId>
<version>5.3.1.Alpha</version>
<version>5.3.1-SNAPSHOT</version>
</parent>

<groupId>org.jboss.tools.windup</groupId>
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.windup.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.jboss.tools.windup.core;singleton:=true
Bundle-Version: 5.3.1.Alpha
Bundle-Version: 5.3.1.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.jboss.tools.windup.core.WindupCorePlugin
Bundle-Vendor: %plugin.vendor
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.windup.core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.jboss.tools.windup</groupId>
<artifactId>plugins</artifactId>
<version>5.3.1.Alpha</version>
<version>5.3.1-SNAPSHOT</version>
</parent>

<groupId>org.jboss.tools.windup.plugins</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.jboss.tools.windup.model.edit;singleton:=true
Bundle-Version: 5.3.1.Alpha
Bundle-Version: 5.3.1.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.jboss.tools.windup.model.edit.domain.WindupEditPlugin
Bundle-Vendor: %providerName
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.windup.model.edit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.tools.windup</groupId>
<artifactId>plugins</artifactId>
<version>5.3.1.Alpha</version>
<version>5.3.1-SNAPSHOT</version>
</parent>

<groupId>org.jboss.tools.windup.plugins</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.jboss.tools.windup.model.editor;singleton:=true
Bundle-Version: 5.3.1.Alpha
Bundle-Version: 5.3.1.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.jboss.tools.windup.windup.presentation.WindupEditorPlugin$Implementation
Bundle-Vendor: %providerName
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.windup.model.editor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.tools.windup</groupId>
<artifactId>plugins</artifactId>
<version>5.3.1.Alpha</version>
<version>5.3.1-SNAPSHOT</version>
</parent>

<groupId>org.jboss.tools.windup.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.windup.model/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Model
Bundle-SymbolicName: org.jboss.tools.windup.model;singleton:=true
Bundle-Version: 5.3.1.Alpha
Bundle-Version: 5.3.1.qualifier
Eclipse-BundleShape: dir
Bundle-Activator: org.jboss.tools.windup.model.Activator
Require-Bundle: org.eclipse.ui,
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.windup.model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.tools.windup</groupId>
<artifactId>plugins</artifactId>
<version>5.3.1.Alpha</version>
<version>5.3.1-SNAPSHOT</version>
</parent>

<groupId>org.jboss.tools.windup.plugins</groupId>
Expand Down
14 changes: 7 additions & 7 deletions plugins/org.jboss.tools.windup.runtime/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Localization: plugin
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.jboss.tools.windup.runtime;singleton:=true
Bundle-Version: 5.3.1.Alpha
Bundle-Version: 5.3.1.qualifier
Bundle-Activator: org.jboss.tools.windup.runtime.WindupRuntimePlugin
Eclipse-BundleShape: dir
Require-Bundle: org.eclipse.core.runtime,
Expand Down Expand Up @@ -33,12 +33,12 @@ Bundle-ClassPath: .,
lib/xsoup.jar,
lib/commons-exec-1.3.jar,
lib/dom4j-1.6.1.jar,
lib/windup-tooling-api-5.3.0.Final.jar,
lib/windup-tooling-impl-5.3.0.Final.jar,
lib/windup-utils-5.3.0.Final.jar,
lib/windup-graph-api-5.3.0.Final.jar,
lib/windup-config-api-5.3.0.Final.jar,
lib/windup-config-xml-5.3.0.Final.jar,
lib/windup-tooling-api-5.3.1-SNAPSHOT.jar,
lib/windup-tooling-impl-5.3.1-SNAPSHOT.jar,
lib/windup-utils-5.3.1-SNAPSHOT.jar,
lib/windup-graph-api-5.3.1-SNAPSHOT.jar,
lib/windup-config-api-5.3.1-SNAPSHOT.jar,
lib/windup-config-xml-5.3.1-SNAPSHOT.jar,
lib/markdown4j-2.2-cj-1.1.jar
Export-Package: org.eclipse.xtend.core,
org.eclipse.xtend.core.compiler,
Expand Down
12 changes: 6 additions & 6 deletions plugins/org.jboss.tools.windup.runtime/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ bin.includes = .,\
xtext/org.eclipse.xtext.xbase.lib-2.11.0.jar,\
lib/commons-exec-1.3.jar,\
lib/dom4j-1.6.1.jar,\
lib/windup-tooling-api-5.3.0.Final.jar,\
lib/windup-tooling-impl-5.3.0.Final.jar,\
lib/windup-config-api-5.3.0.Final.jar,\
lib/windup-graph-api-5.3.0.Final.jar,\
lib/windup-utils-5.3.0.Final.jar,\
lib/windup-config-xml-5.3.0.Final.jar,\
lib/windup-tooling-api-5.3.1-SNAPSHOT.jar,\
lib/windup-tooling-impl-5.3.1-SNAPSHOT.jar,\
lib/windup-config-api-5.3.1-SNAPSHOT.jar,\
lib/windup-graph-api-5.3.1-SNAPSHOT.jar,\
lib/windup-utils-5.3.1-SNAPSHOT.jar,\
lib/windup-config-xml-5.3.1-SNAPSHOT.jar,\
lib/markdown4j-2.2-cj-1.1.jar
src.includes = pom.xml
jars.compile.order = .
Expand Down
6 changes: 3 additions & 3 deletions plugins/org.jboss.tools.windup.runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.tools.windup</groupId>
<artifactId>plugins</artifactId>
<version>5.3.1.Alpha</version>
<version>5.3.1-SNAPSHOT</version>
</parent>

<groupId>org.jboss.tools.windup.plugins</groupId>
Expand All @@ -29,7 +29,7 @@
<classifier>offline</classifier> -->

<groupId>org.jboss.windup</groupId>
<artifactId>mta-cli</artifactId>
<artifactId>windup-cli</artifactId>
<version>${windup.version}</version>
<classifier>no-index</classifier>

Expand Down Expand Up @@ -158,7 +158,7 @@
<artifactItems>
<artifactItem>
<groupId>org.jboss.windup</groupId>
<artifactId>mta-cli</artifactId>
<artifactId>windup-cli</artifactId>
<version>${windup.version}</version>
<classifier>no-index</classifier>
<type>zip</type>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,19 +102,19 @@ private String doGetJavaHome() {
}

public void startWindup(final IProgressMonitor monitor, String jreHome) {
logInfo("Begin start MTA."); //$NON-NLS-1$
logInfo("Begin start Windup."); //$NON-NLS-1$
monitor.worked(1);

String windupExecutable = WindupRuntimePlugin.computeWindupExecutable();

if (windupExecutable == null) {
WindupRuntimePlugin.logErrorMessage("mta-cli not specified."); //$NON-NLS-1$
WindupRuntimePlugin.logErrorMessage("windup-cli not specified."); //$NON-NLS-1$
return;
}

boolean executable = new File(windupExecutable).setExecutable(true);
if (!executable) {
WindupRuntimePlugin.logErrorMessage("mta-cli not executable."); //$NON-NLS-1$
WindupRuntimePlugin.logErrorMessage("windup-cli not executable."); //$NON-NLS-1$
return;
}

Expand All @@ -136,14 +136,14 @@ public void startWindup(final IProgressMonitor monitor, String jreHome) {
ExecuteResultHandler handler = new ExecuteResultHandler() {
@Override
public void onProcessFailed(ExecuteException e) {
logInfo("The MTA process failed:"); //$NON-NLS-1$
logInfo("The Windup process failed:"); //$NON-NLS-1$
logInfo(e.getMessage()); //$NON-NLS-1$
executionBuilder = null;
notifyServerChanged();
}
@Override
public void onProcessComplete(int exitValue) {
logInfo("The MTA process has completed."); //$NON-NLS-1$
logInfo("The Windup process has completed."); //$NON-NLS-1$
executionBuilder = null;
notifyServerChanged();
}
Expand All @@ -160,7 +160,7 @@ protected void processLine(String line, int logLevel) {
executor.setExitValue(1);
monitor.worked(1);
try {
logInfo("Starting MTA in server mode..."); //$NON-NLS-1$
logInfo("Starting Windup in server mode..."); //$NON-NLS-1$
logInfo("Command-line: " + cmdLine); //$NON-NLS-1$
executor.execute(cmdLine, env, handler);
} catch (IOException e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public static Path computeWindupHome() {
}

public static String computeWindupExecutable() {
String location = WindupRuntimePlugin.computeWindupHome().resolve("bin").resolve("mta-cli").toString(); //$NON-NLS-1$ //$NON-NLS-2$
String location = WindupRuntimePlugin.computeWindupHome().resolve("bin").resolve("windup-cli").toString(); //$NON-NLS-1$ //$NON-NLS-2$
if (PlatformUtil.isWindows()) {
location = location + ".bat"; //$NON-NLS-1$
}
Expand Down
3 changes: 1 addition & 2 deletions plugins/org.jboss.tools.windup.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.jboss.tools.windup.ui;singleton:=true
Bundle-Version: 5.3.1.Alpha
Bundle-Version: 5.3.1.qualifier
Eclipse-BundleShape: dir
Bundle-ClassPath: .,
lib/org.eclipse.mylyn.wikitext.markdown.jar,
Expand Down Expand Up @@ -72,7 +72,6 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.pde.ui,
org.eclipse.swt,
org.eclipse.wst.xml.xpath.core,
org.eclipse.mylyn.commons.workbench,
javax.inject,
com.google.inject,
javax.annotation;bundle-version="1.3.5",
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.jboss.tools.windup.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.tools.windup</groupId>
<artifactId>plugins</artifactId>
<version>5.3.1.Alpha</version>
<version>5.3.1-SNAPSHOT</version>
</parent>

<groupId>org.jboss.tools.windup.plugins</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ WindupServerLabel=MTA Server
WindupShutdowCheck=Checking for existing MTA server.
WindupShuttingDown=Shutting Down MTA Server
WindupShuttingDownError=Error occurred while trying to shutdown the MTA server.
WindupRunStartScipt=Executing mta-cli startup script. This may take a moment...
WindupRunStartScipt=Executing windup-cli startup script. This may take a moment...

WindupNotExecutableTitle=Error while running MTA
WindupNotExecutableInfo=The MTA script is not executable.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.mylyn.commons.workbench.forms.DatePicker;
// import org.eclipse.mylyn.commons.workbench.forms.DatePicker;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
Expand Down Expand Up @@ -44,9 +44,9 @@ public class RuleStatusSection extends ElementAttributesContainer {
private Button statusCompleteButton;
private Button statusIncompleteButton;

private DatePicker createdDate;
private DatePicker dueDate;
private DatePicker completedDate;
// private DatePicker createdDate;
// private DatePicker dueDate;
// private DatePicker completedDate;
private Text assignedTo;

@Override
Expand Down Expand Up @@ -83,26 +83,26 @@ public void widgetSelected(SelectionEvent e) {
}
});

createdDate = createDatePicker(toolkit, container, RuleMessages.TaskPlanning_Created);
createdDate.addPickerSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent arg0) {
}
});
// createdDate = createDatePicker(toolkit, container, RuleMessages.TaskPlanning_Created);
// createdDate.addPickerSelectionListener(new SelectionAdapter() {
// @Override
// public void widgetSelected(SelectionEvent arg0) {
// }
// });

dueDate = createDatePicker(toolkit, container, RuleMessages.TaskPlanning_Due);
dueDate.addPickerSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent arg0) {
}
});
// dueDate = createDatePicker(toolkit, container, RuleMessages.TaskPlanning_Due);
// dueDate.addPickerSelectionListener(new SelectionAdapter() {
// @Override
// public void widgetSelected(SelectionEvent arg0) {
// }
// });

completedDate = createDatePicker(toolkit, container, RuleMessages.TaskPlanning_Completed);
completedDate.addPickerSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent arg0) {
}
});
// completedDate = createDatePicker(toolkit, container, RuleMessages.TaskPlanning_Completed);
// completedDate.addPickerSelectionListener(new SelectionAdapter() {
// @Override
// public void widgetSelected(SelectionEvent arg0) {
// }
// });

container = toolkit.createComposite(container);
GridLayoutFactory.fillDefaults().numColumns(2).margins(0, 5).applyTo(container);
Expand All @@ -127,25 +127,25 @@ private Label createLabel(Composite composite, FormToolkit toolkit, String label
return labelControl;
}

private static DatePicker createDatePicker(FormToolkit toolkit, Composite parent, String textLabel) {
Label label = toolkit.createLabel(parent, textLabel);
label.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
// private static DatePicker createDatePicker(FormToolkit toolkit, Composite parent, String textLabel) {
// Label label = toolkit.createLabel(parent, textLabel);
// label.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));

Composite composite = createComposite(parent, 1, toolkit);

DatePicker datePicker = new DatePicker(composite, SWT.FLAT, DatePicker.LABEL_CHOOSE, true, 0);
GridDataFactory.fillDefaults().hint(CONTROL_WIDTH, SWT.DEFAULT).applyTo(datePicker);
datePicker.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_WHITE));
datePicker.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TREE_BORDER);
/*if (getTask().getDueDate() != null) {
Calendar calendar = TaskActivityUtil.getCalendar();
calendar.setTime(getTask().getDueDate());
createdDate.setDate(calendar);
}*/
toolkit.adapt(datePicker, false, false);
toolkit.paintBordersFor(composite);
return datePicker;
}
// Composite composite = createComposite(parent, 1, toolkit);
// DatePicker datePicker = new DatePicker(composite, SWT.FLAT, DatePicker.LABEL_CHOOSE, true, 0);
// GridDataFactory.fillDefaults().hint(CONTROL_WIDTH, SWT.DEFAULT).applyTo(datePicker);
// datePicker.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_WHITE));
// datePicker.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TREE_BORDER);
// /*if (getTask().getDueDate() != null) {
// Calendar calendar = TaskActivityUtil.getCalendar();
// calendar.setTime(getTask().getDueDate());
// createdDate.setDate(calendar);
// }*/
// toolkit.adapt(datePicker, false, false);
// toolkit.paintBordersFor(composite);
// return datePicker;
// }

private static Composite createComposite(Composite parent, int col, FormToolkit toolkit) {
Composite nameValueComp = toolkit.createComposite(parent);
Expand Down
2 changes: 1 addition & 1 deletion plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>windup</artifactId>
<version>5.3.1.Alpha</version>
<version>5.3.1-SNAPSHOT</version>
</parent>

<groupId>org.jboss.tools.windup</groupId>
Expand Down
Loading