Hi
I’m trying to merge stable-develop into develop branch, but getting a WRO error when trying to access the Admin UI and nothing is displayed:
java.lang.IllegalArgumentException: Both ‘/catalog/components/search/searchmanager/SearchFormDirective.js’ and ‘org.fao.geonet.wro4j.ClosureRequireDependencyManager$Node@anonymised.com’ have the same provide id: gn_search_form_controller
In stable-develop branch there’s a file:
https://github.com/geonetwork/core-geonetwork/blob/stable-develop/web-ui/src/main/resources/catalog/components/search/searchmanager/SearchFormController.js
But in develop branch, instead it’s this one:
https://github.com/geonetwork/core-geonetwork/blob/develop/web-ui/src/main/resources/catalog/components/search/searchmanager/SearchFormDirective.js
Both have the same id and when the merge is done both are kept and cause the previous error.
Not very clear which one is the correct one. Can someone confirm so I can finish the merge?
Also please, can we just use develop branch from now? For me becomes quite confusing having these 2 branches and no clear criteria where to commit stuff.
Thanks and regards,
Jose García
–
GeoCat Bridge for ArcGIS allows instant publishing of data and metadata on GeoServer and GeoNetwork. Visit http://geocat.net for details.
Jose García
GeoCat bv
Veenderweg 13
6721 WD Bennekom
The Netherlands
http://GeoCat.net
Hi,
Some code has been made into develop branch, but changed in stable-develop, so the merge could be tricky.
For example, SearchFormDirective has replaced the file SearchFormController.js
Your error is because you kept both files. Delete SearchFormController.js , but as i said, the merge will may be tricky or break things.
···
On Mon, Jun 30, 2014 at 4:06 PM, Jose Garcia <jose.garcia@anonymised.com> wrote:
Hi
I’m trying to merge stable-develop into develop branch, but getting a WRO error when trying to access the Admin UI and nothing is displayed:
java.lang.IllegalArgumentException: Both ‘/catalog/components/search/searchmanager/SearchFormDirective.js’ and ‘org.fao.geonet.wro4j.ClosureRequireDependencyManager$Node@anonymised.com’ have the same provide id: gn_search_form_controller
In stable-develop branch there’s a file:
https://github.com/geonetwork/core-geonetwork/blob/stable-develop/web-ui/src/main/resources/catalog/components/search/searchmanager/SearchFormController.js
But in develop branch, instead it’s this one:
https://github.com/geonetwork/core-geonetwork/blob/develop/web-ui/src/main/resources/catalog/components/search/searchmanager/SearchFormDirective.js
Both have the same id and when the merge is done both are kept and cause the previous error.
Not very clear which one is the correct one. Can someone confirm so I can finish the merge?
Also please, can we just use develop branch from now? For me becomes quite confusing having these 2 branches and no clear criteria where to commit stuff.
Thanks and regards,
Jose García
–
GeoCat Bridge for ArcGIS allows instant publishing of data and metadata on GeoServer and GeoNetwork. Visit http://geocat.net for details.
Jose García
GeoCat bv
Veenderweg 13
6721 WD Bennekom
The Netherlands
http://GeoCat.net
Open source business process management suite built on Java and Eclipse
Turn processes into business applications with Bonita BPM Community Edition
Quickly connect people, data, and systems into organized workflows
Winner of BOSSIE, CODIE, OW2 and Gartner awards
http://p.sf.net/sfu/Bonitasoft
GeoNetwork-devel mailing list
GeoNetwork-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork
–
Florent Gravin
Camptocamp - Chambéry
0479444492
Hi Florent
Thanks for the feedback. I was not sure which of the 2 files should be kept. The rest of the merge was fine (no conflicts), except 2 files, but in ExtJS UI.
Will check today to do some testing and finish the merge of stable-develop into develop branch.
I guess the best should be to use only the develop branch for development and forget about stable-develop.
Regards,
Jose García
···
On Tue, Jul 1, 2014 at 11:19 AM, Florent Gravin <florent.gravin@anonymised.com> wrote:
Hi,
Some code has been made into develop branch, but changed in stable-develop, so the merge could be tricky.
For example, SearchFormDirective has replaced the file SearchFormController.js
Your error is because you kept both files. Delete SearchFormController.js , but as i said, the merge will may be tricky or break things.
–
GeoCat Bridge for ArcGIS allows instant publishing of data and metadata on GeoServer and GeoNetwork. Visit http://geocat.net for details.
Jose García
GeoCat bv
Veenderweg 13
6721 WD Bennekom
The Netherlands
http://GeoCat.net
On Mon, Jun 30, 2014 at 4:06 PM, Jose Garcia <jose.garcia@anonymised.com> wrote:
Hi
I’m trying to merge stable-develop into develop branch, but getting a WRO error when trying to access the Admin UI and nothing is displayed:
java.lang.IllegalArgumentException: Both ‘/catalog/components/search/searchmanager/SearchFormDirective.js’ and ‘org.fao.geonet.wro4j.ClosureRequireDependencyManager$Node@anonymised.com’ have the same provide id: gn_search_form_controller
In stable-develop branch there’s a file:
https://github.com/geonetwork/core-geonetwork/blob/stable-develop/web-ui/src/main/resources/catalog/components/search/searchmanager/SearchFormController.js
But in develop branch, instead it’s this one:
https://github.com/geonetwork/core-geonetwork/blob/develop/web-ui/src/main/resources/catalog/components/search/searchmanager/SearchFormDirective.js
Both have the same id and when the merge is done both are kept and cause the previous error.
Not very clear which one is the correct one. Can someone confirm so I can finish the merge?
Also please, can we just use develop branch from now? For me becomes quite confusing having these 2 branches and no clear criteria where to commit stuff.
Thanks and regards,
Jose García
–
GeoCat Bridge for ArcGIS allows instant publishing of data and metadata on GeoServer and GeoNetwork. Visit http://geocat.net for details.
Jose García
GeoCat bv
Veenderweg 13
6721 WD Bennekom
The Netherlands
http://GeoCat.net
Open source business process management suite built on Java and Eclipse
Turn processes into business applications with Bonita BPM Community Edition
Quickly connect people, data, and systems into organized workflows
Winner of BOSSIE, CODIE, OW2 and Gartner awards
http://p.sf.net/sfu/Bonitasoft
GeoNetwork-devel mailing list
GeoNetwork-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork
–
Florent Gravin
Camptocamp - Chambéry
0479444492
Hi Florent
I just merged stable-develop into develop.
I have done some testing and seem fine, but the file https://github.com/geonetwork/core-geonetwork/blob/develop/web-ui/src/main/resources/catalog/components/edit/directoryentryselector/DirectoryEntrySelector.js has been modified in both branches, so better if you or Francois check that the merged file is fine.
Would be good if all agree on which branch to use for development. I really prefer to close stable-develop as I don’t understand it’s purpose. We can always revert changes in develop branch. But lets see what others think.
In any case if we keep it, lets do all work there and do weekly merges to develop branch.
Regards,
Jose García
···
On Tue, Jul 1, 2014 at 11:19 AM, Florent Gravin <florent.gravin@anonymised.com> wrote:
Hi,
Some code has been made into develop branch, but changed in stable-develop, so the merge could be tricky.
For example, SearchFormDirective has replaced the file SearchFormController.js
Your error is because you kept both files. Delete SearchFormController.js , but as i said, the merge will may be tricky or break things.
–
GeoCat Bridge for ArcGIS allows instant publishing of data and metadata on GeoServer and GeoNetwork. Visit http://geocat.net for details.
Jose García
GeoCat bv
Veenderweg 13
6721 WD Bennekom
The Netherlands
http://GeoCat.net
On Mon, Jun 30, 2014 at 4:06 PM, Jose Garcia <jose.garcia@anonymised.com> wrote:
Hi
I’m trying to merge stable-develop into develop branch, but getting a WRO error when trying to access the Admin UI and nothing is displayed:
java.lang.IllegalArgumentException: Both ‘/catalog/components/search/searchmanager/SearchFormDirective.js’ and ‘org.fao.geonet.wro4j.ClosureRequireDependencyManager$Node@anonymised.com’ have the same provide id: gn_search_form_controller
In stable-develop branch there’s a file:
https://github.com/geonetwork/core-geonetwork/blob/stable-develop/web-ui/src/main/resources/catalog/components/search/searchmanager/SearchFormController.js
But in develop branch, instead it’s this one:
https://github.com/geonetwork/core-geonetwork/blob/develop/web-ui/src/main/resources/catalog/components/search/searchmanager/SearchFormDirective.js
Both have the same id and when the merge is done both are kept and cause the previous error.
Not very clear which one is the correct one. Can someone confirm so I can finish the merge?
Also please, can we just use develop branch from now? For me becomes quite confusing having these 2 branches and no clear criteria where to commit stuff.
Thanks and regards,
Jose García
–
GeoCat Bridge for ArcGIS allows instant publishing of data and metadata on GeoServer and GeoNetwork. Visit http://geocat.net for details.
Jose García
GeoCat bv
Veenderweg 13
6721 WD Bennekom
The Netherlands
http://GeoCat.net
Open source business process management suite built on Java and Eclipse
Turn processes into business applications with Bonita BPM Community Edition
Quickly connect people, data, and systems into organized workflows
Winner of BOSSIE, CODIE, OW2 and Gartner awards
http://p.sf.net/sfu/Bonitasoft
GeoNetwork-devel mailing list
GeoNetwork-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geonetwork-devel
GeoNetwork OpenSource is maintained at http://sourceforge.net/projects/geonetwork
–
Florent Gravin
Camptocamp - Chambéry
0479444492
Hi Jose,
Would be good if all agree on which branch to use for development. I
really prefer to close stable-develop as I don't understand it's purpose.
We can always revert changes in develop branch. But lets see what others
think.
stable-develop is still used from our side (camptocamp + Francois-Xavier)
on a client's project because we encounter some issues with the current
develop branche. stable-develop has been created because one wanted a
stable version of the develop branche before potentially breaking some
things (I guess jesse initiated it).
In any case if we keep it, lets do all work there and do weekly merges to
develop branch.
+1,
Regards,
--
Pierre Mauduit
Ingénieur développement
Camptocamp France SAS
Savoie Technolac, BP 352
73377 Le Bourget du Lac, Cedex
Tel (France) : +33 4 79 26 58 02
Fax : 04 79 70 15 81
Mail : pierre.mauduit@anonymised.com <yves.jacolin@anonymised.com>
http://www.camptocamp.com
Thanks Florent.
I understand the purpose of this stable-develop branch, for now just merging every week to develop I guess should be quite fine.
Related to this, I guess this is a common case:
But, some clients want to have develop features, but stable 
Probably can be mitigated having a good release calendar in the project, something to discuss in IRC with the other developers. If we plan for example a release every 6 months, I think is easier to have the develop branch in healthy quite stable status.
Regards,
Jose García
···
On Thu, Jul 3, 2014 at 2:30 PM, Florent Gravin <florent.gravin@anonymised.com89…> wrote:
Hi,
–
GeoCat Bridge for ArcGIS allows instant publishing of data and metadata on GeoServer and GeoNetwork. Visit http://geocat.net for details.
Jose García
GeoCat bv
Veenderweg 13
6721 WD Bennekom
The Netherlands
http://GeoCat.net
I have done some testing and seem fine, but the file https://github.com/geonetwork/core-geonetwork/blob/develop/web-ui/src/main/resources/catalog/components/edit/directoryentryselector/DirectoryEntrySelector.js has been modified in both branches, so better if you or Francois check that the merged file is fine.
Ok thanks i will check that next week, cause something need to be fixed in the DirectoryEntrySelector.
Would be good if all agree on which branch to use for development. I really prefer to close stable-develop as I don’t understand it’s purpose. We can always revert changes in develop branch. But lets see what others think.
I share your opinion on this branch, for me it is useless and confusing. But, some clients want to have develop features, but stable I think we will need to remove it quite soon.
Anyway, developements need to be done in develop IMO, and it is the branch i started the search-ui and map-viewer from.
Cheers
–
Florent Gravin
Camptocamp - Chambéry
0479444492
I think we will need to remove it quite soon.