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 2013/02/20 15:35:19 UTC
svn commit: r1448184 - in /syncope/trunk: archetype/
console/src/main/java/org/apache/syncope/console/
console/src/main/java/org/apache/syncope/console/pages/
console/src/main/resources/
console/src/main/resources/org/apache/syncope/console/pages/
Author: ilgrosso
Date: Wed Feb 20 14:35:18 2013
New Revision: 1448184
URL: http://svn.apache.org/r1448184
Log:
[SYNCOPE-293] Consolidating version + minor restyling info window
Modified:
syncope/trunk/archetype/pom.xml
syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeSession.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/InfoModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/WelcomePage.java
syncope/trunk/console/src/main/resources/applicationContext.xml
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage_it.properties
Modified: syncope/trunk/archetype/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/archetype/pom.xml?rev=1448184&r1=1448183&r2=1448184&view=diff
==============================================================================
--- syncope/trunk/archetype/pom.xml (original)
+++ syncope/trunk/archetype/pom.xml Wed Feb 20 14:35:18 2013
@@ -148,6 +148,9 @@ under the License.
<resource>
<directory>../core/src/main/webapp</directory>
<targetPath>${project.build.outputDirectory}/archetype-resources/core/src/main/webapp</targetPath>
+ <excludes>
+ <exclude>version.jsp</exclude>
+ </excludes>
</resource>
<resource>
<directory>../core/src/test/resources</directory>
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java?rev=1448184&r1=1448183&r2=1448184&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeApplication.java Wed Feb 20 14:35:18 2013
@@ -56,8 +56,9 @@ import org.apache.wicket.spring.injectio
/**
* SyncopeApplication class.
*/
-public class SyncopeApplication extends WebApplication implements IUnauthorizedComponentInstantiationListener,
- IRoleCheckingStrategy, Serializable {
+public class SyncopeApplication
+ extends WebApplication
+ implements IUnauthorizedComponentInstantiationListener, IRoleCheckingStrategy, Serializable {
public static final String IMG_PREFIX = "/img/menu/";
@@ -84,42 +85,42 @@ public class SyncopeApplication extends
getRequestCycleListeners().add(new SyncopeRequestCycleListener());
}
- public void setupNavigationPanel(final WebPage page, final XMLRolesReader xmlRolesReader, final boolean notsel,
- final String version) {
-
+ public void setupNavigationPanel(final WebPage page, final XMLRolesReader xmlRolesReader, final boolean notsel) {
final ModalWindow infoModal = new ModalWindow("infoModal");
page.add(infoModal);
- infoModal.setInitialWidth(580);
- infoModal.setInitialHeight(285);
+ infoModal.setInitialWidth(350);
+ infoModal.setInitialHeight(300);
+ infoModal.setCssClassName(ModalWindow.CSS_CLASS_GRAY);
+ infoModal.setCookieName("infoModal");
infoModal.setPageCreator(new ModalWindow.PageCreator() {
private static final long serialVersionUID = -7834632442532690940L;
@Override
public Page createPage() {
- return new InfoModalPage(version, SyncopeSession.get().getCoreVersion());
+ return new InfoModalPage();
}
});
- final AjaxLink infoLink = new AjaxLink("infoLink") {
+ final AjaxLink<Void> infoLink = new AjaxLink<Void>("infoLink") {
private static final long serialVersionUID = -7978723352517770644L;
@Override
- public void onClick(AjaxRequestTarget target) {
+ public void onClick(final AjaxRequestTarget target) {
infoModal.show(target);
}
};
page.add(infoLink);
- BookmarkablePageLink schemaLink = new BookmarkablePageLink("schema", Schema.class);
+ BookmarkablePageLink<Void> schemaLink = new BookmarkablePageLink<Void>("schema", Schema.class);
MetaDataRoleAuthorizationStrategy.authorizeAll(schemaLink, WebPage.ENABLE);
page.add(schemaLink);
schemaLink.add(new Image("schemaIcon", new ContextRelativeResource(IMG_PREFIX + (notsel
? IMG_NOTSEL
: "") + "schema" + IMG_SUFFIX)));
- BookmarkablePageLink usersLink = new BookmarkablePageLink("users", Users.class);
+ BookmarkablePageLink<Void> usersLink = new BookmarkablePageLink<Void>("users", Users.class);
String allowedUsersRoles = xmlRolesReader.getAllAllowedRoles("Users", "list");
MetaDataRoleAuthorizationStrategy.authorize(usersLink, WebPage.ENABLE, allowedUsersRoles);
page.add(usersLink);
@@ -127,21 +128,21 @@ public class SyncopeApplication extends
? IMG_NOTSEL
: "") + "users" + IMG_SUFFIX)));
- BookmarkablePageLink rolesLink = new BookmarkablePageLink("roles", Roles.class);
+ BookmarkablePageLink<Void> rolesLink = new BookmarkablePageLink<Void>("roles", Roles.class);
MetaDataRoleAuthorizationStrategy.authorizeAll(rolesLink, WebPage.ENABLE);
page.add(rolesLink);
rolesLink.add(new Image("rolesIcon", new ContextRelativeResource(IMG_PREFIX + (notsel
? IMG_NOTSEL
: "") + "roles" + IMG_SUFFIX)));
- BookmarkablePageLink resourcesLink = new BookmarkablePageLink("resources", Resources.class);
+ BookmarkablePageLink<Void> resourcesLink = new BookmarkablePageLink<Void>("resources", Resources.class);
MetaDataRoleAuthorizationStrategy.authorizeAll(resourcesLink, WebPage.ENABLE);
page.add(resourcesLink);
resourcesLink.add(new Image("resourcesIcon", new ContextRelativeResource(IMG_PREFIX + (notsel
? IMG_NOTSEL
: "") + "resources" + IMG_SUFFIX)));
- BookmarkablePageLink todoLink = new BookmarkablePageLink("todo", Todo.class);
+ BookmarkablePageLink<Void> todoLink = new BookmarkablePageLink<Void>("todo", Todo.class);
MetaDataRoleAuthorizationStrategy.authorize(todoLink, WebPage.ENABLE, xmlRolesReader.getAllAllowedRoles(
"Approval", "list"));
page.add(todoLink);
@@ -149,7 +150,7 @@ public class SyncopeApplication extends
? IMG_NOTSEL
: "") + "todo" + IMG_SUFFIX)));
- BookmarkablePageLink reportLink = new BookmarkablePageLink("reports", Reports.class);
+ BookmarkablePageLink<Void> reportLink = new BookmarkablePageLink<Void>("reports", Reports.class);
String allowedReportRoles = xmlRolesReader.getAllAllowedRoles("Reports", "list");
MetaDataRoleAuthorizationStrategy.authorize(reportLink, WebPage.ENABLE, allowedReportRoles);
page.add(reportLink);
@@ -157,7 +158,8 @@ public class SyncopeApplication extends
? IMG_NOTSEL
: "") + "reports" + IMG_SUFFIX)));
- BookmarkablePageLink configurationLink = new BookmarkablePageLink("configuration", Configuration.class);
+ BookmarkablePageLink<Void> configurationLink = new BookmarkablePageLink<Void>("configuration",
+ Configuration.class);
String allowedConfigurationRoles = xmlRolesReader.getAllAllowedRoles("Configuration", "list");
MetaDataRoleAuthorizationStrategy.authorize(configurationLink, WebPage.ENABLE, allowedConfigurationRoles);
page.add(configurationLink);
@@ -165,7 +167,7 @@ public class SyncopeApplication extends
? IMG_NOTSEL
: "") + "configuration" + IMG_SUFFIX)));
- BookmarkablePageLink taskLink = new BookmarkablePageLink("tasks", Tasks.class);
+ BookmarkablePageLink<Void> taskLink = new BookmarkablePageLink<Void>("tasks", Tasks.class);
String allowedTasksRoles = xmlRolesReader.getAllAllowedRoles("Tasks", "list");
MetaDataRoleAuthorizationStrategy.authorize(taskLink, WebPage.ENABLE, allowedTasksRoles);
page.add(taskLink);
@@ -173,7 +175,7 @@ public class SyncopeApplication extends
? IMG_NOTSEL
: "") + "tasks" + IMG_SUFFIX)));
- page.add(new BookmarkablePageLink("logout", Logout.class));
+ page.add(new BookmarkablePageLink<Void>("logout", Logout.class));
}
@Override
@@ -182,7 +184,7 @@ public class SyncopeApplication extends
}
@Override
- public Class getHomePage() {
+ public Class<? extends Page> getHomePage() {
return SyncopeSession.get().isAuthenticated() ? WelcomePage.class : Login.class;
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeSession.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeSession.java?rev=1448184&r1=1448183&r2=1448184&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeSession.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeSession.java Wed Feb 20 14:35:18 2013
@@ -70,7 +70,7 @@ public class SyncopeSession extends WebS
private String userId;
- private String coreVersion;
+ private String version;
private Roles roles = new Roles();
@@ -131,12 +131,12 @@ public class SyncopeSession extends WebS
this.userId = userId;
}
- public String getCoreVersion() {
- return coreVersion;
+ public String getVersion() {
+ return version;
}
- public void setCoreVersion(String coreVersion) {
- this.coreVersion = coreVersion;
+ public void setVersion(final String version) {
+ this.version = version;
}
public void setEntitlements(final String[] entitlements) {
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePage.java?rev=1448184&r1=1448183&r2=1448184&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/BasePage.java Wed Feb 20 14:35:18 2013
@@ -50,9 +50,6 @@ public class BasePage extends AbstractBa
@SpringBean
private UserRestClient userRestClient;
- @SpringBean(name = "version")
- private String version;
-
public BasePage() {
super();
@@ -66,7 +63,7 @@ public class BasePage extends AbstractBa
}
private void pageSetup() {
- ((SyncopeApplication) getApplication()).setupNavigationPanel(this, xmlRolesReader, true, version);
+ ((SyncopeApplication) getApplication()).setupNavigationPanel(this, xmlRolesReader, true);
final String kind = getClass().getSimpleName().toLowerCase();
final BookmarkablePageLink kindLink = (BookmarkablePageLink) get(kind);
@@ -116,6 +113,7 @@ public class BasePage extends AbstractBa
: new UserTO();
editProfileModalWin.setPageCreator(new ModalWindow.PageCreator() {
+
private static final long serialVersionUID = -7834632442532690940L;
@Override
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/InfoModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/InfoModalPage.java?rev=1448184&r1=1448183&r2=1448184&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/InfoModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/InfoModalPage.java Wed Feb 20 14:35:18 2013
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.console.pages;
+import org.apache.syncope.console.SyncopeSession;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.spring.injection.annot.SpringBean;
@@ -32,12 +33,11 @@ public class InfoModalPage extends BaseM
@SpringBean(name = "license")
private String licenseUrl;
- public InfoModalPage(final String version, final String coreVersion) {
+ public InfoModalPage() {
super();
add(new ExternalLink("syncopeLink", siteUrl));
add(new ExternalLink("licenseLink", licenseUrl));
- add(new Label("consoleVersion", version));
- add(new Label("coreVersion", coreVersion));
+ add(new Label("version", SyncopeSession.get().getVersion()));
}
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java?rev=1448184&r1=1448183&r2=1448184&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java Wed Feb 20 14:35:18 2013
@@ -34,8 +34,6 @@ import org.apache.syncope.common.to.Enti
import org.apache.syncope.common.to.UserTO;
import org.apache.syncope.common.util.CollectionWrapper;
import org.apache.syncope.console.SyncopeSession;
-import org.apache.syncope.console.wicket.markup.html.form.LinkPanel;
-import org.apache.syncope.console.SyncopeSession;
import org.apache.syncope.console.wicket.ajax.markup.html.ClearIndicatingAjaxLink;
import org.apache.syncope.console.wicket.markup.html.form.LinkPanel;
import org.apache.wicket.Page;
@@ -118,7 +116,7 @@ public class Login extends WebPage {
SyncopeSession.get().setUserId(userIdField.getRawInput());
SyncopeSession.get().setEntitlements(entitlements);
- SyncopeSession.get().setCoreVersion(getCoreVersion());
+ SyncopeSession.get().setVersion(getSyncopeVersion());
setResponsePage(WelcomePage.class, parameters);
} catch (HttpClientErrorException e) {
@@ -210,7 +208,7 @@ public class Login extends WebPage {
: result.booleanValue();
}
- private String getCoreVersion() {
+ private String getSyncopeVersion() {
final RestTemplate restTemplate = SyncopeSession.get().getRestTemplate();
PreemptiveAuthHttpRequestFactory requestFactory = ((PreemptiveAuthHttpRequestFactory) restTemplate.
@@ -222,7 +220,7 @@ public class Login extends WebPage {
HttpResponse response = requestFactory.getHttpClient().execute(get);
version = EntityUtils.toString(response.getEntity()).trim();
} catch (Exception e) {
- LOG.error("While fetching core version", e);
+ LOG.error("While fetching version from core", e);
getSession().error(e.getMessage());
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/WelcomePage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/WelcomePage.java?rev=1448184&r1=1448183&r2=1448184&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/WelcomePage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/WelcomePage.java Wed Feb 20 14:35:18 2013
@@ -34,12 +34,9 @@ public class WelcomePage extends WebPage
@SpringBean
private XMLRolesReader xmlRolesReader;
- @SpringBean(name = "version")
- private String version;
-
public WelcomePage(final PageParameters parameters) {
super(parameters);
- ((SyncopeApplication) getApplication()).setupNavigationPanel(this, xmlRolesReader, false, version);
+ ((SyncopeApplication) getApplication()).setupNavigationPanel(this, xmlRolesReader, false);
}
}
Modified: syncope/trunk/console/src/main/resources/applicationContext.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/applicationContext.xml?rev=1448184&r1=1448183&r2=1448184&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/applicationContext.xml (original)
+++ syncope/trunk/console/src/main/resources/applicationContext.xml Wed Feb 20 14:35:18 2013
@@ -55,10 +55,6 @@ under the License.
<constructor-arg value="${scheme}://${host}:${port}${rootPath}"/>
</bean>
- <bean id="version" class="java.lang.String">
- <constructor-arg value="${version}"/>
- </bean>
-
<bean id="site" class="java.lang.String">
<constructor-arg value="${project.parent.url}"/>
</bean>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage.html?rev=1448184&r1=1448183&r2=1448184&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage.html Wed Feb 20 14:35:18 2013
@@ -18,22 +18,25 @@ under the License.
-->
<wicket:extend>
<div id="versionMP">
- <h1><a wicket:id="syncopeLink" target="_blank"><img style="margin-top: -5px;" src="img/logo.png" alt="syncope" title="syncope"/></a></h1>
- <br/><br/>
- <fieldset>
- <table style="font-size:15px;">
- <tr>
- <td>Console:</td>
- <td><span wicket:id="consoleVersion"/></td>
- </tr>
- <tr>
- <td>Core:</td>
- <td><span wicket:id="coreVersion"/></td>
- </tr>
- </table>
- <legend><wicket:message key="version"/></legend>
- </fieldset>
+ <div style="text-align: center;">
+ <a wicket:id="syncopeLink" target="_blank">
+ <img id="logo" src="img/logo.png" alt="syncope" title="syncope"/>
+ </a>
+ <div style="color: white;font-weight: bold;">Version: <span wicket:id="version"/></div>
+ </div>
<br/>
- <wicket:message key="disclaimerHead"/> <a wicket:id="licenseLink" target="_blank">Apache License, Version 2.0 </a><wicket:message key="disclaimerTail"/>
+ <div>
+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
+ </div>
+ <a wicket:id="licenseLink" target="_blank">http://www.apache.org/licenses/LICENSE-2.0</a>
+ <div>
+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.
+ </div>
</div>
-</wicket:extend>
+</wicket:extend>
\ No newline at end of file
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage.properties?rev=1448184&r1=1448183&r2=1448184&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage.properties Wed Feb 20 14:35:18 2013
@@ -15,8 +15,5 @@
# specific language governing permissions and limitations
# under the License.
info=Information
-disclaimerTail=(the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License a 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.
syncopeSite=Apache Syncope Site
-apacheLicense=Apache 2.0 license
version=Version
-disclaimerHead=Licensed under the
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage_it.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage_it.properties?rev=1448184&r1=1448183&r2=1448184&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage_it.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage_it.properties Wed Feb 20 14:35:18 2013
@@ -15,8 +15,5 @@
# specific language governing permissions and limitations
# under the License.
info=Informazioni
-disclaimerTail=(the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License a 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.
syncopeSite=Sito di Apache Syncope
-apacheLicense=Licenza Apache 2.0
version=Versione
-disclaimerHead=Licensed under the