You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2014/06/24 15:25:21 UTC
svn commit: r1605077 [1/5] - in /syncope/trunk: ./
common/src/main/java/org/apache/syncope/common/services/
common/src/main/java/org/apache/syncope/common/to/
common/src/main/java/org/apache/syncope/common/types/
common/src/test/java/org/apache/syncope...
Author: ilgrosso
Date: Tue Jun 24 13:25:18 2014
New Revision: 1605077
URL: http://svn.apache.org/r1605077
Log:
[SYNCOPE-290] Implementation completed
Added:
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConfTO.java
- copied, changed from r1605022, syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConfigurationTO.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/conf/
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/conf/CAttr.java
- copied, changed from r1603867, syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UAttr.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/conf/CAttrUniqueValue.java
- copied, changed from r1603867, syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UAttrUniqueValue.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/conf/CAttrValue.java
- copied, changed from r1603867, syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UAttrValue.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/conf/CSchema.java
- copied, changed from r1603867, syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/USchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/conf/SyncopeConf.java
- copied, changed from r1603867, syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/SyncopeRole.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/SubjectDAO.java
- copied, changed from r1603867, syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/AttributableDAO.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/SubjectSearchDAO.java
- copied, changed from r1603867, syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/AttributableSearchDAO.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AbstractSubjectDAOImpl.java
- copied, changed from r1603867, syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AbstractAttributableDAOImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/SubjectSearchDAOImpl.java
- copied, changed from r1603867, syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AttributableSearchDAOImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/search/SubjectCond.java
- copied, changed from r1603867, syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/search/AttributableCond.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/AbstractSubjectController.java
- copied, changed from r1603867, syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/AbstractAttributableController.java
Removed:
syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConfigurationTO.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConfigurationModalPage.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConfigurationModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConfigurationModalPage.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConfigurationModalPage_it.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConfigurationModalPage_pt_BR.properties
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncopeConf.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/AttributableDAO.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/AttributableSearchDAO.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/MissingConfKeyException.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AbstractAttributableDAOImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/AttributableSearchDAOImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/search/AttributableCond.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SyncopeConfCheck.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SyncopeConfValidator.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/AbstractAttributableController.java
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ConfigurationService.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/AttributableType.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ClientExceptionType.java
syncope/trunk/common/src/test/java/org/apache/syncope/common/JSONTest.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PushTasksPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasksPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ConfigurationRestClient.java
syncope/trunk/console/src/main/resources/authorizations.xml
syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_it.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_pt_BR.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration_it.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration_pt_BR.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerSchemaModalPage.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerSchemaModalPage_it.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerSchemaModalPage_pt_BR.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports_it.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports_pt_BR.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_it.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_pt_BR.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Resources.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Resources_it.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Resources_pt_BR.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema$SchemaTypePanel.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage_it.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage_pt_BR.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema_it.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema_pt_BR.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users_it.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users_pt_BR.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/VirSchemaModalPage.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/VirSchemaModalPage_it.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/VirSchemaModalPage_pt_BR.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AbstractSyncTasksPanel.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PoliciesPanel.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PoliciesPanel_it.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PoliciesPanel_pt_BR.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PushTasksPanel.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PushTasksPanel_it.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PushTasksPanel_pt_BR.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SchedTasks.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SchedTasks.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SchedTasks_it.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SchedTasks_pt_BR.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SyncTasksPanel.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SyncTasksPanel_it.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SyncTasksPanel_pt_BR.properties
syncope/trunk/console/src/test/java/org/apache/syncope/console/AccessTestITCase.java
syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
syncope/trunk/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java
syncope/trunk/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java
syncope/trunk/console/src/test/java/org/apache/syncope/console/UserTestITCase.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ContentUpgrader.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/init/JobInstanceLoader.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/notification/NotificationJob.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/notification/NotificationManager.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/ConfDAO.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/RoleDAO.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/UserDAO.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/ConfDAOImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/ContentLoader.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/RoleDAOImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/SearchSupport.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserDAOImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/search/SearchCond.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SchemaNameValidator.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/LDAPPasswordPropagationActions.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/report/RoleReportlet.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/report/UserReportlet.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ConfigurationController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/AbstractAttributableDataBinder.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/ConfigurationDataBinder.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/SearchCondVisitor.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/UserDataBinder.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/utils/RestServiceExceptionMapper.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/security/SyncopeAuthenticationProvider.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/ConfigurationServiceImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/UserSelfServiceImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/PushJob.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopePushResultHandler.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/AttributableUtil.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/task/GenerateToken.java
syncope/trunk/core/src/main/resources/META-INF/orm.xml
syncope/trunk/core/src/main/resources/META-INF/orm.xml.oracle
syncope/trunk/core/src/main/resources/META-INF/orm.xml.sqlserver
syncope/trunk/core/src/main/resources/content.xml
syncope/trunk/core/src/test/java/org/apache/syncope/core/notification/NotificationTest.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/AttributableSearchTest.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/ConfTest.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/AttributableSearchTest.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/data/SearchCondConverterTest.java
syncope/trunk/core/src/test/resources/content.xml
syncope/trunk/pom.xml
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ConfigurationService.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ConfigurationService.java?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ConfigurationService.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ConfigurationService.java Tue Jun 24 13:25:18 2014
@@ -22,17 +22,14 @@ import java.util.List;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
-import javax.ws.rs.POST;
import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.apache.cxf.jaxrs.model.wadl.Description;
-import org.apache.cxf.jaxrs.model.wadl.Descriptions;
-import org.apache.cxf.jaxrs.model.wadl.DocTarget;
-import org.apache.syncope.common.to.ConfigurationTO;
+import org.apache.syncope.common.to.AttributeTO;
+import org.apache.syncope.common.to.ConfTO;
import org.apache.syncope.common.wrap.MailTemplate;
import org.apache.syncope.common.wrap.Validator;
@@ -72,52 +69,38 @@ public interface ConfigurationService ex
List<Validator> getValidators();
/**
- * Returns configuration parameter with matching key.
+ * Returns all configuration parameters.
*
- * @param key identifier of configuration to be read
- * @return configuration parameter with matching key
+ * @return all configuration parameters
*/
@GET
- @Path("{key}")
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
- ConfigurationTO read(@PathParam("key") String key);
+ ConfTO list();
/**
- * Returns list of all configuration parameters.
+ * Returns configuration parameter with matching key.
*
- * @return list of all configuration parameters
+ * @param key identifier of configuration to be read
+ * @return configuration parameter with matching key
*/
@GET
+ @Path("{key}")
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
- List<ConfigurationTO> list();
-
- /**
- * Creates a new configuration parameter.
- *
- * @param configurationTO Configuration to be stored.
- * @return <tt>Response</tt> object featuring <tt>Location</tt> header of created configuration
- */
- @Descriptions({
- @Description(target = DocTarget.RESPONSE, value = "Featuring <tt>Location</tt> header of created configuration")
- })
- @POST
- @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
- @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
- Response create(ConfigurationTO configurationTO);
+ AttributeTO read(@PathParam("key") String key);
/**
- * Updates configuration parameter for the given key.
+ * Creates / updates the configuration parameter with the given key.
*
- * @param key configuration parameter key
- * @param configurationTO new configuration
+ * @param key parameter key
+ * @param value parameter value
*/
@PUT
@Path("{key}")
@Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
- void update(@PathParam("key") String key, ConfigurationTO configurationTO);
+ void set(@PathParam("key") String key, AttributeTO value);
/**
- * Deletes configuration with matching key.
+ * Deletes the configuration parameter with matching key.
*
* @param key configuration parameter key
*/
Copied: syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConfTO.java (from r1605022, syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConfigurationTO.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConfTO.java?p2=syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConfTO.java&p1=syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConfigurationTO.java&r1=1605022&r2=1605077&rev=1605077&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConfigurationTO.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/to/ConfTO.java Tue Jun 24 13:25:18 2014
@@ -21,31 +21,10 @@ package org.apache.syncope.common.to;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.apache.syncope.common.AbstractBaseBean;
-
-@XmlRootElement(name = "configuration")
+@XmlRootElement(name = "conf")
@XmlType
-public class ConfigurationTO extends AbstractBaseBean {
+public class ConfTO extends AbstractAttributableTO {
private static final long serialVersionUID = -3825039700228595590L;
- private String key;
-
- private String value;
-
- public String getKey() {
- return key;
- }
-
- public void setKey(final String key) {
- this.key = key;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(final String value) {
- this.value = value;
- }
}
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/types/AttributableType.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/types/AttributableType.java?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/types/AttributableType.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/types/AttributableType.java Tue Jun 24 13:25:18 2014
@@ -25,6 +25,7 @@ public enum AttributableType {
USER,
ROLE,
- MEMBERSHIP
+ MEMBERSHIP,
+ CONFIGURATION;
}
Modified: syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ClientExceptionType.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ClientExceptionType.java?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ClientExceptionType.java (original)
+++ syncope/trunk/common/src/main/java/org/apache/syncope/common/types/ClientExceptionType.java Tue Jun 24 13:25:18 2014
@@ -47,8 +47,8 @@ public enum ClientExceptionType {
InvalidMSchema(Response.Status.BAD_REQUEST),
InvalidMDerSchema(Response.Status.BAD_REQUEST),
InvalidMVirSchema(Response.Status.BAD_REQUEST),
+ InvalidCSchema(Response.Status.BAD_REQUEST),
InvalidSchemaMapping(Response.Status.BAD_REQUEST),
- InvalidSyncopeConf(Response.Status.BAD_REQUEST),
InvalidSyncopeUser(Response.Status.BAD_REQUEST),
InvalidExternalResource(Response.Status.BAD_REQUEST),
InvalidNotification(Response.Status.BAD_REQUEST),
Modified: syncope/trunk/common/src/test/java/org/apache/syncope/common/JSONTest.java
URL: http://svn.apache.org/viewvc/syncope/trunk/common/src/test/java/org/apache/syncope/common/JSONTest.java?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/common/src/test/java/org/apache/syncope/common/JSONTest.java (original)
+++ syncope/trunk/common/src/test/java/org/apache/syncope/common/JSONTest.java Tue Jun 24 13:25:18 2014
@@ -19,16 +19,11 @@
package org.apache.syncope.common;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
import org.apache.syncope.common.report.UserReportletConf;
-import org.apache.syncope.common.to.ConfigurationTO;
import org.apache.syncope.common.to.ReportTO;
import org.apache.syncope.common.to.WorkflowFormPropertyTO;
import org.junit.Test;
@@ -36,30 +31,6 @@ import org.junit.Test;
public class JSONTest {
@Test
- public void lists() throws IOException {
- List<ConfigurationTO> confList = new ArrayList<ConfigurationTO>();
- ConfigurationTO configuration = new ConfigurationTO();
- configuration.setKey("key1");
- configuration.setValue("value1");
- confList.add(configuration);
- configuration = new ConfigurationTO();
- configuration.setKey("key2");
- configuration.setValue("value2");
- confList.add(configuration);
-
- ObjectMapper mapper = new ObjectMapper();
-
- StringWriter writer = new StringWriter();
- mapper.writeValue(writer, confList);
-
- List<ConfigurationTO> unserializedSchemas = Arrays.asList(mapper.readValue(writer.toString(),
- ConfigurationTO[].class));
- for (ConfigurationTO unserializedSchema : unserializedSchemas) {
- assertNotNull(unserializedSchema);
- }
- }
-
- @Test
public void map() throws IOException {
WorkflowFormPropertyTO prop = new WorkflowFormPropertyTO();
prop.getEnumValues().put("key1", "value1");
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.java?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/Constants.java Tue Jun 24 13:25:18 2014
@@ -46,6 +46,8 @@ public final class Constants {
public static final String PREF_USERS_VIRTUAL_ATTRIBUTES_VIEW = "users.virtual.attributes.view";
+ public static final String PREF_CONF_SCHEMA_PAGINATOR_ROWS = "conf.schema.paginator.rows";
+
public static final String PREF_USER_SCHEMA_PAGINATOR_ROWS = "user.schema.paginator.rows";
public static final String PREF_USER_DER_SCHEMA_PAGINATOR_ROWS = "user.derived.schema.paginator.rows";
@@ -70,8 +72,6 @@ public final class Constants {
public static final String PREF_CONNECTORS_PAGINATOR_ROWS = "connectors.paginator.rows";
- public static final String PREF_CONFIGURATION_PAGINATOR_ROWS = "configuration.paginator.rows";
-
public static final String PREF_NOTIFICATION_PAGINATOR_ROWS = "notification.paginator.rows";
public static final String PREF_PROPAGATION_TASKS_PAGINATOR_ROWS = "proagationtasks.paginator.rows";
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Configuration.java Tue Jun 24 13:25:18 2014
@@ -25,20 +25,23 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.LoggerConfig;
import org.apache.syncope.common.SyncopeConstants;
-import org.apache.syncope.common.to.ConfigurationTO;
import org.apache.syncope.common.to.LoggerTO;
import org.apache.syncope.common.to.NotificationTO;
import org.apache.syncope.common.types.PolicyType;
import org.apache.syncope.common.types.LoggerLevel;
import org.apache.syncope.common.SyncopeClientException;
+import org.apache.syncope.common.to.AttributeTO;
+import org.apache.syncope.common.to.ConfTO;
import org.apache.syncope.console.commons.Constants;
import org.apache.syncope.console.commons.HttpResourceStream;
import org.apache.syncope.console.commons.PreferenceManager;
import org.apache.syncope.console.commons.SortableDataProviderComparator;
+import org.apache.syncope.console.pages.panels.AttributesPanel;
import org.apache.syncope.console.pages.panels.PoliciesPanel;
import org.apache.syncope.console.rest.ConfigurationRestClient;
import org.apache.syncope.console.rest.LoggerRestClient;
@@ -53,6 +56,7 @@ import org.apache.wicket.ajax.AjaxReques
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
+import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
@@ -72,6 +76,7 @@ import org.apache.wicket.markup.html.lis
import org.apache.wicket.markup.html.list.PropertyListView;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
@@ -106,14 +111,6 @@ public class Configuration extends BaseP
@SpringBean
private PreferenceManager prefMan;
- private final ModalWindow createConfigWin;
-
- private final ModalWindow editConfigWin;
-
- private static final int CONFIG_WIN_HEIGHT = 200;
-
- private static final int CONFIG_WIN_WIDTH = 350;
-
private final ModalWindow createNotificationWin;
private final ModalWindow editNotificationWin;
@@ -122,19 +119,13 @@ public class Configuration extends BaseP
private static final int NOTIFICATION_WIN_WIDTH = 1100;
- private WebMarkupContainer confContainer;
-
private WebMarkupContainer notificationContainer;
- private int confPaginatorRows;
-
private int notificationPaginatorRows;
public Configuration() {
super();
- add(createConfigWin = new ModalWindow("createConfigurationWin"));
- add(editConfigWin = new ModalWindow("editConfigurationWin"));
setupSyncopeConf();
add(new PoliciesPanel("passwordPoliciesPanel", getPageReference(), PolicyType.PASSWORD));
@@ -160,7 +151,7 @@ public class Configuration extends BaseP
}
BookmarkablePageLink<Void> activitiModeler =
- new BookmarkablePageLink<Void>("activitiModeler", ActivitiModelerPopupPage.class);
+ new BookmarkablePageLink<Void>("activitiModeler", ActivitiModelerPopupPage.class);
activitiModeler.setPopupSettings(new VeilPopupSettings().setHeight(600).setWidth(800));
MetaDataRoleAuthorizationStrategy.authorize(activitiModeler, ENABLE,
xmlRolesReader.getAllAllowedRoles("Configuration", "workflowDefRead"));
@@ -178,7 +169,7 @@ public class Configuration extends BaseP
activitiModeler.setEnabled(activitiModelerEnabled);
BookmarkablePageLink<Void> xmlEditor =
- new BookmarkablePageLink<Void>("xmlEditor", XMLEditorPopupPage.class);
+ new BookmarkablePageLink<Void>("xmlEditor", XMLEditorPopupPage.class);
xmlEditor.setPopupSettings(new VeilPopupSettings().setHeight(480).setWidth(800));
MetaDataRoleAuthorizationStrategy.authorize(xmlEditor, ENABLE,
xmlRolesReader.getAllAllowedRoles("Configuration", "workflowDefRead"));
@@ -212,7 +203,7 @@ public class Configuration extends BaseP
// Logger stuff
PropertyListView<LoggerTO> coreLoggerList =
- new LoggerPropertyList(null, "corelogger", loggerRestClient.listLogs());
+ new LoggerPropertyList(null, "corelogger", loggerRestClient.listLogs());
WebMarkupContainer coreLoggerContainer = new WebMarkupContainer("coreLoggerContainer");
coreLoggerContainer.add(coreLoggerList);
coreLoggerContainer.setOutputMarkupId(true);
@@ -223,7 +214,7 @@ public class Configuration extends BaseP
ConsoleLoggerController consoleLoggerController = new ConsoleLoggerController();
PropertyListView<LoggerTO> consoleLoggerList =
- new LoggerPropertyList(consoleLoggerController, "consolelogger", consoleLoggerController.getLoggers());
+ new LoggerPropertyList(consoleLoggerController, "consolelogger", consoleLoggerController.getLoggers());
WebMarkupContainer consoleLoggerContainer = new WebMarkupContainer("consoleLoggerContainer");
consoleLoggerContainer.add(consoleLoggerList);
consoleLoggerContainer.setOutputMarkupId(true);
@@ -233,125 +224,52 @@ public class Configuration extends BaseP
add(consoleLoggerContainer);
}
+ @SuppressWarnings({ "unchecked", "rawtypes" })
private void setupSyncopeConf() {
- confPaginatorRows = prefMan.getPaginatorRows(getRequest(), Constants.PREF_CONFIGURATION_PAGINATOR_ROWS);
-
- final List<IColumn<ConfigurationTO, String>> confColumns = new ArrayList<IColumn<ConfigurationTO, String>>();
- confColumns.add(new PropertyColumn<ConfigurationTO, String>(new ResourceModel("key"), "key", "key"));
- confColumns.add(new PropertyColumn<ConfigurationTO, String>(new ResourceModel("value"), "value", "value"));
-
- confColumns.add(new AbstractColumn<ConfigurationTO, String>(new ResourceModel("actions", "")) {
-
- private static final long serialVersionUID = 2054811145491901166L;
-
- @Override
- public String getCssClass() {
- return "action";
- }
-
- @Override
- public void populateItem(final Item<ICellPopulator<ConfigurationTO>> cellItem, final String componentId,
- final IModel<ConfigurationTO> model) {
-
- final ConfigurationTO configurationTO = model.getObject();
-
- final ActionLinksPanel panel = new ActionLinksPanel(componentId, model, getPageReference());
-
- panel.add(new ActionLink() {
-
- private static final long serialVersionUID = -3722207913631435501L;
-
- @Override
- public void onClick(final AjaxRequestTarget target) {
-
- editConfigWin.setPageCreator(new ModalWindow.PageCreator() {
-
- private static final long serialVersionUID = -7834632442532690940L;
+ WebMarkupContainer parameters = new WebMarkupContainer("parameters");
+ add(parameters);
+ MetaDataRoleAuthorizationStrategy.authorize(parameters, ENABLE, xmlRolesReader.getAllAllowedRoles(
+ "Configuration", "list"));
- @Override
- public Page createPage() {
- return new ConfigurationModalPage(Configuration.this.getPageReference(), editConfigWin,
- configurationTO, false);
- }
- });
+ final ConfTO conf = confRestClient.list();
- editConfigWin.show(target);
- }
- }, ActionLink.ActionType.EDIT, "Configuration");
+ final Form<?> form = new Form<Void>("confForm");
+ form.setModel(new CompoundPropertyModel(conf));
+ parameters.add(form);
- panel.add(new ActionLink() {
+ form.add(new AttributesPanel("parameters", conf, form, false));
- private static final long serialVersionUID = -3722207913631435501L;
-
- @Override
- public void onClick(final AjaxRequestTarget target) {
- try {
- confRestClient.deleteConfiguration(configurationTO.getKey());
- } catch (SyncopeClientException e) {
- LOG.error("While deleting a conf key", e);
- error(e.getMessage());
- return;
- }
-
- info(getString(Constants.OPERATION_SUCCEEDED));
- feedbackPanel.refresh(target);
-
- target.add(confContainer);
- }
- }, ActionLink.ActionType.DELETE, "Configuration");
-
- cellItem.add(panel);
- }
- });
-
- final AjaxFallbackDefaultDataTable<ConfigurationTO, String> confTable =
- new AjaxFallbackDefaultDataTable<ConfigurationTO, String>(
- "syncopeconf", confColumns, new SyncopeConfProvider(), confPaginatorRows);
-
- confContainer = new WebMarkupContainer("confContainer");
- confContainer.add(confTable);
- confContainer.setOutputMarkupId(true);
-
- add(confContainer);
-
- createConfigWin.setCssClassName(ModalWindow.CSS_CLASS_GRAY);
- createConfigWin.setInitialHeight(CONFIG_WIN_HEIGHT);
- createConfigWin.setInitialWidth(CONFIG_WIN_WIDTH);
- createConfigWin.setCookieName("create-configuration-modal");
-
- editConfigWin.setCssClassName(ModalWindow.CSS_CLASS_GRAY);
- editConfigWin.setInitialHeight(CONFIG_WIN_HEIGHT);
- editConfigWin.setInitialWidth(CONFIG_WIN_WIDTH);
- editConfigWin.setCookieName("edit-configuration-modal");
-
- setWindowClosedCallback(createConfigWin, confContainer);
- setWindowClosedCallback(editConfigWin, confContainer);
-
- AjaxLink createConfigurationLink = new AjaxLink("createConfigurationLink") {
+ IndicatingAjaxLink<Void> save = new IndicatingAjaxLink<Void>("saveParameters") {
private static final long serialVersionUID = -7978723352517770644L;
@Override
public void onClick(final AjaxRequestTarget target) {
+ final ConfTO updatedConf = (ConfTO) form.getModelObject();
- createConfigWin.setPageCreator(new ModalWindow.PageCreator() {
-
- private static final long serialVersionUID = -7834632442532690940L;
+ try {
+ for (AttributeTO attr : updatedConf.getAttrs()) {
+ if (attr.getValues().isEmpty()
+ || attr.getValues().equals(Collections.singletonList(StringUtils.EMPTY))) {
- @Override
- public Page createPage() {
- return new ConfigurationModalPage(Configuration.this.getPageReference(), createConfigWin,
- new ConfigurationTO(), true);
+ confRestClient.delete(attr.getSchema());
+ } else {
+ confRestClient.set(attr);
+ }
}
- });
- createConfigWin.show(target);
+ info(getString(Constants.OPERATION_SUCCEEDED));
+ feedbackPanel.refresh(target);
+ } catch (Exception e) {
+ LOG.error("While updating configuration parameters", e);
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
+ feedbackPanel.refresh(target);
+ }
}
};
-
- MetaDataRoleAuthorizationStrategy.authorize(createConfigurationLink, ENABLE, xmlRolesReader.getAllAllowedRoles(
- "Configuration", "create"));
- add(createConfigurationLink);
+ MetaDataRoleAuthorizationStrategy.authorize(save, ENABLE, xmlRolesReader.getAllAllowedRoles(
+ "Configuration", "set"));
+ form.add(save);
Link<Void> dbExportLink = new Link<Void>("dbExportLink") {
@@ -372,34 +290,9 @@ public class Configuration extends BaseP
}
}
};
-
MetaDataRoleAuthorizationStrategy.authorize(dbExportLink, ENABLE, xmlRolesReader.getAllAllowedRoles(
- "Configuration", "read"));
+ "Configuration", "export"));
add(dbExportLink);
-
- @SuppressWarnings("rawtypes")
- Form confPaginatorForm = new Form("confPaginatorForm");
-
- @SuppressWarnings({ "unchecked", "rawtypes" })
- final DropDownChoice rowsChooser = new DropDownChoice("rowsChooser",
- new PropertyModel(this, "confPaginatorRows"), prefMan.getPaginatorChoices());
-
- rowsChooser.add(new AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) {
-
- private static final long serialVersionUID = -1107858522700306810L;
-
- @Override
- protected void onUpdate(final AjaxRequestTarget target) {
- prefMan.set(getRequest(), getResponse(), Constants.PREF_CONFIGURATION_PAGINATOR_ROWS, String.valueOf(
- confPaginatorRows));
- confTable.setItemsPerPage(confPaginatorRows);
-
- target.add(confContainer);
- }
- });
-
- confPaginatorForm.add(rowsChooser);
- add(confPaginatorForm);
}
private void setupNotification() {
@@ -483,7 +376,7 @@ public class Configuration extends BaseP
});
final AjaxFallbackDefaultDataTable<NotificationTO, String> notificationTable =
- new AjaxFallbackDefaultDataTable<NotificationTO, String>(
+ new AjaxFallbackDefaultDataTable<NotificationTO, String>(
"notificationTable", notificationCols, new NotificationProvider(), notificationPaginatorRows);
notificationContainer = new WebMarkupContainer("notificationContainer");
@@ -556,47 +449,6 @@ public class Configuration extends BaseP
add(notificationPaginatorForm);
}
- private class SyncopeConfProvider extends SortableDataProvider<ConfigurationTO, String> {
-
- private static final long serialVersionUID = -276043813563988590L;
-
- private SortableDataProviderComparator<ConfigurationTO> comparator;
-
- public SyncopeConfProvider() {
- //Default sorting
- setSort("key", SortOrder.ASCENDING);
- comparator = new SortableDataProviderComparator<ConfigurationTO>(this);
- }
-
- @Override
- public Iterator<ConfigurationTO> iterator(final long first, final long count) {
- List<ConfigurationTO> list = confRestClient.getAllConfigurations();
-
- Collections.sort(list, comparator);
-
- return list.subList((int) first, (int) first + (int) count).iterator();
- }
-
- @Override
- public long size() {
- return confRestClient.getAllConfigurations().size();
- }
-
- @Override
- public IModel<ConfigurationTO> model(final ConfigurationTO configuration) {
-
- return new AbstractReadOnlyModel<ConfigurationTO>() {
-
- private static final long serialVersionUID = 774694801558497248L;
-
- @Override
- public ConfigurationTO getObject() {
- return configuration;
- }
- };
- }
- }
-
private class NotificationProvider extends SortableDataProvider<NotificationTO, String> {
private static final long serialVersionUID = -276043813563988590L;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java Tue Jun 24 13:25:18 2014
@@ -30,7 +30,6 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.to.AbstractSchemaTO;
-import org.apache.syncope.common.to.SchemaTO;
import org.apache.syncope.common.types.AttributableType;
import org.apache.syncope.common.types.SchemaType;
import org.apache.syncope.console.commons.Constants;
@@ -102,6 +101,9 @@ public class Schema extends BasePage {
private static final long serialVersionUID = 3109256773218160485L;
{
+ put(new SimpleEntry<AttributableType, SchemaType>(
+ AttributableType.CONFIGURATION, SchemaType.NORMAL),
+ Constants.PREF_CONF_SCHEMA_PAGINATOR_ROWS);
put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.USER, SchemaType.NORMAL),
Constants.PREF_USER_SCHEMA_PAGINATOR_ROWS);
put(new SimpleEntry<AttributableType, SchemaType>(AttributableType.USER, SchemaType.DERIVED),
@@ -152,17 +154,19 @@ public class Schema extends BasePage {
List<ITab> tabs = new ArrayList<ITab>();
for (final SchemaType schemaType : SchemaType.values()) {
- final String schemaTypeAsString = schemaType.name().toLowerCase();
+ if (attrType != AttributableType.CONFIGURATION || schemaType == SchemaType.NORMAL) {
+ final String schemaTypeAsString = schemaType.name().toLowerCase();
- tabs.add(new AbstractTab(new Model<String>(getString(schemaTypeAsString))) {
+ tabs.add(new AbstractTab(new Model<String>(getString(schemaTypeAsString))) {
- private static final long serialVersionUID = -5861786415855103549L;
+ private static final long serialVersionUID = -5861786415855103549L;
- @Override
- public WebMarkupContainer getPanel(final String panelId) {
- return new SchemaTypePanel(panelId, attrType, schemaType);
- }
- });
+ @Override
+ public WebMarkupContainer getPanel(final String panelId) {
+ return new SchemaTypePanel(panelId, attrType, schemaType);
+ }
+ });
+ }
}
add(new JQueryUITabbedPanel(attrTypeAsString + "Tabs", tabs));
@@ -178,6 +182,7 @@ public class Schema extends BasePage {
for (final String field : fields) {
final Field clazzField = ReflectionUtils.findField(schemaType.getToClass(), field);
+
if (clazzField != null) {
if (clazzField.getType().equals(Boolean.class) || clazzField.getType().equals(boolean.class)) {
columns.add(new AbstractColumn<AbstractSchemaTO, String>(new ResourceModel(field)) {
@@ -355,6 +360,7 @@ public class Schema extends BasePage {
MetaDataRoleAuthorizationStrategy.authorize(link, ENABLE, allowedCreateRoles);
return link;
+
}
private class SchemaProvider extends SortableDataProvider<AbstractSchemaTO, String> {
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java Tue Jun 24 13:25:18 2014
@@ -165,11 +165,13 @@ public class AttributesPanel extends Pan
filter(schemaTOs, allowed);
} else if (entityTO instanceof UserTO) {
schemaTOs = schemaRestClient.getSchemas(AttributableType.USER);
- } else {
+ } else if (entityTO instanceof MembershipTO) {
schemaTOs = schemaRestClient.getSchemas(AttributableType.MEMBERSHIP);
Set<String> allowed = new HashSet<String>(
roleRestClient.read(((MembershipTO) entityTO).getRoleId()).getMAttrTemplates());
filter(schemaTOs, allowed);
+ } else {
+ schemaTOs = schemaRestClient.getSchemas(AttributableType.CONFIGURATION);
}
schemas.clear();
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationPanel.java?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationPanel.java Tue Jun 24 13:25:18 2014
@@ -19,7 +19,9 @@
package org.apache.syncope.console.pages.panels;
import org.apache.commons.lang3.StringUtils;
+import org.apache.syncope.console.commons.Constants;
import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.feedback.FeedbackMessage;
import org.apache.wicket.feedback.IFeedbackMessageFilter;
@@ -45,6 +47,17 @@ public class NotificationPanel extends F
super(id, feedbackMessageFilter);
+ this.add(new AjaxEventBehavior(Constants.ON_CLICK) {
+
+ private static final long serialVersionUID = -7133385027739964990L;
+
+ @Override
+ protected void onEvent(final AjaxRequestTarget target) {
+ target.appendJavaScript(
+ "setTimeout(\"$('div#" + getMarkupId() + "').fadeOut('normal')\", 0);");
+ }
+ });
+
this.additionalCSSClass = StringUtils.isBlank(additionalCSSClass)
? DEFAULT_ADDITIONAL_CSS_CLASS
: additionalCSSClass;
@@ -54,7 +67,7 @@ public class NotificationPanel extends F
setOutputMarkupId(true);
// Add the additional cssClass and hide the element by default
- add(new AttributeModifier("class", new Model<String>(this.CSS_CLASS + " " + this.additionalCSSClass)));
+ add(new AttributeModifier("class", new Model<String>(CSS_CLASS + " " + this.additionalCSSClass)));
add(new AttributeModifier("style", new Model<String>("opacity: 0;")));
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PushTasksPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PushTasksPanel.java?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PushTasksPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PushTasksPanel.java Tue Jun 24 13:25:18 2014
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.console.pages.panels;
-import static org.apache.syncope.console.pages.panels.AbstractTasks.TASKS;
-
import java.util.ArrayList;
import java.util.List;
import org.apache.syncope.common.SyncopeClientException;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasksPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasksPanel.java?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasksPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/SyncTasksPanel.java Tue Jun 24 13:25:18 2014
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.console.pages.panels;
-import static org.apache.syncope.console.pages.panels.AbstractTasks.TASKS;
-
import java.util.ArrayList;
import java.util.List;
import org.apache.syncope.common.SyncopeClientException;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ConfigurationRestClient.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ConfigurationRestClient.java?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ConfigurationRestClient.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ConfigurationRestClient.java Tue Jun 24 13:25:18 2014
@@ -18,10 +18,10 @@
*/
package org.apache.syncope.console.rest;
-import java.util.List;
import javax.ws.rs.core.Response;
import org.apache.syncope.common.services.ConfigurationService;
-import org.apache.syncope.common.to.ConfigurationTO;
+import org.apache.syncope.common.to.AttributeTO;
+import org.apache.syncope.common.to.ConfTO;
import org.springframework.stereotype.Component;
@Component
@@ -29,44 +29,20 @@ public class ConfigurationRestClient ext
private static final long serialVersionUID = 7692363064029538722L;
- /**
- * Get all stored configurations.
- *
- * @return ConfigurationTOs
- */
- public List<ConfigurationTO> getAllConfigurations() {
+ public ConfTO list() {
return getService(ConfigurationService.class).list();
}
- public ConfigurationTO readConfiguration(final String key) {
+ public AttributeTO read(final String key) {
return getService(ConfigurationService.class).read(key);
}
- /**
- * Create a new configuration.
- *
- * @param configurationTO
- */
- public void createConfiguration(final ConfigurationTO configurationTO) {
- getService(ConfigurationService.class).create(configurationTO);
+ public void set(final AttributeTO attributeTO) {
+ getService(ConfigurationService.class).set(attributeTO.getSchema(), attributeTO);
}
- /**
- * Update an existing configuration.
- *
- * @param configurationTO
- */
- public void updateConfiguration(final ConfigurationTO configurationTO) {
- getService(ConfigurationService.class).update(configurationTO.getKey(), configurationTO);
- }
-
- /**
- * Delete a configuration by key.
- */
- public ConfigurationTO deleteConfiguration(final String key) {
- ConfigurationTO response = getService(ConfigurationService.class).read(key);
+ public void delete(final String key) {
getService(ConfigurationService.class).delete(key);
- return response;
}
public Response dbExport() {
Modified: syncope/trunk/console/src/main/resources/authorizations.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/authorizations.xml?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/authorizations.xml (original)
+++ syncope/trunk/console/src/main/resources/authorizations.xml Tue Jun 24 13:25:18 2014
@@ -201,16 +201,16 @@ under the License.
<entitlement>CONFIGURATION_LIST</entitlement>
</action>
- <action id="create">
- <entitlement>CONFIGURATION_CREATE</entitlement>
+ <action id="export">
+ <entitlement>CONFIGURATION_EXPORT</entitlement>
</action>
<action id="read">
<entitlement>CONFIGURATION_READ</entitlement>
</action>
- <action id="update">
- <entitlement>CONFIGURATION_UPDATE</entitlement>
+ <action id="set">
+ <entitlement>CONFIGURATION_SET</entitlement>
</action>
<action id="delete">
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication.properties Tue Jun 24 13:25:18 2014
@@ -51,3 +51,4 @@ jexl_info=This field expects a JEXL expr
jexl_ex1=surname + ',' + firstname
jexl_ex2='new.' + surname
jexl_syntax_url=Full JEXL reference
+create=Create
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_it.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_it.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_it.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_it.properties Tue Jun 24 13:25:18 2014
@@ -50,3 +50,4 @@ jexl_info=In questo campo possono essere
jexl_ex1=surname + ',' + firstname
jexl_ex2='new.' + surname
jexl_syntax_url=Sintassi JEXL completa
+create=Crea
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_pt_BR.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_pt_BR.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_pt_BR.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_pt_BR.properties Tue Jun 24 13:25:18 2014
@@ -50,3 +50,4 @@ jexl_info=Este campo \u00e9 designado a
jexl_ex1=sobrenome + ',' + nome
jexl_ex2='novo.' + sobrenome
jexl_syntax_url=Refer\u00eancia JEXL completa
+create=Criar
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html Tue Jun 24 13:25:18 2014
@@ -39,29 +39,15 @@ under the License.
<li><a href="#logs"><span><wicket:message key="logs"/></span></a></li>
</ul>
- <div id="parameters">
- <div id="users-contain" class="ui-widget" style="width:inherit">
- <span wicket:id="confContainer">
- <table class="ui-widget ui-widget-content table-hover"
- wicket:id="syncopeconf"/>
- </span>
-
- <span style="float:right">
- <form wicket:id="confPaginatorForm" style="display:inline">
- <label><wicket:message key="displayRows"/></label>
- <select class="text ui-widget-content ui-corner-all"
- wicket:id="rowsChooser"/>
- </form>
- </span>
- </div>
-
- <div wicket:id="createConfigurationWin">[Show modal window for creating configuration]</div>
- <div wicket:id="editConfigurationWin">[Show modal window for editing configuration]</div>
-
- <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
- wicket:id="createConfigurationLink">
- <wicket:message key="create_configuration"/>
- </a>
+ <div id="parameters" wicket:id="parameters" style="width: 700px;">
+ <form wicket:id="confForm">
+ <span wicket:id="parameters">[parameters]</span>
+
+ <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+ wicket:id="saveParameters">
+ <wicket:message key="apply"/>
+ </a>
+ </form>
</div>
<div id="policies">
<ul>
@@ -102,7 +88,7 @@ under the License.
<a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
wicket:id="createNotificationLink">
- <wicket:message key="create_notification"/>
+ <wicket:message key="create"/>
</a>
</div>
<div id="workflow">
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.properties Tue Jun 24 13:25:18 2014
@@ -14,8 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-key=Key
-value=Value
parameters=Parameters
password=Password
account=Account
@@ -26,16 +24,15 @@ coreLog=Core Log
consoleLog=Console Log
edit=Edit
delete=Delete
-create_configuration=Create new configuration
db_export=DB export
logger=Logger
level=Level
events=Events
template=Template
traceLevel=Trace level
-create_notification=Create new notification
subject=Subject
noActivitiEnabledForUsers=Activiti not enabled for users
policies=Policies
logs=Logs
active=Enabled
+apply=Save
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration_it.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration_it.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration_it.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration_it.properties Tue Jun 24 13:25:18 2014
@@ -14,8 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-key=Chiave
-value=Valore
parameters=Parametri
password=Password
account=Account
@@ -26,16 +24,15 @@ coreLog=Log Core
consoleLog=Log Console
edit=Modifica
delete=Rimuovi
-create_configuration=Crea nuova configurazione
db_export=Esportazione DB
logger=Logger
level=Livello
events=Eventi
template=Modello
traceLevel=Tracciamento
-create_notification=Crea nuova notifica
subject=Oggetto
noActivitiEnabledForUsers=Activiti non configurato per gli utenti
policies=Politiche
logs=Logs
active=Abilitata
+apply=Salva
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration_pt_BR.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration_pt_BR.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration_pt_BR.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration_pt_BR.properties Tue Jun 24 13:25:18 2014
@@ -14,8 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-key=Chave
-value=Valor
parameters=Par\u00e2metros
password=Senha
account=Conta
@@ -26,16 +24,15 @@ coreLog=Log Central
consoleLog=Log do Console
edit=Editar
delete=Excluir
-create_configuration=Criar Nova configura\u00e7\u00e3o
db_export=Exportar Banco de Dados
logger=Logger
level=N\u00edvel
events=Eventos
template=Template
traceLevel=N\u00edvel de Trace
-create_notification=Criar nova notifica\u00e7\u00e3o
subject=Assunto
noActivitiEnabledForUsers=Activiti n\u00e3o habilitado para usu\u00e1rios
policies=Pol\u00edticas
logs=Logs
active=Ativada
+apply=Salvar
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerSchemaModalPage.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerSchemaModalPage.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerSchemaModalPage.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerSchemaModalPage.properties Tue Jun 24 13:25:18 2014
@@ -14,7 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-create_attribute=Create new attribute
required_alert=All form fields are required.
expression=Expression
existing_schemas=Existing Schemas:
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerSchemaModalPage_it.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerSchemaModalPage_it.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerSchemaModalPage_it.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerSchemaModalPage_it.properties Tue Jun 24 13:25:18 2014
@@ -14,7 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-create_attribute=Crea nuovo attributo
required_alert=Tutti i campi sono richiesti.
expression=Expression
existing_schemas=Schemi presenti:
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerSchemaModalPage_pt_BR.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerSchemaModalPage_pt_BR.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerSchemaModalPage_pt_BR.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerSchemaModalPage_pt_BR.properties Tue Jun 24 13:25:18 2014
@@ -14,9 +14,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-create_attribute=Criar novo atributo
-required_alert=Todos os campos do formaul\u00E1rio s\u00E3o obrigat\u00F3rios
-expression=Express\u00E3o
+required_alert=Todos os campos do formaul\u00e1rio s\u00e3o obrigat\u00f3rios
+expression=Express\u00e3o
existing_schemas=Esquemas Existentes\:
edit_attribute=Alterar Atributo
attributes=Atributos Derivados
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports.html?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports.html Tue Jun 24 13:25:18 2014
@@ -40,7 +40,7 @@ under the License.
<div wicket:id="reportWin">[Show modal window for report editing]</div>
<a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" wicket:id="createLink">
- <wicket:message key="create_report"/>
+ <wicket:message key="create"/>
</a>
</div>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports.properties Tue Jun 24 13:25:18 2014
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
audit=Audit
-create_report=Create new report
lastExec=Last Execution
nextExec=Next Execution
latestExecStatus=Last status
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports_it.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports_it.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports_it.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports_it.properties Tue Jun 24 13:25:18 2014
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
audit=Audit
-create_report=Crea un nuovo rapporto
lastExec=Ultima Esecuzione
nextExec=Prossima Esecuzione
latestExecStatus=Ultimo stato
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports_pt_BR.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports_pt_BR.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports_pt_BR.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports_pt_BR.properties Tue Jun 24 13:25:18 2014
@@ -15,11 +15,10 @@
# specific language governing permissions and limitations
# under the License.
audit=Auditar
-create_report=Criar novo relat\u00F3rio
-lastExec=\u00DAltima Execu\u00E7\u00E3o
-nextExec=Pr\u00F3xima Execu\u00E7\u00E3o
-latestExecStatus=\u00DAltimo Estatus
+lastExec=\u00daltima Execu\u00e7\u00e3o
+nextExec=Pr\u00f3xima Execu\u00e7\u00e3o
+latestExecStatus=\u00daltimo Estatus
category=Categoria
subcategory=Subcategoria
-startDate=Data de in\u00EDcio
+startDate=Data de in\u00edcio
endDate=Data Final
\ No newline at end of file
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.properties Tue Jun 24 13:25:18 2014
@@ -18,7 +18,6 @@ resource=Resource details
umapping=User mapping
connectorProperties=Connector properties
security=Security
-create_attribute=Create new resource
required_alert=All form fields are required
connector=Connector
existing_resources=Existing resources
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_it.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_it.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_it.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_it.properties Tue Jun 24 13:25:18 2014
@@ -18,8 +18,6 @@ resource=Dettagli Risorsa
umapping=Mapping utenti
connectorProperties=Propriet\u00e0\u00a0 Connettore
security=Sicurezza
-
-create_attribute=Crea nuova risorsa
required_alert=Tutti i campi sono richiesti
connector=Connettore
existing_resources=Risorse esistenti
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_pt_BR.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_pt_BR.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_pt_BR.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_pt_BR.properties Tue Jun 24 13:25:18 2014
@@ -18,7 +18,6 @@ resource=Detalhes de Recursos
umapping=Mapeamento de usu\u00e1rios
connectorProperties=Propriedades de Conectores
security=Seguran\u00e7a
-create_attribute=Criar novo recurso
required_alert=Todos os campos deste formul\u00e1rio s\u00e3o obrigat\u00f3rios
connector=Conector
existing_resources=Recursos Existentes
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Resources.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Resources.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Resources.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Resources.properties Tue Jun 24 13:25:18 2014
@@ -17,7 +17,7 @@
tab1=Resources
edit=Edit
delete=Delete
-create-resource=Create new resource
+create-resource=Create
propagationPriority=Propagation priority
propagationPrimary=Propagation primary
@@ -27,7 +27,7 @@ version=Version
bundleName=Bundle name
edit=Edit
delete=Delete
-create-connector=Create new connector
+create-connector=Create
delete_error=Operation forbidden:the connector you're trying to delete is connected to a Resource
connector=Connector
reloadConnectors=Reload connectors
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Resources_it.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Resources_it.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Resources_it.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Resources_it.properties Tue Jun 24 13:25:18 2014
@@ -17,12 +17,12 @@
tab1=Risorse
edit=Modifica
delete=Rimuovi
-create-resource=Crea nuova risorsa
+create-resource=Crea
propagationPriority=Priorit\u00e0 in propagazione
propagationPrimary=Primaria in propagazione
tab2=Connettori
-create-connector=Crea nuovo connettore
+create-connector=Crea
version=Versione
bundleName=Bundle name
edit=Modifica
@@ -31,5 +31,4 @@ delete_error=Operazione vietata: il conn
displayName=Nome visualizzato
connector=Connettore
reloadConnectors=Ricarica connettori
-confirmReloadConnectors=QQuesta richiesta \u00e8 potenzialmente dannosa per le operazioni in corso, proseguire?
-uesta richiesta \u00e8 potenzialmente dannosa per le operazioni in corso, proseguire?
+confirmReloadConnectors=Questa richiesta \u00e8 potenzialmente dannosa per le operazioni in corso, proseguire?
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Resources_pt_BR.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Resources_pt_BR.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Resources_pt_BR.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Resources_pt_BR.properties Tue Jun 24 13:25:18 2014
@@ -17,16 +17,16 @@
tab1=Recursos
edit=Alterar
delete=Excluir
-create-resource=Criar novo recurso
-propagationPriority=Prioridade de propaga\u00E7\u00E3o
-propagationPrimary=Propaga\u00E7\u00E3o prim\u00E1ria
+create-resource=Criar
+propagationPriority=Prioridade de propaga\u00e7\u00e3o
+propagationPrimary=Propaga\u00e7\u00e3o prim\u00e1ria
tab2=Conectores
displayName=Mostar
-version=Vers\u00E3o
+version=Vers\u00e3o
bundleName=Nome do Pacote
-create-connector=Criar novo conector
-delete_error=Opera\u00E7\u00E3o n\u00E3o permitida\: o conector que voc\u00EA est\u00E1 tentando excluir est\u00E1 conectado a um recurso
+create-connector=Criar
+delete_error=Opera\u00e7\u00e3o n\u00e3o permitida\: o conector que voc\u00ea est\u00e1 tentando excluir est\u00e1 conectado a um recurso
connector=Conector
reloadConnectors=Carregar Conector
-confirmReloadConnectors=Esta requis\u00E7\u00E3o \u00E9 potencialmente perigosa para opera\u00E7\u00F5es em execu\u00E7\u00E3o, prosseguir?
+confirmReloadConnectors=Esta requis\u00e7\u00e3o \u00e9 potencialmente perigosa para opera\u00e7\u00f5es em execu\u00e7\u00e3o, prosseguir?
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema$SchemaTypePanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema%24SchemaTypePanel.html?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema$SchemaTypePanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema$SchemaTypePanel.html Tue Jun 24 13:25:18 2014
@@ -35,7 +35,7 @@ under the License.
<a wicket:id="createSchemaLink"
class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
- <wicket:message key="create_attribute"/>
+ <wicket:message key="create"/>
</a>
</wicket:panel>
</html>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema.html?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema.html Tue Jun 24 13:25:18 2014
@@ -35,11 +35,15 @@ under the License.
<div id="tabs">
<ul>
- <li class="tabs-selected"><a href="#uschema"><wicket:message key="user"/></a></li>
+ <li class="tabs-selected"><a href="#cschema"><wicket:message key="configuration"/></a></li>
+ <li><a href="#uschema"><wicket:message key="user"/></a></li>
<li><a href="#mschema"><wicket:message key="membership"/></a></li>
<li><a href="#rschema"><wicket:message key="role"/></a></li>
</ul>
+ <div id="cschema">
+ <div wicket:id="configurationTabs"/>
+ </div>
<div id="uschema">
<div wicket:id="userTabs"/>
</div>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema.properties Tue Jun 24 13:25:18 2014
@@ -17,7 +17,6 @@
user=User
role=Role
membership=Membership
-create_attribute=Create new attribute
required_alert=All fields are required
mandatory=Mandatory
multivalue=Multivalue
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage.properties Tue Jun 24 13:25:18 2014
@@ -18,7 +18,6 @@ tab1=Attributes
tab2=Derived attributes
tab3=User attributes
tab4=User derived attributes
-create_attribute=Create new attribute
required_alert=All form fields are required.
mandatoryCondition=Mandatory
enumerationValues= Enumeration values
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage_it.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage_it.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage_it.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage_it.properties Tue Jun 24 13:25:18 2014
@@ -18,7 +18,6 @@ tab1=Attributi
tab2=Attributi derivati
tab3=Attributi utenti
tab4=Attributi utenti derivati
-create_attribute=Crea nuovo attributo
required_alert=Tutti i campi sono richiesti
mandatoryCondition=Obbligatorio
enumerationValues= Valori enumeration
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage_pt_BR.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage_pt_BR.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage_pt_BR.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage_pt_BR.properties Tue Jun 24 13:25:18 2014
@@ -18,7 +18,6 @@ tab1=Atributos
tab2=Atributos derivados
tab3=Atributos de usu\u00e1rios
tab4=Atributos derivados de usu\u00e1rios
-create_attribute=Criar novo atributo
required_alert=Todos os campos s\u00e3o obrigat\u00f3rios
mandatoryCondition=obrigat\u00f3rio
enumerationValues= Valores enumerados
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema_it.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema_it.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema_it.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema_it.properties Tue Jun 24 13:25:18 2014
@@ -17,7 +17,6 @@
user=Utente
role=Ruolo
membership=Membership
-create_attribute=Crea nuovo attributo
required_alert=Tutti i campi sono richiesti.
mandatory=Obbligatorio
multivalue=Multivalore
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema_pt_BR.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema_pt_BR.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema_pt_BR.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema_pt_BR.properties Tue Jun 24 13:25:18 2014
@@ -14,23 +14,22 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-user=Usu\u00E1rio
-role=Fun\u00E7\u00E3o
+user=Usu\u00e1rio
+role=Fun\u00e7\u00e3o
membership=Membro
-create_attribute=Criar novo atributo
-required_alert=Todos os campos s\u00E3o requeridos
-mandatory=Obrigat\u00F3rio
+required_alert=Todos os campos s\u00e3o requeridos
+mandatory=Obrigat\u00f3rio
multivalue=Multivalorado
type=Tipo
-validatorClass=classe de Valida\u00E7\u00E3o
-conversionPattern=Padr\u00E3o de Convers\u00E3o
+validatorClass=classe de Valida\u00e7\u00e3o
+conversionPattern=Padr\u00e3o de Convers\u00e3o
edit=Editar
delete=Remover
attributes=Atributos
-expression=Express\u00E3o
+expression=Express\u00e3o
normal=Normal
derived=Derivado
virtual=Virtual
-mandatoryCondition=Mandat\u00F3rio
-uniqueConstraint=\u00DAnico
+mandatoryCondition=Mandat\u00f3rio
+uniqueConstraint=\u00danico
readonly=Apenas leitura
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users.html?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users.html Tue Jun 24 13:25:18 2014
@@ -42,7 +42,7 @@ under the License.
<a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
wicket:id="createLink">
- <wicket:message key="create_user"/>
+ <wicket:message key="create"/>
</a>
</div>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users.properties?rev=1605077&r1=1605076&r2=1605077&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users.properties Tue Jun 24 13:25:18 2014
@@ -17,7 +17,6 @@
tab1=List
tab2=Search
search=Search
-create_user=Create new user
search_results_title=Search results:
search_noResults=No matches found.
search_error=Error:search's format is invalid