JBoss Tools SVN: r40291 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-18 10:44:48 -0400 (Wed, 18 Apr 2012)
New Revision: 40291
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
Log:
Server as shell name added
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2012-04-18 13:53:01 UTC (rev 40290)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2012-04-18 14:44:48 UTC (rev 40291)
@@ -152,6 +152,7 @@
public static final String IMPORT_JSF_PROJECT = "Import JSF Project";
public static final String IMPORT = "Import";
public static final String DELETE_SERVER = "Delete Server";
+ public static final String SERVER = "Server";
public static final String NEW_STRUTS_PROJECT = "New Struts Project";
public static final String PREFERENCES = "Preferences";
public static final String NEW_SERVER_RUNTIME_ENVIRONMENT = "New Server Runtime Environment";
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r40290 - in trunk: jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-04-18 09:53:01 -0400 (Wed, 18 Apr 2012)
New Revision: 40290
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/compatibility/ImportJSF12ProjectFromJBDS4x.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java
Log:
Small fixes. Tests for JSF2 are working just with server runtime defined for whole test suite. No additional server runtime is created.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/compatibility/ImportJSF12ProjectFromJBDS4x.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/compatibility/ImportJSF12ProjectFromJBDS4x.java 2012-04-18 13:41:52 UTC (rev 40289)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/compatibility/ImportJSF12ProjectFromJBDS4x.java 2012-04-18 13:53:01 UTC (rev 40290)
@@ -14,6 +14,7 @@
import java.io.File;
import java.io.IOException;
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase;
@@ -58,9 +59,16 @@
+ File.separator + "WEB-INF"
+ File.separator + "web.xml");
bot.button(IDELabel.Button.NEXT).click();
- SWTBotCheckBox chbServerRuntime = bot.checkBox(1);
- if (chbServerRuntime.isChecked()){
- chbServerRuntime.deselect();
+ // do not deploy to Server
+ try{
+ SWTBotCheckBox chbServerRuntime = bot.checkBox(1);
+ if (chbServerRuntime.isChecked()){
+ chbServerRuntime.deselect();
+ }
+ } catch (WidgetNotFoundException wnfe){
+ // do nothing
+ } catch (IndexOutOfBoundsException ioobe){
+ // do nothing
}
bot.button(IDELabel.Button.FINISH).click();
util.waitForAll(Timing.time10S());
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2012-04-18 13:41:52 UTC (rev 40289)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2012-04-18 13:53:01 UTC (rev 40290)
@@ -274,6 +274,22 @@
expectedProposals.add("msgs");
expectedProposals.add("user : User");
expectedProposals.add("\"#{user.name}\"");
+ expectedProposals.add("applicationScope");
+ expectedProposals.add("cc");
+ expectedProposals.add("component");
+ expectedProposals.add("cookie");
+ expectedProposals.add("facesContext");
+ expectedProposals.add("flash");
+ expectedProposals.add("header");
+ expectedProposals.add("headerValues");
+ expectedProposals.add("initParam");
+ expectedProposals.add("param");
+ expectedProposals.add("paramValues");
+ expectedProposals.add("requestScope");
+ expectedProposals.add("resource");
+ expectedProposals.add("sessionScope");
+ expectedProposals.add("view");
+ expectedProposals.add("viewScope");
// Check content assist for #{ prefix
ContentAssistHelper.checkContentAssistContent(SWTTestExt.bot,
JSF2_TEST_PAGE,
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2012-04-18 13:41:52 UTC (rev 40289)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2012-04-18 13:53:01 UTC (rev 40290)
@@ -76,10 +76,6 @@
protected final static String JBT_TEST_PROJECT_NAME = "JBIDETestProject"; //$NON-NLS-1$
protected final static String FACELETS_TEST_PROJECT_NAME = "FaceletsTestProject"; //$NON-NLS-1$
protected final static String JSF2_TEST_PROJECT_NAME = "JSF2TestProject"; //$NON-NLS-1$
- protected final static String JBOSS_AS_FOR_JSF2_HOME;
- protected final static String JBOSS_AS_FOR_JSF2_SERVER_GROUP;
- protected final static String JBOSS_AS_FOR_JSF2_SERVER_TYPE;
- protected final static String JBOSS_AS_FOR_JSF2_SERVER_RUNTIME_TYPE;
protected final static String RICH_FACES_UI_JAR_LOCATION;
private String projectName = null;
@@ -102,25 +98,6 @@
Activator.getDefault().getLog().log(status);
e.printStackTrace();
}
- // Setup JSF2 project related properties
- if (projectProperties.containsKey("JBossASForJSF2")) {
- JBOSS_AS_FOR_JSF2_HOME = projectProperties.getProperty("JBossASForJSF2");
- String version = projectProperties.getProperty("JBossASForJSF2Version",
- "6.0");
- if (version.equals("6.0")) {
- JBOSS_AS_FOR_JSF2_SERVER_GROUP = IDELabel.ServerGroup.JBOSS_AS_6_0;
- JBOSS_AS_FOR_JSF2_SERVER_RUNTIME_TYPE = IDELabel.ServerRuntimeType.JBOSS_AS_6_x;
- JBOSS_AS_FOR_JSF2_SERVER_TYPE = IDELabel.ServerType.JBOSS_AS_6_x;
- } else {
- throw new RuntimeException(
- "Unsupported version of JBoss AS runtime for JSF2 [version="
- + version + "location='" + JBOSS_AS_FOR_JSF2_HOME
- + "' specified.");
- }
- }
- else{
- throw new RuntimeException("Runtime for JSF2 is not specified");
- }
// Get richfaces-ui.jar location
// System property has priority
String richFacesUiLocation = System.getProperty("org.jboss.tools.vpe.ui.bot.test.richafaces.ui.jar.location","");
@@ -659,41 +636,23 @@
wiz.comboBoxWithLabel(IDELabel.NewJsfProjectDialog.TEMPLATE_LABEL)
.setSelection("JSFKickStartWithoutLibs");//$NON-NLS-1$
wiz.button(IDELabel.Button.NEXT).click();
- try {
- wiz.comboBoxWithLabel(IDELabel.NewJsfProjectDialog.RUNTIME_LABEL)
- .setSelection(JBOSS_AS_FOR_JSF2_SERVER_RUNTIME_TYPE);
- delay();
- wiz.button(IDELabel.Button.FINISH).click();
- try {
- wiz.button(IDELabel.Button.YES).click();
- openErrorLog();
- openPackageExplorer();
- } catch (WidgetNotFoundException wnfe1) {
- }
- } catch (Exception e) {
- bot.button(0).click();
- SWTBotTree innerTree = wiz.tree();
- delay();
- innerTree.expandNode(JBOSS_AS_FOR_JSF2_SERVER_GROUP).select(
- JBOSS_AS_FOR_JSF2_SERVER_RUNTIME_TYPE);
- delay();
- wiz.button(IDELabel.Button.NEXT).click();
- wiz.textWithLabel(IDELabel.NewJsfProjectDialog.HOME_DIRECTORY_LABEL)
- .setText(JBOSS_AS_FOR_JSF2_HOME);
- wiz.button(IDELabel.Button.FINISH).click();
- delay();
- wiz.button(IDELabel.Button.FINISH).click();
- try {
- wiz.button(IDELabel.Button.YES).click();
- openErrorLog();
- openPackageExplorer();
- } catch (WidgetNotFoundException e2) {
- }
+ wiz.comboBoxWithLabel("Runtime:*").setSelection(SWTTestExt.configuredState.getServer().name); //$NON-NLS-1$
+ // Check if there is problem to create JSF 2 project using configured Server Runtime
+ if (!wiz.button(IDELabel.Button.FINISH).isEnabled()){
+ String errorText = wiz.text(1).getText();
+ wiz.button(IDELabel.Button.CANCEL).click();
+ assertTrue("Unable to create JSF 2 Project with Server Runtime: "
+ + SWTTestExt.configuredState.getServer().name
+ + "\nError: "
+ + errorText,
+ false);
}
- waitForBlockingJobsAcomplished(60 * 1000L, BUILDING_WS);
- setException(null);
+ else{
+ open.finish(wiz);
+ waitForBlockingJobsAcomplished(60 * 1000L, BUILDING_WS);
+ setException(null);
+ }
}
-
}
/**
* Creates new empty HTML page within test project
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r40289 - trunk/build/aggregate.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-04-18 09:41:52 -0400 (Wed, 18 Apr 2012)
New Revision: 40289
Modified:
trunk/build/aggregate/pom.xml
Log:
JBIDE-11157: Parent pom versioning
Modified: trunk/build/aggregate/pom.xml
===================================================================
--- trunk/build/aggregate/pom.xml 2012-04-18 13:34:31 UTC (rev 40288)
+++ trunk/build/aggregate/pom.xml 2012-04-18 13:41:52 UTC (rev 40289)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r40288 - in trunk/modeshape/plugins: org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/cnd and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2012-04-18 09:34:31 -0400 (Wed, 18 Apr 2012)
New Revision: 40288
Added:
trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/QualifiedNameProposalProvider.java
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/ChildNodeDialog.java
trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/CndFormsEditorPage.java
trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/QualifiedNameDialog.java
trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/QualifiedNameEditor.java
trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/cndMessages.properties
trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/WorkspaceRegistry.java
trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/cnd/CndValidator.java
trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/cnd/CompactNodeTypeDefinition.java
Log:
JBIDE-11553 QualifiedNameEditor Should Propose Valid Qualified Names. For a node type definition's supertypes and a child node definition's required types, the QualifiedNameEditor now shows "look ahead" valid values based on the qualifier and the text in the name field.
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/WorkspaceRegistry.java
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/WorkspaceRegistry.java 2012-04-18 13:32:49 UTC (rev 40287)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/WorkspaceRegistry.java 2012-04-18 13:34:31 UTC (rev 40288)
@@ -55,15 +55,15 @@
File builtInsCndFile = null;
if (Platform.isRunning()) {
- Bundle bundle = Platform.getBundle(Activator.PLUGIN_ID);
- URL url = bundle.getEntry(BUILT_INS_CND_FILE_NAME);
-
+ final Bundle bundle = Platform.getBundle(Activator.PLUGIN_ID);
+ final URL url = bundle.getEntry(BUILT_INS_CND_FILE_NAME);
+
if (url == null) {
throw new Exception(NLS.bind(Messages.jsrBuiltInsCndFileNotFound, BUILT_INS_CND_FILE_NAME));
}
-
+
builtInsCndFile = new File(org.eclipse.core.runtime.FileLocator.toFileURL(url).getFile());
-
+
if (!builtInsCndFile.exists()) {
throw new Exception(NLS.bind(Messages.jsrBuiltInsCndFileNotFoundInFilesystem, BUILT_INS_CND_FILE_NAME));
}
@@ -129,6 +129,26 @@
}
/**
+ * Obtains the node type definitions registered to the specified namespace.
+ *
+ * @param namespacePrefix the namespace prefix of the node type definitions being requested (cannot be <code>null</code> or
+ * empty)
+ * @return the requested node type definitions (never <code>null</code> but can be empty)
+ */
+ public List<NodeTypeDefinition> getMatchingNodeTypeDefinitions( final String namespacePrefix ) {
+ Utils.verifyIsNotEmpty(namespacePrefix, "namespacePrefix"); //$NON-NLS-1$
+ final List<NodeTypeDefinition> matches = new ArrayList<NodeTypeDefinition>();
+
+ for (final NodeTypeDefinition nodeType : getNodeTypeDefinitions()) {
+ if (namespacePrefix.equals(nodeType.getQualifiedName().getQualifier())) {
+ matches.add(nodeType);
+ }
+ }
+
+ return matches;
+ }
+
+ /**
* @param prefix the prefix whose namespace mapping is being requested (cannot be <code>null</code> or empty)
* @return thre requested namespace mapping or <code>null</code> if not found
*/
@@ -265,9 +285,9 @@
* @param namespaceMapping the namespace mapping being checked (cannot be <code>null</code>)
* @return <code>true</code> if a built-in namespace mapping
*/
- public boolean isBuiltIn(NamespaceMapping namespaceMapping) {
+ public boolean isBuiltIn( final NamespaceMapping namespaceMapping ) {
Utils.verifyIsNotNull(namespaceMapping, "namespaceMapping"); //$NON-NLS-1$
- NamespaceMapping builtIn = getNamespaceMapping(namespaceMapping.getPrefix());
+ final NamespaceMapping builtIn = getNamespaceMapping(namespaceMapping.getPrefix());
return ((builtIn != null) && builtIn.equals(namespaceMapping));
}
@@ -275,7 +295,7 @@
* @param prefix the prefix being checked (cannot be <code>null</code> or empty)
* @return <code>true</code> if the prefix matches one of a built-in namespace mapping
*/
- public boolean isBuiltInNamespacePrefix(String prefix) {
+ public boolean isBuiltInNamespacePrefix( final String prefix ) {
Utils.verifyIsNotNull(prefix, "prefix"); //$NON-NLS-1$
return (getUri(prefix) != null);
}
@@ -284,7 +304,7 @@
* @param uri the URI being checked (cannot be <code>null</code> or empty)
* @return <code>true</code> if the URI matches one of a built-in namespace mapping
*/
- public boolean isBuiltInNamespaceUri(String uri) {
+ public boolean isBuiltInNamespaceUri( final String uri ) {
Utils.verifyIsNotNull(uri, "uri"); //$NON-NLS-1$
return (getPrefix(uri) != null);
}
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/cnd/CndValidator.java
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/cnd/CndValidator.java 2012-04-18 13:32:49 UTC (rev 40287)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/cnd/CndValidator.java 2012-04-18 13:34:31 UTC (rev 40288)
@@ -40,6 +40,11 @@
*/
public final class CndValidator {
+ /**
+ * The valid characters allowed in a local name.
+ */
+ public static final String LOCAL_NAME_VALID_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_."; //$NON-NLS-1$
+
private static final String PARENT_PATH_SEGMENT = ".."; //$NON-NLS-1$
private static final String SELF_PATH_SEGMENT = "."; //$NON-NLS-1$
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/cnd/CompactNodeTypeDefinition.java
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/cnd/CompactNodeTypeDefinition.java 2012-04-18 13:32:49 UTC (rev 40287)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/cnd/CompactNodeTypeDefinition.java 2012-04-18 13:34:31 UTC (rev 40288)
@@ -15,6 +15,9 @@
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.jboss.tools.modeshape.jcr.Activator;
import org.jboss.tools.modeshape.jcr.ChildNodeDefinition;
import org.jboss.tools.modeshape.jcr.ItemDefinition;
import org.jboss.tools.modeshape.jcr.NamespaceMapping;
@@ -271,6 +274,36 @@
}
/**
+ * @param namespacePrefix the namespace prefix of the node type definitions being requested (cannot be <code>null</code> or
+ * empty)
+ * @param includeInherited indicates if inherited node type definitions should be included
+ * @return the requested node type definitions (never <code>null</code> but can be empty)
+ */
+ public List<NodeTypeDefinition> getMatchingNodeTypeDefinitions( final String namespacePrefix,
+ final boolean includeInherited ) {
+ Utils.verifyIsNotEmpty(namespacePrefix, "namespacePrefix"); //$NON-NLS-1$
+ final List<NodeTypeDefinition> matches = new ArrayList<NodeTypeDefinition>();
+
+ // collect local matches
+ for (final NodeTypeDefinition nodeType : getNodeTypeDefinitions()) {
+ if (namespacePrefix.equals(nodeType.getQualifiedName().getQualifier())) {
+ matches.add(nodeType);
+ }
+ }
+
+ // collect inherited matches
+ if (includeInherited) {
+ try {
+ matches.addAll(WorkspaceRegistry.get().getMatchingNodeTypeDefinitions(namespacePrefix));
+ } catch (final Exception e) {
+ Activator.get().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, null, e));
+ }
+ }
+
+ return matches;
+ }
+
+ /**
* @return the namespace mappings (never <code>null</code>)
*/
public List<NamespaceMapping> getNamespaceMappings() {
@@ -393,7 +426,7 @@
try {
((PropertyChangeListener)listener).propertyChange(event);
} catch (final Exception e) {
- // TODO log this
+ Activator.get().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, null, e));
this.listeners.remove(listener);
}
}
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/ChildNodeDialog.java
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/ChildNodeDialog.java 2012-04-18 13:32:49 UTC (rev 40287)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/ChildNodeDialog.java 2012-04-18 13:34:31 UTC (rev 40288)
@@ -98,6 +98,9 @@
private final ErrorMessage nameError;
private ChildNodeDefinition originalChildNode;
+
+ private QualifiedNameProposalProvider requiredTypeProposalProvider;
+
private final ErrorMessage requiredTypesError;
private TableViewer requiredTypesViewer;
@@ -645,6 +648,7 @@
Messages.requiredTypeName,
this.existingNamespacePrefixes);
dialog.setExistingQNames(this.childNodeBeingEdited.getRequiredTypes());
+ dialog.setProposalProvider(this.requiredTypeProposalProvider);
dialog.create();
dialog.getShell().pack();
@@ -693,6 +697,7 @@
this.existingNamespacePrefixes,
QualifiedName.parse(selectedRequiredType));
dialog.setExistingQNames(this.childNodeBeingEdited.getRequiredTypes());
+ dialog.setProposalProvider(this.requiredTypeProposalProvider);
dialog.create();
dialog.getShell().pack();
@@ -811,6 +816,13 @@
}
}
+ /**
+ * @param proposalProvider the required type proposal provider (can be <code>null</code>)
+ */
+ public void setRequiredTypeProposalProvider( final QualifiedNameProposalProvider proposalProvider ) {
+ this.requiredTypeProposalProvider = proposalProvider;
+ }
+
private void updateMessage( final ValidationStatus status,
final ErrorMessage errorMsg ) {
JcrUiUtils.setMessage(status, errorMsg);
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/CndFormsEditorPage.java
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/CndFormsEditorPage.java 2012-04-18 13:32:49 UTC (rev 40287)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/CndFormsEditorPage.java 2012-04-18 13:34:31 UTC (rev 40288)
@@ -1754,6 +1754,41 @@
return propDefnNames;
}
+ private QualifiedNameProposalProvider getProposalProvider() {
+ return new QualifiedNameProposalProvider() {
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.jboss.tools.modeshape.jcr.ui.cnd.QualifiedNameProposalProvider#qnameStartsWith(java.lang.String,
+ * java.lang.String)
+ */
+ @Override
+ protected List<QualifiedName> qnameStartsWith( final String qualifier,
+ final String namePattern ) {
+ final List<NodeTypeDefinition> nodeTypes = getCnd().getMatchingNodeTypeDefinitions(qualifier, true);
+
+ if (nodeTypes.isEmpty()) {
+ return Collections.emptyList();
+ }
+
+ final List<QualifiedName> matches = new ArrayList<QualifiedName>();
+ final boolean acceptAll = Utils.isEmpty(namePattern);
+
+ for (final NodeTypeDefinition nodeType : nodeTypes) {
+ final QualifiedName qname = nodeType.getQualifiedName();
+
+ if (acceptAll
+ || (!Utils.isEmpty(qname.getUnqualifiedName()) && qname.getUnqualifiedName().startsWith(namePattern))) {
+ matches.add(qname);
+ }
+ }
+
+ return matches;
+ }
+ };
+ }
+
/**
* @return the selected child node definition or <code>null</code> if the viewer has an empty selection
*/
@@ -1840,6 +1875,7 @@
getSelectedNodeType(),
getChildNodeNames(),
getCnd().getNamespacePrefixes());
+ dialog.setRequiredTypeProposalProvider(getProposalProvider());
dialog.create();
dialog.getShell().pack();
@@ -1962,6 +1998,7 @@
Messages.superTypeName,
getCnd().getNamespacePrefixes());
dialog.setExistingQNames(getSelectedNodeType().getSupertypes());
+ dialog.setProposalProvider(getProposalProvider());
dialog.create();
dialog.getShell().pack();
@@ -2144,6 +2181,7 @@
getChildNodeNames(),
getCnd().getNamespacePrefixes(),
childNodeBeingEdited);
+ dialog.setRequiredTypeProposalProvider(getProposalProvider());
dialog.create();
dialog.getShell().pack();
@@ -2260,6 +2298,7 @@
getCnd().getNamespacePrefixes(),
QualifiedName.parse(selectedSupertype));
dialog.setExistingQNames(getSelectedNodeType().getSupertypes());
+ dialog.setProposalProvider(getProposalProvider());
dialog.create();
dialog.getShell().pack();
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/QualifiedNameDialog.java
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/QualifiedNameDialog.java 2012-04-18 13:32:49 UTC (rev 40287)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/QualifiedNameDialog.java 2012-04-18 13:34:31 UTC (rev 40288)
@@ -53,6 +53,8 @@
private final String qualifiedNameType;
+ private QualifiedNameProposalProvider proposalProvider;
+
private ScrolledForm scrolledForm;
private final String title;
@@ -172,6 +174,7 @@
handleNameChanged(e.text);
}
});
+ this.nameEditor.setProposalProvider(this.proposalProvider);
}
/**
@@ -202,6 +205,17 @@
}
}
+ /**
+ * @param proposalProvider the proposal provider (can be <code>null</code>)
+ */
+ public void setProposalProvider( final QualifiedNameProposalProvider proposalProvider ) {
+ if (this.nameEditor == null) {
+ this.proposalProvider = proposalProvider;
+ } else {
+ this.nameEditor.setProposalProvider(proposalProvider);
+ }
+ }
+
private void updateState() {
final QualifiedName modifiedQName = this.nameEditor.getQualifiedName();
final ValidationStatus status = this.nameEditor.getStatus();
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/QualifiedNameEditor.java
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/QualifiedNameEditor.java 2012-04-18 13:32:49 UTC (rev 40287)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/QualifiedNameEditor.java 2012-04-18 13:34:31 UTC (rev 40288)
@@ -12,6 +12,9 @@
import java.util.Collection;
import java.util.List;
+import org.eclipse.jface.bindings.keys.KeyStroke;
+import org.eclipse.jface.fieldassist.ContentProposalAdapter;
+import org.eclipse.jface.fieldassist.TextContentAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.events.ModifyEvent;
@@ -58,6 +61,10 @@
private String qualifier;
+ private ContentProposalAdapter proposalAdapter;
+
+ private QualifiedNameProposalProvider proposalProvider;
+
private boolean residualNameAllowed = false;
private ValidationStatus status;
@@ -154,6 +161,13 @@
}
});
+ this.proposalAdapter = new ContentProposalAdapter(this.txtName,
+ new TextContentAdapter(),
+ null,
+ KeyStroke.getInstance(SWT.CTRL, ' '),
+ CndValidator.LOCAL_NAME_VALID_CHARS.toCharArray());
+ this.proposalAdapter.setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_REPLACE);
+
this.txtName.setFocus();
}
}
@@ -184,6 +198,11 @@
this.qualifier = newQualifier;
}
+ // let the proposal provider know
+ if (this.proposalProvider != null) {
+ this.proposalProvider.setQualifier(this.qualifier);
+ }
+
validate();
}
@@ -194,7 +213,7 @@
/**
* @param newValue indicates if and unqualified name equal to {@link ItemDefinition#RESIDUAL_NAME} is allowed.
*/
- public void setAllowsResidualName(boolean newValue) {
+ public void setAllowsResidualName( final boolean newValue ) {
this.residualNameAllowed = newValue;
validate();
}
@@ -249,6 +268,14 @@
}
/**
+ * @param proposalProvider the proposal provider (can be <code>null</code>)
+ */
+ public void setProposalProvider( final QualifiedNameProposalProvider proposalProvider ) {
+ this.proposalProvider = proposalProvider;
+ this.proposalAdapter.setContentProposalProvider(proposalProvider);
+ }
+
+ /**
* @param validQualifiers the valid qualifiers (can be <code>null</code> or empty)
*/
void setValidQualifiers( final Collection<String> validQualifiers ) {
@@ -267,7 +294,7 @@
// only reload qualifiers if different
if ((this.validQualifiers.size() != currentItems.length) || !this.validQualifiers.containsAll(Arrays.asList(currentItems))) {
- String[] newQualifiers = this.validQualifiers.toArray(new String[this.validQualifiers.size()]);
+ final String[] newQualifiers = this.validQualifiers.toArray(new String[this.validQualifiers.size()]);
Arrays.sort(newQualifiers);
this.cbxQualifiers.setItems(newQualifiers);
}
Added: trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/QualifiedNameProposalProvider.java
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/QualifiedNameProposalProvider.java (rev 0)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/QualifiedNameProposalProvider.java 2012-04-18 13:34:31 UTC (rev 40288)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ *
+ * See the LEGAL.txt file distributed with this work for information regarding copyright ownership and licensing.
+ *
+ * See the AUTHORS.txt file distributed with this work for a full listing of individual contributors.
+ */
+package org.jboss.tools.modeshape.jcr.ui.cnd;
+
+import java.util.List;
+
+import org.eclipse.jface.fieldassist.ContentProposal;
+import org.eclipse.jface.fieldassist.IContentProposal;
+import org.eclipse.jface.fieldassist.IContentProposalProvider;
+import org.jboss.tools.modeshape.jcr.QualifiedName;
+import org.jboss.tools.modeshape.jcr.Utils;
+
+/**
+ * Provides proposals based on the qualifier part of a qualified name.
+ */
+abstract class QualifiedNameProposalProvider implements IContentProposalProvider {
+
+ private String qualifier;
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.jface.fieldassist.IContentProposalProvider#getProposals(java.lang.String, int)
+ */
+ @Override
+ public final IContentProposal[] getProposals( final String contents,
+ final int position ) {
+ final List<QualifiedName> matches = qnameStartsWith(this.qualifier, contents);
+
+ if (Utils.isEmpty(matches)) {
+ return new IContentProposal[0];
+ }
+
+ final IContentProposal[] proposals = new IContentProposal[matches.size()];
+ int i = 0;
+
+ for (final QualifiedName qname : matches) {
+ proposals[i++] = new ContentProposal(qname.getUnqualifiedName());
+ }
+
+ return proposals;
+ }
+
+ /**
+ * @param qualifier the qualifier to match (can be <code>null</code> or empty)
+ * @param namePattern the text to match (can be <code>null</code> or empty)
+ * @return a collection of <code>QualifiedName</code>s whose qualifier matches and whose unqualified name starts with the
+ * specified name pattern (never <code>null</code> but can be empty)
+ */
+ protected abstract List<QualifiedName> qnameStartsWith( String qualifier,
+ String namePattern );
+
+ /**
+ * @param qualifier the qualifier the proposals should be based on (can be <code>null</code> or empty)
+ */
+ public void setQualifier( final String qualifier ) {
+ this.qualifier = qualifier;
+ }
+}
\ No newline at end of file
Property changes on: trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/QualifiedNameProposalProvider.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/cndMessages.properties
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/cndMessages.properties 2012-04-18 13:32:49 UTC (rev 40287)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/cnd/cndMessages.properties 2012-04-18 13:34:31 UTC (rev 40288)
@@ -244,7 +244,7 @@
supertypesToolTip = The supertypes (node types and mixins) whose property definitions and child node definitions are inherited
typeHeaderText = Type
typeLabel = Type:
-unqualifiedNameToolTip = The name part of the qualified name (cannot be empty)
+unqualifiedNameToolTip = The name part of the qualified name (cannot be empty). If available, Ctrl-space to see valid choices.
uriLabel = URI:
validQualifiersToolTip = The qualifiers known to this CND
valueConstraintDialogCreateMsg = Create Value Constraint
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r40287 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/.settings.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-18 09:32:49 -0400 (Wed, 18 Apr 2012)
New Revision: 40287
Added:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/.settings/.api_filters
Log:
api filters added
Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/.settings/.api_filters
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/.settings/.api_filters (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/.settings/.api_filters 2012-04-18 13:32:49 UTC (rev 40287)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.jboss.tools.ws.ui.bot.test" version="2">
+ <resource path="src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java" type="org.jboss.tools.ws.ui.bot.test.WSTestBase">
+ <filter id="627060751">
+ <message_arguments>
+ <message_argument value="DeploymentHelper"/>
+ <message_argument value="WSTestBase"/>
+ <message_argument value="deploymentHelper"/>
+ </message_arguments>
+ </filter>
+ <filter id="627060751">
+ <message_arguments>
+ <message_argument value="ProjectHelper"/>
+ <message_argument value="WSTestBase"/>
+ <message_argument value="projectHelper"/>
+ </message_arguments>
+ </filter>
+ <filter id="627060751">
+ <message_arguments>
+ <message_argument value="ResourceHelper"/>
+ <message_argument value="WSTestBase"/>
+ <message_argument value="resourceHelper"/>
+ </message_arguments>
+ </filter>
+ <filter id="627060751">
+ <message_arguments>
+ <message_argument value="WebServiceClientHelper"/>
+ <message_argument value="WSTestBase"/>
+ <message_argument value="clientHelper"/>
+ </message_arguments>
+ </filter>
+ <filter id="643842064">
+ <message_arguments>
+ <message_argument value="Slider_Level"/>
+ <message_argument value="WSTestBase"/>
+ <message_argument value="getLevel()"/>
+ </message_arguments>
+ </filter>
+ <filter id="643846161">
+ <message_arguments>
+ <message_argument value="Slider_Level"/>
+ <message_argument value="WSTestBase"/>
+ <message_argument value="setLevel(WsWizardBaseSlider_Level)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromJavaTest.java" type="org.jboss.tools.ws.ui.bot.test.webservice.eap.EAPFromJavaTest">
+ <filter id="576720909">
+ <message_arguments>
+ <message_argument value="WebServiceTestBase"/>
+ <message_argument value="EAPFromJavaTest"/>
+ </message_arguments>
+ </filter>
+ <filter id="643842064">
+ <message_arguments>
+ <message_argument value="Slider_Level"/>
+ <message_argument value="EAPFromJavaTest"/>
+ <message_argument value="getLevel()"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromWSDLTest.java" type="org.jboss.tools.ws.ui.bot.test.webservice.eap.EAPFromWSDLTest">
+ <filter id="576720909">
+ <message_arguments>
+ <message_argument value="WebServiceTestBase"/>
+ <message_argument value="EAPFromWSDLTest"/>
+ </message_arguments>
+ </filter>
+ <filter id="643842064">
+ <message_arguments>
+ <message_argument value="Slider_Level"/>
+ <message_argument value="EAPFromWSDLTest"/>
+ <message_argument value="getLevel()"/>
+ </message_arguments>
+ </filter>
+ </resource>
+</component>
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r40286 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-18 09:30:54 -0400 (Wed, 18 Apr 2012)
New Revision: 40286
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromJavaTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromWSDLTest.java
Log:
set runtime requirements for eap related tests to be only EAP
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromJavaTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromJavaTest.java 2012-04-18 13:27:17 UTC (rev 40285)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromJavaTest.java 2012-04-18 13:30:54 UTC (rev 40286)
@@ -20,6 +20,9 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
import org.jboss.tools.ws.ui.bot.test.WSAllBotTests;
import org.jboss.tools.ws.ui.bot.test.uiutils.actions.NewFileWizardAction;
import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.Wizard;
@@ -38,6 +41,9 @@
*
*/
@SuiteClasses({ WSAllBotTests.class, EAPCompAllTests.class })
+@Require(perspective="Java EE",
+ server=(a)Server(type=ServerType.EAP,
+ version = "5.1", operator = ">="))
public class EAPFromJavaTest extends WebServiceTestBase {
private static boolean servicePassed = false;
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromWSDLTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromWSDLTest.java 2012-04-18 13:27:17 UTC (rev 40285)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/eap/EAPFromWSDLTest.java 2012-04-18 13:30:54 UTC (rev 40286)
@@ -29,6 +29,9 @@
import org.jboss.tools.ui.bot.ext.SWTBotExt;
import org.jboss.tools.ui.bot.ext.SWTUtilExt;
import org.jboss.tools.ui.bot.ext.Timing;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
import org.jboss.tools.ws.ui.bot.test.WSAllBotTests;
import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.WsWizardBase.Slider_Level;
@@ -47,6 +50,9 @@
*
*/
@SuiteClasses({ WSAllBotTests.class, EAPCompAllTests.class })
+@Require(perspective="Java EE",
+ server=(a)Server(type=ServerType.EAP,
+ version = "5.1", operator = ">="))
public class EAPFromWSDLTest extends WebServiceTestBase {
private static boolean servicePassed = false;
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r40285 - in trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test: resources/prj/hibernate35/src/org and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-04-18 09:27:17 -0400 (Wed, 18 Apr 2012)
New Revision: 40285
Added:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/launcher/RevengFile.launch
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/resources/prj/hibernate35/src/org/reveng/
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/RevengFileSuite.java
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/reveng/
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/reveng/CreateRevengFileTest.java
Log:
Initial version CreateRevengFileTest added into HB ui bot tests
Added: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/launcher/RevengFile.launch
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/launcher/RevengFile.launch (rev 0)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/launcher/RevengFile.launch 2012-04-18 13:27:17 UTC (rev 40285)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/RevengFileSuite.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="DISPLAY" value=":1"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.hb.ui.bot.suite.RevengFileSuite"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.hibernate.ui.bot.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx512m -Xmx1024M -XX:PermSize=128M -XX:MaxPermSize=256M -Dusage_reporting_enabled=false -Dtest.configurations.dir=/home/jpeterka/etc/hb"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
Property changes on: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/launcher/RevengFile.launch
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/RevengFileSuite.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/RevengFileSuite.java (rev 0)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/RevengFileSuite.java 2012-04-18 13:27:17 UTC (rev 40285)
@@ -0,0 +1,14 @@
+package org.jboss.tools.hb.ui.bot.suite;
+
+import org.jboss.tools.hb.ui.bot.test.configuration.CreateConfigurationFileTest;
+import org.jboss.tools.hb.ui.bot.test.configuration.EditConfigurationFileTest;
+import org.jboss.tools.hb.ui.bot.test.reveng.CreateRevengFileTest;
+import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+(a)RunWith(RequirementAwareSuite.class)
+(a)SuiteClasses({CreateRevengFileTest.class})
+public class RevengFileSuite {
+
+}
Property changes on: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/suite/RevengFileSuite.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/reveng/CreateRevengFileTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/reveng/CreateRevengFileTest.java (rev 0)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/reveng/CreateRevengFileTest.java 2012-04-18 13:27:17 UTC (rev 40285)
@@ -0,0 +1,57 @@
+package org.jboss.tools.hb.ui.bot.test.reveng;
+
+import static org.eclipse.swtbot.swt.finder.waits.Conditions.shellIsActive;
+import static org.eclipse.swtbot.swt.finder.waits.Conditions.widgetIsEnabled;
+
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
+import org.jboss.tools.hb.ui.bot.common.Tree;
+import org.jboss.tools.hb.ui.bot.test.HibernateBaseTest;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem;
+import org.jboss.tools.ui.bot.ext.types.EntityType;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.junit.Test;
+
+/**
+ * Hibernate create reveng file ui bot test
+ *
+ * @author jpeterka
+ *
+ */
+@Require(clearProjects = false)
+public class CreateRevengFileTest extends HibernateBaseTest {
+
+ final String prj = "hibernate35";
+ final String pkg = "org.reveng";
+
+ @Test
+ public void createMappingFileTest() {
+ importTestProject("/resources/prj/hibernate35");
+ createRevengFilesFromPackage();
+ }
+
+ private void createRevengFilesFromPackage() {
+ // Select Both classes
+ SWTBotView pe = open.viewOpen(ActionItem.View.GeneralProjectExplorer.LABEL);
+ Tree.select(pe.bot(), prj,"src",pkg);
+
+ // Create mapping files
+ eclipse.createNew(EntityType.HIBERNATE_REVERSE_FILE);
+
+ bot.waitForNumberOfShells(2);
+ SWTBotShell shell = bot.shell("");
+ shell.setFocus();
+
+ bot.waitUntil(widgetIsEnabled(bot.button("Next >")));
+ bot.button(IDELabel.Button.NEXT).click();
+ bot.waitUntil(widgetIsEnabled(bot.button("Finish")));
+ bot.button("Include...").click();
+ bot.button(IDELabel.Button.FINISH).click();
+ bot.waitForNumberOfShells(1);
+
+ bot.closeAllEditors();
+
+ Tree.open(pe.bot(), prj,"src",pkg,"hibernate.reveng.xml");
+ }
+}
Property changes on: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/reveng/CreateRevengFileTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r40284 - in trunk: as and 31 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-04-18 09:02:29 -0400 (Wed, 18 Apr 2012)
New Revision: 40284
Modified:
trunk/archives/pom.xml
trunk/as/pom.xml
trunk/birt/pom.xml
trunk/bpel/pom.xml
trunk/cdi/pom.xml
trunk/central/pom.xml
trunk/common/pom.xml
trunk/deltacloud/pom.xml
trunk/esb/pom.xml
trunk/examples/pom.xml
trunk/flow/pom.xml
trunk/forge/pom.xml
trunk/freemarker/pom.xml
trunk/gwt/pom.xml
trunk/hibernatetools/pom.xml
trunk/jbpm/pom.xml
trunk/jmx/pom.xml
trunk/jsf/pom.xml
trunk/jst/pom.xml
trunk/maven/pom.xml
trunk/modeshape/pom.xml
trunk/openshift/pom.xml
trunk/portlet/pom.xml
trunk/runtime-soa/pom.xml
trunk/runtime/pom.xml
trunk/seam/pom.xml
trunk/smooks/pom.xml
trunk/struts/pom.xml
trunk/tests/pom.xml
trunk/usage/pom.xml
trunk/vpe/pom.xml
trunk/ws/pom.xml
trunk/xulrunner/pom.xml
Log:
JBIDE-11157 : components consume new version of parent pom
Modified: trunk/archives/pom.xml
===================================================================
--- trunk/archives/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/archives/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/as/pom.xml
===================================================================
--- trunk/as/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/as/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/birt/pom.xml
===================================================================
--- trunk/birt/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/birt/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/bpel/pom.xml
===================================================================
--- trunk/bpel/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/bpel/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/cdi/pom.xml
===================================================================
--- trunk/cdi/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/cdi/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/central/pom.xml
===================================================================
--- trunk/central/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/central/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/common/pom.xml
===================================================================
--- trunk/common/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/common/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/deltacloud/pom.xml
===================================================================
--- trunk/deltacloud/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/deltacloud/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/esb/pom.xml
===================================================================
--- trunk/esb/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/esb/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/examples/pom.xml
===================================================================
--- trunk/examples/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/examples/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/flow/pom.xml
===================================================================
--- trunk/flow/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/flow/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/forge/pom.xml
===================================================================
--- trunk/forge/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/forge/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/freemarker/pom.xml
===================================================================
--- trunk/freemarker/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/freemarker/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/gwt/pom.xml
===================================================================
--- trunk/gwt/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/gwt/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/hibernatetools/pom.xml
===================================================================
--- trunk/hibernatetools/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/hibernatetools/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/jbpm/pom.xml
===================================================================
--- trunk/jbpm/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/jbpm/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/jmx/pom.xml
===================================================================
--- trunk/jmx/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/jmx/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/jsf/pom.xml
===================================================================
--- trunk/jsf/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/jsf/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/jst/pom.xml
===================================================================
--- trunk/jst/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/jst/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
Modified: trunk/maven/pom.xml
===================================================================
--- trunk/maven/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/maven/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/modeshape/pom.xml
===================================================================
--- trunk/modeshape/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/modeshape/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/openshift/pom.xml
===================================================================
--- trunk/openshift/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/openshift/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/portlet/pom.xml
===================================================================
--- trunk/portlet/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/portlet/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/runtime/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/runtime-soa/pom.xml
===================================================================
--- trunk/runtime-soa/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/runtime-soa/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/seam/pom.xml
===================================================================
--- trunk/seam/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/seam/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/smooks/pom.xml
===================================================================
--- trunk/smooks/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/smooks/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/struts/pom.xml
===================================================================
--- trunk/struts/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/struts/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/tests/pom.xml
===================================================================
--- trunk/tests/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/tests/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/usage/pom.xml
===================================================================
--- trunk/usage/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/usage/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/vpe/pom.xml
===================================================================
--- trunk/vpe/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/vpe/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/ws/pom.xml
===================================================================
--- trunk/ws/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/ws/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/xulrunner/pom.xml
===================================================================
--- trunk/xulrunner/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
+++ trunk/xulrunner/pom.xml 2012-04-18 13:02:29 UTC (rev 40284)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r40283 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-04-18 08:33:40 -0400 (Wed, 18 Apr 2012)
New Revision: 40283
Modified:
trunk/build/parent/pom.xml
Log:
JBIDE-11157 : Version parent pom.xml
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-04-18 11:47:41 UTC (rev 40282)
+++ trunk/build/parent/pom.xml 2012-04-18 12:33:40 UTC (rev 40283)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>0.0.4-SNAPSHOT</version>
+ <version>3.3.0.Beta3-SNAPSHOT</version>
<name>JBoss Tools Parent</name>
<packaging>pom</packaging>
<modules>
13 years, 11 months
- 1
- 0
JBoss Tools SVN: r40282 - in trunk: tests/plugins/org.jboss.tools.ui.bot.ext/META-INF and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-04-18 07:47:41 -0400 (Wed, 18 Apr 2012)
New Revision: 40282
Added:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/matcher/console/
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/matcher/console/ConsoleOutputMatcher.java
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ConsoleOutputMatcher.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF
Log:
Moved ConsoleOutputMatcher from portlet to swtbotext
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ConsoleOutputMatcher.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ConsoleOutputMatcher.java 2012-04-18 11:18:21 UTC (rev 40281)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ConsoleOutputMatcher.java 2012-04-18 11:47:41 UTC (rev 40282)
@@ -2,7 +2,6 @@
import org.hamcrest.Description;
import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher;
-import org.jboss.tools.ui.bot.ext.SWTBotFactory;
/**
* Checks if the console contains specified text.
@@ -12,19 +11,19 @@
*/
public class ConsoleOutputMatcher extends AbstractSWTMatcher<String> {
- private String consoleText;
+ private org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher wrappedMatcher;
+ public ConsoleOutputMatcher() {
+ wrappedMatcher = new org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher();
+ }
+
@Override
public boolean matchesSafely(String item) {
- consoleText = SWTBotFactory.getConsole().getConsoleText();
- if (consoleText == null){
- throw new IllegalStateException("No console output present");
- }
- return consoleText.contains(item);
+ return wrappedMatcher.matchesSafely(item);
}
@Override
public void describeTo(Description description) {
- description.appendText("is in console output, but instead: \n" + consoleText);
+ wrappedMatcher.describeTo(description);
}
}
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF 2012-04-18 11:18:21 UTC (rev 40281)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF 2012-04-18 11:47:41 UTC (rev 40282)
@@ -18,6 +18,7 @@
org.jboss.tools.ui.bot.ext.helper,
org.jboss.tools.ui.bot.ext.logging,
org.jboss.tools.ui.bot.ext.matcher,
+ org.jboss.tools.ui.bot.ext.matcher.console,
org.jboss.tools.ui.bot.ext.parts,
org.jboss.tools.ui.bot.ext.types,
org.jboss.tools.ui.bot.ext.view,
Copied: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/matcher/console/ConsoleOutputMatcher.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/console/ConsoleOutputMatcher.java)
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/matcher/console/ConsoleOutputMatcher.java (rev 0)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/matcher/console/ConsoleOutputMatcher.java 2012-04-18 11:47:41 UTC (rev 40282)
@@ -0,0 +1,30 @@
+package org.jboss.tools.ui.bot.ext.matcher.console;
+
+import org.hamcrest.Description;
+import org.hamcrest.TypeSafeMatcher;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+
+/**
+ * Checks if the console contains specified text.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class ConsoleOutputMatcher extends TypeSafeMatcher<String> {
+
+ private String consoleText;
+
+ @Override
+ public boolean matchesSafely(String item) {
+ consoleText = SWTBotFactory.getConsole().getConsoleText();
+ if (consoleText == null){
+ throw new IllegalStateException("No console output present");
+ }
+ return consoleText.contains(item);
+ }
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendText("is in console output, but instead: \n" + consoleText);
+ }
+}
13 years, 11 months
- 1
- 0