Skip to content

Squash-o-matic output #661

Merged
merged 89 commits into from Jan 4, 2013

7 participants

@cstamas
Sonatype member
cstamas commented Nov 14, 2012

Squashes the Nexus Core modules into one "nexus-core" module. No Core code change, just shuffling them around.

Changes:

  • nexus-core module introduced, with all the sources from following modules: nexus-utils, nexus-api, nexus-configuration, nexus-proxy, nexus-app and nexus-plugin-manager
  • removed modules (well, "moved" them into):
  • cleanup in UTs and ITs, mostly dependencies but some changes were done too, as suddenly the "mocked" environment became functional (many UTs from api, config or proxy were written by assuming Nexus Core is not functional there, as key code is added in app module).

CI went fine:
https://builds.sonatype.org/view/nexus-features/job/nexus-oss-its-feature/517/

cstamas and others added some commits Nov 12, 2012
@cstamas cstamas Squash-o-matic output
Changes:
* modules removed: nexus-utils, nexus-api, nexus-configuration, nexus-proxy, nexus-app, nexus-plugin-manager
* module "cleaned": nexus-configuration-model, now holds only modello models. Remains to be reusable (for some CLI tools)
* module nexus-core introduced, that is actually The Core of Nexus
dd10bc4
@cstamas cstamas UTs fixed 1b08633
@cstamas cstamas Removed all "perf" tests, as they made no sense.
Perftests for AttributeStorage was "perf" testing 3 implementations,
2 of them were totally unused (map one?) and irrelevant. The whole test
made no sense, as they were implemented at the time of Nx 2.0 when
we wanted to choose the tech that will supersede the XStream backed
one.

Same for LocalStorage, as the two test had no substantial difference,
and they were meant to catch attribute handling related problems, such
as slowdowns. Back then, there were no load tests, or any other kind
of real perf tests, so I removed them too.

Both set of tests were a muddy mixture of mocks, trickeries and such,
making the PITA to fix them, while again, their value is questionable.
75deaee
@cstamas cstamas Merge remote-tracking branch 'origin/master' into squash-o-matic-output
Conflicts:
	nexus/nexus-api/pom.xml
	nexus/nexus-app/pom.xml
	nexus/nexus-plugin-test-api/pom.xml
	nexus/nexus-utils/pom.xml
	nexus/plugins/restlet1x/nexus-restlet1x-plugin/pom.xml
0c79e42
@cstamas cstamas Merge remote-tracking branch 'origin/master' into squash-o-matic-output a7383ca
@cstamas cstamas Moved new file in it's propr place c3d8618
@cstamas cstamas Commons IO slipped out
Chjange from master
b0be4ea
@cstamas cstamas Some ITs needs Nexus internals.
But after cleanup, the edition was not coming anymore to the IT
classpath. Explicitly adding it.
8fbeb2d
@jdillon jdillon Merge branch 'master' into squash-o-matic-output 17722b9
@cstamas
Sonatype member
cstamas commented Nov 14, 2012

I am +1, but this will introduce another wave of CI builds being broken. So, it should be decided "when" we do this.

@jdillon
jdillon commented Nov 14, 2012

I defs think we should ensure we have stabilized the current set of changes first and have functional nexus-oss and nexus-professional + nexus-pro-trial-installer distributions.

IIUC this change should probably be less of a pain, since last round of changes were made to have plugins depend on nexus-plugin-api and not any of the other nexus-proxy, nexus-app, etc modules.

mosabua and others added some commits Nov 9, 2012
@mosabua mosabua Updated to newer version of compiler plugin ece4ac6
@mosabua mosabua Note about adding grid repo 48cb872
@cstamas cstamas NEXUS-5372: Alternative fix
Introduced new format, to replace the old broken
format, while keeping backward compat. In cases when
records are no longer than 255 bytes at least.
b2c1f7a
@cstamas cstamas NEXUS-5372: Applied Igor's comments.
Changes:
* V1 and V2 support removed (they were busted anyway)
* All the UTs now operate with much higher records that before (intentionally
exceeding the problematic 255 bytes message length)
* UTs made stricter about expectations, as all the new "persist" data are actually
two "segments" with 53+47=100 records
4879784
@nabcos nabcos Fix display of containing repositories on artifact information panel 47bdccc
@nabcos nabcos Sort GridViewer 'lower' tabs by tab title 334912b
@cstamas cstamas NEXUS-5372: Using buffered IO
Applied Igor's comments, using Buffered IO
that makes much sense, as we are tossing
around "records" of few bytes.
141e9a4
@cstamas cstamas Updated attributes to set dat files as binaries c2e63ee
@cstamas cstamas Getting rid of runtime repair.
Repair is tried only on boot, and during runtime,
if indexer problem is detected, it is simply made
inactive and is shut down.
c1aadf3
@cstamas cstamas markIndexerDead should handle IOEx
By logging, and not disturbing caller with it, as caller
called us already coz it had one.
9e2dcf5
@ifedorenko ifedorenko NEXUS-5250 fixed empty GUI keyword search results
This was a regression introduced during maven-indexer 5.0.0
rework. SearchNGIndexPlexusResource was not correctly falling
back to uncollapsed response when query returned small number
of records.

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
43b215d
@nabcos nabcos Don't force IE8 rendering mode c3badd1
@ifedorenko ifedorenko suppress remote repository access during Nexus5249IndexerManagerIT
mock index updater was configured too late during the test, which
resulted in some requests going through to real remote repository
and made tests sensitive to network connection quality in addition
to being  unnecessary slow.

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
43abd36
@nabcos nabcos Fix login window not resizing on client validation warning message 8207d45
@nabcos nabcos Fix sorting detail tabs in GridViewer 4363940
@nabcos nabcos requirejs build muck is not used ATM e648b0d
@nabcos nabcos Remove dead code 8bab58d
@nabcos nabcos Bring back Sonatype-content.css, used by error pages b9df334
@adreghiciu adreghiciu Do not interfere with HTTP 400 if it does not have an ErrorResponse
Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
fba0a29
@adreghiciu adreghiciu Buffer respond entity in case of an URE / Use a ThreadSafeClientConnM…
…anager

This may  be temporary till we figure out why connection is not closed in case of an exception

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
5197f3a
@mcculls mcculls Trivial change that should fix spurious timeline test failures when A…
…bstractTimelineTestCase based tests run first
98358e7
@adreghiciu adreghiciu Drop UniformRequestBuilder and get back to using WebResource.Builder
Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
a2ea2ff
@adreghiciu adreghiciu Refactor nexus client exception handling
Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
3dab49c
@adreghiciu adreghiciu Expose getRequestBody()
Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
59ef7a8
@nabcos nabcos Stabilize IT: Add 'cancellable' parameter to SleepRepositoryTask 18c7bee
@cstamas cstamas Client update
Changes:
* applied restlet1x plugin (was still using nonexistent dep)
* fixed POM for scope
* fixed indexer and test clients for core client changes
* modified NexusClientErrorResponseException to not leak restlet1x DTO models
* Jersey bumped from 1.12 to 1.15
c682406
@nabcos nabcos Update/simplify file upload workaround code for IE 3cb7e50
@nabcos nabcos Simplify DropTarget overrides a1af1d8
@nabcos nabcos Update BasicForm#findField override b59cb03
@cstamas cstamas Hack: made client response reusable
This is clearly a hack, but there were no other way to
make Jersey buffer and have reusable client response.
bcfae11
@nabcos nabcos Drop outdated Ext.form.Field overrides 1e0a4cd
@nabcos nabcos Fix BrowseButton for IE9 e9021ee
@adreghiciu adreghiciu Add exception handling ITs
Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
86f1fb8
@nabcos nabcos [NEXUS-5360] Remove accidentally checked in debug code 2197599
@adreghiciu adreghiciu Make method non static as we may need the instance in the future
Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
b63be8e
@jdillon jdillon [NEXUS-3728] use 'su -' intead of 'su -m' 40906c0
@jdillon jdillon [NXCM-4795] exclude .placeholder files ce46fea
@nabcos nabcos [NEXUS-5360] Move Ext.grid.CheckColumn into Nexus namespace c375606
@nabcos nabcos [NEXUS-5360] Update TextArea override 1fbeb55
@adreghiciu adreghiciu Close client response after logging
Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
9713fa0
@adreghiciu adreghiciu Fact that logging remote did not succeed should not break tests
Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
29766d2
@adreghiciu adreghiciu Revet hack about jersey client connection manager to be used as now c…
…onnections are properly closed

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
a6e00bb
@adreghiciu adreghiciu Close client response / exception handling on UID nexus client
Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
454c918
@nabcos nabcos [NEXUS-5381] Fix form upload c96cb8b
@adreghiciu adreghiciu Log at debug level in commands/monitor
Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
6261956
@adreghiciu adreghiciu Fix BasicJerseyNexusClientIT expected exceptions
Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
69576e6
@ifedorenko ifedorenko log repository index add/remove/reindex
Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
08af70a
@nabcos nabcos JS cleanup 175a0ae
@ifedorenko ifedorenko fixed log level for remove null indexing context messge
this is a normal/expected condition and WARN level was not
justified

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
23a1381
@cstamas cstamas NEXUS-5383: Snapshot merges failure
The "to merge or not" decision was based on
metadata/versioning/snapshot/timestamp value.

This was wrong, as since model 1.1.0, the
newly added snapshotVersions element should be
always merged, while the "legacy" element
metadata/versioning/snapshot/timestamp
should be "merged" only if newer.
d96d478
@nabcos nabcos Fix TwinPanelController move buttons
Previous implementation seemed to rely on the side effect that moving DOM
nodes also impacted the selected nodes.

Fixed the bug and some wacky code.
0cfbe13
@nabcos nabcos [NEXUS-5360] jslint bug, escaped apostrophes are no good c4068cd
@nabcos nabcos Make listener handling more robust
The goal is to not let broken code in one plugin stop the whole UI.
Before this change, listeners registered after a 'breaking' listener
would not be executed at all. This change allows event processing to
continue.
95f325d
@nabcos nabcos Fix requirejs dependencies c983df4
@jdillon jdillon Exclude all .* files from license check 769488c
@adreghiciu adreghiciu Add constructor that includes EventBus
Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
3a6c265
@cstamas cstamas NEXUS-5383: More checks needed
After initial fix, another check is needed in operation.
Also, a smaller fix added, to not create VersionComparator
per list entry, but per operation instance.
e4c87a5
@cstamas cstamas Get rid of timeline repair.
Applied Igor's comments.
ca7dcaa
@nabcos nabcos Use timestamped js/css files
A build timestamp in the actual resource path will provide better
browser cache busting.
6bf9773
@nabcos nabcos Make plugin script loading more robust
Plugin scripts are now loaded independent of each other, so that
errors that occur on load will only stop execution of that plugin
script, and not prevent the whole UI from loading.
7bc224d
@nabcos nabcos [NEXUS-5378] Make Save/Reset buttons centered for server settings 29094fa
@cstamas cstamas Timeline index repair failure is not propagated.
Timeline handles indexer with special care: it will try
to repair it if it's start failed. This change now
will not propagate anymore the exception thrown during
repair (already in exception handler!), but will mark the
indexer as "dead", log the fact, and continue the usual
fluff.

On next reboot, another repair will be tried.
763d505
@nabcos nabcos [NEXUS-5360] Cleanup JS 801bfbe
@nabcos nabcos [NEXUS-5360] Fix image locations
Location of aggregated sonatype-all.css changed to
style/$timestamp/sonatype-all.css, so the relative image urls were
wrong.
1f4bcbf
@nabcos nabcos [NEXUS-5360] Fix warning message not displayed on search panel (e.g. …
…'too many results')
7dd152c
@nabcos nabcos [NEXUS-5360] Cleanup JS 9d6a3a5
@nabcos nabcos [NEXUS-5360] Fix Display of TextEntryList 77106a1
@cstamas cstamas Merge remote-tracking branch 'origin/master' into squash-o-matic-output
Conflicts:
	nexus/nexus-app/pom.xml
	nexus/nexus-client-core/src/main/java/org/sonatype/nexus/client/core/NotFoundException.java
	nexus/nexus-client-core/src/main/java/org/sonatype/nexus/client/core/spi/rest/jersey/UniformRequestBuilder.java
	nexus/nexus-client-core/src/main/java/org/sonatype/nexus/client/rest/jersey/ContextAwareUniformInterfaceException.java
	nexus/nexus-client-core/src/main/java/org/sonatype/nexus/client/rest/jersey/NexusClientHandlerException.java
	nexus/nexus-webapp/src/main/requirejs/buildconfig.js
	nexus/nexus-webapp/src/main/webapp/js/ext/util.js
	nexus/nexus-webapp/src/main/webapp/js/ext/util/event.js
	nexus/nexus-webapp/src/main/webapp/js/repoServer/ServerEditPanel.js
	nexus/plugins/indexer/nexus-indexer-lucene-plugin/src/main/java/org/sonatype/nexus/index/DefaultIndexerManager.java
	nexus/plugins/restlet1x/nexus-restlet1x-plugin/src/main/java/org/sonatype/nexus/rest/IndexTemplatePlexusResource.java
	nexus/plugins/restlet1x/nexus-restlet1x-plugin/src/main/resources/templates/index.vm
	pom.xml
a53b19e
@cstamas cstamas Merge remote-tracking branch 'origin/master' into squash-o-matic-output 4ce7198
@cstamas cstamas Moved new items in place.
Ben's mime related changes.
cbba95a
cstamas added some commits Dec 5, 2012
@cstamas cstamas Merge remote-tracking branch 'origin/master' into squash-o-matic-output
Conflicts:
	nexus/nexus-api/pom.xml
	nexus/nexus-api/src/test/java/org/sonatype/nexus/proxy/item/DummyRepositoryItemUidFactory.java
	nexus/nexus-app/pom.xml
	nexus/nexus-configuration/pom.xml
	nexus/nexus-configuration/src/test/java/org/sonatype/nexus/configuration/application/SimpleApplicationConfiguration.java
	nexus/nexus-configuration/src/test/java/org/sonatype/nexus/configuration/application/upgrade/DummyApplicationStatusSource.java
	nexus/nexus-plugin-manager/pom.xml
	nexus/nexus-proxy/src/test/java/org/sonatype/nexus/configuration/SimpleApplicationConfiguration.java
	nexus/nexus-proxy/src/test/java/org/sonatype/nexus/configuration/SimpleProxyApplicationConfiguration.java
	nexus/nexus-proxy/src/test/java/org/sonatype/nexus/configuration/SimpleSecureApplicationConfiguration.java
	nexus/nexus-proxy/src/test/java/org/sonatype/nexus/proxy/attributes/perf/AttributeStoragePerformanceTestSupport.java
	nexus/nexus-proxy/src/test/java/org/sonatype/nexus/proxy/attributes/perf/DefaultFSAttributeStoragePerformanceIT.java
	nexus/nexus-proxy/src/test/java/org/sonatype/nexus/proxy/attributes/perf/HashMapAttributeStoragePerformanceIT.java
	nexus/nexus-proxy/src/test/java/org/sonatype/nexus/proxy/attributes/perf/JacksonJSONFSAttributeStoragePerformanceIT.java
	nexus/nexus-proxy/src/test/java/org/sonatype/nexus/proxy/attributes/perf/internal/OrderedRunner.java
	nexus/nexus-proxy/src/test/java/org/sonatype/nexus/proxy/attributes/perf/internal/TMockRepository.java
	nexus/nexus-proxy/src/test/java/org/sonatype/nexus/proxy/attributes/perf/internal/TestRepositoryItemUid.java
	nexus/nexus-proxy/src/test/java/org/sonatype/nexus/proxy/item/DummyRepositoryItemUidFactory.java
	nexus/nexus-proxy/src/test/java/org/sonatype/nexus/proxy/storage/local/fs/perf/DefaultFSLocalRepositoryStoragePerformance2IT.java
	nexus/nexus-proxy/src/test/java/org/sonatype/nexus/proxy/storage/local/fs/perf/DefaultFSLocalRepositoryStoragePerformanceIT.java
	nexus/nexus-utils/pom.xml
	nexus/pom.xml
a830402
@cstamas cstamas Post merge fixes. 1be96ba
@cstamas cstamas Merge remote-tracking branch 'origin/master' into squash-o-matic-output
Conflicts:
	nexus/nexus-api/pom.xml
	nexus/nexus-app/pom.xml
	nexus/nexus-configuration/pom.xml
	nexus/nexus-core/pom.xml
	nexus/nexus-utils/pom.xml
45bf889
@cstamas cstamas Merge remote-tracking branch 'origin/master' into squash-o-matic-output 6cfc724
@cstamas cstamas Moving new stuff in right place 8251e22
@cstamas cstamas Merge remote-tracking branch 'origin/master' into squash-o-matic-output c69aaec
@cstamas cstamas Cleaning post merge remnants
POM had some merge problem, and moving newly added
stuff to their proper place
9fdb057
@cstamas cstamas Cleanup of PM
PM module (but not code!) was left by mistake
present in the build. Also, newly added files
were missed to be moved
8de848d
@cstamas
Sonatype member
cstamas commented Jan 4, 2013

CI "passed": one search related IT failed

Related issue for tracking
https://issues.sonatype.org/browse/NEXUS-5470

@cstamas cstamas merged commit d28ef36 into master Jan 4, 2013
@cstamas cstamas deleted the squash-o-matic-output branch Jan 4, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.