[jboss-svn-commits] JBL Code SVN: r19361 - in labs/jbosslabs/labs-3.0-build: services/project-service/src/main/java/org/jboss/labs/core/service/impl and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Apr 1 10:14:17 EDT 2008
Author: wrzep
Date: 2008-04-01 10:14:16 -0400 (Tue, 01 Apr 2008)
New Revision: 19361
Added:
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/DeleteLicense.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/deleteLicense.xhtml
Modified:
labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/core/service/LicenseService.java
labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/LicenseServiceBean.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/AddLicense.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/LicenseServiceFactory.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/ShowLicense.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/ShowLicenses.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/UpdateLicense.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/CreateProjectRequest.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ShowView.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/license/ProjectLicensesFactory.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/license/UpdateProjectLicenses.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/license.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/licenses.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/licenses.xhtml
Log:
JBLAB-915 licenses mgmt
Modified: labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/core/service/LicenseService.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/core/service/LicenseService.java 2008-04-01 13:57:51 UTC (rev 19360)
+++ labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/core/service/LicenseService.java 2008-04-01 14:14:16 UTC (rev 19361)
@@ -25,6 +25,7 @@
import org.jboss.labs.core.model.License;
import org.jboss.labs.exception.admin.LicenseNotFoundException;
+import org.jboss.labs.exception.LabsRollbackException;
import javax.ejb.Local;
import java.util.List;
@@ -42,5 +43,7 @@
void addLicense(License license);
+ void deleteLicense(License license) throws LabsRollbackException;
+
License updateLicense(License license);
}
\ No newline at end of file
Modified: labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/LicenseServiceBean.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/LicenseServiceBean.java 2008-04-01 13:57:51 UTC (rev 19360)
+++ labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/LicenseServiceBean.java 2008-04-01 14:14:16 UTC (rev 19361)
@@ -1,14 +1,18 @@
package org.jboss.labs.core.service.impl;
import org.jboss.labs.core.model.License;
+import org.jboss.labs.core.model.Project;
import org.jboss.labs.core.service.LicenseService;
import org.jboss.labs.exception.admin.LicenseNotFoundException;
+import org.jboss.labs.exception.LabsRollbackException;
import javax.ejb.Stateful;
+import javax.ejb.Stateless;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
import java.util.List;
+import java.util.ArrayList;
/**
* @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
@@ -17,7 +21,7 @@
@Stateful(name="LicenseService")
public class LicenseServiceBean implements LicenseService {
- @PersistenceContext(unitName = "core_model", type = PersistenceContextType.EXTENDED)
+ @PersistenceContext(unitName = "core_model", type = PersistenceContextType.EXTENDED)
private EntityManager em;
@SuppressWarnings("unchecked")
@@ -38,7 +42,58 @@
em.persist(license);
}
+ public void deleteLicense(License license) throws LabsRollbackException {
+ license = em.merge(license);
+ assertCanBeDeleted(license);
+ em.remove(license);
+ }
+
public License updateLicense(License license) {
return em.merge(license);
}
+
+ private void assertCanBeDeleted(License license) throws LabsRollbackException {
+
+ assertProjectListIsEmpty(license);
+
+ assertNoCompatibleLicensesReferences(license);
+ }
+
+ private void assertProjectListIsEmpty(License license) throws LabsRollbackException {
+
+ if (!license.getProjectList().isEmpty()) {
+
+ StringBuilder msg = new StringBuilder();
+ msg.append("The following projects use license '")
+ .append(license.toLicenseString()).append("': ");
+
+ for (Project p : license.getProjectList()) {
+ msg.append(p.getProjectId());
+ msg.append(' ');
+ }
+
+ throw new LabsRollbackException(msg.toString());
+ }
+ }
+
+ private void assertNoCompatibleLicensesReferences(License license) throws LabsRollbackException {
+
+
+ List<License> list = em.createQuery("SELECT l FROM License l" +
+ " WHERE :license MEMBER OF l.compatibleLicensesList")
+ .setParameter("license", license).getResultList();
+
+ if (list.isEmpty()) {
+ return;
+ }
+
+ StringBuffer msg = new StringBuffer();
+ msg.append("The following licenses refer to license")
+ .append(license.toLicenseString()).append(" as compatible licenses '");
+ for (License l : list) {
+ msg.append('\'').append(l.toLicenseString()).append("' ");
+ }
+
+ throw new LabsRollbackException(msg.toString());
+ }
}
\ No newline at end of file
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java 2008-04-01 13:57:51 UTC (rev 19360)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java 2008-04-01 14:14:16 UTC (rev 19361)
@@ -57,4 +57,5 @@
public static final String LICENSES_PAGE = LICENSE_PREFIX + "/licenses.seam";
public static final String LICENSE_PAGE = LICENSE_PREFIX + "/license.seam";
public static final String ADD_LICENSE_PAGE = LICENSE_PREFIX + "/addLicense.seam";
+ public static final String DELETE_LICENSE_PAGE = LICENSE_PREFIX + "/deleteLicense.seam";
}
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/AddLicense.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/AddLicense.java 2008-04-01 13:57:51 UTC (rev 19360)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/AddLicense.java 2008-04-01 14:14:16 UTC (rev 19361)
@@ -26,6 +26,7 @@
import org.jboss.labs.admin.Pages;
import org.jboss.labs.core.model.License;
import org.jboss.labs.core.service.LicenseService;
+import org.jboss.labs.injection.seam.Guice;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.*;
import org.jboss.seam.core.Conversation;
@@ -35,11 +36,14 @@
import java.io.Serializable;
import java.util.List;
+import com.google.inject.Inject;
+
/**
* @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
*/
@Name("addLicense")
+ at Guice
public class AddLicense implements Serializable {
@In private Conversation conversation;
@@ -48,7 +52,7 @@
@In private List<License> licenses;
- @In private LicenseService licenseService;
+ @Inject private LicenseService licenseService;
@In private FacesMessages facesMessages;
Copied: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/DeleteLicense.java (from rev 19358, labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/ShowLicense.java)
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/DeleteLicense.java (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/DeleteLicense.java 2008-04-01 14:14:16 UTC (rev 19361)
@@ -0,0 +1,85 @@
+/*
+* JBoss Labs. http://labs.jboss.com/jbosslabs
+*
+* Copyright © 2008 Red Hat Middleware, LLC. All rights reserved.
+*
+* This copyrighted material is made available to anyone wishing to use,
+* modify, copy, or redistribute it subject to the terms and conditions
+* of the GNU Lesser General Public License, v. 2.1.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT A WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License, v.2.1 along with this distribution; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+* 02110-1301, USA.
+*
+* Red Hat Author(s): Bob McWhirter, Przemyslaw Dej, Ryszard Kozmik,
+* Tomasz Szymanski, Adam Warski, Pawel Wrzeszcz
+*/
+
+package org.jboss.labs.admin.action.license;
+
+import org.jboss.labs.admin.Pages;
+import org.jboss.labs.core.model.License;
+import org.jboss.labs.core.service.LicenseService;
+import org.jboss.labs.exception.LabsRollbackException;
+import org.jboss.labs.injection.seam.Guice;
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.*;
+import org.jboss.seam.core.Conversation;
+import org.jboss.seam.faces.FacesMessages;
+
+import java.util.List;
+
+import com.google.inject.Inject;
+
+/**
+ * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
+ */
+
+ at Name("deleteLicense")
+ at Guice
+public class DeleteLicense {
+
+ @Out(required = false, scope = ScopeType.CONVERSATION) private License license;
+
+ @Out(required = false, scope = ScopeType.CONVERSATION) private List<License> licenses;
+
+ @Inject private LicenseService licenseService;
+
+ // @In private Conversation conversation;
+
+ @In private FacesMessages facesMessages;
+
+ // @Begin(nested=true)
+ public String deleteLicense(License license) {
+
+ this.license = license;
+
+ // conversation.setDescription("Delete license");
+
+ return Pages.DELETE_LICENSE_PAGE;
+ }
+
+ //@End
+ public String doDelete(License license) {
+
+ try {
+ licenseService.deleteLicense(license);
+ } catch (LabsRollbackException e) {
+ facesMessages.add("Cannot delete this license.");
+ facesMessages.add(e.getMessage());
+ return Pages.LICENSES_PAGE;
+ }
+
+ licenses = licenseService.getLicenses();
+
+ facesMessages.add("License '" + license.toLicenseString() + "' has been deleted.");
+
+ return Pages.LICENSES_PAGE;
+ }
+}
\ No newline at end of file
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/LicenseServiceFactory.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/LicenseServiceFactory.java 2008-04-01 13:57:51 UTC (rev 19360)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/LicenseServiceFactory.java 2008-04-01 14:14:16 UTC (rev 19361)
@@ -32,15 +32,14 @@
* @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
*/
- at Name("licenseServiceFactory")
- at Guice
+//@Name("licenseServiceFactory")
+//@Guice
public class LicenseServiceFactory {
- @Inject private org.jboss.labs.core.service.LicenseService licenseService;
+ // @Inject private org.jboss.labs.core.service.LicenseService licenseService;
- @Factory(value = "licenseService", scope = ScopeType.SESSION, autoCreate = true)
- public org.jboss.labs.core.service.LicenseService getLicenseService() {
- System.out.println("LicenseServiceFactory.getLicenseService");
- return licenseService;
- }
+ // @Factory(value = "licenseService", scope = ScopeType.CONVERSATION, autoCreate = true)
+ // public org.jboss.labs.core.service.LicenseService getLicenseService() {
+ // return licenseService;
+ //}
}
\ No newline at end of file
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/ShowLicense.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/ShowLicense.java 2008-04-01 13:57:51 UTC (rev 19360)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/ShowLicense.java 2008-04-01 14:14:16 UTC (rev 19361)
@@ -54,12 +54,15 @@
@In private Conversation conversation;
- @Begin(nested=true)
+ // @Begin(nested=true)
public String showLicense(License license) throws ProjectNotFoundException {
+ System.out.println("ShowLicense.showLicense " + license.getVersion());
+
this.license = license;
- conversation.setDescription(license.getName() + " ver. " + license.getLicenseVersion());
+ // conversation.beginNested();
+ //conversation.setDescription(license.getName() + " ver. " + license.getLicenseVersion());
licenseItems = new ArrayList<SelectItem>();
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/ShowLicenses.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/ShowLicenses.java 2008-04-01 13:57:51 UTC (rev 19360)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/ShowLicenses.java 2008-04-01 14:14:16 UTC (rev 19361)
@@ -26,6 +26,7 @@
import org.jboss.labs.admin.Pages;
import org.jboss.labs.core.model.License;
import org.jboss.labs.core.service.LicenseService;
+import org.jboss.labs.injection.seam.Guice;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Begin;
import org.jboss.seam.annotations.In;
@@ -35,15 +36,18 @@
import java.util.List;
+import com.google.inject.Inject;
+
/**
* @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
*/
@Name("showLicenses")
+ at Guice
public class ShowLicenses {
@In private Conversation conversation;
- @In private LicenseService licenseService;
+ @Inject private LicenseService licenseService;
@Out(scope = ScopeType.CONVERSATION) private List<License> licenses;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/UpdateLicense.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/UpdateLicense.java 2008-04-01 13:57:51 UTC (rev 19360)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/UpdateLicense.java 2008-04-01 14:14:16 UTC (rev 19361)
@@ -26,6 +26,7 @@
import org.jboss.labs.admin.Pages;
import org.jboss.labs.core.model.License;
import org.jboss.labs.core.service.LicenseService;
+import org.jboss.labs.injection.seam.Guice;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.*;
import org.jboss.seam.core.Conversation;
@@ -35,20 +36,23 @@
import java.io.Serializable;
import java.util.List;
+import com.google.inject.Inject;
+
/**
* @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
*/
@Name("updateLicense")
+ at Guice
public class UpdateLicense implements Serializable {
@In private Conversation conversation;
@Out(scope = ScopeType.CONVERSATION, required = false) private License license;
- @In private List<License> licenses;
+ @In @Out(required = false, scope = ScopeType.CONVERSATION) private List<License> licenses;
- @In private LicenseService licenseService;
+ @Inject private LicenseService licenseService;
@In private FacesMessages facesMessages;
@@ -82,19 +86,25 @@
saveCompatibleLicenses.saveCompatibleLicenses();
- this.license = licenseService.updateLicense(license);
-
facesMessages.add("License has been updated successfully.");
if (!apply) {
- conversation.end();
+ // conversation.end();
+ this.license = licenseService.updateLicense(license);
+
+ this.licenses = licenseService.getLicenses();
+
return Pages.LICENSES_PAGE;
- } else {
- return "";
}
+
+ this.license = licenseService.updateLicense(license);
+
+ this.licenses = licenseService.getLicenses();
+
+ return "";
}
// @End
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/CreateProjectRequest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/CreateProjectRequest.java 2008-04-01 13:57:51 UTC (rev 19360)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/CreateProjectRequest.java 2008-04-01 14:14:16 UTC (rev 19361)
@@ -52,7 +52,7 @@
@In private User user;
- @In private LicenseService licenseService;
+ @Inject private LicenseService licenseService;
@Out(scope = ScopeType.CONVERSATION) private List<License> licenses;
//@Out(scope = ScopeType.CONVERSATION) private List<Group> groups;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ShowView.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ShowView.java 2008-04-01 13:57:51 UTC (rev 19360)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ShowView.java 2008-04-01 14:14:16 UTC (rev 19361)
@@ -26,6 +26,7 @@
import org.jboss.labs.admin.Pages;
import org.jboss.labs.core.service.LicenseService;
import org.jboss.labs.core.model.License;
+import org.jboss.labs.injection.seam.Guice;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Out;
@@ -33,11 +34,14 @@
import java.util.List;
+import com.google.inject.Inject;
+
@Name("showView")
+ at Guice
public class ShowView {
- @In private LicenseService licenseService;
+ @Inject private LicenseService licenseService;
@Out(scope = ScopeType.CONVERSATION, required = false) private List<License> licenses;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/license/ProjectLicensesFactory.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/license/ProjectLicensesFactory.java 2008-04-01 13:57:51 UTC (rev 19360)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/license/ProjectLicensesFactory.java 2008-04-01 14:14:16 UTC (rev 19361)
@@ -23,24 +23,21 @@
package org.jboss.labs.admin.action.project.license;
-import org.jboss.seam.annotations.Name;
+import org.jboss.labs.core.model.License;
+import org.jboss.labs.core.model.Project;
import org.jboss.seam.annotations.Factory;
import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.ScopeType;
-import org.jboss.labs.core.model.Project;
-import org.jboss.labs.core.model.License;
+import org.jboss.seam.annotations.Name;
import javax.faces.model.SelectItem;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
/**
* @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
*/
@Name("projectLicensesFactory")
- at Scope(ScopeType.CONVERSATION)
public class ProjectLicensesFactory {
@In private Project project;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/license/UpdateProjectLicenses.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/license/UpdateProjectLicenses.java 2008-04-01 13:57:51 UTC (rev 19360)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/license/UpdateProjectLicenses.java 2008-04-01 14:14:16 UTC (rev 19361)
@@ -61,8 +61,6 @@
public String update() throws LabsRollbackException {
- System.out.println("UpdateProjectLicenses.update " + projectLicenses);
-
List<License> list = new ArrayList<License>();
for (String projectLicense : projectLicenses) {
@@ -79,6 +77,10 @@
return Pages.PROJECT_PAGE;
}
+ public void apply() throws LabsRollbackException {
+ update();
+ }
+
private License find(String licenseIdString) {
int lincenseId = Integer.parseInt(licenseIdString);
Added: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/deleteLicense.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/deleteLicense.xhtml (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/deleteLicense.xhtml 2008-04-01 14:14:16 UTC (rev 19361)
@@ -0,0 +1,24 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:a4j="http://richfaces.org/a4j"
+ template="../layout/template.xhtml">
+
+<ui:define name="body">
+
+ <h2>Delete License</h2>
+ <h:form id="mainForm" >
+ Do you really want to delete the following license: '#{license.toLicenseString()}'?
+ <h:commandButton value="Yes" action="#{deleteLicense.doDelete(license)}"/>
+ <s:button value="No" action="/license/licenses.seam">
+ <s:conversationPropagation type="end"/>
+ </s:button>
+ </h:form>
+
+</ui:define>
+</ui:composition>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/license.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/license.xhtml 2008-04-01 13:57:51 UTC (rev 19360)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/license.xhtml 2008-04-01 14:14:16 UTC (rev 19361)
@@ -9,7 +9,7 @@
template="../layout/template.xhtml">
<ui:define name="body">
- <h2>License</h2>
+ <h2>Edit License</h2>
<h:form id="mainForm">
<s:validateAll>
<table>
@@ -18,6 +18,7 @@
<td>
<h:inputText value="#{license.name}"
required="true" requiredMessage="License name is required"/>
+ #{license.version}
</td>
</tr>
<tr>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/licenses.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/licenses.xhtml 2008-04-01 13:57:51 UTC (rev 19360)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/licenses.xhtml 2008-04-01 14:14:16 UTC (rev 19361)
@@ -15,19 +15,21 @@
<br/>
<h:dataTable value="#{licenses}"
rendered="#{! empty licenses}"
- var="license">
+ var="l">
<f:facet name="header">Licenses</f:facet>
<h:column>
<f:facet name="header">Name</f:facet>
- <h:outputText value="#{license.name} "/>
+ <h:outputText value="#{l.name} "/> #{l.version}
</h:column>
<h:column>
<f:facet name="header">Version</f:facet>
- <h:outputText value="#{license.licenseVersion} "/>
+ <h:outputText value="#{l.licenseVersion} "/>
</h:column>
<h:column>
<f:facet name="header">Action</f:facet>
- <h:commandLink value="[edit]" action="#{showLicense.showLicense(license)}"/>
+ <h:commandLink value="[edit]" action="#{showLicense.showLicense(l)}"/>
+ <h:outputText value=" "/>
+ <h:commandLink value="[delete]" action="#{deleteLicense.deleteLicense(l)}"/>
</h:column>
</h:dataTable>
</h:form>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/licenses.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/licenses.xhtml 2008-04-01 13:57:51 UTC (rev 19360)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/licenses.xhtml 2008-04-01 14:14:16 UTC (rev 19361)
@@ -17,6 +17,7 @@
</h:selectManyCheckbox>
<br/>
<h:commandButton value="Save" action="#{updateProjectLicenses.update()}" />
+ <h:commandButton value="Apply" action="#{updateProjectLicenses.apply()}" />
<s:button value="Cancel" action="/project/project.seam"/>
</h:form>
More information about the jboss-svn-commits
mailing list