December 2011 - jbosstools-commits

JBoss Tools SVN: r37532 - in trunk/download.jboss.org/jbosstools/updates/requirements: indigo and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-12-22 12:40:37 -0500 (Thu, 22 Dec 2011) New Revision: 37532 Modified: trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml Log: pull newer Indigo SR2 bits (JBIDE-10289) Modified: trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml 2011-12-22 17:39:07 UTC (rev 37531) +++ trunk/download.jboss.org/jbosstools/updates/requirements/eclipse/build.xml 2011-12-22 17:40:37 UTC (rev 37532) @@ -16,13 +16,13 @@ -f ~/RHDS/updates/requirements/eclipse/build.xml -Ddestination=/tmp/eclipse-repo --> <target name="mirror"> - <property name="URL" value="http://download.eclipse.org/eclipse/updates/3.7.x/M20111201-1437/" /> + <property name="URL" value="http://download.eclipse.org/eclipse/updates/3.7.x/M20111214-1406/" /> <property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/eclipse/" /> <property name="compress" value="true" /> <p2.mirror> - <repository location="file:${destination}/3.7.2.M20111201-1437/" name="Eclipse 3.7" /> + <repository location="file:${destination}/3.7.2.M20111214-1406/" name="Eclipse 3.7" /> <source> <repository location="${URL}" /> </source> @@ -30,6 +30,6 @@ <slicingOptions includeFeatures="true" followStrict="true" /> </p2.mirror> - <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.7.2.M20111201-1437/" artifactRepository="file:${destination}/3.7.2.M20111201-1437/" publishartifacts="true" source="${destination}/3.7.2.M20111201-1437/" compress="${compress}" /> + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/3.7.2.M20111214-1406/" artifactRepository="file:${destination}/3.7.2.M20111214-1406/" publishartifacts="true" source="${destination}/3.7.2.M20111214-1406/" compress="${compress}" /> </target> </project> Modified: trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml 2011-12-22 17:39:07 UTC (rev 37531) +++ trunk/download.jboss.org/jbosstools/updates/requirements/indigo/build.xml 2011-12-22 17:40:37 UTC (rev 37532) @@ -23,7 +23,7 @@ <property name="compress" value="true" /> <p2.mirror> - <repository location="file:${destination}/201112121340-SR1-M/" name="Indigo 201112121340-SR1-M" /> + <repository location="file:${destination}/201112221140-SR1-M/" name="Indigo 201112221140-SR1-M" /> <source> <repository location="${URL}" /> </source> @@ -31,6 +31,6 @@ <slicingOptions includeFeatures="true" followStrict="true" /> </p2.mirror> - <p2.publish.featuresAndBundles metadataRepository="file:${destination}/201112121340-SR1-M/" artifactRepository="file:${destination}/201112121340-SR1-M/" publishartifacts="true" source="${destination}/201112121340-SR1-M/" compress="${compress}" /> + <p2.publish.featuresAndBundles metadataRepository="file:${destination}/201112221140-SR1-M/" artifactRepository="file:${destination}/201112221140-SR1-M/" publishartifacts="true" source="${destination}/201112221140-SR1-M/" compress="${compress}" /> </target> </project>

13 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r37531 - in trunk/download.jboss.org/jbosstools/updates/development/indigo: soa-tooling and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-12-22 12:39:07 -0500 (Thu, 22 Dec 2011) New Revision: 37531 Modified: trunk/download.jboss.org/jbosstools/updates/development/indigo/compositeA... trunk/download.jboss.org/jbosstools/updates/development/indigo/compositeC... trunk/download.jboss.org/jbosstools/updates/development/indigo/soa-toolin... trunk/download.jboss.org/jbosstools/updates/development/indigo/soa-toolin... Log: release M5 to dev milestone site Modified: trunk/download.jboss.org/jbosstools/updates/development/indigo/compositeA... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/development/indigo/compositeA... 2011-12-22 15:41:43 UTC (rev 37530) +++ trunk/download.jboss.org/jbosstools/updates/development/indigo/compositeA... 2011-12-22 17:39:07 UTC (rev 37531) @@ -7,9 +7,9 @@ get new time w/ date +%s000 --> -<property name='p2.timestamp' value='1320783117000'/> +<property name='p2.timestamp' value='1324575266000'/> </properties> <children size='1'> -<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.M4/'/> +<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.M5.core/'/> </children> </repository> Modified: trunk/download.jboss.org/jbosstools/updates/development/indigo/compositeC... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/development/indigo/compositeC... 2011-12-22 15:41:43 UTC (rev 37530) +++ trunk/download.jboss.org/jbosstools/updates/development/indigo/compositeC... 2011-12-22 17:39:07 UTC (rev 37531) @@ -7,9 +7,9 @@ get new time w/ date +%s000 --> -<property name='p2.timestamp' value='1320783117000'/> +<property name='p2.timestamp' value='1324575270000'/> </properties> <children size='1'> -<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.M4/'/> +<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.M5.core/'/> </children> </repository> Modified: trunk/download.jboss.org/jbosstools/updates/development/indigo/soa-toolin... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/development/indigo/soa-toolin... 2011-12-22 15:41:43 UTC (rev 37530) +++ trunk/download.jboss.org/jbosstools/updates/development/indigo/soa-toolin... 2011-12-22 17:39:07 UTC (rev 37531) @@ -7,9 +7,9 @@ get new time w/ date +%s000 --> -<property name='p2.timestamp' value='1320783117000'/> +<property name='p2.timestamp' value='1324575282000'/> </properties> <children size='1'> -<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.M4.soa-tooling'/> +<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.M5.soa-tooling'/> </children> </repository> Modified: trunk/download.jboss.org/jbosstools/updates/development/indigo/soa-toolin... =================================================================== --- trunk/download.jboss.org/jbosstools/updates/development/indigo/soa-toolin... 2011-12-22 15:41:43 UTC (rev 37530) +++ trunk/download.jboss.org/jbosstools/updates/development/indigo/soa-toolin... 2011-12-22 17:39:07 UTC (rev 37531) @@ -7,9 +7,9 @@ get new time w/ date +%s000 --> -<property name='p2.timestamp' value='1320783117000'/> +<property name='p2.timestamp' value='1324575286000'/> </properties> <children size='1'> -<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.M4.soa-tooling'/> +<child location='http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.M5.soa-tooling'/> </children> </repository>

13 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r37530 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-12-22 10:41:43 -0500 (Thu, 22 Dec 2011) New Revision: 37530 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationOperation.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AddToExistingProjectOperation.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProjectOperation.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizard.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizardModel.java Log: [JBIDE-10549] implemented reporting of subtask when importing new project/enabling existing project. Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationOperation.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationOperation.java 2011-12-22 14:40:21 UTC (rev 37529) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationOperation.java 2011-12-22 15:41:43 UTC (rev 37530) @@ -27,7 +27,6 @@ import org.eclipse.osgi.util.NLS; import com.openshift.express.client.IApplication; -import com.openshift.express.client.IUser; import com.openshift.express.client.OpenShiftException; /** @@ -40,14 +39,11 @@ private String projectName; private IApplication application; private String remoteName; - private IUser user; - public AbstractImportApplicationOperation(String projectName, IApplication application, String remoteName, - IUser user) { + public AbstractImportApplicationOperation(String projectName, IApplication application, String remoteName) { this.projectName = projectName; this.application = application; this.remoteName = remoteName; - this.user = user; } /** Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AddToExistingProjectOperation.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AddToExistingProjectOperation.java 2011-12-22 14:40:21 UTC (rev 37529) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AddToExistingProjectOperation.java 2011-12-22 15:41:43 UTC (rev 37530) @@ -41,7 +41,7 @@ public AddToExistingProjectOperation(String projectName, IApplication application, String remoteName, IUser user) { - super(projectName, application, remoteName, user); + super(projectName, application, remoteName); } /** Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProjectOperation.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProjectOperation.java 2011-12-22 14:40:21 UTC (rev 37529) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProjectOperation.java 2011-12-22 15:41:43 UTC (rev 37530) @@ -31,7 +31,6 @@ import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.project.MavenProjectImportOperation; import com.openshift.express.client.IApplication; -import com.openshift.express.client.IUser; import com.openshift.express.client.OpenShiftException; /** @@ -42,8 +41,8 @@ private File cloneDestination; public ImportNewProjectOperation(String projectName, IApplication application, String remoteName, - File cloneDestination, IUser user) { - super(projectName, application, remoteName, user); + File cloneDestination) { + super(projectName, application, remoteName); this.cloneDestination = cloneDestination; } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizard.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizard.java 2011-12-22 14:40:21 UTC (rev 37529) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizard.java 2011-12-22 15:41:43 UTC (rev 37530) @@ -13,7 +13,7 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.net.URISyntaxException; -import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import org.eclipse.core.resources.WorkspaceJob; @@ -30,6 +30,8 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; +import org.jboss.tools.common.ui.DelegatingProgressMonitor; +import org.jboss.tools.common.ui.JobUtils; import org.jboss.tools.common.ui.WizardUtils; import org.jboss.tools.openshift.express.internal.ui.ImportFailedException; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; @@ -59,70 +61,12 @@ @Override public boolean performFinish() { try { - final ArrayBlockingQueue<IStatus> queue = new ArrayBlockingQueue<IStatus>(1); - WizardUtils.runInWizard( - new WorkspaceJob("Importing project to workspace...") { - - @Override - public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException { - IStatus status = Status.OK_STATUS; - status = performOperations(monitor, status); - if (!status.isOK()) { - OpenShiftUIActivator.log(status); - } - queue.offer(status); - return status; - } - - private IStatus performOperations(IProgressMonitor monitor, IStatus status) { - try { - if (model.isNewProject()) { - model.importProject(monitor); - } else { - if (!askForConfirmation(model.getApplicationName(), model.getProjectName())) { - return Status.CANCEL_STATUS; - } - model.addToExistingProject(monitor); - } - return Status.OK_STATUS; - } catch (final WontOverwriteException e) { - openWarning("Project already present", e.getMessage()); - return Status.CANCEL_STATUS; - } catch (final ImportFailedException e) { - return OpenShiftUIActivator.createErrorStatus( - "Could not import maven project {0}.", e, - model.getProjectName()); - } catch (IOException e) { - return OpenShiftUIActivator.createErrorStatus( - "Could not copy openshift configuration files to project {0}", e, - model.getProjectName()); - } catch (OpenShiftException e) { - return OpenShiftUIActivator.createErrorStatus( - "Could not import project to the workspace.", e); - } catch (URISyntaxException e) { - return OpenShiftUIActivator.createErrorStatus( - "The url of the remote git repository is not valid", e); - } catch (InvocationTargetException e) { - if (isTransportException(e)) { - TransportException te = getTransportException(e); - return OpenShiftUIActivator - .createErrorStatus( - "Could not clone the repository. Authentication failed.\n" - + " Please make sure that you added your private key to the ssh preferences.", - te); - } else { - return OpenShiftUIActivator.createErrorStatus( - "An exception occurred while creating local git repository.", e); - } - } catch (Exception e) { - return OpenShiftUIActivator.createErrorStatus( - "Could not import project to the workspace.", e); - } - } - }, getContainer()); - IStatus status = queue.poll(10, TimeUnit.SECONDS); - return status != null - && status.isOK(); + final DelegatingProgressMonitor delegatingMonitor = new DelegatingProgressMonitor(); + Future<IStatus> jobResult = + WizardUtils.runInWizard( + new ImportJob(delegatingMonitor), + delegatingMonitor, getContainer()); + return JobUtils.isOk(jobResult.get(10, TimeUnit.SECONDS)); } catch (Exception e) { ErrorDialog.openError(getShell(), "Error", "Could not create local git repository.", new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, @@ -132,19 +76,21 @@ } private boolean askForConfirmation(final String applicationName, final String projectName) { - final boolean[] confirmed = new boolean[1]; + final boolean[] confirmed = new boolean[1]; getShell().getDisplay().syncExec(new Runnable() { @Override public void run() { - confirmed[0] = MessageDialog.openConfirm(getShell(), - NLS.bind("Import OpenShift Application ", applicationName), + confirmed[0] = MessageDialog.openConfirm(getShell(), + NLS.bind("Import OpenShift Application ", applicationName), NLS.bind( "OpenShift application {0} will be enabled on project {1} by copying OpenShift " + - "configuration and enable Git for the project.\n " + - "This cannot be undone. Do you wish to continue ?", applicationName, projectName)); - }}); - return confirmed[0]; + "configuration and enable Git for the project.\n " + + "This cannot be undone. Do you wish to continue ?", applicationName, + projectName)); + } + }); + return confirmed[0]; } private void openWarning(final String title, final String message) { @@ -176,4 +122,70 @@ } return null; } + + /** + * A workspace job that will create a new project or enable the selected + * project to be used with OpenShift. + */ + private class ImportJob extends WorkspaceJob { + + private DelegatingProgressMonitor delegatingMonitor; + + public ImportJob(DelegatingProgressMonitor delegatingMonitor) { + super("Importing project to workspace..."); + this.delegatingMonitor = delegatingMonitor; + } + + @Override + public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException { + try { + delegatingMonitor.add(monitor); + + if (model.isNewProject()) { + model.importProject(delegatingMonitor); + } else { + if (!askForConfirmation(model.getApplicationName(), model.getProjectName())) { + return Status.CANCEL_STATUS; + } + model.addToExistingProject(delegatingMonitor); + } + + return Status.OK_STATUS; + } catch (final WontOverwriteException e) { + openWarning("Project already present", e.getMessage()); + return Status.CANCEL_STATUS; + } catch (final ImportFailedException e) { + return OpenShiftUIActivator.createErrorStatus( + "Could not import maven project {0}.", e, + model.getProjectName()); + } catch (IOException e) { + return OpenShiftUIActivator.createErrorStatus( + "Could not copy openshift configuration files to project {0}", e, + model.getProjectName()); + } catch (OpenShiftException e) { + return OpenShiftUIActivator.createErrorStatus( + "Could not import project to the workspace.", e); + } catch (URISyntaxException e) { + return OpenShiftUIActivator.createErrorStatus( + "The url of the remote git repository is not valid", e); + } catch (InvocationTargetException e) { + if (isTransportException(e)) { + TransportException te = getTransportException(e); + return OpenShiftUIActivator + .createErrorStatus( + "Could not clone the repository. Authentication failed.\n" + + " Please make sure that you added your private key to the ssh preferences.", + te); + } else { + return OpenShiftUIActivator.createErrorStatus( + "An exception occurred while creating local git repository.", e); + } + } catch (Exception e) { + return OpenShiftUIActivator.createErrorStatus( + "Could not import project to the workspace.", e); + } finally { + delegatingMonitor.done(); + } + } + } } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizardModel.java 2011-12-22 14:40:21 UTC (rev 37529) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizardModel.java 2011-12-22 15:41:43 UTC (rev 37530) @@ -68,8 +68,8 @@ List<IProject> importedProjects = new ImportNewProjectOperation(getProjectName() , getApplication() , getRemoteName() - , getRepositoryFile() - , getUser()).execute(monitor); + , getRepositoryFile()) + .execute(monitor); createServerAdapter(monitor, importedProjects); } @@ -232,7 +232,7 @@ public String getMode() { return (String) getProperty(AdapterWizardPageModel.MODE); } - + public boolean isCreateServer() { Boolean isCreateServer = (Boolean) getProperty(CREATE_SERVER); return isCreateServer != null

13 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r37529 - trunk/documentation/whatsnew/hibernate.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2011-12-22 09:40:21 -0500 (Thu, 22 Dec 2011) New Revision: 37529 Modified: trunk/documentation/whatsnew/hibernate/hibernate-news-3.5.0.M5.html Log: Fixed small misprint Modified: trunk/documentation/whatsnew/hibernate/hibernate-news-3.5.0.M5.html =================================================================== --- trunk/documentation/whatsnew/hibernate/hibernate-news-3.5.0.M5.html 2011-12-22 14:07:21 UTC (rev 37528) +++ trunk/documentation/whatsnew/hibernate/hibernate-news-3.5.0.M5.html 2011-12-22 14:40:21 UTC (rev 37529) @@ -43,7 +43,7 @@ You can now choose which version of Hibernate you want to use, Hibernate 3.5 or 4.0. - Be ware that Hibernate 4.0 support is still experimental and not *all* + Be aware that Hibernate 4.0 support is still experimental and not *all* operations/features are Hibernate 4 enabled yet, but we include it so you can give feedback/report issues for this to make the support more complete.

13 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r37528 - in trunk/hibernatetools/plugins: org.jboss.tools.hibernate4_0 and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2011-12-22 09:07:21 -0500 (Thu, 22 Dec 2011) New Revision: 37528 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryParametersPage.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/.classpath trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/QueryExecutor.java Log: https://issues.jboss.org/browse/JBIDE-10559 Load hibernate type in HibernateExtension classloader (in this case Type from Hibernate4 will be used ) 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 2011-12-22 14:05:03 UTC (rev 37527) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/views/QueryParametersPage.java 2011-12-22 14:07:21 UTC (rev 37528) @@ -308,7 +308,7 @@ } CellEditor[] editors = new CellEditor[columnProperties.length]; editors[0] = new TextCellEditor( queryParametersTable ); - editors[1] = new ComboBoxCellEditor( queryParametersTable, valueTypes ); + editors[1] = new ComboBoxCellEditor( queryParametersTable, valueTypes, SWT.READ_ONLY ); editors[2] = new StringArrayDialogCellEditor(queryParametersTable) { private Button b; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/.classpath =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/.classpath 2011-12-22 14:05:03 UTC (rev 37527) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/.classpath 2011-12-22 14:07:21 UTC (rev 37528) @@ -7,14 +7,14 @@ <classpathentry exported="true" kind="lib" path="lib/required/commons-collections-3.2.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/required/dom4j-1.6.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/required/hibernate-commons-annotations-4.0.0.Final.jar"/> - <classpathentry exported="true" kind="lib" path="lib/required/hibernate-core-4.0.0.CR6.jar" sourcepath="/home/eskimo/Downloads/hibernate-release-4.0.0.CR6/project"/> + <classpathentry exported="true" kind="lib" path="lib/required/hibernate-core-4.0.0.CR6.jar" sourcepath="C:/dev/Libs/hibernate-release-4.0.0.CR6/project"/> <classpathentry exported="true" kind="lib" path="lib/required/hibernate-jpa-2.0-api-1.0.1.Final.jar"/> <classpathentry exported="true" kind="lib" path="lib/required/jandex-1.0.3.Final.jar"/> <classpathentry exported="true" kind="lib" path="lib/required/javassist-3.12.1.GA.jar"/> <classpathentry exported="true" kind="lib" path="lib/required/jboss-logging-3.1.0.CR1.jar"/> <classpathentry exported="true" kind="lib" path="lib/required/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/> <classpathentry exported="true" kind="lib" path="lib/tools/freemarker.jar"/> - <classpathentry exported="true" kind="lib" path="lib/tools/hibernate-tools-3.5.0.Beta.jar" sourcepath="C:/dev/workspaces/RedHat/_Git/dgeraskov/hibernate-tools/src"/> + <classpathentry exported="true" kind="lib" path="lib/tools/hibernate-tools-3.5.0.Beta.jar" sourcepath="C:/dev/workspaces/RedHat/_Git/dgeraskov2/hibernate-tools/src"/> <classpathentry exported="true" kind="lib" path="lib/tools/jtidy-r8-20060801.jar"/> <classpathentry exported="true" kind="lib" path="lib/bsh-core-2.0b4.jar"/> <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.15.jar"/> Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java 2011-12-22 14:05:03 UTC (rev 37527) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java 2011-12-22 14:07:21 UTC (rev 37528) @@ -76,7 +76,7 @@ try { try { session = sessionFactory.openSession(); - return QueryExecutor.executeHQLQuery(session, hql, queryParameters); + return QueryExecutor.executeHQLQuery(this, session, hql, queryParameters); } catch (Throwable e){ //Incompatible library versions could throw subclasses of Error, like AbstractMethodError //may be there is a sense to say to user that the reason is probably a wrong CC version Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/QueryExecutor.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/QueryExecutor.java 2011-12-22 14:05:03 UTC (rev 37527) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/QueryExecutor.java 2011-12-22 14:07:21 UTC (rev 37528) @@ -22,11 +22,15 @@ import org.hibernate.Session; import org.hibernate.console.ConsoleMessages; import org.hibernate.console.ConsoleQueryParameter; +import org.hibernate.console.HibernateConsoleRuntimeException; import org.hibernate.console.QueryInputModel; +import org.hibernate.console.execution.ExecutionContext.Command; import org.hibernate.console.ext.HibernateException; +import org.hibernate.console.ext.HibernateExtension; import org.hibernate.console.ext.QueryResult; import org.hibernate.console.ext.QueryResultImpl; import org.hibernate.engine.spi.SessionImplementor; +import org.hibernate.internal.util.ReflectHelper; import org.hibernate.type.Type; import bsh.EvalError; @@ -38,15 +42,23 @@ */ public class QueryExecutor { - public static QueryResult executeHQLQuery(Session session, String hql, - QueryInputModel queryParameters) { + public static QueryResult executeHQLQuery(HibernateExtension hibernateExtension, Session session, String hql, + final QueryInputModel queryParameters) { - Query query = session.createQuery(hql); + final Query query = session.createQuery(hql); List<Object> list = Collections.emptyList(); long queryTime = 0; list = new ArrayList<Object>(); - setupParameters(query, queryParameters); + hibernateExtension.execute(new Command() { + + @Override + public Object execute() { + setupParameters(query, queryParameters); + return null; + } + }); + long startTime = System.currentTimeMillis(); QueryResultImpl result = new QueryResultImpl(list, queryTime); @@ -155,22 +167,36 @@ for (int i = 0; i < qp.length; i++) { ConsoleQueryParameter parameter = qp[i]; + String typeName = parameter.getType().getClass().getName(); try { int pos = Integer.parseInt(parameter.getName()); //FIXME no method to set positioned list value - query2.setParameter(pos, calcValue( parameter ), parameter.getType()); + query2.setParameter(pos, calcValue( parameter ), convertToType(typeName)); } catch(NumberFormatException nfe) { Object value = parameter.getValue(); if (value != null && value.getClass().isArray()){ Object[] values = (Object[])value; - query2.setParameterList(parameter.getName(), Arrays.asList(values), parameter.getType()); + query2.setParameterList(parameter.getName(), Arrays.asList(values), convertToType(typeName)); } else { - query2.setParameter(parameter.getName(), calcValue( parameter ), parameter.getType()); + query2.setParameter(parameter.getName(), calcValue( parameter ), convertToType(typeName)); } } } } + /** + * Method converts Hibernate3 to Hibernate4 classes + * @param typeClassName + * @return + */ + private static Type convertToType(String typeClassName){ + try { + return (Type) ReflectHelper.classForName(typeClassName).newInstance(); + } catch (Exception e) { + throw new HibernateConsoleRuntimeException("Can't instantiate hibernate type " + typeClassName, e); + } + } + private static Object calcValue(ConsoleQueryParameter parameter) { return parameter.getValueForQuery(); }

13 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r37527 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test: example and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: ljelinko Date: 2011-12-22 09:05:03 -0500 (Thu, 22 Dec 2011) New Revision: 37527 Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleRuntime4xTest.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleRuntime5xTest.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleRuntime4x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleRuntime5x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JavaPortletExampleRuntime4x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/RichFacesPortletExampleRuntime5x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime4x.java Removed: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExample.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JavaPortletExample.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExample.java Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleTest.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/ExamplesSuite.java Log: Created example tests for 5x runtime Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java 2011-12-22 14:03:51 UTC (rev 37526) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java 2011-12-22 14:05:03 UTC (rev 37527) @@ -4,9 +4,11 @@ import org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletProject; import org.jboss.tools.portlet.ui.bot.test.core.LoadJavaPortletInBrowserRuntime4x; import org.jboss.tools.portlet.ui.bot.test.core.RunJavaPortletOnServer; -import org.jboss.tools.portlet.ui.bot.test.example.JSFPortletExample; -import org.jboss.tools.portlet.ui.bot.test.example.JavaPortletExample; -import org.jboss.tools.portlet.ui.bot.test.example.SeamPortletExample; +import org.jboss.tools.portlet.ui.bot.test.example.JSFPortletExampleRuntime4x; +import org.jboss.tools.portlet.ui.bot.test.example.JSFPortletExampleRuntime5x; +import org.jboss.tools.portlet.ui.bot.test.example.JavaPortletExampleRuntime4x; +import org.jboss.tools.portlet.ui.bot.test.example.RichFacesPortletExampleRuntime5x; +import org.jboss.tools.portlet.ui.bot.test.example.SeamPortletExampleRuntime4x; import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletProject; import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletRuntime4x; import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletRuntime5x; @@ -34,9 +36,11 @@ CreateSeamPortletRuntime4x.class, CreateSeamPortletRuntime5x.class, RunSeamPortletOnServer.class, - JavaPortletExample.class, - JSFPortletExample.class, - SeamPortletExample.class + JavaPortletExampleRuntime4x.class, + JSFPortletExampleRuntime4x.class, + SeamPortletExampleRuntime4x.class, + JSFPortletExampleRuntime5x.class, + RichFacesPortletExampleRuntime5x.class }) public class AllTestsSuite { Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleRuntime4xTest.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleRuntime4xTest.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleRuntime4xTest.java 2011-12-22 14:05:03 UTC (rev 37527) @@ -0,0 +1,33 @@ +package org.jboss.tools.portlet.ui.bot.test.example; + +import static org.jboss.tools.portlet.ui.bot.matcher.factory.PortletMatchersFactory.canLoadAt4xRuntime; + +import org.jboss.tools.portlet.ui.bot.entity.PortletDefinition; +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.ServerState; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; + +/** + * Common ancestor for example projects tests for 4x runtime. + * + * @author Lucia Jelinkova + * + */ +@Require(server=@Server(version="4.3", state=ServerState.Running, type=ServerType.EPP)) +public abstract class AbstractPortletExampleRuntime4xTest extends + AbstractPortletExampleTest { + + protected abstract PortletDefinition getPortletDefinition(); + + @Override + protected void executeExample() { + super.executeExample(); + doAssertThatInWorkspace(getPortletDefinition(), canLoadAt4xRuntime()); + } + + @Override + public String getExampleCategory() { + return "Portlet"; + } +} Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleRuntime5xTest.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleRuntime5xTest.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleRuntime5xTest.java 2011-12-22 14:05:03 UTC (rev 37527) @@ -0,0 +1,22 @@ +package org.jboss.tools.portlet.ui.bot.test.example; + +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.ServerState; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; + +/** + * Common ancestor for example projects tests for 5x runtime. + * + * @author Lucia Jelinkova + * + */ +@Require(server=@Server(version="5.0", operator=">", state=ServerState.Running, type=ServerType.EPP)) +public abstract class AbstractPortletExampleRuntime5xTest extends + AbstractPortletExampleTest { + + @Override + public String getExampleCategory() { + return "Portlet for GateIn 3.1/EPP 5.x"; + } +} Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleTest.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleTest.java 2011-12-22 14:03:51 UTC (rev 37526) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleTest.java 2011-12-22 14:05:03 UTC (rev 37527) @@ -4,19 +4,15 @@ import static org.jboss.tools.portlet.ui.bot.matcher.WorkspaceAssert.assertThatInWorkspace; import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.exceptionInConsoleOutput; import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.isNumberOfErrors; -import static org.jboss.tools.portlet.ui.bot.matcher.factory.PortletMatchersFactory.canLoadAt4xRuntime; +import org.eclipse.swtbot.swt.finder.SWTBot; import org.hamcrest.Matcher; -import org.jboss.tools.portlet.ui.bot.entity.PortletDefinition; import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask; import org.jboss.tools.portlet.ui.bot.task.SWTBotAware; import org.jboss.tools.portlet.ui.bot.task.console.ConsoleClearingTask; import org.jboss.tools.portlet.ui.bot.task.server.RunninngProjectOnServerTask; import org.jboss.tools.ui.bot.ext.ExampleTest; -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.ServerState; -import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; +import org.junit.Test; /** * Common ancestor for example projects tests. @@ -24,36 +20,32 @@ * @author Lucia Jelinkova * */ -@Require(server=@Server(version="4.3", state=ServerState.Running, type=ServerType.EPP)) public abstract class AbstractPortletExampleTest extends ExampleTest { - protected abstract PortletDefinition getPortletDefinition(); - @Override protected void executeExample() { doPerform(new ConsoleClearingTask()); - + for (String project : getProjectNames()){ doPerform(new RunninngProjectOnServerTask(project)); } - + doAssertThatInWorkspace(0, isNumberOfErrors()); doAssertThatInWorkspace(not(exceptionInConsoleOutput())); - doAssertThatInWorkspace(getPortletDefinition(), canLoadAt4xRuntime()); } - + protected void doPerform(AbstractSWTTask task){ task.setBot(bot); task.perform(); } - + protected void doAssertThatInWorkspace(Matcher<Void> matcher){ if (matcher instanceof SWTBotAware){ ((SWTBotAware) matcher).setBot(bot); } assertThatInWorkspace(matcher); } - + protected <T> void doAssertThatInWorkspace(T actual, Matcher<T> matcher){ if (matcher instanceof SWTBotAware){ ((SWTBotAware) matcher).setBot(bot); Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/ExamplesSuite.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/ExamplesSuite.java 2011-12-22 14:03:51 UTC (rev 37526) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/ExamplesSuite.java 2011-12-22 14:05:03 UTC (rev 37527) @@ -6,9 +6,11 @@ @RunWith(RequirementAwareUsageWindowClosingSuite.class) @Suite.SuiteClasses({ - JavaPortletExample.class, - JSFPortletExample.class, - SeamPortletExample.class + JavaPortletExampleRuntime4x.class, + JSFPortletExampleRuntime4x.class, + SeamPortletExampleRuntime4x.class, + JSFPortletExampleRuntime5x.class, + RichFacesPortletExampleRuntime5x.class }) public class ExamplesSuite { Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExample.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExample.java 2011-12-22 14:03:51 UTC (rev 37526) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExample.java 2011-12-22 14:05:03 UTC (rev 37527) @@ -1,37 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.example; - -import static org.jboss.tools.portlet.ui.bot.entity.EntityFactory.portlet; - -import org.jboss.tools.portlet.ui.bot.entity.PortletDefinition; - - -/** - * Tests the Java portlet example. - * - * @author Lucia Jelinkova - * - */ -public class JSFPortletExample extends AbstractPortletExampleTest { - - private static final String PROJECT_NAME = "testjsfportlet"; - - @Override - public String getExampleCategory() { - return "Portlet"; - } - - @Override - public String getExampleName() { - return "JBoss JSF Portlet Example"; - } - - @Override - public String[] getProjectNames() { - return new String[]{PROJECT_NAME}; - } - - @Override - protected PortletDefinition getPortletDefinition() { - return portlet("TestJSFPortlet", "Test JBoss JSF Portlet"); - } -} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleRuntime4x.java (from rev 37515, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExample.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleRuntime4x.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleRuntime4x.java 2011-12-22 14:05:03 UTC (rev 37527) @@ -0,0 +1,32 @@ +package org.jboss.tools.portlet.ui.bot.test.example; + +import static org.jboss.tools.portlet.ui.bot.entity.EntityFactory.portlet; + +import org.jboss.tools.portlet.ui.bot.entity.PortletDefinition; + + +/** + * Tests the JSF portlet example. + * + * @author Lucia Jelinkova + * + */ +public class JSFPortletExampleRuntime4x extends AbstractPortletExampleRuntime4xTest { + + private static final String PROJECT_NAME = "testjsfportlet"; + + @Override + public String getExampleName() { + return "JBoss JSF Portlet Example"; + } + + @Override + public String[] getProjectNames() { + return new String[]{PROJECT_NAME}; + } + + @Override + protected PortletDefinition getPortletDefinition() { + return portlet("TestJSFPortlet", "Test JBoss JSF Portlet"); + } +} Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleRuntime5x.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleRuntime5x.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JSFPortletExampleRuntime5x.java 2011-12-22 14:05:03 UTC (rev 37527) @@ -0,0 +1,22 @@ +package org.jboss.tools.portlet.ui.bot.test.example; + +/** + * Tests the JSF portlet example. + * + * @author Lucia Jelinkova + * + */ +public class JSFPortletExampleRuntime5x extends AbstractPortletExampleRuntime5xTest { + + private static final String PROJECT_NAME = "JSFPortlet"; + + @Override + public String getExampleName() { + return "JBoss JSF RI Portlet"; + } + + @Override + public String[] getProjectNames() { + return new String[]{PROJECT_NAME}; + } +} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JavaPortletExample.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JavaPortletExample.java 2011-12-22 14:03:51 UTC (rev 37526) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JavaPortletExample.java 2011-12-22 14:05:03 UTC (rev 37527) @@ -1,37 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.example; - -import static org.jboss.tools.portlet.ui.bot.entity.EntityFactory.portlet; - -import org.jboss.tools.portlet.ui.bot.entity.PortletDefinition; - - -/** - * Tests the Java portlet example. - * - * @author Lucia Jelinkova - * - */ -public class JavaPortletExample extends AbstractPortletExampleTest { - - private static final String PROJECT_NAME = "testjavaportlet"; - - @Override - public String getExampleCategory() { - return "Portlet"; - } - - @Override - public String getExampleName() { - return "JBoss Java Portlet Example"; - } - - @Override - public String[] getProjectNames() { - return new String[]{PROJECT_NAME}; - } - - @Override - protected PortletDefinition getPortletDefinition() { - return portlet("default/TestJavaPortlet", "TestJavaPortlet"); - } -} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JavaPortletExampleRuntime4x.java (from rev 37515, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JavaPortletExample.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JavaPortletExampleRuntime4x.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/JavaPortletExampleRuntime4x.java 2011-12-22 14:05:03 UTC (rev 37527) @@ -0,0 +1,32 @@ +package org.jboss.tools.portlet.ui.bot.test.example; + +import static org.jboss.tools.portlet.ui.bot.entity.EntityFactory.portlet; + +import org.jboss.tools.portlet.ui.bot.entity.PortletDefinition; + + +/** + * Tests the Java portlet example. + * + * @author Lucia Jelinkova + * + */ +public class JavaPortletExampleRuntime4x extends AbstractPortletExampleRuntime4xTest { + + private static final String PROJECT_NAME = "testjavaportlet"; + + @Override + public String getExampleName() { + return "JBoss Java Portlet Example"; + } + + @Override + public String[] getProjectNames() { + return new String[]{PROJECT_NAME}; + } + + @Override + protected PortletDefinition getPortletDefinition() { + return portlet("default/TestJavaPortlet", "TestJavaPortlet"); + } +} Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/RichFacesPortletExampleRuntime5x.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/RichFacesPortletExampleRuntime5x.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/RichFacesPortletExampleRuntime5x.java 2011-12-22 14:05:03 UTC (rev 37527) @@ -0,0 +1,32 @@ +package org.jboss.tools.portlet.ui.bot.test.example; + + +/** + * Tests the JSF portlet example. + * + * @author Lucia Jelinkova + * + */ +public class RichFacesPortletExampleRuntime5x extends AbstractPortletExampleRuntime5xTest { + + private static final String PROJECT_NAME_IN_WIZARD = "RichFacesPortlet"; + + private static final String PROJECT_NAME_IN_WORKSPACE = "RichfacesPortlet"; + + private int getProjectNameMethodCallCounter = 0; + + @Override + public String getExampleName() { + return "JBoss Portlet Bridge - RichFaces Application"; + } + + @Override + public String[] getProjectNames() { + // an ugly hack to pass the assert that the project name in wizard is the same as project name in workspace + if (getProjectNameMethodCallCounter <= 1){ + getProjectNameMethodCallCounter++; + return new String[]{PROJECT_NAME_IN_WIZARD}; + } + return new String[]{PROJECT_NAME_IN_WORKSPACE}; + } +} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExample.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExample.java 2011-12-22 14:03:51 UTC (rev 37526) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExample.java 2011-12-22 14:05:03 UTC (rev 37527) @@ -1,55 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.example; - -import static org.jboss.tools.portlet.ui.bot.entity.EntityFactory.file; -import static org.jboss.tools.portlet.ui.bot.entity.EntityFactory.portlet; - -import org.jboss.tools.portlet.ui.bot.entity.PortletDefinition; -import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile; -import org.jboss.tools.portlet.ui.bot.task.server.RunningFileOnServerTask; -import org.jboss.tools.ui.bot.ext.config.Annotations.DB; -import org.jboss.tools.ui.bot.ext.config.Annotations.Require; -import org.jboss.tools.ui.bot.ext.config.Annotations.Seam; -import org.jboss.tools.ui.bot.ext.config.Annotations.Server; -import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; -import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; - - -/** - * Tests the Java portlet example. - * - * @author Lucia Jelinkova - * - */ -@Require(db=@DB, seam=@Seam, server=@Server(version="4.3", state=ServerState.Running, type=ServerType.EPP)) -public class SeamPortletExample extends AbstractPortletExampleTest { - - private static final String PROJECT_NAME = "testseamportlet"; - - private static final WorkspaceFile DATASOURCE_FILE = file(PROJECT_NAME, "resources/" + PROJECT_NAME + "-ds.xml"); - - @Override - public String getExampleCategory() { - return "Portlet"; - } - - @Override - public String getExampleName() { - return "JBoss Seam Portlet Example"; - } - - @Override - public String[] getProjectNames() { - return new String[]{PROJECT_NAME}; - } - - @Override - protected void executeExample() { - doPerform(new RunningFileOnServerTask(DATASOURCE_FILE)); - super.executeExample(); - } - - @Override - protected PortletDefinition getPortletDefinition() { - return portlet("TestSeamPortlet", "Test JBoss Seam Portlet"); - } -} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime4x.java (from rev 37515, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExample.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime4x.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime4x.java 2011-12-22 14:05:03 UTC (rev 37527) @@ -0,0 +1,50 @@ +package org.jboss.tools.portlet.ui.bot.test.example; + +import static org.jboss.tools.portlet.ui.bot.entity.EntityFactory.file; +import static org.jboss.tools.portlet.ui.bot.entity.EntityFactory.portlet; + +import org.jboss.tools.portlet.ui.bot.entity.PortletDefinition; +import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile; +import org.jboss.tools.portlet.ui.bot.task.server.RunningFileOnServerTask; +import org.jboss.tools.ui.bot.ext.config.Annotations.DB; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Seam; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; + + +/** + * Tests the Seam portlet example. + * + * @author Lucia Jelinkova + * + */ +@Require(db=@DB, seam=@Seam, server=@Server(version="4.3", state=ServerState.Running, type=ServerType.EPP)) +public class SeamPortletExampleRuntime4x extends AbstractPortletExampleRuntime4xTest { + + private static final String PROJECT_NAME = "testseamportlet"; + + private static final WorkspaceFile DATASOURCE_FILE = file(PROJECT_NAME, "resources/" + PROJECT_NAME + "-ds.xml"); + + @Override + public String getExampleName() { + return "JBoss Seam Portlet Example"; + } + + @Override + public String[] getProjectNames() { + return new String[]{PROJECT_NAME}; + } + + @Override + protected void executeExample() { + doPerform(new RunningFileOnServerTask(DATASOURCE_FILE)); + super.executeExample(); + } + + @Override + protected PortletDefinition getPortletDefinition() { + return portlet("TestSeamPortlet", "Test JBoss Seam Portlet"); + } +}

13 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r37526 - in trunk/openshift/plugins: org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2011-12-22 09:03:51 -0500 (Thu, 22 Dec 2011) New Revision: 37526 Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressMessages.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/expressMessages.properties Removed: trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EgitBehaviourDelegate.java trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EgitPublishMethod.java trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EgitPublisher.java Modified: trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java Log: JBIDE-10541 Cleanup, string externalize, allow possibility of server-based or workspace-global preferences for what should get added during a publish Modified: trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java 2011-12-22 13:54:34 UTC (rev 37525) +++ trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java 2011-12-22 14:03:51 UTC (rev 37526) @@ -19,7 +19,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.HashSet; import java.util.List; +import java.util.Set; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.Assert; @@ -59,6 +61,7 @@ import org.eclipse.jgit.transport.URIish; import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.RepositoryProvider; +import org.eclipse.wst.server.core.IServer; import org.jboss.tools.openshift.egit.core.internal.EGitCoreActivator; /** @@ -684,26 +687,70 @@ return status; } - public static int countCommitableChanges(IProject project, IProgressMonitor monitor) { + public static int countCommitableChanges(IProject project, IServer server, IProgressMonitor monitor) { try { - Repository repo = getRepository(project); - - EclipseGitProgressTransformer jgitMonitor = new EclipseGitProgressTransformer(monitor); - IndexDiff indexDiff = new IndexDiff(repo, Constants.HEAD, - IteratorService.createInitialIterator(repo)); - indexDiff.diff(jgitMonitor, 0, 0, NLS.bind( - UIText.CommitActionHandler_repository, repo.getDirectory().getPath())); - // System.out.println(indexDiff.getAdded().size()); - // System.out.println(indexDiff.getChanged().size()); - // System.out.println(indexDiff.getConflicting().size()); - // System.out.println(indexDiff.getMissing().size()); - // System.out.println(indexDiff.getModified().size()); - // System.out.println(indexDiff.getRemoved().size()); - // System.out.println(indexDiff.getUntracked().size()); - - return indexDiff.getModified().size(); + Set<String> commitable = getCommitableChanges(project, server, monitor); + return commitable.size(); } catch (IOException ioe) { } return -1; } + + private static Set<String> getCommitableChanges(IProject project, IServer server, IProgressMonitor monitor) throws IOException { + Repository repo = getRepository(project); + + EclipseGitProgressTransformer jgitMonitor = new EclipseGitProgressTransformer(monitor); + IndexDiff indexDiff = new IndexDiff(repo, Constants.HEAD, + IteratorService.createInitialIterator(repo)); + indexDiff.diff(jgitMonitor, 0, 0, NLS.bind( + UIText.CommitActionHandler_repository, repo.getDirectory().getPath())); + Set<String> set = new HashSet<String>(); + if( commitAddedResources(server)) + set.addAll(indexDiff.getAdded()); + if( commitChangedResources(server)) + set.addAll(indexDiff.getChanged()); + if( commitConflictingResources(server)) + set.addAll(indexDiff.getConflicting()); + if( commitMissingResources(server)) + set.addAll(indexDiff.getMissing()); + if( commitModifiedResources(server)) + set.addAll(indexDiff.getModified()); + if( commitRemovedResources(server)) + set.addAll(indexDiff.getRemoved()); + if( commitUntrackedResources(server)) + set.addAll(indexDiff.getUntracked()); + + return set; + } + + /* + * Current behaviour is to commit only: + * added, changed, modified, removed + * + * These can be customized as properties on the server one day, if we wish, + * such that each server can have custom settings, or, they can be global settings + */ + public static boolean commitAddedResources(IServer server) { + return true; + } + public static boolean commitChangedResources(IServer server) { + return true; + } + public static boolean commitConflictingResources(IServer server) { + return false; + } + public static boolean commitMissingResources(IServer server) { + return false; + } + public static boolean commitModifiedResources(IServer server) { + return true; + } + public static boolean commitRemovedResources(IServer server) { + return true; + } + public static boolean commitUntrackedResources(IServer server) { + return false; + } + + } Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EgitBehaviourDelegate.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EgitBehaviourDelegate.java 2011-12-22 13:54:34 UTC (rev 37525) +++ trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EgitBehaviourDelegate.java 2011-12-22 14:03:51 UTC (rev 37526) @@ -1,86 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.egit.core; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior; -import org.jboss.ide.eclipse.as.core.server.internal.IJBossBehaviourDelegate; - -public class EgitBehaviourDelegate implements IJBossBehaviourDelegate { - - public static final String ID = "egit"; - - @Override - public String getBehaviourTypeId() { - return ID; - } - - @Override - public void setActualBehaviour(DelegatingServerBehavior actualBehaviour) { - } - - @Override - public void stop(boolean force) { - } - - @Override - public void publishStart(IProgressMonitor monitor) throws CoreException { - } - - @Override - public void publishFinish(IProgressMonitor monitor) throws CoreException { - } - - @Override - public void onServerStarting() { - // do nothing - } - - @Override - public void onServerStopping() { - // do nothing - } - - @Override - public IStatus canChangeState(String launchMode) { - // do nothing - return Status.OK_STATUS; - } - - /** - * remove from interface - */ - @Override - public String getDefaultStopArguments() throws CoreException { - return null; - } - - @Override - public void dispose() { - // do nothing - } - - @Override - public void onServerStarted() { - // TODO Auto-generated method stub - - } - - @Override - public void onServerStopped() { - // TODO Auto-generated method stub - - } - -} Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EgitPublishMethod.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EgitPublishMethod.java 2011-12-22 13:54:34 UTC (rev 37525) +++ trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EgitPublishMethod.java 2011-12-22 14:03:51 UTC (rev 37526) @@ -1,49 +0,0 @@ -package org.jboss.tools.openshift.egit.core; - - -public class EgitPublishMethod { /* - implements IJBossServerPublishMethod { - - public String getPublishMethodId() { - return EgitBehaviourDelegate.ID; - } - - @Override - public void publishStart(DeployableServerBehavior behaviour, - IProgressMonitor monitor) throws CoreException { - // TODO Auto-generated method stub - - } - - @Override - public int publishFinish(DeployableServerBehavior behaviour, - IProgressMonitor monitor) throws CoreException { - // TODO Auto-generated method stub - return 0; - } - - @Override - public int publishModule(DeployableServerBehavior behaviour, int kind, - int deltaKind, IModule[] module, IProgressMonitor monitor) - throws CoreException { - // TODO Auto-generated method stub - IProject project = module[0].getProject(); - EGitUtils.commit(project, monitor); - EGitUtils.push(EGitUtils.getRepository(project), monitor); - return IServer.PUBLISH_STATE_NONE; - } - - @Override - public IPublishCopyCallbackHandler getCallbackHandler(IPath path, - IServer server) { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getPublishDefaultRootFolder(IServer server) { - // TODO Auto-generated method stub - return null; - } - */ -} Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EgitPublisher.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EgitPublisher.java 2011-12-22 13:54:34 UTC (rev 37525) +++ trunk/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EgitPublisher.java 2011-12-22 14:03:51 UTC (rev 37526) @@ -1,40 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.openshift.egit.core; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.wst.server.core.IModule; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.model.IModuleResourceDelta; -import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod; -import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher; - -public class EgitPublisher implements IJBossServerPublisher { - - @Override - public boolean accepts(String method, IServer server, IModule[] module) { - return false; - } - - @Override - public int getPublishState() { - return 0; - } - - @Override - public IStatus publishModule(IJBossServerPublishMethod method, IServer server, IModule[] module, int publishType, - IModuleResourceDelta[] delta, IProgressMonitor monitor) throws CoreException { - return null; - } - -} Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressMessages.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressMessages.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressMessages.java 2011-12-22 14:03:51 UTC (rev 37526) @@ -0,0 +1,17 @@ +package org.jboss.tools.openshift.express.internal.core.behaviour; + +import org.eclipse.osgi.util.NLS; + +public class ExpressMessages extends NLS { + private static final String BUNDLE_NAME = "org.jboss.tools.openshift.express.internal.core.behaviour.expressMessages"; //$NON-NLS-1$ + + static { + // load message values from bundle file + NLS.initializeMessages(BUNDLE_NAME, ExpressMessages.class); + } + public static String requestCommitAndPushTitle; + public static String requestCommitAndPushMsg; + public static String requestPushTitle; + public static String requestPushMsg; + +} Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2011-12-22 13:54:34 UTC (rev 37525) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2011-12-22 14:03:51 UTC (rev 37526) @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jgit.lib.Repository; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.internal.ui.wizards.ConfigureProjectWizard; @@ -93,7 +94,7 @@ return IServer.PUBLISH_STATE_UNKNOWN; } - int changed = EGitUtils.countCommitableChanges(p, new NullProgressMonitor() ); + int changed = EGitUtils.countCommitableChanges(p, behaviour.getServer(), new NullProgressMonitor() ); if( changed != 0 && requestCommitAndPushApproval(module, changed)) { monitor.beginTask("Publishing " + p.getName(), 200); EGitUtils.commit(p, new SubProgressMonitor(monitor, 100)); @@ -129,17 +130,15 @@ private boolean requestCommitAndPushApproval(final IModule[] module, int changed) { String projName = module[module.length-1].getProject().getName(); - String msg = "There are " + changed + " local changes in \"" + projName + "\". " + - "Do you want to publish to OpenShift by commiting the changes and pushing its Git repository?"; - String title = "Publish " + projName + "?"; + String msg = NLS.bind(ExpressMessages.requestCommitAndPushMsg, changed, projName); + String title = NLS.bind(ExpressMessages.requestCommitAndPushTitle, projName); return requestApproval(msg, title); } private boolean requestPushApproval(final IModule[] module) { String projName = module[module.length-1].getProject().getName(); - String msg = "The are no local changes in \"" + projName + "\". " + - "Do you want to publish to OpenShift by pushing its Git repository?"; - String title = "Publish " + projName + "?"; + String msg = NLS.bind(ExpressMessages.requestPushMsg, projName); + String title = NLS.bind(ExpressMessages.requestPushTitle, projName); return requestApproval(msg, title); } Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/expressMessages.properties =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/expressMessages.properties (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/expressMessages.properties 2011-12-22 14:03:51 UTC (rev 37526) @@ -0,0 +1,4 @@ +requestCommitAndPushTitle=Publish {0}? +requestCommitAndPushMsg=There are {0} local changes in "{1}". Do you want to publish to OpenShift by commiting the changes and pushing its Git repository? +requestPushTitle=Publish {0}? +requestPushMsg=The are no local changes in "{0}". Do you want to publish to OpenShift by pushing its Git repository?

13 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r37525 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-12-22 08:54:34 -0500 (Thu, 22 Dec 2011) New Revision: 37525 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java Log: [JBIDE-10549] implemented reporting of subtask when creating an OpenShift application. other jobs are still not reporting. Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java 2011-12-22 13:49:43 UTC (rev 37524) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java 2011-12-22 13:54:34 UTC (rev 37525) @@ -78,7 +78,7 @@ } public IApplication createApplication(String name, ICartridge cartridge, IProgressMonitor monitor) throws OpenShiftException { - monitor.subTask("Creating application..."); + monitor.subTask("creating application..."); IApplication application = getUser().createApplication(name, cartridge); waitForAccessible(application, monitor); return application; @@ -89,7 +89,7 @@ } private void waitForAccessible(IApplication application, IProgressMonitor monitor) throws OpenShiftApplicationNotAvailableException, OpenShiftException { - monitor.subTask("Waiting for application to become accessible..."); + monitor.subTask("waiting for application to become accessible..."); if (!application.waitForAccessible(APP_CREATION_TIMEOUT * 1000)) { throw new OpenShiftApplicationNotAvailableException(NLS.bind( OpenShiftExpressUIMessages.HOSTNAME_NOT_ANSWERING, Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java 2011-12-22 13:49:43 UTC (rev 37524) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPage.java 2011-12-22 13:54:34 UTC (rev 37525) @@ -10,7 +10,8 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.wizard; -import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; import org.eclipse.core.databinding.Binding; import org.eclipse.core.databinding.DataBindingContext; @@ -37,6 +38,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.jboss.tools.common.ui.DelegatingProgressMonitor; +import org.jboss.tools.common.ui.JobUtils; import org.jboss.tools.common.ui.WizardUtils; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; @@ -166,35 +168,31 @@ } public boolean createApplication() { - final ArrayBlockingQueue<Boolean> applicationCreated = new ArrayBlockingQueue<Boolean>(1); final DelegatingProgressMonitor delegatingMonitor = new DelegatingProgressMonitor(); - try { - WizardUtils.runInWizard(new Job(NLS.bind("Creating application \"{0}\"", wizardModel.getName())) { + Job job = new Job(NLS.bind("New application {0}", wizardModel.getName())) { - @Override - protected IStatus run(IProgressMonitor monitor) { - delegatingMonitor.add(monitor); - try { - wizardModel.createApplication(delegatingMonitor); - applicationCreated.offer(true); - return Status.OK_STATUS; - } catch (OpenShiftApplicationNotAvailableException e) { - applicationCreated.offer(false); - return OpenShiftUIActivator.createErrorStatus( - e.getMessage(), e, wizardModel.getName()); - } catch (OpenShiftException e) { - applicationCreated.offer(false); - return OpenShiftUIActivator.createErrorStatus( - "Could not create application \"{0}\"", - (Throwable) e, wizardModel.getName()); - } + @Override + protected IStatus run(IProgressMonitor monitor) { + delegatingMonitor.add(monitor); + try { + wizardModel.createApplication(delegatingMonitor); + return Status.OK_STATUS; + } catch (OpenShiftApplicationNotAvailableException e) { + return OpenShiftUIActivator.createErrorStatus( + e.getMessage(), e, wizardModel.getName()); + } catch (OpenShiftException e) { + return OpenShiftUIActivator.createErrorStatus( + "Could not create application \"{0}\"", + (Throwable) e, wizardModel.getName()); } - }, delegatingMonitor, getContainer()); + } + }; + try { + Future<IStatus> jobResult = WizardUtils.runInWizard(job, delegatingMonitor, getContainer()); + return JobUtils.isOk(jobResult.get(10, TimeUnit.SECONDS)); } catch (Exception e) { - e.printStackTrace(); - // ignore + return false; } - return applicationCreated.poll(); } private class ApplicationNameValidator implements IValidator {

13 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r37524 - trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-12-22 08:49:43 -0500 (Thu, 22 Dec 2011) New Revision: 37524 Added: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/JobUtils.java Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/JobResultFuture.java trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/WizardUtils.java Log: [JBIDE-10549] changed WizardUtils to return JobResultFuture, added JobUtils Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/JobResultFuture.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/JobResultFuture.java 2011-12-22 13:13:15 UTC (rev 37523) +++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/JobResultFuture.java 2011-12-22 13:49:43 UTC (rev 37524) @@ -33,7 +33,7 @@ private ArrayBlockingQueue<IStatus> queue = new ArrayBlockingQueue<IStatus>(1); public JobResultFuture(Job job) { - onJobFinished(job); + addJobFinishedListener(job); } @Override @@ -63,13 +63,13 @@ return queue.poll(timeout, unit); } - private JobChangeAdapter onJobFinished(final Job job) { - return new JobChangeAdapter() { + private void addJobFinishedListener(final Job job) { + job.addJobChangeListener(new JobChangeAdapter() { @Override public void done(IJobChangeEvent event) { queue.offer(job.getResult()); } - }; + }); } } Added: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/JobUtils.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/JobUtils.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/JobUtils.java 2011-12-22 13:49:43 UTC (rev 37524) @@ -0,0 +1,38 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.common.ui; + +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.jobs.Job; + +/** + * @author André Dietisheim + * + */ +public class JobUtils { + + private JobUtils() { + // inhibit instantiation + } + + public static IStatus waitForJobResult(Job job, long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException { + return new JobResultFuture(job).get(timeout, unit); + } + + public static boolean isOk(IStatus status) { + return status != null + && status.isOK(); + } +} Property changes on: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/JobUtils.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/WizardUtils.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/WizardUtils.java 2011-12-22 13:13:15 UTC (rev 37523) +++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/WizardUtils.java 2011-12-22 13:49:43 UTC (rev 37524) @@ -11,9 +11,11 @@ package org.jboss.tools.common.ui; import java.lang.reflect.InvocationTargetException; +import java.util.concurrent.Future; import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.wizard.IWizard; @@ -32,33 +34,52 @@ } /** - * Runs the given job in the given wizard container. In order to have the - * wizard displaying a progress bar, you need to set + * Runs the given job in the given wizard container. This method will return + * immediately, it will not wait for the job completion. + * + * In order to have the wizard displaying a progress bar, you need to set * Wizard#setNeedsProgressMonitor to <code>true</code>. * - * * @param job * the job to run * @param container * the wizard container to run the job in + * @return a future that allows you to wait for the job result. * @throws InvocationTargetException * the invocation target exception * @throws InterruptedException * the interrupted exception - * * @author André Dietisheim - * * @see IWizardContainer#run(boolean, boolean, IRunnableWithProgress) * @see Job */ - public static void runInWizard(final Job job, IWizardContainer container) + public static Future<IStatus> runInWizard(final Job job, IWizardContainer container) throws InvocationTargetException, InterruptedException { - runInWizard(job, null, container); + return runInWizard(job, null, container); } - public static void runInWizard(final Job job, final DelegatingProgressMonitor delegatingMonitor, + /** + * Runs the given job in the given wizard container. This method will return + * immediately, it will not wait for the job completion. + * + * In order to have the wizard displaying a progress bar, you need to set + * Wizard#setNeedsProgressMonitor to <code>true</code>. + * + * @param job + * the job to run in the wizard + * @param delegatingMonitor + * the delegating monitor that the wizard monitor shall be added + * to. + * @param container + * the wizard container to run the job in + * @return a future that allows you to wait for the job result + * @throws InvocationTargetException + * @throws InterruptedException + */ + public static Future<IStatus> runInWizard(final Job job, final DelegatingProgressMonitor delegatingMonitor, IWizardContainer container) throws InvocationTargetException, InterruptedException { + JobResultFuture future = new JobResultFuture(job); container.run(true, false, new IRunnableWithProgress() { @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { @@ -79,6 +100,7 @@ } } }); + return future; } /** @@ -103,18 +125,17 @@ * @throws InterruptedException * the interrupted exception */ - public static void runInWizard(final Job job, IWizardContainer container, DataBindingContext dbc) + public static Future<IStatus> runInWizard(final Job job, IWizardContainer container, DataBindingContext dbc) throws InvocationTargetException, InterruptedException { - runInWizard(job, container); - dbc.updateTargets(); - dbc.updateModels(); + return runInWizard(job, null, container); } - public static void runInWizard(Job job, DelegatingProgressMonitor monitor, IWizardContainer container, + public static Future<IStatus> runInWizard(Job job, DelegatingProgressMonitor monitor, IWizardContainer container, DataBindingContext dbc) throws InvocationTargetException, InterruptedException { - runInWizard(job, monitor, container); + Future<IStatus> jobResult = runInWizard(job, monitor, container); dbc.updateTargets(); dbc.updateModels(); + return jobResult; } /**

13 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r37523 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2011-12-22 08:13:15 -0500 (Thu, 22 Dec 2011) New Revision: 37523 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DeployAction.java Log: JBIDE-10551 - most-likely commit Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DeployAction.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DeployAction.java 2011-12-22 13:02:57 UTC (rev 37522) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DeployAction.java 2011-12-22 13:13:15 UTC (rev 37523) @@ -169,7 +169,7 @@ projs += i.next().getName() + ", "; //$NON-NLS-1$ projs = projs.substring(0, projs.length() - 2); - int style = SWT.APPLICATION_MODAL | SWT.OK | SWT.CANCEL; + int style = SWT.OK | SWT.CANCEL; MessageBox messageBox = new MessageBox(Display.getCurrent().getActiveShell(), style); messageBox.setText(ServerActionMessages.DeployActionMessageBoxTitle); messageBox.setMessage(ServerActionMessages.DeployActionMessageBoxMsg);

13 years, 9 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits December 2011