GitHub user johnmccabe opened a pull request:
https://github.com/apache/incubator-brooklyn/pull/1119
reorganise project structure in preparation for repository split
This commit applies the pre-repository-split restructuring script
`1-rearrange-incubator.sh` from rdowner/brooklyn-repo-split#5, and updates
maven/tests accordingly.
Once applied the project will be structured in preparation for the split
into multiple git repositories (`brooklyn-server`, `brooklyn-ui`,
`brooklyn-library`, `brooklyn-dist`, `brooklyn`).
A verbose commit history is maintained for reference with each commit
prefixed by the impacted submodule, ie [SERVER], [LIBRARY] etc. (_Note the
work-in-progress repo was originally located
[here](https://github.com/johnmccabe/PRESPLIT-incubator-brooklyn)._)
The project can be built as normal, with a brooklyn pom in the root of the
repository.
You may also build each submodule in turn, `brooklyn-ui`,
`brooklyn-server`, `brooklyn-library` and finally `brooklyn-dist`. The brooklyn
subdirectory will eventually become the split repo base project,.
Feedback is greatly welcomed.
---
#### Post-merge actions [8]
Once this is merged:
1. Existing branches and PR's may have to be rebased or merged
2. Your IDE may have to be completely reset
On (1) git actually does a remarkable job of tracking things across
moves, so I expect conflicts will mainly be:
* where you have added or deleted files
* where you have changed something which has changed (especially the poms)
If you have a PR or WIP which does these it will be a bit easier to
merge them first so please let us know. In particular there is UI,
OSGi, and Salt work in progress I think we were hoping to merge. But I
don't want to hold up the migration for too long.
FYI it will be a little bit more tedious to migrate these changes across
to the new repo structure (ie apache/brooklyn{,-*}) but git-patch
assuming we keep the same filesystem structure using git modules should
work pretty well once you have rebased on the reorged incubator project.
---
For reference the reorg/split related email threads are listed here:
1. [\[HEADS-UP\] Brooklyn
graduation](https://mail-archives.apache.org/mod_mbox/incubator-brooklyn-dev/201511.mbox/%3C564B6794.3070800%40CloudsoftCorp.com%3E)
2. [\[DISCUSS\] new repos and project
migration](https://mail-archives.apache.org/mod_mbox/incubator-brooklyn-dev/201511.mbox/%3C56563E49.3010907%40CloudsoftCorp.com%3E)
3. [\[VOTE\] migration to new apache/brooklyn*
repos](https://mail-archives.apache.org/mod_mbox/incubator-brooklyn-dev/201511.mbox/%3C565643A2.1080207%40CloudsoftCorp.com%3E)
4. [\[RESULT\]\[VOTE\] migration to new apache/brooklyn*
repos](https://mail-archives.apache.org/mod_mbox/incubator-brooklyn-dev/201512.mbox/%3C565DFD5F.609%40gmail.com%3E)
5. [(\[IMPORTANT\]\[PLEASE-READ\] Graduation tasks and git repo
changes](https://mail-archives.apache.org/mod_mbox/incubator-brooklyn-dev/201512.mbox/%3C565E16BF.4030306%40gmail.com%3E)
6. [Repository splitting
script](https://mail-archives.apache.org/mod_mbox/incubator-brooklyn-dev/201512.mbox/%3CCABQFKi23w96TrguxWh8Kk9DC163FqKVxxoNt7ebhQpE-qquAbw%40mail.gmail.com%3E)
7. [Repository splitting
script](https://mail-archives.apache.org/mod_mbox/incubator-brooklyn-dev/201512.mbox/%3CCABQFKi23w96TrguxWh8Kk9DC163FqKVxxoNt7ebhQpE-qquAbw%40mail.gmail.com%3E)
8. [Incubator
re-org](http://mail-archives.apache.org/mod_mbox/incubator-brooklyn-dev/201512.mbox/%3C567550F7.4030906%40CloudsoftCorp.com%3E)
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/johnmccabe/incubator-brooklyn reorg-2015-12-21
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-brooklyn/pull/1119.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1119
----
commit e430723955b0668fb4f1b934dcde55701b0b5a45
Author: John McCabe <[email protected]>
Date: 2015-12-16T11:25:27Z
[SPLITPREP] rearranged to have structure of new repositories
commit 018a0e15cae6f69e247f11a7ef84ab9bd437507e
Author: Alex Heneveld <[email protected]>
Date: 2015-12-21T12:09:30Z
Merge commit 'e430723' into reorg2
Newer PR's moved to the right place.
Conflicts:
brooklyn-library/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java
brooklyn-library/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterImpl.java
brooklyn-library/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java
brooklyn-library/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeDriver.java
brooklyn-library/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java
brooklyn-library/sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeSshDriver.java
brooklyn-library/sandbox/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/hazelcast/hazelcast-brooklyn.xml
brooklyn-library/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java
brooklyn-library/sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java
sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java
sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterImpl.java
sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java
sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeDriver.java
sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java
sandbox/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeSshDriver.java
sandbox/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/hazelcast/hazelcast-brooklyn.xml
sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterEc2LiveTest.java
sandbox/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastCluster.java
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterImpl.java
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNode.java
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeDriver.java
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeImpl.java
software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastNodeSshDriver.java
software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/hazelcast/hazelcast-brooklyn.xml
software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastClusterSoftlayerLiveTest.java
software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/hazelcast/HazelcastTestHelper.java
commit 8a3c17b963576ec75b66d1e7b20422f86a0df11d
Author: Alex Heneveld <[email protected]>
Date: 2015-12-21T12:37:58Z
[SPLITPREP] move more PR items to the right place
commit 3d793007a567831fd1f219189b20f2c49cc55cea
Author: John McCabe <[email protected]>
Date: 2015-12-16T12:00:20Z
[SPLITPREP] brookly version 0.9.SPLITWIP-SNAPSHOT for test purposes
commit c6ad9cf69f942c169f9a5dd19f621d3491e6a752
Author: John McCabe <[email protected]>
Date: 2015-12-16T14:08:16Z
[SERVER] simple pom.xml updates post-reorg
commit faa6a9da37910fd36a49dd57c1aa3d5b3f5a21b8
Author: Alex Heneveld <[email protected]>
Date: 2015-12-21T13:36:45Z
[LIBRARY] fix GeoDns test
commit 21482363fa273536430f16180569cbe617c7b981
Author: John McCabe <[email protected]>
Date: 2015-12-16T14:10:02Z
[SERVER] omit jsgui feature from karaf
commit ea3e4ca2d1f272272873228f4383088aa6460e7c
Author: John McCabe <[email protected]>
Date: 2015-12-16T14:12:59Z
[SERVER] omit jsgui feature from launcher build (no code update)
commit df67b6e60cffeab4c1526b258a3f4cb4804cceb1
Author: John McCabe <[email protected]>
Date: 2015-12-16T14:17:22Z
[SERVER] delete dependencies on software-* jars from brooklyn-library repo
commit 9d2c69d4384f2333b27d6a5b51ec68742eeb6cb0
Author: John McCabe <[email protected]>
Date: 2015-12-16T14:26:18Z
[SERVER] [HACK] commented out dependencies on test jars to allow use of
-Dmaven.test.skip=true, even though tests are being skipped the test jars are
considered during buildplan creation which causes the build to fail. At this
point in the repo-fix some tests fail to compile so we need to exclude them,
they will be fixed for the split, *but* it should be possible to build Brooklyn
without test jars having been generated imho.
commit 8243033ea6e5cb0de6fc30b4ad264409c8220251
Author: John McCabe <[email protected]>
Date: 2015-12-16T18:08:00Z
[LIBRARY] removed brooklyn-dist depdency
Conflicts:
brooklyn-library/qa/pom.xml -- added rat exclude for README in
downstream
commit 1c7e36aa4ae9f69cbb6288d2a18ea29fde182aaf
Author: John McCabe <[email protected]>
Date: 2015-12-16T18:10:47Z
[LIBRARY] added root brooklyn-library pom (dumb copy of incubator-brooklyn
root and parent), updated submodule poms. This currently builds successfully
after brooklyn-server
commit d49445da7a15044cd45727029758ffc2bcd63415
Author: John McCabe <[email protected]>
Date: 2015-12-16T19:44:07Z
[SERVER] [LIBRARY] moved webapp related CAMP tests to brooklyn-library
commit 06165730bcea3627dc7b2f36d72bb98a81cd2a62
Author: John McCabe <[email protected]>
Date: 2015-12-16T19:51:08Z
[SERVER] replaced ProxySslConfig with a dummy POJO
commit 980237ee8a5f16adbe365910faa9ec91ec1937a2
Author: John McCabe <[email protected]>
Date: 2015-12-16T20:03:05Z
[SERVER] [UNDO HACK] readded test deps after fixing/moving tests - undoes
commit 906ad0c
commit 265f0fea7fd3db86533745a6252e2fe29c1e2c97
Author: John McCabe <[email protected]>
Date: 2015-12-16T20:40:59Z
[SERVER] [LIBRARY] moved missing resources and fixed CAMP tests moved in
7007c65
commit 598a3d2055ccf1a04906e0fe1531546ee3396f83
Author: John McCabe <[email protected]>
Date: 2015-12-16T22:16:20Z
[SERVER] minor fixes to existing poms
commit b4d6c4b7dca73f4fb6bdfe80c4e556ac44f1775d
Author: John McCabe <[email protected]>
Date: 2015-12-16T22:17:50Z
[LIBRARY] switch back to using brooklyn-parent
commit 912343571778bb72dc377ba503166e73fa409f23
Author: John McCabe <[email protected]>
Date: 2015-12-17T18:06:47Z
[SERVER] [UI] moved BrooklynJavascriptGuiLauncher from ui to server repo,
relative paths updated, tested in both IntelliJ and Eclipse
commit 559fee486e037d509a896aa9a1e327bde19ee4f3
Author: John McCabe <[email protected]>
Date: 2015-12-17T18:14:41Z
[SERVER] [LIBRARY] [DIST] multiple pom updates to pull brooklyn-parent via
relative path to brooklyn-server repo, added dist and a root pom to build the
all modules that are built in the pre-split incubator-brooklyn repo
Conflicts:
pom.xml - versions removed in root, hazelcast version updated in PR's;
new version applied to server/library poms
commit 39616e408e6da67ea341608f613ecb9c1626404a
Author: John McCabe <[email protected]>
Date: 2015-12-17T23:20:24Z
[SERVER] updated BrooklynJavascriptGuiLauncherTest to use a non
brooklyn-library test entity
commit 0d1ca4b2c3c9324815142256787dde03a6986bb8
Author: Alex Heneveld <[email protected]>
Date: 2015-12-18T22:33:34Z
[SERVER] fix rat violations
one in the proxy ssl config replacement test file,
the other in README.md (but curiously only for library, not for
server/README.md)
commit 78ea56a6ab7725a2e87e1050947fcf3fa5580d15
Author: Alex Heneveld <[email protected]>
Date: 2015-12-18T22:37:01Z
[UBER] add pom in brooklyn uber project subdir to build everything
it's the same as the pom in the root, but referring to ../ for submodules
commit fef8a36541c31ffcef168ab474ebaf980396854b
Author: Alex Heneveld <[email protected]>
Date: 2015-12-18T22:57:12Z
[ALL] update README file in each repo to be appropriate to that repo, with
building instructions
commit 5d242dc9e6a9a8e387b3062789cec11dc7ca1b6e
Author: John McCabe <[email protected]>
Date: 2015-12-19T03:46:28Z
[SERVER] [LIBRARY] fix/move rest-server and camp-brooklyn tests
*note* this includes an update to VersionResourceTest.java to disable the
version test, due to the use of the dummy 0.9.SPLITWIP-SNAPSHOT version and
must be reverted before merging
commit 356b0f9c5d350f33dbee9eafd167ab4c3523aeb2
Author: John McCabe <[email protected]>
Date: 2015-12-19T12:13:56Z
[UI] fix jasmine tests
copies rest-api fixtures from brooklyn-server submodule repo
commit 1e748da4a5b041ad1ee63e81a0867b2d6f597923
Author: John McCabe <[email protected]>
Date: 2015-12-19T13:48:21Z
[SERVER] use catalog entities from software-base in rest-server tests
removes dependency on software-library submodule repo
commit 3d92033887d3a04abe076c648abfe201e234448d
Author: John McCabe <[email protected]>
Date: 2015-12-19T16:34:58Z
[LIBRARY] add database dependency for camp tests
commit b32a37b4e0f2bf7d1eeed52ff97b1be2e15f36b9
Author: John McCabe <[email protected]>
Date: 2015-12-19T19:17:26Z
[LIBRARY] move camp webapp related tests from software-webapp to qa module
adding them to software-webapp had introduced a dependency on
software-database
commit 45f1979a6a488c33a862e721bf1af982bbdcf57e
Author: John McCabe <[email protected]>
Date: 2015-12-19T19:21:19Z
[DIST] revert parent updates and move archetype to last built module
(currently failing Rat)
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
