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 2016/01/18 16:36:54 UTC
[1/3] syncope git commit: [SYNCOPE-156] Bringing CodeMirror popups to
modern modals - still WIP
Repository: syncope
Updated Branches:
refs/heads/master 6649c5941 -> 3735f9474
[SYNCOPE-156] Bringing CodeMirror popups to modern modals - still WIP
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e5c3e80e
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e5c3e80e
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e5c3e80e
Branch: refs/heads/master
Commit: e5c3e80efa988c941dd7d67144fba616a770d5fe
Parents: 6649c59
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Jan 18 16:34:36 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Jan 18 16:34:36 2016 +0100
----------------------------------------------------------------------
.../console/panels/AnyTypeModalPanel.java | 2 +-
.../console/panels/AbstractModalPanel.html | 4 +-
.../panels/AbstractSearchResultPanel.html | 3 +-
.../AbstractSearchResultPanel_it.properties | 10 +--
.../AbstractSearchResultPanel_pt_BR.properties | 6 +-
.../panels/AnyTypeClassDetailsPanel.html | 2 -
.../client/console/topology/Topology.html | 2 +-
.../console/pages/CamelRoutesPopupPage.java | 76 ------------------
.../console/panels/CamelRoutesDetailsPanel.java | 51 ++++++++++++
.../console/panels/CamelRoutesModalPanel.java | 46 +++++++++++
.../client/console/panels/CamelRoutesPanel.java | 84 ++++++++++++--------
.../console/rest/CamelRoutesRestClient.java | 13 ++-
.../console/pages/CamelRoutesPopupPage.html | 66 ---------------
.../pages/CamelRoutesPopupPage.properties | 19 -----
.../pages/CamelRoutesPopupPage_it.properties | 19 -----
.../pages/CamelRoutesPopupPage_pt_BR.properties | 19 -----
.../console/panels/CamelRoutesDetailsPanel.html | 51 ++++++++++++
.../console/panels/CamelRoutesModalPanel.html | 23 ++++++
.../client/console/panels/CamelRoutesPanel.html | 23 ------
.../console/panels/CamelRoutesPanel.properties | 20 +++++
.../panels/CamelRoutesPanel_it.properties | 20 +++++
.../panels/CamelRoutesPanel_pt_BR.properties | 20 +++++
.../syncope/common/lib/to/CamelRouteTO.java | 6 +-
fit/console-reference/pom.xml | 8 +-
.../src/main/resources/console.properties | 2 +-
25 files changed, 307 insertions(+), 288 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeModalPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeModalPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeModalPanel.java
index 0ec02d0..7135d91 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeModalPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeModalPanel.java
@@ -26,7 +26,7 @@ public class AnyTypeModalPanel extends AbstractModalPanel<AnyTypeTO> {
private static final long serialVersionUID = -4603032036433309900L;
- protected final AnyTypeTO anyTypeTO;
+ private final AnyTypeTO anyTypeTO;
public AnyTypeModalPanel(final BaseModal<AnyTypeTO> modal, final AnyTypeTO anyTypeTO, final PageReference pageRef) {
super(modal, pageRef);
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractModalPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractModalPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractModalPanel.html
index abda19e..96226fc 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractModalPanel.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractModalPanel.html
@@ -16,8 +16,8 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://xmlns.jcp.org/jsf/composite">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
- <wicket:child />
+ <wicket:child/>
</wicket:panel>
</html>
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractSearchResultPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractSearchResultPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractSearchResultPanel.html
index ec13467..be726fd 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractSearchResultPanel.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractSearchResultPanel.html
@@ -26,7 +26,7 @@ under the License.
<div class="dataTable">
<span wicket:id="resultTable">[Table]</span>
</div>
-
+
<div class="rowsChooser">
<form wicket:id="paginator">
<div>
@@ -40,7 +40,6 @@ under the License.
</form>
</div>
</div>
- <wicket:child/>
</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractSearchResultPanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractSearchResultPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractSearchResultPanel_it.properties
index eb11fe4..fd4d6f8 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractSearchResultPanel_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractSearchResultPanel_it.properties
@@ -26,11 +26,11 @@ status=Stato
token=Token
username=Username
creationDate=Data Creazione
-tokenValued=Valued
-tokenNotValued=Not valued
+tokenValued=Valorizzato
+tokenNotValued=Non valorizzato
any.edit=Modifica ${anyTO.type} ${key}
any.new=Nuovo ${anyTO.type}
-any.attr.display=Attributes to be displayed
-any.finish=Submit ${anyTO.type}
-any.cancel=Cancel ${anyTO.type}
+any.attr.display=Attributi da mostrare
+any.finish=Invia ${anyTO.type}
+any.cancel=Annulla ${anyTO.type}
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractSearchResultPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractSearchResultPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractSearchResultPanel_pt_BR.properties
index 21148f2..77212f2 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractSearchResultPanel_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/AbstractSearchResultPanel_pt_BR.properties
@@ -31,6 +31,6 @@ tokenNotValued=N\u00e3o Atribu\u00eddo
any.edit=Alterar ${anyTO.type} ${key}
any.new=Novo ${anyTO.type}
-any.attr.display=Attributes to be displayed
-any.finish=Submit ${anyTO.type}
-any.cancel=Cancel ${anyTO.type}
+any.attr.display=Atributos a ser exibido
+any.finish=Apresentar ${anyTO.type}
+any.cancel=Cancelar ${anyTO.type}
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/client/console/src/main/resources/org/apache/syncope/client/console/panels/AnyTypeClassDetailsPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/AnyTypeClassDetailsPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/AnyTypeClassDetailsPanel.html
index 1c042ac..2a68a1d 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/AnyTypeClassDetailsPanel.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/AnyTypeClassDetailsPanel.html
@@ -17,8 +17,6 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<div class="form-group">
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/client/console/src/main/resources/org/apache/syncope/client/console/topology/Topology.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/topology/Topology.html b/client/console/src/main/resources/org/apache/syncope/client/console/topology/Topology.html
index 14370cf..2c090f6 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/topology/Topology.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/topology/Topology.html
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://xmlns.jcp.org/jsf/composite">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<wicket:head>
<script type="text/javascript" src="webjars/jsplumb/${jsplumb.version}/dom.jsPlumb-${jsplumb.version}-min.js"></script>
<script type="text/javascript" src="webjars/jquery-cookie/${jquery-cookie.version}/jquery.cookie.js"></script>
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/pages/CamelRoutesPopupPage.java
----------------------------------------------------------------------
diff --git a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/pages/CamelRoutesPopupPage.java b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/pages/CamelRoutesPopupPage.java
deleted file mode 100644
index e87443e..0000000
--- a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/pages/CamelRoutesPopupPage.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.client.console.pages;
-
-import org.apache.syncope.client.console.commons.Constants;
-import org.apache.syncope.client.console.rest.CamelRoutesRestClient;
-import org.apache.syncope.common.lib.SyncopeClientException;
-import org.apache.syncope.common.lib.to.CamelRouteTO;
-import org.apache.syncope.common.lib.types.CamelEntitlement;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
-import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextArea;
-import org.apache.wicket.model.CompoundPropertyModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.model.PropertyModel;
-
-public class CamelRoutesPopupPage extends BasePopupPage {
-
- private static final long serialVersionUID = -1438441210568592931L;
-
- private final CamelRoutesRestClient restClient = new CamelRoutesRestClient();
-
- public CamelRoutesPopupPage(final CamelRouteTO routeTO) {
- super();
-
- Form<CamelRouteTO> routeDefForm = new Form<>("routeDefForm");
-
- TextArea<String> routeDefArea = new TextArea<>("content", new PropertyModel<String>(routeTO, "content"));
- routeDefForm.add(routeDefArea);
- routeDefForm.setModel(new CompoundPropertyModel<>(routeTO));
-
- AjaxButton submit = new IndicatingAjaxButton(APPLY, new Model<>(getString(SUBMIT)), routeDefForm) {
-
- private static final long serialVersionUID = -958724007591692537L;
-
- @Override
- protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
- try {
- restClient.update(routeTO.getKey(), ((CamelRouteTO) form.getModelObject()).getContent());
- info(getString(Constants.OPERATION_SUCCEEDED));
- } catch (SyncopeClientException scee) {
- error(getString(Constants.ERROR) + ": " + scee.getMessage());
- }
- notificationPanel.refresh(target);
- }
-
- @Override
- protected void onError(final AjaxRequestTarget target, final Form<?> form) {
- notificationPanel.refresh(target);
- }
- };
-
- MetaDataRoleAuthorizationStrategy.authorize(submit, ENABLE, CamelEntitlement.ROUTE_UPDATE);
- routeDefForm.add(submit);
- add(routeDefForm);
- }
-}
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDetailsPanel.java
----------------------------------------------------------------------
diff --git a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDetailsPanel.java b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDetailsPanel.java
new file mode 100644
index 0000000..2fe9c5b
--- /dev/null
+++ b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDetailsPanel.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.client.console.panels;
+
+import org.apache.syncope.common.lib.to.CamelRouteTO;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.OnLoadHeaderItem;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextArea;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.PropertyModel;
+
+public class CamelRoutesDetailsPanel extends Panel {
+
+ public CamelRoutesDetailsPanel(final String id, final CamelRouteTO camelRoute) {
+ super(id);
+
+ Form<CamelRouteTO> routeDefForm = new Form<>("routeDefForm");
+
+ TextArea<String> routeDefArea = new TextArea<>("route", new PropertyModel<String>(camelRoute, "content"));
+ routeDefForm.add(routeDefArea);
+ routeDefForm.setModel(new CompoundPropertyModel<>(camelRoute));
+ add(routeDefForm);
+ }
+
+ @Override
+ public void renderHead(final IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(OnLoadHeaderItem.forScript(
+ "CodeMirror.fromTextArea(document.getElementById('route'), {lineNumbers: true})."
+ + "on('change', updateTextArea)"));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesModalPanel.java
----------------------------------------------------------------------
diff --git a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesModalPanel.java b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesModalPanel.java
new file mode 100644
index 0000000..8141c78
--- /dev/null
+++ b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesModalPanel.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.client.console.panels;
+
+import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
+import org.apache.syncope.common.lib.to.CamelRouteTO;
+import org.apache.wicket.PageReference;
+
+public class CamelRoutesModalPanel extends AbstractModalPanel<CamelRouteTO> {
+
+ private static final long serialVersionUID = 2053048734388383021L;
+
+ private final CamelRouteTO camelRouteTO;
+
+ public CamelRoutesModalPanel(
+ final BaseModal<CamelRouteTO> modal,
+ final CamelRouteTO camelRouteTO,
+ final PageReference pageRef) {
+
+ super(modal, pageRef);
+ this.camelRouteTO = camelRouteTO;
+ add(new CamelRoutesDetailsPanel("camelRouteDetailsPanel", this.camelRouteTO));
+ }
+
+ @Override
+ public CamelRouteTO getItem() {
+ return this.camelRouteTO;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesPanel.java
----------------------------------------------------------------------
diff --git a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesPanel.java b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesPanel.java
index 8ef050d..06ac021 100644
--- a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesPanel.java
+++ b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesPanel.java
@@ -25,28 +25,29 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.apache.syncope.client.console.SyncopeConsoleSession;
+import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.commons.SearchableDataProvider;
import org.apache.syncope.client.console.commons.SortableDataProviderComparator;
import org.apache.syncope.client.console.pages.CamelRoutesPage;
-import org.apache.syncope.client.console.pages.CamelRoutesPopupPage;
import org.apache.syncope.client.console.panels.CamelRoutesPanel.CamelRoutesProvider;
import org.apache.syncope.client.console.rest.CamelRoutesRestClient;
+import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.client.console.wicket.markup.html.form.ActionLinksPanel;
+import org.apache.syncope.client.console.wizards.AbstractModalPanelBuilder;
+import org.apache.syncope.client.console.wizards.AjaxWizard;
import org.apache.syncope.client.console.wizards.WizardMgtPanel;
import org.apache.syncope.common.lib.to.CamelRouteTO;
import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.common.lib.types.CamelEntitlement;
-import org.apache.syncope.common.rest.api.service.CamelRouteService;
-import org.apache.wicket.Page;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
+import org.apache.wicket.event.Broadcast;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
+import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
@@ -57,14 +58,8 @@ public class CamelRoutesPanel extends AbstractSearchResultPanel<
private static final long serialVersionUID = 3727444742501082182L;
- private static final int CAMELROUTE_WIN_HEIGHT = 480;
-
- private static final int CAMELROUTE_WIN_WIDTH = 800;
-
private final AnyTypeKind anyTypeKind;
- private ModalWindow editCamelRouteWin;
-
public CamelRoutesPanel(final String id, final PageReference pageRef, final AnyTypeKind anyTypeKind) {
super(id, new Builder<CamelRouteTO, CamelRouteTO, CamelRoutesRestClient>(
new CamelRoutesRestClient(), pageRef) {
@@ -83,12 +78,43 @@ public class CamelRoutesPanel extends AbstractSearchResultPanel<
modal.size(Modal.Size.Large);
initResultTable();
- editCamelRouteWin = new ModalWindow("editCamelRouteWin");
- editCamelRouteWin.setCssClassName(ModalWindow.CSS_CLASS_GRAY);
- editCamelRouteWin.setInitialHeight(CAMELROUTE_WIN_HEIGHT);
- editCamelRouteWin.setInitialWidth(CAMELROUTE_WIN_WIDTH);
- editCamelRouteWin.setCookieName("editCamelRouteWin-modal");
- add(editCamelRouteWin);
+ this.addNewItemPanelBuilder(new AbstractModalPanelBuilder<CamelRouteTO>(
+ BaseModal.CONTENT_ID, new CamelRouteTO(), pageRef) {
+
+ private static final long serialVersionUID = -6388405037134399367L;
+
+ @Override
+ public ModalPanel<CamelRouteTO> build(final int index, final boolean edit) {
+ final CamelRouteTO modelObject = newModelObject();
+ return new CamelRoutesModalPanel(modal, modelObject, pageRef) {
+
+ private static final long serialVersionUID = -6227956682141146095L;
+
+ @Override
+ public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+ try {
+ restClient.update(modelObject);
+ info(getString(Constants.OPERATION_SUCCEEDED));
+ modal.close(target);
+ } catch (Exception e) {
+ LOG.error("While creating or updating CamelRouteTO", e);
+ error(getString(Constants.ERROR) + ": " + e.getMessage());
+ }
+ modal.getNotificationPanel().refresh(target);
+ }
+ };
+ }
+
+ @Override
+ protected void onCancelInternal(final CamelRouteTO modelObject) {
+ }
+
+ @Override
+ protected Serializable onApplyInternal(final CamelRouteTO modelObject) {
+ // do nothing
+ return null;
+ }
+ }, false);
}
private CamelRoutesPanel(
@@ -117,8 +143,8 @@ public class CamelRoutesPanel extends AbstractSearchResultPanel<
@Override
protected List<IColumn<CamelRouteTO, String>> getColumns() {
- final List<IColumn<CamelRouteTO, String>> columns = new ArrayList<>();
- columns.add(new PropertyColumn<CamelRouteTO, String>(new ResourceModel("name"), "name", "name"));
+ List<IColumn<CamelRouteTO, String>> columns = new ArrayList<>();
+ columns.add(new PropertyColumn<CamelRouteTO, String>(new ResourceModel("key"), "key", "key"));
columns.add(new AbstractColumn<CamelRouteTO, String>(new ResourceModel("actions", "")) {
private static final long serialVersionUID = -3503023501954863131L;
@@ -140,20 +166,10 @@ public class CamelRoutesPanel extends AbstractSearchResultPanel<
@Override
public void onClick(final AjaxRequestTarget target, final Serializable ignore) {
- editCamelRouteWin.setPageCreator(new ModalWindow.PageCreator() {
-
- private static final long serialVersionUID = -7834632442532690940L;
-
- @Override
- public Page createPage() {
- return new CamelRoutesPopupPage(restClient.read(model.getObject().getKey()));
- }
-
- });
-
- editCamelRouteWin.show(target);
+ send(CamelRoutesPanel.this, Broadcast.EXACT,
+ new AjaxWizard.EditItemActionEvent<>(model.getObject(), target));
}
- }, ActionLink.ActionType.EDIT, CamelEntitlement.ROUTE_READ);
+ }, ActionLink.ActionType.EDIT, CamelEntitlement.ROUTE_UPDATE);
item.add(actionLinks.build(componentId));
}
});
@@ -178,14 +194,14 @@ public class CamelRoutesPanel extends AbstractSearchResultPanel<
@Override
public Iterator<CamelRouteTO> iterator(final long first, final long count) {
- List<CamelRouteTO> list = SyncopeConsoleSession.get().getService(CamelRouteService.class).list(anyTypeKind);
+ List<CamelRouteTO> list = restClient.list(anyTypeKind);
Collections.sort(list, comparator);
return list.subList((int) first, (int) first + (int) count).iterator();
}
@Override
public long size() {
- return SyncopeConsoleSession.get().getService(CamelRouteService.class).list(anyTypeKind).size();
+ return restClient.list(anyTypeKind).size();
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/rest/CamelRoutesRestClient.java
----------------------------------------------------------------------
diff --git a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/rest/CamelRoutesRestClient.java b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/rest/CamelRoutesRestClient.java
index 285b27d..d3cbfc9 100644
--- a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/rest/CamelRoutesRestClient.java
+++ b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/rest/CamelRoutesRestClient.java
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.client.console.rest;
+import java.util.Collections;
import java.util.List;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.common.lib.to.CamelRouteTO;
@@ -31,16 +32,12 @@ public class CamelRoutesRestClient extends BaseRestClient {
private static final long serialVersionUID = -2018208424159468912L;
public List<CamelRouteTO> list(final AnyTypeKind anyTypeKind) {
- return getService(CamelRouteService.class).list(anyTypeKind);
+ return isCamelEnabledFor(anyTypeKind)
+ ? getService(CamelRouteService.class).list(anyTypeKind)
+ : Collections.<CamelRouteTO>emptyList();
}
- public CamelRouteTO read(final String key) {
- return getService(CamelRouteService.class).read(key);
- }
-
- public void update(final String key, final String content) {
- CamelRouteTO routeTO = read(key);
- routeTO.setContent(content);
+ public void update(final CamelRouteTO routeTO) {
getService(CamelRouteService.class).update(routeTO);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutesPopupPage.html
----------------------------------------------------------------------
diff --git a/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutesPopupPage.html b/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutesPopupPage.html
deleted file mode 100644
index 3b0b255..0000000
--- a/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutesPopupPage.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
- <wicket:head>
- <link rel="stylesheet" type="text/css" href="webjars/codemirror/${codemirror.version}/lib/codemirror.css"/>
-
- <script type="text/javascript" src="webjars/codemirror/${codemirror.version}/lib/codemirror.js"></script>
- <script type="text/javascript" src="webjars/codemirror/${codemirror.version}/mode/xml/xml.js"></script>
- <script type="text/javascript">
- function updateTextArea(editor) {
- document.getElementById("routeDefForm").elements["content"].value = editor.getValue();
- }
- </script>
- <style>
- .w_content_3 {
- padding: 0;
- color: #333333;
- font-family: Verdana,Tahoma,sans-serif;
- font-size: 100%;
- border: 1px solid #BBBBBB;
- padding: 1%;
- }
- </style>
- </wicket:head>
- <wicket:extend>
- <div style="padding: 1%;">
- <div class="w_content_3">
- <p class="ui-widget ui-corner-all ui-widget-header">
- <wicket:message key="title"/>
- </p>
- <form wicket:id="routeDefForm" id="routeDefForm">
- <textarea wicket:id="content" id="content" name="content" style="width: 100%; height: 350px;">
- </textarea>
- <div style="padding-top: 1%;">
- <input type="submit"
- class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
- wicket:id="apply"
- onclick=""/>
- </div>
- </form>
- </div>
- </div>
- <script>
- window.onload = function () {
- var editor = CodeMirror.fromTextArea(document.getElementById("content"), {lineNumbers: true});
- editor.on("change", updateTextArea);
- }
- </script>
- </wicket:extend>
-</html>
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutesPopupPage.properties
----------------------------------------------------------------------
diff --git a/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutesPopupPage.properties b/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutesPopupPage.properties
deleted file mode 100644
index 31bf6a7..0000000
--- a/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutesPopupPage.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-title=Camel route
-submit=Save
-cancel=Close
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutesPopupPage_it.properties
----------------------------------------------------------------------
diff --git a/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutesPopupPage_it.properties b/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutesPopupPage_it.properties
deleted file mode 100644
index 7d2f1ec..0000000
--- a/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutesPopupPage_it.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-title=Rotta di Camel
-submit=Salva
-cancel=Chiudi
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutesPopupPage_pt_BR.properties
----------------------------------------------------------------------
diff --git a/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutesPopupPage_pt_BR.properties b/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutesPopupPage_pt_BR.properties
deleted file mode 100644
index fa7217f..0000000
--- a/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/pages/CamelRoutesPopupPage_pt_BR.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-title=Rota de Camel
-submit=Salvar
-cancel=Fechar
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/panels/CamelRoutesDetailsPanel.html
----------------------------------------------------------------------
diff --git a/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/panels/CamelRoutesDetailsPanel.html b/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/panels/CamelRoutesDetailsPanel.html
new file mode 100644
index 0000000..8850975
--- /dev/null
+++ b/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/panels/CamelRoutesDetailsPanel.html
@@ -0,0 +1,51 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <wicket:head>
+ <link rel="stylesheet" type="text/css" href="webjars/codemirror/${codemirror.version}/lib/codemirror.css"/>
+
+ <script type="text/javascript" src="webjars/codemirror/${codemirror.version}/lib/codemirror.js"></script>
+ <script type="text/javascript" src="webjars/codemirror/${codemirror.version}/mode/xml/xml.js"></script>
+ <script type="text/javascript">
+ function updateTextArea(editor) {
+ document.getElementById("routeDefForm").elements["route"].value = editor.getValue();
+ }
+ </script>
+ <style>
+ .w_content_3 {
+ padding: 0;
+ color: #333333;
+ font-family: Verdana,Tahoma,sans-serif;
+ font-size: 100%;
+ border: 1px solid #BBBBBB;
+ padding: 1%;
+ }
+ </style>
+ </wicket:head>
+ <wicket:panel>
+ <div style="padding: 1%;">
+ <div class="w_content_3">
+ <form wicket:id="routeDefForm" id="routeDefForm">
+ <textarea wicket:id="route" id="route" name="route" style="width: 100%; height: 350px;">
+ </textarea>
+ </form>
+ </div>
+ </div>
+ </wicket:panel>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/panels/CamelRoutesModalPanel.html
----------------------------------------------------------------------
diff --git a/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/panels/CamelRoutesModalPanel.html b/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/panels/CamelRoutesModalPanel.html
new file mode 100644
index 0000000..783f516
--- /dev/null
+++ b/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/panels/CamelRoutesModalPanel.html
@@ -0,0 +1,23 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <wicket:extend>
+ <div wicket:id="camelRouteDetailsPanel">[camelRouteDetailsPanel]</div>
+ </wicket:extend>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/panels/CamelRoutesPanel.html
----------------------------------------------------------------------
diff --git a/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/panels/CamelRoutesPanel.html b/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/panels/CamelRoutesPanel.html
deleted file mode 100644
index 0bd1210..0000000
--- a/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/panels/CamelRoutesPanel.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
- <wicket:extend>
- <div wicket:id="editCamelRouteWin">[Show modal window for editing Camel route]</div>
- </wicket:extend>
-</html>
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/panels/CamelRoutesPanel.properties
----------------------------------------------------------------------
diff --git a/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/panels/CamelRoutesPanel.properties b/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/panels/CamelRoutesPanel.properties
new file mode 100644
index 0000000..bbb89ab
--- /dev/null
+++ b/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/panels/CamelRoutesPanel.properties
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+any.edit=Edit Camel Route ${key}
+any.new=New Camel Route
+any.finish=Update
+any.cancel=Cancel
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/panels/CamelRoutesPanel_it.properties
----------------------------------------------------------------------
diff --git a/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/panels/CamelRoutesPanel_it.properties b/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/panels/CamelRoutesPanel_it.properties
new file mode 100644
index 0000000..07d463e
--- /dev/null
+++ b/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/panels/CamelRoutesPanel_it.properties
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+any.edit=Modifica Camel Route ${key}
+any.new=Nuova Camel Route
+any.finish=Aggiorna
+any.cancel=Annulla
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/panels/CamelRoutesPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/panels/CamelRoutesPanel_pt_BR.properties b/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/panels/CamelRoutesPanel_pt_BR.properties
new file mode 100644
index 0000000..a25f1a1
--- /dev/null
+++ b/ext/camel/client-console/src/main/resources/org/apache/syncope/client/console/panels/CamelRoutesPanel_pt_BR.properties
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+any.edit=Alterar Camel Route ${key}
+any.new=Nova Camel Route
+any.finish=Atualizar
+any.cancel=Cancelar
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/ext/camel/common-lib/src/main/java/org/apache/syncope/common/lib/to/CamelRouteTO.java
----------------------------------------------------------------------
diff --git a/ext/camel/common-lib/src/main/java/org/apache/syncope/common/lib/to/CamelRouteTO.java b/ext/camel/common-lib/src/main/java/org/apache/syncope/common/lib/to/CamelRouteTO.java
index 620a656..cb64fb6 100644
--- a/ext/camel/common-lib/src/main/java/org/apache/syncope/common/lib/to/CamelRouteTO.java
+++ b/ext/camel/common-lib/src/main/java/org/apache/syncope/common/lib/to/CamelRouteTO.java
@@ -30,19 +30,19 @@ public class CamelRouteTO extends AbstractBaseBean {
private static final long serialVersionUID = 6431992877435181674L;
- private String name;
+ private String key;
private AnyTypeKind anyTypeKind;
private String content;
public String getKey() {
- return name;
+ return key;
}
@PathParam("key")
public void setKey(final String key) {
- this.name = key;
+ this.key = key;
}
public String getContent() {
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/fit/console-reference/pom.xml
----------------------------------------------------------------------
diff --git a/fit/console-reference/pom.xml b/fit/console-reference/pom.xml
index a73941e..571fc2d 100644
--- a/fit/console-reference/pom.xml
+++ b/fit/console-reference/pom.xml
@@ -109,7 +109,7 @@ under the License.
<type>war</type>
<scope>test</scope>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>org.apache.syncope.fit</groupId>
<artifactId>syncope-fit-build-tools</artifactId>
<version>${project.version}</version>
@@ -128,7 +128,7 @@ under the License.
<version>${project.version}</version>
<type>war</type>
<scope>test</scope>
- </dependency>
+ </dependency>-->
</dependencies>
<build>
@@ -313,7 +313,7 @@ under the License.
</properties>
</configuration>
<deployables>
- <deployable>
+<!-- <deployable>
<groupId>net.tirasa.connid.bundles.soap</groupId>
<artifactId>wssample</artifactId>
<type>war</type>
@@ -336,7 +336,7 @@ under the License.
<properties>
<context>syncope</context>
</properties>
- </deployable>
+ </deployable>-->
<deployable>
<location>${project.build.directory}/${project.build.finalName}</location>
<properties>
http://git-wip-us.apache.org/repos/asf/syncope/blob/e5c3e80e/fit/console-reference/src/main/resources/console.properties
----------------------------------------------------------------------
diff --git a/fit/console-reference/src/main/resources/console.properties b/fit/console-reference/src/main/resources/console.properties
index be99423..eb7ea39 100644
--- a/fit/console-reference/src/main/resources/console.properties
+++ b/fit/console-reference/src/main/resources/console.properties
@@ -25,7 +25,7 @@ anonymousKey=${anonymousKey}
scheme=http
host=localhost
-port=9080
+port=8080
rootPath=/syncope/rest/
activitiModelerDirectory=${activiti-modeler.directory}
[3/3] syncope git commit: Incorporating CHANGES for 1.2.7
Posted by il...@apache.org.
Incorporating CHANGES for 1.2.7
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3735f947
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3735f947
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3735f947
Branch: refs/heads/master
Commit: 3735f9474c752b81069e0bcac124fff31226493c
Parents: 23626cd
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Jan 18 16:36:37 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Jan 18 16:36:37 2016 +0100
----------------------------------------------------------------------
CHANGES | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/3735f947/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 7d9964e..b27e7fa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -202,6 +202,19 @@ Release Notes - Syncope - Version 2.0.0-M1
** Wish
* [SYNCOPE-535] - Provide Debian packages for Apache Syncope
+Release Notes - Syncope - Version 1.2.7
+================================================================================
+
+** Bug
+ * [SYNCOPE-729] - Skipped remote update during resource assignment if connector CREATE capability is not provided
+ * [SYNCOPE-735] - Acitiviti history tables uncontrolled growth
+ * [SYNCOPE-739] - Virtual attributes are not updated after a sync task
+ * [SYNCOPE-741] - Tasks page unusable when a task has thousand executions
+
+** Improvement
+ * [SYNCOPE-748] - Selectively delete task and report executions
+ * [SYNCOPE-751] - Preview for PDF binary values
+
Release Notes - Syncope - Version 1.2.6
================================================================================
[2/3] syncope git commit: Upgrading Cargo
Posted by il...@apache.org.
Upgrading Cargo
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/23626cd1
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/23626cd1
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/23626cd1
Branch: refs/heads/master
Commit: 23626cd12b22aab81db8f34f4e66509ea1c28e55
Parents: e5c3e80
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Jan 18 16:35:16 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Jan 18 16:35:16 2016 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/23626cd1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9846744..977509b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1307,7 +1307,7 @@ under the License.
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>1.4.17</version>
+ <version>1.4.18</version>
<configuration>
<container>
<containerId>tomcat8x</containerId>