November 2010 - jbosstools-commits

JBoss Tools SVN: r26517 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2010-11-12 11:06:41 -0500 (Fri, 12 Nov 2010) New Revision: 26517 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/UIUtils.java Log: [JBIDE-7558] removed static menu ids Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/UIUtils.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/UIUtils.java 2010-11-12 16:06:27 UTC (rev 26516) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/UIUtils.java 2010-11-12 16:06:41 UTC (rev 26517) @@ -47,6 +47,9 @@ */ public class UIUtils { + private static final String CONTEXT_MENU_PREFIX = "popup:"; + private static final String VIEW_MENU_PREFIX = "menu:"; + private UIUtils() { } @@ -258,6 +261,14 @@ } }); } + + public static String getContextMenuId(String viewId) { + return new StringBuffer(CONTEXT_MENU_PREFIX).append(viewId).toString(); + } + + public static String getViewMenuId(String viewId) { + return new StringBuffer(VIEW_MENU_PREFIX).append(viewId).toString(); + } /** * Creates context menu to a given control.

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r26516 - 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-12 11:06:27 -0500 (Fri, 12 Nov 2010) New Revision: 26516 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java Log: [JBIDE-7558] removed static menu ids Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-11-12 16:02:48 UTC (rev 26515) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-11-12 16:06:27 UTC (rev 26516) @@ -18,7 +18,6 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.ui.IActionBars; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.ViewPart; import org.eclipse.ui.views.properties.IPropertySheetPage; @@ -36,11 +35,7 @@ */ public static final String ID = "org.jboss.tools.deltacloud.ui.views.DeltaCloudView"; - private static final String CONTEXT_MENU_ID = "popup:" + ID; - private static final String VIEW_MENU_ID = "menu:" + ID; - public static final String COLLAPSE_ALL = "CollapseAll.label"; //$NON-NLS-1$ - private static final String HELP_CONTEXTID = "org.jboss.tools.deltacloud.ui.viewer"; private TreeViewer viewer; @@ -76,15 +71,12 @@ private void hookContextMenu(Control control) { IMenuManager contextMenu = UIUtils.createContextMenu(control); - UIUtils.registerContributionManager(CONTEXT_MENU_ID, contextMenu, control); + UIUtils.registerContributionManager(UIUtils.getContextMenuId(ID), contextMenu, control); } private void contributeToActionBars() { // TODO: replace by declarative command fillLocalToolBar(getViewSite().getActionBars().getToolBarManager()); - IActionBars actionBars = getViewSite().getActionBars(); - IMenuManager menuManager = actionBars.getMenuManager(); - UIUtils.registerContributionManager(VIEW_MENU_ID, menuManager, viewer.getControl()); } private void fillLocalToolBar(IToolBarManager manager) {

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r26515 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-11-12 11:02:48 -0500 (Fri, 12 Nov 2010) New Revision: 26515 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamModelStorageTest.java Log: JBIDE-7319 https://jira.jboss.org/browse/JBIDE-7319 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamModelStorageTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamModelStorageTest.java 2010-11-12 15:52:07 UTC (rev 26514) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamModelStorageTest.java 2010-11-12 16:02:48 UTC (rev 26515) @@ -15,9 +15,12 @@ import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.internal.core.SeamProject; import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.TestProjectProvider; public class SeamModelStorageTest extends TestCase { IProject project = null; + TestProjectProvider provider = null; + boolean makeCopy = true; public SeamModelStorageTest() { super("Seam Model Storage Test"); @@ -26,6 +29,13 @@ public void setUp() throws Exception { project = ResourcesPlugin.getWorkspace().getRoot().getProject("TestStorage"); assertNotNull("Can't load TestStorage", project); //$NON-NLS-1$ + if(!project.exists()) { + provider = new TestProjectProvider("org.jboss.tools.seam.core.test", + null,"TestScanner" ,true); + project = provider.getProject(); + } + project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + this.project.build(IncrementalProjectBuilder.FULL_BUILD, null); } public void testStorage() throws Exception { @@ -65,4 +75,11 @@ assertTrue("Modification index after adding new library must be greater than 0", mod > 0); } + @Override + protected void tearDown() throws Exception { + if(provider!=null) { + provider.dispose(); + } + } + }

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r26514 - trunk/drools.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-11-12 10:52:07 -0500 (Fri, 12 Nov 2010) New Revision: 26514 Modified: trunk/drools/README.building.txt trunk/drools/pom-with-deps.xml trunk/drools/pom.xml Log: clean up poms: better comments/instructions, remove obsolete refs, use FQDN Modified: trunk/drools/README.building.txt =================================================================== --- trunk/drools/README.building.txt 2010-11-12 15:20:49 UTC (rev 26513) +++ trunk/drools/README.building.txt 2010-11-12 15:52:07 UTC (rev 26514) @@ -5,5 +5,3 @@ Then run maven: $ mvn clean install - - Modified: trunk/drools/pom-with-deps.xml =================================================================== --- trunk/drools/pom-with-deps.xml 2010-11-12 15:20:49 UTC (rev 26513) +++ trunk/drools/pom-with-deps.xml 2010-11-12 15:52:07 UTC (rev 26514) @@ -3,25 +3,26 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <relativePath>../parent-pom.xml</relativePath> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools</groupId> - <artifactId>drools.all</artifactId> + <artifactId>org.jboss.tools.drools.all</artifactId> + <name>org.jboss.tools.drools.all</name> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> -  +  + +  <module>../org.jboss.tools.ui.bot.ext</module> <module>../org.jboss.tools.jst.ui.bot.test</module> -  <module>plugins</module> <module>features</module> <module>tests</module> - <module>site</module> - </modules> + <module>site</module> + </modules> </project> Modified: trunk/drools/pom.xml =================================================================== --- trunk/drools/pom.xml 2010-11-12 15:20:49 UTC (rev 26513) +++ trunk/drools/pom.xml 2010-11-12 15:52:07 UTC (rev 26514) @@ -3,35 +3,26 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools</groupId> - <artifactId>drools</artifactId> - <name>drools.all</name> + <artifactId>org.jboss.tools.drools.all</artifactId> + <name>org.jboss.tools.drools.all</name> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> +  + +  +  +  + <module>plugins</module> <module>features</module> <module>tests</module> - <module>site</module> - </modules> -  -  + <module>site</module> + </modules> </project>

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r26513 - trunk/build/aggregate/site.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-11-12 10:20:49 -0500 (Fri, 12 Nov 2010) New Revision: 26513 Modified: trunk/build/aggregate/site/pom.xml Log: update input URL for savara Modified: trunk/build/aggregate/site/pom.xml =================================================================== --- trunk/build/aggregate/site/pom.xml 2010-11-12 14:50:50 UTC (rev 26512) +++ trunk/build/aggregate/site/pom.xml 2010-11-12 15:20:49 UTC (rev 26513) @@ -20,7 +20,7 @@ <inputRepo2>http://download.jboss.org/jbosstools/builds/staging/pi4soa-3.1.x</inputRepo2> <inputRepo3>http://download.jboss.org/jbosstools/builds/staging/jbosstools-teiid-desi...</inputRepo3> <inputRepo4>http://download.jboss.org/jbosstools/builds/staging/jbosstools-drools-5.2</inputRepo4> - <inputRepo5>http://download.jboss.org/jbosstools/builds/staging/savara-1.1.x</inputRepo5> + <inputRepo5>http://download.jboss.org/jbosstools/builds/staging/jbosstools-savara-1.1.x</inputRepo5> <inputRepos>1,2,3,4,5</inputRepos> </properties>

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r26512 - in trunk/hibernatetools: plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2010-11-12 09:50:50 -0500 (Fri, 12 Nov 2010) New Revision: 26512 Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/TextDialogCellEditor.java trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ParametersListDialog.java Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryParametersPage.java trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleQueryParameter.java trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/HQLQueryPage.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java Log: JBIDE-4202 Entering parameter lists in Hibernate Tools Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleQueryParameter.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleQueryParameter.java 2010-11-12 14:49:31 UTC (rev 26511) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleQueryParameter.java 2010-11-12 14:50:50 UTC (rev 26512) @@ -118,18 +118,26 @@ //if(value == null) { throw new IllegalArgumentException("Value must not be set to null"); } this.value = value; } - - public String getValueAsString() { - if(isNull()) return ""; //$NON-NLS-1$ - return type.toString(getValue()); + + public String[] getStringValues() { + if(value == null) return new String[]{""}; //$NON-NLS-1$ + if (value.getClass().isArray()){ + Object[] arr = (Object[])value; + String[] values = new String[arr.length]; + for (int i = 0; i < arr.length; i++) { + values[i] = type.toString(arr[i]); + } + return values; + } else { + return new String[]{type.toString(value)}; + } } - public void setValueFromString(String value) { + public Object convertStringToValue(String value){ try { - Object object = type.fromStringValue(value); - setValue(object); + return type.fromStringValue(value); } catch(Exception he) { - setNull(); + return NULL_MARKER; } } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/HQLQueryPage.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/HQLQueryPage.java 2010-11-12 14:49:31 UTC (rev 26511) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/HQLQueryPage.java 2010-11-12 14:50:50 UTC (rev 26512) @@ -22,6 +22,7 @@ package org.hibernate.console; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -75,12 +76,20 @@ ConsoleQueryParameter[] qp = model.getQueryParameters(); for (int i = 0; i < qp.length; i++) { ConsoleQueryParameter parameter = qp[i]; + try { int pos = Integer.parseInt(parameter.getName()); + //FIXME no method to set positioned list value query2.setParameter(pos, calcValue( parameter ), parameter.getType()); } catch(NumberFormatException nfe) { - query2.setParameter(parameter.getName(), calcValue( parameter ), parameter.getType()); - } + Object value = parameter.getValue(); + if (value != null && value.getClass().isArray()){ + Object[] values = (Object[])value; + query2.setParameterList(parameter.getName(), Arrays.asList(values), parameter.getType()); + } else { + query2.setParameter(parameter.getName(), calcValue( parameter ), parameter.getType()); + } + } } } Added: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ParametersListDialog.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ParametersListDialog.java (rev 0) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ParametersListDialog.java 2010-11-12 14:50:50 UTC (rev 26512) @@ -0,0 +1,152 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.hibernate.console; + +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.InputDialog; +import org.eclipse.jface.viewers.ListViewer; +import org.eclipse.jface.window.Window; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Shell; + +/** + * @author Dmitry Geraskov + * + */ +public class ParametersListDialog extends Dialog { + + private ListViewer listViewer; + + private ConsoleQueryParameter cqp; + + private String[] values; + + /** + * @param parentShell + */ + public ParametersListDialog(Shell parentShell, ConsoleQueryParameter cqp) { + super(parentShell); + this.cqp = cqp; + + } + + @Override + protected Control createDialogArea(Composite container) { + Composite parent = (Composite) super.createDialogArea(container); + listViewer = new ListViewer(parent); + GridData gd = new GridData(GridData.FILL_BOTH); + gd.heightHint = convertHeightInCharsToPixels(15); + gd.widthHint = convertWidthInCharsToPixels(55); + org.eclipse.swt.widgets.List list = listViewer.getList(); + list.setLayoutData(gd); + list.setFont(container.getFont()); + /*List<String> input = new ArrayList<String>(); + Object value = cqp.getValue(); + if (value != null) { + if (cqp.isArrayValue()) { + Object[] values = (Object[]) value; + for (Object object : values) { + input.add(cqp.convertValueToString(object)); + } + } else { + input.add(cqp.convertValueToString(value)); + } + }*/ + if (!cqp.isNull()){ + list.setItems(cqp.getStringValues()); + } + if (list.getItemCount() > 0){ + list.select(list.getItemCount() - 1); + } + addButtons(parent); + return parent; + } + + protected void configureShell(Shell shell) { + super.configureShell(shell); + shell.setText("Parameter Values"); //$NON-NLS-1$ + } + + private Button buttonAdd; + private Button buttonRemove; + private Button buttonModify; + + private void addButtons(Composite parent) { + Composite composite = new Composite(parent, SWT.NULL); + FillLayout fillLayout = new FillLayout(SWT.HORIZONTAL); + fillLayout.spacing = 2; + + composite.setLayout(fillLayout); + + buttonAdd = new Button(composite, SWT.PUSH); + buttonAdd.setText("Add"); //$NON-NLS-1$ + + buttonModify = new Button(composite, SWT.PUSH); + buttonModify.setText("Modify"); //$NON-NLS-1$ + + buttonRemove = new Button(composite, SWT.PUSH); + buttonRemove.setText("Remove"); //$NON-NLS-1$ + + buttonAdd.addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent e) { + InputDialog inputDialog = new InputDialog(null, "Add Element", //$NON-NLS-1$ + "New parameter: ", "", null); //$NON-NLS-1$ //$NON-NLS-2$ + if (inputDialog.open() == Window.OK) { + listViewer.getList().add(inputDialog.getValue()); + } + } + }); + + buttonModify.addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent e) { + int line = listViewer.getList().getSelectionIndex(); + if (line >=0 ){ + InputDialog inputDialog = new InputDialog(null, "Add Element", //$NON-NLS-1$ + "New parameter: ", listViewer.getList().getItem(line), null); //$NON-NLS-1$ + if (inputDialog.open() == Window.OK) { + listViewer.getList().setItem(line, inputDialog.getValue()); + } + } + + + } + }); + + buttonRemove.addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent e) { + int line = listViewer.getList().getSelectionIndex(); + if (line < 0) { + return; + } else { + listViewer.getList().remove(line); + } + } + }); + } + + @Override + protected void okPressed() { + values = listViewer.getList().getItems(); + super.okPressed(); + } + + public String[] getValue() { + return values; + } + +} Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryParametersPage.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryParametersPage.java 2010-11-12 14:49:31 UTC (rev 26511) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryParametersPage.java 2010-11-12 14:50:50 UTC (rev 26512) @@ -48,10 +48,12 @@ import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TextCellEditor; import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; @@ -62,6 +64,7 @@ import org.eclipse.ui.part.Page; import org.hibernate.console.ConsoleQueryParameter; import org.hibernate.console.ImageConstants; +import org.hibernate.console.ParametersListDialog; import org.hibernate.console.QueryInputModel; import org.hibernate.eclipse.console.HibernateConsoleMessages; import org.hibernate.eclipse.console.QueryEditor; @@ -122,8 +125,6 @@ toggleActive.setChecked(model.ignoreParameters()); tableViewer.getTable().setEnabled(!model.ignoreParameters()); tableViewer.setInput(model); - - } private void createStatusLabel() { @@ -224,11 +225,27 @@ } } if ( VALUE_PROPERTY.equals( property ) ) { - cqp.setValueFromString((String) value); + String[] inputStrings; + if (value instanceof String[]){ + inputStrings = (String[])value; + } else { + inputStrings = new String[]{(String) value}; + } + Object[] values = new Object[inputStrings.length]; + for (int i = 0; i < inputStrings.length; i++) { + values[i] = cqp.convertStringToValue(inputStrings[i]); + } + if (values.length > 1){ + cqp.setValue(values); + } else if (values.length == 1){ + cqp.setValue(values[0]); + } else { + cqp.setValue(null); + } } if ( NULL_PROPERTY.equals( property ) ) { if(cqp.isNull()) { - cqp.setValueFromString( "" ); // best attempt to "unnull" //$NON-NLS-1$ + cqp.setValue(cqp.convertStringToValue( "" )); // best attempt to "unnull" //$NON-NLS-1$ } else { cqp.setNull(); } @@ -253,7 +270,11 @@ } } if ( VALUE_PROPERTY.equals( property ) ) { - return cqp.getValueAsString(); + return cqp.getStringValues(); + /*if (cqp.isArrayValue()){ + return cqp.convertValueToString(((Object[])cqp.getValue())[0]); + } + return cqp.convertValueToString(cqp.getValue());*/ } if ( NULL_PROPERTY.equals( property )) { return Boolean.valueOf(cqp.isNull()); @@ -294,7 +315,45 @@ CellEditor[] editors = new CellEditor[columnProperties.length]; editors[0] = new TextCellEditor( queryParametersTable ); editors[1] = new ComboBoxCellEditor( queryParametersTable, valueTypes ); - editors[2] = new TextCellEditor( queryParametersTable ); + editors[2] = new TextDialogCellEditor(queryParametersTable) { + + private Button b; + + @Override + protected Object openDialogBox(Control cellEditorWindow) { + Object firstElement = ((IStructuredSelection)tableViewer.getSelection()).getFirstElement(); + if(firstElement instanceof ConsoleQueryParameter) { + ParametersListDialog pld = new ParametersListDialog(null, (ConsoleQueryParameter) firstElement); + if (pld.open()==Window.OK){ + return pld.getValue();//String[] + } + } + return getValue();//could be String or String[] + } + + public void activate() { + Object param = ((IStructuredSelection)tableViewer.getSelection()).getFirstElement(); + if(param instanceof ConsoleQueryParameter) { + try { + Integer.parseInt(((ConsoleQueryParameter) param).getName()); + /* + * "ordered" parameter doesn't allow list value + * see also HQLQueryPage#setupParameters() + */ + b.setVisible(false); + } catch(NumberFormatException nfe) { + /*"named" parameter allows parameter list value*/ + b.setVisible(true); + } + } + }; + + protected org.eclipse.swt.widgets.Button createButton(Composite parent) { + return b = super.createButton(parent); + }; + + }; + editors[3] = new CheckboxCellEditor( queryParametersTable ); tableViewer.setCellEditors( editors ); @@ -323,7 +382,7 @@ case 1: return cqp.getType().getName(); case 2: - return cqp.getValueAsString(); + return cqp.getStringValues()[0]; case 3: return null; //cqp.isNull()?"X":""; default: Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/TextDialogCellEditor.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/TextDialogCellEditor.java (rev 0) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/TextDialogCellEditor.java 2010-11-12 14:50:50 UTC (rev 26512) @@ -0,0 +1,243 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.hibernate.eclipse.console.views; + +import java.text.MessageFormat; + +import org.eclipse.jface.viewers.TextCellEditor; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.FocusEvent; +import org.eclipse.swt.events.FocusListener; +import org.eclipse.swt.events.KeyAdapter; +import org.eclipse.swt.events.KeyEvent; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.Font; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Layout; +import org.eclipse.swt.widgets.Text; + +/** + * @author Dmitry Geraskov + * + */ +public abstract class TextDialogCellEditor extends TextCellEditor { + + private Text text; + + /** + * The button. + */ + private Button button; + + /** + * The editor control. + */ + private Composite editor; + + private String[] strValues = null; + + private FocusListener buttonFocusListener; + + protected TextDialogCellEditor(Composite parent) { + super(parent); + } + + @Override + protected Control createControl(Composite parent) { + Font font = parent.getFont(); + Color bg = parent.getBackground(); + + editor = new Composite(parent, getStyle()); + editor.setFont(font); + editor.setBackground(bg); + editor.setLayout(new DialogCellLayout()); + + text = (Text) super.createControl(editor); + updateContents(strValues); + + button = createButton(editor); + button.setFont(font); + + button.addKeyListener(new KeyAdapter() { + /* (non-Javadoc) + * @see org.eclipse.swt.events.KeyListener#keyReleased(org.eclipse.swt.events.KeyEvent) + */ + public void keyReleased(KeyEvent e) { + if (e.character == '\u001b') { // Escape + fireCancelEditor(); + } + } + }); + + button.addFocusListener(getButtonFocusListener()); + + button.addSelectionListener(new SelectionAdapter() { + /* (non-Javadoc) + * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent) + */ + public void widgetSelected(SelectionEvent event) { + // Remove the button's focus listener since it's guaranteed + // to lose focus when the dialog opens + button.removeFocusListener(getButtonFocusListener()); + + Object newValue = openDialogBox(editor); + + // Re-add the listener once the dialog closes + button.addFocusListener(getButtonFocusListener()); + + if (newValue != null) { + boolean newValidState = isCorrect(newValue); + if (newValidState) { + markDirty(); + doSetValue(newValue); + } else { + // try to insert the current value into the error message. + setErrorMessage(MessageFormat.format(getErrorMessage(), + new Object[] { newValue.toString() })); + } + fireApplyEditorValue(); + } + } + + + }); + + setValueValid(true); + + return editor; + } + + @Override + protected void focusLost() { + if (isActivated()) { + if (button != null && !button.isDisposed() && !button.isFocusControl()) { + if (text != null && !text.isDisposed() && !text.isFocusControl()){ + fireApplyEditorValue(); + deactivate(); + } + } + } + } + + protected abstract Object openDialogBox(Control cellEditorWindow); + + private FocusListener getButtonFocusListener() { + if (buttonFocusListener == null) { + buttonFocusListener = new FocusListener() { + + /* (non-Javadoc) + * @see org.eclipse.swt.events.FocusListener#focusGained(org.eclipse.swt.events.FocusEvent) + */ + public void focusGained(FocusEvent e) { + + } + + /* (non-Javadoc) + * @see org.eclipse.swt.events.FocusListener#focusLost(org.eclipse.swt.events.FocusEvent) + */ + public void focusLost(FocusEvent e) { + TextDialogCellEditor.this.focusLost(); + } + }; + } + + return buttonFocusListener; + } + + protected Button createButton(Composite parent) { + Button result = new Button(parent, SWT.DOWN); + result.setText("..."); //$NON-NLS-1$ + return result; + } + + public void deactivate() { + if (button != null && !button.isDisposed()) { + button.removeFocusListener(getButtonFocusListener()); + } + + super.deactivate(); + } + + @Override + protected void editOccured(ModifyEvent e) { + String text = this.text.getText(); + if (strValues == null || strValues.length == 0){ + strValues = new String[]{text}; + } else { + strValues[0] = text; + } + super.editOccured(e); + } + + protected Object doGetValue() { + return strValues; + } + + protected void doSetValue(Object value) { + if (value == null) { + value = ""; + this.strValues = new String[]{""}; + } else if (value.getClass().isArray()){ + this.strValues = (String[])value; + value = this.strValues[0]; + } + super.doSetValue(value); + } + + protected void updateContents(String[] value) { + if (text == null) { + return; + } + + String strVal = "";//$NON-NLS-1$ + if (value != null && value.length > 0) { + strVal = value[0]; + } + text.setText(strVal); + } + + private class DialogCellLayout extends Layout { + public void layout(Composite editor, boolean force) { + Rectangle bounds = editor.getClientArea(); + Point size = button.computeSize(SWT.DEFAULT, SWT.DEFAULT, force); + if (text != null) { + text.setBounds(0, 0, bounds.width - size.x, bounds.height); + } + button.setBounds(bounds.width - size.x, 0, size.x, bounds.height); + } + + public Point computeSize(Composite editor, int wHint, int hHint, + boolean force) { + if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT) { + return new Point(wHint, hHint); + } + Point contentsSize = text.computeSize(SWT.DEFAULT, SWT.DEFAULT, + force); + Point buttonSize = button.computeSize(SWT.DEFAULT, SWT.DEFAULT, + force); + // Just return the button width to ensure the button is not clipped + // if the label is long. + // The label will just use whatever extra width there is + Point result = new Point(buttonSize.x, Math.max(contentsSize.y, + buttonSize.y)); + return result; + } + } + + +} \ No newline at end of file Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java 2010-11-12 14:49:31 UTC (rev 26511) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/ConsoleConfigurationTest.java 2010-11-12 14:50:50 UTC (rev 26512) @@ -1,14 +1,31 @@ package org.hibernate.eclipse.console.test; +import java.lang.reflect.Field; +import java.util.Map; + import junit.framework.TestCase; +import org.hibernate.Hibernate; +import org.hibernate.Query; import org.hibernate.SessionFactory; +import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.Mappings; import org.hibernate.console.ConcoleConfigurationAdapter; import org.hibernate.console.ConsoleConfiguration; +import org.hibernate.console.ConsoleQueryParameter; import org.hibernate.console.HibernateConsoleRuntimeException; import org.hibernate.console.KnownConfigurations; +import org.hibernate.console.QueryInputModel; import org.hibernate.console.QueryPage; import org.hibernate.eclipse.console.test.launchcfg.TestConsoleConfigurationPreferences; +import org.hibernate.impl.AbstractQueryImpl; +import org.hibernate.mapping.Column; +import org.hibernate.mapping.KeyValue; +import org.hibernate.mapping.PrimaryKey; +import org.hibernate.mapping.Property; +import org.hibernate.mapping.RootClass; +import org.hibernate.mapping.SimpleValue; +import org.hibernate.mapping.Table; public class ConsoleConfigurationTest extends TestCase { @@ -99,7 +116,59 @@ QueryPage qp = consoleCfg.executeHQLQuery("from java.lang.Object --this is my comment"); //$NON-NLS-1$ assertNotNull(qp); } + + public void testHQLListParameters() throws SecurityException, NoSuchFieldException, IllegalArgumentException, IllegalAccessException { + consoleCfg.build(); + Configuration c = consoleCfg.getConfiguration(); + Mappings mappings = c.createMappings(); + RootClass rc = new RootClass(); + rc.setEntityName("java.awt.Button"); + rc.setClassName( "java.awt.Button" ); + Column column = new Column("label"); + PrimaryKey pk = new PrimaryKey(); + pk.addColumn(column); + Table table = new Table("faketable"); + rc.setTable(table); + table.addColumn(column); + table.setPrimaryKey(pk); + Property fakeProp = new Property(); + fakeProp.setName("label"); + SimpleValue sv = new SimpleValue(); + sv.addColumn(column); + sv.setTypeName("string"); + sv.setTable(table); + fakeProp.setValue(sv); + rc.setIdentifierProperty(fakeProp); + rc.setIdentifier((KeyValue) fakeProp.getValue()); + mappings.addClass(rc); + consoleCfg.buildSessionFactory(); + + ConsoleQueryParameter paramA = new ConsoleQueryParameter("a", Hibernate.INTEGER, + new Integer[]{new Integer(1), new Integer(2)}); + ConsoleQueryParameter paramB = new ConsoleQueryParameter("b", Hibernate.INTEGER, new Integer(3)); + ConsoleQueryParameter paramOrdered = new ConsoleQueryParameter("0", Hibernate.INTEGER, new Integer(4)); + QueryInputModel model = new QueryInputModel(); + model.addParameter(paramA); + model.addParameter(paramB); + model.addParameter(paramOrdered); + QueryPage qp = consoleCfg.executeHQLQuery("select count(*) from java.awt.Button where 1 in ( ?, :a, :b )", model); //$NON-NLS-1$ + assertNotNull(qp); + try{ + qp.getList();//execute the query + } catch (Exception e){ + //ignore - there is fake mapping + } + Field qField = qp.getClass().getDeclaredField("query"); + qField.setAccessible(true); + Query query = (Query) qField.get(qp); + assertTrue(query.getNamedParameters().length == 2); // a and b + Field listParam = AbstractQueryImpl.class.getDeclaredField("namedParameterLists"); + listParam.setAccessible(true); + Map namedParameterLists = (Map) listParam.get(query); + assertTrue(namedParameterLists.size() == 1);//"a" added as a list parameter + } + /*public void testCleanup() throws InterruptedException { for(int cnt=0;cnt<10000;cnt++) {

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r26511 - in trunk/seam/tests/org.jboss.tools.seam.core.test: projects/TestStorage and 12 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-11-12 09:49:31 -0500 (Fri, 12 Nov 2010) New Revision: 26511 Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.classpath trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.project trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/org.eclipse.jdt.core.prefs trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/org.eclipse.jst.common.project.facet.core.prefs trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/org.eclipse.wst.common.component trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/org.jboss.tools.seam.core.prefs trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/CustomAnnotation.java trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/InstallTest.java trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/Messages.properties trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/User.java trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/XYZ.component.xml trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/XYZImpl.java trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/META-INF/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/META-INF/MANIFEST.MF trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/classes/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/classes/demo/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/classes/demo/Messages.properties trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/classes/demo/User.class trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/components.xml trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/faces-config.xml trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/lib/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/lib/jboss-seam.1 trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/web.xml trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/index.jsp trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/pages/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/pages/hello.jsp trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/pages/inputUserName.jsp trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/seam.properties trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/ant/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/ant/build.properties trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/ant/build.xml trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamModelStorageTest.java Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java Log: JBIDE-7319 https://jira.jboss.org/browse/JBIDE-7319 Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.classpath =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.classpath (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.classpath 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="JavaSource"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v5.5"/> + <classpathentry kind="output" path="WebContent/WEB-INF/classes"/> +</classpath> Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.project =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.project (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.project 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>TestStorage</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.seam.core.seambuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.jboss.tools.jsf.jsfnature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.jboss.tools.seam.core.seamnature</nature> + </natures> +</projectDescription> Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/org.eclipse.jdt.core.prefs 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1,7 @@ +#Tue Jun 19 15:59:09 MSD 2007 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/org.eclipse.jst.common.project.facet.core.prefs =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/org.eclipse.jst.common.project.facet.core.prefs (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/org.eclipse.jst.common.project.facet.core.prefs 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1,4 @@ +#Tue Jun 19 15:59:10 MSD 2007 +classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER/owners=jst.java\:5.0 +classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5/owners=jst.web\:2.4 +eclipse.preferences.version=1 Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/org.eclipse.jst.common.project.facet.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/org.eclipse.wst.common.component 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> +<wb-module deploy-name="TestStorage"> +<wb-resource deploy-path="/" source-path="/WebContent"/> +<wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/> +<property name="context-root" value="TestStorage"/> +<property name="java-output-path" value="build/classes"/> +</wb-module> +</project-modules> Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/org.eclipse.wst.common.project.facet.core.xml 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <fixed facet="jst.jsf"/> + <fixed facet="jst.web"/> + <fixed facet="jst.seam"/> + <fixed facet="jst.java"/> + <installed facet="jst.java" version="5.0"/> + <installed facet="jst.web" version="2.5"/> + <installed facet="jst.jsf" version="1.2"/> + <installed facet="jst.seam" version="1.2"/> +</faceted-project> Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/org.jboss.tools.seam.core.prefs =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/org.jboss.tools.seam.core.prefs (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/org.jboss.tools.seam.core.prefs 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1,6 @@ +#Tue Oct 23 14:08:40 MSD 2007 +action.package=demo +eclipse.preferences.version=1 +model.package=demo +seam.project.connection.profile=DefaultDS +seam.project.deployment.type=war Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/.settings/org.jboss.tools.seam.core.prefs ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/CustomAnnotation.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/CustomAnnotation.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/CustomAnnotation.java 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1,31 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package demo; + +import org.jboss.seam.annotations.*; + +@Name("myCustomAnnotation") +public @interface CustomAnnotation { + + @Name("inner_JBIDE_4144") + public static class Inner { + private String innerName; + + public String getInnerName() { + return innerName; + } + + public void setInnerName(String s) { + innerName = s; + } + } + +} \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/CustomAnnotation.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/InstallTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/InstallTest.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/InstallTest.java 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1,28 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package demo; + +import javax.persistence.Entity; +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.*; +import org.jboss.seam.Component; + +/** + * Created by JBoss Developer Studio + */ + +@Name("installWithoutPrecedence_JBIDE_2052") +(a)Scope(ScopeType.APPLICATION) +@Entity +@Install(false) +public class InstallTest { + +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/InstallTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/Messages.properties =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/Messages.properties (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/Messages.properties 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1,3 @@ +header=Hello Demo Application +prompt_message=Name: +hello_message=Hello \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/Messages.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/User.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/User.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/User.java 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1,92 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package demo; + +import javax.persistence.Entity; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.*; +import org.jboss.seam.Component; + +/** + * Created by JBoss Developer Studio + */ + +@Name("myUser") +(a)Scope(ScopeType.APPLICATION) +@Entity +(a)Install(precedence=Install.FRAMEWORK) + +public class User { + + @Name("inner_JBIDE_1374") + public static class Inner { + private String innerName; + + public String getInnerName() { + return innerName; + } + + public void setInnerName(String s) { + innerName = s; + } + } + + private String name; + + @Out + private String address = ""; + + @In + private String payment = ""; + + /** + * @return User Name + */ + public String getName() { + return name; + } + + /** + * @param User Name + */ + public void setName(String name) { + this.name = name; + } + + public String getAddress() { + return address; + } + + public String getPayment() { + return payment; + } + + @Unwrap + public User unwrapMethod() { + return new User(); + } + + @Create @Destroy + public void createAndDestroyMethod(Component c) { + } + + @Factory(value="myFactory", scope=ScopeType.SESSION) + public User testFactory() { + return new User(); + } + + @Factory + public User getMyFactory2() { + return new User(); + } + +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/User.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/XYZ.component.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/XYZ.component.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/XYZ.component.xml 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component name="xyz" class="demo.XYZImpl" scope="application" + auto-create="true" + xmlns="http://jboss.com/products/seam/components" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.2.xsd"/> \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/XYZ.component.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/XYZImpl.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/XYZImpl.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/XYZImpl.java 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1,22 @@ +/******************************************************************************* + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package demo; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.*; + +/** + * Created by JBoss Developer Studio + */ + +public class XYZImpl { + +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/JavaSource/demo/XYZImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/META-INF/MANIFEST.MF 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/META-INF/MANIFEST.MF ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/classes/demo/Messages.properties =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/classes/demo/Messages.properties (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/classes/demo/Messages.properties 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1,3 @@ +header=Hello Demo Application +prompt_message=Name: +hello_message=Hello \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/classes/demo/Messages.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/classes/demo/User.class =================================================================== (Binary files differ) Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/classes/demo/User.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/components.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/components.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/components.xml 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1,45 @@ +<?xml version="1.0"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-1.2.xsd http://jboss.com/products/seam/core http://jboss.com/products/seam/core-1.2.xsd"> + <component class="java.lang.Boolean" name="myComponent" scope="page"> + <property name="property1">value1</property> + <property name="myList"> + <value>value1</value> + </property> + <property name="myMap"> + <key>key1</key> + <value>map value 1</value> + </property> + </component> + <core:managed-persistence-context name="myPersistenceContext1"/> + + <component class="demo.User"/> + + <core:resource-bundle> + <core:bundle-names> + <value>bundleA</value> + <value>bundleB</value> + </core:bundle-names> + </core:resource-bundle> + + <core:manager + conversation-is-long-running-parameter="a" + parent-conversation-id-parameter="b" + conversation-id-parameter="c" + concurrent-request-timeout="2" + conversation-timeout="3" + /> + + <core:ejb installed="true"/> + + <factory name="factory1" scope="conversation"/> + + <component class="java.lang.Boolean" name="duplicated"/> + <component class="java.lang.Boolean" name="duplicated"/> + + <component class="demo.CustomAnnotation" name="compWithPrecedence10" precedence="10"/> + <component class="demo.CustomAnnotation" name="compWithDefaultPrecedence"/> + <component class="demo.CustomAnnotation" name="compWithPrecedence20" precedence="20"/> + +</components> Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/components.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/faces-config.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/faces-config.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/faces-config.xml 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" + "http://java.sun.com/dtd/web-facesconfig_1_1.dtd"> +<faces-config> + <managed-bean> + <description>User Name Bean</description> + <managed-bean-name>user</managed-bean-name> + <managed-bean-class>demo.User</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>name</property-name> + <property-class>java.lang.String</property-class> + <value/> + </managed-property> + </managed-bean> + <navigation-rule> + <from-view-id>/pages/inputUserName.jsp</from-view-id> + <navigation-case> + <from-outcome>hello</from-outcome> + <to-view-id>/pages/hello.jsp</to-view-id> + </navigation-case> + </navigation-rule> +</faces-config> \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/faces-config.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/lib/jboss-seam.1 =================================================================== (Binary files differ) Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/lib/jboss-seam.1 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/web.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/web.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/web.xml 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1,26 @@ +<?xml version="1.0"?> +<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + <display-name>TestStorage</display-name> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + <listener> + <listener-class>com.sun.faces.config.ConfigureListener</listener-class> + </listener> +  + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> +  + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + <login-config> + <auth-method>BASIC</auth-method> + </login-config> +</web-app> Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/WEB-INF/web.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/index.jsp =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/index.jsp (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/index.jsp 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1,7 @@ +<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> + +<html> + <body> + <jsp:forward page="/pages/inputUserName.jsf" /> + </body> +</html> \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/index.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/pages/hello.jsp =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/pages/hello.jsp (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/pages/hello.jsp 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1,20 @@ +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> + +<f:loadBundle var="Message" basename="demo.Messages" /> + +<html> + <head> + <title>Hello!</title> + </head> + + <body> + <f:view> + <h3> + <h:outputText value="#{Message.hello_message}" />, + <h:outputText value="#{user.name}" />! + </h3> + </f:view> + </body> + +</html> \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/pages/hello.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/pages/inputUserName.jsp =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/pages/inputUserName.jsp (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/pages/inputUserName.jsp 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1,28 @@ +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> + +<f:loadBundle var="Message" basename="demo.Messages"/> + +<html> + <head> + <title>Input User Name Page</title> + </head> + <body> + + <f:view> + <h1><h:outputText value="#{Message.header}"/></h1> + + <h:messages style="color: red"/> + + <h:form id="greetingForm"> + <h:outputText value="#{Message.prompt_message}"/> + <h:inputText value="#{user.name}" required="true"> + <f:validateLength maximum="30" minimum="3"/> + </h:inputText> + + <h:commandButton action="hello" value="Say Hello!" /> + + </h:form> + </f:view> + </body> +</html> \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/pages/inputUserName.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/seam.properties =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/seam.properties (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/seam.properties 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1 @@ +org.jboss.seam.core.microcontainer.persistenceUnitName=MyPersistenceUnit \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/WebContent/seam.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/ant/build.properties =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/ant/build.properties (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/ant/build.properties 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1,3 @@ +# +#Tue Jun 19 15:59:08 MSD 2007 +classpath.external=C\:\\Documents and Settings\\glory\\runtime-RedHat_Seam\\.metadata\\.plugins\\org.jboss.tools.common.projecttemplates\\lib\\servlet\\2.4\\jsp-api.jar;C\:\\Documents and Settings\\glory\\runtime-RedHat_Seam\\.metadata\\.plugins\\org.jboss.tools.common.projecttemplates\\lib\\servlet\\2.4\\servlet-api.jar; Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/ant/build.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/ant/build.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/ant/build.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/ant/build.xml 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1,74 @@ +<project name="KickStart" default="deploy" basedir="../"> + +  + <property file="${basedir}/ant/build.properties" /> + + <property name="project.name" value="KickStart" /> + <property name="web.content.dir" value="${basedir}/WebContent" /> + <property name="web-inf.dir" value="${web.content.dir}/WEB-INF" /> + <property name="build.dir" value="build" /> + <property name="war.name" value="${build.dir}/${project.name}.war" /> + +  + <property name="deploy.dir" value="deploy" /> + +  + <path id="compile.classpath"> + <fileset dir="${webinf.dir}/lib"> + <include name="**/*.jar" /> + </fileset> + <pathelement path="${classpath}" /> + <pathelement path="${classpath.external}" /> + <pathelement path="${webinf.dir}/classes" /> + </path> + +  + <target name="copyResources"> + <copy todir="${web-inf.dir}/classes" includeEmptyDirs="no"> + <fileset dir="JavaSource"> + <patternset> + <include name="**/*.*" /> + <exclude name="**/*.java" /> + </patternset> + </fileset> + </copy> + </target> + +  + <target name="prepare"> + <tstamp /> + </target> + +  + <target name="clean" description="Prepare for clean build"> + <delete dir="${web-inf.dir}/classes" failonerror="false"/> + <mkdir dir="${web-inf.dir}/classes" /> + </target> + +  + <target name="compile" depends="prepare, copyResources"> + <javac srcdir="JavaSource" destdir="${web-inf.dir}/classes"> + <classpath refid="compile.classpath" /> + </javac> + </target> + +  + <target name="build" depends="prepare, compile" /> + +  + <target name="rebuild" depends="clean, prepare, compile" /> + +  + <target name="war" depends="build"> + <mkdir dir="${build.dir}" /> + <war warfile="${war.name}" basedir="${web.content.dir}" webxml="${web-inf.dir}/web.xml"> + <exclude name="WEB-INF/web.xml" /> + </war> + </target> + + <target name="deploy" depends="war"> + <delete dir="${deploy.dir}/${project.name}" failonerror="false"/> + <copy file="${war.name}" todir="${deploy.dir}" /> + </target> + +</project> \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestStorage/ant/build.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2010-11-12 14:03:40 UTC (rev 26510) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2010-11-12 14:49:31 UTC (rev 26511) @@ -35,6 +35,7 @@ TestSuite suite = new TestSuite(); suite.setName("All tests for " + PLUGIN_ID); suite.addTest(new ProjectImportTestSetup(new TestSuite(ScannerTest.class),"org.jboss.tools.seam.core.test","projects/TestScanner","TestScanner")); + suite.addTest(new ProjectImportTestSetup(new TestSuite(SeamModelStorageTest.class),"org.jboss.tools.seam.core.test","projects/TestStorage","TestStorage")); suite.addTestSuite(SerializationTest.class); suite.addTestSuite(SeamBigProjectTest.class); suite.addTestSuite(SeamEARTest.class); Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamModelStorageTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamModelStorageTest.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamModelStorageTest.java 2010-11-12 14:49:31 UTC (rev 26511) @@ -0,0 +1,68 @@ +package org.jboss.tools.seam.core.test; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IncrementalProjectBuilder; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.jboss.tools.jst.web.kb.KbProjectFactory; +import org.jboss.tools.jst.web.kb.internal.KbProject; +import org.jboss.tools.jst.web.kb.taglib.ITagLibrary; +import org.jboss.tools.seam.core.SeamCorePlugin; +import org.jboss.tools.seam.internal.core.SeamProject; +import org.jboss.tools.test.util.JobUtils; + +public class SeamModelStorageTest extends TestCase { + IProject project = null; + + public SeamModelStorageTest() { + super("Seam Model Storage Test"); + } + + public void setUp() throws Exception { + project = ResourcesPlugin.getWorkspace().getRoot().getProject("TestStorage"); + assertNotNull("Can't load TestStorage", project); //$NON-NLS-1$ + } + + public void testStorage() throws Exception { + SeamProject seam = (SeamProject)SeamCorePlugin.getSeamProject(project, true); + assertNotNull(seam); + int mod = seam.getModificationsSinceLastStore(); + System.out.println("-->" + mod); + assertTrue("Modification index after load must be greater than 0", mod > 0); + + seam.store(); + mod = seam.getModificationsSinceLastStore(); + System.out.println("-->" + mod); + assertEquals("Modification index after store must be cleared", 0, mod); + + IFile fromFile = project.getFile(new Path("WebContent/WEB-INF/lib/jboss-seam.1")); + IFile toFile = project.getFile(new Path("WebContent/WEB-INF/lib/jboss-seam.jar")); + + toFile.create(fromFile.getContents(), true, new NullProgressMonitor()); + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + JobUtils.waitForIdle(); + project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + JobUtils.waitForIdle(); + project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); + JobUtils.waitForIdle(); + + mod = seam.getModificationsSinceLastStore(); + System.out.println("-->" + mod); + assertTrue("Modification index after adding new library must be greater than 0", mod > 0); + } + +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamModelStorageTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r26510 - 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-12 09:03:40 -0500 (Fri, 12 Nov 2010) New Revision: 26510 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformInstanceActionThread.java Log: [JBIDE-7365] split code into several methods Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformInstanceActionThread.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformInstanceActionThread.java 2010-11-12 13:59:21 UTC (rev 26509) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformInstanceActionThread.java 2010-11-12 14:03:40 UTC (rev 26510) @@ -53,26 +53,9 @@ // To handle the user starting a new action when we haven't // confirmed the last one yet, // cancel the previous job and then go on performing this action - Job job = cloud.getActionJob(id); - if (job != null) { - job.cancel(); - try { - job.join(); - } catch (InterruptedException e) { - // do nothing, this is ok - } - } + cancelPreviousJob(id); cloud.performInstanceAction(id, action); - while (instance != null && expectedState != null - && !(instance.getState().equals(expectedState)) - && !(instance.getState().equals(DeltaCloudInstance.TERMINATED))) { - instance = cloud.refreshInstance(id); - try { - Thread.sleep(300); - } catch (InterruptedException e) { - break; - } - } + waitForInstanceState(id); } catch (DeltaCloudException e) { final IStatus status = StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e); Activator.log(status); @@ -93,4 +76,29 @@ } return Status.OK_STATUS; } + + private void cancelPreviousJob(String id) { + Job job = cloud.getActionJob(id); + if (job != null) { + job.cancel(); + try { + job.join(); + } catch (InterruptedException e) { + // do nothing, this is ok + } + } + } + + private void waitForInstanceState(String id) { + while (instance != null && expectedState != null + && !(instance.getState().equals(expectedState)) + && !(instance.getState().equals(DeltaCloudInstance.TERMINATED))) { + instance = cloud.refreshInstance(id); + try { + Thread.sleep(300); + } catch (InterruptedException e) { + break; + } + } + } }

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r26509 - trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test.

by jbosstools-commits＠lists.jboss.org

Author: vrubezhny Date: 2010-11-12 08:59:21 -0500 (Fri, 12 Nov 2010) New Revision: 26509 Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java Log: JBIDE-7492 org.jboss.tools.jsf.jsp.ca.test.JsfJspJbide6259Test error WaitForIdle is fixed due to increase the TIMEOUT Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java 2010-11-12 13:58:12 UTC (rev 26508) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java 2010-11-12 13:59:21 UTC (rev 26509) @@ -27,7 +27,7 @@ public class TestUtil { /** The Constant MAX_IDLE. */ - public static final long MAX_IDLE = 15*1000L; + public static final long MAX_IDLE = 5*60*1000L; /** * Returns the CA Processor from content assistant for the given offset in the document.

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r26508 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-11-12 08:58:12 -0500 (Fri, 12 Nov 2010) New Revision: 26508 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/AddJSFCapabilitiesTest.java Log: JBIDE-7564 https://jira.jboss.org/browse/JBIDE-7564 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/AddJSFCapabilitiesTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/AddJSFCapabilitiesTest.java 2010-11-12 13:55:49 UTC (rev 26507) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/AddJSFCapabilitiesTest.java 2010-11-12 13:58:12 UTC (rev 26508) @@ -12,6 +12,7 @@ import org.eclipse.core.runtime.Path; import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.ui.IPerspectiveDescriptor; import org.eclipse.ui.PlatformUI; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IRuntimeType; @@ -65,6 +66,9 @@ } public void testAddJSFCapabilities() { + IPerspectiveDescriptor p = PlatformUI.getWorkbench().getPerspectiveRegistry().findPerspectiveWithId("org.jboss.tools.jst.web.ui.WebDevelopmentPerspective"); + if(p != null) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().setPerspective(p); + ImportWebProjectWizard wizard = (ImportWebProjectWizard)new Act().getWizard(project); WizardDialog dialog = new WizardDialog( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), @@ -90,6 +94,8 @@ IFile f = project.getFile(new Path(".settings/org.eclipse.wst.common.project.facet.core.xml")); assertNotNull(f); assertTrue(f.exists()); + + dialog.close(); } static String RUNTIME = "org.eclipse.jst.server.tomcat.runtime.60";

15 years, 5 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits November 2010