Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -437,9 +437,11 @@
[submodule "GuicedEE/consul-service-resolver"]
path = GuicedEE/consul-service-resolver
url = https://github.com/GuicedEE/ConsulServiceResolver.git
branch = master
[submodule "GuicedEE/website-backend"]
path = GuicedEE/website-backend
url = https://github.com/GuicedEE/WebsiteBackend.git
branch = master
[submodule "EntityAssist_Website"]
path = EntityAssist/Website
url = https://github.com/Entity-Assist/Website.git
Expand Down
1 change: 1 addition & 0 deletions .idea/runConfigurations/Entity_Assist_Website.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/runConfigurations/GuicedEE_Website.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ActivityMaster/client
Submodule client updated 22 files
+45 −10 src/main/java/com/guicedee/activitymaster/fsdm/client/services/ConsoleLogActivityMasterProgressMaster.java
+0 −6 src/main/java/com/guicedee/activitymaster/fsdm/client/services/IClassificationDataConceptService.java
+1 −1 src/main/java/com/guicedee/activitymaster/fsdm/client/services/IEnterpriseService.java
+0 −13 src/main/java/com/guicedee/activitymaster/fsdm/client/services/IResourceItemService.java
+126 −18 src/main/java/com/guicedee/activitymaster/fsdm/client/services/SessionUtils.java
+4 −4 src/main/java/com/guicedee/activitymaster/fsdm/client/services/administration/ActivityMasterConfiguration.java
+5 −6 src/main/java/com/guicedee/activitymaster/fsdm/client/services/administration/MasterDefaultSystem.java
+28 −0 src/main/java/com/guicedee/activitymaster/fsdm/client/services/rest/security/ApplicableTokensDTO.java
+38 −0 src/main/java/com/guicedee/activitymaster/fsdm/client/services/rest/security/SecurityTokenCreateDTO.java
+41 −0 src/main/java/com/guicedee/activitymaster/fsdm/client/services/rest/security/SecurityTokenDTO.java
+12 −0 src/main/java/com/guicedee/activitymaster/fsdm/client/services/rest/security/SecurityTokenDataIncludes.java
+26 −0 src/main/java/com/guicedee/activitymaster/fsdm/client/services/rest/security/SecurityTokenFindDTO.java
+33 −0 src/main/java/com/guicedee/activitymaster/fsdm/client/services/rest/security/SecurityTokenGrantDTO.java
+26 −0 src/main/java/com/guicedee/activitymaster/fsdm/client/services/rest/security/SecurityTokenMembershipDTO.java
+29 −0 src/main/java/com/guicedee/activitymaster/fsdm/client/services/rest/security/SecurityTokenMoveDTO.java
+28 −0 src/main/java/com/guicedee/activitymaster/fsdm/client/services/rest/security/SecurityTokenRef.java
+28 −0 src/main/java/com/guicedee/activitymaster/fsdm/client/services/rest/security/SecurityTokenResolveDTO.java
+26 −0 src/main/java/com/guicedee/activitymaster/fsdm/client/services/rest/security/SecurityTokenUpdateDTO.java
+46 −4 src/main/java/com/guicedee/activitymaster/fsdm/client/services/systems/IActivityMasterProgressMonitor.java
+3 −3 src/main/java/com/guicedee/activitymaster/fsdm/client/services/systems/IMasterSystem.java
+108 −69 src/main/java/com/guicedee/activitymaster/fsdm/client/services/systems/IProgressable.java
+5 −4 src/main/java/module-info.java
2 changes: 1 addition & 1 deletion ActivityMaster/core
Submodule core updated 27 files
+0 −13 src/main/java/com/guicedee/activitymaster/fsdm/ClassificationsDataConceptService.java
+23 −23 src/main/java/com/guicedee/activitymaster/fsdm/EnterpriseService.java
+14 −9 src/main/java/com/guicedee/activitymaster/fsdm/PasswordsService.java
+15 −36 src/main/java/com/guicedee/activitymaster/fsdm/ResourceItemService.java
+354 −0 src/main/java/com/guicedee/activitymaster/fsdm/auth/ActivityMasterAuthBridge.java
+4 −4 src/main/java/com/guicedee/activitymaster/fsdm/implementations/ActivityMasterSystemBinder.java
+1 −1 src/main/java/com/guicedee/activitymaster/fsdm/injections/ActivityMasterPostStartup.java
+585 −0 src/main/java/com/guicedee/activitymaster/fsdm/rest/security/SecurityRestService.java
+5 −0 src/main/java/com/guicedee/activitymaster/fsdm/rest/security/package-info.java
+4 −7 src/main/java/com/guicedee/activitymaster/fsdm/systems/ActiveFlagSystem.java
+4 −6 src/main/java/com/guicedee/activitymaster/fsdm/systems/AddressSystem.java
+4 −6 src/main/java/com/guicedee/activitymaster/fsdm/systems/ArrangementsSystem.java
+4 −9 src/main/java/com/guicedee/activitymaster/fsdm/systems/ClassificationsDataConceptSystem.java
+4 −6 src/main/java/com/guicedee/activitymaster/fsdm/systems/ClassificationsSystem.java
+4 −5 src/main/java/com/guicedee/activitymaster/fsdm/systems/EnterpriseSystem.java
+4 −8 src/main/java/com/guicedee/activitymaster/fsdm/systems/EventsSystem.java
+4 −6 src/main/java/com/guicedee/activitymaster/fsdm/systems/InvolvedPartySystem.java
+4 −9 src/main/java/com/guicedee/activitymaster/fsdm/systems/ProductsSystem.java
+4 −7 src/main/java/com/guicedee/activitymaster/fsdm/systems/ResourceItemSystem.java
+4 −9 src/main/java/com/guicedee/activitymaster/fsdm/systems/RulesSystem.java
+4 −5 src/main/java/com/guicedee/activitymaster/fsdm/systems/SecurityTokenSystem.java
+4 −4 src/main/java/com/guicedee/activitymaster/fsdm/systems/SystemsSystem.java
+4 −4 src/main/java/com/guicedee/activitymaster/fsdm/systems/TimeSystem.java
+12 −2 src/main/java/module-info.java
+0 −0 src/main/resources/META-INF/services/com.guicedee.activitymaster.fsdm.client.services.systems.IMasterSystem
+222 −0 src/test/java/com/guicedee/activitymaster/tests/TestActivityMasterAuthBridge.java
+213 −0 src/test/java/com/guicedee/activitymaster/tests/TestActivityMasterSecurityRest.java
2 changes: 1 addition & 1 deletion ActivityMaster/mail
2 changes: 1 addition & 1 deletion ActivityMaster/tasks
Submodule tasks updated 1 files
+44 −0 .gitignore
1 change: 1 addition & 0 deletions GuicedEE/consul-service-resolver
1 change: 1 addition & 0 deletions GuicedEE/runtime-autoconfigure
Submodule runtime-autoconfigure added at 8fc9eb
1 change: 1 addition & 0 deletions GuicedEE/service-discovery
Submodule service-discovery added at aceac1
1 change: 1 addition & 0 deletions GuicedEE/service-registry
Submodule service-registry added at 418480
2 changes: 1 addition & 1 deletion GuicedEE/services
2 changes: 1 addition & 1 deletion GuicedEE/web
1 change: 1 addition & 0 deletions GuicedEE/website-backend
Submodule website-backend added at 8cbd70
3 changes: 1 addition & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
<module>GuicedEE/vertx</module>
<module>GuicedEE/cerial</module>
<module>GuicedEE/config</module>
<module>GuicedEE/consul</module>
<module>GuicedEE/consul-service-resolver</module>
<module>GuicedEE/metrics</module>
<module>GuicedEE/health</module>
Expand Down Expand Up @@ -158,7 +157,7 @@
<profile>
<id>entityassist</id>
<modules>
<module>EntityAssist</module>
<module>EntityAssist/EntityAssist</module>
</modules>
</profile>
<profile>
Expand Down