JBoss Tools SVN: r13793 - in trunk: tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-02-25 08:38:25 -0500 (Wed, 25 Feb 2009)
New Revision: 13793
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3701
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2009-02-25 11:18:35 UTC (rev 13792)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2009-02-25 13:38:25 UTC (rev 13793)
@@ -27,7 +27,6 @@
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.core.SeamPreferences;
import org.jboss.tools.seam.internal.core.SeamProject;
-import org.jboss.tools.seam.internal.core.validation.ISeamValidator;
import org.jboss.tools.test.util.JUnitUtils;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ProjectImportTestSetup;
@@ -35,6 +34,8 @@
public class SeamValidatorsTest extends AbstractResourceMarkerTest {
IProject project = null;
+
+ public static final String MARKER_TYPE = "org.eclipse.wst.validation.problemmarker";
public SeamValidatorsTest() {
super("Seam Validator Tests");
@@ -91,7 +92,7 @@
IFile testJSP = project.getFile("WebContent/test.jsp");
testJSP.touch(null);
JobUtils.waitForIdle();
- assertMarkerIsNotCreated(testJSP, null, "actor cannot be resolved");
+ assertMarkerIsNotCreated(testJSP, MARKER_TYPE, "actor cannot be resolved");
}
public void testVarAttributes() throws CoreException {
@@ -106,7 +107,7 @@
// Test for http://jira.jboss.com/jira/browse/JBIDE-1696
IFile subclassComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/SubclassTestComponent.java");
- assertMarkerIsCreated(subclassComponentFile, null, "Stateful component \"testComponentJBIDE1696\" must have a method marked @Remove", 25);
+ assertMarkerIsCreated(subclassComponentFile, MARKER_TYPE, "Stateful component \"testComponentJBIDE1696\" must have a method marked @Remove", 25);
IFile superclassComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/SuperclassTestComponent.java");
IFile superclassComponentFileWithRemove = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/SuperclassTestComponent.withRemove");
try{
@@ -121,15 +122,14 @@
public void testJiraJbide1631() throws CoreException {
// Test for http://jira.jboss.com/jira/browse/JBIDE-1631
- IFile jbide1631XHTMLFile = project.getFile("WebContent/JBIDE-1631.xhtml");
- refreshProject(project);
- assertMarkerIsCreated(jbide1631XHTMLFile, null, "\"foo1\" cannot be resolved", 16 );
- assertMarkerIsCreated(jbide1631XHTMLFile, null, "\"foo2\" cannot be resolved", 16 );
+ String jbide1631XHTMLFile = "WebContent/JBIDE-1631.xhtml";
+ String jbide1631XHTMLFile2 = "WebContent/JBIDE-1631.1";
+
+ assertMarkerIsCreated(jbide1631XHTMLFile, jbide1631XHTMLFile2, "\"foo1\" cannot be resolved", 16 );
+ assertMarkerIsCreated(project.getFile(jbide1631XHTMLFile), MARKER_TYPE, "\"foo2\" cannot be resolved", 16 );
}
public void testComponentsValidator() {
- ISeamProject seamProject = getSeamProject(project);
-
IFile bbcComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.java");
IFile statefulComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.java");
IFile componentsFile = project.getFile("WebContent/WEB-INF/components.xml");
@@ -305,8 +305,6 @@
}
public void testEntitiesValidator() {
- ISeamProject seamProject = getSeamProject(project);
-
IFile abcEntityFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/entity/abcEntity.java");
int number = getMarkersNumber(abcEntityFile);
@@ -340,7 +338,6 @@
final String TARGET_FILE_NAME
= "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.java";
- ISeamProject seamProject = getSeamProject(project);
IFile componentsFile = project.getFile("WebContent/WEB-INF/components.xml");
final String NEW_CONTENT_FILE_NAME6 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.6";
@@ -428,7 +425,7 @@
assertMarkerIsCreated(
TARGET_FILE_NAME,"Duplicate @Remove method \"removeMethod2\"", 22);
- IFile componentsFileWithSTComponent = project.getFile("WebContent/WEB-INF/components.2");
+ //IFile componentsFileWithSTComponent = project.getFile("WebContent/WEB-INF/components.2");
try {
componentsFile.setContents(componentsFileWithoutSTComponent.getContents(), true, false, null);
}catch(Exception ex){
@@ -450,7 +447,7 @@
IFile targetFile = project.getFile(targetPath);
targetFile.setContents(newContentFile.getContents(), true, false, null);
refreshProject(project);
- assertMarkerIsCreated(targetFile, ISeamValidator.SEAM_RESOURCE_MESSAGE_ID, pattern, line);
+ assertMarkerIsCreated(targetFile, MARKER_TYPE, pattern, line);
}
/**
@@ -463,7 +460,7 @@
String pattern, int line) throws CoreException {
IFile targetFile = project.getFile(targetPath);
- assertMarkerIsCreated(targetFile, ISeamValidator.SEAM_RESOURCE_MESSAGE_ID, pattern, line);
+ assertMarkerIsCreated(targetFile, MARKER_TYPE, pattern, line);
}
/**
@@ -478,8 +475,6 @@
}
public void testFactoriesValidator() {
- ISeamProject seamProject = getSeamProject(project);
-
IFile Component12File = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/Component12.java");
refreshProject(project);
@@ -513,8 +508,6 @@
}
public void testBijectionsValidator() {
- ISeamProject seamProject = getSeamProject(project);
-
IFile selectionTestFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/SelectionTest.java");
IFile selectionIndexTestFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/SelectionIndexTest.java");
@@ -620,8 +613,6 @@
IPreferenceStore store = SeamCorePlugin.getDefault().getPreferenceStore();
System.out.println("UNKNOWN_EL_VARIABLE_NAME value- "+store.getString(SeamPreferences.UNKNOWN_EL_VARIABLE_NAME));
- ISeamProject seamProject = getSeamProject(project);
-
IFile contextVariableTestFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/ContextVariableTest.java");
refreshProject(project);
@@ -687,8 +678,6 @@
System.out.println("UNKNOWN_VARIABLE_NAME value- "+store.getString(SeamPreferences.UNKNOWN_VARIABLE_NAME));
System.out.println("UNPAIRED_GETTER_OR_SETTER value- "+store.getString(SeamPreferences.UNPAIRED_GETTER_OR_SETTER));
- ISeamProject seamProject = getSeamProject(project);
-
IFile abcComponentXHTMLFile = project.getFile("WebContent/abcComponent.xhtml");
IFile abcComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.java");
Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java 2009-02-25 11:18:35 UTC (rev 13792)
+++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java 2009-02-25 13:38:25 UTC (rev 13793)
@@ -52,7 +52,7 @@
protected IMarker[] findMarkers(IResource resource, String type, String pattern) throws CoreException {
List<IMarker> result = new ArrayList<IMarker>();
- IMarker[] markers = resource.findMarkers(type, false, IResource.DEPTH_INFINITE);
+ IMarker[] markers = resource.findMarkers(type, true, IResource.DEPTH_INFINITE);
for (int i = 0; i < markers.length; i++) {
String message = markers[i].getAttribute(IMarker.MESSAGE, "");
if (message.matches(pattern)) {
15 years, 2 months
- 1
- 0
JBoss Tools SVN: r13792 - trunk/hibernatetools/plugins/org.hibernate.eclipse/lib/tools.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2009-02-25 06:18:35 -0500 (Wed, 25 Feb 2009)
New Revision: 13792
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse/lib/tools/hibernate-tools.jar
Log:
compiled with java 5 for real this time
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/lib/tools/hibernate-tools.jar
===================================================================
(Binary files differ)
15 years, 2 months
- 1
- 0
JBoss Tools SVN: r13791 - trunk/jsf/docs/userguide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: msorokin
Date: 2009-02-25 06:09:26 -0500 (Wed, 25 Feb 2009)
New Revision: 13791
Modified:
trunk/jsf/docs/userguide/en/modules/editors.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-620
Code Assist for beans in jars archives
Modified: trunk/jsf/docs/userguide/en/modules/editors.xml
===================================================================
--- trunk/jsf/docs/userguide/en/modules/editors.xml 2009-02-25 09:42:29 UTC (rev 13790)
+++ trunk/jsf/docs/userguide/en/modules/editors.xml 2009-02-25 11:09:26 UTC (rev 13791)
@@ -1235,7 +1235,7 @@
<title>Advanced Settings</title>
<para>In the left vertical pane of the Visual part there are three buttons: <emphasis>
- <property>Preferences</property>, </emphasis>
+ <property>Preferences</property></emphasis>
(
<inlinemediaobject>
<imageobject>
15 years, 2 months
- 1
- 0
JBoss Tools SVN: r13790 - in trunk: common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/query and 7 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-02-25 04:42:29 -0500 (Wed, 25 Feb 2009)
New Revision: 13790
Added:
trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/reporting/
trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/reporting/ReportProblemWizardTest.java
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/TestSuiteWithParams.java
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/global/ReportProblemActionDelegate.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/query/AbstractQueryWizard.java
trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/vrules/wizard/runtime2/VerifyWizard.java
trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/test/ModelUiAllTests.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite201GA.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/AbstractSeamNewOperationTest.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12EARNewOperationTest.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12WARNewOperationTest.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12XOperationsTestSuite121EAP.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite201GA.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2850 make seam tests 6 times faster to minimize impact of test execution time during execution the same test suits with different configurations
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/global/ReportProblemActionDelegate.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/global/ReportProblemActionDelegate.java 2009-02-25 09:04:27 UTC (rev 13789)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/action/global/ReportProblemActionDelegate.java 2009-02-25 09:42:29 UTC (rev 13790)
@@ -36,9 +36,9 @@
ReportProblemWizard wizard = new ReportProblemWizard();
Properties p = new Properties();
- p.setProperty("help", "ReportProblemWizard");
+ p.setProperty(ReportProblemWizard.Property.HELP, "ReportProblemWizard");
wizard.setObject(p);
- wizard.execute();
+ wizard.execute();
}
public void selectionChanged(IAction action, ISelection selection) {}
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/query/AbstractQueryWizard.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/query/AbstractQueryWizard.java 2009-02-25 09:04:27 UTC (rev 13789)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/query/AbstractQueryWizard.java 2009-02-25 09:42:29 UTC (rev 13790)
@@ -19,6 +19,16 @@
import org.jboss.tools.common.model.ui.ModelUIPlugin;
public class AbstractQueryWizard implements SpecialWizard {
+
+ public static class Property {
+ public static final String HELP = "help";
+ public static final String MODAL = "modal";
+ public static final String TITLE = "title";
+ public static final String SUBTITLE = "subtitle";
+ public static final String MESSAGE = "message";
+ public static final String BLOCKING = "blocking";
+ }
+
private AbstractQueryWizardView view = null;
public void dispose() {
@@ -42,16 +52,18 @@
if(key == null) {
//put debuggin here
} else {
- String title = p.getProperty("title");
+ String title = p.getProperty(Property.TITLE);
if(title == null) title = WizardKeys.getHeader(key);
if(title == null) title = WizardKeys.getHeader("Properties"); // NON-NLS-1
if(title == null) title = "Title is not found for key \"" + key + "\"";
view.setWindowTitle(title);
- String subtitle = p.getProperty("subtitle");
+
+ String subtitle = p.getProperty(Property.SUBTITLE);
if(subtitle == null) subtitle = WizardKeys.getTitle(key);
if(subtitle == null) subtitle = "Subtitle is not found for key \"" + key + "\"";
view.setTitle(subtitle);
- String message = p.getProperty("message");
+
+ String message = p.getProperty(Property.MESSAGE);
if(message == null) message = WizardKeys.getString(key + ".Message");
if(message != null) view.setMessage(message);
}
@@ -90,15 +102,15 @@
public int execute() {
Shell shell = ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell();
IQueryDialog dialog = createDialog(shell);
- dialog.setView(view);
- dialog.getDialog().create();
- view.setDialog(dialog.getDialog());
dialog.getDialog().open();
return view.code();
}
- protected IQueryDialog createDialog(Shell shell) {
- return new AbstractQueryDialog(shell);
+ public IQueryDialog createDialog(Shell shell) {
+ IQueryDialog dialog = new AbstractQueryDialog(shell);
+ dialog.setView(view);
+ dialog.getDialog().create();
+ view.setDialog(dialog.getDialog());
+ return dialog;
}
-
}
Modified: trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/vrules/wizard/runtime2/VerifyWizard.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/vrules/wizard/runtime2/VerifyWizard.java 2009-02-25 09:04:27 UTC (rev 13789)
+++ trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/vrules/wizard/runtime2/VerifyWizard.java 2009-02-25 09:42:29 UTC (rev 13790)
@@ -20,7 +20,7 @@
setView(new VerifyWizardView());
}
- protected IQueryDialog createDialog(Shell shell) {
+ public IQueryDialog createDialog(Shell shell) {
return new VerifyDialog(shell);
}
Added: trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/reporting/ReportProblemWizardTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/reporting/ReportProblemWizardTest.java (rev 0)
+++ trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/reporting/ReportProblemWizardTest.java 2009-02-25 09:42:29 UTC (rev 13790)
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * 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.common.model.ui.reporting;
+
+import org.eclipse.swt.widgets.Shell;
+import org.jboss.tools.common.model.ui.ModelUIPlugin;
+import org.jboss.tools.common.model.ui.wizards.query.IQueryDialog;
+
+import junit.framework.TestCase;
+
+/**
+ * @author eskimo
+ *
+ */
+public class ReportProblemWizardTest extends TestCase {
+ public void testReportProblemWizard() {
+ Shell shell = ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell();
+ IQueryDialog reportWiz = new ReportProblemWizard().createDialog(shell);
+ reportWiz.getDialog().setBlockOnOpen(false);
+ reportWiz.getDialog().open();
+ reportWiz.getDialog().close();
+ }
+}
Property changes on: trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/reporting/ReportProblemWizardTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/test/ModelUiAllTests.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/test/ModelUiAllTests.java 2009-02-25 09:04:27 UTC (rev 13789)
+++ trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/test/ModelUiAllTests.java 2009-02-25 09:42:29 UTC (rev 13790)
@@ -10,14 +10,14 @@
******************************************************************************/
package org.jboss.tools.common.model.ui.test;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
import org.jboss.tools.common.core.jdt.test.FavoritesClassControllerTest;
-import org.jboss.tools.common.model.ui.dialog.MessageAndCheckboxDialog;
import org.jboss.tools.common.model.ui.dialog.test.ErrorDialogTest;
import org.jboss.tools.common.model.ui.dialog.test.MessageAndCheckboxDialogTest;
+import org.jboss.tools.common.model.ui.reporting.ReportProblemWizardTest;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
/**
* @author eskimo
*
@@ -33,6 +33,7 @@
suite.addTestSuite(FavoritesClassControllerTest.class);
suite.addTestSuite(ErrorDialogTest.class);
suite.addTestSuite(MessageAndCheckboxDialogTest.class);
+ suite.addTestSuite(ReportProblemWizardTest.class);
return suite;
}
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite201GA.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite201GA.java 2009-02-25 09:04:27 UTC (rev 13789)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite201GA.java 2009-02-25 09:42:29 UTC (rev 13790)
@@ -10,6 +10,10 @@
******************************************************************************/
package org.jboss.tools.seam.core.test.project.facet;
+import org.jboss.tools.test.util.JobUtils;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
import junit.framework.TestSuite;
@@ -18,9 +22,32 @@
*
*/
public class Seam20XFacetTestSuite201GA {
- public static TestSuite suite() {
+ public static final Test suite() {
TestSuite suite = new TestSuite("Seam 2.0.X tests");
- suite.addTestSuite(Seam2FacetInstallDelegateTest.class);
+ suite.addTest(new Seam2FacetInstallDelegateTestSetup(new TestSuite(Seam2FacetInstallDelegateTest.class)));
return suite;
}
+
+ public static class Seam2FacetInstallDelegateTestSetup extends TestSetup {
+
+ Seam2FacetInstallDelegateTest delegate = new Seam2FacetInstallDelegateTest("Delegate");
+ @Override
+ protected void setUp() throws Exception {
+ delegate.setUp();
+ JobUtils.waitForIdle(50);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ delegate.tearDown();
+ }
+
+ /**
+ * @param test
+ */
+ public Seam2FacetInstallDelegateTestSetup(Test test) {
+ super(test);
+ }
+
+ }
}
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java 2009-02-25 09:04:27 UTC (rev 13789)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java 2009-02-25 09:42:29 UTC (rev 13790)
@@ -22,6 +22,7 @@
import org.eclipse.core.resources.IResourceChangeEvent;
import org.eclipse.core.resources.IResourceProxy;
import org.eclipse.core.resources.IResourceProxyVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
@@ -56,7 +57,7 @@
suspendAllValidation = ValidationFramework.getDefault().isSuspended();
ValidationFramework.getDefault().suspendAllValidation(true);
- ws.removeResourceChangeListener( EventManager.getManager() );
+ ResourcesPlugin.getWorkspace().removeResourceChangeListener( EventManager.getManager() );
// commented to run tests on wtp 3.0.4 build
// ws.removeResourceChangeListener( ValManager.getDefault() );
//EventManager.getManager().shutdown();
@@ -68,20 +69,18 @@
seam2Facet = ProjectFacetsManager.getProjectFacet("jst.seam");
seam2FacetVersion = seam2Facet.getVersion("2.0");
-
File folder = getSeamHomeFolder();
SeamRuntimeManager.getInstance().addRuntime(SEAM_2_0_0, folder.getAbsolutePath(), SeamVersion.SEAM_2_0, true);
SeamRuntimeManager.getInstance().findRuntimeByName(SEAM_2_0_0);
-
- warProject = createSeamWarProject("warprj");
- earProject = createSeamEarProject("earprj");
+ IProject war = (IProject)ResourcesPlugin.getWorkspace().getRoot().findMember("warprj");
+ warProject = (war!=null ? ProjectFacetsManager.create(war, false,
+ null): createSeamWarProject("warprj"));
+ IProject ear = (IProject)ResourcesPlugin.getWorkspace().getRoot().findMember("earprj");
+ earProject = (ear!=null? ProjectFacetsManager.create(ear, false,
+ null):createSeamEarProject("earprj"));
- warProject.getProject().getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, null);
-
-
-
- super.setUp();
+ //warProject.getProject().getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, null);
}
@Override
@@ -90,7 +89,7 @@
ValidationFramework.getDefault().suspendAllValidation(suspendAllValidation);
XJob.setSuspended(suspendXJobs);
- ws.addResourceChangeListener(EventManager.getManager(),
+ ResourcesPlugin.getWorkspace().addResourceChangeListener(EventManager.getManager(),
IResourceChangeEvent.PRE_CLOSE | IResourceChangeEvent.PRE_DELETE |
IResourceChangeEvent.POST_BUILD | IResourceChangeEvent.PRE_BUILD | IResourceChangeEvent.POST_CHANGE);
// ws.addResourceChangeListener(ValOperationManager.getDefault(),
@@ -350,7 +349,6 @@
public void testCreateEar() throws CoreException, IOException {
-
}
@Override
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/AbstractSeamNewOperationTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/AbstractSeamNewOperationTest.java 2009-02-25 09:04:27 UTC (rev 13789)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/AbstractSeamNewOperationTest.java 2009-02-25 09:42:29 UTC (rev 13790)
@@ -38,6 +38,7 @@
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.validation.ValidationFramework;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.core.project.facet.SeamVersion;
@@ -71,6 +72,7 @@
private static final IUndoableOperation CREATE_SEAM_ENTITY = new SeamEntityCreateOperation();
protected final Set<IResource> resourcesToCleanup = new HashSet<IResource>();
+ private boolean suspendAllValidation = false;
private static final IProjectFacet seamFacet;
@@ -84,14 +86,19 @@
}
protected void setUp() throws Exception {
-
+ suspendAllValidation = ValidationFramework.getDefault().isSuspended();
+ ValidationFramework.getDefault().suspendAllValidation(true);
JobUtils.waitForIdle();
-
-
-
-
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ // TODO Auto-generated method stub
+ super.tearDown();
+ ValidationFramework.getDefault().suspendAllValidation(suspendAllValidation);
+ }
+
abstract protected IProject getProject();
abstract void setUpSeamProjects();
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12EARNewOperationTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12EARNewOperationTest.java 2009-02-25 09:04:27 UTC (rev 13789)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12EARNewOperationTest.java 2009-02-25 09:42:29 UTC (rev 13790)
@@ -15,6 +15,7 @@
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
@@ -55,8 +56,9 @@
SeamRuntimeManager.getInstance().addRuntime(getSeamRTName(), folder.getAbsolutePath(), getSeamRTVersion(getSeamRTName()), true);
SeamRuntime sr = SeamRuntimeManager.getInstance().findRuntimeByName(getSeamRTName());
assertNotNull("An error occured while getting the SEAM RUN-TIME for: " + getSeamRTName(), sr);
-
- if (earProject == null && earEjbProject == null && earEarProject == null && testProject == null)
+
+ IResource project = ResourcesPlugin.getWorkspace().getRoot().findMember(SEAM_EAR_PROJECTNAME);
+ if (project== null && earProject == null && earEjbProject == null && earEarProject == null && testProject == null)
createSeamEarProject(SEAM_EAR_PROJECTNAME);
try {
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12WARNewOperationTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12WARNewOperationTest.java 2009-02-25 09:04:27 UTC (rev 13789)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12WARNewOperationTest.java 2009-02-25 09:42:29 UTC (rev 13790)
@@ -16,6 +16,7 @@
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
@@ -50,9 +51,11 @@
SeamRuntimeManager.getInstance().addRuntime(getSeamRTName(), folder.getAbsolutePath(), getSeamRTVersion(getSeamRTName()), true);
SeamRuntime sr = SeamRuntimeManager.getInstance().findRuntimeByName(getSeamRTName());
assertNotNull("An error occured while getting the SEAM RUN-TIME for: " + getSeamRTName(), sr);
-
- createSeamWarProject(SEAM_WAR_PROJECTNAME);
+ IResource project = ResourcesPlugin.getWorkspace().getRoot().findMember(SEAM_WAR_PROJECTNAME);
+ if(project==null) {
+ createSeamWarProject(SEAM_WAR_PROJECTNAME);
+ }
try {
JobUtils.waitForIdle();
} catch (Exception e) {
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12XOperationsTestSuite121EAP.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12XOperationsTestSuite121EAP.java 2009-02-25 09:04:27 UTC (rev 13789)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12XOperationsTestSuite121EAP.java 2009-02-25 09:42:29 UTC (rev 13790)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.seam.ui.test.wizard;
+import junit.extensions.TestSetup;
+import junit.framework.Test;
import junit.framework.TestSuite;
/**
@@ -17,11 +19,55 @@
*
*/
public class Seam12XOperationsTestSuite121EAP {
- public static TestSuite suite() {
+ public static Test suite() {
TestSuite suite = new TestSuite();
suite.setName("Seam 1.2.X Operations Tests");
- suite.addTestSuite(Seam12EARNewOperationTest.class);
- suite.addTestSuite(Seam12WARNewOperationTest.class);
+ suite.addTest(
+ new Seam12EARNewOperationTestSetup(
+ new TestSuite(Seam12EARNewOperationTest.class)));
+ suite.addTest(
+ new Seam12WARNewOperationTestSetup(
+ new TestSuite(Seam12WARNewOperationTest.class)));
return suite;
}
+
+ public static class Seam12EARNewOperationTestSetup extends TestSetup {
+ Seam12EARNewOperationTest delegate = new Seam12EARNewOperationTest("delegate");
+ /**
+ * @param test
+ */
+ public Seam12EARNewOperationTestSetup(Test test) {
+ super(test);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ delegate.setUp();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ delegate.tearDown();
+ }
+ }
+
+ public static class Seam12WARNewOperationTestSetup extends TestSetup {
+ Seam12WARNewOperationTest delegate = new Seam12WARNewOperationTest("delegate");
+ /**
+ * @param test
+ */
+ public Seam12WARNewOperationTestSetup(Test test) {
+ super(test);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ delegate.setUp();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ delegate.tearDown();
+ }
+ }
}
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite201GA.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite201GA.java 2009-02-25 09:04:27 UTC (rev 13789)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite201GA.java 2009-02-25 09:42:29 UTC (rev 13790)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.seam.ui.test.wizard;
+import junit.extensions.TestSetup;
+import junit.framework.Test;
import junit.framework.TestSuite;
/**
@@ -18,12 +20,56 @@
*/
public class Seam20XOperationsTestSuite201GA {
- public static TestSuite suite() {
+ public static final Test suite() {
TestSuite suite = new TestSuite();
suite.setName("Seam 2.0.X Operations Test");
- suite.addTestSuite(Seam20EARNewOperationTest.class);
- suite.addTestSuite(Seam20WARNewOperationTest.class);
+ suite.addTest(
+ new Seam20EARNewOperationTestSetup(
+ new TestSuite(Seam20EARNewOperationTest.class)));
+ suite.addTest(
+ new Seam20WARNewOperationTestSetup(
+ new TestSuite(Seam20WARNewOperationTest.class)));
return suite;
}
+ public static class Seam20EARNewOperationTestSetup extends TestSetup {
+ Seam20EARNewOperationTest delegate = new Seam20EARNewOperationTest("delegate");
+
+ /**
+ * @param test
+ */
+ public Seam20EARNewOperationTestSetup(Test test) {
+ super(test);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ delegate.setUp();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ delegate.tearDown();
+ }
+ }
+
+ public static class Seam20WARNewOperationTestSetup extends TestSetup {
+ Seam20WARNewOperationTest delegate = new Seam20WARNewOperationTest("delegate");
+ /**
+ * @param test
+ */
+ public Seam20WARNewOperationTestSetup(Test test) {
+ super(test);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ delegate.setUp();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ delegate.tearDown();
+ }
+ }
}
Added: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/TestSuiteWithParams.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/TestSuiteWithParams.java (rev 0)
+++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/TestSuiteWithParams.java 2009-02-25 09:42:29 UTC (rev 13790)
@@ -0,0 +1,52 @@
+/**
+ *
+ */
+package org.jboss.tools.tests;
+
+import java.beans.IntrospectionException;
+import java.beans.PropertyDescriptor;
+import java.beans.Statement;
+import java.util.Properties;
+
+import junit.framework.Test;
+import junit.framework.TestResult;
+import junit.framework.TestSuite;
+
+/**
+ * @author eskimo
+ *
+ */
+public class TestSuiteWithParams extends TestSuite {
+
+ Properties parameters = new Properties();
+
+ public TestSuiteWithParams(Class theClass, Properties params) {
+ super(theClass);
+ this.parameters.putAll(params);
+ }
+
+ @Override
+ public void runTest(Test test, TestResult result) {
+
+ for (Object property : parameters.keySet()) {
+ String propertyName = property.toString();
+ try {
+ PropertyDescriptor propertyDescr = new PropertyDescriptor(propertyName,test.getClass());
+ Statement setPropertyStatement =
+ new Statement(
+ test,propertyDescr.getWriteMethod().getName(),new Object[]{parameters.get(property)});
+ setPropertyStatement.execute();
+ } catch (IntrospectionException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ }
+ super.runTest(test, result);
+ }
+
+
+}
Property changes on: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/TestSuiteWithParams.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 2 months
- 1
- 0
JBoss Tools SVN: r13789 - in trunk/esb/plugins: org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2009-02-25 04:04:27 -0500 (Wed, 25 Feb 2009)
New Revision: 13789
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeManager.java
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java
trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/JBossESBRuntimeContainerPage.java
Log:
JBIDE-3858:There is no warning message that the specified target runtime does not contain a valid ESB runtime for ESB version 4.5 in New JBoss ESB Project wizard.
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeManager.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeManager.java 2009-02-25 08:42:53 UTC (rev 13788)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeManager.java 2009-02-25 09:04:27 UTC (rev 13789)
@@ -20,6 +20,7 @@
import java.util.Map;
import java.util.Set;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
@@ -416,31 +417,35 @@
runtimes = converter.getMap(runtimeListString);
}
- public static boolean isValidESBServer(String path){
- File resttaJar = getResttaJar(path, "");
- return resttaJar != null && resttaJar.exists() || isValidSoapContainedESBRuntime(path);
+ public static boolean isValidESBServer(String path, String version){
+ return getResttaJar(path, "" , version) || isValidSoapContainedESBRuntime(path, version);
}
- private static boolean isValidSoapContainedESBRuntime(String path){
- File resttaJar = getResttaJar(path, SOAP_AS_LOCATION);
- return resttaJar != null && resttaJar.exists();
+ private static boolean isValidSoapContainedESBRuntime(String path, String version){
+ return getResttaJar(path, SOAP_AS_LOCATION, version);
}
- public static File getResttaJar(String path, String asFoldername){
+ public static boolean getResttaJar(String path, String asFoldername, String version){
IPath serverLocation = new Path(path);
if(asFoldername != null && !"".equals(asFoldername)){
serverLocation = serverLocation.append(asFoldername);
}
-
- String rosettaJar = "server" + File.separator + "default"
+ IPath sarLocation = serverLocation.append( "server" + File.separator + "default"
+ File.separator + "deploy" + File.separator
- + "jbossesb.sar" + File.separator + "lib" + File.separator + "jbossesb-rosetta.jar";
- IPath esbLocation = serverLocation.append(rosettaJar);
+ + "jbossesb.sar");
+ IPath rosettaJar = sarLocation.append("lib" + File.separator + "jbossesb-rosetta.jar");
- return esbLocation.toFile();
+ try{
+ double versionNumber = Double.valueOf(version);
+ if(versionNumber >= 4.5){
+ return isVersion45(sarLocation);
+ }
+ }catch(NumberFormatException e){
+ }
+ return rosettaJar.toFile().exists();
}
- public static boolean isValidESBStandaloneRuntimeDir(String path) {
+ public static boolean isValidESBStandaloneRuntimeDir(String path, String version) {
IPath location = new Path(path);
IPath esblocation = location.append("lib").append("jbossesb.esb");
IPath sarLocation = location.append("lib").append("jbossesb.sar");
@@ -450,9 +455,23 @@
if (!sarLocation.toFile().isDirectory()) {
return false;
}
+
+ try{
+ double versionNumber = Double.valueOf(version);
+ if(versionNumber >= 4.5){
+ return isVersion45(sarLocation);
+ }
+ }catch(NumberFormatException e){
+ }
return true;
}
+
+ private static boolean isVersion45(IPath sarLocation){
+ IPath libPath = sarLocation.append("lib");
+ File jbossesbConfigModel110 = libPath.append("jbossesb-config-model-1.1.0.jar").toFile();
+ return jbossesbConfigModel110 != null && jbossesbConfigModel110.exists();
+ }
public String getESBVersionNumber(File rosettaJar){
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties 2009-02-25 08:42:53 UTC (rev 13788)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/messages/JBossESBUI.properties 2009-02-25 09:04:27 UTC (rev 13789)
@@ -1,4 +1,4 @@
-Label_JBoss_Runtime_Load_Error=Error occurred while loading JBoss ESB runtime. Please select a correct JBoss ESB runtime or JBoss ESB server location
+Label_JBoss_Runtime_Load_Error=Error occurred while loading JBoss ESB {0} runtime . Please select a correct JBoss ESB runtime or JBoss ESB server location
Error_JBoss_Basic_Editor_Composite=Parent control should be Composite
Error_JBoss_Basic_Editor_Support=Editor supports only grid layout
@@ -47,7 +47,7 @@
ESBFacetInstallationPage_Default_SRC_Folder=src
ESBFacetInstallationPage_Description=Configure project structure and classpath
ESBFacetInstallationPage_Error_Message_Have_Not_Set_Target_Runtime=Please specify the project primary target runtime
-ESBFacetInstallationPage_Error_Message_Invalid_ESB_Runtime=The specified target runtime does not contain a valid ESB runtime.
+ESBFacetInstallationPage_Error_Message_Invalid_ESB_Runtime=The specified target runtime does not contain a valid ESB {0} runtime .
ESBFacetInstallationPage_Error_Message_No_Target_Runtime=No target runtime was specified.
ESBFacetInstallationPage_Error_Message_Specify_Content_Folder=Please specify a valid content folder.
ESBFacetInstallationPage_Error_Message_Specify_ESB_Runtime=Please specify a ESB runtime
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java 2009-02-25 08:42:53 UTC (rev 13788)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/preference/controls/JBossRuntimeListFieldEditor.java 2009-02-25 09:04:27 UTC (rev 13789)
@@ -555,8 +555,8 @@
return;
}
- if (!runtimeExist(homeDir.getValueAsString())) {
- setErrorMessage(JBossESBUIMessages.Label_JBoss_Runtime_Load_Error);
+ if (!runtimeExist(homeDir.getValueAsString(), (String)version.getValue())) {
+ setErrorMessage(NLS.bind(JBossESBUIMessages.Label_JBoss_Runtime_Load_Error, version.getValue()));
setPageComplete(false);
return;
}
@@ -655,14 +655,14 @@
};
}
- private boolean runtimeExist(String path) {
+ private boolean runtimeExist(String path, String version) {
File jbosswsHomeDir = new File(path);
if (!jbosswsHomeDir.isDirectory())
return false;
- if(!JBossRuntimeManager.isValidESBStandaloneRuntimeDir(path)
- && !JBossRuntimeManager.isValidESBServer(path)){
+ if(!JBossRuntimeManager.isValidESBStandaloneRuntimeDir(path, version)
+ && !JBossRuntimeManager.isValidESBServer(path, version)){
return false;
}
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2009-02-25 08:42:53 UTC (rev 13788)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBFacetInstallationPage.java 2009-02-25 09:04:27 UTC (rev 13789)
@@ -20,13 +20,13 @@
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.jst.common.project.facet.JavaFacetUtils;
import org.eclipse.jst.common.project.facet.core.JavaFacetInstallConfig;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -360,9 +360,9 @@
org.eclipse.wst.server.core.IRuntime serverRuntime = ServerCore
.findRuntime(runtime.getProperty("id")); //$NON-NLS-1$
if (!JBossRuntimeManager.isValidESBServer(serverRuntime
- .getLocation().toOSString())) {
+ .getLocation().toOSString(), getSelectedESBVersion().getVersionString())) {
hasRuntime = true;
- setMessage(JBossESBUIMessages.ESBFacetInstallationPage_Error_Message_Invalid_ESB_Runtime, WARNING);
+ setMessage(NLS.bind(JBossESBUIMessages.ESBFacetInstallationPage_Error_Message_Invalid_ESB_Runtime, getSelectedESBVersion().getVersionString()), WARNING);
setPageComplete(isPageComplete());
return true;
}
@@ -384,8 +384,8 @@
org.eclipse.wst.server.core.IRuntime serverRuntime = ServerCore
.findRuntime(runtime.getProperty("id"));
if (!JBossRuntimeManager.isValidESBServer(serverRuntime
- .getLocation().toOSString())) {
- setMessage(JBossESBUIMessages.ESBFacetInstallationPage_Error_Message_Invalid_ESB_Runtime, WARNING);
+ .getLocation().toOSString(), getSelectedESBVersion().getVersionString())) {
+ setMessage(NLS.bind(JBossESBUIMessages.ESBFacetInstallationPage_Error_Message_Invalid_ESB_Runtime, getSelectedESBVersion().getVersionString()), WARNING);
hasRuntime = true;
setPageComplete(isPageComplete());
return true;
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/JBossESBRuntimeContainerPage.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/JBossESBRuntimeContainerPage.java 2009-02-25 08:42:53 UTC (rev 13788)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/JBossESBRuntimeContainerPage.java 2009-02-25 09:04:27 UTC (rev 13789)
@@ -165,7 +165,7 @@
Object element) {
if(element instanceof IRuntime){
IPath location = ((IRuntime)element).getLocation();
- return JBossRuntimeManager.isValidESBServer(location.toOSString());
+ return JBossRuntimeManager.isValidESBServer(location.toOSString(), "");
}
return true;
}
15 years, 2 months
- 1
- 0
JBoss Tools SVN: r13788 - in trunk: archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/project and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-02-25 03:42:53 -0500 (Wed, 25 Feb 2009)
New Revision: 13788
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspacePreferenceManager.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/project/ArchivesBuilder.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntArchivesCore.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IPreferenceManager.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java
Log:
JBIDE-3825 - publishing for galder. Changes noted in JIRA
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspacePreferenceManager.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspacePreferenceManager.java 2009-02-25 03:31:16 UTC (rev 13787)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspacePreferenceManager.java 2009-02-25 08:42:53 UTC (rev 13788)
@@ -24,7 +24,6 @@
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.ArchivesCorePlugin;
-import org.jboss.ide.eclipse.archives.core.model.IArchivesLogger;
import org.jboss.ide.eclipse.archives.core.model.IPreferenceManager;
import org.osgi.service.prefs.BackingStoreException;
@@ -54,10 +53,14 @@
return null;
}
- public boolean isBuilderEnabled(IPath path) {
+
+ public boolean shouldBuild(IPath path) {
if( !ResourcesPlugin.getWorkspace().isAutoBuilding())
return false;
-
+ return isArchivesBuilderEnabled(path);
+ }
+
+ public boolean isArchivesBuilderEnabled(IPath path) {
QualifiedName name = new QualifiedName(ArchivesCorePlugin.PLUGIN_ID, AUTOMATIC_BUILDER_ENABLED);
IResource res = getResource(path);
if( res != null && areProjectSpecificPrefsEnabled(res)) {
@@ -70,7 +73,7 @@
return new InstanceScope().getNode(ArchivesCorePlugin.PLUGIN_ID).getBoolean(AUTOMATIC_BUILDER_ENABLED, true);
}
- public void setBuilderEnabled(IPath path, boolean value) {
+ public void setArchivesBuilderEnabled(IPath path, boolean value) {
QualifiedName name = new QualifiedName(ArchivesCorePlugin.PLUGIN_ID, AUTOMATIC_BUILDER_ENABLED);
IResource resource = getResource(path);
// if the resource is null or the resource has no preference val, use global val
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/project/ArchivesBuilder.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/project/ArchivesBuilder.java 2009-02-25 03:31:16 UTC (rev 13787)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/project/ArchivesBuilder.java 2009-02-25 08:42:53 UTC (rev 13788)
@@ -55,7 +55,7 @@
protected IProject[] build(int kind, Map args, IProgressMonitor monitor) throws CoreException {
// if we're not to build, get out of here
- if( !ArchivesCore.getInstance().getPreferenceManager().isBuilderEnabled(getProject().getLocation()))
+ if( !ArchivesCore.getInstance().getPreferenceManager().isArchivesBuilderEnabled(getProject().getLocation()))
return new IProject[]{};
IProject[] interestingProjects = getInterestingProjectsInternal();
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntArchivesCore.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntArchivesCore.java 2009-02-25 03:31:16 UTC (rev 13787)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntArchivesCore.java 2009-02-25 08:42:53 UTC (rev 13788)
@@ -123,16 +123,19 @@
public boolean areProjectSpecificPrefsEnabled(IPath path) {
return false;
}
+ public void setProjectSpecificPrefsEnabled(IPath path, boolean val) {
+ // not implemented
+ }
- public boolean isBuilderEnabled(IPath path) {
+ public boolean shouldBuild(IPath path) {
return true;
}
- public void setBuilderEnabled(IPath path, boolean val) {
- // not implemented
+ public boolean isArchivesBuilderEnabled(IPath path) {
+ return true;
}
- public void setProjectSpecificPrefsEnabled(IPath path, boolean val) {
+ public void setArchivesBuilderEnabled(IPath path, boolean val) {
// not implemented
}
}
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java 2009-02-25 03:31:16 UTC (rev 13787)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java 2009-02-25 08:42:53 UTC (rev 13788)
@@ -60,7 +60,8 @@
if (delta == null || delta.getPostNode() == null) {
return false;
}
- if( !ArchivesCore.getInstance().getPreferenceManager().isBuilderEnabled(delta.getPostNode().getProjectPath()))
+ IPath projectPath = delta.getPostNode().getProjectPath();
+ if( !ArchivesCore.getInstance().getPreferenceManager().shouldBuild(projectPath))
return false;
return true;
}
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IPreferenceManager.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IPreferenceManager.java 2009-02-25 03:31:16 UTC (rev 13787)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IPreferenceManager.java 2009-02-25 08:42:53 UTC (rev 13788)
@@ -13,8 +13,9 @@
import org.eclipse.core.runtime.IPath;
public interface IPreferenceManager {
- public boolean isBuilderEnabled(IPath path);
- public void setBuilderEnabled(IPath path, boolean val);
+ public boolean shouldBuild(IPath path);
+ public boolean isArchivesBuilderEnabled(IPath path);
+ public void setArchivesBuilderEnabled(IPath path, boolean val);
public boolean areProjectSpecificPrefsEnabled(IPath path);
public void setProjectSpecificPrefsEnabled(IPath path, boolean val);
}
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java 2009-02-25 03:31:16 UTC (rev 13787)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java 2009-02-25 08:42:53 UTC (rev 13788)
@@ -79,7 +79,7 @@
if( getResourceLocationIfExists() != null ) {
overrideButton.setSelection(getPrefManager().areProjectSpecificPrefsEnabled(getResourceLocationIfExists()));
}
- automaticBuilder.setSelection(getPrefManager().isBuilderEnabled(getResourceLocationIfExists()));
+ automaticBuilder.setSelection(getPrefManager().isArchivesBuilderEnabled(getResourceLocationIfExists()));
showErrorDialog.setSelection(PrefsInitializer.getBoolean(PrefsInitializer.PREF_SHOW_BUILD_ERROR_DIALOG, getElement(), true));
showAllProjects.setSelection(
PrefsInitializer.getBoolean(PrefsInitializer.PREF_SHOW_ALL_PROJECTS, getElement(), false));
@@ -210,7 +210,7 @@
if( getResourceLocationIfExists() != null ) {
getPrefManager().setProjectSpecificPrefsEnabled(getResourceLocationIfExists(), overrideButton.getSelection());
}
- getPrefManager().setBuilderEnabled(getResourceLocationIfExists(), automaticBuilder.getSelection());
+ getPrefManager().setArchivesBuilderEnabled(getResourceLocationIfExists(), automaticBuilder.getSelection());
PrefsInitializer.setBoolean(PrefsInitializer.PREF_SHOW_BUILD_ERROR_DIALOG, showErrorDialog.getSelection(), getElement());
PrefsInitializer.setBoolean(PrefsInitializer.PREF_SHOW_PACKAGE_OUTPUT_PATH, showPackageOutputPath.getSelection(), getElement());
PrefsInitializer.setBoolean(PrefsInitializer.PREF_SHOW_FULL_FILESET_ROOT_DIR, showFullFilesetRootDir.getSelection(), getElement());
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java 2009-02-25 03:31:16 UTC (rev 13787)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java 2009-02-25 08:42:53 UTC (rev 13788)
@@ -27,6 +27,7 @@
import org.eclipse.wst.server.core.model.IModuleFolder;
import org.eclipse.wst.server.core.model.IModuleResource;
import org.eclipse.wst.server.core.model.IModuleResourceDelta;
+import org.jboss.ide.eclipse.archives.core.build.ArchiveBuildDelegate;
import org.jboss.ide.eclipse.archives.core.model.IArchive;
import org.jboss.ide.eclipse.archives.core.util.PathUtils;
import org.jboss.ide.eclipse.archives.webtools.IntegrationPlugin;
@@ -75,6 +76,8 @@
if( publishType == REMOVE_PUBLISH ) {
removeModule(module2, monitor);
} else if( publishType == FULL_PUBLISH ) {
+ IArchive pack = getPackage(module2);
+ new ArchiveBuildDelegate().fullArchiveBuild(pack, monitor);
publishModule(module2, false, monitor);
} else if( publishType == INCREMENTAL_PUBLISH ) {
publishModule(module2, true, monitor);
15 years, 2 months
- 1
- 0
JBoss Tools SVN: r13787 - in workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui: editors and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2009-02-24 22:31:16 -0500 (Tue, 24 Feb 2009)
New Revision: 13787
Added:
workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/ISmooksTestRunner.java
workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/xml2java/
workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/xml2java/X2JTestRunner.java
Modified:
workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/editors/SmooksTestMultiPageEditor.java
workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/views/SmooksTestEditor.java
Log:
Added: workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/ISmooksTestRunner.java
===================================================================
--- workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/ISmooksTestRunner.java (rev 0)
+++ workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/ISmooksTestRunner.java 2009-02-25 03:31:16 UTC (rev 13787)
@@ -0,0 +1,15 @@
+package org.smooks.tools.testui;
+
+import javax.xml.transform.Source;
+
+import org.eclipse.core.resources.IFile;
+
+public interface ISmooksTestRunner {
+ public String getSmooksConfigFilePath();
+
+ public void setSmooksConfigFilePath(String path);
+
+ public void init(IFile configFile , Source inputSource);
+
+ public Object run() throws Exception ;
+}
Property changes on: workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/ISmooksTestRunner.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/editors/SmooksTestMultiPageEditor.java
===================================================================
--- workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/editors/SmooksTestMultiPageEditor.java 2009-02-25 01:41:35 UTC (rev 13786)
+++ workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/editors/SmooksTestMultiPageEditor.java 2009-02-25 03:31:16 UTC (rev 13787)
@@ -2,6 +2,7 @@
import java.io.StringWriter;
+import java.lang.reflect.InvocationTargetException;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Collections;
@@ -12,7 +13,6 @@
import org.eclipse.core.resources.IResourceChangeListener;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.events.SelectionAdapter;
@@ -26,11 +26,16 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.FontDialog;
-import org.eclipse.ui.*;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
import org.eclipse.ui.editors.text.TextEditor;
+import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.ui.part.MultiPageEditorPart;
-import org.eclipse.ui.ide.IDE;
import org.smooks.tools.testui.views.SmooksTestEditor;
/**
@@ -72,8 +77,8 @@
index = addPage(testEditor, getEditorInput());
setPageText(index, "Test");
} catch (PartInitException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ Exception e1 = new InvocationTargetException(e);
+ throw new RuntimeException(e1);
}
}
/**
Modified: workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/views/SmooksTestEditor.java
===================================================================
--- workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/views/SmooksTestEditor.java 2009-02-25 01:41:35 UTC (rev 13786)
+++ workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/views/SmooksTestEditor.java 2009-02-25 03:31:16 UTC (rev 13787)
@@ -4,6 +4,7 @@
package org.smooks.tools.testui.views;
import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -11,17 +12,20 @@
import java.util.Iterator;
import java.util.List;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
+import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
+
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.part.EditorPart;
import org.jboss.tools.smooks.graphical.GraphInformations;
@@ -31,12 +35,13 @@
import org.jboss.tools.smooks.ui.editors.SmooksFileEditorInput;
import org.jboss.tools.smooks.ui.wizards.SmooksConfigFileNewWizard;
import org.jboss.tools.smooks.xml2java.analyzer.AbstractXMLModelAnalyzer;
+import org.smooks.tools.testui.xml2java.X2JTestRunner;
/**
* @author Dart
*
*/
-public class SmooksTestEditor extends EditorPart {
+public class SmooksTestEditor extends EditorPart implements SelectionListener {
private GraphInformations graphInformations;
private String inputSource;
@@ -104,19 +109,19 @@
.equals(param.getName())) {
String p = param.getValue();
try {
- String filePath = AbstractXMLModelAnalyzer
- .parseFilePath(p);
- BufferedReader reader = new BufferedReader(
- new InputStreamReader(
- new FileInputStream(filePath)));
- String line = reader.readLine();
- StringBuffer buffer = new StringBuffer();
- while (line != null) {
- buffer.append(line);
- line = reader.readLine();
- buffer.append("\n");
- }
- inputSource = buffer.toString();
+ String filePath = AbstractXMLModelAnalyzer
+ .parseFilePath(p);
+ BufferedReader reader = new BufferedReader(
+ new InputStreamReader(new FileInputStream(
+ filePath)));
+ String line = reader.readLine();
+ StringBuffer buffer = new StringBuffer();
+ while (line != null) {
+ buffer.append(line);
+ line = reader.readLine();
+ buffer.append("\n");
+ }
+ inputSource = buffer.toString();
} catch (InvocationTargetException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -161,11 +166,16 @@
*/
@Override
public void createPartControl(Composite parent) {
- parent.setLayout(new FillLayout());
+ GridLayout gl = new GridLayout();
+ parent.setLayout(gl);
StyledText text = new StyledText(parent, SWT.NONE);
if (inputSource != null) {
text.setText(inputSource);
}
+
+ Button button = new Button(parent, SWT.NONE);
+ button.addSelectionListener(this);
+
}
/*
@@ -175,8 +185,30 @@
*/
@Override
public void setFocus() {
- // TODO Auto-generated method stub
}
+ public void widgetDefaultSelected(SelectionEvent e) {
+
+ }
+
+ public void widgetSelected(SelectionEvent e) {
+ X2JTestRunner runner = new X2JTestRunner();
+ Source source = null;
+ if (inputSource != null) {
+ ByteArrayInputStream stream = new ByteArrayInputStream(inputSource
+ .getBytes());
+ source = new StreamSource(stream);
+ }
+ if (source != null) {
+ runner.init(((IFileEditorInput) this.getEditorInput()).getFile(),
+ source);
+ try {
+ runner.run();
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+
}
Added: workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/xml2java/X2JTestRunner.java
===================================================================
--- workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/xml2java/X2JTestRunner.java (rev 0)
+++ workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/xml2java/X2JTestRunner.java 2009-02-25 03:31:16 UTC (rev 13787)
@@ -0,0 +1,159 @@
+/**
+ *
+ */
+package org.smooks.tools.testui.xml2java;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.transform.Source;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+import org.jboss.tools.smooks.graphical.GraphInformations;
+import org.jboss.tools.smooks.graphical.Param;
+import org.jboss.tools.smooks.graphical.Params;
+import org.jboss.tools.smooks.graphical.util.GraphicalInformationSaver;
+import org.jboss.tools.smooks.model.AbstractResourceConfig;
+import org.jboss.tools.smooks.model.DocumentRoot;
+import org.jboss.tools.smooks.model.ResourceConfigType;
+import org.jboss.tools.smooks.model.ResourceType;
+import org.jboss.tools.smooks.model.SmooksResourceListType;
+import org.jboss.tools.smooks.model.util.SmooksModelConstants;
+import org.jboss.tools.smooks.model.util.SmooksModelUtils;
+import org.jboss.tools.smooks.model.util.SmooksResourceFactoryImpl;
+import org.jboss.tools.smooks.ui.wizards.SmooksConfigFileNewWizard;
+import org.jboss.tools.smooks.utils.ProjectClassLoader;
+import org.milyn.Smooks;
+import org.milyn.container.ExecutionContext;
+import org.milyn.event.report.HtmlReportGenerator;
+import org.milyn.payload.JavaResult;
+import org.smooks.tools.testui.ISmooksTestRunner;
+
+/**
+ * @author Dart
+ *
+ */
+public class X2JTestRunner implements ISmooksTestRunner {
+
+ private Source inputSource;
+
+ private IFile configFile;
+
+ public String getSmooksConfigFilePath() {
+ return null;
+ }
+
+ public void init(IFile configFile, Source inputSource) {
+ this.configFile = configFile;
+ this.inputSource = inputSource;
+ }
+
+ public void setSmooksConfigFilePath(String path) {
+
+ }
+
+ private String getPathFromGraphicalInformations(IFile file)
+ throws IOException {
+ GraphicalInformationSaver saver = new GraphicalInformationSaver(file);
+ GraphInformations graphInfo = saver.doLoad();
+ Params params = graphInfo.getParams();
+ String path = null;
+ if (params != null) {
+ List<Param> paramList = graphInfo.getParams().getParam();
+ for (Iterator<Param> iterator = paramList.iterator(); iterator
+ .hasNext();) {
+ Param param = (Param) iterator.next();
+ if (SmooksConfigFileNewWizard.PRO_SOURCE_DATA_PATH.equals(param
+ .getName())) {
+ path = param.getValue();
+ break;
+ }
+ }
+ }
+ return path;
+ }
+
+ public Object run() throws Exception {
+ ClassLoader oldClassLoader = Thread.currentThread()
+ .getContextClassLoader();
+ List resultList = new ArrayList();
+ try {
+ IJavaProject javaProject = JavaCore.create(configFile.getProject());
+ List<String> beanIdList = getBeanIdList();
+ ProjectClassLoader classLoader = new ProjectClassLoader(javaProject);
+ Thread.currentThread().setContextClassLoader(classLoader);
+ if (configFile == null)
+ throw new Exception("Can't load Config File");
+ Smooks smooks = new Smooks(configFile.getLocation()
+ .toPortableString());
+ ExecutionContext executionContext = smooks.createExecutionContext();
+
+ // Transform the source Order to the target LineOrder via a
+ // JavaSource and JavaResult instance...
+ // JavaSource source = new JavaSource(srcOrder);
+ // String path =
+ // getPathFromGraphicalInformations(node.getConfigFile());
+ // String filePath = AbstractXMLModelAnalyzer.parseFilePath(path);
+ // InputStream ss = new FileInputStream(filePath);
+ // StreamSource streamSource = new StreamSource(ss);
+ JavaResult result = new JavaResult();
+ // Configure the execution context to generate a report...
+ executionContext.setEventListener(new HtmlReportGenerator(
+ "target/report/report.html"));
+ smooks.filter(inputSource, result, executionContext);
+ for (Iterator iterator = beanIdList.iterator(); iterator.hasNext();) {
+ String beanID = (String) iterator.next();
+ System.out.println(result.getBean(beanID));
+ }
+ } catch (Exception e) {
+ throw e;
+ } finally {
+ Thread.currentThread().setContextClassLoader(oldClassLoader);
+ }
+ // LineOrder lineOrder = (LineOrder) result.getBean("LineOrder");
+ return null;
+ }
+
+ private List<String> getBeanIdList() throws IOException, CoreException {
+ List<String> list = new ArrayList<String>();
+ if (configFile != null) {
+ Resource resource = new SmooksResourceFactoryImpl()
+ .createResource(null);
+ resource.load(configFile.getContents(),
+ Collections.EMPTY_MAP);
+ DocumentRoot dr = (DocumentRoot) resource.getContents().get(0);
+ SmooksResourceListType resourceList = dr.getSmooksResourceList();
+ List<AbstractResourceConfig> resources = resourceList
+ .getAbstractResourceConfig();
+ for (Iterator iterator = resources.iterator(); iterator.hasNext();) {
+ AbstractResourceConfig r = (AbstractResourceConfig) iterator
+ .next();
+ if (r instanceof ResourceConfigType) {
+ ResourceType resource1 = ((ResourceConfigType) r)
+ .getResource();
+ if (resource1 != null) {
+ String value = resource1.getStringValue();
+ if (value != null)
+ value.trim();
+ if (SmooksModelConstants.BEAN_POPULATOR.equals(value)) {
+ String beanid = SmooksModelUtils.getParmaText(
+ SmooksModelUtils.BEAN_ID,
+ (ResourceConfigType) r);
+ if (beanid != null) {
+ list.add(beanid.trim());
+ }
+ }
+ }
+ }
+ }
+ }
+ return list;
+ }
+}
Property changes on: workspace/dart/plugins/org.jboss.tools.smooks.testui/src/org/smooks/tools/testui/xml2java/X2JTestRunner.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 2 months
- 1
- 0
JBoss Tools SVN: r13786 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2009-02-24 20:41:35 -0500 (Tue, 24 Feb 2009)
New Revision: 13786
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFileEditorInput.java
Log:
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFileEditorInput.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFileEditorInput.java 2009-02-24 19:45:30 UTC (rev 13785)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/SmooksFileEditorInput.java 2009-02-25 01:41:35 UTC (rev 13786)
@@ -31,6 +31,16 @@
private Object targetRoot = null;
+ private IFile graphicalInformationFile;
+
+ public IFile getGraphicalInformationFile() {
+ return graphicalInformationFile;
+ }
+
+ public void setGraphicalInformationFile(IFile graphicalInformationFile) {
+ this.graphicalInformationFile = graphicalInformationFile;
+ }
+
public Object getSourceTreeViewerInputContents() {
return sourceRoot;
}
@@ -48,8 +58,13 @@
}
public SmooksFileEditorInput(IFile file) {
- super(file);
+ this(file,null);
}
+
+ public SmooksFileEditorInput(IFile smooksConfigFile , IFile graphicalInformationFile) {
+ super(smooksConfigFile);
+ this.graphicalInformationFile = graphicalInformationFile;
+ }
/**
* @return the sourceModel
15 years, 2 months
- 1
- 0
JBoss Tools SVN: r13785 - in trunk/seam/tests: org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-02-24 14:45:30 -0500 (Tue, 24 Feb 2009)
New Revision: 13785
Added:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam12XFacetTestSuite121EAP.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite201GA.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite202SP1.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite203CR1.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite211GA.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuiteFP.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12XOperationsTestSuite121EAP.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite201GA.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite202SP1.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite203CR1.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite211GA.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuiteFP.java
Removed:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam12XTestSuite.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XTestSuite.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12XOperationsTestSuite.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite.java
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2850 add seam.core and seam.ui test suites that should be ran with different configurations
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2009-02-24 18:20:19 UTC (rev 13784)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2009-02-24 19:45:30 UTC (rev 13785)
@@ -13,8 +13,8 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.jboss.tools.seam.core.test.project.facet.Seam12XTestSuite;
-import org.jboss.tools.seam.core.test.project.facet.Seam20XTestSuite;
+import org.jboss.tools.seam.core.test.project.facet.Seam12XFacetTestSuite121EAP;
+import org.jboss.tools.seam.core.test.project.facet.Seam20XFacetTestSuite201GA;
import org.jboss.tools.seam.core.test.project.facet.Seam2FacetInstallDelegateTest;
import org.jboss.tools.seam.core.test.project.facet.SeamFacetInstallDelegateTest;
import org.jboss.tools.seam.core.test.project.facet.SeamRuntimeListConverterTest;
@@ -39,8 +39,6 @@
suite.addTestSuite(SeamRuntimeManagerTest.class);
suite.addTest(SeamValidatorsAllTests.suite());
suite.addTest(SeamRefactoringAllTests.suite());
- suite.addTest(Seam12XTestSuite.suite());
- suite.addTest(Seam20XTestSuite.suite());
return suite;
}
}
\ No newline at end of file
Copied: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam12XFacetTestSuite121EAP.java (from rev 13739, trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam12XTestSuite.java)
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam12XFacetTestSuite121EAP.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam12XFacetTestSuite121EAP.java 2009-02-24 19:45:30 UTC (rev 13785)
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * 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.seam.core.test.project.facet;
+
+
+import junit.framework.TestSuite;
+
+public class Seam12XFacetTestSuite121EAP {
+ public static TestSuite suite() {
+ TestSuite suite = new TestSuite("Seam 1.2.X tests");
+ suite.addTestSuite(SeamFacetInstallDelegateTest.class);
+ return suite;
+ }
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam12XFacetTestSuite121EAP.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam12XTestSuite.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam12XTestSuite.java 2009-02-24 18:20:19 UTC (rev 13784)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam12XTestSuite.java 2009-02-24 19:45:30 UTC (rev 13785)
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * 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.seam.core.test.project.facet;
-
-
-import junit.framework.TestSuite;
-
-public class Seam12XTestSuite {
- public static TestSuite suite() {
- TestSuite suite = new TestSuite("Seam 1.2.X tests");
- suite.addTestSuite(SeamFacetInstallDelegateTest.class);
- return suite;
- }
-}
Copied: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite201GA.java (from rev 13739, trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XTestSuite.java)
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite201GA.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite201GA.java 2009-02-24 19:45:30 UTC (rev 13785)
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * 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.seam.core.test.project.facet;
+
+import junit.framework.TestSuite;
+
+
+/**
+ * @author eskimo
+ *
+ */
+public class Seam20XFacetTestSuite201GA {
+ public static TestSuite suite() {
+ TestSuite suite = new TestSuite("Seam 2.0.X tests");
+ suite.addTestSuite(Seam2FacetInstallDelegateTest.class);
+ return suite;
+ }
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite201GA.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite202SP1.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite202SP1.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite202SP1.java 2009-02-24 19:45:30 UTC (rev 13785)
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * 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.seam.core.test.project.facet;
+
+import junit.framework.TestSuite;
+
+
+/**
+ * @author eskimo
+ *
+ */
+public class Seam20XFacetTestSuite202SP1 extends Seam20XFacetTestSuite201GA {
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite202SP1.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite203CR1.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite203CR1.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite203CR1.java 2009-02-24 19:45:30 UTC (rev 13785)
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * 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.seam.core.test.project.facet;
+
+/**
+ * @author eskimo
+ *
+ */
+public class Seam20XFacetTestSuite203CR1 extends Seam20XFacetTestSuite201GA {
+
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite203CR1.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite211GA.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite211GA.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite211GA.java 2009-02-24 19:45:30 UTC (rev 13785)
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * 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.seam.core.test.project.facet;
+
+/**
+ * @author eskimo
+ *
+ */
+public class Seam20XFacetTestSuite211GA extends Seam20XFacetTestSuite201GA {
+
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite211GA.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuiteFP.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuiteFP.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuiteFP.java 2009-02-24 19:45:30 UTC (rev 13785)
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * 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.seam.core.test.project.facet;
+
+/**
+ * @author eskimo
+ *
+ */
+public class Seam20XFacetTestSuiteFP extends Seam20XFacetTestSuite201GA {
+
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuiteFP.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XTestSuite.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XTestSuite.java 2009-02-24 18:20:19 UTC (rev 13784)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XTestSuite.java 2009-02-24 19:45:30 UTC (rev 13785)
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * 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.seam.core.test.project.facet;
-
-import junit.framework.TestSuite;
-
-
-/**
- * @author eskimo
- *
- */
-public class Seam20XTestSuite {
- public static TestSuite suite() {
- TestSuite suite = new TestSuite("Seam 2.0.X tests");
- suite.addTestSuite(Seam2FacetInstallDelegateTest.class);
- return suite;
- }
-}
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2009-02-24 18:20:19 UTC (rev 13784)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2009-02-24 19:45:30 UTC (rev 13785)
@@ -25,10 +25,10 @@
import org.jboss.tools.seam.ui.test.wizard.PackageNamesTest;
import org.jboss.tools.seam.ui.test.wizard.Seam12EARNewOperationTest;
import org.jboss.tools.seam.ui.test.wizard.Seam12WARNewOperationTest;
-import org.jboss.tools.seam.ui.test.wizard.Seam12XOperationsTestSuite;
+import org.jboss.tools.seam.ui.test.wizard.Seam12XOperationsTestSuite121EAP;
import org.jboss.tools.seam.ui.test.wizard.Seam20EARNewOperationTest;
import org.jboss.tools.seam.ui.test.wizard.Seam20WARNewOperationTest;
-import org.jboss.tools.seam.ui.test.wizard.Seam20XOperationsTestSuite;
+import org.jboss.tools.seam.ui.test.wizard.Seam20XOperationsTestSuite201GA;
import org.jboss.tools.seam.ui.test.wizard.SeamActionNewWizardTest;
import org.jboss.tools.seam.ui.test.wizard.SeamFormNewWizardTest;
import org.jboss.tools.seam.ui.test.wizard.SeamProjectNewWizardTest;
@@ -57,8 +57,6 @@
suite.addTestSuite(SeamELContentAssistJbide1645Test.class);
suite.addTest(new ProjectImportTestSetup(new TestSuite(SeamSettingsPreferencesPageTest.class), "org.jboss.tools.seam.ui.test", "projects/TestSeamSettingsPreferencesPage", "TestSeamSettingsPreferencesPage"));
suite.addTestSuite(PackageNamesTest.class);
- suite.addTest(Seam20XOperationsTestSuite.suite());
- suite.addTest(Seam12XOperationsTestSuite.suite());
return suite;
}
}
\ No newline at end of file
Deleted: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12XOperationsTestSuite.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12XOperationsTestSuite.java 2009-02-24 18:20:19 UTC (rev 13784)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12XOperationsTestSuite.java 2009-02-24 19:45:30 UTC (rev 13785)
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * 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.seam.ui.test.wizard;
-
-import junit.framework.TestSuite;
-
-/**
- * @author eskimo
- *
- */
-public class Seam12XOperationsTestSuite {
- public static TestSuite suite() {
- TestSuite suite = new TestSuite();
- suite.setName("Seam 1.2.X Operations Tests");
- suite.addTestSuite(Seam12EARNewOperationTest.class);
- suite.addTestSuite(Seam12WARNewOperationTest.class);
- return suite;
- }
-}
Copied: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12XOperationsTestSuite121EAP.java (from rev 13739, trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12XOperationsTestSuite.java)
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12XOperationsTestSuite121EAP.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12XOperationsTestSuite121EAP.java 2009-02-24 19:45:30 UTC (rev 13785)
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * 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.seam.ui.test.wizard;
+
+import junit.framework.TestSuite;
+
+/**
+ * @author eskimo
+ *
+ */
+public class Seam12XOperationsTestSuite121EAP {
+ public static TestSuite suite() {
+ TestSuite suite = new TestSuite();
+ suite.setName("Seam 1.2.X Operations Tests");
+ suite.addTestSuite(Seam12EARNewOperationTest.class);
+ suite.addTestSuite(Seam12WARNewOperationTest.class);
+ return suite;
+ }
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12XOperationsTestSuite121EAP.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite.java 2009-02-24 18:20:19 UTC (rev 13784)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite.java 2009-02-24 19:45:30 UTC (rev 13785)
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * 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.seam.ui.test.wizard;
-
-import junit.framework.TestSuite;
-
-/**
- *
- * @author eskimo
- */
-public class Seam20XOperationsTestSuite {
-
- public static TestSuite suite() {
- TestSuite suite = new TestSuite();
- suite.setName("Seam 2.0.X Operations Test");
- suite.addTestSuite(Seam20EARNewOperationTest.class);
- suite.addTestSuite(Seam20WARNewOperationTest.class);
- return suite;
- }
-
-}
Copied: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite201GA.java (from rev 13739, trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite.java)
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite201GA.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite201GA.java 2009-02-24 19:45:30 UTC (rev 13785)
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * 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.seam.ui.test.wizard;
+
+import junit.framework.TestSuite;
+
+/**
+ *
+ * @author eskimo
+ */
+public class Seam20XOperationsTestSuite201GA {
+
+ public static TestSuite suite() {
+ TestSuite suite = new TestSuite();
+ suite.setName("Seam 2.0.X Operations Test");
+ suite.addTestSuite(Seam20EARNewOperationTest.class);
+ suite.addTestSuite(Seam20WARNewOperationTest.class);
+ return suite;
+ }
+
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite201GA.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite202SP1.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite202SP1.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite202SP1.java 2009-02-24 19:45:30 UTC (rev 13785)
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * 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.seam.ui.test.wizard;
+
+/**
+ * @author eskimo
+ *
+ */
+public class Seam20XOperationsTestSuite202SP1 extends
+ Seam20XOperationsTestSuite201GA {
+
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite202SP1.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite203CR1.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite203CR1.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite203CR1.java 2009-02-24 19:45:30 UTC (rev 13785)
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * 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.seam.ui.test.wizard;
+
+/**
+ * @author eskimo
+ *
+ */
+public class Seam20XOperationsTestSuite203CR1 extends
+ Seam20XOperationsTestSuite201GA {
+
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite203CR1.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite211GA.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite211GA.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite211GA.java 2009-02-24 19:45:30 UTC (rev 13785)
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * 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.seam.ui.test.wizard;
+
+/**
+ * @author eskimo
+ *
+ */
+public class Seam20XOperationsTestSuite211GA extends
+ Seam20XOperationsTestSuite201GA {
+
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite211GA.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuiteFP.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuiteFP.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuiteFP.java 2009-02-24 19:45:30 UTC (rev 13785)
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * 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.seam.ui.test.wizard;
+
+/**
+ * @author eskimo
+ *
+ */
+public class Seam20XOperationsTestSuiteFP extends
+ Seam20XOperationsTestSuite201GA {
+
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuiteFP.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 2 months
- 1
- 0
JBoss Tools SVN: r13784 - in trunk/seam: tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-02-24 13:20:19 -0500 (Tue, 24 Feb 2009)
New Revision: 13784
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/ValidationErrorManager.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3701
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/ValidationErrorManager.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/ValidationErrorManager.java 2009-02-24 18:01:12 UTC (rev 13783)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/ValidationErrorManager.java 2009-02-24 18:20:19 UTC (rev 13784)
@@ -159,7 +159,7 @@
}
}
- WorkbenchReporter.addMessage(target, this.getClass(), message);
+ WorkbenchReporter.addMessage(target, this.getClass(), message, null, ""+message.getLineNumber());
// reporter.addMessage(validationManager, message);
}
@@ -190,7 +190,7 @@
e);
return;
}
- WorkbenchReporter.addMessage(target, this.getClass(), message);
+ WorkbenchReporter.addMessage(target, this.getClass(), message, null, ""+message.getLineNumber());
// reporter.addMessage(validationManager, message);
}
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java 2009-02-24 18:01:12 UTC (rev 13783)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java 2009-02-24 18:20:19 UTC (rev 13784)
@@ -100,7 +100,8 @@
String type = null;
String version = null;
String runtimeId = null;
- IPath jbossAsLocationPath = new Path(System.getProperty("jbosstools.test.jboss.home.4.2"));
+ IPath jbossAsLocationPath = new Path(System.getProperty("jbosstools.test.jboss.home.4.2",
+ "C:/jbdevstudio/jboss-eap/jboss-as"));
IRuntimeType[] runtimeTypes = ServerUtil.getRuntimeTypes(null, null, "org.jboss.ide.eclipse.as.runtime.42");
if (runtimeTypes.length > 0) {
runtime = runtimeTypes[0].createRuntime(null, new NullProgressMonitor());
15 years, 2 months
- 1
- 0