| Summary: | cannot run web-ide configuration; need to make org.eclipse.orion.server.logs optional for server.configurator | ||
|---|---|---|---|
| Product: | [ECD] Orion | Reporter: | Adrian Aichner <adrian.aichner> |
| Component: | Server | Assignee: | Maciej Bendkowski <maciej.bendkowski> |
| Status: | RESOLVED FIXED | QA Contact: | |
| Severity: | normal | ||
| Priority: | P3 | CC: | ken_walker, maciej.bendkowski |
| Version: | unspecified | ||
| Target Milestone: | 4.0 M1 | ||
| Hardware: | PC | ||
| OS: | Linux | ||
| Whiteboard: | |||
|
Description
Adrian Aichner
There were some changes very recently regarding logging on the server. http://git.eclipse.org/c/orion/org.eclipse.orion.server.git/commit/?id=472f85f69a347e9ea90bb4020c21640e8be415ce Was a change John had to make for the build, perhaps this is the dependency you need? Hmmh, your link has +plugin@org.eclipse.orion.server.logs=GIT,tag=v20130417-0829,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.logs while my clone (rebased to master minutes ago, with no incoming change) has this: plugin@org.eclipse.orion.server.logs=GIT,tag=v20130718-1426,repo=git://git.eclipse.org/gitroot/orion/org.eclipse.orion.server.git,path=bundles/org.eclipse.orion.server.logs The v20130417-0829 looks rather old to me and is not what I see in master right now. I am pulling from origin http://git.eclipse.org/gitroot/orion/org.eclipse.orion.server.git (fetch) Ken gave you an old commit link. The latest commit which updates the version you were wondering about is: http://git.eclipse.org/c/orion/org.eclipse.orion.server.git/commit/?id=f5c6208c6337a2766e253e05541f167a8f749595 (In reply to comment #3) > Ken gave you an old commit link. The latest commit which updates the version > you were wondering about is: > http://git.eclipse.org/c/orion/org.eclipse.orion.server.git/commit/ > ?id=f5c6208c6337a2766e253e05541f167a8f749595 Thanks for the update! Can you confirm the you can run configuration web-ide without changes from orion/master? I am using eclipse-standard-kepler-R-linux-gtk to do all this. Is this OK? My git log says this: commit 9340be58fcb9f84fe7a00cbf40e19aba3c6b1fc5 Author: John Arthorne <john_arthorne@ca.ibm.com> Date: Thu Jul 18 22:30:34 2013 -0400 Releng build tagging for I201307182230 commit f5c6208c6337a2766e253e05541f167a8f749595 Author: John Arthorne <john_arthorne@ca.ibm.com> Date: Thu Jul 18 10:30:32 2013 -0400 Releng build tagging for I201307181030 And there is a diff against origin/main branch: adrian@tanga:~/git/org.eclipse.orion.server$ git diff f5c6208c6337a2766e253e05541f167a8f749595 diff --git a/releng/org.eclipse.orion.releng/maps/orion.map b/releng/org.eclipse index 649c594..71308d6 100644 --- a/releng/org.eclipse.orion.releng/maps/orion.map +++ b/releng/org.eclipse.orion.releng/maps/orion.map @@ -1,9 +1,9 @@ #client plugin@org.eclipse.orion.client.core=GIT,tag=v20130710-2208,repo=git://git.ecli -plugin@org.eclipse.orion.client.ui=GIT,tag=v20130718-1136,repo=git://git.eclips +plugin@org.eclipse.orion.client.ui=GIT,tag=v20130718-1703,repo=git://git.eclips plugin@org.eclipse.orion.client.editor=GIT,tag=v20130717-2112,repo=git://git.ec plugin@org.eclipse.orion.client.users=GIT,tag=v20130612-2007,repo=git://git.ecl -plugin@org.eclipse.orion.client.git=GIT,tag=v20130716-0415,repo=git://git.eclip +plugin@org.eclipse.orion.client.git=GIT,tag=v20130718-1719,repo=git://git.eclip #server plugin@org.eclipse.orion.launching=GIT,tag=v20110309-2156,repo=git://git.eclips (END) So I try this: adrian@tanga:~/git/org.eclipse.orion.server$ git checkout f5c6208c6337a2766e253e05541f167a8f749595 Note: checking out 'f5c6208c6337a2766e253e05541f167a8f749595'. You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout. If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example: git checkout -b new_branch_name Zweigspitze (HEAD) ist jetzt bei f5c6208... Releng build tagging for I201307181030 adrian@tanga:~/git/org.eclipse.orion.server$ Nope, does not help either. I still have to run configuration web-ide with this change adrian@tanga:~/git/org.eclipse.orion.server$ git diff diff --git a/bundles/org.eclipse.orion.server.configurator/META-INF/MANIFEST.MF index 2965d44..1177fd0 100644 --- a/bundles/org.eclipse.orion.server.configurator/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.orion.server.configurator/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.orion.server.servlets;bundle-versi org.json;bundle-version="1.0.0", org.eclipse.orion.server.search;bundle-version="0.5.0", org.eclipse.orion.server.git;bundle-version="1.0.0", - org.eclipse.orion.server.logs;bundle-version="1.0.0", + org.eclipse.orion.server.logs;bundle-version="1.0.0";resolution:=optional, org.eclipse.orion.server.npm;bundle-version="0.4.0", org.eclipse.orion.server.hosting;bundle-version="0.2.0", org.eclipse.equinox.preferences;bundle-version="3.4.0", to succeed. Adrian Quite embarrassing bug, but the .project file for org.eclipse.orion.server.logs was missing and hence you couldn't import the project into your workspace. The missing .project file was caused by a bug in the main .gitignore. We should definitely investigate the use of .gitignore.. Pushed to master: http://git.eclipse.org/c/orion/org.eclipse.orion.server.git/commit/?id=54adbcfa49208c45a87b7738c8a09116b8727dd7 Adrian, please pull changes from master. It should be working now out of the box, without any of your changes. Please confirm, so I can close the bug. Thanks Maciej! I am running commit d0dfaea97d9cffd90703fb37ff90876520209c36 Author: Maciej Bendkowski <maciej.bendkowski@pl.ibm.com> Date: Mon Jul 22 13:31:45 2013 +0200 Bug 413262 - Enable the log provider feature using a configuration entry in now and it works like a charm. It only took me a while to verify because after import projects, set target, run configuration it works when started from the eclipse IDE, but not from my command-line alias I normally use to start it. Turns out I had to update my alias since in the course of debugging this I started using a squeaky clean new eclipse workspace just to be sure. It now works fine from my updated command line alias as well. I get the alias line by just running pgrep -l -f eclipse Adrian (In reply to comment #6) > Thanks Maciej! > > I am running > > commit d0dfaea97d9cffd90703fb37ff90876520209c36 > Author: Maciej Bendkowski <maciej.bendkowski@pl.ibm.com> > Date: Mon Jul 22 13:31:45 2013 +0200 > > Bug 413262 - Enable the log provider feature using a configuration entry > in > > now and it works like a charm. Thanks for pointing this out. Closing. |