[jboss-svn-commits] JBL Code SVN: r7148 - in labs/reportingservices/trunk/dev/modules/adminconsole: service-impl/src/main/java/org/jboss/reporting/ui/reporttree webadminconsole/src/main/java/org/jboss/reporting webadminconsole/src/main/java/org/jboss/reporting/managedbean webadminconsole/src/main/java/org/jboss/reporting/ui/reportlist webadminconsole/src/main/webapp/WEB-INF webadminconsole/src/main/webapp/images webadminconsole/src/main/webapp/report
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 26 13:02:00 EDT 2006
Author: cyril.joui at supinfo.com
Date: 2006-10-26 12:59:52 -0400 (Thu, 26 Oct 2006)
New Revision: 7148
Added:
labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/java/org/jboss/reporting/managedbean/
labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/java/org/jboss/reporting/managedbean/ExplorerDataBean.java
Removed:
labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/webapp/images/Thumbs.db
Modified:
labs/reportingservices/trunk/dev/modules/adminconsole/service-impl/src/main/java/org/jboss/reporting/ui/reporttree/MyFacesTreeService.java
labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/java/org/jboss/reporting/ui/reportlist/ReportList.java
labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/webapp/WEB-INF/faces-config.xml
labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/webapp/WEB-INF/web.xml
labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/webapp/report/list.jsp
labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/webapp/report/tree.jsp
Log:
Console refactoring (part 1)
Modified: labs/reportingservices/trunk/dev/modules/adminconsole/service-impl/src/main/java/org/jboss/reporting/ui/reporttree/MyFacesTreeService.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/adminconsole/service-impl/src/main/java/org/jboss/reporting/ui/reporttree/MyFacesTreeService.java 2006-10-26 15:31:39 UTC (rev 7147)
+++ labs/reportingservices/trunk/dev/modules/adminconsole/service-impl/src/main/java/org/jboss/reporting/ui/reporttree/MyFacesTreeService.java 2006-10-26 16:59:52 UTC (rev 7148)
@@ -53,8 +53,7 @@
**/
public MyFacesTreeService()
{
- System.out.println("MyFacesTreeService constructor ....");
- // empty
+ log.debug("MyFacesTreeService constructeur ...");
}
// MyFacesTreeService implementation ----------------------
@@ -87,8 +86,10 @@
* @return Returns the report list associated with a node.
*/
public ArrayList getReportList(String in_path) {
- ArrayList result;
- result = new ArrayList(((HashMap)reportsLists.get(in_path)).values() );
+ ArrayList result = null;
+ if(reportsLists.get(in_path) != null) {
+ result = new ArrayList(((HashMap)reportsLists.get(in_path)).values() );
+ }
return result;
}
@@ -204,6 +205,8 @@
list.put(in_report_info.getReport().getReport_name(), in_report_info);
reportsLists.put(in_report_info.getReport().getReport_path(), list);
}
+
+ log.debug("reportList map : " + reportsLists);
reportsCounter++;
log.debug("Add report, tree is now containing : " + reportsCounter + " reports");
@@ -335,9 +338,5 @@
reportsCounter = reportsCounter - removed_count;
log.debug("Removed archive containing " + removed_count + " reports, tree is now containing : " + reportsCounter + " reports");
}
-
-
-
-
}
}
\ No newline at end of file
Added: labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/java/org/jboss/reporting/managedbean/ExplorerDataBean.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/java/org/jboss/reporting/managedbean/ExplorerDataBean.java 2006-10-26 15:31:39 UTC (rev 7147)
+++ labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/java/org/jboss/reporting/managedbean/ExplorerDataBean.java 2006-10-26 16:59:52 UTC (rev 7148)
@@ -0,0 +1,57 @@
+package org.jboss.reporting.managedbean;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.custom.tree.model.TreeModel;
+
+public class ExplorerDataBean {
+
+ private static final Log logger = LogFactory.getLog(ExplorerDataBean.class);
+
+ private TreeModel treeModel;
+
+ private Long treeModelVersion = null;
+
+ private MBeanServerConnection server;
+
+ public ExplorerDataBean() {
+ try {
+ server = (MBeanServerConnection) new InitialContext()
+ .lookup("jmx/invoker/RMIAdaptor");
+ logger.debug("server jmx connection initialized");
+ } catch (NamingException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * @return the treeModel
+ */
+ public Object getTreeModel() {
+ try {
+ // check if we have the lastest data for the treeModel
+ Long lastestTreeModelVersion = (Long) server
+ .getAttribute(new ObjectName(
+ "reporting:service=ReportsTree,type=MyFaces"),
+ new String("Tree_version_id"));
+
+ if (treeModelVersion == null
+ || lastestTreeModelVersion.longValue() > treeModelVersion
+ .longValue()) {
+ treeModelVersion = lastestTreeModelVersion;
+ treeModel = (TreeModel) server.getAttribute(new ObjectName(
+ "reporting:service=ReportsTree,type=MyFaces"), "Tree");
+ logger.debug("treeModel relaoded / version : " + treeModelVersion);
+ }
+ } catch (Exception e) {
+ throw new IllegalStateException("error getting treeModel (cause : " + e + ")");
+ }
+
+ return treeModel;
+ }
+}
Modified: labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/java/org/jboss/reporting/ui/reportlist/ReportList.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/java/org/jboss/reporting/ui/reportlist/ReportList.java 2006-10-26 15:31:39 UTC (rev 7147)
+++ labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/java/org/jboss/reporting/ui/reportlist/ReportList.java 2006-10-26 16:59:52 UTC (rev 7148)
@@ -8,124 +8,126 @@
package org.jboss.reporting.ui.reportlist;
import java.util.ArrayList;
+
+import javax.faces.context.FacesContext;
+import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.naming.InitialContext;
-import org.apache.myfaces.custom.tree.event.*;
-import org.apache.myfaces.custom.tree.model.*;
-import javax.faces.context.FacesContext;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
+
+import org.apache.myfaces.custom.tree.event.TreeSelectionEvent;
+import org.apache.myfaces.custom.tree.event.TreeSelectionListener;
import org.jboss.logging.Logger;
/**
- *
+ *
* @author noel.rocher at jboss.org
* @version $Revision: 1.0 $
*
* @since 07-October-2004
*/
-public class ReportList implements TreeSelectionListener
-{
- // provide logging
- private final Logger log = Logger.getLogger(ReportList.class);
- ArrayList reports=null;
- String jndi_path="reports";
- String sort="jndi_name";
- boolean ascending=true;
- long id=0L;
- RMIAdaptor server;
+public class ReportList implements TreeSelectionListener {
+ // provide logging
+ private final Logger log = Logger.getLogger(ReportList.class);
- public ReportList()
- {
- id=System.currentTimeMillis();
- try
- {
- server = (RMIAdaptor)(new InitialContext()).lookup("jmx/invoker/RMIAdaptor");
- refreshList();
- }
- catch (Exception e)
- {
- log.error(e);
- }
- }
-
+ ArrayList reports = null;
- private void refreshList()
- {
- try
- {
- String[] sig = {"java.lang.String"};
- Object[] opArgs = {jndi_path};
- reports = (ArrayList)server.invoke(new ObjectName("reporting:service=ReportsTree,type=MyFaces"), "getReportList", opArgs, sig);
- }
- catch (Exception e)
- {
- log.error(e);
- }
- }
-
- public void valueChanged(TreeSelectionEvent event)
- {
- String path = event.getNewSelectionPath().toString();
- path=path.substring(1,path.length());
- path=path.substring(0, path.length()-1);
- path=path.replaceAll(", ","/");
- jndi_path=path;
- refreshList();
- FacesContext.getCurrentInstance().getExternalContext().getSessionMap().put("reportlist",this);
- FacesContext.getCurrentInstance().renderResponse();
-
-
- }
+ String jndi_path = "reports";
-
-
+ String sort = "jndi_name";
+
+ boolean ascending = true;
+
+ long id = 0L;
+
+ MBeanServerConnection server;
+
+ public ReportList() {
+ id = System.currentTimeMillis();
+ try {
+ server = (MBeanServerConnection) (new InitialContext())
+ .lookup("jmx/invoker/RMIAdaptor");
+ refreshList();
+ } catch (Exception e) {
+ log.error(e);
+ }
+ }
+
+ private void refreshList() {
+ try {
+ String[] sig = { "java.lang.String" };
+ Object[] opArgs = { jndi_path };
+ log.debug("server cnx : " + server);
+ reports = (ArrayList) server.invoke(new ObjectName(
+ "reporting:service=ReportsTree,type=MyFaces"),
+ "getReportList", opArgs, sig);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error(e);
+ }
+ }
+
+ public void valueChanged(TreeSelectionEvent event) {
+ log.debug("valueChanged ....");
+ String path = event.getNewSelectionPath().toString();
+ path = path.substring(1, path.length());
+ path = path.substring(0, path.length() - 1);
+ path = path.replaceAll(", ", "/");
+ jndi_path = path;
+ refreshList();
+ FacesContext.getCurrentInstance().getExternalContext().getSessionMap()
+ .put("reportlist", this);
+ FacesContext.getCurrentInstance().renderResponse();
+
+ }
+
/**
* @return Returns the reports.
*/
public ArrayList getReports() {
- return reports;
+ return reports;
}
+
/**
- * @param reports The reports to set.
- */
- public void setReports(ArrayList reports) {
- this.reports = reports;
- }
- /**
* @return Returns the jndi_path.
*/
public String getJndi_path() {
- return jndi_path;
+ return jndi_path;
}
+
/**
* @return Returns the ascending.
*/
public boolean isAscending() {
- return ascending;
+ return ascending;
}
+
/**
- * @param ascending The ascending to set.
+ * @param ascending
+ * The ascending to set.
*/
public void setAscending(boolean ascending) {
- this.ascending = ascending;
+ this.ascending = ascending;
}
+
/**
* @return Returns the sort.
*/
public String getSort() {
- return sort;
+ return sort;
}
+
/**
- * @param sort The sort to set.
+ * @param sort
+ * The sort to set.
*/
public void setSort(String sort) {
- this.sort = sort;
+ this.sort = sort;
}
-/**
- * @return Returns the id.
- */
-public long getId() {
- return id;
-}
+ /**
+ * @return Returns the id.
+ */
+ public long getId() {
+ return id;
+ }
}
\ No newline at end of file
Modified: labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/webapp/WEB-INF/faces-config.xml 2006-10-26 15:31:39 UTC (rev 7147)
+++ labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/webapp/WEB-INF/faces-config.xml 2006-10-26 16:59:52 UTC (rev 7148)
@@ -9,19 +9,26 @@
<!--
| Managed Beans
-->
-
+
+ <managed-bean>
+ <managed-bean-name>explorerData</managed-bean-name>
+ <managed-bean-class>org.jboss.reporting.managedbean.ExplorerDataBean</managed-bean-class>
+ <managed-bean-scope>application</managed-bean-scope>
+ </managed-bean>
+
<managed-bean>
<managed-bean-name>reportlist</managed-bean-name>
<managed-bean-class>org.jboss.reporting.ui.reportlist.ReportList</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
-
+
+ <!--
<managed-bean>
<managed-bean-name>reportscheduleform</managed-bean-name>
<managed-bean-class>org.jboss.reporting.ui.ReportScheduleForm</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
-
+ -->
<!--
| Navigation Rules
Modified: labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/webapp/WEB-INF/web.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/webapp/WEB-INF/web.xml 2006-10-26 15:31:39 UTC (rev 7147)
+++ labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/webapp/WEB-INF/web.xml 2006-10-26 16:59:52 UTC (rev 7148)
@@ -118,6 +118,10 @@
<filter-name>extensionsFilter</filter-name>
<url-pattern>*.jsf</url-pattern>
</filter-mapping>
+ <filter-mapping>
+ <filter-name>extensionsFilter</filter-name>
+ <url-pattern>/faces/*</url-pattern>
+ </filter-mapping>
<!-- Listener, that does all the startup work (configuration, init). -->
@@ -139,6 +143,10 @@
<servlet-name>Faces Servlet</servlet-name>
<url-pattern>*.jsf</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>/faces/*</url-pattern>
+ </servlet-mapping>
<taglib>
<taglib-uri>http://myfaces.apache.org/extensions</taglib-uri>
Deleted: labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/webapp/images/Thumbs.db
===================================================================
(Binary files differ)
Modified: labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/webapp/report/list.jsp
===================================================================
--- labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/webapp/report/list.jsp 2006-10-26 15:31:39 UTC (rev 7147)
+++ labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/webapp/report/list.jsp 2006-10-26 16:59:52 UTC (rev 7148)
@@ -3,64 +3,58 @@
<%@ taglib uri="http://myfaces.apache.org/extensions" prefix="x"%>
+<x:dataTable id="reportlist"
+ styleClass="standardTable"
+ headerClass="standardTable_SortHeader"
+ footerClass="standardTable_Footer"
+ rowClasses="standardTable_Row1,standardTable_Row2"
+ var="reportinfo"
+ value="#{reportlist.reports}"
+ sortColumn="#{reportlist.sort}"
+ sortAscending="#{reportlist.ascending}"
+ preserveDataModel="true"
+ preserveSort="true">
- <x:dataTable id="reportlist"
- styleClass="standardTable"
- headerClass="standardTable_SortHeader"
- footerClass="standardTable_Footer"
- rowClasses="standardTable_Row1,standardTable_Row2"
- var="reportinfo"
- value="#{reportlist.reports}"
- sortColumn="#{reportlist.sort}"
- sortAscending="#{reportlist.ascending}"
- preserveDataModel="true"
- preserveSort="true">
+ <f:facet name="header">
+ <h:outputText value="List from /#{reportlist.jndi_path}" />
+ </f:facet>
- <f:facet name="header">
- <h:outputText value="List from /#{reportlist.jndi_path}" />
- </f:facet>
+ <h:column>
+ <f:facet name="header">
+ <x:commandSortHeader columnName="color" arrow="true">
+ <h:outputText value="Jndi Name" />
+ </x:commandSortHeader>
+ </f:facet>
+ <h:outputText value="#{reportinfo.report.report_name}" />
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <x:commandSortHeader columnName="color" arrow="true">
+ <h:outputText value="from File" />
+ </x:commandSortHeader>
+ </f:facet>
+ <h:outputText value="#{reportinfo.file.name}" />
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <x:commandSortHeader columnName="size" arrow="true">
+ <h:outputText value="File Size" />
+ </x:commandSortHeader>
+ </f:facet>
+ <h:outputText value="#{reportinfo.fileSize}"/>
+ </h:column>
- <h:column>
- <f:facet name="header">
- <x:commandSortHeader columnName="color" arrow="true">
- <h:outputText value="Jndi Name" />
- </x:commandSortHeader>
- </f:facet>
- <h:outputText value="#{reportinfo.report.report_name}" />
- </h:column>
-
- <h:column>
- <f:facet name="header">
- <x:commandSortHeader columnName="color" arrow="true">
- <h:outputText value="from File" />
- </x:commandSortHeader>
- </f:facet>
- <h:outputText value="#{reportinfo.file.name}" />
- </h:column>
- <h:column>
- <f:facet name="header">
- <x:commandSortHeader columnName="size" arrow="true">
- <h:outputText value="File Size" />
- </x:commandSortHeader>
- </f:facet>
- <h:outputText value="#{reportinfo.fileSize}"/>
- </h:column>
-
- <h:column>
- <f:facet name="header">
- <x:commandSortHeader columnName="size" arrow="true">
- <h:outputText value="Last Modification" />
- </x:commandSortHeader>
- </f:facet>
- <h:outputText value="#{reportinfo.fileLastModified}">
- <f:convertDateTime dateStyle="short" />
- </h:outputText>
- </h:column>
-
-
- </x:dataTable>
-
-
+ <h:column>
+ <f:facet name="header">
+ <x:commandSortHeader columnName="size" arrow="true">
+ <h:outputText value="Last Modification" />
+ </x:commandSortHeader>
+ </f:facet>
+ <h:outputText value="#{reportinfo.fileLastModified}">
+ <f:convertDateTime dateStyle="short" />
+ </h:outputText>
+ </h:column>
+</x:dataTable>
\ No newline at end of file
Modified: labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/webapp/report/tree.jsp
===================================================================
--- labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/webapp/report/tree.jsp 2006-10-26 15:31:39 UTC (rev 7147)
+++ labs/reportingservices/trunk/dev/modules/adminconsole/webadminconsole/src/main/webapp/report/tree.jsp 2006-10-26 16:59:52 UTC (rev 7148)
@@ -1,40 +1,12 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://myfaces.apache.org/extensions" prefix="x"%>
-<%@ page import="javax.naming.InitialContext,javax.management.ObjectName,
- org.jboss.jmx.adaptor.rmi.RMIAdaptor"%>
-
-
-
-<%
-
- RMIAdaptor server = (RMIAdaptor)(new InitialContext()).lookup("jmx/invoker/RMIAdaptor");
- Long tree_version_id = (Long)pageContext.getAttribute("tree_version_id", PageContext.SESSION_SCOPE);
- if ( tree_version_id == null)
- {
- tree_version_id = (Long)server.getAttribute(new ObjectName("reporting:service=ReportsTree,type=MyFaces"), new String("Tree_version_id"));
- Object tree = server.getAttribute(new ObjectName("reporting:service=ReportsTree,type=MyFaces"), new String("Tree"));
- pageContext.setAttribute("treeModel", tree , PageContext.SESSION_SCOPE);
- pageContext.setAttribute("tree_version_id", tree_version_id , PageContext.SESSION_SCOPE);
- }
- else
- {
- Long new_tree_version_id = (Long)server.getAttribute(new ObjectName("reporting:service=ReportsTree,type=MyFaces"), new String("Tree_version_id"));
- if ( ((Long)new_tree_version_id).longValue() > tree_version_id.longValue() )
- {
- Object tree = server.getAttribute(new ObjectName("reporting:service=ReportsTree,type=MyFaces"), new String("Tree"));
- pageContext.setAttribute("treeModel", tree , PageContext.SESSION_SCOPE);
- pageContext.setAttribute("tree_version_id", new_tree_version_id , PageContext.SESSION_SCOPE);
- }
- }
-%>
-
-
- <x:tree id="tree" value="#{treeModel}"
- styleClass="tree"
- nodeClass="treenode"
- selectedNodeClass="treenodeSelected"
- expandRoot="true" >
- <x:treeSelectionListener type="org.jboss.reporting.ui.reportlist.ReportList" />
- </x:tree>
-
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://myfaces.apache.org/extensions" prefix="x"%>
+
+
+<x:tree id="tree" value="#{explorerData.treeModel}" styleClass="tree"
+ nodeClass="treenode" selectedNodeClass="treenodeSelected"
+ expandRoot="true">
+ <x:treeSelectionListener
+ type="org.jboss.reporting.ui.reportlist.ReportList" />
+</x:tree>
+
More information about the jboss-svn-commits
mailing list