Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 328234 - Git repos for EPF Project
Summary: Git repos for EPF Project
Status: RESOLVED FIXED
Alias: None
Product: Community
Classification: Eclipse Foundation
Component: Git (show other bugs)
Version: unspecified   Edit
Hardware: PC Windows 7
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Eclipse Webmaster CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-10-20 07:15 EDT by Onno van der Straaten CLA
Modified: 2013-03-22 11:16 EDT (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 Onno van der Straaten CLA 2010-10-20 07:15:27 EDT
Hi,
I was wondering if we can get an Subversion repos for our project, the Eclipse Process Framework project. We don't have that as far as I know and I think we (will) need it. 
Thanks and Regards,
Onno
Comment 1 Eclipse Webmaster CLA 2010-10-20 09:55:49 EDT
Are you looking to move from CVS to SVN? Is there a reason you're not moving to GIT?
Either way it's not a problem, all we need to do is schedule the move.

I've cc'd Wayne in case I've missed something.

-M.
Comment 2 Onno van der Straaten CLA 2010-10-20 10:09:02 EDT
Please don't schedule a move yet, I'm just enquiring right now, I have to consult the other committer members as well. 

I was btw thinking of 'adding' a SVN repos and not 'replacing' the CVS with a SVN repos. I did not know it was possible to 'move'. Now that I know this possible I think we have to consider moving everything to Subversion but this something I think we have to discus. 

But do you think it would be better to move to GIT? I have no experience with GIT but my impression is that is not as easy to learn as Subversion and not so user friendly. Am I wrong, should I be using GIT??

Onno
Comment 3 Eclipse Webmaster CLA 2010-10-20 10:21:43 EDT
> I was btw thinking of 'adding' a SVN repos and not 'replacing' the CVS with a
> SVN repos.

We actively 'discourage' using 2 VCS systems for the same project as it increases the difficulty of managing data.

> I did not know it was possible to 'move'. Now that I know this
> possible I think we have to consider moving everything to Subversion but this
> something I think we have to discus. 

Of course, I just wasn't sure if you(the project) had already done so.

> But do you think it would be better to move to GIT? I have no experience with
> GIT but my impression is that is not as easy to learn as Subversion and not so
> user friendly. Am I wrong, should I be using GIT??

Well certainly more project are moving towards GIT, and I know the EGit/JGit projects are working on making GIT easier to use within Eclipse.

-m.
Comment 4 Denis Roy CLA 2012-03-23 11:06:07 EDT
Matt, Onno, what's the status of this?
Comment 5 Ricardo Balduino CLA 2012-10-26 15:35:58 EDT
I think it is time to make the move - the clock is ticking for the last chance to move before end of the year 2012.

Onno, is that something you would like to coordinate from the EPF committers side?
I personally don't mind using either SVN or Git. If most projects are moving to on or another, let's follow their lead.

Eclipse webmaster, can you help us automate the move of source code, process content, and web site pages to the new repository?
Comment 6 Onno van der Straaten CLA 2012-10-27 05:09:45 EDT
Yes sure Ricardo I am willing to do that. Git or SVN, I don't mind as well but I agree lets follow the other projects and move to Git.
Comment 7 Wayne Beaton CLA 2012-10-29 10:50:00 EDT
(In reply to comment #6)
> Yes sure Ricardo I am willing to do that. Git or SVN, I don't mind as well
> but I agree lets follow the other projects and move to Git.

+1

(In reply to comment #5)
> I personally don't mind using either SVN or Git. If most projects are moving
> to on or another, let's follow their lead.

For completeness, we intend to officially deprecate SVN soon. We've already removed it from the New Project Provisioning Request (NPPR) form. Git is your best choice.
Comment 8 Ricardo Balduino CLA 2012-10-29 18:32:40 EDT
+1 for Git.

Thanks Onno for taking care of this. You may want to close this Bugzilla discussion and open a new Bugzilla item under the EPF project. In fact I had created a new entry before seeing this discussion, you may reassign that one to you: https://bugs.eclipse.org/bugs/show_bug.cgi?id=392947
Comment 9 Bingxue Xu CLA 2012-10-30 13:20:41 EDT
+1 for Git.

Just need one clarification: Onno is going to move the entire EPF repository to this new repository, right? Including the EPF web site, EPFWiki, the EPF Composer, etc.

Also let's just stay on one Bugzilla for this task. Which one do you want to use? This one or the one Ricardo created?

Thanks much.
Comment 10 Eclipse Webmaster CLA 2012-10-30 14:34:13 EDT
We separate the project code from the website, so at a minimum you'll have 2 repos going forward.

Are you guys running a custom wiki of some kind on top of www.eclipse.org?

-M.
Comment 11 Onno van der Straaten CLA 2012-10-30 15:07:09 EDT
We have the EPF Wiki at http://epf.eclipse.org and http://epfdemo.eclipse.org but that is completely separate from the CVS repository.
Comment 12 Bingxue Xu CLA 2012-10-30 18:01:26 EDT
So to clairfy, we need three repositories:

EPF Project website
EPF Project code and content
EPFWiki

Is that correct?

Do we also request the aministrators to create them for the EPF project?

Thanks much.
Comment 13 Onno van der Straaten CLA 2012-10-31 04:00:14 EDT
We can consider that but I think the 'standard' migration will create two repositories. One for the website and one for the project files. 

One for /cvsroot/technology/org.eclipse.epf/. That includes everything from project: composer, EPF Wiki, libraries etc.

And one for the website /cvsroot/org.eclipse/www/epf
Comment 14 Onno van der Straaten CLA 2012-10-31 04:03:01 EDT
I think this bug can/should be considered the request to create/migrate our repositories. Now that we have consensus.
Comment 15 Wayne Beaton CLA 2012-10-31 10:27:39 EDT
(In reply to comment #12)
> So to clairfy, we need three repositories:
> 
> EPF Project website
> EPF Project code and content
> EPFWiki

Wiki?

Why do you need a repository for the wiki?
Comment 16 Onno van der Straaten CLA 2012-10-31 14:27:36 EDT
(In reply to comment #15)
> (In reply to comment #12)
> > So to clairfy, we need three repositories:
> > 
> > EPF Project website
> > EPF Project code and content
> > EPFWiki
> 
> Wiki?
> 
> Why do you need a repository for the wiki?

Our EPF Wiki is not related to the Eclipse wiki. It is custom developed Wiki technology to be used together with EPF composer. So the code of that we keep in the repository as well.
Comment 17 Bingxue Xu CLA 2012-10-31 14:46:37 EDT
Sure, so we just need two repostiories in this case.

EPF Project website
EPF Project code and content and EPFWiki code

Thanks much.
Comment 18 Eclipse Webmaster CLA 2012-10-31 14:49:15 EDT
Do we have a time line for this?  Today, tomorrow, or next week?  Is there any cleanup to be done in CVS before it's pulled into Git?

-M.
Comment 19 Wayne Beaton CLA 2012-10-31 15:11:48 EDT
(In reply to comment #16)
> Our EPF Wiki is not related to the Eclipse wiki. It is custom developed Wiki
> technology to be used together with EPF composer. So the code of that we
> keep in the repository as well.

Is the EPF Wiki in project scope?

Have contributions to the EPF Wiki followed the IP Due Diligence process?

Has third party contributions to the wiki code followed the IP Due Diligence process?

FWIW, I noticed that there are several libraries [1,2] that I believe require CQs.

Every file in the EPF Wiki code that I looked at was missing the required copyright and license headers. They need to be added.


[1]http://dev.eclipse.org/viewcvs/viewvc.cgi/org.eclipse.epf/projects/org.eclipse.epf.web/lib/?root=Technology_Project
[2]http://dev.eclipse.org/viewcvs/viewvc.cgi/org.eclipse.epf/projects/org.eclipse.epf.web.search/lib/?root=Technology_Project
Comment 20 Bingxue Xu CLA 2012-10-31 15:21:08 EDT
As for the time line, can we plan this for early Dec, that is, the week of Dec 3, 2012?

As for EPFWiki, Onnon is the sole contributor and I believe that he did go through the IP process. If there is anything that needs to be corrected, we will ask Onno to review and reply.

Thanks much.
Comment 21 Wayne Beaton CLA 2012-10-31 15:22:52 EDT
(In reply to comment #20)
> As for the time line, can we plan this for early Dec, that is, the week of
> Dec 3, 2012?
> 
> As for EPFWiki, Onnon is the sole contributor and I believe that he did go
> through the IP process. If there is anything that needs to be corrected, we
> will ask Onno to review and reply.

You didn't answer my question regarding scope.

The copyright and license headers must be addressed.

The potentially-missing CQs are not related to the EPF Wiki code. This must be addressed.
Comment 22 Bingxue Xu CLA 2012-10-31 15:29:27 EDT
EPFWiki is a sub-project inside EPF, Onno is the one who takes full responsibility for that sub-project. We have to ask him to address any issue related with WPFWiki.

Thanks.
Comment 23 Wayne Beaton CLA 2012-11-05 11:42:30 EST
Changing the summary of this bug to reflect the current status (and make searches easier).
Comment 24 Onno van der Straaten CLA 2012-11-26 14:22:12 EST
The EPF Wiki contributions have followed the IP Due Diligence proces. The copyright and license headers where removed by mistake when I upgraded the source to newer version of the web framework used (Rails).

I can re-add the license etc but it seems I have lost access to the CVS server. When I try my connection it responds with
Error fetching resource list from repository
Reason:
Unknow response received from csv server:

I can ssh to the machine so I'm not sure what is wrong with the connection
ostraaten@Ali:~$ ssh ovander@dev.eclipse.org
Password: 
Last login: Mon Sep 17 14:22:02 2012 from 5ed135b9.cm-7-2a.dynamic.ziggo.nl

				dev.eclipse.org
                                git.eclipse.org                    
 
                                      ***
Please be aware that these servers must be used for purposes approved by the 
Eclipse Management Organization (EMO) and/or an Eclipse Project Management 
Committee (PMC).




(In reply to comment #19)
> (In reply to comment #16)
> > Our EPF Wiki is not related to the Eclipse wiki. It is custom developed Wiki
> > technology to be used together with EPF composer. So the code of that we
> > keep in the repository as well.
> 
> Is the EPF Wiki in project scope?
> 
> Have contributions to the EPF Wiki followed the IP Due Diligence process?
> 
> Has third party contributions to the wiki code followed the IP Due Diligence
> process?
>
Comment 25 Wayne Beaton CLA 2012-11-26 14:26:23 EST
Moving to Community/Git.
Comment 26 Wayne Beaton CLA 2012-11-26 14:32:24 EST
(In reply to comment #24)
> I can re-add the license etc but it seems I have lost access to the CVS
> server. When I try my connection it responds with
> Error fetching resource list from repository

The files in the directory and all those nested below seem to be read-only. Did somebody from the project do that?
Comment 27 Wayne Beaton CLA 2012-11-26 14:34:49 EST
(In reply to comment #24)
> The EPF Wiki contributions have followed the IP Due Diligence proces. The
> copyright and license headers where removed by mistake when I upgraded the
> source to newer version of the web framework used (Rails).
> 

I don't think I understand.

How and why would the license headers be removed? If the code is being maintained in an eclipse.org repository, then the headers should be present.

Is the code being maintained elsewhere and periodically copied to eclipse.org?

AFAICT, there is no approved CQ for Rails. Should there be one?
Comment 28 Onno van der Straaten CLA 2012-11-26 15:15:52 EST
After reading http://wiki.eclipse.org/Git/Migrating_to_Git I think it might better to have more git repositories.

I put it in a wiki page
http://wiki.eclipse.org/EPF_Git_Repositories

Basically a git repository is created for each folder.
Comment 29 Onno van der Straaten CLA 2012-11-26 15:42:17 EST
(In reply to comment #27)
> (In reply to comment #24)
> > The EPF Wiki contributions have followed the IP Due Diligence proces. The
> > copyright and license headers where removed by mistake when I upgraded the
> > source to newer version of the web framework used (Rails).
> > 
> 
> I don't think I understand.
> 
> How and why would the license headers be removed? If the code is being
> maintained in an eclipse.org repository, then the headers should be present.
> 
> Is the code being maintained elsewhere and periodically copied to
> eclipse.org?
> 
> AFAICT, there is no approved CQ for Rails. Should there be one?

I thought that the copyright statement in the root would suffice. See http://dev.eclipse.org/viewcvs/viewvc.cgi/org.eclipse.epf/epfwiki/source/COPYRIGHT?view=markup&revision=1.4&root=Technology_Project. I forgot that it is a requirement to have a license statement in each file. On upgrade to 3.1.4 I 'cleaned' all license statements, personally I thought it was a bit much to have that in each file. See for example http://dev.eclipse.org/viewcvs/viewvc.cgi/org.eclipse.epf/epfwiki/source/app/controllers/comments_controller.rb?root=Technology_Project&r1=1.6&r2=1.7

But to cut a long story short, lets skip this component. I think it is at the end of its life cycle, we don't need to migrate it. We can have this discussion when there is a demand in the community for it. I'll remove the downloads and put up a notice.
Comment 30 Onno van der Straaten CLA 2012-11-26 15:52:24 EST
Remove the downloads see http://eclipse.org/epf/downloads/epfwiki/downloads.php
Comment 31 Eclipse Webmaster CLA 2012-11-30 11:00:46 EST
Ok, can someone summarize what Webmaster needs to do and when?

-M.
Comment 32 Eclipse Webmaster CLA 2012-12-03 11:44:46 EST
Ok based on comments 20 and 28 I ran the conversions today.  CVS has been frozen and the Git URLs are:

Code:

ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.additional.git  ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.features.git
ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.nl-src.git
ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.prototype.git
ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.ai.git
ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.libraries.git
ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.plugins.git
ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.tests.git
ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.archive.git
ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.nl-libraries.git
ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.projects.git

http://git.eclipse.org/gitroot/epf/org.eclipse.epf.additional.git  http://git.eclipse.org/gitroot/epf/org.eclipse.epf.features.git
http://git.eclipse.org/gitroot/epf/org.eclipse.epf.nl-src.git
http://git.eclipse.org/gitroot/epf/org.eclipse.epf.prototype.git
http://git.eclipse.org/gitroot/epf/org.eclipse.epf.ai.git
http://git.eclipse.org/gitroot/epf/org.eclipse.epf.libraries.git
http://git.eclipse.org/gitroot/epf/org.eclipse.epf.plugins.git
http://git.eclipse.org/gitroot/epf/org.eclipse.epf.tests.git
http://git.eclipse.org/gitroot/epf/org.eclipse.epf.archive.git
http://git.eclipse.org/gitroot/epf/org.eclipse.epf.nl-libraries.git
http://git.eclipse.org/gitroot/epf/org.eclipse.epf.projects.git


Website

ssh://committer_id@git.eclipse.org/gitroot/www.eclipse.org/epf.git
http://git.eclipse.org/gitroot/www.eclipse.org/epf.git

-M.
Comment 33 Wayne Beaton CLA 2012-12-03 11:59:09 EST
Please be sure to update the project metadata in the portal!
Comment 34 Bingxue Xu CLA 2012-12-03 19:25:17 EST
Hi Webmaster,

Could you please also create a component called "composer" under org.eclipse.epf so we have a corresponding one compared to the CVS repository?

Thanks very much.
Comment 35 Bingxue Xu CLA 2012-12-03 19:35:02 EST
And the following three too:
     desgin
     docs
     epfwiki

Thanks very much.
Bing.
Comment 36 Bingxue Xu CLA 2012-12-04 02:45:05 EST
Hi Webmaster,

Please unlock our EPF CVS repo as it broke our current daily builds. We got the following error message:
      Failed CVS command: cvs -d :ext:bxu@dev.eclipse.org:/cvsroot/technology rtag...

We thought we could still use the CVS repo for our builds, but apparently it won't work. So please keep it unlocked until the CVS repo shutdown deadline, that is, Dec. 21, 2012.

Please help ASAP as our daily builds are blocked, and we are releasing the current releases this month.

Thanks very much.
Comment 37 Bingxue Xu CLA 2012-12-04 12:31:39 EST
Hi Webmaster,

Any update on this?

Could you please unlock the EPF project CVS repo ASAP for now as our daily builds are broken due to this lock? We don't have time to redo my builds using Git at this time as we are approaching release time.

Thanks very much.
Bing.
Comment 38 Eclipse Webmaster CLA 2012-12-04 13:10:17 EST
Ok I've unfrozen CVS.

-M.
Comment 39 Bingxue Xu CLA 2012-12-04 14:10:07 EST
Thanks a million!!!
Bing.
Comment 40 Eclipse Webmaster CLA 2012-12-04 14:39:15 EST
(In reply to comment #34)
(In reply to comment #35)

Not sure what your asking for here.  If you would like some 'empty' Git repos under /gitroot/epf you can create them by logging into build and issuing:

>initrepo /gitroot/epf/some.repo.git

-M.
Comment 41 Bingxue Xu CLA 2012-12-04 17:58:34 EST
Sure, we will do that ourselves.

Thanks very much.
Comment 42 Wayne Beaton CLA 2012-12-12 12:28:00 EST
Please update the project metatdata to point to the new Git repositories!
Comment 43 Weiping Lu CLA 2013-01-07 20:55:31 EST
Hi Webmaster,

Could you please create/migrate the "composer", "design", "docs", and "epfwiki" components for us?

I've also noticed that the contents of the following components did not get migrated from cvs:

ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.nl-src.git

ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.libraries.git

ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.plugins.git

ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.archive.git

ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.nl-libraries.git


The "composer" is the most critical/important component, as it contains the EPF source code history for the most recent years. We would feel much more comfortable that at lease the migration of this component is done by the expert :-) 


Many thanks!,

Weiping
Comment 44 Weiping Lu CLA 2013-01-08 11:53:48 EST
Copy Alex's comment here:

"Based on my investigation, we do need Eclipse admin to help import/create Git repo for data under composer/1.5 directory, the only reason is to keep the history come from CVS repo."
Comment 45 Weiping Lu CLA 2013-01-08 12:04:16 EST
Hi Webmaster,

Could you please help us on "composer" as soon as possible? Our 1st iteration for the next EPF release has already started this week.

Thanks in advance,

Weiping
Comment 46 Eclipse Webmaster CLA 2013-01-08 14:16:47 EST
(In reply to comment #43)

> Could you please create/migrate the "composer", "design", "docs", and
> "epfwiki" components for us?

Done.  For some reason I called the composer repo org.eclipse.epf.ai.git, so I re-ran the import.

ssh://committer_id@git.eclipse.org.gitroot/epf/org.eclipse.epf.epfcomposer.git
ssh://committer_id@git.eclipse.org.gitroot/epf/org.eclipse.epf.design.git
ssh://committer_id@git.eclipse.org.gitroot/epf/org.eclipse.epf.docs.git
ssh://committer_id@git.eclipse.org.gitroot/epf/org.eclipse.epf.wiki.git

> ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.nl-src.git
> ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.nl-libraries

This was due to - vs _ .  I've re-run the imports.
 
> ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.libraries.git
> ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.plugins.git
> ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.archive.git

These all 'look' ok(they have a non-empty size).  Is there something I'm missing?

-M.
Comment 47 Weiping Lu CLA 2013-01-08 18:00:58 EST
Hi Webmaster,

Thank you very much for the prompt action - now we are having "composer", "design", "docs" components in Git repo !

There are still two less critical issues:

(1) Would it be possible to changes the name from "...org.eclipse.epf.epfcomposer.git" to  "...org.eclipse.epf.composer.git" so that it is better matched with the name in the original CVS repo "composer"? 

However, if you know that there is any risk/complication with the change, then don't change it.

(2) For the following 2 components, when I cloned any of them, I still got "Source Git repository is empty":

ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.plugins.git
ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.archive.git

The following three are fine now (contents not empty):

ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.nl-src.git
ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.libraries.git
ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.nl-libraries.git

Thanks,

Weiping
Comment 48 Eclipse Webmaster CLA 2013-01-09 11:10:05 EST
(In reply to comment #47)

> (1) Would it be possible to changes the name from
> "...org.eclipse.epf.epfcomposer.git" to  "...org.eclipse.epf.composer.git"

Done.
 
> ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.plugins.git
> ssh://committer_id@git.eclipse.org/gitroot/epf/org.eclipse.epf.archive.git

Sigh, that will teach me to write a script to run all of the imports.  There were some errors during the original conversion(conflicting files in Attic) that were 'lost' in the output stream.  I've re-run the imports and checked that the repos are now non-empty.

-M.
Comment 49 Weiping Lu CLA 2013-01-09 13:09:54 EST
Hi Webmaster,

Thank you !!

All look well now, and we greatly appreciate your timely support :-)

Weiping
Comment 50 Denis Roy CLA 2013-03-22 11:16:37 EDT
Fixed.