[
https://issues.jboss.org/browse/JBIDE-12218?page=com.atlassian.jira.plugi...
]
Andre Dietisheim edited comment on JBIDE-12218 at 8/22/12 10:21 AM:
--------------------------------------------------------------------
According to
http://stackoverflow.com/questions/1871282/nested-git-repositories
there's nothing that would tell that nested git-repos are illegal. I tested it and
thing look good. When changing some files in the projects within the parent, the parent
git repop get to know about the modifications. The nested git folder is automatically
ignored (see also here:
http://stackoverflow.com/questions/2317652/nested-git-repositories-withou...).
Apparently git submodules or subtree merging would be cleaner
(
http://stackoverflow.com/questions/1871282/nested-git-repositories). Submodules does not
look appropriate to me: You cannot define a submodule for a folder that is already within
the index:
{code}
[adietish@adietish-thinkpad as-quickstarts]$ cd helloworld-html5/
[adietish@adietish-thinkpad helloworld-html5]$ git submodule add
ssh://5217d3628cf043b08fcad0ed2d0aa6b6@test22-openshiftci.rhcloud.com/~/git/test22.git/
You need to run this command from the toplevel of the working tree.
[adietish@adietish-thinkpad helloworld-html5]$ cd ..
[adietish@adietish-thinkpad as-quickstarts]$ git submodule add
ssh://5217d3628cf043b08fcad0ed2d0aa6b6@test22-openshiftci.rhcloud.com/~/git/test22.git/
helloworld-html5/
'helloworld-html5' already exists in the index
{code}
Submodule look more like a way to aggregate existing repos into a parent repo. Here we
have an existing repo with a folder that we'd like to get merged with an existing
repo. Subtree merging would imho be the right tool for the merge. It does not resolve the
issue when pushing. We would still push the whole repo which has no pom and would not
build nor run on OpenShift. Furthermore subtree merging is not supported in EGit yet:
http://stackoverflow.com/questions/1871282/nested-git-repositories (see the jgit merge
strategies here:
http://download.eclipse.org/jgit/docs/jgit-2.0.0.201206130900-r/apidocs/o...).
To me the current solution looks fine. I'd suggest we close this bug WORKS_FOR_ME
was (Author: adietish):
According to
http://stackoverflow.com/questions/1871282/nested-git-repositories
there's nothing that would tell that nested git-repos are illegal. Apparently git
submodules or subtree merging would be cleaner. Subtree merging is not supported in EGit
yet though:
http://stackoverflow.com/questions/1871282/nested-git-repositories
Git-versioned projects not building when deployed on OpenShift
--------------------------------------------------------------
Key: JBIDE-12218
URL:
https://issues.jboss.org/browse/JBIDE-12218
Project: Tools (JBoss Tools)
Issue Type: Bug
Components: openshift
Affects Versions: 3.3.0.CR1
Reporter: Stefan Bunciak
Assignee: Max Rydahl Andersen
Priority: Blocker
Fix For: 3.3.2, 3.4.0.M1
Attachments: deployed-helloworld.png, push-force.png
After trying to *Commit & Push* i get: master: master [rejected - non-fast-forward]
{code}
Repository
ssh://500881bf89dc482298bebb43ea15fbdf@html-rhtestdomain.rhcloud.com/~/git/html.git/
{code}
After *publishing* via server adapter (no Maven build triggered):
{code}
Repository
ssh://500881bf89dc482298bebb43ea15fbdf@html-rhtestdomain.rhcloud.com/~/git/html.git/
Stopping application...
Done
~/git/html.git ~/git/html.git
~/git/html.git
Emptying tmp dir:
/var/lib/stickshift/500881bf89dc482298bebb43ea15fbdf/html/jbossas-7/standalone/tmp/auth
Emptying tmp dir:
/var/lib/stickshift/500881bf89dc482298bebb43ea15fbdf/html/jbossas-7/standalone/tmp/vfs
Emptying tmp dir:
/var/lib/stickshift/500881bf89dc482298bebb43ea15fbdf/html/jbossas-7/standalone/tmp/work
Starting application...
Done
{code}
Output of the server.log (used the *Tail files* option from OpenShift Explorer):
{code}
2012/06/19 09:41:23,904 INFO [org.jboss.as.controller] (Controller Boot Thread)
JBAS014774: Service status report
JBAS014777: Services which failed to start: service
jboss.server.deployment.scanner.default: org.jboss.msc.service.StartException in service
jboss.server.deployment.scanner.default: java.lang.IllegalArgumentException: JBAS015053:
/var/lib/stickshift/500881bf89dc482298bebb43ea15fbdf/html/jbossas-7/standalone/deployments
does not exist
2012/06/19 09:41:23,983 ERROR [org.jboss.as] (Controller Boot Thread) JBAS015875: JBoss
AS 7.1.0.Final "Thunder" started (with errors) in 32395ms - Started 168 of 283
services (1 services failed or missing dependencies, 111 services are passive or
on-demand)
{code}
But git project (jboss-kithensink) from
[
git://github.com/openshift/kitchensink-example.git] works fine. What's the
difference? Probably their repo layout.
--
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