SYNCOPE-701 improved jrebel enduser profile, managed empty attributes in user edit/create form
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/be774ee6 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/be774ee6 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/be774ee6 Branch: refs/heads/master Commit: be774ee674ca0299cb4c924c21ac428d6c20a883 Parents: c2bbd0a Author: Andrea Patricelli <andrea.patrice...@tirasa.net> Authored: Fri Oct 30 17:56:52 2015 +0100 Committer: Andrea Patricelli <andrea.patrice...@tirasa.net> Committed: Fri Oct 30 17:56:52 2015 +0100 ---------------------------------------------------------------------- .../resources/UserSelfUpdateResource.java | 2 +- .../app/js/directives/dynamicAttribute.js | 12 ++- fit/enduser-reference/pom.xml | 82 +++++++++++++++++--- 3 files changed, 84 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/be774ee6/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfUpdateResource.java ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfUpdateResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfUpdateResource.java index 8befc00..2d72d69 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfUpdateResource.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfUpdateResource.java @@ -49,7 +49,7 @@ public class UserSelfUpdateResource extends AbstractBaseResource { @Override protected ResourceResponse newResourceResponse(final Attributes attributes) { - int responseStatus = 200; + int responseStatus; final String responseMessage; ResourceResponse response = new ResourceResponse(); http://git-wip-us.apache.org/repos/asf/syncope/blob/be774ee6/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicAttribute.js ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicAttribute.js b/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicAttribute.js index 6a00507..781d251 100644 --- a/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicAttribute.js +++ b/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicAttribute.js @@ -182,8 +182,16 @@ angular.module('self') break; } - } - ; + }; + + $scope.$watch(function () { + return $scope.user.plainAttrs[$scope.schema.key].values[$scope.index]; + }, function (newValue, oldValue) { + $scope.user.plainAttrs[$scope.schema.key].values = $scope.user.plainAttrs[$scope.schema.key].values + .filter(function (n) { + return (n !== undefined && n !== ""); + }); + }); }, replace: true }; http://git-wip-us.apache.org/repos/asf/syncope/blob/be774ee6/fit/enduser-reference/pom.xml ---------------------------------------------------------------------- diff --git a/fit/enduser-reference/pom.xml b/fit/enduser-reference/pom.xml index aee8f79..b88ce2d 100644 --- a/fit/enduser-reference/pom.xml +++ b/fit/enduser-reference/pom.xml @@ -318,11 +318,6 @@ under the License. <profile> <id>jrebel</id> - - <properties> - <javaagent>-javaagent:${env.REBEL_HOME}/jrebel.jar</javaagent> - </properties> - <build> <defaultGoal>clean verify cargo:run</defaultGoal> @@ -335,16 +330,85 @@ under the License. <classpath> <fallback>default</fallback> <resources> - <resource/> + <resource> + <directory>${basedir}/../../common/lib/target/classes</directory> + </resource> + <resource> + <directory>${basedir}/../../common/rest-api/target/classes</directory> + </resource> + + <resource> + <directory>${basedir}/../../core/logic/target/classes</directory> + <excludes> + <exclude>logicContext.xml</exclude> + </excludes> + </resource> + <resource> + <directory>${basedir}/../../core/rest-cxf/target/classes</directory> + <excludes> + <exclude>restCXFContext.xml</exclude> + </excludes> + </resource> + <resource> + <directory>${basedir}/../../core/misc/target/classes</directory> + <excludes> + <exclude>securityContext.xml</exclude> + </excludes> + </resource> + <resource> + <directory>${basedir}/../../core/persistence-api/target/classes</directory> + </resource> + <resource> + <directory>${basedir}/../../core/persistence-jpa/target/classes</directory> + <excludes> + <exclude>persistenceContext.xml</exclude> + </excludes> + </resource> + <resource> + <directory>${basedir}/../../core/provisioning-api/target/classes</directory> + </resource> + <resource> + <directory>${basedir}/../../core/provisioning-java/target/classes</directory> + <excludes> + <exclude>provisioningContext.xml</exclude> + </excludes> + </resource> + <resource> + <directory>${basedir}/../../core/workflow-api/target/classes</directory> + </resource> + <resource> + <directory>${basedir}/../../core/workflow-java/target/classes</directory> + <excludes> + <exclude>workflowContext.xml</exclude> + </excludes> + </resource> + <resource> + <directory>${basedir}/../../core/workflow-activiti/target/classes</directory> + <excludes> + <exclude>workflowActivitiContext.xml</exclude> + </excludes> + </resource> + <resource> + <directory>${basedir}/../../ext/camel/provisioning-camel/target/classes</directory> + <excludes> + <exclude>provisioningCamelContext.xml</exclude> + </excludes> + </resource> + <resource> <directory>${basedir}/../../client/enduser/target/classes</directory> </resource> + </resources> </classpath> <web> <resources> - <resource/> + <resource> + <target>/</target> + <directory>${basedir}/../../ext/swagger-ui/target/classes/META-INF/resources</directory> + </resource> + <resource> <target>/</target> <directory>${basedir}/../../client/enduser/target/classes/META-INF/resources/</directory> @@ -373,8 +437,8 @@ under the License. <configuration> <properties> <cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n - -noverify ${javaagent} -Drebel.spring_plugin=true - -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=256m</cargo.jvmargs> + -noverify -javaagent:${env.REBEL_HOME}/jrebel.jar -Drebel.spring_plugin=true + -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=512m -Xmx1024m -Xms512m</cargo.jvmargs> </properties> </configuration> </configuration>