July 2014 - jbosstools-issues - Jboss List Archives

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

by Andre Dietisheim (JIRA)

[ https://issues.jboss.org/browse/JBIDE-17831?page=com.atlassian.jira.plugi... ] Andre Dietisheim updated JBIDE-17831: ------------------------------------- Attachment: (was: push-force.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: Enhancement > Components: openshift > Affects Versions: 4.2.0.Beta3 > Reporter: Andre Dietisheim > Assignee: Andre Dietisheim > Priority: Optional > Labels: application_wizard, respin-a > Fix For: 4.2.0.Beta3 > > Attachments: import-failed-uncommitted-changes.png > > -- This message was sent by Atlassian JIRA (v6.2.6#6264)

11 years, 9 months

1
0
0 / 0

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

by Andre Dietisheim (JIRA)

[ https://issues.jboss.org/browse/JBIDE-17831?page=com.atlassian.jira.plugi... ] Andre Dietisheim updated JBIDE-17831: ------------------------------------- Attachment: (was: 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: Enhancement > Components: openshift > Affects Versions: 4.2.0.Beta3 > Reporter: Andre Dietisheim > Assignee: Andre Dietisheim > Priority: Optional > Labels: application_wizard, respin-a > Fix For: 4.2.0.Beta3 > > Attachments: import-failed-uncommitted-changes.png > > -- This message was sent by Atlassian JIRA (v6.2.6#6264)

11 years, 9 months

1
0
0 / 0

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

by Andre Dietisheim (JIRA)

[ https://issues.jboss.org/browse/JBIDE-17831?page=com.atlassian.jira.plugi... ] Andre Dietisheim updated JBIDE-17831: ------------------------------------- Attachment: (was: git-log.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: Enhancement > Components: openshift > Affects Versions: 4.2.0.Beta3 > Reporter: Andre Dietisheim > Assignee: Andre Dietisheim > Priority: Optional > Labels: application_wizard, respin-a > Fix For: 4.2.0.Beta3 > > Attachments: import-failed-uncommitted-changes.png > > -- This message was sent by Atlassian JIRA (v6.2.6#6264)

11 years, 9 months

1
0
0 / 0

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

by Andre Dietisheim (JIRA)

[ https://issues.jboss.org/browse/JBIDE-17831?page=com.atlassian.jira.plugi... ] Andre Dietisheim updated JBIDE-17831: ------------------------------------- Priority: Optional (was: Blocker) > 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: Enhancement > Components: openshift > Affects Versions: 4.2.0.Beta3 > Reporter: Andre Dietisheim > Assignee: Andre Dietisheim > Priority: Optional > 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 > > -- This message was sent by Atlassian JIRA (v6.2.6#6264)

11 years, 9 months

1
0
0 / 0

[JBoss JIRA] (JBIDE-17740) Application wizard: Cannot deploy git-based project to OpenShift

by Andre Dietisheim (JIRA)

[ https://issues.jboss.org/browse/JBIDE-17740?page=com.atlassian.jira.plugi... ] Andre Dietisheim edited comment on JBIDE-17740 at 7/8/14 1:38 PM: ------------------------------------------------------------------ I'll reject this bug as the behavior shown is expected (you cannot merge into a project with uncommitted changes). was (Author: adietish): I'll close this bug as the behavior shown is expected (you cannot merge into a project with uncommitted changes). > Application wizard: Cannot deploy git-based project to OpenShift > ---------------------------------------------------------------- > > Key: JBIDE-17740 > URL: https://issues.jboss.org/browse/JBIDE-17740 > Project: Tools (JBoss Tools) > Issue Type: Bug > Components: openshift > Affects Versions: 4.2.0.Beta3 > Reporter: Marián Labuda > 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, import.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)

11 years, 9 months

1
0
0 / 0

[JBoss JIRA] (JBIDE-17740) Application wizard: Cannot deploy git-based project to OpenShift

by Andre Dietisheim (JIRA)

[ https://issues.jboss.org/browse/JBIDE-17740?page=com.atlassian.jira.plugi... ] Andre Dietisheim edited comment on JBIDE-17740 at 7/8/14 1:35 PM: ------------------------------------------------------------------ I filed the discussed enhancement request to JBIDE-17831: We should warn the user upfront about the uncommitted changes when he selects the existing project. The required push force is also expected since we're not doing a proper merge but we copy the openshift configurations to the existing project and then push it to OpenShift. The local project and OpenShift differ in history and thus a push force is required. We could only get around this by doing a proper recursive merge as in JBIDE-14890 but this change is unfortunately late for Beta3. was (Author: adietish): I filed the discussed enhancement request to JBIDE-17831: We should warn the user upfront about the uncommitted changes when he selects the existing project. > Application wizard: Cannot deploy git-based project to OpenShift > ---------------------------------------------------------------- > > Key: JBIDE-17740 > URL: https://issues.jboss.org/browse/JBIDE-17740 > Project: Tools (JBoss Tools) > Issue Type: Bug > Components: openshift > Affects Versions: 4.2.0.Beta3 > Reporter: Marián Labuda > 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, import.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)

11 years, 9 months

1
0
0 / 0

[JBoss JIRA] (JBIDE-17740) Application wizard: Cannot deploy git-based project to OpenShift

by Andre Dietisheim (JIRA)

[ https://issues.jboss.org/browse/JBIDE-17740?page=com.atlassian.jira.plugi... ] Andre Dietisheim resolved JBIDE-17740. -------------------------------------- Resolution: Rejected > Application wizard: Cannot deploy git-based project to OpenShift > ---------------------------------------------------------------- > > Key: JBIDE-17740 > URL: https://issues.jboss.org/browse/JBIDE-17740 > Project: Tools (JBoss Tools) > Issue Type: Bug > Components: openshift > Affects Versions: 4.2.0.Beta3 > Reporter: Marián Labuda > 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, import.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)

11 years, 9 months

1
0
0 / 0

[JBoss JIRA] (JBIDE-17740) Application wizard: Cannot deploy git-based project to OpenShift

by Andre Dietisheim (JIRA)

[ https://issues.jboss.org/browse/JBIDE-17740?page=com.atlassian.jira.plugi... ] Andre Dietisheim commented on JBIDE-17740: ------------------------------------------ I filed the discussed enhancement request to JBIDE-17831: We should warn the user upfront about the uncommitted changes when he selects the existing project. > Application wizard: Cannot deploy git-based project to OpenShift > ---------------------------------------------------------------- > > Key: JBIDE-17740 > URL: https://issues.jboss.org/browse/JBIDE-17740 > Project: Tools (JBoss Tools) > Issue Type: Bug > Components: openshift > Affects Versions: 4.2.0.Beta3 > Reporter: Marián Labuda > 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, import.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)

11 years, 9 months

1
0
0 / 0

[JBoss JIRA] (JBIDE-17740) Application wizard: Cannot deploy git-based project to OpenShift

by Andre Dietisheim (JIRA)

[ https://issues.jboss.org/browse/JBIDE-17740?page=com.atlassian.jira.plugi... ] Andre Dietisheim commented on JBIDE-17740: ------------------------------------------ I'll close this bug as the behavior shown is expected (you cannot merge into a project with uncommitted changes). > Application wizard: Cannot deploy git-based project to OpenShift > ---------------------------------------------------------------- > > Key: JBIDE-17740 > URL: https://issues.jboss.org/browse/JBIDE-17740 > Project: Tools (JBoss Tools) > Issue Type: Bug > Components: openshift > Affects Versions: 4.2.0.Beta3 > Reporter: Marián Labuda > 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, import.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)

11 years, 9 months

1
0
0 / 0

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

by Andre Dietisheim (JIRA)

[ https://issues.jboss.org/browse/JBIDE-17831?page=com.atlassian.jira.plugi... ] Andre Dietisheim updated JBIDE-17831: ------------------------------------- Steps to Reproduce: EXEC: Import a git based project into the workspace in JBT (ex. git@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! This is fully expected since you cannot merge in git when you have uncommitted changes. But this missing requiremend of a clean project can be spotted far earlier when the project is selected. It is cumbersome to have a new openshift application but it could not get merged into the existing project *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@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. > 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 > > -- This message was sent by Atlassian JIRA (v6.2.6#6264)

11 years, 9 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

2006

jbosstools-issues July 2014