[jbosstools-issues] [JBoss JIRA] (JBIDE-10171) OpenShift Express Use Case Scenario

[Andre Dietisheim (Issue Comment Edited) (JIRA)]

    [ https://issues.jboss.org/browse/JBIDE-10171?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12643320#comment-12643320 ] 

Andre Dietisheim edited comment on JBIDE-10171 at 11/16/11 7:47 AM:
--------------------------------------------------------------------

Both usecases require us to merge the openshift application with the local app the user started with. 
Forge did that by merging the local application with the OpenShift application overriding remote changes with the local ones (see https://github.com/forge/plugin-openshift-express/blob/master/src/main/java/com/redhat/openshift/express/forge/OpenShiftExpressPlugin.java#L65). In the next step they then pushed the local app, that was merged, to OpenShift.
Another option would be to push (--force) the local app to OpenShift. 

We had a lengthy discussion by mail and the last finding we had was the following approach (proposed by Max):

{code}
git merge openshift/master -s recursive -X ours    
# openshift/master will be the default to use but should be possible to change (i.e. rhc uses origin/master by default)

git commit -a -m "deploy from JBoss OpenShift Tools"
# will have an option for skipping this step.  

git push -f openshift/master     
# same as in #1, but option for skipping -f (those that want to keep the history clean) , note yours say openshift HEAD, but I hope using same name as used in #1 is enough. If not then that sucks
{code}
                
      was (Author: adietish):
    Both usecases require us to merge the openshift application with the local app the user started with. 
Forge did that by merging the local application with the OpenShift application overriding remote changes with the local ones (see https://github.com/forge/plugin-openshift-express/blob/master/src/main/java/com/redhat/openshift/express/forge/OpenShiftExpressPlugin.java#L65). In the next step they then pushed the local app, that was merged, to OpenShift.
Another option would be to push (--force) the local app to OpenShift. 
We had a lengthy discussion by mail and the last finding we had was the following approach (proposed by Max):

{code}
git merge openshift/master -s recursive -X ours    
# openshift/master will be the default to use but should be possible to change (i.e. rhc uses origin/master by default)

git commit -a -m "deploy from JBoss OpenShift Tools"
# will have an option for skipping this step.  

git push -f openshift/master     
# same as in #1, but option for skipping -f (those that want to keep the history clean) , note yours say openshift HEAD, but I hope using same name as used in #1 is enough. If not then that sucks
{code}
                  
> OpenShift Express Use Case Scenario
> -----------------------------------
>
>                 Key: JBIDE-10171
>                 URL: https://issues.jboss.org/browse/JBIDE-10171
>             Project: Tools (JBoss Tools)
>          Issue Type: Feature Request
>          Components: openshift
>            Reporter: Burr Sutter
>            Assignee: Andre Dietisheim
>            Priority: Critical
>
> Here is the workflow:
> 1) User starts with one of the 4 key archetypes (ee6  war, ee6 ear, springmvc, html5) to create a default application
> 2) deploys that app to a local JBoss instance to manually test
> 3) user sets up a New Server attached to an application at OpenShift Express
> 4) User now deploys the project created in step 1 above to the openshift express server
> And a related workflow:
> 1) User imports a pre-existing Maven project
> 2) Adjusts his dependencies for JBoss AS deployment
> 3) deploys and tests on a localhost version of JBoss AS7
> 4) Configures a OpenShift Server in the Servers tab
> 5) Deploys to Openshift

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.jboss.org/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira