Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 416653 - [server] Remove the orion.file.layout option (userTree or flat)
Summary: [server] Remove the orion.file.layout option (userTree or flat)
Status: RESOLVED FIXED
Alias: None
Product: Orion
Classification: ECD
Component: Server (show other bugs)
Version: 4.0   Edit
Hardware: PC Linux
: P3 normal (vote)
Target Milestone: 6.0 M2   Edit
Assignee: Anthony Hunter CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: 432565
  Show dependency tree
 
Reported: 2013-09-05 14:10 EDT by Anthony Hunter CLA
Modified: 2014-04-27 10:32 EDT (History)
1 user (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Anthony Hunter CLA 2013-09-05 14:10:16 EDT
See http://wiki.eclipse.org/Orion/Server_admin_guide#Configuring_project_layout 

The default layout is flat but you can optionally set the value orion.file.layout=userTree to turn on organizing the layout of the projects.

In fact the value on the orion.eclipse.org server is userTree.

As a result I have been handling both options when doing migration of the metadata for Bug 412995 and Bug 415796.

Unfortunately, many of the JUnit tests fail if you try to test against an Orion server running with layout=userTree, which is making testing a challenge.

I am opening up a discussion point that I would like to set the default be orion.file.layout=userTree and we remove the flat layout option.
Comment 1 John Arthorne CLA 2013-09-06 08:42:20 EDT
Removing it is fine with me. We should also remove the documentation for the option to avoid confusion.
Comment 2 Anthony Hunter CLA 2013-09-10 14:37:19 EDT
(In reply to Anthony Hunter from comment #0)
> Unfortunately, many of the JUnit tests fail if you try to test against an
> Orion server running with layout=userTree, which is making testing a
> challenge.

The test failures were solved with two fixes to the tests, see Bug 416952 and Bug 416956.
Comment 3 Anthony Hunter CLA 2013-09-17 10:55:30 EDT
The new SimpleMetaStore will only support orion.file.layout=userTree and we can remove this option in Orion 4.0.
Comment 4 Anthony Hunter CLA 2013-10-03 16:24:08 EDT
(In reply to Anthony Hunter from comment #3)
> The new SimpleMetaStore will only support orion.file.layout=userTree and we
> can remove this option in Orion 4.0.

We can remove this from the documentation whenever we remove the legacy storage. I am not sure if we are going to remove the old storage in 4.0, this is likely a 5.0 feature.
Comment 5 Anthony Hunter CLA 2014-02-24 14:02:44 EST
We can look at doing this for 6.0. I assume we can remove the legacy metadata storage during 6.0?
Comment 6 Anthony Hunter CLA 2014-04-22 12:24:33 EDT
The CONFIG_FILE_LAYOUT preference is only referred to in the OrionConfiguration class. Since it is only really used by the CompatibilityMetaStore, the preference should be moved there.

I will deliver this changes with the code changes required for Bug 432565
Comment 7 Anthony Hunter CLA 2014-04-24 17:45:40 EDT
(In reply to Anthony Hunter from comment #6)
> The CONFIG_FILE_LAYOUT preference is only referred to in the
> OrionConfiguration class. Since it is only really used by the
> CompatibilityMetaStore, the preference should be moved there.
> 
> I will deliver this changes with the code changes required for Bug 432565

I have updated https://wiki.eclipse.org/Orion/Server_admin_guide#Configuring_project_layout to document that the property is no longer supported.

The CONFIG_FILE_LAYOUT preference has also been moved into the CompatibilityMetaStore with commit from Bug 433238:
http://git.eclipse.org/c/orion/org.eclipse.orion.server.git/diff/bundles/org.eclipse.orion.server.servlets/src/org/eclipse/orion/internal/server/servlets/workspace/CompatibilityMetaStore.java?id=dfb6a1256a9970be2774a164af84dba30389805f

The commit is in branch ah-Bug432565 currently
Comment 8 John Arthorne CLA 2014-04-27 10:32:27 EDT
(In reply to Anthony Hunter from comment #5)
> We can look at doing this for 6.0. I assume we can remove the legacy
> metadata storage during 6.0?

Sure, if it is complicated to keep it. In server admin guide we should give updated migration instructions for those who never migrated off the old format.. for example first use Orion 5.0 to migrate to "simple" format, and then use Orion 6.0 to migrate to new format.