[jbosstools-issues] [JBoss JIRA] (JBIDE-17831) Application wizard: stuck with application but existing project cannot be merged: uncommitted changes

[Andre Dietisheim (JIRA)]

     [ https://issues.jboss.org/browse/JBIDE-17831?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Andre Dietisheim updated JBIDE-17831:
-------------------------------------

    Steps to Reproduce: 
EXEC: Import a git based project into the workspace in JBT (ex. git at github.com:adietish/kitchensink.git)
EXEC: Launch New application wizard from OpenShift explorer (or launch via project context menu Configure->New/Import OpenShift Application).
EXEC: Choose basic cartridge and click Next button (ex. EAP 6).
EXEC: Fill in name on the next wizard page and click Next.
EXEC: Choose Use existing project and select the existing git based project.
EXEC: Finish the wizard.
EXEC: Wait for the Import application shell and confirm.
Result: 
There is the error that there are uncommitted changes and it is required to commit them first.
!import-failed-uncommitted-changes.png!
 Expected Result:
I should get warned about the inability to merge into my existing project (because of uncommitted changes) when I select the existing project, not only when the import is processed.


  was:
EXEC: Import a git based project into the workspace in JBT (ex. git at github.com:adietish/kitchensink.git)
EXEC: Launch New application wizard from OpenShift explorer (or launch via project context menu Configure->New/Import OpenShift Application).
EXEC: Choose basic cartridge and click Next button (ex. EAP 6).
EXEC: Fill in name on the next wizard page and click Next.
EXEC: Choose Use existing project and select the existing git based project.
EXEC: Finish the wizard.
EXEC: Wait for the Import application shell and confirm.

EXPECTED RESULT: Question shell is shown or wizard is completed successfully and application on OpenShift is that one from the workspace (merged successfully).
RESULT: There is the error that there are uncommitted changes and it is required to commit them first. Application on OpenShift is default (from basic cartridge).

!import-failed-uncommitted-changes.png!

Workaround via manually creating server adapter and pushing unfortunately wont work either: the existing project in the workspace does not have the openshift settings and wont be recognized as valid workspace for the server adapter:

!cannot-create-server-adapter.png!



> Application wizard: stuck with application but existing project cannot be merged: uncommitted changes
> -----------------------------------------------------------------------------------------------------
>
>                 Key: JBIDE-17831
>                 URL: https://issues.jboss.org/browse/JBIDE-17831
>             Project: Tools (JBoss Tools)
>          Issue Type: Bug
>          Components: openshift
>    Affects Versions: 4.2.0.Beta3
>            Reporter: Andre Dietisheim
>            Assignee: Andre Dietisheim
>            Priority: Blocker
>              Labels: application_wizard, respin-a
>             Fix For: 4.2.0.Beta3
>
>         Attachments: cannot-create-server-adapter.png, git-log.png, import-failed-uncommitted-changes.png, push-force.png
>
>
> It is not possible to deploy existing git based project to the OpenShift instance. What's going to happen is that new OpenShift project is created, but existing git project is not merged. As result there is a project based on basic cartridge and not on existing project. There is a issue with git changes - uncommitted changes required to commit first, but it is not possible bcs. remote is still set to the old one git remote.
> See log
> {code}
> !ENTRY org.jboss.tools.openshift.express.ui 4 0 2014-07-02 08:52:28.848
> !MESSAGE Could not import project to the workspace.
> !STACK 0
> org.jboss.tools.openshift.express.internal.ui.UnCommittedChangesException: The project jboss-javaee6-webapp has uncommitted changes. Please commit those changes first.
> 	at org.jboss.tools.openshift.express.internal.ui.wizard.application.importoperation.MergeIntoGitSharedProject.execute(MergeIntoGitSharedProject.java:97)
> 	at org.jboss.tools.openshift.express.internal.ui.wizard.application.OpenShiftApplicationWizardModel.mergeIntoGitSharedProject(OpenShiftApplicationWizardModel.java:186)
> 	at org.jboss.tools.openshift.express.internal.ui.wizard.application.OpenShiftApplicationWizard$ImportJob.runInWorkspace(OpenShiftApplicationWizard.java:376)
> 	at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38)
> 	at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
> {code}
> Error shell:
> !import.png!



--
This message was sent by Atlassian JIRA
(v6.2.6#6264)