UP-4179: uPortal 5 project overhault with a Gradle-based build #715

drewwills · 2016-09-06T17:57:28Z

https://issues.jasig.org/browse/UP-4179

This is only the beginning of this work.

Please see the wiki page for this effort: https://wiki.jasig.org/display/UPC/uPortal+5+Project+Overhaul

The complete plan is outlined there.

Tasks

Move all the 'export-*' Import/Export scripts from /org/jasig/portal/ (classapth) to /org/apereo/portal/
Review changes to import/export to verify that appropriate pre-uP5 entity files are still importable
Leave the script attributes of existing files in src/main/data unchanged
Verify that no unwanted files remain under org.jasig.portal within...
~~uportal-war/src/main/java~~
uportal-war/src/main/resources
uportal-war/src/test/java
uportal-war/src/test/groovy
uportal-war/src/test/resources
Test CONFIG mode
Troubleshoot the org.apereo.portal.portlets.image.ImagePortletController
grep for org.jasig.portal and verify that remaining occurrences make sense (some will, particularly a few within Import/Export)
Look into @holdorph's observations

… furtherance of the plan documented here: https://wiki.jasig.org/display/UPC/uPortal+5+Project+Overhaul

…o uPortal

…he -all (not -bin) distro becasue it's better for IDE tooling

- settings.gradle (defines project name and 3 submodules intended for Soffit) - gradle.properties (group & version, some project metadata we may or may not use) - build.gradle (mostly just the com.gradle.build-scan plugin)

…drewwills/Soffit

…OL_NOSTORE and CACHE_CONTROL_NOCACHE constants to uPortal-soffit/ because they're needed by both submodules

…ithub.com/drewwills/Soffit

…thub.com/drewwills/Soffit

…r; this is the portlet application context file for the Soffit Connector portlet

drewwills · 2016-09-06T18:39:16Z

Travis CI seems to be invoking $gradle assemble where it should be invoking $gradle install... anyone know why that is?

… of Gradle

coveralls · 2016-09-06T20:49:10Z

Coverage decreased (-0.03%) to 22.964% when pulling 4ab5fc7 on drewwills:UP-4179 into c5d425d on Jasig:master.

…existing code into them - uPortal-core - uPortal-rdbm - uPortal-utils

…e dependencies

coveralls · 2016-09-07T23:18:57Z

Coverage decreased (-0.005%) to 22.985% when pulling c91a8f8 on drewwills:UP-4179 into c5d425d on Jasig:master.

…g.jasig.portal.api' to 'org.apereo...'

coveralls · 2016-09-08T00:01:56Z

Coverage decreased (-0.001%) to 22.989% when pulling a87baae on drewwills:UP-4179 into c5d425d on Jasig:master.

….portal...' and into 'org.apereo.portal...' - org.apereo.portal.channel - org.apereo.portal.character.stream - org.apereo.portal.character.stream.events - org.apereo.portal.concurrency - org.apereo.portal.concurrency.caching - org.apereo.portal.concurrency.locking

… relics of an earlier age

coveralls · 2016-09-08T01:47:59Z

Coverage decreased (-0.001%) to 22.989% when pulling fc3f8d2 on drewwills:UP-4179 into c5d425d on Jasig:master.

…rg.jasig.portal...' and into 'org.apereo.portal...'

…ackages -- out of 'org.jasig.portal...' and into 'org.apereo.portal...'

coveralls · 2016-09-08T23:59:44Z

Coverage increased (+0.01%) to 23.002% when pulling 6af06b6 on drewwills:UP-4179 into c5d425d on Jasig:master.

…ages -- and all subpackages -- out of 'org.jasig.portal...' and into 'org.apereo.portal...'

…ges -- and all subpackages -- out of 'org.jasig.portal...' and into 'org.apereo.portal...'

coveralls · 2016-09-09T01:31:10Z

Coverage increased (+0.01%) to 23.002% when pulling 6812068 on drewwills:UP-4179 into c5d425d on Jasig:master.

coveralls · 2016-09-09T01:37:52Z

Coverage increased (+0.003%) to 22.992% when pulling 6812068 on drewwills:UP-4179 into c5d425d on Jasig:master.

coveralls · 2016-09-15T04:50:08Z

Coverage decreased (-0.01%) to 22.978% when pulling 22cd947 on drewwills:UP-4179 into c5d425d on Jasig:master.

coveralls · 2016-09-15T04:52:07Z

Coverage decreased (-0.01%) to 22.977% when pulling 22cd947 on drewwills:UP-4179 into c5d425d on Jasig:master.

coveralls · 2016-09-15T05:12:50Z

Coverage decreased (-0.01%) to 22.978% when pulling 22cd947 on drewwills:UP-4179 into c5d425d on Jasig:master.

…portal-war/src/main/groovy/org/jasig/... into .../apereo/...

coveralls · 2016-09-15T17:54:39Z

Coverage decreased (-0.004%) to 22.986% when pulling 67c8fba on drewwills:UP-4179 into c5d425d on Jasig:master.

…est/java/org/jasig/... into .../apereo/...

…/' the folders 'channels' and 'lang' because their contents are orphaned

…'org.jasig.portal' to 'org.apereo.portal'

coveralls · 2016-09-15T19:09:17Z

Coverage decreased (-0.02%) to 22.973% when pulling 62085b9 on drewwills:UP-4179 into c5d425d on Jasig:master.

coveralls · 2016-09-15T19:13:16Z

Coverage decreased (-0.02%) to 22.971% when pulling 62085b9 on drewwills:UP-4179 into c5d425d on Jasig:master.

coveralls · 2016-09-15T19:25:45Z

Coverage decreased (-0.008%) to 22.982% when pulling 9b23b26 on drewwills:UP-4179 into c5d425d on Jasig:master.

…jasig.portal' to 'org.apereo.portal'

…ces make sense (some will, particularly a few within Import/Export)

coveralls · 2016-09-15T22:12:30Z

Coverage decreased (-0.02%) to 22.973% when pulling be64fbe on drewwills:UP-4179 into c5d425d on Jasig:master.

coveralls · 2016-09-15T22:17:56Z

Coverage decreased (-0.002%) to 22.988% when pulling d9ea1ec on drewwills:UP-4179 into c5d425d on Jasig:master.

drewwills · 2016-09-15T23:42:56Z

@holdorph -- I ran some tests. Here's what I now believe...

I thought that the command $gradle wrapper would create only files that are a necessary part of the build system, but I was wrong about that. It also generated 6 files in .gradle. Those files don't need to be included -- they're work/temp files used by Gradle during the execution of $gradle wrapper itself (and later used by other commands). Nothing in .gradle/ needs to be in the repo, and .gradle/ can & should be listed in the .gitignore.

I have made these changes.

coveralls · 2016-09-15T23:50:10Z

Coverage increased (+0.007%) to 22.997% when pulling e945df5 on drewwills:UP-4179 into c5d425d on Jasig:master.

…th 'apereo'

coveralls · 2016-09-16T00:14:09Z

Coverage decreased (-0.02%) to 22.973% when pulling 9be12f0 on drewwills:UP-4179 into c5d425d on Jasig:master.

ChristianMurphy · 2016-09-16T00:29:02Z

...data/required_entities/entity-type/org.apereo.portal.security.IPermissionSet.entity-type.xml

@@ -20,6 +20,6 @@

 -->
 <entity-type script="classpath://org/jasig/portal/io/import-entity-type_v3-2.crn">
-  <name>org.apereo.portal.security.IPermissionSet</name>
+  <name>org.jasig.portal.security.IPermissionSet</name>


wait, shouldn't these be changing from jasig to apereo, not vice verse?

Yep -- that was a mistake that crept in when I was trying to erase unwanted changes the IDE had made auto-magically to uportal-war/src/main/data. Should be fixed already.

ChristianMurphy · 2016-09-16T00:30:40Z

...c/main/data/required_entities/entity-type/org.apereo.portal.security.IPerson.entity-type.xml

@@ -20,6 +20,6 @@

 -->
 <entity-type script="classpath://org/jasig/portal/io/import-entity-type_v3-2.crn">
-  <name>org.apereo.portal.security.IPerson</name>
+  <name>org.jasig.portal.security.IPerson</name>


same here, shouldn't these be changing from jasig to apereo, not vice verse?

ChristianMurphy · 2016-09-16T00:34:37Z

build.xml

@@ -728,6 +728,20 @@
    <!--                                                                                    -->

    <!-- Internal use -->
+    <target name="gradle-install" description="Build and install (in maven local) the uPortal modules that have been ported to a Gradle-based build">
+        <!--
+         | TEMPORARY MEASURE!


This was a temporary measure for before move to gradle, can this be removed now?

Not yet. Probably we will need that target as long as we need the build.xml file. We'll be able to remove that file entirely after Phase II (though maybe not immediately).

ChristianMurphy · 2016-09-16T00:55:57Z

...offit-renderer/src/main/java/org/apereo/portal/soffit/renderer/SoffitRendererController.java

@@ -0,0 +1,294 @@
+package org.apereo.portal.soffit.renderer;


File is missing ASF License header

I've just run $mvn license:format on the whole project. It picked up that, plus a hand full of other items. Soon to be committed.

…adress a few small issues with Import/Export that arose from the repackaging from 'org.jasig.portal' to 'org.apereo.portal'

coveralls · 2016-09-16T01:12:47Z

Coverage decreased (-0.02%) to 22.97% when pulling 006bc48 on drewwills:UP-4179 into c5d425d on Jasig:master.

coveralls · 2016-09-16T16:38:01Z

Coverage decreased (-0.009%) to 22.981% when pulling 85de7eb on drewwills:UP-4179 into c5d425d on Jasig:master.

…g/apereo/portal/io/ that were made auto-magically by the IDE in repackaging from 'org.jasig.portal' to 'org.apereo.portal'

coveralls · 2016-09-16T17:05:58Z

Coverage decreased (-0.01%) to 22.979% when pulling 75787b8 on drewwills:UP-4179 into c5d425d on Jasig:master.

drewwills added 10 commits September 6, 2016 10:51

UP-4179: Update the version of the master branch to 5.0.0-SNAPSHOT in…

7366a59

… furtherance of the plan documented here: https://wiki.jasig.org/display/UPC/uPortal+5+Project+Overhaul

UP-4179: Add a Gradle Wrapper based on the latest version of Gradle t…

fa6de1d

…o uPortal

UP-4179: Update distributionUrl in gradle-wrapper.properties to use t…

8e027b1

…he -all (not -bin) distro becasue it's better for IDE tooling

UP-4179: Getting started with Gradle; adding...

bc4c0d3

- settings.gradle (defines project name and 3 submodules intended for Soffit) - gradle.properties (group & version, some project metadata we may or may not use) - build.gradle (mostly just the com.gradle.build-scan plugin)

UP-4728: Add submodule uPortal-soffit ported from https://github.com/…

8e0b9a7

…drewwills/Soffit

UP-4728: Undo IntelliJ's butchered import order; moce the CACHE_CONTR…

9b33dc6

…OL_NOSTORE and CACHE_CONTROL_NOCACHE constants to uPortal-soffit/ because they're needed by both submodules

UP-4728: Add submodule uPortal-soffit-connector ported from https://g…

86ca33a

…ithub.com/drewwills/Soffit

UP-4728: Add submodule uPortal-soffit-renderer ported from https://gi…

9c56a44

…thub.com/drewwills/Soffit

UP-4728: Add the connector-portlet.xmlfile to uPortal-soffit-connecto…

965625c

…r; this is the portlet application context file for the Soffit Connector portlet

UP-4728: Add support for Soffit to uPortal

03a9c77

drewwills mentioned this pull request Sep 6, 2016

[WiP] Add the Soffit prototype to your dev environment; DO NOT MERGE! #665

Closed

drewwills added 2 commits September 6, 2016 13:23

UP-4179: Instruct Travis CI to use the Maven dependency step, instead…

08a7215

… of Gradle

UP-4179: Instruct Travis CI to use the Maven dependency step, instead…

4ab5fc7

… of Gradle

drewwills added 2 commits September 7, 2016 16:00

UP-4179: Add the following (3) Gradle-based submodules and move some …

ae9c898

…existing code into them - uPortal-core - uPortal-rdbm - uPortal-utils

UP-4728: Use the 'compile project()' dependency style for cross-modul…

c91a8f8

…e dependencies

UP-4179: (Interim step) move packages 'org.jasig.portal.aggr' and 'or…

a87baae

…g.jasig.portal.api' to 'org.apereo...'

drewwills added 2 commits September 7, 2016 18:33

Remove channelRegistry.xml and channelRegistry.dtd; they are (unused)…

fc3f8d2

… relics of an earlier age

drewwills added 2 commits September 8, 2016 14:51

UP-4179: (Interim step) move the o.j.p.dao.usertype package out of 'o…

80bbf97

…rg.jasig.portal...' and into 'org.apereo.portal...'

UP-4179: (Interim step) move the o.j.p.events package -- and all subp…

6af06b6

…ackages -- out of 'org.jasig.portal...' and into 'org.apereo.portal...'

drewwills added 2 commits September 8, 2016 18:07

UP-4179: (Interim step) move the o.j.p.fragment and o.j.p.groups pack…

1a05df7

…ages -- and all subpackages -- out of 'org.jasig.portal...' and into 'org.apereo.portal...'

UP-4179: (Interim step) move the o.j.p.hibernate and o.j.p.i18n packa…

6812068

…ges -- and all subpackages -- out of 'org.jasig.portal...' and into 'org.apereo.portal...'

UP-4179: (Interim step) move remaining items (portal/groups) out of u…

67c8fba

…portal-war/src/main/groovy/org/jasig/... into .../apereo/...

drewwills added 3 commits September 15, 2016 11:26

UP-4179: (Interim step) move remaining items out of uportal-war/src/t…

85d4c86

…est/java/org/jasig/... into .../apereo/...

UP-4179: Remove from 'uportal-war/src/test/resources/org/jasig/portal…

62085b9

…/' the folders 'channels' and 'lang' because their contents are orphaned

UP-4179: Re-package sources within uportal-portlets-overlay/cas from …

9b23b26

…'org.jasig.portal' to 'org.apereo.portal'

drewwills added 2 commits September 15, 2016 14:21

UP-4179: Re-package sources within uportal-search-api/src/ from 'org.…

be64fbe

…jasig.portal' to 'org.apereo.portal'

UP-4179: grep for org.jasig.portal and verify that remaining occurren…

d9ea1ec

…ces make sense (some will, particularly a few within Import/Export)

UP-4179: Remove (accidentally added) files in .gradle/

e945df5

UP-4179: Rename a couple *.entity-type.xml files replacing 'jasig' wi…

9be12f0

…th 'apereo'

ChristianMurphy requested changes Sep 16, 2016

View reviewed changes

UP-4179: Revert any (IDE-generated) changes to tenant sampledata and …

006bc48

…adress a few small issues with Import/Export that arose from the repackaging from 'org.jasig.portal' to 'org.apereo.portal'

Fix some license headers

85de7eb

UP-4179: Revert unwanted changes to uportal-war/src/test/resources/or…

75787b8

…g/apereo/portal/io/ that were made auto-magically by the IDE in repackaging from 'org.jasig.portal' to 'org.apereo.portal'

drewwills merged commit 3933dcc into uPortal-Project:master Sep 19, 2016

drewwills deleted the UP-4179 branch September 19, 2016 16:55

ChristianMurphy added this to the 5.0.0 milestone Apr 1, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

UP-4179: uPortal 5 project overhault with a Gradle-based build #715

UP-4179: uPortal 5 project overhault with a Gradle-based build #715

drewwills commented Sep 6, 2016 •

edited

Loading

drewwills commented Sep 6, 2016

coveralls commented Sep 6, 2016

coveralls commented Sep 7, 2016

coveralls commented Sep 8, 2016

coveralls commented Sep 8, 2016

coveralls commented Sep 8, 2016

coveralls commented Sep 9, 2016

coveralls commented Sep 9, 2016

coveralls commented Sep 15, 2016

coveralls commented Sep 15, 2016

coveralls commented Sep 15, 2016

coveralls commented Sep 15, 2016

coveralls commented Sep 15, 2016

coveralls commented Sep 15, 2016

coveralls commented Sep 15, 2016

coveralls commented Sep 15, 2016

coveralls commented Sep 15, 2016

drewwills commented Sep 15, 2016

coveralls commented Sep 15, 2016

coveralls commented Sep 16, 2016

ChristianMurphy Sep 16, 2016 •

edited

Loading

drewwills Sep 16, 2016

ChristianMurphy Sep 16, 2016

ChristianMurphy Sep 16, 2016

drewwills Sep 16, 2016

ChristianMurphy Sep 16, 2016

drewwills Sep 16, 2016

coveralls commented Sep 16, 2016

coveralls commented Sep 16, 2016

coveralls commented Sep 16, 2016

UP-4179: uPortal 5 project overhault with a Gradle-based build #715

UP-4179: uPortal 5 project overhault with a Gradle-based build #715

Conversation

drewwills commented Sep 6, 2016 • edited Loading

Tasks

drewwills commented Sep 6, 2016

coveralls commented Sep 6, 2016

coveralls commented Sep 7, 2016

coveralls commented Sep 8, 2016

coveralls commented Sep 8, 2016

coveralls commented Sep 8, 2016

coveralls commented Sep 9, 2016

coveralls commented Sep 9, 2016

coveralls commented Sep 15, 2016

coveralls commented Sep 15, 2016

coveralls commented Sep 15, 2016

coveralls commented Sep 15, 2016

coveralls commented Sep 15, 2016

coveralls commented Sep 15, 2016

coveralls commented Sep 15, 2016

coveralls commented Sep 15, 2016

coveralls commented Sep 15, 2016

drewwills commented Sep 15, 2016

coveralls commented Sep 15, 2016

coveralls commented Sep 16, 2016

ChristianMurphy Sep 16, 2016 • edited Loading

Choose a reason for hiding this comment

drewwills Sep 16, 2016

Choose a reason for hiding this comment

ChristianMurphy Sep 16, 2016

Choose a reason for hiding this comment

ChristianMurphy Sep 16, 2016

Choose a reason for hiding this comment

drewwills Sep 16, 2016

Choose a reason for hiding this comment

ChristianMurphy Sep 16, 2016

Choose a reason for hiding this comment

drewwills Sep 16, 2016

Choose a reason for hiding this comment

coveralls commented Sep 16, 2016

coveralls commented Sep 16, 2016

coveralls commented Sep 16, 2016

drewwills commented Sep 6, 2016 •

edited

Loading

ChristianMurphy Sep 16, 2016 •

edited

Loading