JBoss Tools SVN: r26978 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-26 10:35:39 -0500 (Fri, 26 Nov 2010)
New Revision: 26978
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
Log:
[JBIDE-7628] cleanup, added null-check
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-11-26 15:06:54 UTC (rev 26977)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-11-26 15:35:39 UTC (rev 26978)
@@ -80,23 +80,24 @@
if (currCloud != null) {
currCloud.removeInstanceListListener(InstanceView.this);
}
- setCurrentCloud(index);
- storeSelectedCloud();
- Display.getCurrent().asyncExec(new Runnable() {
+ DeltaCloud currentCloud = setCurrentCloud(index);
+ if (currentCloud != null) {
+ storeSelectedCloud(currentCloud);
+ Display.getCurrent().asyncExec(new Runnable() {
- @Override
- public void run() {
- viewer.setInput(currCloud);
- currCloud.addInstanceListListener(InstanceView.this);
- }
-
- });
+ @Override
+ public void run() {
+ viewer.setInput(currCloud);
+ currCloud.addInstanceListListener(InstanceView.this);
+ }
+ });
+ }
}
- private void storeSelectedCloud() {
+ private void storeSelectedCloud(DeltaCloud cloud) {
Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID);
try {
- prefs.put(IDeltaCloudPreferenceConstants.LAST_CLOUD_INSTANCE_VIEW, currCloud.getName());
+ prefs.put(IDeltaCloudPreferenceConstants.LAST_CLOUD_INSTANCE_VIEW, cloud.getName());
} catch (Exception exc) {
// do nothing
}
@@ -218,13 +219,14 @@
return clouds;
}
- private void setCurrentCloud(int index) {
+ private DeltaCloud setCurrentCloud(int index) {
DeltaCloud[] clouds = getClouds();
if (index >= clouds.length) {
currCloud = null;
} else {
currCloud = getClouds()[index];
}
+ return currCloud;
}
private void setFilterLabelVisible(DeltaCloud currentCloud, Label filterLabel) {
@@ -373,7 +375,8 @@
Display.getDefault().syncExec(new Runnable() {
@Override
public void run() {
- currCloud.addInstanceListListener(InstanceView.this); // does not add identical instance twice
+ // does not add identical instance twice
+ currCloud.addInstanceListListener(InstanceView.this);
viewer.setInput(instances);
refreshToolbarCommandStates();
}
13 years, 5 months
JBoss Tools SVN: r26977 - in trunk/seam/plugins: org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-11-26 10:06:54 -0500 (Fri, 26 Nov 2010)
New Revision: 26977
Modified:
trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/ui/test/wizard/AbstractSeamNewOperationTest.java
trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12EARNewOperationTest.java
trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12WARNewOperationTest.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseOperation.java
Log:
https://jira.jboss.org/browse/JBIDE-7359 Fixed
Modified: trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/ui/test/wizard/AbstractSeamNewOperationTest.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/ui/test/wizard/AbstractSeamNewOperationTest.java 2010-11-26 14:07:35 UTC (rev 26976)
+++ trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/ui/test/wizard/AbstractSeamNewOperationTest.java 2010-11-26 15:06:54 UTC (rev 26977)
@@ -12,11 +12,9 @@
import java.io.File;
import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
-import java.text.StringCharacterIterator;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -51,8 +49,6 @@
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.common.EclipseUtil;
-import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.ui.widget.editor.IFieldEditor;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
@@ -140,9 +136,7 @@
return null;
}
- protected void assertLaunchCreated(String testProjectName, String seamLocalInterfaceName) {
-// String namePrefix = seamLocalInterfaceName +"Test-JDK16.launch"; //$NON-NLS-1$
- String namePrefix = seamLocalInterfaceName +"Test, ....launch"; //$NON-NLS-1$
+ protected void assertLaunchCreated(String testProjectName, String seamLocalInterfaceName, String namePrefix) {
String launchName = DebugPlugin.getDefault().getLaunchManager().generateLaunchConfigurationName(namePrefix);
File launchFile = new File(LaunchManager.LOCAL_LAUNCH_CONFIGURATION_CONTAINER_PATH.toFile(), launchName);
assertTrue("TestNG launch file doesn't exest.", launchFile.exists());
@@ -192,6 +186,13 @@
}
}
+ protected void assertLaunchesCreated(String testProjectName, String seamLocalInterfaceName) {
+ for (String prefix : SeamBaseOperation.TEST_NAME_PREFIXES) {
+ String namePrefix = seamLocalInterfaceName + prefix;
+ assertLaunchCreated(testProjectName, seamLocalInterfaceName, namePrefix);
+ }
+ }
+
protected void assertResourceIsCreatedAndHasNoProblems(IResource resource, String path) {
assertNotNull("Resource isn't created: " + path, resource);
assertTrue("Resource isn't created: " + path, resource.exists());
Modified: trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12EARNewOperationTest.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12EARNewOperationTest.java 2010-11-26 14:07:35 UTC (rev 26976)
+++ trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12EARNewOperationTest.java 2010-11-26 15:06:54 UTC (rev 26977)
@@ -194,7 +194,7 @@
seamProjectWebContentFolder.toString() + "/" +
seamPageName + ".xhtml");
- assertLaunchCreated(seamPrjSet.getTestProject().getName(), seamLocalInterfaceName);
+ assertLaunchesCreated(seamPrjSet.getTestProject().getName(), seamLocalInterfaceName);
}
@Override
Modified: trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12WARNewOperationTest.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12WARNewOperationTest.java 2010-11-26 14:07:35 UTC (rev 26976)
+++ trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12WARNewOperationTest.java 2010-11-26 15:06:54 UTC (rev 26977)
@@ -145,7 +145,7 @@
seamProjectWebContentFolder.toString() + "/" +
seamPageName + ".xhtml");
- assertLaunchCreated(seamPrjSet.getTestProject().getName(), seamLocalInterfaceName);
+ assertLaunchesCreated(seamPrjSet.getTestProject().getName(), seamLocalInterfaceName);
/*
"${" + ISeamParameter.SEAM_PROJECT_SRC_ACTION + "}/
${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseOperation.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseOperation.java 2010-11-26 14:07:35 UTC (rev 26976)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseOperation.java 2010-11-26 15:06:54 UTC (rev 26977)
@@ -15,8 +15,10 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.apache.tools.ant.types.FilterSetCollection;
import org.apache.tools.ant.util.FileUtils;
@@ -104,7 +106,7 @@
IStatus result = Status.OK_STATUS;
this.info = info;
- launchFile = null;
+ launchFiles = null;
final SeamProjectsSet seamPrjSet = new SeamProjectsSet(getProject(info));
@@ -124,12 +126,16 @@
if(shouldTouchServer(seamPrjSet)) {
WebUtils.changeTimeStamp(seamPrjSet.getWarProject());
}
- if(launchFile!=null && launchFile.exists()) {
- ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
- if(manager instanceof LaunchManager) {
- ((LaunchManager)manager).importConfigurations(new File[]{launchFile}, monitor);
+ if(launchFiles!=null) {
+ for (File launchFile : launchFiles) {
+ if(launchFile.exists()) {
+ ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
+ if(manager instanceof LaunchManager) {
+ ((LaunchManager)manager).importConfigurations(new File[]{launchFile}, monitor);
+ }
+ launchFile.delete();
+ }
}
- launchFile.delete();
}
} catch (BackingStoreException e) {
result = new Status(IStatus.ERROR,SeamGuiPlugin.PLUGIN_ID,e.getMessage(),e);
@@ -308,15 +314,17 @@
protected abstract boolean shouldCreateTestLaunch();
- private File launchFile = null;
+ private Set<File> launchFiles;
private String launchTemplatePath;
+ public static final String[] TEST_NAME_PREFIXES = {"Test, ....launch", "Test.launch"};
+
protected List<FileMapping> getFileMappingsWithTestLaunch(Map<String, Object> vars) {
List<FileMapping> mapping = new ArrayList<FileMapping>();
mapping.addAll(getFileMappings(vars));
- launchFile = null;
+ launchFiles = new HashSet<File>();
// Uncomment following code if we shouldn't create TestNG launch in case TestNG plug-in is not installed.
// See https://jira.jboss.org/browse/JBIDE-7359
// ----------------->
@@ -327,11 +335,21 @@
// }
// <-----------------
-// String namePrefix = vars.get(ISeamParameter.SEAM_LOCAL_INTERFACE_NAME) +"Test-JDK16.launch"; //$NON-NLS-1$
- String namePrefix = vars.get(ISeamParameter.SEAM_LOCAL_INTERFACE_NAME) +"Test, ....launch"; //$NON-NLS-1$
+// String namePrefix = vars.get(ISeamParameter.SEAM_LOCAL_INTERFACE_NAME) + "Test-JDK16.launch"; //$NON-NLS-1$
+ // Different versions of TestNG plugins use different default names for launches. So we have to create two launches with different names.
+ for (String prefix : TEST_NAME_PREFIXES) {
+ String namePrefix = vars.get(ISeamParameter.SEAM_LOCAL_INTERFACE_NAME) + prefix; //$NON-NLS-1$
+ addTestLaunchToFileMapping(mapping, namePrefix);
+ }
+
+ return mapping;
+ }
+
+ protected List<FileMapping> addTestLaunchToFileMapping(List<FileMapping> mapping, String namePrefix) {
String launchName = DebugPlugin.getDefault().getLaunchManager().generateLaunchConfigurationName(namePrefix);
try {
- launchFile = new File(SeamCorePlugin.getDefault().getStateLocation().toFile(), ".testNGlaunches/" + launchName);
+ File launchFile = new File(SeamCorePlugin.getDefault().getStateLocation().toFile(), ".testNGlaunches/" + launchName);
+ launchFiles.add(launchFile);
if(launchFile.exists()) {
launchFile.delete();
}
13 years, 5 months
JBoss Tools SVN: r26976 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-11-26 09:07:35 -0500 (Fri, 26 Nov 2010)
New Revision: 26976
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/fileUpload.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/fileUpload.xhtml.xml
Log:
https://jira.jboss.org/browse/JBIDE-7705 , fileUpload content test was fixed.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/fileUpload.xhtml
===================================================================
(Binary files differ)
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/fileUpload.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/fileUpload.xhtml.xml 2010-11-26 13:35:03 UTC (rev 26975)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/fileUpload.xhtml.xml 2010-11-26 14:07:35 UTC (rev 26976)
@@ -33,250 +33,42 @@
</DIV>
</test>
<test id="fileUpload1">
- <DIV CLASS="dr-pnl rich-panel">
- <DIV CLASS="dr-pnl-h rich-panel-header"
- STYLE="/background-image: url\(.*resources/common/background.gif\);/">
- <SPAN CLASS="vpe-text">
- File Upload
- </SPAN>
+ <DIV CLASS="rich-fileupload-list-decor" STYLE="width: 400px;">
+ <TABLE CLASS="rich-fileupload-toolbar-decor">
+ <TR>
+ <TD>
+ <DIV CLASS="rich-fileupload-button-border" STYLE="float: left;">
+ <DIV CLASS="rich-fileupload-button rich-fileupload-font btn"
+ STYLE="position: relative;">
+ <DIV
+ CLASS=" rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-add btn">
+ Add...
+</DIV>
+ </DIV>
+ </DIV>
+ <DIV CLASS="rich-fileupload-button-border" STYLE="float: left;">
+ <DIV CLASS="rich-fileupload-button rich-fileupload-font btn">
+ <DIV
+ CLASS="rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-start btn">
+ <B>
+ Upload
+</B>
+ </DIV>
+ </DIV>
+ </DIV>
+ <DIV CLASS="rich-fileupload-button-border" STYLE="float: right;">
+ <DIV CLASS="rich-fileupload-button rich-fileupload-font btn">
+ <DIV
+ CLASS="rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-clear btn">
+ Clear All
+</DIV>
+ </DIV>
+ </DIV>
+ </TD>
+ </TR>
+ </TABLE>
+ <DIV CLASS="rich-fileupload-list-overflow" STYLE="width: 100%; height: 210px;">
</DIV>
- <DIV CLASS="dr-pnl-b rich-panel-body">
- <FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
- <TABLE BORDER="0" STYLE="-moz-user-modify: read-write;">
- <TBODY>
- <TR>
- <TD CLASS="top">
- <DIV CLASS="rich-fileupload-list-decor" STYLE="width: 400px;">
- <TABLE CLASS="rich-fileupload-toolbar-decor">
- <TR>
- <TD>
- <DIV CLASS="rich-fileupload-button-border" STYLE="float: left;">
- <DIV CLASS="rich-fileupload-button rich-fileupload-font btn"
- STYLE="position: relative;">
- <DIV
- CLASS="rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-add btn">
- Add...
- </DIV>
- </DIV>
- </DIV>
- <DIV CLASS="rich-fileupload-button-border" STYLE="float: left;">
- <DIV CLASS="rich-fileupload-button rich-fileupload-font btn">
- <DIV
- CLASS="rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-start btn">
- <B>
- Upload
- </B>
- </DIV>
- </DIV>
- </DIV>
- <DIV CLASS="rich-fileupload-button-border" STYLE="float: right;">
- <DIV CLASS="rich-fileupload-button rich-fileupload-font btn">
- <DIV
- CLASS="rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-clear btn">
- Clear All
- </DIV>
- </DIV>
- </DIV>
- </TD>
- </TR>
- </TABLE>
- <DIV CLASS="rich-fileupload-list-overflow" STYLE="width: 100%; height: 210px;">
- </DIV>
- </DIV>
- </TD>
- <TD CLASS="top">
- <SPAN STYLE="-moz-user-modify: read-write;">
- <DIV CLASS="dr-pnl rich-panel">
- <DIV CLASS="dr-pnl-h rich-panel-header"
- STYLE="/background-image: url\(.*resources/common/background.gif\);/">
- <SPAN CLASS="vpe-text">
- Uploaded Files Info
- </SPAN>
- </DIV>
- <DIV CLASS="dr-pnl-b rich-panel-body info">
- <SPAN CLASS="vpe-text">
- No files currently uploaded
- </SPAN>
- <TABLE COLUMNS="1" VALUE="#{fileUploadBean.files}"
- VAR="file" ROWKEYVAR="row" CLASS="dr-table rich-table">
- <COLGROUP SPAN="1">
- </COLGROUP>
- <TBODY>
- <TR CLASS="dr-table-row rich-table-row">
- <TD CLASS="dr-table-cell rich-table-cell">
- <DIV CLASS="dr-pnl rich-panel">
- <DIV
- CLASS="dr-pnl-b rich-panel-body rich-laguna-panel-no-header">
- <TABLE BORDER="0" STYLE="-moz-user-modify: read-write;">
- <TBODY>
- <TR>
- <TD>
- <IMG
- SRC="/.*resources/mediaOutput/mediaOutput.jpg/"
- STYLE="width: 50px; height: 50px;" />
-
- </TD>
- <TD>
- <TABLE BORDER="0"
- STYLE="-moz-user-modify: read-write;">
- <TBODY>
- <TR>
- <TD>
- <SPAN CLASS="vpe-text">
- File Name:
- </SPAN>
- </TD>
- <TD>
- <SPAN CLASS="vpe-text">
- #{file.name}
- </SPAN>
- </TD>
- </TR>
- <TR>
- <TD>
- <SPAN CLASS="vpe-text">
- File Length(bytes):
- </SPAN>
- </TD>
- <TD>
- <SPAN CLASS="vpe-text">
- #{file.length}
- </SPAN>
- </TD>
- </TR>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
- </TABLE>
- </DIV>
- </DIV>
- </TD>
- </TR>
- <TR CLASS="dr-table-row rich-table-row">
- <TD CLASS="dr-table-cell rich-table-cell">
- <DIV CLASS="dr-pnl rich-panel">
- <DIV
- CLASS="dr-pnl-b rich-panel-body rich-laguna-panel-no-header">
- <TABLE BORDER="0" STYLE="-moz-user-modify: read-write;">
- <TBODY>
- <TR>
- <TD>
- <IMG
- SRC="/.*resources/mediaOutput/mediaOutput.jpg/"
- STYLE="width: 50px; height: 50px;" />
-
- </TD>
- <TD>
- <TABLE BORDER="0"
- STYLE="-moz-user-modify: read-write;">
- <TBODY>
- <TR>
- <TD>
- <SPAN CLASS="vpe-text">
- File Name:
- </SPAN>
- </TD>
- <TD>
- <SPAN CLASS="vpe-text">
- #{file.name}
- </SPAN>
- </TD>
- </TR>
- <TR>
- <TD>
- <SPAN CLASS="vpe-text">
- File Length(bytes):
- </SPAN>
- </TD>
- <TD>
- <SPAN CLASS="vpe-text">
- #{file.length}
- </SPAN>
- </TD>
- </TR>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
- </TABLE>
- </DIV>
- </DIV>
- </TD>
- </TR>
- <TR CLASS="dr-table-row rich-table-row">
- <TD CLASS="dr-table-cell rich-table-cell">
- <DIV CLASS="dr-pnl rich-panel">
- <DIV
- CLASS="dr-pnl-b rich-panel-body rich-laguna-panel-no-header">
- <TABLE BORDER="0" STYLE="-moz-user-modify: read-write;">
- <TBODY>
- <TR>
- <TD>
- <IMG
- SRC="/.*resources/mediaOutput/mediaOutput.jpg/"
- STYLE="width: 50px; height: 50px;" />
-
- </TD>
- <TD>
- <TABLE BORDER="0"
- STYLE="-moz-user-modify: read-write;">
- <TBODY>
- <TR>
- <TD>
- <SPAN CLASS="vpe-text">
- File Name:
- </SPAN>
- </TD>
- <TD>
- <SPAN CLASS="vpe-text">
- #{file.name}
- </SPAN>
- </TD>
- </TR>
- <TR>
- <TD>
- <SPAN CLASS="vpe-text">
- File Length(bytes):
- </SPAN>
- </TD>
- <TD>
- <SPAN CLASS="vpe-text">
- #{file.length}
- </SPAN>
- </TD>
- </TR>
- </TBODY>
- </TABLE>
- </TD>
- </TR>
- </TBODY>
- </TABLE>
- </DIV>
- </DIV>
- </TD>
- </TR>
- </TBODY>
- </TABLE>
- </DIV>
- </DIV>
- <IMG WIDTH="1px" HEIGHT="3"
- SRC="/.*resources/spacer/spacer.gif/"
- CLASS="rich-spacer" />
- <BR STYLE="-moz-user-modify: read-write;" />
-
- <INPUT TYPE="button" VALUE="Clear Uploaded Data"
- STYLE="-moz-user-modify: read-only;" />
-
- </SPAN>
- </TD>
- </TR>
- </TBODY>
- </TABLE>
- </FORM>
- </DIV>
</DIV>
</test>
</tests>
\ No newline at end of file
13 years, 5 months
JBoss Tools SVN: r26975 - branches/jbosstools-3.2.0.Beta2/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-11-26 08:35:03 -0500 (Fri, 26 Nov 2010)
New Revision: 26975
Modified:
branches/jbosstools-3.2.0.Beta2/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java
Log:
https://jira.jboss.org/browse/JBIDE-7726
Do not run validators by default
Modified: branches/jbosstools-3.2.0.Beta2/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java
===================================================================
--- branches/jbosstools-3.2.0.Beta2/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java 2010-11-26 13:01:28 UTC (rev 26974)
+++ branches/jbosstools-3.2.0.Beta2/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java 2010-11-26 13:35:03 UTC (rev 26975)
@@ -212,6 +212,9 @@
if (!includeMappings) {
overrides.put("hibernate.archive.autodetection", "none"); //$NON-NLS-1$//$NON-NLS-2$
}
+ if (StringHelper.isEmpty((String) overrides.get("javax.persistence.validation.mode"))) {//$NON-NLS-1$
+ overrides.put("javax.persistence.validation.mode", "none"); //$NON-NLS-1$//$NON-NLS-2$
+ }
Class<?> clazz = ReflectHelper.classForName(
"org.hibernate.ejb.Ejb3Configuration", ConsoleConfiguration.class); //$NON-NLS-1$
Object ejb3cfg = clazz.newInstance();
13 years, 5 months
JBoss Tools SVN: r26974 - trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-11-26 08:01:28 -0500 (Fri, 26 Nov 2010)
New Revision: 26974
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java
Log:
JBIDE-7726
Do not run bean validators
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java 2010-11-26 10:49:12 UTC (rev 26973)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationFactory.java 2010-11-26 13:01:28 UTC (rev 26974)
@@ -212,6 +212,9 @@
if (!includeMappings) {
overrides.put("hibernate.archive.autodetection", "none"); //$NON-NLS-1$//$NON-NLS-2$
}
+ if (StringHelper.isEmpty((String) overrides.get("javax.persistence.validation.mode"))) {//$NON-NLS-1$
+ overrides.put("javax.persistence.validation.mode", "none"); //$NON-NLS-1$//$NON-NLS-2$
+ }
Class<?> clazz = ReflectHelper.classForName(
"org.hibernate.ejb.Ejb3Configuration", ConsoleConfiguration.class); //$NON-NLS-1$
Object ejb3cfg = clazz.newInstance();
13 years, 5 months
JBoss Tools SVN: r26973 - in trunk/jsf/tests/org.jboss.tools.jsf.ui.test: projects/TestWizards/WebContent/WEB-INF/lib and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-11-26 05:49:12 -0500 (Fri, 26 Nov 2010)
New Revision: 26973
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/primefaces-2.0.0.RC.jar
Removed:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/ShowJarLibrariesTest/
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TaglibXMLUnformatedDTD_JBIDE5642.java
Log:
https://jira.jboss.org/browse/JBIDE-7704 , Jar file for TaglibXMLUnformatedDTD_JBIDE5642 was added to the TestWizards project, ShowJarLibrariesTest was removed.
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/primefaces-2.0.0.RC.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/TestWizards/WebContent/WEB-INF/lib/primefaces-2.0.0.RC.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2010-11-26 09:15:11 UTC (rev 26972)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2010-11-26 10:49:12 UTC (rev 26973)
@@ -77,11 +77,8 @@
"org.jboss.tools.jsf.ui.test",
new String[]{"projects/test_jsf_project"},
new String[]{"test_jsf_project"}));
- suite.addTest(new ProjectImportTestSetup(new TestSuite(TaglibXMLUnformatedDTD_JBIDE5642.class),
- "org.jboss.tools.jsf.ui.test",
- new String[]{"projects/ShowJarLibrariesTest"},
- new String[]{"ShowJarLibrariesTest"}));
suite.addTestSuite(JsfUiPreferencesPagesTest.class);
+ suite.addTestSuite(TaglibXMLUnformatedDTD_JBIDE5642.class);
return new TestWizardsProject(suite);
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TaglibXMLUnformatedDTD_JBIDE5642.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TaglibXMLUnformatedDTD_JBIDE5642.java 2010-11-26 09:15:11 UTC (rev 26972)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/TaglibXMLUnformatedDTD_JBIDE5642.java 2010-11-26 10:49:12 UTC (rev 26973)
@@ -37,9 +37,8 @@
public class TaglibXMLUnformatedDTD_JBIDE5642 extends TestCase {
- private static final String PROJECT_NAME = "ShowJarLibrariesTest"; //$NON-NLS-1$
+ private static final String PROJECT_NAME = "TestWizards"; //$NON-NLS-1$
private static final String WEB_PROJECTS_VIEW_ID = "org.jboss.tools.jst.web.ui.navigator.WebProjectsView"; //$NON-NLS-1$
- private static final String PACKAGE_EXPLORER_VIEW_ID = "org.eclipse.jdt.ui.PackageExplorer"; //$NON-NLS-1$
private static final String LIB_PATH = "/Tag Libraries/"; //$NON-NLS-1$
private static final String LIB_NAME_I = "primefaces-i.taglib.xml - primefaces-2.0.0.RC.jar"; //$NON-NLS-1$
private static final String LIB_NAME_P = "primefaces-p.taglib.xml - primefaces-2.0.0.RC.jar"; //$NON-NLS-1$
@@ -57,7 +56,6 @@
assertNotNull("Web Projects view is not available", webProjectsView); //$NON-NLS-1$
TestUtil.delay(2000);
TestUtil.waitForIdle();
-
WebProjectsNavigator projectsNavigator = (WebProjectsNavigator) webProjectsView;
TreeViewer treeViewer = projectsNavigator.getViewer();
assertNotNull(treeViewer);
13 years, 5 months
JBoss Tools SVN: r26972 - trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-11-26 04:15:11 -0500 (Fri, 26 Nov 2010)
New Revision: 26972
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java
Log:
JBIDE-7735
fix compile error
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java 2010-11-26 08:47:34 UTC (rev 26971)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java 2010-11-26 09:15:11 UTC (rev 26972)
@@ -203,7 +203,7 @@
}
protected class ResComparator implements Comparator<IResource> {
- @Override
+
public int compare(IResource o1, IResource o2) {
return o1.getName().compareTo(o2.getName());
}
13 years, 5 months
JBoss Tools SVN: r26971 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp.
by jbosstools-commits＠lists.jboss.org
Author: jlukas(a)redhat.com
Date: 2010-11-26 03:47:34 -0500 (Fri, 26 Nov 2010)
New Revision: 26971
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java
Log:
adding fail in case of error in the new ws wizard
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java 2010-11-26 06:32:04 UTC (rev 26970)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/WSTestBase.java 2010-11-26 08:47:34 UTC (rev 26971)
@@ -29,6 +29,7 @@
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotCombo;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.gen.ActionItem;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.NewObject.JavaEEEnterpriseApplicationProject;
@@ -46,27 +47,13 @@
import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.Wizard;
import org.junit.After;
import org.junit.AfterClass;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.runner.RunWith;
@RunWith(SWTBotJunit4ClassRunner.class)
public abstract class WSTestBase extends SWTTestExt {
- public static final String EAR_PROJECT_NAME="EAR";
-
- public static final String CLASS_C="ClassC";
- public static final String BOTTOMUP_WS_CLIENT_PROJ_NAME = "BottomUpJbossWSClient";
- public static final String BOTTOMUP_WS_CLIENT_SERVLET_NAME = "BottomUpJbossWStest";
- public static final String BOTTOMUP_WS_CLIENT_SERVLET_URL = "http://localhost:8080/"+BOTTOMUP_WS_CLIENT_PROJ_NAME+"/"+BOTTOMUP_WS_CLIENT_SERVLET_NAME;
- public static final String TWO_SERVICES_CLIENT_SERVLET_NAME="TwoServicesJbossWStest";
- public static final String TWO_SERVICES_CLIENT_SERVLET_URL = "http://localhost:8080/"+BOTTOMUP_WS_CLIENT_PROJ_NAME+"/"+TWO_SERVICES_CLIENT_SERVLET_NAME;
- public static final String TOPDOWN_WS_CLIENT_PROJ_NAME = "TopDownJbossWSClient";
- public static final String TOPDOWN_WS_CLIENT_SERVLET_NAME = "TopDownJbossWStest";
- public static final String TOPDOWN_WS_CLIENT_SERVLET_URL = "http://localhost:8080/"+TOPDOWN_WS_CLIENT_PROJ_NAME+"/"+TOPDOWN_WS_CLIENT_SERVLET_NAME;
- public static final String JBOSSWS_CRED_LOGIN="admin";
- public static final String JBOSSWS_CRED_PASS="admin";
- public static final int CLIENT_SCALE_START=1;
-
private static final String SOAP_REQUEST_TEMPLATE = "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?>" +
"<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"" +
" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"" +
@@ -188,6 +175,17 @@
wsw.finish();
util.waitForNonIgnoredJobs();
bot.sleep(1000);
+
+ //let's fail if there's some error in the wizard,
+ //and close error dialog and the wizard so other tests
+ //can continue
+ if (bot.activeShell().getText().contains("Error")) {
+ SWTBotShell sh = bot.activeShell();
+ String msg = sh.bot().text().getText();
+ sh.bot().button(0).click();
+ wsw.cancel();
+ Assert.fail(msg);
+ }
}
private SWTBotEditor createClass(String pkg, String cName) {
13 years, 5 months