This is an automated email from the ASF dual-hosted git repository.

gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-archetypes.git

commit 38603b95d988fc373bf3eedb129fe65002f2f24d
Merge: 2839bbb 963fb95
Author: Georg Kallidis <[email protected]>
AuthorDate: Thu Jun 28 14:56:59 2018 +0200

    Merge branch 'master' of 
https://gitlab.cedis.fu-berlin.de/turbine/archetypes

 tags/turbine-webapp-2.3.3-1.0.0/pom.xml            |  65 ++
 .../src/changes/changes.xml                        |  36 +
 .../META-INF/maven/archetype-metadata.xml          |  78 ++
 .../src/main/resources/archetype-resources/pom.xml | 404 ++++++++++
 .../src/main/java/L10N_en_US.properties            |  19 +
 .../src/main/java/modules/screens/Index.java       |  64 ++
 .../src/main/torque-schema/application-data.xml    |  31 +
 .../src/main/torque-schema/application-schema.xml  |  36 +
 .../src/main/torque-schema/id-table-schema.xml     |  46 ++
 .../main/torque-schema/torque-security-data.xml    |  67 ++
 .../main/torque-schema/torque-security-schema.xml  | 112 +++
 .../src/main/webapp/WEB-INF/conf/Torque.properties |  55 ++
 .../WEB-INF/conf/TurbineResources.properties       | 876 +++++++++++++++++++++
 .../webapp/WEB-INF/conf/componentConfiguration.xml |  25 +
 .../webapp/WEB-INF/conf/containerConfiguration.xml |  35 +
 .../src/main/webapp/WEB-INF/conf/intake.xml        |  35 +
 .../src/main/webapp/WEB-INF/conf/log4j.properties  | 137 ++++
 .../main/webapp/WEB-INF/conf/roleConfiguration.xml |  28 +
 .../src/main/webapp/WEB-INF/web.xml                |  96 +++
 .../ui/skins/default/images/powered-by-logo.gif    | Bin 0 -> 2062 bytes
 .../ui/skins/default/images/turbine-project.png    | Bin 0 -> 21047 bytes
 .../webapp/resources/ui/skins/default/skin.props   |  19 +
 .../src/main/webapp/templates/layouts/Default.vm   |  29 +
 .../src/main/webapp/templates/screens/Index.vm     |  27 +
 tags/turbine-webapp-4.0-1.0.0/pom.xml              |  65 ++
 .../src/changes/changes.xml                        |  39 +
 .../META-INF/maven/archetype-metadata.xml          |  78 ++
 .../src/main/resources/archetype-resources/pom.xml | 239 ++++++
 .../src/main/java/L10N_en_US.properties            |  19 +
 .../src/main/java/modules/screens/Index.java       |  64 ++
 .../src/main/torque-schema/application-data.xml    |  31 +
 .../src/main/torque-schema/application-schema.xml  |  36 +
 .../src/main/torque-schema/id-table-schema.xml     |  46 ++
 .../main/torque-schema/torque-security-data.xml    |  67 ++
 .../main/torque-schema/torque-security-schema.xml  | 112 +++
 .../src/main/webapp/WEB-INF/conf/Torque.properties |  55 ++
 .../WEB-INF/conf/TurbineResources.properties       | 679 ++++++++++++++++
 .../webapp/WEB-INF/conf/componentConfiguration.xml |  53 ++
 .../webapp/WEB-INF/conf/containerConfiguration.xml |  35 +
 .../src/main/webapp/WEB-INF/conf/intake.xml        |  35 +
 .../src/main/webapp/WEB-INF/conf/log4j.properties  | 137 ++++
 .../main/webapp/WEB-INF/conf/roleConfiguration.xml |  78 ++
 .../WEB-INF/conf/turbine-classic-pipeline.xml      |  32 +
 .../src/main/webapp/WEB-INF/web.xml                |  96 +++
 .../ui/skins/default/images/powered-by-logo.gif    | Bin 0 -> 2062 bytes
 .../ui/skins/default/images/turbine-project.png    | Bin 0 -> 21047 bytes
 .../webapp/resources/ui/skins/default/skin.props   |  19 +
 .../src/main/webapp/templates/layouts/Default.vm   |  29 +
 .../src/main/webapp/templates/screens/Index.vm     |  27 +
 tags/turbine-webapp-4.0-1.0.1/LICENSE              | 202 +++++
 tags/turbine-webapp-4.0-1.0.1/NOTICE               |   5 +
 tags/turbine-webapp-4.0-1.0.1/README               |   5 +
 tags/turbine-webapp-4.0-1.0.1/pom.xml              |  64 ++
 .../src/changes/changes.xml                        |  75 ++
 .../META-INF/maven/archetype-metadata.xml          |  96 +++
 .../resources/archetype-resources/docs/README.txt  | 123 +++
 .../docs/sample-mysql-data/_application-data.sql   |  15 +
 .../sample-mysql-data/_turbine-security-data.sql   |  40 +
 .../src/main/resources/archetype-resources/pom.xml | 290 +++++++
 .../src/main/java/L10N.properties                  |  23 +
 .../src/main/java/L10N_de_DE.properties            |  28 +
 .../src/main/java/L10N_en_US.properties            |  23 +
 .../security/torque/TorqueAbstractUserManager.java | 400 ++++++++++
 .../torque/turbine/TorqueAbstractTurbineGroup.java | 140 ++++
 .../turbine/TorqueAbstractTurbinePermission.java   | 207 +++++
 .../torque/turbine/TorqueAbstractTurbineRole.java  | 264 +++++++
 .../torque/turbine/TorqueAbstractTurbineUser.java  | 139 ++++
 .../turbine/TorqueTurbineGroupManagerImpl.java     | 144 ++++
 .../turbine/TorqueTurbineRoleManagerImpl.java      | 140 ++++
 .../turbine/TorqueTurbineUserManagerImpl.java      | 200 +++++
 .../java/modules/actions/ChangePasswordAction.java |  95 +++
 .../src/main/java/modules/actions/LoginUser.java   | 114 +++
 .../main/java/modules/actions/LoginUserIntake.java | 183 +++++
 .../src/main/java/modules/actions/LogoutUser.java  | 121 +++
 .../main/java/modules/actions/SecureAction.java    |  85 ++
 .../src/main/java/modules/screens/Index.java       |  63 ++
 .../src/main/java/modules/screens/Password.java    |  54 ++
 .../main/java/modules/screens/SecureScreen.java    |  93 +++
 .../src/main/java/modules/screens/TestSecure.java  |  48 ++
 .../src/main/java/om/TurbineGroup.java             |  89 +++
 .../src/main/java/om/TurbineGroupPeer.java         |  21 +
 .../src/main/java/om/TurbineGroupPeerImpl.java     |  25 +
 .../src/main/java/om/TurbinePermission.java        |  60 ++
 .../src/main/java/om/TurbineRole.java              |  99 +++
 .../src/main/java/om/TurbineRolePeer.java          |  21 +
 .../src/main/java/om/TurbineRolePeerImpl.java      |  27 +
 .../src/main/java/om/TurbineRolePermission.java    |  25 +
 .../src/main/java/om/TurbineUser.java              | 149 ++++
 .../src/main/java/om/TurbineUserPeer.java          |  22 +
 .../src/main/java/om/TurbineUserPeerImpl.java      |  25 +
 .../src/main/torque-schema/application-data.xml    |  31 +
 .../src/main/torque-schema/application-schema.xml  |  53 ++
 .../src/main/torque-schema/id-table-schema.xml     |  47 ++
 .../main/torque-schema/torque-security-data.xml    |  67 ++
 .../main/torque-schema/torque-security-schema.xml  | 120 +++
 .../src/main/webapp/WEB-INF/conf/Torque.properties | 126 +++
 .../WEB-INF/conf/TurbineConfigurationBuilder.xml   |  15 +
 .../WEB-INF/conf/TurbineResources.properties       | 652 +++++++++++++++
 .../webapp/WEB-INF/conf/componentConfiguration.xml | 124 +++
 .../webapp/WEB-INF/conf/containerConfiguration.xml |  35 +
 .../src/main/webapp/WEB-INF/conf/intake.xml        |  45 ++
 .../src/main/webapp/WEB-INF/conf/log4j.properties  | 137 ++++
 .../main/webapp/WEB-INF/conf/roleConfiguration.xml | 179 +++++
 .../WEB-INF/conf/turbine-classic-pipeline.xml      |  32 +
 .../webapp/WEB-INF/conf/usersettings.properties    |   0
 .../src/main/webapp/WEB-INF/jetty-env.xml          |  15 +
 .../src/main/webapp/WEB-INF/web.xml                | 106 +++
 .../ui/skins/default/images/powered-by-logo.gif    | Bin 0 -> 2062 bytes
 .../ui/skins/default/images/turbine-project.png    | Bin 0 -> 21047 bytes
 .../webapp/resources/ui/skins/default/skin.props   |  19 +
 .../src/main/webapp/templates/layouts/Default.vm   |  57 ++
 .../webapp/templates/macros/applicationMacros.vm   | 151 ++++
 .../src/main/webapp/templates/navigations/Menu.vm  |  45 ++
 .../src/main/webapp/templates/screens/Error.vm     |   7 +
 .../src/main/webapp/templates/screens/Index.vm     |  39 +
 .../src/main/webapp/templates/screens/Login.vm     | 101 +++
 .../src/main/webapp/templates/screens/Password.vm  |  56 ++
 .../main/webapp/templates/screens/TestSecure.vm    |   5 +
 .../resources/projects/first/archetype.properties  |  13 +
 .../src/test/resources/projects/first/goal.txt     |   1 +
 tags/turbine-webapp-4.0-1.0.2/LICENSE              | 202 +++++
 tags/turbine-webapp-4.0-1.0.2/NOTICE               |   5 +
 tags/turbine-webapp-4.0-1.0.2/README               |   5 +
 tags/turbine-webapp-4.0-1.0.2/pom.xml              |  68 ++
 .../src/changes/changes.xml                        |  95 +++
 .../META-INF/maven/archetype-metadata.xml          | 122 +++
 .../resources/archetype-resources/docs/README.txt  | 178 +++++
 .../docs/sample-mysql-data/_application-data.sql   |  15 +
 .../sample-mysql-data/_turbine-security-data.sql   |  51 ++
 .../src/main/resources/archetype-resources/pom.xml | 423 ++++++++++
 .../src/main/java/L10N.properties                  |  24 +
 .../src/main/java/L10N_de_DE.properties            |  30 +
 .../src/main/java/L10N_en_US.properties            |  23 +
 .../java/modules/actions/ChangePasswordAction.java |  95 +++
 .../src/main/java/modules/actions/LoginUser.java   | 114 +++
 .../main/java/modules/actions/LoginUserIntake.java | 186 +++++
 .../src/main/java/modules/actions/LogoutUser.java  | 121 +++
 .../main/java/modules/actions/SecureAction.java    |  98 +++
 .../src/main/java/modules/actions/ShowRecords.java |  48 ++
 .../src/main/java/modules/screens/Index.java       |  66 ++
 .../src/main/java/modules/screens/Password.java    |  53 ++
 .../main/java/modules/screens/SecureScreen.java    |  93 +++
 .../src/main/java/modules/screens/TestSecure.java  |  47 ++
 .../src/main/java/om/TurbineGroupPeer.java         |  21 +
 .../src/main/java/om/TurbineGroupPeerImpl.java     |  25 +
 .../src/main/java/om/TurbinePermissionPeer.java    |  16 +
 .../main/java/om/TurbinePermissionPeerImpl.java    |  20 +
 .../src/main/java/om/TurbineRolePeer.java          |  21 +
 .../src/main/java/om/TurbineRolePeerImpl.java      |  27 +
 .../src/main/java/om/TurbineRolePermission.java    |  25 +
 .../src/main/java/om/TurbineUser.java              | 101 +++
 .../src/main/java/om/TurbineUserPeer.java          |  22 +
 .../src/main/java/om/TurbineUserPeerImpl.java      |  25 +
 .../src/main/java/services/pull/RelatedTool.java   | 125 +++
 .../src/main/java/wrapper/TurbineUserWrapper.java  |  20 +
 .../src/main/torque-schema/application-data.xml    |  31 +
 .../src/main/torque-schema/application-schema.xml  |  53 ++
 .../src/main/torque-schema/id-table-schema.xml     |  47 ++
 .../main/torque-schema/torque-security-data.xml    |  67 ++
 .../main/torque-schema/torque-security-schema.xml  | 125 +++
 .../src/main/webapp/WEB-INF/conf/Torque.properties | 126 +++
 .../WEB-INF/conf/TurbineConfigurationBuilder.xml   |  15 +
 .../WEB-INF/conf/TurbineResources.properties       | 655 +++++++++++++++
 .../webapp/WEB-INF/conf/componentConfiguration.xml | 150 ++++
 .../webapp/WEB-INF/conf/containerConfiguration.xml |  35 +
 .../src/main/webapp/WEB-INF/conf/intake.xml        |  45 ++
 .../src/main/webapp/WEB-INF/conf/log4j.properties  | 137 ++++
 .../main/webapp/WEB-INF/conf/roleConfiguration.xml | 134 ++++
 .../WEB-INF/conf/turbine-classic-pipeline.xml      |  32 +
 .../webapp/WEB-INF/conf/usersettings.properties    |   0
 .../src/main/webapp/WEB-INF/jetty-env.xml          |  15 +
 .../src/main/webapp/WEB-INF/web.xml                | 106 +++
 .../ui/skins/default/images/pb-turbine100px.png    | Bin 0 -> 10483 bytes
 .../ui/skins/default/images/turbine-project.png    | Bin 0 -> 21047 bytes
 .../ui/skins/default/images/turbine4-project.png   | Bin 0 -> 14902 bytes
 .../webapp/resources/ui/skins/default/page.css     | 121 +++
 .../main/webapp/resources/ui/skins/default/page.js |  21 +
 .../webapp/resources/ui/skins/default/skin.props   |  19 +
 .../src/main/webapp/templates/layouts/Default.vm   |  58 ++
 .../webapp/templates/macros/applicationMacros.vm   | 151 ++++
 .../src/main/webapp/templates/navigations/Menu.vm  |  52 ++
 .../src/main/webapp/templates/screens/Error.vm     |   7 +
 .../src/main/webapp/templates/screens/Index.vm     |  45 ++
 .../src/main/webapp/templates/screens/Login.vm     | 104 +++
 .../src/main/webapp/templates/screens/Password.vm  |  56 ++
 .../main/webapp/templates/screens/TestSecure.vm    |  27 +
 .../main/webapp/templates/screens/showRecords.vm   |  51 ++
 .../src/test/conf/torque/TorqueTest.properties     |  83 ++
 .../conf/torque/fulcrumComponentConfiguration.xml  |  74 ++
 .../test/conf/torque/fulcrumRoleConfiguration.xml  | 121 +++
 .../AbstractTurbineTorqueModelManagerTest.java     | 488 ++++++++++++
 .../TurbineTorqueDefaultModelManagerTest.java      |  63 ++
 .../src/test/resources/log4j.properties            |  75 ++
 .../resources/projects/first/archetype.properties  |  13 +
 .../src/test/resources/projects/first/goal.txt     |   1 +
 .../turbine-webapp-4.0/LICENSE                     | 202 +++++
 .../turbine-webapp-4.0/NOTICE                      |   5 +
 .../turbine-webapp-4.0/README                      |   5 +
 .../turbine-webapp-4.0/pom.xml                     |  68 ++
 .../turbine-webapp-4.0/src/changes/changes.xml     |  95 +++
 .../META-INF/maven/archetype-metadata.xml          | 122 +++
 .../resources/archetype-resources/docs/README.txt  | 178 +++++
 .../docs/sample-mysql-data/_application-data.sql   |  15 +
 .../sample-mysql-data/_turbine-security-data.sql   |  51 ++
 .../src/main/resources/archetype-resources/pom.xml | 423 ++++++++++
 .../src/main/java/L10N.properties                  |  24 +
 .../src/main/java/L10N_de_DE.properties            |  30 +
 .../src/main/java/L10N_en_US.properties            |  23 +
 .../java/modules/actions/ChangePasswordAction.java |  95 +++
 .../src/main/java/modules/actions/LoginUser.java   | 114 +++
 .../main/java/modules/actions/LoginUserIntake.java | 186 +++++
 .../src/main/java/modules/actions/LogoutUser.java  | 121 +++
 .../main/java/modules/actions/SecureAction.java    |  98 +++
 .../src/main/java/modules/actions/ShowRecords.java |  48 ++
 .../src/main/java/modules/screens/Index.java       |  66 ++
 .../src/main/java/modules/screens/Password.java    |  53 ++
 .../main/java/modules/screens/SecureScreen.java    |  93 +++
 .../src/main/java/modules/screens/TestSecure.java  |  47 ++
 .../src/main/java/om/TurbineGroupPeer.java         |  21 +
 .../src/main/java/om/TurbineGroupPeerImpl.java     |  25 +
 .../src/main/java/om/TurbinePermissionPeer.java    |  16 +
 .../main/java/om/TurbinePermissionPeerImpl.java    |  20 +
 .../src/main/java/om/TurbineRolePeer.java          |  21 +
 .../src/main/java/om/TurbineRolePeerImpl.java      |  27 +
 .../src/main/java/om/TurbineRolePermission.java    |  25 +
 .../src/main/java/om/TurbineUser.java              | 101 +++
 .../src/main/java/om/TurbineUserPeer.java          |  22 +
 .../src/main/java/om/TurbineUserPeerImpl.java      |  25 +
 .../src/main/java/services/pull/RelatedTool.java   | 125 +++
 .../src/main/java/wrapper/TurbineUserWrapper.java  |  20 +
 .../src/main/torque-schema/application-data.xml    |  31 +
 .../src/main/torque-schema/application-schema.xml  |  53 ++
 .../src/main/torque-schema/id-table-schema.xml     |  47 ++
 .../main/torque-schema/torque-security-data.xml    |  67 ++
 .../main/torque-schema/torque-security-schema.xml  | 125 +++
 .../src/main/webapp/WEB-INF/conf/Torque.properties | 126 +++
 .../WEB-INF/conf/TurbineConfigurationBuilder.xml   |  15 +
 .../WEB-INF/conf/TurbineResources.properties       | 655 +++++++++++++++
 .../webapp/WEB-INF/conf/componentConfiguration.xml | 150 ++++
 .../webapp/WEB-INF/conf/containerConfiguration.xml |  35 +
 .../src/main/webapp/WEB-INF/conf/intake.xml        |  45 ++
 .../src/main/webapp/WEB-INF/conf/log4j.properties  | 137 ++++
 .../main/webapp/WEB-INF/conf/roleConfiguration.xml | 134 ++++
 .../WEB-INF/conf/turbine-classic-pipeline.xml      |  32 +
 .../webapp/WEB-INF/conf/usersettings.properties    |   0
 .../src/main/webapp/WEB-INF/jetty-env.xml          |  15 +
 .../src/main/webapp/WEB-INF/web.xml                | 106 +++
 .../ui/skins/default/images/pb-turbine100px.png    | Bin 0 -> 10483 bytes
 .../ui/skins/default/images/turbine-project.png    | Bin 0 -> 21047 bytes
 .../ui/skins/default/images/turbine4-project.png   | Bin 0 -> 14902 bytes
 .../webapp/resources/ui/skins/default/page.css     | 121 +++
 .../main/webapp/resources/ui/skins/default/page.js |  21 +
 .../webapp/resources/ui/skins/default/skin.props   |  19 +
 .../src/main/webapp/templates/layouts/Default.vm   |  58 ++
 .../webapp/templates/macros/applicationMacros.vm   | 151 ++++
 .../src/main/webapp/templates/navigations/Menu.vm  |  52 ++
 .../src/main/webapp/templates/screens/Error.vm     |   7 +
 .../src/main/webapp/templates/screens/Index.vm     |  45 ++
 .../src/main/webapp/templates/screens/Login.vm     | 104 +++
 .../src/main/webapp/templates/screens/Password.vm  |  56 ++
 .../main/webapp/templates/screens/TestSecure.vm    |  27 +
 .../main/webapp/templates/screens/showRecords.vm   |  51 ++
 .../src/test/conf/torque/TorqueTest.properties     |  83 ++
 .../conf/torque/fulcrumComponentConfiguration.xml  |  74 ++
 .../test/conf/torque/fulcrumRoleConfiguration.xml  | 121 +++
 .../turbine/CompleteTurbineResources.properties    | 631 +++++++++++++++
 .../turbine/fulcrumContainerConfiguration.xml      |  28 +
 .../torque/turbine/turbine-classic-pipeline.xml    |  32 +
 .../AbstractFulcrumTorqueModelManagerTest.java     | 488 ++++++++++++
 .../FulcrumTorqueDefaultModelManagerTest.java      |  63 ++
 .../security/TurbineSecurityServiceTest.java       | 187 +++++
 .../src/test/resources/log4j.properties            |  89 +++
 .../resources/projects/first/archetype.properties  |  13 +
 .../src/test/resources/projects/first/goal.txt     |   1 +
 trunk/turbine-webapp-2.3.3/pom.xml                 |  65 ++
 trunk/turbine-webapp-2.3.3/src/changes/changes.xml |  36 +
 .../META-INF/maven/archetype-metadata.xml          |  78 ++
 .../src/main/resources/archetype-resources/pom.xml | 404 ++++++++++
 .../src/main/java/L10N_en_US.properties            |  19 +
 .../src/main/java/modules/screens/Index.java       |  64 ++
 .../src/main/torque-schema/application-data.xml    |  31 +
 .../src/main/torque-schema/application-schema.xml  |  36 +
 .../src/main/torque-schema/id-table-schema.xml     |  46 ++
 .../main/torque-schema/torque-security-data.xml    |  67 ++
 .../main/torque-schema/torque-security-schema.xml  | 112 +++
 .../src/main/webapp/WEB-INF/conf/Torque.properties |  55 ++
 .../WEB-INF/conf/TurbineResources.properties       | 876 +++++++++++++++++++++
 .../webapp/WEB-INF/conf/componentConfiguration.xml |  25 +
 .../webapp/WEB-INF/conf/containerConfiguration.xml |  35 +
 .../src/main/webapp/WEB-INF/conf/intake.xml        |  35 +
 .../src/main/webapp/WEB-INF/conf/log4j.properties  | 137 ++++
 .../main/webapp/WEB-INF/conf/roleConfiguration.xml |  28 +
 .../src/main/webapp/WEB-INF/web.xml                |  96 +++
 .../ui/skins/default/images/powered-by-logo.gif    | Bin 0 -> 2062 bytes
 .../ui/skins/default/images/turbine-project.png    | Bin 0 -> 21047 bytes
 .../webapp/resources/ui/skins/default/skin.props   |  19 +
 .../src/main/webapp/templates/layouts/Default.vm   |  29 +
 .../src/main/webapp/templates/screens/Index.vm     |  27 +
 trunk/turbine-webapp-4.0/LICENSE                   | 202 +++++
 trunk/turbine-webapp-4.0/NOTICE                    |   5 +
 trunk/turbine-webapp-4.0/README                    |   5 +
 trunk/turbine-webapp-4.0/pom.xml                   |  68 ++
 trunk/turbine-webapp-4.0/src/changes/changes.xml   |  95 +++
 .../META-INF/maven/archetype-metadata.xml          | 129 +++
 .../resources/archetype-resources/docs/README.txt  | 178 +++++
 .../docs/sample-mysql-data/_application-data.sql   |  15 +
 .../sample-mysql-data/_turbine-security-data.sql   |  51 ++
 .../src/main/resources/archetype-resources/pom.xml | 424 ++++++++++
 .../src/main/java/L10N.properties                  |  24 +
 .../src/main/java/L10N_de_DE.properties            |  30 +
 .../src/main/java/L10N_en_US.properties            |  23 +
 .../main/java/flux/modules/actions/FluxAction.java |  97 +++
 .../main/java/flux/modules/actions/FluxLogin.java  |  97 +++
 .../main/java/flux/modules/actions/FluxLogout.java | 107 +++
 .../java/flux/modules/actions/SecureAction.java    | 116 +++
 .../modules/actions/group/FluxGroupAction.java     | 171 ++++
 .../actions/permission/FluxPermissionAction.java   | 176 +++++
 .../flux/modules/actions/role/FluxRoleAction.java  | 234 ++++++
 .../flux/modules/actions/user/FluxUserAction.java  | 261 ++++++
 .../main/java/flux/modules/screens/FluxError.java  |  27 +
 .../main/java/flux/modules/screens/FluxIndex.java  |  92 +++
 .../main/java/flux/modules/screens/FluxScreen.java |  94 +++
 .../java/flux/modules/screens/group/Default.java   |  25 +
 .../flux/modules/screens/permission/Default.java   |  25 +
 .../java/flux/modules/screens/role/Default.java    |  25 +
 .../java/flux/modules/screens/user/Default.java    |  25 +
 .../src/main/java/flux/tools/FluxTool.java         | 297 +++++++
 .../java/modules/actions/ChangePasswordAction.java |  95 +++
 .../src/main/java/modules/actions/LoginUser.java   | 114 +++
 .../main/java/modules/actions/LoginUserIntake.java | 186 +++++
 .../src/main/java/modules/actions/LogoutUser.java  | 121 +++
 .../main/java/modules/actions/SecureAction.java    |  98 +++
 .../src/main/java/modules/actions/ShowRecords.java |  48 ++
 .../src/main/java/modules/screens/Index.java       |  66 ++
 .../src/main/java/modules/screens/Password.java    |  53 ++
 .../main/java/modules/screens/SecureScreen.java    |  93 +++
 .../src/main/java/modules/screens/TestSecure.java  |  47 ++
 .../src/main/java/om/TurbineGroupPeer.java         |  21 +
 .../src/main/java/om/TurbineGroupPeerImpl.java     |  25 +
 .../src/main/java/om/TurbinePermissionPeer.java    |  16 +
 .../main/java/om/TurbinePermissionPeerImpl.java    |  20 +
 .../src/main/java/om/TurbineRolePeer.java          |  21 +
 .../src/main/java/om/TurbineRolePeerImpl.java      |  27 +
 .../src/main/java/om/TurbineRolePermission.java    |  25 +
 .../src/main/java/om/TurbineUser.java              |  79 ++
 .../src/main/java/om/TurbineUserGroupRole.java     |  23 +
 .../main/java/om/TurbineUserGroupRolePeerImpl.java |  23 +
 .../src/main/java/om/TurbineUserPeer.java          |  22 +
 .../src/main/java/om/TurbineUserPeerImpl.java      |  25 +
 .../src/main/java/services/pull/RelatedTool.java   | 125 +++
 .../src/main/java/wrapper/TurbineUserWrapper.java  |  36 +
 .../src/main/torque-schema/application-data.xml    |  31 +
 .../src/main/torque-schema/application-schema.xml  |  53 ++
 .../src/main/torque-schema/id-table-schema.xml     |  47 ++
 .../main/torque-schema/torque-security-data.xml    |  67 ++
 .../main/torque-schema/torque-security-schema.xml  | 125 +++
 .../src/main/webapp/META-INF/context.xml           |  10 +
 .../src/main/webapp/WEB-INF/conf/Torque.properties | 126 +++
 .../WEB-INF/conf/TurbineConfigurationBuilder.xml   |  15 +
 .../WEB-INF/conf/TurbineResources.properties       | 661 ++++++++++++++++
 .../webapp/WEB-INF/conf/componentConfiguration.xml | 154 ++++
 .../webapp/WEB-INF/conf/containerConfiguration.xml |  35 +
 .../src/main/webapp/WEB-INF/conf/flux.properties   |  37 +
 .../src/main/webapp/WEB-INF/conf/intake.xml        |  45 ++
 .../src/main/webapp/WEB-INF/conf/log4j.properties  | 137 ++++
 .../main/webapp/WEB-INF/conf/roleConfiguration.xml | 134 ++++
 .../WEB-INF/conf/turbine-classic-pipeline.xml      |  32 +
 .../webapp/WEB-INF/conf/usersettings.properties    |   0
 .../src/main/webapp/WEB-INF/jetty-env.xml          |  15 +
 .../src/main/webapp/WEB-INF/web.xml                | 106 +++
 .../ui/skins/default/images/pb-turbine100px.png    | Bin 0 -> 10483 bytes
 .../ui/skins/default/images/turbine-project.png    | Bin 0 -> 21047 bytes
 .../ui/skins/default/images/turbine4-project.png   | Bin 0 -> 14902 bytes
 .../webapp/resources/ui/skins/default/page.css     | 121 +++
 .../main/webapp/resources/ui/skins/default/page.js |  21 +
 .../webapp/resources/ui/skins/default/skin.props   |  19 +
 .../main/webapp/templates/app/layouts/Default.vm   |  58 ++
 .../templates/app/macros/applicationMacros.vm      | 151 ++++
 .../main/webapp/templates/app/navigations/Menu.vm  |  52 ++
 .../src/main/webapp/templates/app/screens/Error.vm |   7 +
 .../src/main/webapp/templates/app/screens/Index.vm |  45 ++
 .../src/main/webapp/templates/app/screens/Login.vm | 104 +++
 .../main/webapp/templates/app/screens/Password.vm  |  56 ++
 .../webapp/templates/app/screens/TestSecure.vm     |  27 +
 .../webapp/templates/app/screens/showRecords.vm    |  51 ++
 .../webapp/templates/flux/layouts/FluxDefault.vm   |  30 +
 .../webapp/templates/flux/macros/fluxMacros.vm     | 151 ++++
 .../templates/flux/navigations/FluxBottom.vm       |   2 +
 .../webapp/templates/flux/navigations/FluxMenu.vm  |  16 +
 .../webapp/templates/flux/navigations/FluxTop.vm   |   3 +
 .../templates/flux/screens/FluxEmbeddedMenu.vm     |  12 +
 .../webapp/templates/flux/screens/FluxError.vm     |  26 +
 .../webapp/templates/flux/screens/FluxIndex.vm     |  15 +
 .../webapp/templates/flux/screens/FluxLogin.vm     |  28 +
 .../flux/screens/group/FluxGroupAlreadyExists.vm   |  13 +
 .../templates/flux/screens/group/FluxGroupForm.vm  |  50 ++
 .../templates/flux/screens/group/FluxGroupList.vm  |  43 +
 .../permission/FluxPermissionAlreadyExists.vm      |  11 +
 .../flux/screens/permission/FluxPermissionForm.vm  |  48 ++
 .../flux/screens/permission/FluxPermissionList.vm  |  42 +
 .../screens/permission/FluxRolePermissionList.vm   |  56 ++
 .../flux/screens/role/FluxRoleAlreadyExists.vm     |  16 +
 .../templates/flux/screens/role/FluxRoleForm.vm    |  51 ++
 .../templates/flux/screens/role/FluxRoleList.vm    |  42 +
 .../flux/screens/user/FluxMissingRequiredInputs.vm |  15 +
 .../flux/screens/user/FluxUserAlreadyExists.vm     |  13 +
 .../templates/flux/screens/user/FluxUserForm.vm    |  66 ++
 .../templates/flux/screens/user/FluxUserList.vm    |  38 +
 .../flux/screens/user/FluxUserRoleForm.vm          |  63 ++
 .../src/test/conf/torque/TorqueTest.properties     |  83 ++
 .../conf/torque/fulcrumComponentConfiguration.xml  |  74 ++
 .../test/conf/torque/fulcrumRoleConfiguration.xml  | 121 +++
 .../turbine/CompleteTurbineResources.properties    | 631 +++++++++++++++
 .../turbine/fulcrumContainerConfiguration.xml      |  28 +
 .../torque/turbine/turbine-classic-pipeline.xml    |  32 +
 .../AbstractFulcrumTorqueModelManagerTest.java     | 488 ++++++++++++
 .../FulcrumTorqueDefaultModelManagerTest.java      |  63 ++
 .../security/TurbineSecurityServiceTest.java       | 404 ++++++++++
 .../src/test/resources/log4j.properties            |  89 +++
 .../resources/projects/first/archetype.properties  |  13 +
 .../src/test/resources/projects/first/goal.txt     |   1 +
 421 files changed, 35895 insertions(+)

Reply via email to