Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 330000 - [releng] Add search component to SCM
Summary: [releng] Add search component to SCM
Status: RESOLVED FIXED
Alias: None
Product: e4
Classification: Eclipse Project
Component: Search (show other bugs)
Version: unspecified   Edit
Hardware: PC Linux
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: 322721
  Show dependency tree
 
Reported: 2010-11-11 09:33 EST by Paul Webster CLA
Modified: 2010-11-24 09:41 EST (History)
7 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Paul Webster CLA 2010-11-11 09:33:27 EST
We now have approval to add the search component to e4.

You can either have CVS or GIT.  Please comment on this bug.

CQ 4455 (http://dev.eclipse.org/ipzilla/show_bug.cgi?id=4455)

PW
Comment 1 Paul Webster CLA 2010-11-15 10:19:32 EST
Danail, I need someone on your team to decide which SCM your team will work in.

Git is the SCM that the Eclipse Foundation expects to move to, but it involves much more working with the commandline tools as the eGit tooling is progressing, but not at the level of the Team/CVS tooling.

The other option is just use CVS.

PW
Comment 2 Danail Branekov CLA 2010-11-24 03:45:10 EST
Hi Paul,

We had a discussion on the SCM which we will use and the team members' preference tends to using GIT. However, the rest of the E4 project is developed in CVS. Do you expect technical difficulties due to different source depots?

Thanks!

Regards, Danail
Comment 3 Paul Webster CLA 2010-11-24 07:40:31 EST
(In reply to comment #2)
> We had a discussion on the SCM which we will use and the team members'
> preference tends to using GIT. However, the rest of the E4 project is developed
> in CVS. Do you expect technical difficulties due to different source depots?

Parts of e4 have already moved to Git (well, deeplinking and the contributed installer), and we encourage it.

http://wiki.eclipse.org/E4/Git

You can use EGit and the git command line, and it will still be built from a map file (releng projects will remain in CVS).  There are 2 scripts on the wiki that can tag the map files, and Andrew and I will be available to help with that part.

The EGit guys will also appreciate work that shakes out their project :-)

PW
Comment 4 Danail Branekov CLA 2010-11-24 07:42:22 EST
All right, lets go for GIT.
Could you create a repository?

Thanks!
Comment 5 Dimitar Georgiev CLA 2010-11-24 07:46:51 EST
Hi, Paul.

Please also note we will need https enabled for this repository. Due to firewall restrictions, ssh is not an option for us.
Thanks!

Regards, Dimitar
Comment 6 Paul Webster CLA 2010-11-24 09:04:28 EST
(In reply to comment #4)
> All right, lets go for GIT.
> Could you create a repository?

I'm partway through:
git://git.eclipse.org/gitroot/e4/org.eclipse.e4.search.git

Your tests appear to need jmock (currently squirreled away in the webtools incubator) and abbot ... where can I get the OSGi bundles for abbot ?

PW
Comment 7 Paul Webster CLA 2010-11-24 09:05:50 EST
Importing into Eclipse 3.7 (ignoring the tests for now), I get one compile error:

Description	Resource	Path	Location	Type
Type mismatch: cannot convert from Class<capture#1-of ?> to Class<ISearchDestination>	DestinationsCategoryExtensionParser.java	/org.eclipse.platform.discovery.runtime/src/org/eclipse/platform/discovery/runtime/internal/xp/impl	line 105	Java Problem

PW
Comment 8 Paul Webster CLA 2010-11-24 09:16:29 EST
(In reply to comment #7)
> Description    Resource    Path    Location    Type
> Type mismatch: cannot convert from Class<capture#1-of ?> to
> Class<ISearchDestination>    DestinationsCategoryExtensionParser.java   
> /org.eclipse.platform.discovery.runtime/src/org/eclipse/platform/discovery/runtime/internal/xp/impl
>    line 105    Java Problem

This is probably related to 3.7 includes OSGi 4.3 which is now J2SE-1.5 based (includes generics).

PW
Comment 9 Danail Branekov CLA 2010-11-24 09:19:04 EST
> where can I get the OSGi bundles for abbot
You can get them from http://sourceforge.net/projects/abbot/files/abbot.swt/
However, Abbot has not passed IP reviews yet and I will log an IPZilla about it.
Until it gets resolved I guess we should keep Abbot depedend tests away from the build. Is this possible?
Comment 10 Paul Webster CLA 2010-11-24 09:26:53 EST
(In reply to comment #9)
> Until it gets resolved I guess we should keep Abbot depedend tests away from
> the build. Is this possible?

Yes, we just won't build the test feature.

PW
Comment 11 Paul Webster CLA 2010-11-24 09:41:28 EST
The contribution is in Git.  I've broken the rest of the requests up into the following bugs:

Bug 331018 -  Approve and include dependencies for the tests
Bug 331019 -  [releng] Add search to the e4 build
Bug 331020 -  Compile error against OSGi 4.3
Bug 331023 -  Enable HTTPS for the e4 search repo

We need at least bug 331020 solved before we can finish bug 331019

PW