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 2012/02/23 17:38:04 UTC
svn commit: r1292848 [3/3] - in /incubator/syncope/trunk:
archetype/src/main/resources/archetype-resources/
archetype/src/main/resources/archetype-resources/console/
archetype/src/main/resources/archetype-resources/core/ client/
client/src/main/java/or...
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/ActionLinksPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/ActionLinksPanel.java?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/ActionLinksPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/ActionLinksPanel.java Thu Feb 23 16:38:01 2012
@@ -53,6 +53,7 @@ public class ActionLinksPanel extends Pa
super.add(new Fragment("panelDelete", "emptyFragment", this));
super.add(new Fragment("panelExecute", "emptyFragment", this));
super.add(new Fragment("panelDryRun", "emptyFragment", this));
+ super.add(new Fragment("panelExport", "emptyFragment", this));
}
public void add(
@@ -80,6 +81,7 @@ public class ActionLinksPanel extends Pa
final ActionLink link,
final ActionLink.ActionType type,
final String roles) {
+
add(link, type, roles, true);
}
@@ -99,10 +101,13 @@ public class ActionLinksPanel extends Pa
fragment.addOrReplace(
new IndicatingAjaxLink("claimLink") {
- private static final long serialVersionUID = -7978723352517770644L;
+ private static final long serialVersionUID =
+ -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
+ public void onClick(
+ final AjaxRequestTarget target) {
+
link.onClick(target);
}
});
@@ -114,10 +119,13 @@ public class ActionLinksPanel extends Pa
fragment.addOrReplace(
new IndicatingAjaxLink("createLink") {
- private static final long serialVersionUID = -7978723352517770644L;
+ private static final long serialVersionUID =
+ -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
+ public void onClick(
+ final AjaxRequestTarget target) {
+
link.onClick(target);
}
});
@@ -130,10 +138,13 @@ public class ActionLinksPanel extends Pa
fragment.addOrReplace(
new IndicatingAjaxLink("editLink") {
- private static final long serialVersionUID = -7978723352517770644L;
+ private static final long serialVersionUID =
+ -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
+ public void onClick(
+ final AjaxRequestTarget target) {
+
link.onClick(target);
}
});
@@ -145,10 +156,13 @@ public class ActionLinksPanel extends Pa
fragment.addOrReplace(
new IndicatingAjaxLink("templateLink") {
- private static final long serialVersionUID = -7978723352517770644L;
+ private static final long serialVersionUID =
+ -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
+ public void onClick(
+ final AjaxRequestTarget target) {
+
link.onClick(target);
}
});
@@ -160,10 +174,13 @@ public class ActionLinksPanel extends Pa
fragment.addOrReplace(
new IndicatingAjaxLink("searchLink") {
- private static final long serialVersionUID = -7978723352517770644L;
+ private static final long serialVersionUID =
+ -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
+ public void onClick(
+ final AjaxRequestTarget target) {
+
link.onClick(target);
}
});
@@ -175,10 +192,13 @@ public class ActionLinksPanel extends Pa
fragment.addOrReplace(
new IndicatingAjaxLink("executeLink") {
- private static final long serialVersionUID = -7978723352517770644L;
+ private static final long serialVersionUID =
+ -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
+ public void onClick(
+ final AjaxRequestTarget target) {
+
link.onClick(target);
}
});
@@ -190,10 +210,13 @@ public class ActionLinksPanel extends Pa
fragment.addOrReplace(
new IndicatingAjaxLink("dryRunLink") {
- private static final long serialVersionUID = -7978723352517770644L;
+ private static final long serialVersionUID =
+ -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
+ public void onClick(
+ final AjaxRequestTarget target) {
+
link.onClick(target);
}
});
@@ -205,22 +228,44 @@ public class ActionLinksPanel extends Pa
fragment.addOrReplace(
new IndicatingDeleteOnConfirmAjaxLink("deleteLink") {
- private static final long serialVersionUID = -7978723352517770644L;
+ private static final long serialVersionUID =
+ -7978723352517770644L;
@Override
- public void onClick(final AjaxRequestTarget target) {
+ public void onClick(
+ final AjaxRequestTarget target) {
+
link.onClick(target);
}
});
break;
+ case EXPORT:
+ fragment = new Fragment(
+ "panelExport", "fragmentExport", this);
+
+ fragment.addOrReplace(
+ new IndicatingAjaxLink("exportLink") {
+
+ private static final long serialVersionUID =
+ -7978723352517770644L;
+
+ @Override
+ public void onClick(
+ final AjaxRequestTarget target) {
+
+ link.onClick(target);
+ }
+ });
+ break;
default:
// do nothink
}
if (fragment != null) {
fragment.setEnabled(enabled);
- MetaDataRoleAuthorizationStrategy.authorize(fragment, ENABLE, roles);
+ MetaDataRoleAuthorizationStrategy.authorize(
+ fragment, ENABLE, roles);
super.addOrReplace(fragment);
}
}
@@ -261,6 +306,10 @@ public class ActionLinksPanel extends Pa
super.addOrReplace(
new Fragment("panelDelete", "emptyFragment", this));
break;
+ case EXPORT:
+ super.addOrReplace(
+ new Fragment("panelExport", "emptyFragment", this));
+ break;
default:
// do nothink
}
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java Thu Feb 23 16:38:01 2012
@@ -39,11 +39,21 @@ public class AjaxDropDownChoicePanel<T>
final IModel<T> model,
final boolean active) {
+ this(id, name, model, active, true);
+ }
+
+ public AjaxDropDownChoicePanel(
+ final String id,
+ final String name,
+ final IModel<T> model,
+ final boolean active,
+ final boolean nullValid) {
+
super(id, name, model, active);
field = new DropDownChoice("dropDownChoiceField", model,
Collections.EMPTY_LIST, new ChoiceRenderer());
-
+ ((DropDownChoice) field).setNullValid(nullValid);
add(field.setLabel(new Model(name)).setOutputMarkupId(true));
if (active) {
@@ -53,7 +63,7 @@ public class AjaxDropDownChoicePanel<T>
-1107858522700306810L;
@Override
- protected void onUpdate(AjaxRequestTarget art) {
+ protected void onUpdate(final AjaxRequestTarget target) {
// nothing to do
}
});
@@ -81,7 +91,6 @@ public class AjaxDropDownChoicePanel<T>
@Override
public FieldPanel clone() {
-
AjaxDropDownChoicePanel<T> panel =
(AjaxDropDownChoicePanel<T>) super.clone();
Modified: incubator/syncope/trunk/console/src/main/resources/authorizations.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/authorizations.xml?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/authorizations.xml (original)
+++ incubator/syncope/trunk/console/src/main/resources/authorizations.xml Thu Feb 23 16:38:01 2012
@@ -104,6 +104,26 @@ under the License.
<action id="list">
<entitlement>REPORT_LIST</entitlement>
</action>
+
+ <action id="create">
+ <entitlement>REPORT_CREATE</entitlement>
+ </action>
+
+ <action id="read">
+ <entitlement>REPORT_READ</entitlement>
+ </action>
+
+ <action id="update">
+ <entitlement>REPORT_UPDATE</entitlement>
+ </action>
+
+ <action id="delete">
+ <entitlement>REPORT_DELETE</entitlement>
+ </action>
+
+ <action id="execute">
+ <entitlement>REPORT_EXECUTE</entitlement>
+ </action>
</page>
<page id="Connectors">
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/SyncopeApplication.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/SyncopeApplication.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/SyncopeApplication.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/SyncopeApplication.properties Thu Feb 23 16:38:01 2012
@@ -38,3 +38,5 @@ todo=TODO
DateTimeField$HoursValidator=Hour value must be in range (1, 12)
error=Error
generic_error=An error occurred during the operation
+id=Id
+name=Name
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/SyncopeApplication_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/SyncopeApplication_it.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/SyncopeApplication_it.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/SyncopeApplication_it.properties Thu Feb 23 16:38:01 2012
@@ -38,3 +38,5 @@ todo=TODO
DateTimeField$HoursValidator=L'ora deve essere nell'intervallo (1,12)
error=Errore
generic_error=Si \u00e8 verificato un errore durante l'operazione
+id=Id
+name=Nome
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Configuration.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Configuration.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Configuration.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Configuration.properties Thu Feb 23 16:38:01 2012
@@ -31,7 +31,6 @@ db_export=DB export
logger=Logger
level=Level
submit=Save
-id=Id
events=Events
template=Template
traceLevel=Trace level
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Configuration_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Configuration_it.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Configuration_it.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Configuration_it.properties Thu Feb 23 16:38:01 2012
@@ -31,7 +31,6 @@ db_export=Esportazione DB
logger=Logger
level=Livello
submit=Salva
-id=Id
events=Eventi
template=Modello
traceLevel=Tracciamento
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ConnectorModalPage.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ConnectorModalPage.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ConnectorModalPage.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ConnectorModalPage.properties Thu Feb 23 16:38:01 2012
@@ -17,7 +17,6 @@
tab1=General
tab2=Configuration
tab3=Capabilities
-name=Name
displayName=Display name
bundleName=Bundle name
version=Version
@@ -33,4 +32,4 @@ value=Value
success_connection=Successful connecting to resource
error_connection=Connection failure
-check=Check connection
\ No newline at end of file
+check=Check connection
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ConnectorModalPage_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ConnectorModalPage_it.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ConnectorModalPage_it.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ConnectorModalPage_it.properties Thu Feb 23 16:38:01 2012
@@ -17,7 +17,6 @@
tab1=Generale
tab2=Configurazione
tab3=Capabilities
-name=Nome
bundleName=Bundle name
version=Versione
action=Azione
@@ -33,4 +32,4 @@ value=Valore
success_connection=Connessione alla risorsa avvenuta con successo
error_connection=Connessione fallita
-check=Verifica connessione
\ No newline at end of file
+check=Verifica connessione
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/DerivedSchemaModalPage.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/DerivedSchemaModalPage.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/DerivedSchemaModalPage.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/DerivedSchemaModalPage.properties Thu Feb 23 16:38:01 2012
@@ -16,7 +16,6 @@
# under the License.
create_attribute=Create new attribute
required_alert=All form fields are required.
-name=Name
expression=Expression
existing_schemas=Existing Schemas:
edit_attribute=Edit attribute
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/DerivedSchemaModalPage_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/DerivedSchemaModalPage_it.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/DerivedSchemaModalPage_it.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/DerivedSchemaModalPage_it.properties Thu Feb 23 16:38:01 2012
@@ -16,7 +16,6 @@
# under the License.
create_attribute=Crea nuovo attributo
required_alert=Tutti i campi sono richiesti.
-name=Nome
expression=Expression
existing_schemas=Schemi presenti:
edit_attribute=Modifica attributo
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/DisplayAttributesModalPage.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/DisplayAttributesModalPage.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/DisplayAttributesModalPage.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/DisplayAttributesModalPage.properties Thu Feb 23 16:38:01 2012
@@ -25,7 +25,6 @@ surname=Surname
userId=User Id
edit=Edit
delete=Delete
-id=Id
status=Status
token=Token
username=Username
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/DisplayAttributesModalPage_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/DisplayAttributesModalPage_it.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/DisplayAttributesModalPage_it.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/DisplayAttributesModalPage_it.properties Thu Feb 23 16:38:01 2012
@@ -25,7 +25,6 @@ surname=Cognome
userId=User Id
edit=Edit
delete=Rimuovi
-id=Id
status=Stato
token=Token
username=Username
Added: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ExecMessageModalPage.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ExecMessageModalPage.html?rev=1292848&view=auto
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ExecMessageModalPage.html (added)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ExecMessageModalPage.html Thu Feb 23 16:38:01 2012
@@ -0,0 +1,21 @@
+<!--
+ Licensed 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.
+ under the License.
+-->
+<wicket:extend>
+ <div id="dialog">
+ <pre wicket:id="message">
+ [Task execution's message to show]
+ </pre>
+ </div>
+</wicket:extend>
\ No newline at end of file
Propchange: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ExecMessageModalPage.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ExecMessageModalPage.html
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ExecMessageModalPage.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/NotificationTaskModalPage_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/NotificationTaskModalPage_it.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/NotificationTaskModalPage_it.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/NotificationTaskModalPage_it.properties Thu Feb 23 16:38:01 2012
@@ -17,7 +17,6 @@
profile=Profilo
executions=Esecuzioni
title=Task
-id=Id
startDate=Data di avvio
endDate=Data di conclusione
status=Stato
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/PolicyModalPage.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/PolicyModalPage.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/PolicyModalPage.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/PolicyModalPage.properties Thu Feb 23 16:38:01 2012
@@ -16,7 +16,6 @@
# under the License.
title=Account policy management
-id=Id
description=Description
type=Type
apply=Save
@@ -84,4 +83,4 @@ PASSWORD=Password Policy
GLOBAL_PASSWORD=Password Global Policy
SYNC=Synchronization Policy
GLOBAL_SYNC=Synchronization Global Policy
-#-----------------------------
\ No newline at end of file
+#-----------------------------
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/PolicyModalPage_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/PolicyModalPage_it.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/PolicyModalPage_it.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/PolicyModalPage_it.properties Thu Feb 23 16:38:01 2012
@@ -16,7 +16,6 @@
# under the License.
title=Gestiona Account Policy
-id=Id
description=Descrizione
type=Tipo
apply=Salva
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/PropagationTaskModalPage.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/PropagationTaskModalPage.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/PropagationTaskModalPage.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/PropagationTaskModalPage.properties Thu Feb 23 16:38:01 2012
@@ -17,7 +17,6 @@
profile=Profile
executions=Executions
title=Task
-id=Id
accountId=Account id
resource=Resource
startDate=Start date
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/PropagationTaskModalPage_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/PropagationTaskModalPage_it.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/PropagationTaskModalPage_it.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/PropagationTaskModalPage_it.properties Thu Feb 23 16:38:01 2012
@@ -17,7 +17,6 @@
profile=Profilo
executions=Esecuzioni
title=Task
-id=Id
accountId=Id account
resource=Risorsa
startDate=Data di avvio
Added: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportExecResultDownloadModalPage.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportExecResultDownloadModalPage.html?rev=1292848&view=auto
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportExecResultDownloadModalPage.html (added)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportExecResultDownloadModalPage.html Thu Feb 23 16:38:01 2012
@@ -0,0 +1,19 @@
+<!--
+ Licensed 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.
+ under the License.
+-->
+<wicket:extend>
+ <div id="dialog">
+ <wicket:message key="downloadAs"/> <span wicket:id="format" class="small_dynamicsize">[format]</span>
+ </div>
+</wicket:extend>
\ No newline at end of file
Added: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportExecResultDownloadModalPage.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportExecResultDownloadModalPage.properties?rev=1292848&view=auto
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportExecResultDownloadModalPage.properties (added)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportExecResultDownloadModalPage.properties Thu Feb 23 16:38:01 2012
@@ -0,0 +1,18 @@
+# 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.
+downloadAs=Download as
+download=Download
Added: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportExecResultDownloadModalPage_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportExecResultDownloadModalPage_it.properties?rev=1292848&view=auto
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportExecResultDownloadModalPage_it.properties (added)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportExecResultDownloadModalPage_it.properties Thu Feb 23 16:38:01 2012
@@ -0,0 +1,18 @@
+# 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.
+downloadAs=Scarica come
+download=Scarica
Added: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportModalPage.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportModalPage.html?rev=1292848&view=auto
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportModalPage.html (added)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportModalPage.html Thu Feb 23 16:38:01 2012
@@ -0,0 +1,112 @@
+<!--
+ Licensed 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.
+ under the License.
+-->
+<wicket:extend>
+ <div style="margin:10px">
+ <p class="ui-widget ui-corner-all ui-widget-header"><wicket:message key="title"/></p>
+ <form wicket:id="form">
+ <div id="tabs">
+ <ul>
+ <li class="tabs-selected"><a href="#profile"><span><wicket:message key="profile"/></span></a></li>
+ <li><a href="#crontab"><span><wicket:message key="crontab"/></span></a></li>
+ <li><a href="#executions"><span><wicket:message key="executions"/></span></a></li>
+ </ul>
+ <div id="profile">
+ <div id="users-contain" class="ui-widget">
+ <span wicket:id="profile">
+ <div id="formtable">
+
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <span wicket:id="idLabel">[Id]</span>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="id">[id]</span>
+ </div>
+ </div>
+
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <span wicket:id="nameLabel">[Name]</span>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="name">[name]</span>
+ </div>
+ </div>
+
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="lastExec"><wicket:message key="lastExec"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="lastExec">[lastExec]</span>
+ </div>
+ </div>
+
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="nextExec"><wicket:message key="nextExec"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="nextExec">[nextExec]</span>
+ </div>
+ </div>
+ </div>
+
+ <script type="text/javascript">
+ $(function() {
+ $('#formtable div.tablerow:even').addClass("alt");
+ });
+ </script>
+ </span>
+ </div>
+ </div>
+ <div id="crontab">
+ <span wicket:id="crontab">
+ <div id="formtable">
+ <div class="tablerow alt">
+ <label for="cron"><wicket:message key="cron"/></label>
+ </div>
+ <div class="tablerow">
+ <input type="text" id="seconds" class="text ui-widget-content ui-corner-all" wicket:id="seconds" style="width: 50px;float: left" />
+ <input type="text" id="minutes" class="text ui-widget-content ui-corner-all" wicket:id="minutes" style="width: 50px;float: left" />
+ <input type="text" id="hours" class="text ui-widget-content ui-corner-all" wicket:id="hours" style="width: 50px;float: left" />
+ <input type="text" id="daysOfMonth" class="text ui-widget-content ui-corner-all" wicket:id="daysOfMonth" style="width: 50px;float: left" />
+ <input type="text" id="months" class="text ui-widget-content ui-corner-all" wicket:id="months" style="width: 50px;float: left" />
+ <input type="text" id="daysOfWeek" class="text ui-widget-content ui-corner-all" wicket:id="daysOfWeek" style="width: 50px" />
+ </div>
+ <div class="tablerow alt">
+ <label for="cronExpression"><wicket:message key="templates"/></label>
+ </div>
+ <div class="tablerow">
+ <select class="text ui-widget-content ui-corner-all" wicket:id="cronTemplateChooser" style="width: 250px"/>
+ </div>
+ </div>
+ </span>
+ </div>
+ <div id="executions">
+ <span wicket:id="executions" style="width: 100%">
+ <table id="executions" class="ui-widget ui-widget-content"
+ wicket:id="executionsTable" style="width: 100%"/>
+ </span>
+ </div>
+ </div>
+ <div style="margin: 20px 10px 0">
+ <input type="submit" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" wicket:id="apply"/>
+ </div>
+ </form>
+ </div>
+ <div wicket:id="reportExecMessageWin"/>
+ <div wicket:id="reportExecExportWin"/>
+</wicket:extend>
\ No newline at end of file
Added: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportModalPage.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportModalPage.properties?rev=1292848&view=auto
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportModalPage.properties (added)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportModalPage.properties Thu Feb 23 16:38:01 2012
@@ -0,0 +1,33 @@
+# 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.
+profile=Profile
+crontab=Schedule
+executions=Executions
+title=Report
+lastExec=Last Execution
+nextExec=Next Execution
+cron=Schedule (seconds, minutes, hours, days of month, months, days of week)
+templates=Remove task from scheduler / Use a template to schedule
+apply=Save
+startDate=Start date
+endDate=End date
+status=Status
+message=Message
+taskExecutions=Task executions
+delete=Delete
+showMessage=Show
+chooseForTemplate=Use A Template
Added: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportModalPage_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportModalPage_it.properties?rev=1292848&view=auto
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportModalPage_it.properties (added)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportModalPage_it.properties Thu Feb 23 16:38:01 2012
@@ -0,0 +1,33 @@
+# 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.
+profile=Profilo
+crontab=Schedule
+executions=Esecuzioni
+title=Rapporto
+lastExec=Ultima Esecuzione
+nextExec=Prossima Esecuzione
+cron=Schedule (secondi, minuti, ore, giorni del mese, mesi, giorni della settimana)
+templates=Rimuovi task dallo scheduler / Ustilizza un template per schedulare
+apply=Salva
+startDate=Data di avvio
+endDate=Data di conclusione
+status=Stato
+message=Messaggio
+taskExecutions=Esecuzione del task
+delete=Rimozione
+showMessage=Mostra
+chooseForTemplate=Usa Un Template
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Reports.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Reports.html?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Reports.html (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Reports.html Thu Feb 23 16:38:01 2012
@@ -14,9 +14,37 @@
-->
<wicket:extend>
- <div style="margin:auto;vertical-align: middle">
- <img src="img/under-construction.jpg" alt="under_construction"
- style="display:block; margin:auto;"/>
+ <div id="tabs">
+ <ul>
+ <li class="tabs-selected"><a href="#tabs-1"><span><wicket:message key="reports"/></span></a></li>
+ <li><a href="#tabs-2"><span><wicket:message key="auditing"/></span></a></li>
+ </ul>
+
+ <div id="tabs-1">
+ <div id="users-contain" class="ui-widget" style="width:inherit;">
+ <span wicket:id="reportContainer">
+ <table class="ui-widget ui-widget-content table-hover"
+ wicket:id="reportTable"/>
+ </span>
+ <span style="float:right">
+ <form wicket:id="paginatorForm" 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="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"/>
+ </a>
+
+ </div>
+
+ <div id="tabs-2">
+ </div>
</div>
</wicket:extend>
\ No newline at end of file
Added: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Reports.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Reports.properties?rev=1292848&view=auto
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Reports.properties (added)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Reports.properties Thu Feb 23 16:38:01 2012
@@ -0,0 +1,21 @@
+# 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.
+auditing=Auditing
+create_report=Create new report
+lastExec=Last Execution
+nextExec=Next Execution
+latestExecStatus=Last status
Added: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Reports_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Reports_it.properties?rev=1292848&view=auto
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Reports_it.properties (added)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Reports_it.properties Thu Feb 23 16:38:01 2012
@@ -0,0 +1,21 @@
+# 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.
+auditing=Auditing
+create_report=Crea un nuovo rapporto
+lastExec=Ultima Esecuzione
+nextExec=Prossima Esecuzione
+latestExecStatus=Ultimo stato
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ResourceModalPage.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ResourceModalPage.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ResourceModalPage.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ResourceModalPage.properties Thu Feb 23 16:38:01 2012
@@ -20,7 +20,6 @@ connectorProperties=Connector properties
security=Security
create_attribute=Create new resource
required_alert=All form fields are required
-name=Name
connector=Connector
existing_resources=Existing resources
action=Action
@@ -54,4 +53,4 @@ resetToken=Reset Token
success_connection=Successful connecting to resource
error_connection=Connection failure
-check=Check connection
\ No newline at end of file
+check=Check connection
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ResourceModalPage_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ResourceModalPage_it.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ResourceModalPage_it.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ResourceModalPage_it.properties Thu Feb 23 16:38:01 2012
@@ -21,7 +21,6 @@ security=Sicurezza
create_attribute=Crea nuova risorsa
required_alert=Tutti i campi sono richiesti
-name=Nome
connector=Connettore
existing_resources=Risorse esistenti
action=Azione
@@ -55,4 +54,4 @@ resetToken=Reset Token
success_connection=Connessione alla risorsa avvenuta con successo
error_connection=Connessione fallita
-check=Verifica connessione
\ No newline at end of file
+check=Verifica connessione
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Resources.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Resources.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Resources.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Resources.properties Thu Feb 23 16:38:01 2012
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
tab1=Resources
-name=Name
edit=Edit
delete=Delete
create-resource=Create new resource
@@ -23,8 +22,6 @@ propagationPriority=Propagation priority
propagationPrimary=Propagation primary
tab2=Connectors
-id=Id
-name=Name
displayName=Display name
version=Version
bundleName=Bundle name
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Resources_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Resources_it.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Resources_it.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Resources_it.properties Thu Feb 23 16:38:01 2012
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
tab1=Risorse
-name=Nome
edit=Modifica
delete=Rimuovi
create-resource=Crea nuova risorsa
@@ -24,11 +23,9 @@ propagationPrimary=Primaria in propagazi
tab2=Connettori
create-connector=Crea nuovo connettore
-name=Nome
version=Versione
bundleName=Bundle name
edit=Modifica
delete=Elimina
-id=Id
delete_error=Operazione vietata: il connettore che si desidera rimuovere \u00e8 correlato ad una risorsa
displayName=Nome visualizzato
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/RoleModalPage.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/RoleModalPage.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/RoleModalPage.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/RoleModalPage.properties Thu Feb 23 16:38:01 2012
@@ -25,7 +25,6 @@ tab6=Security
add=+
drop=-
error=Generic error occurred during the operation
-name=Name
firstResourcesList=Role's resources
secondResourcesList=Available resources
firstEntitlementsList=Role's entitlements
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/RoleModalPage_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/RoleModalPage_it.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/RoleModalPage_it.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/RoleModalPage_it.properties Thu Feb 23 16:38:01 2012
@@ -24,7 +24,6 @@ tab5=Entitlement
tab6=Sicurezza
add=+
drop=-
-name=Nome
error=Errore generico durante l'operazione
firstResourcesList=Risorse ruolo
secondResourcesList=Risorse disponibili
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SchedTaskModalPage.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SchedTaskModalPage.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SchedTaskModalPage.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SchedTaskModalPage.properties Thu Feb 23 16:38:01 2012
@@ -18,7 +18,6 @@ profile=Profile
crontab=Schedule
executions=Executions
title=Task
-id=Id
class=Class
lastExec=Last Execution
nextExec=Next Execution
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SchedTaskModalPage_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SchedTaskModalPage_it.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SchedTaskModalPage_it.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SchedTaskModalPage_it.properties Thu Feb 23 16:38:01 2012
@@ -18,9 +18,8 @@ profile=Profilo
crontab=Schedule
executions=Esecuzioni
title=Task
-id=Id
class=Classe
-lastExec=Ultima Esecuzuone
+lastExec=Ultima Esecuzione
nextExec=Prossima Esecuzione
cron=Schedule (secondi, minuti, ore, giorni del mese, mesi, giorni della settimana)
templates=Rimuovi task dallo scheduler / Ustilizza un template per schedulare
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Schema.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Schema.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Schema.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Schema.properties Thu Feb 23 16:38:01 2012
@@ -31,7 +31,6 @@ required_alert=All fields are required
mandatory=Mandatory
multivalue=Multivalue
virtual=Virtual
-name=Name
type=Type
validatorClass=Validator class
conversionPattern=Conversion pattern
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SchemaModalPage.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SchemaModalPage.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SchemaModalPage.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SchemaModalPage.properties Thu Feb 23 16:38:01 2012
@@ -25,7 +25,6 @@ enumerationValues= Accepted values
uniqueConstraint=Unique constraint
multivalue=Multivalue
multivalueAndUniqueConstr.validation='Multivalue' and 'Unique constraint' options can't be both checked
-name=Name
type=Type
validatorClass=Validator class
conversionPattern=Conversion pattern
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SchemaModalPage_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SchemaModalPage_it.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SchemaModalPage_it.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SchemaModalPage_it.properties Thu Feb 23 16:38:01 2012
@@ -23,7 +23,6 @@ required_alert=Tutti i campi sono richie
mandatoryCondition=Vincolo d'obbligatoriet\u00e0
enumerationValues= Valori ammessi
multivalue=Multivalore
-name=Nome
type=Tipo
validatorClass=Validatore
conversionPattern=Conversion pattern
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Schema_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Schema_it.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Schema_it.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Schema_it.properties Thu Feb 23 16:38:01 2012
@@ -31,7 +31,6 @@ required_alert=Tutti i campi sono richie
mandatory=Obbligatorio
multivalue=Multivalore
virtual=Virtuale
-name=Nome
type=Tipo
validatorClass=Validator class
conversionPattern=Pattern di conversione
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SyncTaskModalPage.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SyncTaskModalPage.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SyncTaskModalPage.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SyncTaskModalPage.properties Thu Feb 23 16:38:01 2012
@@ -18,7 +18,6 @@ profile=Profile
crontab=Schedule
executions=Executions
title=Task
-id=Id
resourceName=Resource Name
lastExec=Last Execution
nextExec=Next Execution
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SyncTaskModalPage_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SyncTaskModalPage_it.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SyncTaskModalPage_it.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SyncTaskModalPage_it.properties Thu Feb 23 16:38:01 2012
@@ -18,9 +18,8 @@ profile=Profilo
crontab=Schedule
executions=Esecuzioni
title=Task
-id=Id
resourceName=Nome Risorsa
-lastExec=Ultima Esecuzuone
+lastExec=Ultima Esecuzione
nextExec=Prossima Esecuzione
updates=Aggiorna identit\u00e0 esistenti
cron=Schedule (secondi, minuti, ore, giorni del mese, mesi, giorni della settimana)
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Todo.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Todo.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Todo.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Todo.properties Thu Feb 23 16:38:01 2012
@@ -24,7 +24,6 @@ claim=Claim
manage=Manage
approvals=Approval
userRequests=User requests
-id=Id
delete=Delete
type=Type
user=User
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Todo_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Todo_it.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Todo_it.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Todo_it.properties Thu Feb 23 16:38:01 2012
@@ -24,7 +24,6 @@ claim=Richiedi
manage=Gestisci
approvals=Approvazioni
userRequests=Richieste utente
-id=Id
delete=Rimuovi
type=Tipo
user=Utente
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/VirtualSchemaModalPage.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/VirtualSchemaModalPage.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/VirtualSchemaModalPage.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/VirtualSchemaModalPage.properties Thu Feb 23 16:38:01 2012
@@ -16,7 +16,6 @@
# under the License.
create_attribute=Create new attribute
required_alert=All form fields are required.
-name=Name
existing_schemas=Existing Schemas:
edit_attribute=Edit attribute
attributes=Virtual attributes
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/VirtualSchemaModalPage_it.properties
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/VirtualSchemaModalPage_it.properties?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/VirtualSchemaModalPage_it.properties (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/VirtualSchemaModalPage_it.properties Thu Feb 23 16:38:01 2012
@@ -16,7 +16,6 @@
# under the License.
create_attribute=Crea nuovo attributo
required_alert=Tutti i campi sono richiesti.
-name=Nome
existing_schemas=Schemi presenti:
edit_attribute=Modifica attributo
attributes=Attributi virtuali
Modified: incubator/syncope/trunk/console/src/main/resources/org/syncope/console/wicket/markup/html/form/ActionLinksPanel.html
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/resources/org/syncope/console/wicket/markup/html/form/ActionLinksPanel.html?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/resources/org/syncope/console/wicket/markup/html/form/ActionLinksPanel.html (original)
+++ incubator/syncope/trunk/console/src/main/resources/org/syncope/console/wicket/markup/html/form/ActionLinksPanel.html Thu Feb 23 16:38:01 2012
@@ -28,6 +28,7 @@
<span id="action" wicket:id="panelCreate">[plus]</span>
<span id="action" wicket:id="panelTemplate">[plus]</span>
<span id="action" wicket:id="panelEdit">[plus]</span>
+ <span id="action" wicket:id="panelExport">[plus]</span>
<span id="action" wicket:id="panelDelete">[plus]</span>
<wicket:fragment wicket:id="fragmentClaim">
@@ -62,6 +63,10 @@
<a href="#" wicket:id="executeLink"><img src="img/actions/execute.png" alt="execute icon" title="Execute"/></a>
</wicket:fragment>
+ <wicket:fragment wicket:id="fragmentExport">
+ <a href="#" wicket:id="exportLink"><img src="img/actions/export.png" alt="export icon" title="Export"/></a>
+ </wicket:fragment>
+
<wicket:fragment wicket:id="emptyFragment">
</wicket:fragment>
-</wicket:panel>
\ No newline at end of file
+</wicket:panel>
Added: incubator/syncope/trunk/console/src/main/webapp/img/actions/export.png
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/webapp/img/actions/export.png?rev=1292848&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/syncope/trunk/console/src/main/webapp/img/actions/export.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/ConnInstance.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/ConnInstance.java?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/ConnInstance.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/ConnInstance.java Thu Feb 23 16:38:01 2012
@@ -33,7 +33,7 @@ import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.Lob;
import javax.persistence.OneToMany;
-import org.syncope.core.util.XMLSerializer;
+import org.syncope.client.util.XMLSerializer;
import org.syncope.types.ConnConfProperty;
import org.syncope.types.ConnectorCapability;
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/ExternalResource.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/ExternalResource.java?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/ExternalResource.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/ExternalResource.java Thu Feb 23 16:38:01 2012
@@ -40,7 +40,7 @@ import javax.validation.constraints.NotN
import org.apache.commons.lang.StringUtils;
import org.identityconnectors.framework.common.objects.SyncToken;
import org.syncope.core.persistence.validation.entity.ExternalResourceCheck;
-import org.syncope.core.util.XMLSerializer;
+import org.syncope.client.util.XMLSerializer;
import org.syncope.types.ConnConfProperty;
import org.syncope.types.IntMappingType;
import org.syncope.types.PropagationMode;
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Notification.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Notification.java?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Notification.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Notification.java Thu Feb 23 16:38:01 2012
@@ -36,7 +36,7 @@ import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import org.syncope.client.search.NodeCond;
import org.syncope.core.persistence.validation.entity.NotificationCheck;
-import org.syncope.core.util.XMLSerializer;
+import org.syncope.client.util.XMLSerializer;
import org.syncope.types.TraceLevel;
@NotificationCheck
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Policy.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Policy.java?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Policy.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Policy.java Thu Feb 23 16:38:01 2012
@@ -25,7 +25,7 @@ import javax.persistence.Id;
import javax.persistence.Lob;
import javax.validation.constraints.NotNull;
import org.syncope.core.persistence.validation.entity.PolicyCheck;
-import org.syncope.core.util.XMLSerializer;
+import org.syncope.client.util.XMLSerializer;
import org.syncope.types.AbstractPolicySpec;
import org.syncope.types.PolicyType;
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/PropagationTask.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/PropagationTask.java?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/PropagationTask.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/PropagationTask.java Thu Feb 23 16:38:01 2012
@@ -27,7 +27,7 @@ import javax.persistence.ManyToOne;
import org.identityconnectors.framework.common.objects.Attribute;
import org.syncope.core.persistence.beans.user.SyncopeUser;
import org.syncope.core.persistence.validation.entity.PropagationTaskCheck;
-import org.syncope.core.util.XMLSerializer;
+import org.syncope.client.util.XMLSerializer;
import org.syncope.types.PropagationMode;
import org.syncope.types.PropagationOperation;
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Report.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Report.java?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Report.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Report.java Thu Feb 23 16:38:01 2012
@@ -32,7 +32,7 @@ import javax.persistence.Lob;
import javax.persistence.OneToMany;
import org.syncope.client.report.ReportletConf;
import org.syncope.core.persistence.validation.entity.ReportCheck;
-import org.syncope.core.util.XMLSerializer;
+import org.syncope.client.util.XMLSerializer;
@Entity
@ReportCheck
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/SyncTask.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/SyncTask.java?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/SyncTask.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/SyncTask.java Thu Feb 23 16:38:01 2012
@@ -27,7 +27,7 @@ import javax.validation.constraints.Min;
import org.syncope.client.to.UserTO;
import org.syncope.core.persistence.validation.entity.SyncTaskCheck;
import org.syncope.core.scheduling.SyncJob;
-import org.syncope.core.util.XMLSerializer;
+import org.syncope.client.util.XMLSerializer;
@Entity
@SyncTaskCheck
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/UserRequest.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/UserRequest.java?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/UserRequest.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/UserRequest.java Thu Feb 23 16:38:01 2012
@@ -28,7 +28,7 @@ import javax.persistence.Lob;
import javax.validation.constraints.NotNull;
import org.syncope.client.mod.UserMod;
import org.syncope.client.to.UserTO;
-import org.syncope.core.util.XMLSerializer;
+import org.syncope.client.util.XMLSerializer;
import org.syncope.types.UserRequestType;
@Entity
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ReportExecDAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ReportExecDAO.java?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ReportExecDAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ReportExecDAO.java Thu Feb 23 16:38:01 2012
@@ -19,6 +19,7 @@
package org.syncope.core.persistence.dao;
import java.util.List;
+import org.syncope.core.persistence.beans.Report;
import org.syncope.core.persistence.beans.ReportExec;
import org.syncope.core.persistence.validation.entity.InvalidEntityException;
@@ -26,6 +27,10 @@ public interface ReportExecDAO extends D
ReportExec find(Long id);
+ ReportExec findLatestStarted(Report report);
+
+ ReportExec findLatestEnded(Report report);
+
List<ReportExec> findAll();
ReportExec save(ReportExec execution)
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ReportExecDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ReportExecDAOImpl.java?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ReportExecDAOImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ReportExecDAOImpl.java Thu Feb 23 16:38:01 2012
@@ -22,6 +22,7 @@ import java.util.List;
import javax.persistence.Query;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
+import org.syncope.core.persistence.beans.Report;
import org.syncope.core.persistence.beans.ReportExec;
import org.syncope.core.persistence.dao.ReportExecDAO;
import org.syncope.core.persistence.validation.entity.InvalidEntityException;
@@ -35,6 +36,31 @@ public class ReportExecDAOImpl extends A
return entityManager.find(ReportExec.class, id);
}
+ private ReportExec findLatest(final Report report,
+ final String field) {
+
+ Query query = entityManager.createQuery("SELECT e "
+ + "FROM " + ReportExec.class.getSimpleName() + " e "
+ + "WHERE e.report=:report "
+ + "ORDER BY e." + field + " DESC");
+ query.setParameter("report", report);
+ query.setMaxResults(1);
+
+ List<ReportExec> result = query.getResultList();
+ return result == null || result.isEmpty()
+ ? null : result.iterator().next();
+ }
+
+ @Override
+ public ReportExec findLatestStarted(final Report report) {
+ return findLatest(report, "startDate");
+ }
+
+ @Override
+ public ReportExec findLatestEnded(final Report report) {
+ return findLatest(report, "endDate");
+ }
+
@Override
public List<ReportExec> findAll() {
Query query = entityManager.createQuery(
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/rest/data/ReportDataBinder.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/rest/data/ReportDataBinder.java?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/rest/data/ReportDataBinder.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/rest/data/ReportDataBinder.java Thu Feb 23 16:38:01 2012
@@ -18,23 +18,44 @@
*/
package org.syncope.core.rest.data;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.Trigger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.quartz.SchedulerFactoryBean;
import org.springframework.stereotype.Component;
import org.syncope.client.report.ReportletConf;
import org.syncope.client.to.ReportExecTO;
import org.syncope.client.to.ReportTO;
+import org.syncope.core.init.JobInstanceLoader;
import org.syncope.core.persistence.beans.Report;
import org.syncope.core.persistence.beans.ReportExec;
+import org.syncope.core.persistence.dao.ReportExecDAO;
@Component
public class ReportDataBinder {
+ /**
+ * Logger.
+ */
+ private static final Logger LOG = LoggerFactory.getLogger(
+ ReportDataBinder.class);
+
private static final String[] IGNORE_REPORT_PROPERTIES = {
- "id", "reportlets", "executions"};
+ "id", "reportlets", "executions", "latestExecStatus"};
private static final String[] IGNORE_REPORT_EXECUTION_PROPERTIES = {
"id", "report", "execResult"};
+ @Autowired
+ private ReportExecDAO reportExecDAO;
+
+ @Autowired
+ private SchedulerFactoryBean scheduler;
+
public void getReport(final Report report, final ReportTO reportTO) {
BeanUtils.copyProperties(reportTO, report, IGNORE_REPORT_PROPERTIES);
report.getReportletConfs().clear();
@@ -50,8 +71,29 @@ public class ReportDataBinder {
reportTO.setReportletConfs(report.getReportletConfs());
+ ReportExec latestExec = reportExecDAO.findLatestStarted(report);
+ reportTO.setLatestExecStatus(latestExec == null
+ ? "" : latestExec.getStatus());
+
for (ReportExec reportExec : report.getExecs()) {
- reportTO.addExec(getReportExecTO(reportExec));
+ reportTO.addExecution(getReportExecTO(reportExec));
+ }
+
+ String triggerName = JobInstanceLoader.getTriggerName(
+ JobInstanceLoader.getJobName(report));
+
+ Trigger trigger;
+ try {
+ trigger = scheduler.getScheduler().getTrigger(triggerName,
+ Scheduler.DEFAULT_GROUP);
+ } catch (SchedulerException e) {
+ LOG.warn("While trying to get to " + triggerName, e);
+ trigger = null;
+ }
+
+ if (trigger != null) {
+ reportTO.setLastExec(trigger.getPreviousFireTime());
+ reportTO.setNextExec(trigger.getNextFireTime());
}
return reportTO;
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/rest/data/TaskDataBinder.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/rest/data/TaskDataBinder.java?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/rest/data/TaskDataBinder.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/rest/data/TaskDataBinder.java Thu Feb 23 16:38:01 2012
@@ -18,7 +18,6 @@
*/
package org.syncope.core.rest.data;
-import java.util.List;
import javassist.NotFoundException;
import org.apache.commons.lang.StringUtils;
import org.quartz.Scheduler;
@@ -226,8 +225,7 @@ public class TaskDataBinder {
taskTO.setLatestExecStatus(latestExec == null
? "" : latestExec.getStatus());
- List<TaskExec> executions = task.getExecs();
- for (TaskExec execution : executions) {
+ for (TaskExec execution : task.getExecs()) {
taskTO.addExecution(getTaskExecTO(execution));
}
Modified: incubator/syncope/trunk/core/src/test/java/org/syncope/core/rest/ReportTestITCase.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/test/java/org/syncope/core/rest/ReportTestITCase.java?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/test/java/org/syncope/core/rest/ReportTestITCase.java (original)
+++ incubator/syncope/trunk/core/src/test/java/org/syncope/core/rest/ReportTestITCase.java Thu Feb 23 16:38:01 2012
@@ -40,6 +40,14 @@ import org.syncope.client.to.UserTO;
public class ReportTestITCase extends AbstractTest {
@Test
+ public void getReportletClasses() {
+ Set<String> reportletClasses = restTemplate.getForObject(
+ BASE_URL + "report/reportletClasses.json", Set.class);
+ assertNotNull(reportletClasses);
+ assertFalse(reportletClasses.isEmpty());
+ }
+
+ @Test
public void count() {
Integer count = restTemplate.getForObject(
BASE_URL + "report/count.json", Integer.class);
Modified: incubator/syncope/trunk/core/src/test/java/org/syncope/core/rest/TaskTestITCase.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/test/java/org/syncope/core/rest/TaskTestITCase.java?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/test/java/org/syncope/core/rest/TaskTestITCase.java (original)
+++ incubator/syncope/trunk/core/src/test/java/org/syncope/core/rest/TaskTestITCase.java Thu Feb 23 16:38:01 2012
@@ -22,6 +22,7 @@ import static org.junit.Assert.*;
import java.util.Arrays;
import java.util.List;
+import java.util.Set;
import org.junit.Test;
import org.springframework.http.HttpStatus;
import org.springframework.web.client.HttpStatusCodeException;
@@ -39,6 +40,22 @@ import org.syncope.core.scheduling.TestS
public class TaskTestITCase extends AbstractTest {
@Test
+ public void getJobClasses() {
+ Set<String> jobClasses = restTemplate.getForObject(
+ BASE_URL + "task/jobClasses.json", Set.class);
+ assertNotNull(jobClasses);
+ assertFalse(jobClasses.isEmpty());
+ }
+
+ @Test
+ public void getJobActionsClasses() {
+ Set<String> actions = restTemplate.getForObject(
+ BASE_URL + "task/jobActionsClasses.json", Set.class);
+ assertNotNull(actions);
+ assertFalse(actions.isEmpty());
+ }
+
+ @Test
public void create() {
SyncTaskTO task = new SyncTaskTO();
task.setResource("ws-target-resource-2");
Modified: incubator/syncope/trunk/quality/src/main/resources/org/syncope/checkstyle.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/quality/src/main/resources/org/syncope/checkstyle.xml?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/quality/src/main/resources/org/syncope/checkstyle.xml (original)
+++ incubator/syncope/trunk/quality/src/main/resources/org/syncope/checkstyle.xml Thu Feb 23 16:38:01 2012
@@ -138,7 +138,10 @@ under the License.
<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes.html -->
- <module name="LineLength"/>
+ <module name="LineLength">
+ <property name="max" value="120"/>
+ <property name="ignorePattern" value="^import"/>
+ </module>
<module name="MethodLength"/>
<module name="ParameterNumber"/>