From 8f9fee31c66ce08046258694e5e2d83a31e38b5d Mon Sep 17 00:00:00 2001 From: YuriyZ Date: Wed, 7 Dec 2022 12:54:23 +0200 Subject: [PATCH] fix(agama): fix agama auth dependency which blocks build process #3149 (#3244) Moved agama into jans-auth-server --- agama/pom.xml | 3 - jans-auth-server/agama/.gitignore | 35 +++++ jans-auth-server/agama/CHANGELOG.md | 133 ++++++++++++++++++ jans-auth-server/agama/README.md | 12 ++ .../agama}/engine/pom.xml | 11 +- .../default/config-agama-test.properties | 0 .../io/jans/agama/NativeJansFlowBridge.java | 0 .../engine/continuation/PendingException.java | 0 .../PendingRedirectException.java | 0 .../continuation/PendingRenderException.java | 0 .../engine/exception/FlowCrashException.java | 0 .../exception/FlowTimeoutException.java | 0 .../TemplateProcessingException.java | 0 .../io/jans/agama/engine/misc/FlowUtils.java | 0 .../agama/engine/misc/PrimitiveUtils.java | 0 .../jans/agama/engine/model/FlowResult.java | 0 .../io/jans/agama/engine/model/FlowRun.java | 0 .../jans/agama/engine/model/FlowStatus.java | 0 .../jans/agama/engine/model/ProtoFlowRun.java | 0 .../agama/engine/page/BasicTemplateModel.java | 0 .../io/jans/agama/engine/page/Labels.java | 0 .../java/io/jans/agama/engine/page/Page.java | 0 .../io/jans/agama/engine/script/LogUtils.java | 0 .../jans/agama/engine/script/ScriptUtils.java | 0 .../serialize/ContinuationSerializer.java | 0 .../agama/engine/serialize/FstSerializer.java | 0 .../engine/serialize/KryoSerializer.java | 0 .../agama/engine/serialize/NativeJavaBox.java | 0 .../engine/serialize/ObjectSerializer.java | 0 .../engine/serialize/SerializerFactory.java | 0 .../agama/engine/service/ActionService.java | 0 .../service/AgamaPersistenceService.java | 0 .../agama/engine/service/AppInitializer.java | 0 .../agama/engine/service/FlowService.java | 0 .../engine/service/ManagedBeanService.java | 0 .../agama/engine/service/ServicesFactory.java | 0 .../engine/service/TemplatingService.java | 0 .../jans/agama/engine/service/WebContext.java | 0 .../agama/engine/servlet/BaseServlet.java | 0 .../engine/servlet/ExecutionServlet.java | 0 .../agama/engine/servlet/RestartServlet.java | 0 .../agama/engine/servlet/StatusServlet.java | 0 .../io/jans/agama/timer/FlowRunsCleaner.java | 0 .../agama/timer/FlowRunsCleanerEvent.java | 0 .../io/jans/agama/timer/Transpilation.java | 0 .../jans/agama/timer/TranspilationEvent.java | 0 .../src/main/resources/META-INF/beans.xml | 0 .../java/io/jans/agama/test/BaseTest.java | 0 .../agama/test/CustomConfigsFlowTest.java | 0 .../jans/agama/test/InexistentFlowTest.java | 0 .../java/io/jans/agama/test/MathFlowTest.java | 0 .../agama/test/SaySomething2FlowTest.java | 0 .../agama/test/SaySomething3FlowTest.java | 0 .../jans/agama/test/SaySomethingFlowTest.java | 0 .../io/jans/agama/test/UidOnlyAuthTest.java | 0 .../flows/io.jans.agama.test.auth.uidOnly | 0 .../resources/flows/io.jans.agama.test.math | 0 .../flows/io.jans.agama.test.showConfig | 0 .../src/test/resources/flows/org.gluu.flow1 | 0 .../src/test/resources/flows/org.gluu.flow2 | 0 .../src/test/resources/flows/org.gluu.flow3 | 0 .../engine/src/test/resources/log4j2-test.xml | 0 .../templates/custom/printConfigs.ftlh | 0 .../src/test/resources/templates/f1/index.ftl | 0 .../test/resources/templates/f1/index2.ftl | 0 .../test/resources/templates/hello/index.ftlh | 0 .../src/test/resources/templates/login.ftlh | 0 .../test/resources/templates/me/myindex.ftlh | 0 .../src/test/resources/testng.properties | 0 .../engine/src/test/resources/testng.xml | 0 .../agama}/inboundID/CustomMappings.java.txt | 0 .../agama}/inboundID/pom.xml | 4 +- .../src/main/java/io/jans/inbound/Attrs.java | 0 .../io/jans/inbound/IdentityProcessor.java | 0 .../main/java/io/jans/inbound/JwtUtil.java | 0 .../main/java/io/jans/inbound/Mappings.java | 0 .../main/java/io/jans/inbound/Provider.java | 0 .../io/jans/inbound/oauth2/CodeGrantUtil.java | 0 .../io/jans/inbound/oauth2/OAuthParams.java | 0 .../main/java/io/jans/util/NetworkUtils.java | 0 .../agama}/model/pom.xml | 9 +- .../io/jans/agama/model/EngineConfig.java | 0 .../main/java/io/jans/agama/model/Flow.java | 0 .../io/jans/agama/model/FlowMetadata.java | 0 .../java/io/jans/agama/model/ProtoFlow.java | 0 .../io/jans/agama/model/serialize/Type.java | 0 jans-auth-server/pom.xml | 6 +- jans-bom/pom.xml | 5 + 88 files changed, 208 insertions(+), 10 deletions(-) create mode 100644 jans-auth-server/agama/.gitignore create mode 100644 jans-auth-server/agama/CHANGELOG.md create mode 100644 jans-auth-server/agama/README.md rename {agama => jans-auth-server/agama}/engine/pom.xml (95%) rename {agama => jans-auth-server/agama}/engine/profiles/default/config-agama-test.properties (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/NativeJansFlowBridge.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/continuation/PendingException.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/continuation/PendingRedirectException.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/continuation/PendingRenderException.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/exception/FlowCrashException.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/exception/FlowTimeoutException.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/exception/TemplateProcessingException.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/misc/FlowUtils.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/misc/PrimitiveUtils.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/model/FlowResult.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/model/FlowRun.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/model/FlowStatus.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/model/ProtoFlowRun.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/page/BasicTemplateModel.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/page/Labels.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/page/Page.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/script/LogUtils.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/script/ScriptUtils.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/serialize/ContinuationSerializer.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/serialize/FstSerializer.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/serialize/KryoSerializer.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/serialize/NativeJavaBox.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/serialize/ObjectSerializer.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/serialize/SerializerFactory.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/service/ActionService.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/service/AgamaPersistenceService.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/service/AppInitializer.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/service/FlowService.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/service/ManagedBeanService.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/service/ServicesFactory.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/service/TemplatingService.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/service/WebContext.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/servlet/BaseServlet.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/servlet/ExecutionServlet.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/servlet/RestartServlet.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/engine/servlet/StatusServlet.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/timer/FlowRunsCleaner.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/timer/FlowRunsCleanerEvent.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/timer/Transpilation.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/java/io/jans/agama/timer/TranspilationEvent.java (100%) rename {agama => jans-auth-server/agama}/engine/src/main/resources/META-INF/beans.xml (100%) rename {agama => jans-auth-server/agama}/engine/src/test/java/io/jans/agama/test/BaseTest.java (100%) rename {agama => jans-auth-server/agama}/engine/src/test/java/io/jans/agama/test/CustomConfigsFlowTest.java (100%) rename {agama => jans-auth-server/agama}/engine/src/test/java/io/jans/agama/test/InexistentFlowTest.java (100%) rename {agama => jans-auth-server/agama}/engine/src/test/java/io/jans/agama/test/MathFlowTest.java (100%) rename {agama => jans-auth-server/agama}/engine/src/test/java/io/jans/agama/test/SaySomething2FlowTest.java (100%) rename {agama => jans-auth-server/agama}/engine/src/test/java/io/jans/agama/test/SaySomething3FlowTest.java (100%) rename {agama => jans-auth-server/agama}/engine/src/test/java/io/jans/agama/test/SaySomethingFlowTest.java (100%) rename {agama => jans-auth-server/agama}/engine/src/test/java/io/jans/agama/test/UidOnlyAuthTest.java (100%) rename {agama => jans-auth-server/agama}/engine/src/test/resources/flows/io.jans.agama.test.auth.uidOnly (100%) rename {agama => jans-auth-server/agama}/engine/src/test/resources/flows/io.jans.agama.test.math (100%) rename {agama => jans-auth-server/agama}/engine/src/test/resources/flows/io.jans.agama.test.showConfig (100%) rename {agama => jans-auth-server/agama}/engine/src/test/resources/flows/org.gluu.flow1 (100%) rename {agama => jans-auth-server/agama}/engine/src/test/resources/flows/org.gluu.flow2 (100%) rename {agama => jans-auth-server/agama}/engine/src/test/resources/flows/org.gluu.flow3 (100%) rename {agama => jans-auth-server/agama}/engine/src/test/resources/log4j2-test.xml (100%) rename {agama => jans-auth-server/agama}/engine/src/test/resources/templates/custom/printConfigs.ftlh (100%) rename {agama => jans-auth-server/agama}/engine/src/test/resources/templates/f1/index.ftl (100%) rename {agama => jans-auth-server/agama}/engine/src/test/resources/templates/f1/index2.ftl (100%) rename {agama => jans-auth-server/agama}/engine/src/test/resources/templates/hello/index.ftlh (100%) rename {agama => jans-auth-server/agama}/engine/src/test/resources/templates/login.ftlh (100%) rename {agama => jans-auth-server/agama}/engine/src/test/resources/templates/me/myindex.ftlh (100%) rename {agama => jans-auth-server/agama}/engine/src/test/resources/testng.properties (100%) rename {agama => jans-auth-server/agama}/engine/src/test/resources/testng.xml (100%) rename {agama => jans-auth-server/agama}/inboundID/CustomMappings.java.txt (100%) rename {agama => jans-auth-server/agama}/inboundID/pom.xml (95%) rename {agama => jans-auth-server/agama}/inboundID/src/main/java/io/jans/inbound/Attrs.java (100%) rename {agama => jans-auth-server/agama}/inboundID/src/main/java/io/jans/inbound/IdentityProcessor.java (100%) rename {agama => jans-auth-server/agama}/inboundID/src/main/java/io/jans/inbound/JwtUtil.java (100%) rename {agama => jans-auth-server/agama}/inboundID/src/main/java/io/jans/inbound/Mappings.java (100%) rename {agama => jans-auth-server/agama}/inboundID/src/main/java/io/jans/inbound/Provider.java (100%) rename {agama => jans-auth-server/agama}/inboundID/src/main/java/io/jans/inbound/oauth2/CodeGrantUtil.java (100%) rename {agama => jans-auth-server/agama}/inboundID/src/main/java/io/jans/inbound/oauth2/OAuthParams.java (100%) rename {agama => jans-auth-server/agama}/inboundID/src/main/java/io/jans/util/NetworkUtils.java (100%) rename {agama => jans-auth-server/agama}/model/pom.xml (73%) rename {agama => jans-auth-server/agama}/model/src/main/java/io/jans/agama/model/EngineConfig.java (100%) rename {agama => jans-auth-server/agama}/model/src/main/java/io/jans/agama/model/Flow.java (100%) rename {agama => jans-auth-server/agama}/model/src/main/java/io/jans/agama/model/FlowMetadata.java (100%) rename {agama => jans-auth-server/agama}/model/src/main/java/io/jans/agama/model/ProtoFlow.java (100%) rename {agama => jans-auth-server/agama}/model/src/main/java/io/jans/agama/model/serialize/Type.java (100%) diff --git a/agama/pom.xml b/agama/pom.xml index 6faf97af46f..fc8f3f7536f 100644 --- a/agama/pom.xml +++ b/agama/pom.xml @@ -41,10 +41,7 @@ - model transpiler - engine - inboundID diff --git a/jans-auth-server/agama/.gitignore b/jans-auth-server/agama/.gitignore new file mode 100644 index 00000000000..92e4596b0a6 --- /dev/null +++ b/jans-auth-server/agama/.gitignore @@ -0,0 +1,35 @@ +# Eclipse +.project +.classpath +.settings/ +bin/ + +# IntelliJ +.idea +*.ipr +*.iml +*.iws + +# NetBeans +nb-configuration.xml + +# Visual Studio Code +.vscode + +# OSX +.DS_Store + +# Vim +*.swp +*.swo + +# patch +*.orig +*.rej + +# Maven +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +release.properties diff --git a/jans-auth-server/agama/CHANGELOG.md b/jans-auth-server/agama/CHANGELOG.md new file mode 100644 index 00000000000..8db8bf36439 --- /dev/null +++ b/jans-auth-server/agama/CHANGELOG.md @@ -0,0 +1,133 @@ +# Changelog + +## [1.0.4](https://github.com/JanssenProject/jans/compare/agama-v1.0.3...agama-v1.0.4) (2022-11-08) + + +### Bug Fixes + +* avoid NPE when configuration is missing [#2857](https://github.com/JanssenProject/jans/issues/2857) ([#2863](https://github.com/JanssenProject/jans/issues/2863)) ([4a27091](https://github.com/JanssenProject/jans/commit/4a2709185bd7ba84c3230cb94d4efea940681742)) + +## 1.0.3 (2022-11-01) + + +### Features + +* **agama:** add utility classes for inbound identity ([#2204](https://github.com/JanssenProject/jans/issues/2204)) ([29f58ee](https://github.com/JanssenProject/jans/commit/29f58ee0e6c84b4af5493cabcb19167bc7ffbe40)) +* **agama:** add utility classes for inbound identity ([#2231](https://github.com/JanssenProject/jans/issues/2231)) ([96e32a4](https://github.com/JanssenProject/jans/commit/96e32a407ec6c545b73a6fd103ed2ae5876bd500)) +* **agama:** add utility classes for inbound identity ([#2280](https://github.com/JanssenProject/jans/issues/2280)) ([ca6fdc9](https://github.com/JanssenProject/jans/commit/ca6fdc90256e4ef103bf50dc27cb694c940ba70b)) +* **agama:** add utility classes for inbound identity ([#2417](https://github.com/JanssenProject/jans/issues/2417)) ([2878bdd](https://github.com/JanssenProject/jans/commit/2878bdd737b4bd7f8f080113826a4bc4bf49ffba)) +* **jans-config-api:** agama flow endpoint ([#1898](https://github.com/JanssenProject/jans/issues/1898)) ([0e73306](https://github.com/JanssenProject/jans/commit/0e73306f7642a74a3ed2cf8a8687a1ea447aa7bd)) + + +### Bug Fixes + +* jans-config-api/plugins/sample/helloworld/pom.xml to reduce vulnerabilities ([#972](https://github.com/JanssenProject/jans/issues/972)) ([e2ae05e](https://github.com/JanssenProject/jans/commit/e2ae05e5515dd85a95c0a8520de57f673aba7918)) +* jans-eleven/pom.xml to reduce vulnerabilities ([#2676](https://github.com/JanssenProject/jans/issues/2676)) ([d27a7f9](https://github.com/JanssenProject/jans/commit/d27a7f99f22cb8f4bd445a3400224a38cb91eedc)) + + +### Documentation + +* add instructions to setup inbound identity flows [#2198](https://github.com/JanssenProject/jans/issues/2198) ([#2222](https://github.com/JanssenProject/jans/issues/2222)) ([d959b32](https://github.com/JanssenProject/jans/commit/d959b32cc9de0b8311d13ce25fcba162d0b0c5a3)) + + +### Miscellaneous Chores + +* release 1.0.2 ([43dead6](https://github.com/JanssenProject/jans/commit/43dead615f3508ca393c330c2db27a8fb9d1017a)) + +## 1.0.2 (2022-08-30) + + +### Features + +* **agama:** add utility classes for inbound identity ([#2204](https://github.com/JanssenProject/jans/issues/2204)) ([29f58ee](https://github.com/JanssenProject/jans/commit/29f58ee0e6c84b4af5493cabcb19167bc7ffbe40)) +* **agama:** add utility classes for inbound identity ([#2231](https://github.com/JanssenProject/jans/issues/2231)) ([96e32a4](https://github.com/JanssenProject/jans/commit/96e32a407ec6c545b73a6fd103ed2ae5876bd500)) +* **agama:** allow the config-api to perform syntax check of flows ([#1621](https://github.com/JanssenProject/jans/issues/1621)) ([2e99d3a](https://github.com/JanssenProject/jans/commit/2e99d3a9bec389f68086c606062280967ce338ce)) +* **agama:** reject usage of repeated input names ([#1484](https://github.com/JanssenProject/jans/issues/1484)) ([aed8cf3](https://github.com/JanssenProject/jans/commit/aed8cf33d89b98f0ac6aae52e145a84a0937d60e)) +* **jans-config-api:** agama flow endpoint ([#1898](https://github.com/JanssenProject/jans/issues/1898)) ([0e73306](https://github.com/JanssenProject/jans/commit/0e73306f7642a74a3ed2cf8a8687a1ea447aa7bd)) +* update DSL to support shorthand for finish [#1628](https://github.com/JanssenProject/jans/issues/1628) ([71e4652](https://github.com/JanssenProject/jans/commit/71e46524492d48fccf2ed2840ede3d6ae525a3e3)) + + +### Bug Fixes + +* **agama:** template overriding not working with more than one level of nesting ([#1841](https://github.com/JanssenProject/jans/issues/1841)) ([723922a](https://github.com/JanssenProject/jans/commit/723922a17b1babc49a1135030c06db367726ab63)) + + +### Documentation + +* add email-otp flow and organize sample flow folders [#1749](https://github.com/JanssenProject/jans/issues/1749) ([#1800](https://github.com/JanssenProject/jans/issues/1800)) ([8aea2ee](https://github.com/JanssenProject/jans/commit/8aea2eeaab8d99724d48a817ff47495b5f7632d7)) +* add instructions to setup inbound identity flows [#2198](https://github.com/JanssenProject/jans/issues/2198) ([#2222](https://github.com/JanssenProject/jans/issues/2222)) ([d959b32](https://github.com/JanssenProject/jans/commit/d959b32cc9de0b8311d13ce25fcba162d0b0c5a3)) +* **agama:** add sample flows to docs ([#1750](https://github.com/JanssenProject/jans/issues/1750)) ([7d33490](https://github.com/JanssenProject/jans/commit/7d334905a147746556f984015215b7c9f5b937ef)) +* update docs wrt to language updates [#1628](https://github.com/JanssenProject/jans/issues/1628) ([ca32bd5](https://github.com/JanssenProject/jans/commit/ca32bd54ec109134dad04d4a0f15eebc6d7bdd8e)) + + +### Miscellaneous Chores + +* release 1.0.1 ([828bfe8](https://github.com/JanssenProject/jans/commit/828bfe80cee87e639839391f98ac3dc2f2d4a920)) +* release 1.0.2 ([43dead6](https://github.com/JanssenProject/jans/commit/43dead615f3508ca393c330c2db27a8fb9d1017a)) + +## [1.0.1](https://github.com/JanssenProject/jans/compare/agama-v1.0.0...agama-v1.0.1) (2022-07-06) + + +### Features + +* **agama:** allow the config-api to perform syntax check of flows ([#1621](https://github.com/JanssenProject/jans/issues/1621)) ([2e99d3a](https://github.com/JanssenProject/jans/commit/2e99d3a9bec389f68086c606062280967ce338ce)) +* **agama:** improve flows timeout ([#1447](https://github.com/JanssenProject/jans/issues/1447)) ([ccfb62e](https://github.com/JanssenProject/jans/commit/ccfb62ec13d371c96a0d597d5a0229864f044373)) +* **agama:** reject usage of repeated input names ([#1484](https://github.com/JanssenProject/jans/issues/1484)) ([aed8cf3](https://github.com/JanssenProject/jans/commit/aed8cf33d89b98f0ac6aae52e145a84a0937d60e)) +* update DSL to support shorthand for finish [#1628](https://github.com/JanssenProject/jans/issues/1628) ([71e4652](https://github.com/JanssenProject/jans/commit/71e46524492d48fccf2ed2840ede3d6ae525a3e3)) + + +### Bug Fixes + +* **agama:** adjust pom version [#1402](https://github.com/JanssenProject/jans/issues/1402) ([#1403](https://github.com/JanssenProject/jans/issues/1403)) ([930f080](https://github.com/JanssenProject/jans/commit/930f0801177d516d6bfa9c536d590556144cbd61)) +* **agama:** adjust pom version [#1402](https://github.com/JanssenProject/jans/issues/1402) ([#1404](https://github.com/JanssenProject/jans/issues/1404)) ([86bf614](https://github.com/JanssenProject/jans/commit/86bf61420bf6b8d236b8200835a2ff05f430308b)) +* update pom [#1438](https://github.com/JanssenProject/jans/issues/1438) ([#1439](https://github.com/JanssenProject/jans/issues/1439)) ([66b9962](https://github.com/JanssenProject/jans/commit/66b996286a2285986845677ea039f177f756d962)) + + +### Documentation + +* update docs wrt to language updates [#1628](https://github.com/JanssenProject/jans/issues/1628) ([ca32bd5](https://github.com/JanssenProject/jans/commit/ca32bd54ec109134dad04d4a0f15eebc6d7bdd8e)) + + +### Miscellaneous Chores + +* release 1.0.0 ([3df6f77](https://github.com/JanssenProject/jans/commit/3df6f7721a8e9d57e28d065ee29153d023dfe9ea)) +* release 1.0.0 ([9644d1b](https://github.com/JanssenProject/jans/commit/9644d1bd29c291e57c140b0c9ac67243c322ac35)) +* release 1.0.1 ([828bfe8](https://github.com/JanssenProject/jans/commit/828bfe80cee87e639839391f98ac3dc2f2d4a920)) + +## 1.0.0 (2022-05-19) + + +### Features + +* add schema updates [#1390](https://github.com/JanssenProject/jans/issues/1390) ([c9023b3](https://github.com/JanssenProject/jans/commit/c9023b3435fbc8079aabe5c70de3177ec9112308)) +* allow flows to access their metadata properties [#1340](https://github.com/JanssenProject/jans/issues/1340) ([344ba04](https://github.com/JanssenProject/jans/commit/344ba0448c73e3c56e05f529eea5009b2157c1fc)) +* initial agama commit [#1322](https://github.com/JanssenProject/jans/issues/1322) ([#1323](https://github.com/JanssenProject/jans/issues/1323)) ([0148bc8](https://github.com/JanssenProject/jans/commit/0148bc8a32a005e47ba9d090e895282775148a95)) +* **jans-config-api:** user custom attributes at root level - 1348 ([5b3f0a1](https://github.com/JanssenProject/jans/commit/5b3f0a13e25cd842e0bbd4be3d21eb48ab1d108f)) + + +### Miscellaneous Chores + +* release 1.0.0 ([b2895f2](https://github.com/JanssenProject/jans/commit/b2895f224b5772c0724ea0afbdf67a417a5c537c)) +* release 1.0.0-beta.16 ([90e4bb2](https://github.com/JanssenProject/jans/commit/90e4bb29df040bd9fe5921a054bc4226d34ca1ef)) +* release 1.0.0-beta.16 ([eec2073](https://github.com/JanssenProject/jans/commit/eec2073be9fd25544f31087e171934afb9a71e6d)) +* release 1.0.0-beta.16 ([cd92ead](https://github.com/JanssenProject/jans/commit/cd92ead2ca654383091c4923d3de5619b70fc5b9)) +* release 1.0.0-beta.16 ([7f0a91b](https://github.com/JanssenProject/jans/commit/7f0a91bd90efc1cd7a80047f9cd6b7c6a22417a2)) +* release 1.0.0-beta.16 ([c2ad604](https://github.com/JanssenProject/jans/commit/c2ad604dc29e7401bc4cb0788feaa20e11de0440)) +* release 1.0.0-beta.16 ([a641486](https://github.com/JanssenProject/jans/commit/a6414864712789d1fcf80b823338100aebda030e)) +* release 1.0.0-beta.16 ([94d5791](https://github.com/JanssenProject/jans/commit/94d5791a23fce4ecb8913c16c940cfbbc85fed4c)) +* release 1.0.0-beta.16 ([16de429](https://github.com/JanssenProject/jans/commit/16de4299bc5e9c4a842f279ae0d3ae8282a4ff2c)) +* release 1.0.0-beta.16 ([72915c0](https://github.com/JanssenProject/jans/commit/72915c0e82b9684ac1c59934d5b9a36c2456058d)) +* release 1.0.0-beta.16 ([3ea2b37](https://github.com/JanssenProject/jans/commit/3ea2b37deac3416564614fb6a4e84b056ddbed3f)) +* release 1.0.0-beta.16 ([78a6d39](https://github.com/JanssenProject/jans/commit/78a6d39ffadf9abee18c7be0e14ad3eb6ec2ef1b)) +* release 1.0.0-beta.16 ([11bfa93](https://github.com/JanssenProject/jans/commit/11bfa9368e6ee482cc44240de08c8133d91b3f4c)) +* release 1.0.0-beta.16 ([22b180b](https://github.com/JanssenProject/jans/commit/22b180bba9a08045a6daa7ca8ee2b71abd42a973)) +* release 1.0.0-beta.16 ([b9acd0b](https://github.com/JanssenProject/jans/commit/b9acd0bceeeb54e3c47f869f11d97a22e8dc161f)) +* release 1.0.0-beta.16 ([328cd30](https://github.com/JanssenProject/jans/commit/328cd309ae1655a52709e13ca2f89441c6c965a2)) +* release 1.0.0-beta.16 ([5a84602](https://github.com/JanssenProject/jans/commit/5a84602838fb5d2e667422220fcd44dc53543e23)) +* release 1.0.0-beta.16 ([4923277](https://github.com/JanssenProject/jans/commit/4923277b100b5c814d94b27b88d1809794dfc413)) +* release 1.0.0-beta.16 ([258ba96](https://github.com/JanssenProject/jans/commit/258ba962bd93eb5be4d51e7de3a80da89c2e222f)) +* release 1.0.0-beta.16 ([77c4423](https://github.com/JanssenProject/jans/commit/77c4423d82b697fd91a0e61f40bad6bd9da0dba8)) +* release 1.0.0-beta.16 ([688b324](https://github.com/JanssenProject/jans/commit/688b32407b396917695cca787c08e95fe98269a1)) +* release 1.0.0-beta.16 ([4e86f15](https://github.com/JanssenProject/jans/commit/4e86f15fc39ec89d4790ebfaa7d30e7053fef606)) +* release 1.0.0-beta.16 ([8d514ee](https://github.com/JanssenProject/jans/commit/8d514ee63d840627321de2d89e816577dd919914)) +* release 1.0.0-beta.16 ([0899898](https://github.com/JanssenProject/jans/commit/0899898e80ba9b7e6a915574737bdf0756b59a14)) diff --git a/jans-auth-server/agama/README.md b/jans-auth-server/agama/README.md new file mode 100644 index 00000000000..0026c38c9c9 --- /dev/null +++ b/jans-auth-server/agama/README.md @@ -0,0 +1,12 @@ +# Agama + +Agama is an auth-server component that offers an alternative way to build authentication flows in Janssen server. +Originally, person authentication flows are defined in the server by means of jython scripts that adhere to a predefined API. With Agama, flows are coded in a DSL (domain specific language) designed for the sole purpose of writing web flows. + +Some advantages of using Agama include: + +1. Ability to express authentication flows in a clean and concise way +2. Flow composition is supported out-of-the-box: reuse of an existing flow in another requires no effort +3. Reasoning about flows behavior is easy (as consequence of points 1 and 2). This makes flow modifications and refactoring straightforward +4. Small cognitive load. Agama DSL is a very small language with simple, non-distracting syntax +5. Friendly UI templating engine. No complexities when authoring web pages - stay focused on writing HTML markup diff --git a/agama/engine/pom.xml b/jans-auth-server/agama/engine/pom.xml similarity index 95% rename from agama/engine/pom.xml rename to jans-auth-server/agama/engine/pom.xml index b5059e95528..65aa9517d85 100644 --- a/agama/engine/pom.xml +++ b/jans-auth-server/agama/engine/pom.xml @@ -8,8 +8,9 @@ io.jans - agama + jans-auth-server-parent 1.0.6-SNAPSHOT + ../../pom.xml @@ -71,12 +72,12 @@ io.jans agama-model - ${jans.version} + ${project.version} io.jans agama-transpiler - ${jans.version} + ${project.version} @@ -89,6 +90,8 @@ org.jboss.spec.javax.ws.rs jboss-jaxrs-api_3.0_spec + ${jboss-jaxrs-api_3.0_spec.version} + provided @@ -215,7 +218,7 @@ io.jans agama-inbound - ${jans.version} + ${project.version} test diff --git a/agama/engine/profiles/default/config-agama-test.properties b/jans-auth-server/agama/engine/profiles/default/config-agama-test.properties similarity index 100% rename from agama/engine/profiles/default/config-agama-test.properties rename to jans-auth-server/agama/engine/profiles/default/config-agama-test.properties diff --git a/agama/engine/src/main/java/io/jans/agama/NativeJansFlowBridge.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/NativeJansFlowBridge.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/NativeJansFlowBridge.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/NativeJansFlowBridge.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/continuation/PendingException.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/continuation/PendingException.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/continuation/PendingException.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/continuation/PendingException.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/continuation/PendingRedirectException.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/continuation/PendingRedirectException.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/continuation/PendingRedirectException.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/continuation/PendingRedirectException.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/continuation/PendingRenderException.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/continuation/PendingRenderException.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/continuation/PendingRenderException.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/continuation/PendingRenderException.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/exception/FlowCrashException.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/exception/FlowCrashException.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/exception/FlowCrashException.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/exception/FlowCrashException.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/exception/FlowTimeoutException.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/exception/FlowTimeoutException.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/exception/FlowTimeoutException.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/exception/FlowTimeoutException.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/exception/TemplateProcessingException.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/exception/TemplateProcessingException.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/exception/TemplateProcessingException.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/exception/TemplateProcessingException.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/misc/FlowUtils.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/misc/FlowUtils.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/misc/FlowUtils.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/misc/FlowUtils.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/misc/PrimitiveUtils.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/misc/PrimitiveUtils.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/misc/PrimitiveUtils.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/misc/PrimitiveUtils.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/model/FlowResult.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/model/FlowResult.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/model/FlowResult.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/model/FlowResult.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/model/FlowRun.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/model/FlowRun.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/model/FlowRun.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/model/FlowRun.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/model/FlowStatus.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/model/FlowStatus.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/model/FlowStatus.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/model/FlowStatus.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/model/ProtoFlowRun.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/model/ProtoFlowRun.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/model/ProtoFlowRun.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/model/ProtoFlowRun.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/page/BasicTemplateModel.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/page/BasicTemplateModel.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/page/BasicTemplateModel.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/page/BasicTemplateModel.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/page/Labels.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/page/Labels.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/page/Labels.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/page/Labels.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/page/Page.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/page/Page.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/page/Page.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/page/Page.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/script/LogUtils.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/script/LogUtils.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/script/LogUtils.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/script/LogUtils.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/script/ScriptUtils.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/script/ScriptUtils.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/script/ScriptUtils.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/script/ScriptUtils.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/serialize/ContinuationSerializer.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/serialize/ContinuationSerializer.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/serialize/ContinuationSerializer.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/serialize/ContinuationSerializer.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/serialize/FstSerializer.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/serialize/FstSerializer.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/serialize/FstSerializer.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/serialize/FstSerializer.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/serialize/KryoSerializer.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/serialize/KryoSerializer.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/serialize/KryoSerializer.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/serialize/KryoSerializer.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/serialize/NativeJavaBox.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/serialize/NativeJavaBox.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/serialize/NativeJavaBox.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/serialize/NativeJavaBox.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/serialize/ObjectSerializer.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/serialize/ObjectSerializer.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/serialize/ObjectSerializer.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/serialize/ObjectSerializer.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/serialize/SerializerFactory.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/serialize/SerializerFactory.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/serialize/SerializerFactory.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/serialize/SerializerFactory.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/service/ActionService.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/service/ActionService.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/service/ActionService.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/service/ActionService.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/service/AgamaPersistenceService.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/service/AgamaPersistenceService.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/service/AgamaPersistenceService.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/service/AgamaPersistenceService.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/service/AppInitializer.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/service/AppInitializer.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/service/AppInitializer.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/service/AppInitializer.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/service/FlowService.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/service/FlowService.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/service/FlowService.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/service/FlowService.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/service/ManagedBeanService.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/service/ManagedBeanService.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/service/ManagedBeanService.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/service/ManagedBeanService.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/service/ServicesFactory.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/service/ServicesFactory.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/service/ServicesFactory.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/service/ServicesFactory.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/service/TemplatingService.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/service/TemplatingService.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/service/TemplatingService.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/service/TemplatingService.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/service/WebContext.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/service/WebContext.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/service/WebContext.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/service/WebContext.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/servlet/BaseServlet.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/servlet/BaseServlet.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/servlet/BaseServlet.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/servlet/BaseServlet.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/servlet/ExecutionServlet.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/servlet/ExecutionServlet.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/servlet/ExecutionServlet.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/servlet/ExecutionServlet.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/servlet/RestartServlet.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/servlet/RestartServlet.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/servlet/RestartServlet.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/servlet/RestartServlet.java diff --git a/agama/engine/src/main/java/io/jans/agama/engine/servlet/StatusServlet.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/servlet/StatusServlet.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/engine/servlet/StatusServlet.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/engine/servlet/StatusServlet.java diff --git a/agama/engine/src/main/java/io/jans/agama/timer/FlowRunsCleaner.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/timer/FlowRunsCleaner.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/timer/FlowRunsCleaner.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/timer/FlowRunsCleaner.java diff --git a/agama/engine/src/main/java/io/jans/agama/timer/FlowRunsCleanerEvent.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/timer/FlowRunsCleanerEvent.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/timer/FlowRunsCleanerEvent.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/timer/FlowRunsCleanerEvent.java diff --git a/agama/engine/src/main/java/io/jans/agama/timer/Transpilation.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/timer/Transpilation.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/timer/Transpilation.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/timer/Transpilation.java diff --git a/agama/engine/src/main/java/io/jans/agama/timer/TranspilationEvent.java b/jans-auth-server/agama/engine/src/main/java/io/jans/agama/timer/TranspilationEvent.java similarity index 100% rename from agama/engine/src/main/java/io/jans/agama/timer/TranspilationEvent.java rename to jans-auth-server/agama/engine/src/main/java/io/jans/agama/timer/TranspilationEvent.java diff --git a/agama/engine/src/main/resources/META-INF/beans.xml b/jans-auth-server/agama/engine/src/main/resources/META-INF/beans.xml similarity index 100% rename from agama/engine/src/main/resources/META-INF/beans.xml rename to jans-auth-server/agama/engine/src/main/resources/META-INF/beans.xml diff --git a/agama/engine/src/test/java/io/jans/agama/test/BaseTest.java b/jans-auth-server/agama/engine/src/test/java/io/jans/agama/test/BaseTest.java similarity index 100% rename from agama/engine/src/test/java/io/jans/agama/test/BaseTest.java rename to jans-auth-server/agama/engine/src/test/java/io/jans/agama/test/BaseTest.java diff --git a/agama/engine/src/test/java/io/jans/agama/test/CustomConfigsFlowTest.java b/jans-auth-server/agama/engine/src/test/java/io/jans/agama/test/CustomConfigsFlowTest.java similarity index 100% rename from agama/engine/src/test/java/io/jans/agama/test/CustomConfigsFlowTest.java rename to jans-auth-server/agama/engine/src/test/java/io/jans/agama/test/CustomConfigsFlowTest.java diff --git a/agama/engine/src/test/java/io/jans/agama/test/InexistentFlowTest.java b/jans-auth-server/agama/engine/src/test/java/io/jans/agama/test/InexistentFlowTest.java similarity index 100% rename from agama/engine/src/test/java/io/jans/agama/test/InexistentFlowTest.java rename to jans-auth-server/agama/engine/src/test/java/io/jans/agama/test/InexistentFlowTest.java diff --git a/agama/engine/src/test/java/io/jans/agama/test/MathFlowTest.java b/jans-auth-server/agama/engine/src/test/java/io/jans/agama/test/MathFlowTest.java similarity index 100% rename from agama/engine/src/test/java/io/jans/agama/test/MathFlowTest.java rename to jans-auth-server/agama/engine/src/test/java/io/jans/agama/test/MathFlowTest.java diff --git a/agama/engine/src/test/java/io/jans/agama/test/SaySomething2FlowTest.java b/jans-auth-server/agama/engine/src/test/java/io/jans/agama/test/SaySomething2FlowTest.java similarity index 100% rename from agama/engine/src/test/java/io/jans/agama/test/SaySomething2FlowTest.java rename to jans-auth-server/agama/engine/src/test/java/io/jans/agama/test/SaySomething2FlowTest.java diff --git a/agama/engine/src/test/java/io/jans/agama/test/SaySomething3FlowTest.java b/jans-auth-server/agama/engine/src/test/java/io/jans/agama/test/SaySomething3FlowTest.java similarity index 100% rename from agama/engine/src/test/java/io/jans/agama/test/SaySomething3FlowTest.java rename to jans-auth-server/agama/engine/src/test/java/io/jans/agama/test/SaySomething3FlowTest.java diff --git a/agama/engine/src/test/java/io/jans/agama/test/SaySomethingFlowTest.java b/jans-auth-server/agama/engine/src/test/java/io/jans/agama/test/SaySomethingFlowTest.java similarity index 100% rename from agama/engine/src/test/java/io/jans/agama/test/SaySomethingFlowTest.java rename to jans-auth-server/agama/engine/src/test/java/io/jans/agama/test/SaySomethingFlowTest.java diff --git a/agama/engine/src/test/java/io/jans/agama/test/UidOnlyAuthTest.java b/jans-auth-server/agama/engine/src/test/java/io/jans/agama/test/UidOnlyAuthTest.java similarity index 100% rename from agama/engine/src/test/java/io/jans/agama/test/UidOnlyAuthTest.java rename to jans-auth-server/agama/engine/src/test/java/io/jans/agama/test/UidOnlyAuthTest.java diff --git a/agama/engine/src/test/resources/flows/io.jans.agama.test.auth.uidOnly b/jans-auth-server/agama/engine/src/test/resources/flows/io.jans.agama.test.auth.uidOnly similarity index 100% rename from agama/engine/src/test/resources/flows/io.jans.agama.test.auth.uidOnly rename to jans-auth-server/agama/engine/src/test/resources/flows/io.jans.agama.test.auth.uidOnly diff --git a/agama/engine/src/test/resources/flows/io.jans.agama.test.math b/jans-auth-server/agama/engine/src/test/resources/flows/io.jans.agama.test.math similarity index 100% rename from agama/engine/src/test/resources/flows/io.jans.agama.test.math rename to jans-auth-server/agama/engine/src/test/resources/flows/io.jans.agama.test.math diff --git a/agama/engine/src/test/resources/flows/io.jans.agama.test.showConfig b/jans-auth-server/agama/engine/src/test/resources/flows/io.jans.agama.test.showConfig similarity index 100% rename from agama/engine/src/test/resources/flows/io.jans.agama.test.showConfig rename to jans-auth-server/agama/engine/src/test/resources/flows/io.jans.agama.test.showConfig diff --git a/agama/engine/src/test/resources/flows/org.gluu.flow1 b/jans-auth-server/agama/engine/src/test/resources/flows/org.gluu.flow1 similarity index 100% rename from agama/engine/src/test/resources/flows/org.gluu.flow1 rename to jans-auth-server/agama/engine/src/test/resources/flows/org.gluu.flow1 diff --git a/agama/engine/src/test/resources/flows/org.gluu.flow2 b/jans-auth-server/agama/engine/src/test/resources/flows/org.gluu.flow2 similarity index 100% rename from agama/engine/src/test/resources/flows/org.gluu.flow2 rename to jans-auth-server/agama/engine/src/test/resources/flows/org.gluu.flow2 diff --git a/agama/engine/src/test/resources/flows/org.gluu.flow3 b/jans-auth-server/agama/engine/src/test/resources/flows/org.gluu.flow3 similarity index 100% rename from agama/engine/src/test/resources/flows/org.gluu.flow3 rename to jans-auth-server/agama/engine/src/test/resources/flows/org.gluu.flow3 diff --git a/agama/engine/src/test/resources/log4j2-test.xml b/jans-auth-server/agama/engine/src/test/resources/log4j2-test.xml similarity index 100% rename from agama/engine/src/test/resources/log4j2-test.xml rename to jans-auth-server/agama/engine/src/test/resources/log4j2-test.xml diff --git a/agama/engine/src/test/resources/templates/custom/printConfigs.ftlh b/jans-auth-server/agama/engine/src/test/resources/templates/custom/printConfigs.ftlh similarity index 100% rename from agama/engine/src/test/resources/templates/custom/printConfigs.ftlh rename to jans-auth-server/agama/engine/src/test/resources/templates/custom/printConfigs.ftlh diff --git a/agama/engine/src/test/resources/templates/f1/index.ftl b/jans-auth-server/agama/engine/src/test/resources/templates/f1/index.ftl similarity index 100% rename from agama/engine/src/test/resources/templates/f1/index.ftl rename to jans-auth-server/agama/engine/src/test/resources/templates/f1/index.ftl diff --git a/agama/engine/src/test/resources/templates/f1/index2.ftl b/jans-auth-server/agama/engine/src/test/resources/templates/f1/index2.ftl similarity index 100% rename from agama/engine/src/test/resources/templates/f1/index2.ftl rename to jans-auth-server/agama/engine/src/test/resources/templates/f1/index2.ftl diff --git a/agama/engine/src/test/resources/templates/hello/index.ftlh b/jans-auth-server/agama/engine/src/test/resources/templates/hello/index.ftlh similarity index 100% rename from agama/engine/src/test/resources/templates/hello/index.ftlh rename to jans-auth-server/agama/engine/src/test/resources/templates/hello/index.ftlh diff --git a/agama/engine/src/test/resources/templates/login.ftlh b/jans-auth-server/agama/engine/src/test/resources/templates/login.ftlh similarity index 100% rename from agama/engine/src/test/resources/templates/login.ftlh rename to jans-auth-server/agama/engine/src/test/resources/templates/login.ftlh diff --git a/agama/engine/src/test/resources/templates/me/myindex.ftlh b/jans-auth-server/agama/engine/src/test/resources/templates/me/myindex.ftlh similarity index 100% rename from agama/engine/src/test/resources/templates/me/myindex.ftlh rename to jans-auth-server/agama/engine/src/test/resources/templates/me/myindex.ftlh diff --git a/agama/engine/src/test/resources/testng.properties b/jans-auth-server/agama/engine/src/test/resources/testng.properties similarity index 100% rename from agama/engine/src/test/resources/testng.properties rename to jans-auth-server/agama/engine/src/test/resources/testng.properties diff --git a/agama/engine/src/test/resources/testng.xml b/jans-auth-server/agama/engine/src/test/resources/testng.xml similarity index 100% rename from agama/engine/src/test/resources/testng.xml rename to jans-auth-server/agama/engine/src/test/resources/testng.xml diff --git a/agama/inboundID/CustomMappings.java.txt b/jans-auth-server/agama/inboundID/CustomMappings.java.txt similarity index 100% rename from agama/inboundID/CustomMappings.java.txt rename to jans-auth-server/agama/inboundID/CustomMappings.java.txt diff --git a/agama/inboundID/pom.xml b/jans-auth-server/agama/inboundID/pom.xml similarity index 95% rename from agama/inboundID/pom.xml rename to jans-auth-server/agama/inboundID/pom.xml index 20941866b1d..dcad64c43f1 100644 --- a/agama/inboundID/pom.xml +++ b/jans-auth-server/agama/inboundID/pom.xml @@ -9,8 +9,9 @@ io.jans - agama + jans-auth-server-parent 1.0.6-SNAPSHOT + ../../pom.xml @@ -64,6 +65,7 @@ org.jboss.spec.javax.ws.rs jboss-jaxrs-api_3.0_spec + ${jboss-jaxrs-api_3.0_spec.version} provided diff --git a/agama/inboundID/src/main/java/io/jans/inbound/Attrs.java b/jans-auth-server/agama/inboundID/src/main/java/io/jans/inbound/Attrs.java similarity index 100% rename from agama/inboundID/src/main/java/io/jans/inbound/Attrs.java rename to jans-auth-server/agama/inboundID/src/main/java/io/jans/inbound/Attrs.java diff --git a/agama/inboundID/src/main/java/io/jans/inbound/IdentityProcessor.java b/jans-auth-server/agama/inboundID/src/main/java/io/jans/inbound/IdentityProcessor.java similarity index 100% rename from agama/inboundID/src/main/java/io/jans/inbound/IdentityProcessor.java rename to jans-auth-server/agama/inboundID/src/main/java/io/jans/inbound/IdentityProcessor.java diff --git a/agama/inboundID/src/main/java/io/jans/inbound/JwtUtil.java b/jans-auth-server/agama/inboundID/src/main/java/io/jans/inbound/JwtUtil.java similarity index 100% rename from agama/inboundID/src/main/java/io/jans/inbound/JwtUtil.java rename to jans-auth-server/agama/inboundID/src/main/java/io/jans/inbound/JwtUtil.java diff --git a/agama/inboundID/src/main/java/io/jans/inbound/Mappings.java b/jans-auth-server/agama/inboundID/src/main/java/io/jans/inbound/Mappings.java similarity index 100% rename from agama/inboundID/src/main/java/io/jans/inbound/Mappings.java rename to jans-auth-server/agama/inboundID/src/main/java/io/jans/inbound/Mappings.java diff --git a/agama/inboundID/src/main/java/io/jans/inbound/Provider.java b/jans-auth-server/agama/inboundID/src/main/java/io/jans/inbound/Provider.java similarity index 100% rename from agama/inboundID/src/main/java/io/jans/inbound/Provider.java rename to jans-auth-server/agama/inboundID/src/main/java/io/jans/inbound/Provider.java diff --git a/agama/inboundID/src/main/java/io/jans/inbound/oauth2/CodeGrantUtil.java b/jans-auth-server/agama/inboundID/src/main/java/io/jans/inbound/oauth2/CodeGrantUtil.java similarity index 100% rename from agama/inboundID/src/main/java/io/jans/inbound/oauth2/CodeGrantUtil.java rename to jans-auth-server/agama/inboundID/src/main/java/io/jans/inbound/oauth2/CodeGrantUtil.java diff --git a/agama/inboundID/src/main/java/io/jans/inbound/oauth2/OAuthParams.java b/jans-auth-server/agama/inboundID/src/main/java/io/jans/inbound/oauth2/OAuthParams.java similarity index 100% rename from agama/inboundID/src/main/java/io/jans/inbound/oauth2/OAuthParams.java rename to jans-auth-server/agama/inboundID/src/main/java/io/jans/inbound/oauth2/OAuthParams.java diff --git a/agama/inboundID/src/main/java/io/jans/util/NetworkUtils.java b/jans-auth-server/agama/inboundID/src/main/java/io/jans/util/NetworkUtils.java similarity index 100% rename from agama/inboundID/src/main/java/io/jans/util/NetworkUtils.java rename to jans-auth-server/agama/inboundID/src/main/java/io/jans/util/NetworkUtils.java diff --git a/agama/model/pom.xml b/jans-auth-server/agama/model/pom.xml similarity index 73% rename from agama/model/pom.xml rename to jans-auth-server/agama/model/pom.xml index 0374a99c54a..aac9d1c8662 100644 --- a/agama/model/pom.xml +++ b/jans-auth-server/agama/model/pom.xml @@ -8,8 +8,9 @@ io.jans - agama + jans-auth-server-parent 1.0.6-SNAPSHOT + ../../pom.xml @@ -17,6 +18,10 @@ io.jans jans-orm-model + + io.jans + jans-doc + io.jans jans-core-util @@ -24,6 +29,8 @@ org.jboss.spec.javax.ws.rs jboss-jaxrs-api_3.0_spec + ${jboss-jaxrs-api_3.0_spec.version} + provided diff --git a/agama/model/src/main/java/io/jans/agama/model/EngineConfig.java b/jans-auth-server/agama/model/src/main/java/io/jans/agama/model/EngineConfig.java similarity index 100% rename from agama/model/src/main/java/io/jans/agama/model/EngineConfig.java rename to jans-auth-server/agama/model/src/main/java/io/jans/agama/model/EngineConfig.java diff --git a/agama/model/src/main/java/io/jans/agama/model/Flow.java b/jans-auth-server/agama/model/src/main/java/io/jans/agama/model/Flow.java similarity index 100% rename from agama/model/src/main/java/io/jans/agama/model/Flow.java rename to jans-auth-server/agama/model/src/main/java/io/jans/agama/model/Flow.java diff --git a/agama/model/src/main/java/io/jans/agama/model/FlowMetadata.java b/jans-auth-server/agama/model/src/main/java/io/jans/agama/model/FlowMetadata.java similarity index 100% rename from agama/model/src/main/java/io/jans/agama/model/FlowMetadata.java rename to jans-auth-server/agama/model/src/main/java/io/jans/agama/model/FlowMetadata.java diff --git a/agama/model/src/main/java/io/jans/agama/model/ProtoFlow.java b/jans-auth-server/agama/model/src/main/java/io/jans/agama/model/ProtoFlow.java similarity index 100% rename from agama/model/src/main/java/io/jans/agama/model/ProtoFlow.java rename to jans-auth-server/agama/model/src/main/java/io/jans/agama/model/ProtoFlow.java diff --git a/agama/model/src/main/java/io/jans/agama/model/serialize/Type.java b/jans-auth-server/agama/model/src/main/java/io/jans/agama/model/serialize/Type.java similarity index 100% rename from agama/model/src/main/java/io/jans/agama/model/serialize/Type.java rename to jans-auth-server/agama/model/src/main/java/io/jans/agama/model/serialize/Type.java diff --git a/jans-auth-server/pom.xml b/jans-auth-server/pom.xml index 958ae363ee2..6796979d221 100644 --- a/jans-auth-server/pom.xml +++ b/jans-auth-server/pom.xml @@ -54,7 +54,8 @@ https://sonarcloud.io 4.0.3.Final 4.7.5.Final - + 1.0.1.Final + ${maven.min-version} @@ -100,11 +101,14 @@ model + agama/model persistence-model test-model client static common + agama/engine + agama/inboundID server diff --git a/jans-bom/pom.xml b/jans-bom/pom.xml index 81447b88ae7..e9561c20e81 100644 --- a/jans-bom/pom.xml +++ b/jans-bom/pom.xml @@ -216,6 +216,11 @@ jans-orm-util ${project.version} + + io.jans + jans-doc + ${project.version} + io.jans jans-core-script