[jboss-svn-commits] JBL Code SVN: r19374 - in labs/jbosslabs/labs-3.0-build/views/admin/src/main: webapp/license and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Apr 2 04:25:59 EDT 2008
Author: wrzep
Date: 2008-04-02 04:25:59 -0400 (Wed, 02 Apr 2008)
New Revision: 19374
Added:
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/LicensesFactory.java
Modified:
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/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/webapp/license/license.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/licenses.xhtml
Log:
JBLAB-915 licenses mgmt
Modified: 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/java/org/jboss/labs/admin/action/license/DeleteLicense.java 2008-04-02 03:06:01 UTC (rev 19373)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/DeleteLicense.java 2008-04-02 08:25:59 UTC (rev 19374)
@@ -23,6 +23,7 @@
package org.jboss.labs.admin.action.license;
+import com.google.inject.Inject;
import org.jboss.labs.admin.Pages;
import org.jboss.labs.core.model.License;
import org.jboss.labs.core.service.LicenseService;
@@ -33,10 +34,6 @@
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)
*/
@@ -47,25 +44,23 @@
@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 Conversation conversation;
@In private FacesMessages facesMessages;
- // @Begin(nested=true)
+ @Begin(nested=true)
public String deleteLicense(License license) {
this.license = license;
- // conversation.setDescription("Delete license");
+ conversation.setDescription("Delete license");
return Pages.DELETE_LICENSE_PAGE;
}
- //@End
+ @End
public String doDelete(License license) {
try {
@@ -73,13 +68,13 @@
} catch (LabsRollbackException e) {
facesMessages.add("Cannot delete this license.");
facesMessages.add(e.getMessage());
- return Pages.LICENSES_PAGE;
+ return Pages.LICENSE_PAGE;
}
- licenses = licenseService.getLicenses();
-
facesMessages.add("License '" + license.toLicenseString() + "' has been deleted.");
+ conversation.end();
+
return Pages.LICENSES_PAGE;
}
}
\ No newline at end of file
Copied: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/LicensesFactory.java (from rev 19373, 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/LicensesFactory.java (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/LicensesFactory.java 2008-04-02 08:25:59 UTC (rev 19374)
@@ -0,0 +1,50 @@
+/*
+* 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 com.google.inject.Inject;
+import org.jboss.labs.core.model.License;
+import org.jboss.labs.injection.seam.Guice;
+import org.jboss.seam.annotations.Factory;
+import org.jboss.seam.annotations.Name;
+
+import java.util.List;
+
+/**
+ * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
+ */
+
+ at Name("licensesFactory")
+ at Guice
+public class LicensesFactory {
+
+ @Inject private org.jboss.labs.core.service.LicenseService licenseService;
+
+ @Factory(value = "licenses", autoCreate = true)
+ public List<License> getLicenseService() {
+ return licenseService.getLicenses();
+ }
+
+
+}
\ 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-02 03:06:01 UTC (rev 19373)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/ShowLicense.java 2008-04-02 08:25:59 UTC (rev 19374)
@@ -27,11 +27,9 @@
import org.jboss.labs.core.model.License;
import org.jboss.labs.exception.admin.ProjectNotFoundException;
import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.Begin;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
-import org.jboss.seam.core.Conversation;
import javax.faces.model.SelectItem;
import java.util.ArrayList;
@@ -52,12 +50,11 @@
@Out(scope = ScopeType.CONVERSATION) private List<SelectItem> licenseItems;
- @In private Conversation conversation;
+ //@In private Conversation conversation;
// @Begin(nested=true)
public String showLicense(License license) throws ProjectNotFoundException {
- System.out.println("ShowLicense.showLicense " + license.getVersion());
this.license = license;
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-02 03:06:01 UTC (rev 19373)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/license/ShowLicenses.java 2008-04-02 08:25:59 UTC (rev 19374)
@@ -24,39 +24,30 @@
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.injection.seam.Guice;
-import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Begin;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Out;
import org.jboss.seam.core.Conversation;
-import java.util.List;
-
-import com.google.inject.Inject;
-
/**
* @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
*/
@Name("showLicenses")
- at Guice
+//@Guice
public class ShowLicenses {
@In private Conversation conversation;
- @Inject private LicenseService licenseService;
+ // @Inject private LicenseService licenseService;
- @Out(scope = ScopeType.CONVERSATION) private List<License> licenses;
+ //@Out(scope = ScopeType.CONVERSATION) private List<License> licenses;
@Begin
public String showLicenses() {
conversation.setDescription("Licenses");
- licenses = licenseService.getLicenses();
+ // licenses = licenseService.getLicenses();
return Pages.LICENSES_PAGE;
}
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-02 03:06:01 UTC (rev 19373)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/license.xhtml 2008-04-02 08:25:59 UTC (rev 19374)
@@ -18,7 +18,6 @@
<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-02 03:06:01 UTC (rev 19373)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/license/licenses.xhtml 2008-04-02 08:25:59 UTC (rev 19374)
@@ -19,7 +19,7 @@
<f:facet name="header">Licenses</f:facet>
<h:column>
<f:facet name="header">Name</f:facet>
- <h:outputText value="#{l.name} "/> #{l.version}
+ <h:outputText value="#{l.name} "/>
</h:column>
<h:column>
<f:facet name="header">Version</f:facet>
More information about the jboss-svn-commits
mailing list