Adapt Relay Search integration to Metrics' project standards

added component::metrics/website owner::metrics-team priority::medium resolution::fixed reviewer::karsten severity::normal status::closed type::defect labels

Trac:
Status: new to accepted
Owner: metrics-team to iwakeh

See also #25393 (moved).

A while ago we decided at the team meeting that RS will be integrated, i.e., merged into metrics-web, so the submodule will be obsolete then.

For integrating rs into mw I started with rs commit b6e6c3235806c9d1521dbc2c08cecee626466928.

Please use this branch for all further work on RS into Metrics-web integration.

If possible treat these ticket's children with highest priority and when implementing further RS functionality also make sure it ends up in the merge branch.

The completeness of the merge branch regarding RS needs to checked.

Re-assigning this to metrics-team now.

Trac:
Owner: iwakeh to metrics-team
Status: accepted to assigned

Trac:
Status: assigned to needs_review

Probably not this week, but I will review the changes in comment:4 as soon as I can. The plan in the description looks great though.

This ticket's description doesn't reflect the decision to finally merge RS into metrics-web, it rather describes the adaption of RS as separate sub-module. The above steps are not necessary for the tight integration, they only make sense, if RS stays separate.

It seems the discussion should be re-opened here?

Setting to needs_information.

This is a topic for the Aberdeen meeting.

Trac:
Status: needs_review to needs_information

Trac:
Description: RelaySearch integration needs some tuning and streamlining: First steps

Move from src/main/resources/web/rs into src/submods/relaysearch
Only include fonts once into the war file (currently these are duplicated)
Avoid including readme files and scripts that are not needed for the running web application into the war file.
Separate preparation steps inside RelaySearch from building the war.
Create an Ant task that prepares RelaySearch for war file inclusion and adds the needed files to the war file.

More tasks should be added as comments.

to

Depending on the decision Metrics Team reaches:

== In case Relay Search is merged into metrics-web

This would require to add RS code to the appropriate places in metrics-web. (see comment:5 for a first draft branch)

== In case Relay Search stays separate

RelaySearch integration needs some tuning and streamlining: First steps

Move from src/main/resources/web/rs into src/submods/relaysearch
Only include fonts once into the war file (currently these are duplicated)
Avoid including readme files and scripts that are not needed for the running web application into the war file.
Separate preparation steps inside RelaySearch from building the war.
Create an Ant task that prepares RelaySearch for war file inclusion and adds the needed files to the war file.

More tasks should be added as comments.

Please review my https://gitweb.torproject.org/user/irl/metrics-web.git/log/?h=task/25392 branch.

commit	714ae2df3d54608eadab5420035c3210e685c2f0

Integrate RelaySearch (Fixes: #25392)

This is using commit b6e6c3235806c9d1521dbc2c08cecee626466928 of atlas.git.

 * Removes submodule for RS.
 * Move two license files to basedirectory; these should be merged.
 * Move atlas.css into css folder
 * Fonts in both were identical
 * Changes all findable paths to the new setting
 * js libs were simply copied; these should be sorted out more
 * Merged rs/img and rs/images folder into images

Thanks to iwakeh for the bulk of the work in this commit.

Trac:
Status: needs_information to needs_review

I'll take a look today.

Trac:
Reviewer: N/A to karsten

Okay, this went faster than it looked on first sight. I found two minor things:

Those .class files in bin/ should probably not be in the repository. Can you remove them in a fixup commit that I can squash into 714ae2d?
There are now unused files in src/main/resources/web/images/, like atlas.png and atlas.xcf. Would you want to look out for other unused images and remove those, too, possibly in a separate (non-fixup) commit?

I can merge and deploy later today.

Trac:
Status: needs_review to needs_revision

Replying to karsten:

Okay, this went faster than it looked on first sight. I found two minor things:

Those .class files in bin/ should probably not be in the repository. Can you remove them in a fixup commit that I can squash into 714ae2d?

Looks like these were added by Eclipse while I wasn't looking. Fixed.

There are now unused files in src/main/resources/web/images/, like atlas.png and atlas.xcf. Would you want to look out for other unused images and remove those, too, possibly in a separate (non-fixup) commit?

Fixed this too. There are probably other things to tidy up, but would be smaller patches. Once this is merged, it would be easier to make more localised patches to address individual things and queue those up.

I can merge and deploy later today.

Awesome. (:

Trac:
Status: needs_revision to needs_review

Changes look good! Merged and deployed. Not closing yet, because I'm not sure if you want to do more. Thanks!

Trac:
Status: needs_review to new

I think other things can be new tickets if we come across them.

Trac:
Resolution: N/A to fixed
Status: new to closed

closed

mentioned in issue #25393 (moved)

mentioned in issue #25699 (moved)

mentioned in issue #25744 (moved)

mentioned in issue #25747 (moved)

mentioned in issue #25748 (moved)

mentioned in issue #25749 (moved)

mentioned in issue #26232 (moved)

Adapt Relay Search integration to Metrics' project standards

Child items 0

Activity