JBoss Tools SVN: r41851 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2012-06-09 10:04:51 -0400 (Sat, 09 Jun 2012)
New Revision: 41851
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
Log:
JBIDE-10738
As-you-type EL validation
JUnit test is added for JSF project
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2012-06-09 14:04:08 UTC (rev 41850)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2012-06-09 14:04:51 UTC (rev 41851)
@@ -55,7 +55,6 @@
TestSuite suite = new TestSuite("JSF UI tests"); //$NON-NLS-1$
ValidationFramework.getDefault().suspendAllValidation(true);
-/*
suite.addTestSuite(JBossPerspectiveTest.class);
suite.addTestSuite(NewJSFProjectTest.class);
suite.addTestSuite(CAForUnclosedELTest.class);
@@ -171,7 +170,7 @@
CAJsfResourceBundlePropertyApplyTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$
new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$
new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$
-*/
+
suite.addTest(new ProjectImportTestSetup(new TestSuite(
JSFAsYouTypeInJavaValidationTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$
new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r41850 - in trunk: common/tests/org.jboss.tools.common.base.test/META-INF and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2012-06-09 10:04:08 -0400 (Sat, 09 Jun 2012)
New Revision: 41850
Added:
trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/java/
trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/java/BaseAsYouTypeInJavaValidationTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/validation/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/validation/java/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/validation/java/JSFAsYouTypeInJavaValidationTest.java
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java
trunk/common/tests/org.jboss.tools.common.base.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
Log:
JBIDE-10738
As-you-type EL validation
JUnit test is added for JSF project
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java 2012-06-09 07:36:04 UTC (rev 41849)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java 2012-06-09 14:04:08 UTC (rev 41850)
@@ -65,9 +65,11 @@
private boolean fIsCanceled = false;
private boolean fInRewriteSession = false;
private IDocumentRewriteSessionListener fDocumentRewriteSessionListener = new DocumentRewriteSessionListener();
+ // AsYouType EL Validation 'marker type' name.
+ // marker type is used in the quickFixProcessor extension point
+ public static final String MARKER_TYPE= "org.jboss.tools.common.validation.el"; //$NON-NLS-1$
public final class JavaELProblemReporter implements IReporter {
- public static final String MARKER_TYPE= "org.jboss.tools.common.validation.el"; //$NON-NLS-1$
private IFile fFile;
private ICompilationUnit fCompilationUnit;
private IAnnotationModel fAnnotationModel;
@@ -163,7 +165,7 @@
}
fAnnotations.put(annotation, position);
- getAnnotationModel().addAnnotation(annotation, position);
+ fAnnotationModel.addAnnotation(annotation, position);
}
@Override
@@ -195,10 +197,6 @@
}
class CoreELProblem extends CategorizedProblem {
- // spelling 'marker type' name. Only virtual as spelling problems are never persisted in markers.
- // marker type is used in the quickFixProcessor extension point
- public static final String MARKER_TYPE= "org.jboss.tools.common.validation.el"; //$NON-NLS-1$
-
/** The end offset of the problem */
private int fSourceEnd= 0;
@@ -471,7 +469,7 @@
}
for (int i = 0; i < partitions.length; i++) {
if (partitions[i] != null && !fIsCanceled && IJavaPartitions.JAVA_STRING.equals(partitions[i].getType())) {
- if (fValidatorManager != null)
+ if (fValidatorManager != null)
fValidatorManager.validate(partitions[i], fHelper, fReporter);
}
}
Modified: trunk/common/tests/org.jboss.tools.common.base.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/tests/org.jboss.tools.common.base.test/META-INF/MANIFEST.MF 2012-06-09 07:36:04 UTC (rev 41849)
+++ trunk/common/tests/org.jboss.tools.common.base.test/META-INF/MANIFEST.MF 2012-06-09 14:04:08 UTC (rev 41850)
@@ -10,7 +10,8 @@
org.jboss.tools.common.base.test.contentassist,
org.jboss.tools.common.base.test.kb,
org.jboss.tools.common.base.test.model,
- org.jboss.tools.common.base.test.validation
+ org.jboss.tools.common.base.test.validation,
+ org.jboss.tools.common.base.test.validation.java
Require-Bundle: org.jboss.tools.common,
org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.ui;bundle-version="3.7.0",
Added: trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/java/BaseAsYouTypeInJavaValidationTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/java/BaseAsYouTypeInJavaValidationTest.java (rev 0)
+++ trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/java/BaseAsYouTypeInJavaValidationTest.java 2012-06-09 14:04:08 UTC (rev 41850)
@@ -0,0 +1,239 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.base.test.validation.java;
+
+import java.util.Iterator;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.WorkingCopyOwner;
+import org.eclipse.jdt.internal.ui.javaeditor.ClassFileEditor;
+import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitDocumentProvider.ProblemAnnotation;
+import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.Position;
+import org.eclipse.jface.text.source.IAnnotationModel;
+import org.eclipse.jface.text.source.ISourceViewer;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.text.edits.MultiTextEdit;
+import org.eclipse.text.edits.ReplaceEdit;
+import org.eclipse.text.edits.TextEdit;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+import org.jboss.tools.common.EclipseUtil;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.WorkbenchUtils;
+
+/**
+ *
+ * @author Victor V. Rubezhny
+ *
+ */
+public class BaseAsYouTypeInJavaValidationTest extends TestCase {
+ private static final int MAX_SECONDS_TO_WAIT = 10;
+
+ protected String fileName;
+ protected IProject project = null;
+ protected IEditorPart editorPart = null;
+ protected JavaEditor javaEditor = null;
+ protected ISourceViewer viewer = null;
+ protected IDocument document = null;
+ protected IFile file = null;
+ protected ICompilationUnit unit = null;
+ IAnnotationModel annotationModel = null;
+
+ /** The working copy owner */
+ protected final WorkingCopyOwner workingCopyOwner = new WorkingCopyOwner() {
+ };
+
+ public static final String MARKER_TYPE = "org.jboss.tools.common.validation.el"; //$NON-NLS-1$
+ public static final String EL2FIND_START = "#{";
+ public static final String EL2FIND_END = "}";
+
+ public void openEditor(String fileName) {
+ this.fileName = fileName;
+ editorPart = WorkbenchUtils.openEditor(project.getName()
+ + "/" + fileName); //$NON-NLS-1$
+ obtainJavaEditor(editorPart);
+ viewer = getTextViewer();
+ document = viewer.getDocument();
+ }
+
+ public void closeEditor() {
+ if (editorPart != null) {
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow()
+ .getActivePage().closeEditor(editorPart, false);
+ editorPart = null;
+ javaEditor = null;
+ viewer = null;
+ document = null;
+ }
+ }
+
+ protected void obtainJavaEditor(IEditorPart editorPart) {
+ if (!(editorPart instanceof JavaEditor)
+ || editorPart instanceof ClassFileEditor)
+ return;
+
+ javaEditor = (JavaEditor) editorPart;
+
+ assertNotNull(
+ "Cannot get the Java Text Editor instance for Java Class file \"" //$NON-NLS-1$
+ + fileName + "\"", javaEditor);
+
+ assertTrue("Java Editor is opened for a binary Java Class",
+ javaEditor.getEditorInput() instanceof IFileEditorInput);
+ file = ((IFileEditorInput) javaEditor.getEditorInput()).getFile();
+ assertNotNull("Java Editor is opened for a binary Java Class", file);
+
+ unit = EclipseUtil.getCompilationUnit(file);
+ assertNotNull("Cannot find a Compilation Unit for Source file", unit);
+
+ annotationModel = getAnnotationModel();
+ assertNotNull("Cannot find an Annotation Model for the Java Editor",
+ annotationModel);
+
+ // clean deffered events
+ while (Display.getCurrent().readAndDispatch())
+ ;
+ }
+
+ protected IAnnotationModel getAnnotationModel() {
+ final IDocumentProvider documentProvider = javaEditor
+ .getDocumentProvider();
+ if (documentProvider == null) {
+ return null;
+ }
+ return documentProvider.getAnnotationModel(javaEditor.getEditorInput());
+ }
+
+ protected ISourceViewer getTextViewer() {
+ return javaEditor != null ? javaEditor.getViewer() : null;
+ }
+
+ protected void doAsYouTipeInJavaValidationTest(String elToValidate,
+ String errorMessage) throws JavaModelException {
+ String documentContent = document.get();
+ int start = (documentContent == null ? -1 : documentContent
+ .indexOf(EL2FIND_START));
+ assertFalse("No EL found in Java Strings: Starting '" + EL2FIND_START
+ + "' characters are not found in document", (start == -1));
+ int end = (documentContent == null ? -1 : documentContent.indexOf(
+ EL2FIND_END, start));
+ assertFalse("EL is not closed in Java Strings: Ending '"
+ + EL2FIND_START + "' characters are not found in document",
+ (end == -1));
+
+ int offset = start;
+ int length = end - start + EL2FIND_END.length();
+
+ IProgressMonitor monitor = new NullProgressMonitor();
+ modifyDocumentContent(unit, start, length, elToValidate, monitor);
+
+ end = start + elToValidate.length();
+
+ ProblemAnnotation problemAnnotation = waitForProblemAnnotationAppearance(
+ start, end, MARKER_TYPE, MAX_SECONDS_TO_WAIT);
+ assertNotNull("No ProblemAnnotation found for Marker Type: "
+ + MARKER_TYPE, problemAnnotation);
+
+ String message = problemAnnotation.getText();
+ assertEquals(
+ "Not expected error message found in ProblemAnnotation. Expected: ["
+ + errorMessage + "], Found: [" + message + "]",
+ errorMessage, message);
+ }
+
+ private void modifyDocumentContent(final ICompilationUnit unit,
+ final int start, final int length, final String text,
+ final IProgressMonitor monitor) {
+ // Display.getDefault().syncExec(new Runnable() {
+ // public void run() {
+ ICompilationUnit workingCopy;
+ try {
+ workingCopy = unit.getWorkingCopy(monitor);
+ TextEdit edit = new MultiTextEdit();
+ ReplaceEdit replaceEdit = new ReplaceEdit(start, length, text);
+ edit.addChild(replaceEdit);
+
+ workingCopy.applyTextEdit(edit, monitor);
+ workingCopy.commitWorkingCopy(true, monitor);
+ } catch (JavaModelException e) {
+ fail("An error occured while modifying the document content");
+ }
+
+ String newDocumentContent = document.get();
+ assertTrue("Document isn't modified",
+ newDocumentContent.indexOf(text) != -1);
+ // }
+ // });
+
+ }
+
+ private ProblemAnnotation waitForProblemAnnotationAppearance(
+ final int start, final int end, final String markerType,
+ final int seconds) {
+ final ProblemAnnotation[] result = new ProblemAnnotation[] { null };
+
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ int secondsLeft = seconds;
+ while (secondsLeft-- > 0) {
+ JobUtils.delay(1000);
+
+ // clean deffered events
+ while (Display.getCurrent().readAndDispatch())
+ ;
+
+ annotationModel = getAnnotationModel();
+ boolean found = false;
+ Iterator it = annotationModel.getAnnotationIterator();
+ while (!found && it.hasNext()) {
+ Object o = it.next();
+
+ if (!(o instanceof ProblemAnnotation))
+ continue;
+
+ ProblemAnnotation problemAnnotation = (ProblemAnnotation) o;
+ Position position = annotationModel
+ .getPosition(problemAnnotation);
+
+ if (position.getOffset() < start
+ || position.getOffset() >= end)
+ continue;
+
+ if (position.getOffset() + position.getLength() >= end)
+ continue;
+
+ String paMarkerType = problemAnnotation.getMarkerType();
+ if (!markerType.equalsIgnoreCase(markerType))
+ continue;
+
+ System.out.println("Problem: " + problemAnnotation.getText());
+ result[0] = problemAnnotation;
+ return;
+ }
+ }
+ }
+ });
+
+ return result[0];
+ }
+
+}
Property changes on: trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/java/BaseAsYouTypeInJavaValidationTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2012-06-09 07:36:04 UTC (rev 41849)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2012-06-09 14:04:08 UTC (rev 41850)
@@ -46,6 +46,7 @@
import org.jboss.tools.jsf.jsp.ca.test.WebContentAssistProviderTest;
import org.jboss.tools.jsf.jsp.hover.ELTooltipTest;
import org.jboss.tools.jsf.ui.test.refactoring.ELReferencesRenameTest;
+import org.jboss.tools.jsf.ui.test.validation.java.JSFAsYouTypeInJavaValidationTest;
import org.jboss.tools.test.util.ProjectImportTestSetup;
public class JsfUiAllTests {
@@ -54,7 +55,7 @@
TestSuite suite = new TestSuite("JSF UI tests"); //$NON-NLS-1$
ValidationFramework.getDefault().suspendAllValidation(true);
-
+/*
suite.addTestSuite(JBossPerspectiveTest.class);
suite.addTestSuite(NewJSFProjectTest.class);
suite.addTestSuite(CAForUnclosedELTest.class);
@@ -170,6 +171,11 @@
CAJsfResourceBundlePropertyApplyTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$
new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$
new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$
+*/
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(
+ JSFAsYouTypeInJavaValidationTest.class), "org.jboss.tools.jsf.base.test", //$NON-NLS-1$
+ new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$
+ new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$
return suite;
}
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/validation/java/JSFAsYouTypeInJavaValidationTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/validation/java/JSFAsYouTypeInJavaValidationTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/validation/java/JSFAsYouTypeInJavaValidationTest.java 2012-06-09 14:04:08 UTC (rev 41850)
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.ui.test.validation.java;
+
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.jboss.tools.common.base.test.validation.java.BaseAsYouTypeInJavaValidationTest;
+import org.jboss.tools.common.preferences.SeverityPreferences;
+import org.jboss.tools.jst.web.kb.WebKbPlugin;
+import org.jboss.tools.jst.web.kb.preferences.ELSeverityPreferences;
+import org.jboss.tools.test.util.ProjectImportTestSetup;
+
+/**
+ *
+ * @author Victor V. Rubezhny
+ *
+ */
+public class JSFAsYouTypeInJavaValidationTest extends BaseAsYouTypeInJavaValidationTest {
+ private static final String PROJECT_NAME = "JSF2KickStartWithoutLibs";
+ private static final String PAGE_NAME = "JavaSource/demo/User.java";
+
+ private static final String [][] EL2VALIDATE =
+ {
+ {"#{user.names}", "\"names\" cannot be resolved"},
+ {"#{suser.name}", "\"suser\" cannot be resolved"},
+ {"#{['}", "EL syntax error: Expecting expression."}
+ };
+
+ public void setUp() throws Exception {
+ project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
+ project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+ }
+
+ public void testAsYouTypeInJavaValidation() throws JavaModelException {
+ assertNotNull("Test project '" + PROJECT_NAME + "' is not prepared", project);
+ openEditor(PAGE_NAME);
+ IPreferenceStore store = WebKbPlugin.getDefault().getPreferenceStore();
+ String defaultValidateUnresolvedEL = SeverityPreferences.ENABLE;
+ String defaultUnknownELVariableName = SeverityPreferences.IGNORE;
+ try {
+ defaultValidateUnresolvedEL = store.getString(ELSeverityPreferences.RE_VALIDATE_UNRESOLVED_EL);
+ defaultUnknownELVariableName = store.getString(ELSeverityPreferences.UNKNOWN_EL_VARIABLE_NAME);
+ store.setValue(ELSeverityPreferences.RE_VALIDATE_UNRESOLVED_EL, SeverityPreferences.ENABLE);
+ store.setValue(ELSeverityPreferences.UNKNOWN_EL_VARIABLE_NAME, SeverityPreferences.ERROR);
+ for (int i = 0; i < EL2VALIDATE.length; i++) {
+ doAsYouTipeInJavaValidationTest(EL2VALIDATE[i][0], EL2VALIDATE[i][1]);
+ }
+ } finally {
+ store.setValue(ELSeverityPreferences.RE_VALIDATE_UNRESOLVED_EL, defaultValidateUnresolvedEL);
+ store.setValue(ELSeverityPreferences.UNKNOWN_EL_VARIABLE_NAME, defaultUnknownELVariableName);
+ closeEditor();
+ }
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/validation/java/JSFAsYouTypeInJavaValidationTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r41849 - branches/jbosstools-3.3.x/build/publish.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-06-09 03:36:04 -0400 (Sat, 09 Jun 2012)
New Revision: 41849
Modified:
branches/jbosstools-3.3.x/build/publish/publish.sh
Log:
JBDS-1992 if product/results/target/ folder exists, copy contents into installer/ folder
Modified: branches/jbosstools-3.3.x/build/publish/publish.sh
===================================================================
--- branches/jbosstools-3.3.x/build/publish/publish.sh 2012-06-08 23:58:25 UTC (rev 41848)
+++ branches/jbosstools-3.3.x/build/publish/publish.sh 2012-06-09 07:36:04 UTC (rev 41849)
@@ -195,6 +195,12 @@
z=${STAGINGDIR}/all/${srczipname}; for m in $(md5sum ${z}); do if [[ $m != ${z} ]]; then echo $m > ${z}.MD5; fi; done
fi
+# JBDS-1992 create results page in installer/ folder, including update site zip, sources zip, and installers
+if [[ -d ${WORKSPACE}/sources/product/results/target ]]; then
+ mkdir -p ${STAGINGDIR}/installer/
+ rsync -aq ${WORKSPACE}/sources/product/results/target/* ${STAGINGDIR}/installer/
+fi
+
mkdir -p ${STAGINGDIR}/logs
# collect component zips from upstream aggregated build jobs
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r41848 - in branches/jbosstools-3.3.x/esb/plugins: org.jboss.tools.esb.core/resources/meta and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-06-08 19:58:25 -0400 (Fri, 08 Jun 2012)
New Revision: 41848
Modified:
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java
Log:
JBIDE-11869
https://issues.jboss.org/browse/JBIDE-11869
BMP 5 Processor Action.
Merge to 3.3.x
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties 2012-06-08 23:52:14 UTC (rev 41847)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties 2012-06-08 23:58:25 UTC (rev 41848)
@@ -61,6 +61,7 @@
ESB.AddScripting.menu=Scripting
ESB.AddEJBProcessor.menu=EJB Processor
ESB.AddBPMProcessor.menu=BPM Processor
+ESB.AddBPM5Processor.menu=BPM 5 Processor
ESB.AddXSLTAction.menu=XSLT Action
ESB.AddJMSRouter.menu=JMS Router
ESB.AddEMailRouter.menu=EMail Router
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2012-06-08 23:52:14 UTC (rev 41847)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2012-06-08 23:58:25 UTC (rev 41848)
@@ -614,6 +614,9 @@
ESB.AddBPMVar.WindowTitle=Add BPM Var
ESB.AddBPMVar.Title=ESB BPM Var
+ESB.AddBPMParam.WindowTitle=Add BPM Param
+ESB.AddBPMParam.Title=ESB BPM Param
+
ESB.AddHeader.WindowTitle=Add Header
ESB.AddHeader.Title=ESB Header
@@ -625,6 +628,7 @@
ESBPreAlias_Properties.Title=ESB Alias
ESBPreAttributeAlias_Properties.Title=ESB Attribute Alias
ESBPreBPMVar_Properties.Title=ESB BPM Var
+ESBPreBPMParam_Properties.Title=ESB BPM Param
ESBPreClientProp_Properties.Title=ESB HTTP Client Property
ESBPreConverter_Properties.Title=ESB Converter
ESBPreFieldAlias_Properties.Title=ESB Field Alias
@@ -742,6 +746,9 @@
ESB.AddBPMProcessor.WindowTitle=Add BPM Processor
ESB.AddBPMProcessor.Title=ESB BPM Processor
+ESB.AddBPM5Processor.WindowTitle=Add BPM 5 Processor
+ESB.AddBPM5Processor.Title=ESB BPM 5 Processor
+
ESB.AddXSLTAction.WindowTitle=Add XSLT Action
ESB.AddXSLTAction.Title=ESB XSLT Action
@@ -791,6 +798,7 @@
ESBPreActionAggregator120_Properties.Title=Aggregator
ESBPreActionBPELInvoke120_Properties.Title=BPEL Invoke Action
ESBPreActionBpmProcessor120_Properties.Title=BPM Processor
+ESBPreActionBpm5Processor131_Properties.Title=BPM 5 Processor
ESBPreActionByteArrayToString101_Properties.Title=Byte Array to String
ESBPreActionCommandInterpreter101_Properties.Title=Command Interpreter
ESBPreActionContentBasedRouter101_Properties.Title=Content Based Router
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2012-06-08 23:52:14 UTC (rev 41847)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2012-06-08 23:58:25 UTC (rev 41848)
@@ -44,6 +44,7 @@
<PAIR
name="org.jboss.soa.esb.actions.validation.SchemaValidationAction" value="ESBPreActionSchemaValidator"/>
<PAIR name="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor" value="ESBPreActionBpmProcessor"/>
+ <PAIR name="org.jboss.soa.esb.services.jbpm5.actions.Bpm5Processor" value="ESBPreActionBpm5Processor131"/>
<PAIR name="org.jboss.soa.esb.smooks.SmooksAction" value="ESBPreActionSmooksAction"/>
</MAPPING>
<MAPPING name="FileVersions">
@@ -149,6 +150,76 @@
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%"
+ XMLSUBPATH="action" name="ESBPreActionBpm5Processor131">
+ <XChildrenEntities>
+ <XChildEntity name="ESBProperty"/>
+ <XChildEntity name="ESBPreBPMParam"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.action" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="bpm 5 processor action"
+ loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ name="name" xmlname="name"/>
+ <XModelAttribute PROPERTIES="category=general;save=always"
+ default="org.jboss.soa.esb.services.jbpm5.actions.Bpm5Processor"
+ name="class" xmlname="class">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="pre=true;category=general;save=always"
+ name="process definition name" xmlname="process-definition-name"/>
+ <XModelAttribute PROPERTIES="pre=true;category=general;save=always"
+ name="process id" xmlname="process-id"/>
+ <XModelAttribute PROPERTIES="pre=true;category=general;save=always"
+ default="startProcess" name="process action" xmlname="process-action">
+ <Constraint loader="List">
+ <value name="startProcess"/>
+ <value name="signalEvent"/>
+ <value name="abortProcessInstance"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="pre=true;category=advanced"
+ name="process handler class" xmlname="processHandlerClass"/>
+ <XModelAttribute PROPERTIES="pre=true;category=advanced"
+ name="process handler host" xmlname="processHandlerHost"/>
+ <XModelAttribute PROPERTIES="pre=true;category=advanced"
+ name="process handler port" xmlname="processHandlerPort"/>
+ <XModelAttribute PROPERTIES="category=general" default="process"
+ name="process" xmlname="process">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Add BPM Param..." kind="action" name="AddBPMParam">
+ <EntityData EntityName="ESBPreBPMParam">
+ <AttributeData AttributeName="esb"/>
+ <AttributeData AttributeName="bpm"/>
+ <AttributeData AttributeName="value" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ <XActionItemReference entity="ESBProperty" name="CopyActions"/>
+ <XActionItemReference entity="ESBProperty" name="DeleteActions"/>
+ <XActionItemReference entity="ESBProperty" name="Properties"/>
+ <XActionItemReference entity="ESBProperty" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%ESB%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%"
XMLSUBPATH="action" name="ESBPreActionBpmProcessor120">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
@@ -3005,6 +3076,37 @@
</XModelEntity>
<XModelEntity
ImplementingClass="org.jboss.tools.esb.core.model.ESBRouteToImpl"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=bpmParam"
+ XMLSUBPATH="mapping" name="ESBPreBPMParam">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.property" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="bpm param" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ name="esb" xmlname="esb"/>
+ <XModelAttribute PROPERTIES="category=general;save=always" name="bpm" xmlname="bpm"/>
+ <XModelAttribute PROPERTIES="category=general" name="value" xmlname="value"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="Properties"/>
+ <XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity
+ ImplementingClass="org.jboss.tools.esb.core.model.ESBRouteToImpl"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=bpmVar"
XMLSUBPATH="mapping" name="ESBPreBPMVar">
<XChildrenEntities/>
@@ -4304,6 +4406,7 @@
<XChildEntity name="ESBPreActionXStreamToObject101"/>
<XChildEntity name="ESBPreActionCommandInterpreter101"/>
<XChildEntity name="ESBPreActionBpmProcessor120"/>
+ <XChildEntity name="ESBPreActionBpm5Processor131"/>
<XChildEntity name="ESBPreActionScripting120"/>
<XChildEntity name="ESBPreActionGroovyProcessor101"/>
<XChildEntity name="ESBPreActionEJBProcessor120"/>
@@ -4344,6 +4447,16 @@
</XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="BPM 5 Processor..." kind="action" name="AddBPM5Processor">
+ <EntityData EntityName="ESBPreActionBpm5Processor131">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="process definition name"/>
+ <AttributeData AttributeName="process id"/>
+ <AttributeData AttributeName="process action"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
displayName="Business Rules Processor..." kind="action" name="AddBusinessRulesProcessor">
<EntityData EntityName="ESBPreActionBusinessRulesProcessor130">
<AttributeData AttributeName="name"/>
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java 2012-06-08 23:52:14 UTC (rev 41847)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java 2012-06-08 23:58:25 UTC (rev 41848)
@@ -57,6 +57,7 @@
propertyConverters.put("notification", ConverterConstants.NOTIFICATION_CONVERTER);
propertyConverters.put("notification2", ConverterConstants.NOTIFICATION_CONVERTER_2);
propertyConverters.put("bpmVar", ConverterConstants.BPM_VAR_CONVERTER);
+ propertyConverters.put("bpmParam", ConverterConstants.BPM_PARAM_CONVERTER);
propertyConverters.put("httpclient", ConverterConstants.ENDPOINT_CONVERTER);
propertyConverters.put("header", ConverterConstants.HEADER_CONVERTER);
propertyConverters.put("namespace", ConverterConstants.NAMESPACES_CONVERTER);
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java 2012-06-08 23:52:14 UTC (rev 41847)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java 2012-06-08 23:58:25 UTC (rev 41848)
@@ -35,6 +35,10 @@
String BPM_VARS = "esbToBpmVars";
IPropertyConverter BPM_VAR_CONVERTER = new BasicListConverter(BPM_VARS, BPM_VAR_ENTITY);
+ String BPM_PARAM_ENTITY = "ESBPreBPMParam";
+ String BPM_PARAMS = "esbToBpmParams";
+ IPropertyConverter BPM_PARAM_CONVERTER = new BasicListConverter(BPM_PARAMS, BPM_PARAM_ENTITY);
+
String HTTP_CLIENT_PROP_ENTITY = "ESBPreClientProp";
String END_POINT_URL = "endpointUrl";
IPropertyConverter ENDPOINT_CONVERTER = new EndpointConverter();
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java 2012-06-08 23:52:14 UTC (rev 41847)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java 2012-06-08 23:58:25 UTC (rev 41848)
@@ -210,6 +210,14 @@
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddBPMVar") //$NON-NLS-1$
);
+ static IFormData BPM_PARAM_LIST_DEFINITION = new FormData(
+ "BPM Param List", //$NON-NLS-1$
+ ModelFormLayoutData.EMPTY_DESCRIPTION,
+ new FormAttributeData[]{new FormAttributeData("esb", 25), new FormAttributeData("bpm", 25), new FormAttributeData("value", 50)},
+ new String[]{ConverterConstants.BPM_PARAM_ENTITY},
+ FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddBPMParam") //$NON-NLS-1$
+ );
+
static IFormData NAMESPACE_LIST_DEFINITION = createOneAttributeSingleChildList(
"Namespace List", "namespace uri", ConverterConstants.NAMESPACE_ENTITY, "CreateActions.AddNamespace"
);
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java 2012-06-08 23:52:14 UTC (rev 41847)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java 2012-06-08 23:58:25 UTC (rev 41848)
@@ -81,6 +81,9 @@
if(entity.getChild(ConverterConstants.BPM_VAR_ENTITY) != null) {
list.add(ESBListsFormLayoutData.BPM_VAR_LIST_DEFINITION);
}
+ if(entity.getChild(ConverterConstants.BPM_PARAM_ENTITY) != null) {
+ list.add(ESBListsFormLayoutData.BPM_PARAM_LIST_DEFINITION);
+ }
if(entity.getChild(ConverterConstants.ROUTER_NAMESPACE_ENTITY) != null) {
list.add(ESBListsFormLayoutData.ROUTER_NAMESPACE_LIST_DEFINITION);
}
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r41847 - in trunk/esb/plugins: org.jboss.tools.esb.core/resources/meta and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-06-08 19:52:14 -0400 (Fri, 08 Jun 2012)
New Revision: 41847
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties
trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties
trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java
trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java
trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java
Log:
JBIDE-11869
https://issues.jboss.org/browse/JBIDE-11869
BMP 5 Processor Action.
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties 2012-06-08 22:16:49 UTC (rev 41846)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-menu.properties 2012-06-08 23:52:14 UTC (rev 41847)
@@ -61,6 +61,7 @@
ESB.AddScripting.menu=Scripting
ESB.AddEJBProcessor.menu=EJB Processor
ESB.AddBPMProcessor.menu=BPM Processor
+ESB.AddBPM5Processor.menu=BPM 5 Processor
ESB.AddXSLTAction.menu=XSLT Action
ESB.AddJMSRouter.menu=JMS Router
ESB.AddEMailRouter.menu=EMail Router
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2012-06-08 22:16:49 UTC (rev 41846)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb.properties 2012-06-08 23:52:14 UTC (rev 41847)
@@ -614,6 +614,9 @@
ESB.AddBPMVar.WindowTitle=Add BPM Var
ESB.AddBPMVar.Title=ESB BPM Var
+ESB.AddBPMParam.WindowTitle=Add BPM Param
+ESB.AddBPMParam.Title=ESB BPM Param
+
ESB.AddHeader.WindowTitle=Add Header
ESB.AddHeader.Title=ESB Header
@@ -625,6 +628,7 @@
ESBPreAlias_Properties.Title=ESB Alias
ESBPreAttributeAlias_Properties.Title=ESB Attribute Alias
ESBPreBPMVar_Properties.Title=ESB BPM Var
+ESBPreBPMParam_Properties.Title=ESB BPM Param
ESBPreClientProp_Properties.Title=ESB HTTP Client Property
ESBPreConverter_Properties.Title=ESB Converter
ESBPreFieldAlias_Properties.Title=ESB Field Alias
@@ -742,6 +746,9 @@
ESB.AddBPMProcessor.WindowTitle=Add BPM Processor
ESB.AddBPMProcessor.Title=ESB BPM Processor
+ESB.AddBPM5Processor.WindowTitle=Add BPM 5 Processor
+ESB.AddBPM5Processor.Title=ESB BPM 5 Processor
+
ESB.AddXSLTAction.WindowTitle=Add XSLT Action
ESB.AddXSLTAction.Title=ESB XSLT Action
@@ -791,6 +798,7 @@
ESBPreActionAggregator120_Properties.Title=Aggregator
ESBPreActionBPELInvoke120_Properties.Title=BPEL Invoke Action
ESBPreActionBpmProcessor120_Properties.Title=BPM Processor
+ESBPreActionBpm5Processor131_Properties.Title=BPM 5 Processor
ESBPreActionByteArrayToString101_Properties.Title=Byte Array to String
ESBPreActionCommandInterpreter101_Properties.Title=Command Interpreter
ESBPreActionContentBasedRouter101_Properties.Title=Content Based Router
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2012-06-08 22:16:49 UTC (rev 41846)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-actions.meta 2012-06-08 23:52:14 UTC (rev 41847)
@@ -44,6 +44,7 @@
<PAIR
name="org.jboss.soa.esb.actions.validation.SchemaValidationAction" value="ESBPreActionSchemaValidator"/>
<PAIR name="org.jboss.soa.esb.services.jbpm.actions.BpmProcessor" value="ESBPreActionBpmProcessor"/>
+ <PAIR name="org.jboss.soa.esb.services.jbpm5.actions.Bpm5Processor" value="ESBPreActionBpm5Processor131"/>
<PAIR name="org.jboss.soa.esb.smooks.SmooksAction" value="ESBPreActionSmooksAction"/>
</MAPPING>
<MAPPING name="FileVersions">
@@ -149,6 +150,76 @@
</XModelEntity>
<XModelEntity ImplementingClass="%ESB%"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%"
+ XMLSUBPATH="action" name="ESBPreActionBpm5Processor131">
+ <XChildrenEntities>
+ <XChildEntity name="ESBProperty"/>
+ <XChildEntity name="ESBPreBPMParam"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.action" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="bpm 5 processor action"
+ loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ name="name" xmlname="name"/>
+ <XModelAttribute PROPERTIES="category=general;save=always"
+ default="org.jboss.soa.esb.services.jbpm5.actions.Bpm5Processor"
+ name="class" xmlname="class">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="pre=true;category=general;save=always"
+ name="process definition name" xmlname="process-definition-name"/>
+ <XModelAttribute PROPERTIES="pre=true;category=general;save=always"
+ name="process id" xmlname="process-id"/>
+ <XModelAttribute PROPERTIES="pre=true;category=general;save=always"
+ default="startProcess" name="process action" xmlname="process-action">
+ <Constraint loader="List">
+ <value name="startProcess"/>
+ <value name="signalEvent"/>
+ <value name="abortProcessInstance"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="pre=true;category=advanced"
+ name="process handler class" xmlname="processHandlerClass"/>
+ <XModelAttribute PROPERTIES="pre=true;category=advanced"
+ name="process handler host" xmlname="processHandlerHost"/>
+ <XModelAttribute PROPERTIES="pre=true;category=advanced"
+ name="process handler port" xmlname="processHandlerPort"/>
+ <XModelAttribute PROPERTIES="category=general" default="process"
+ name="process" xmlname="process">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Add BPM Param..." kind="action" name="AddBPMParam">
+ <EntityData EntityName="ESBPreBPMParam">
+ <AttributeData AttributeName="esb"/>
+ <AttributeData AttributeName="bpm"/>
+ <AttributeData AttributeName="value" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ <XActionItemReference entity="ESBProperty" name="CopyActions"/>
+ <XActionItemReference entity="ESBProperty" name="DeleteActions"/>
+ <XActionItemReference entity="ESBProperty" name="Properties"/>
+ <XActionItemReference entity="ESBProperty" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%ESB%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%EntityOrdered%"
XMLSUBPATH="action" name="ESBPreActionBpmProcessor120">
<XChildrenEntities>
<XChildEntity name="ESBProperty"/>
@@ -3005,6 +3076,37 @@
</XModelEntity>
<XModelEntity
ImplementingClass="org.jboss.tools.esb.core.model.ESBRouteToImpl"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=bpmParam"
+ XMLSUBPATH="mapping" name="ESBPreBPMParam">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.esb.property" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="bpm param" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general;id=true;save=always"
+ name="esb" xmlname="esb"/>
+ <XModelAttribute PROPERTIES="category=general;save=always" name="bpm" xmlname="bpm"/>
+ <XModelAttribute PROPERTIES="category=general" name="value" xmlname="value"/>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="CopyActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="DeleteActions"/>
+ <XActionItemReference entity="ESBPreAlias" name="Properties"/>
+ <XActionItemReference entity="ESBPreAlias" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity
+ ImplementingClass="org.jboss.tools.esb.core.model.ESBRouteToImpl"
PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;converter=bpmVar"
XMLSUBPATH="mapping" name="ESBPreBPMVar">
<XChildrenEntities/>
@@ -4304,6 +4406,7 @@
<XChildEntity name="ESBPreActionXStreamToObject101"/>
<XChildEntity name="ESBPreActionCommandInterpreter101"/>
<XChildEntity name="ESBPreActionBpmProcessor120"/>
+ <XChildEntity name="ESBPreActionBpm5Processor131"/>
<XChildEntity name="ESBPreActionScripting120"/>
<XChildEntity name="ESBPreActionGroovyProcessor101"/>
<XChildEntity name="ESBPreActionEJBProcessor120"/>
@@ -4344,6 +4447,16 @@
</XActionItem>
<XActionItem HandlerClassName="%Create%" ICON="action.empty"
PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="BPM 5 Processor..." kind="action" name="AddBPM5Processor">
+ <EntityData EntityName="ESBPreActionBpm5Processor131">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="process definition name"/>
+ <AttributeData AttributeName="process id"/>
+ <AttributeData AttributeName="process action"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
displayName="Business Rules Processor..." kind="action" name="AddBusinessRulesProcessor">
<EntityData EntityName="ESBPreActionBusinessRulesProcessor130">
<AttributeData AttributeName="name"/>
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java 2012-06-08 22:16:49 UTC (rev 41846)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java 2012-06-08 23:52:14 UTC (rev 41847)
@@ -57,6 +57,7 @@
propertyConverters.put("notification", ConverterConstants.NOTIFICATION_CONVERTER);
propertyConverters.put("notification2", ConverterConstants.NOTIFICATION_CONVERTER_2);
propertyConverters.put("bpmVar", ConverterConstants.BPM_VAR_CONVERTER);
+ propertyConverters.put("bpmParam", ConverterConstants.BPM_PARAM_CONVERTER);
propertyConverters.put("httpclient", ConverterConstants.ENDPOINT_CONVERTER);
propertyConverters.put("header", ConverterConstants.HEADER_CONVERTER);
propertyConverters.put("namespace", ConverterConstants.NAMESPACES_CONVERTER);
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java 2012-06-08 22:16:49 UTC (rev 41846)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ConverterConstants.java 2012-06-08 23:52:14 UTC (rev 41847)
@@ -35,6 +35,10 @@
String BPM_VARS = "esbToBpmVars";
IPropertyConverter BPM_VAR_CONVERTER = new BasicListConverter(BPM_VARS, BPM_VAR_ENTITY);
+ String BPM_PARAM_ENTITY = "ESBPreBPMParam";
+ String BPM_PARAMS = "esbToBpmParams";
+ IPropertyConverter BPM_PARAM_CONVERTER = new BasicListConverter(BPM_PARAMS, BPM_PARAM_ENTITY);
+
String HTTP_CLIENT_PROP_ENTITY = "ESBPreClientProp";
String END_POINT_URL = "endpointUrl";
IPropertyConverter ENDPOINT_CONVERTER = new EndpointConverter();
Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java 2012-06-08 22:16:49 UTC (rev 41846)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBListsFormLayoutData.java 2012-06-08 23:52:14 UTC (rev 41847)
@@ -210,6 +210,14 @@
FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddBPMVar") //$NON-NLS-1$
);
+ static IFormData BPM_PARAM_LIST_DEFINITION = new FormData(
+ "BPM Param List", //$NON-NLS-1$
+ ModelFormLayoutData.EMPTY_DESCRIPTION,
+ new FormAttributeData[]{new FormAttributeData("esb", 25), new FormAttributeData("bpm", 25), new FormAttributeData("value", 50)},
+ new String[]{ConverterConstants.BPM_PARAM_ENTITY},
+ FormLayoutDataUtil.createDefaultFormActionData("CreateActions.AddBPMParam") //$NON-NLS-1$
+ );
+
static IFormData NAMESPACE_LIST_DEFINITION = createOneAttributeSingleChildList(
"Namespace List", "namespace uri", ConverterConstants.NAMESPACE_ENTITY, "CreateActions.AddNamespace"
);
Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java 2012-06-08 22:16:49 UTC (rev 41846)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/form/ESBXMLFormLayoutData.java 2012-06-08 23:52:14 UTC (rev 41847)
@@ -81,6 +81,9 @@
if(entity.getChild(ConverterConstants.BPM_VAR_ENTITY) != null) {
list.add(ESBListsFormLayoutData.BPM_VAR_LIST_DEFINITION);
}
+ if(entity.getChild(ConverterConstants.BPM_PARAM_ENTITY) != null) {
+ list.add(ESBListsFormLayoutData.BPM_PARAM_LIST_DEFINITION);
+ }
if(entity.getChild(ConverterConstants.ROUTER_NAMESPACE_ENTITY) != null) {
list.add(ESBListsFormLayoutData.ROUTER_NAMESPACE_LIST_DEFINITION);
}
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r41846 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-06-08 18:16:49 -0400 (Fri, 08 Jun 2012)
New Revision: 41846
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProject.java
Log:
Fixed - JBIDE-12150
Git repository is sometimes corrupted after application creation
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java 2012-06-08 22:11:55 UTC (rev 41845)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java 2012-06-08 22:16:49 UTC (rev 41846)
@@ -101,7 +101,7 @@
addToModified(copyOpenshiftConfigurations(getApplication(), getRemoteName(), project, monitor));
addToModified(setupGitIgnore(project, monitor));
addToModified(setupOpenShiftMavenProfile(project, monitor));
- addSettingsFile(project, monitor);
+ addToModified(addSettingsFile(project, monitor));
addRemote(getRemoteName(), getApplication().getUUID(), project);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java 2012-06-08 22:11:55 UTC (rev 41845)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java 2012-06-08 22:16:49 UTC (rev 41846)
@@ -93,7 +93,7 @@
copyOpenshiftConfigurations(getApplication(), getRemoteName(), project, monitor);
setupGitIgnore(project, monitor);
setupOpenShiftMavenProfile(project, monitor);
- addSettingsFile(project, monitor);
+ addToModified(addSettingsFile(project, monitor));
shareProject(project, monitor);
addRemoteRepo(getRemoteName(), getApplication().getGitUrl(), EGitUtils.getRepository(project));
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProject.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProject.java 2012-06-08 22:11:55 UTC (rev 41845)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProject.java 2012-06-08 22:16:49 UTC (rev 41846)
@@ -85,7 +85,7 @@
// TODO: handle multiple projects (is this really possible?)
IProject project = getSettingsProject(importedProjects);
addToModified(setupGitIgnore(project, monitor));
- addSettingsFile(project, monitor);
+ addToModified(addSettingsFile(project, monitor));
addAndCommitModifiedResource(project, monitor);
return getSettingsProject(importedProjects);
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r41845 - branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-06-08 18:11:55 -0400 (Fri, 08 Jun 2012)
New Revision: 41845
Modified:
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProject.java
Log:
Fixed - JBIDE-12150
Git repository is sometimes corrupted after application creation
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java 2012-06-08 21:47:46 UTC (rev 41844)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java 2012-06-08 22:11:55 UTC (rev 41845)
@@ -101,7 +101,7 @@
addToModified(copyOpenshiftConfigurations(getApplication(), getRemoteName(), project, monitor));
addToModified(setupGitIgnore(project, monitor));
addToModified(setupOpenShiftMavenProfile(project, monitor));
- addSettingsFile(project, monitor);
+ addToModified(addSettingsFile(project, monitor));
addRemote(getRemoteName(), getApplication().getUUID(), project);
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java 2012-06-08 21:47:46 UTC (rev 41844)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java 2012-06-08 22:11:55 UTC (rev 41845)
@@ -93,7 +93,7 @@
copyOpenshiftConfigurations(getApplication(), getRemoteName(), project, monitor);
setupGitIgnore(project, monitor);
setupOpenShiftMavenProfile(project, monitor);
- addSettingsFile(project, monitor);
+ addToModified(addSettingsFile(project, monitor));
shareProject(project, monitor);
addRemoteRepo(getRemoteName(), getApplication().getGitUrl(), EGitUtils.getRepository(project));
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProject.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProject.java 2012-06-08 21:47:46 UTC (rev 41844)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProject.java 2012-06-08 22:11:55 UTC (rev 41845)
@@ -85,7 +85,7 @@
// TODO: handle multiple projects (is this really possible?)
IProject project = getSettingsProject(importedProjects);
addToModified(setupGitIgnore(project, monitor));
- addSettingsFile(project, monitor);
+ addToModified(addSettingsFile(project, monitor));
addAndCommitModifiedResource(project, monitor);
return getSettingsProject(importedProjects);
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r41844 - in branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core: resources/meta and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-06-08 17:47:46 -0400 (Fri, 08 Jun 2012)
New Revision: 41844
Added:
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/MessageFlowPriorityConverter.java
Modified:
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb12.meta
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb13.meta
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb131.meta
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBCustomizedObjectImpl.java
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java
branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificPropertyConverter.java
Log:
JBIDE-11868
https://issues.jboss.org/browse/JBIDE-11868
Field editor 'Message Flow Priority' added to forms for service/bus/provider/listener elements.
Merge to 3.3.x
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties 2012-06-08 21:29:17 UTC (rev 41843)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/help/keys-esb-attrs.properties 2012-06-08 21:47:46 UTC (rev 41844)
@@ -98,6 +98,7 @@
ESB.jndi_context_factory=Jndi Context Factory
ESB.jndi_pkg_prefix=Jndi Pkg Prefix
ESB.jndi_url=Jndi URL
+ESB.message_flow_priority=Message Flow Priority
ESB.channel_id_ref=Channel ID Ref
ESB.max_threads=Max Threads
ESB.is_gateway=Is Gateway
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2012-06-08 21:29:17 UTC (rev 41843)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2012-06-08 21:47:46 UTC (rev 41844)
@@ -293,6 +293,23 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
name="id" xmlname="busid"/>
+ <XModelAttribute PROPERTIES="category=advanced;pre=true"
+ name="message flow priority" xmlname="messageFlowPriority">
+ <Constraint loader="List">
+ <value/>
+ <value name="0"/>
+ <value name="1"/>
+ <value name="2"/>
+ <value name="3"/>
+ <value name="4"/>
+ <value name="5"/>
+ <value name="6"/>
+ <value name="7"/>
+ <value name="8"/>
+ <value name="9"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -352,6 +369,8 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
name="name" xmlname="name"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -430,6 +449,8 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
name="id" xmlname="busid"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -470,6 +491,8 @@
<XModelAttributeReference
attributes="poll frequency seconds,schedule frequency,schedule id ref"
entity="ESBScheduledListener101" name="scheduled listener"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -597,6 +620,8 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
name="name" xmlname="name"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -639,6 +664,8 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
name="id" xmlname="busid"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -794,6 +821,8 @@
name="name" xmlname="name"/>
<XModelAttribute PROPERTIES="category=general;save=always"
name="hostname" xmlname="hostname"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -838,6 +867,8 @@
entity="ESBListener101" name="listener"/>
<XModelAttribute PROPERTIES="category=general;save=always"
name="script" xmlname="script"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -994,6 +1025,8 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
name="id" xmlname="busid"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -1039,6 +1072,8 @@
<XModelAttributeReference
attributes="name,channel id ref,max threads,is gateway"
entity="ESBListener101" name="listener"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -1124,6 +1159,8 @@
name="name" xmlname="name"/>
<XModelAttribute PROPERTIES="category=general;save=always"
name="hibernate cfg file" xmlname="hibernate-cfg-file"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -1378,6 +1415,8 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced"
name="provider adapter JNDI" xmlname="providerAdapterJNDI"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -1414,6 +1453,8 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
name="id" xmlname="busid"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -1577,6 +1618,8 @@
<XModelAttribute PROPERTIES="category=advanced"
name="jndi pkg prefix" xmlname="jndi-pkg-prefix"/>
<XModelAttribute PROPERTIES="category=advanced" name="jndi url" xmlname="jndi-URL"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -2169,6 +2212,8 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
name="id" xmlname="busid"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -2299,6 +2344,8 @@
<XModelAttribute PROPERTIES="category=advanced" name="password" xmlname="password"/>
<XModelAttributeReference attributes="transacted"
entity="ESBScheduledListener101" name="transacted"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -2371,6 +2418,8 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
name="name" xmlname="name"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -2452,6 +2501,8 @@
</Constraint>
<Editor name="ListString"/>
</XModelAttribute>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -2784,6 +2835,8 @@
<XModelAttribute PROPERTIES="category=advanced" name="handler class" xmlname="handlerClass">
<Constraint loader="%IntEL%"/>
</XModelAttribute>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb12.meta
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb12.meta 2012-06-08 21:29:17 UTC (rev 41843)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb12.meta 2012-06-08 21:47:46 UTC (rev 41844)
@@ -349,6 +349,8 @@
<XModelAttributeReference
attributes="poll frequency seconds,schedule frequency,schedule id ref"
entity="ESBScheduledListener101" name="scheduled listener"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -487,6 +489,8 @@
</Constraint>
<Editor name="ListString"/>
</XModelAttribute>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -533,6 +537,8 @@
</Constraint>
<Editor name="ListString"/>
</XModelAttribute>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -570,6 +576,8 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
name="name" xmlname="name"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -616,6 +624,8 @@
name="port" xmlname="port">
<Constraint loader="%IntEL%"/>
</XModelAttribute>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -695,6 +705,8 @@
<XModelAttributeReference
attributes="name,channel id ref,max threads,is gateway"
entity="ESBListener101" name="listener"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -743,6 +755,8 @@
<Editor name="List"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general" name="host" xmlname="host"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -803,6 +817,8 @@
</Constraint>
<Editor name="ListString"/>
</XModelAttribute>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -838,6 +854,8 @@
<XModelAttributeReference
attributes="name,channel id ref,max threads,is gateway"
entity="ESBListener101" name="listener"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -1130,6 +1148,8 @@
entity="ESBListener101" name="listener"/>
<XModelAttributeReference attributes="poll frequency seconds"
entity="ESBScheduledListener101" name="scheduled listener"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb13.meta
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb13.meta 2012-06-08 21:29:17 UTC (rev 41843)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb13.meta 2012-06-08 21:47:46 UTC (rev 41844)
@@ -105,6 +105,8 @@
<Editor name="ListString"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced" name="timeout" xmlname="timeout"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -158,6 +160,8 @@
<Editor name="ListString"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="category=advanced" name="timeout" xmlname="timeout"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -201,6 +205,8 @@
</XModelAttribute>
<XModelAttribute PROPERTIES="category=general;id=true;save=always"
name="name" xmlname="name"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
@@ -289,11 +295,13 @@
attributes="name,channel id ref,max threads,is gateway"
entity="ESBListener101" name="listener"/>
<XModelAttribute PROPERTIES="category=advanced" name="client id" xmlname="clientId"/>
+ <XModelAttribute PROPERTIES="category=advanced"
+ name="durable subscription name" xmlname="durableSubscriptionName"/>
+ <XModelAttributeReference attributes="message flow priority"
+ entity="ESBBus" name="message flow priority"/>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
- <XModelAttribute PROPERTIES="category=advanced"
- name="durable subscription name" xmlname="durableSubscriptionName"/>
</XModelAttributes>
<XActionItem kind="list">
<XActionItem kind="list" name="CreateActions">
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb131.meta
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb131.meta 2012-06-08 21:29:17 UTC (rev 41843)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb131.meta 2012-06-08 21:47:46 UTC (rev 41844)
@@ -47,6 +47,23 @@
</Constraint>
<Editor name="ListString"/>
</XModelAttribute>
+ <XModelAttribute PROPERTIES="category=advanced;pre=true"
+ name="message flow priority" xmlname="messageFlowPriority">
+ <Constraint loader="List">
+ <value name=""/>
+ <value name="0"/>
+ <value name="1"/>
+ <value name="2"/>
+ <value name="3"/>
+ <value name="4"/>
+ <value name="5"/>
+ <value name="6"/>
+ <value name="7"/>
+ <value name="8"/>
+ <value name="9"/>
+ </Constraint>
+ <Editor name="List"/>
+ </XModelAttribute>
<XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
<Editor name="Note"/>
</XModelAttribute>
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java 2012-06-08 21:29:17 UTC (rev 41843)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBConstants.java 2012-06-08 21:47:46 UTC (rev 41844)
@@ -195,5 +195,7 @@
public String ATTR_SCHEDULE_ID = "schedule id"; //$NON-NLS-1$
public String ATTR_SCHEDULE_ID_REF = "schedule id ref"; //$NON-NLS-1$
+ public String ATTR_MESSAGE_FLOW_PRIORITY = "message flow priority"; //$NON-NLS-1$
+
public String XML_ATTR_PROTECTED_METHODS = "protected-methods"; //$NON-NLS-1$
}
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBCustomizedObjectImpl.java
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBCustomizedObjectImpl.java 2012-06-08 21:29:17 UTC (rev 41843)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBCustomizedObjectImpl.java 2012-06-08 21:47:46 UTC (rev 41844)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.esb.core.model;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.impl.CustomizedObjectImpl;
import org.jboss.tools.common.model.impl.OrderedByEntityChildren;
import org.jboss.tools.common.model.impl.RegularChildren;
@@ -33,4 +35,33 @@
return super.createChildren();
}
+ public boolean isAttributeEditable(String name) {
+ if(ESBConstants.ATTR_MESSAGE_FLOW_PRIORITY.equals(name)) {
+ String entity = getModelEntity().getName();
+ if(entity.startsWith(ESBConstants.ENT_ESB_SERVICE)) {
+ XModelObject as = getChildByPath("Actions");
+ if(as != null) {
+ String inxsd = as.getAttributeValue("in xsd");
+ if(inxsd == null || inxsd.length() == 0 || "false".equals(as.getAttributeValue("webservice"))) {
+ return false;
+ }
+ }
+ }
+ if(getModelEntity().getAttribute("is gateway") != null && !"true".equals(getAttributeValue("is gateway"))) {
+ return false;
+ }
+ XModelObject p = FileSystemsHelper.getFile(this);
+ if(p != null) {
+ String fileEntity = p.getModelEntity().getName();
+ if(ESBConstants.ENT_ESB_FILE_101.equals(fileEntity)
+ || ESBConstants.ENT_ESB_FILE_110.equals(fileEntity)
+ || ESBConstants.ENT_ESB_FILE_120.equals(fileEntity)
+ || ESBConstants.ENT_ESB_FILE_130.equals(fileEntity)) {
+ return false;
+ }
+ }
+ }
+ return super.isAttributeEditable(name);
+ }
+
}
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java 2012-06-08 21:29:17 UTC (rev 41843)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/ESBLoaderUtil.java 2012-06-08 21:47:46 UTC (rev 41844)
@@ -18,6 +18,7 @@
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
import org.jboss.tools.common.xml.XMLUtilities;
+import org.jboss.tools.esb.core.model.converters.MessageFlowPriorityConverter;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -56,7 +57,8 @@
String entity = o.getModelEntity().getName();
if(SpecificActionLoader.instance.isActionsFolder(entity)) {
SpecificActionLoader.instance.convertChildrenToSpecific(o);
- } else if("true".equals(o.getModelEntity().getProperty("hasConvertedProperties"))) {
+ } else if("true".equals(o.getModelEntity().getProperty("hasConvertedProperties"))
+ || o.getModelEntity().getAttribute(ESBConstants.ATTR_MESSAGE_FLOW_PRIORITY) != null) {
SpecificPropertyConverter.instance.convertBasicToSpecific(o);
}
}
@@ -65,7 +67,8 @@
if(!needToSave(o)) return true;
if(SpecificActionLoader.instance.isPreActionEntity(o)) {
o = SpecificActionLoader.instance.convertSpecificActionToBasic(o);
- } else if("true".equals(o.getModelEntity().getProperty("hasConvertedProperties"))) {
+ } else if("true".equals(o.getModelEntity().getProperty("hasConvertedProperties"))
+ || o.getModelEntity().getAttribute(ESBConstants.ATTR_MESSAGE_FLOW_PRIORITY) != null) {
o = SpecificPropertyConverter.instance.convertSpecificToBasic(o);
}
return super.save(parent, o);
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java 2012-06-08 21:29:17 UTC (rev 41843)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificActionLoader.java 2012-06-08 21:47:46 UTC (rev 41844)
@@ -198,19 +198,23 @@
String pre = as[i].getProperty("pre");
if(pre == null || pre.length() == 0) continue;
if("true".equals(pre)) {
- String name = as[i].getXMLName();
- XModelObject p = basic.getChildByPath(name);
- if(p == null) continue;
- String value = p.getAttributeValue("value");
- specific.setAttributeValue(as[i].getName(), value);
- specific.set(as[i].getXMLName() + ".#comment", p.getAttributeValue("comment"));
- p.removeFromParent();
+ copyBasicPropertyToSpecificAttribute(basic, specific, as[i]);
} else {
//very specific cases
}
}
}
+ public static void copyBasicPropertyToSpecificAttribute(XModelObject basic, XModelObject specific, XAttribute a) {
+ String name = a.getXMLName();
+ XModelObject p = basic.getChildByPath(name);
+ if(p == null) return;
+ String value = p.getAttributeValue("value");
+ specific.setAttributeValue(a.getName(), value);
+ specific.set(a.getXMLName() + ".#comment", p.getAttributeValue("comment"));
+ p.removeFromParent();
+ }
+
public static void copySpecificAtttributesToBasicProperties(XModelObject specific, XModelObject basic) {
XModelEntity entity = specific.getModelEntity();
XAttribute[] as = entity.getAttributes();
@@ -218,18 +222,22 @@
String pre = as[i].getProperty("pre");
if(pre == null || pre.length() == 0) continue;
if("true".equals(pre)) {
- String value = specific.getAttributeValue(as[i].getName());
- if(value == null || value.length() == 0 || value.equals(as[i].getDefaultValue())) {
- if(!"always".equals(as[i].getProperty("save"))) continue;
- }
- XModelObject p = specific.getModel().createModelObject(ESBConstants.ENT_ESB_PROPERTY, null);
- p.setAttributeValue("name", as[i].getXMLName());
- p.setAttributeValue("value", value);
- p.setAttributeValue("comment", specific.get(as[i].getXMLName() + ".#comment"));
- basic.addChild(p);
+ copySpecificAttributeToBasicProperty(specific, basic, as[i]);
} else {
//very specific cases
}
}
}
+
+ public static void copySpecificAttributeToBasicProperty(XModelObject specific, XModelObject basic, XAttribute a) {
+ String value = specific.getAttributeValue(a.getName());
+ if(value == null || value.length() == 0 || value.equals(a.getDefaultValue())) {
+ if(!"always".equals(a.getProperty("save"))) return;
+ }
+ XModelObject p = specific.getModel().createModelObject(ESBConstants.ENT_ESB_PROPERTY, null);
+ p.setAttributeValue("name", a.getXMLName());
+ p.setAttributeValue("value", value);
+ p.setAttributeValue("comment", specific.get(a.getXMLName() + ".#comment"));
+ basic.addChild(p);
+ }
}
Modified: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificPropertyConverter.java
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificPropertyConverter.java 2012-06-08 21:29:17 UTC (rev 41843)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/SpecificPropertyConverter.java 2012-06-08 21:47:46 UTC (rev 41844)
@@ -15,6 +15,7 @@
import org.jboss.tools.esb.core.model.converters.FTPListenerConverter;
import org.jboss.tools.esb.core.model.converters.IPropertyConverter;
import org.jboss.tools.esb.core.model.converters.JBRListenerConverter;
+import org.jboss.tools.esb.core.model.converters.MessageFlowPriorityConverter;
/**
* When loading from xml, reads 'raw' list of esb property children of loaded object
@@ -47,6 +48,10 @@
} else if(JBR_ENTITIES.indexOf("." + entity + ".") >= 0) {
JBRListenerConverter.instance.toSpecific(basic, basic);
}
+
+ if(basic.getModelEntity().getAttribute(ATTR_MESSAGE_FLOW_PRIORITY) != null) {
+ MessageFlowPriorityConverter.instance.toSpecific(basic, basic);
+ }
return basic;
}
@@ -60,6 +65,15 @@
basic = basic.copy();
JBRListenerConverter.instance.toBasic(basic, specific);
}
+
+ if(basic.getModelEntity().getAttribute(ATTR_MESSAGE_FLOW_PRIORITY) != null) {
+ String value = basic.getAttributeValue(ATTR_MESSAGE_FLOW_PRIORITY);
+ if(value != null && value.length() > 0) {
+ if(basic == specific) basic = basic.copy();
+ MessageFlowPriorityConverter.instance.toBasic(basic, specific);
+ basic.setAttributeValue(ATTR_MESSAGE_FLOW_PRIORITY, "");
+ }
+ }
return basic;
}
Added: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/MessageFlowPriorityConverter.java
===================================================================
--- branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/MessageFlowPriorityConverter.java (rev 0)
+++ branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/MessageFlowPriorityConverter.java 2012-06-08 21:47:46 UTC (rev 41844)
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.esb.core.model.converters;
+
+import org.jboss.tools.common.meta.XAttribute;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.esb.core.model.ESBConstants;
+import org.jboss.tools.esb.core.model.SpecificActionLoader;
+
+/**
+ * @author Viacheslav Kabanovich
+ */
+public class MessageFlowPriorityConverter implements IPropertyConverter {
+ public static MessageFlowPriorityConverter instance = new MessageFlowPriorityConverter();
+
+ public MessageFlowPriorityConverter() {}
+
+ public void toBasic(XModelObject basic, XModelObject specific) {
+ XAttribute a = specific.getModelEntity().getAttribute(ESBConstants.ATTR_MESSAGE_FLOW_PRIORITY);
+ if(a != null) SpecificActionLoader.copySpecificAttributeToBasicProperty(specific, basic, a);
+ }
+
+ public void toSpecific(XModelObject basic, XModelObject specific) {
+ XAttribute a = specific.getModelEntity().getAttribute(ESBConstants.ATTR_MESSAGE_FLOW_PRIORITY);
+ if(a != null) SpecificActionLoader.copyBasicPropertyToSpecificAttribute(basic, specific, a);
+ }
+
+}
Property changes on: branches/jbosstools-3.3.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/MessageFlowPriorityConverter.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r41843 - trunk/download.jboss.org/jbosstools/examples.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-06-08 17:29:17 -0400 (Fri, 08 Jun 2012)
New Revision: 41843
Modified:
trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3....
Log:
install GWT configurator for gwt archetype
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3....
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3.... 2012-06-08 20:37:28 UTC (rev 41842)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3.... 2012-06-08 21:29:17 UTC (rev 41843)
@@ -326,9 +326,9 @@
<property name="connectorIds">org.maven.ide.eclipse.wtp</property>
</fix>
<fix type="plugin">
- <property name="id">org.jboss.tools.maven.core</property>
+ <property name="id">org.jboss.tools.maven.gwt</property>
<property name="versions">[1.3.0,1.4.0)</property>
- <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="description">This project example requires JBoss Maven GWT Integration</property>
<property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.gwt.feature</property>
</fix>
<fix type="plugin">
13 years, 10 months
- 1
- 0
JBoss Tools SVN: r41842 - trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2012-06-08 16:37:28 -0400 (Fri, 08 Jun 2012)
New Revision: 41842
Modified:
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/RmPostProcessor.java
Log:
JBIDE-11124: Removing project via forge is not working properly (third attempt)
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/RmPostProcessor.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/RmPostProcessor.java 2012-06-08 20:32:38 UTC (rev 41841)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/RmPostProcessor.java 2012-06-08 20:37:28 UTC (rev 41842)
@@ -34,6 +34,9 @@
if (resourceNames == null) return;
IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
for (String resourceName : resourceNames) {
+ if (resourceName.endsWith("/")) {
+ resourceName = resourceName.substring(0, resourceName.length() - 1);
+ }
for (IProject project : projects) {
if (project.exists() && resourceName.equals(project.getLocation().toOSString())) {
try {
13 years, 10 months
- 1
- 0