[jboss-svn-commits] JBL Code SVN: r6474 - in labs/reportingservices: tags/reportingservices_0_1_preview/src/tests/org/jboss/test/reporting/simple/jfreereport trunk trunk/dev trunk/dev/distribs/deployer trunk/dev/distribs/sar trunk/dev/distribs/sar/src/main/resources/META-INF trunk/dev/modules trunk/dev/modules/engine trunk/dev/modules/engine/jasperreports trunk/dev/modules/engine/jasperreports/src trunk/dev/modules/engine/jasperreports/src/main trunk/dev/modules/engine/jasperreports/src/main/java trunk/dev/modules/engine/jasperreports/src/main/java/org trunk/dev/modules/engine/jasperreports/src/main/java/org/jboss trunk/dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting trunk/dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting/engine trunk/dev/modules/engine/jfreereport trunk/dev/modules/engine/jfreereport/src trunk/dev/modules/engine/jfreereport/src/main trunk/dev/modules/engine/jfreereport/src/main/java trunk/dev/modules/engine/jfreereport/src/main/jav! a/org trunk/dev/modules/engine/jfreereport/src/main/java/org/jboss trunk/dev/modules/engine/jfreereport/src/main/java/org/jboss/reporting trunk/dev/modules/engine/jfreereport/src/main/java/org/jboss/reporting/engine trunk/dev/modules/server/api/src/main/java/org/jboss/reporting/server trunk/dev/modules/server/api/src/main/java/org/jboss/reporting/server/scheduler trunk/dev/modules/server/impl trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/request trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/scheduler trunk/dev/modules/webadminconsole trunk/dev/modules/webadminconsole/src/main/java/org/jboss/reporting trunk/dev/modules/webadminconsole/src/main/java/org/jboss/reporting/servlet trunk/dev/modules/webadminconsole/src/mai! n/java/org/jboss/reporting/ui trunk/dev/modules/webadminconsole/src/main/java/org/jboss/reporting/ui/reporttree trunk/dev/modules/webadminconsole/src/main/resources trunk/dev/modules/webadminconsole/src/main/webapp trunk/dev/modules/webadminconsole/src/main/webapp/WEB-INF trunk/dev/modules/webadminconsole/src/main/webapp/inc
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Sep 30 13:34:35 EDT 2006
Author: cyril.joui at supinfo.com
Date: 2006-09-30 13:33:01 -0400 (Sat, 30 Sep 2006)
New Revision: 6474
Added:
labs/reportingservices/trunk/dev/modules/engine/
labs/reportingservices/trunk/dev/modules/engine/jasperreports/
labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/
labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/main/
labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/main/java/
labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/main/java/org/
labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/main/java/org/jboss/
labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting/
labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting/engine/
labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting/engine/JasperReports.java
labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting/engine/JasperReportsMBean.java
labs/reportingservices/trunk/dev/modules/engine/jfreereport/
labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/
labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/
labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/java/
labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/java/org/
labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/java/org/jboss/
labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/java/org/jboss/reporting/
labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/java/org/jboss/reporting/engine/
labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/java/org/jboss/reporting/engine/JFreeReport.java
labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/java/org/jboss/reporting/engine/JFreeReportMBean.java
labs/reportingservices/trunk/dev/modules/server/api/src/main/java/org/jboss/reporting/server/ReportInfo.java
labs/reportingservices/trunk/dev/modules/server/api/src/main/java/org/jboss/reporting/server/scheduler/
labs/reportingservices/trunk/dev/modules/server/api/src/main/java/org/jboss/reporting/server/scheduler/ScheduleInfo.java
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/java/org/jboss/reporting/servlet/
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/java/org/jboss/reporting/ui/
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/java/org/jboss/reporting/ui/ReportScheduleForm.java
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/java/org/jboss/reporting/ui/reportlist/
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/java/org/jboss/reporting/ui/reporttree/
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/resources/messages.properties
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/WEB-INF/faces-config.xml
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/WEB-INF/jboss-web.xml
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/explorer.jsp
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/include/
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/include/head.inc
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/include/navigation.jsp
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/include/page_footer.jsp
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/include/page_header.jsp
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/index.jsp
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/execute_now.jsp
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/list.jsp
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/schedule.jsp
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/schedule_tab_delivery.jsp
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/schedule_tab_schedule_params.jsp
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/tree.jsp
Removed:
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/ReportInfo.java
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/JFreeReport.java
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/JFreeReportMBean.java
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/JasperReports.java
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/JasperReportsMBean.java
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/scheduler/ScheduleInfo.java
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/ui/
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/java/org/jboss/reporting/servlet/JasperReportServlet.java
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/java/org/jboss/reporting/ui/ReportScheduleForm.java
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/java/org/jboss/reporting/ui/reportlist/
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/java/org/jboss/reporting/ui/reporttree/
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/include/head.inc
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/include/navigation.jsp
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/include/page_footer.jsp
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/include/page_header.jsp
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/execute_now.jsp
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/list.jsp
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/schedule.jsp
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/schedule_tab_delivery.jsp
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/schedule_tab_schedule_params.jsp
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/tree.jsp
labs/reportingservices/trunk/src/main/org/jboss/reporting/servlet/
labs/reportingservices/trunk/src/resources/messages.properties
labs/reportingservices/trunk/src/webapp/WEB-INF/faces-config.xml
labs/reportingservices/trunk/src/webapp/WEB-INF/jboss-web.xml
labs/reportingservices/trunk/src/webapp/explorer.jsp
labs/reportingservices/trunk/src/webapp/include/
labs/reportingservices/trunk/src/webapp/index.jsp
labs/reportingservices/trunk/src/webapp/report/
Modified:
labs/reportingservices/tags/reportingservices_0_1_preview/src/tests/org/jboss/test/reporting/simple/jfreereport/SampleData3.java
labs/reportingservices/trunk/dev/distribs/deployer/pom.xml
labs/reportingservices/trunk/dev/distribs/sar/pom.xml
labs/reportingservices/trunk/dev/distribs/sar/src/main/resources/META-INF/jboss-service.xml
labs/reportingservices/trunk/dev/modules/pom.xml
labs/reportingservices/trunk/dev/modules/server/impl/pom.xml
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/request/ReportRequestProcessor.java
labs/reportingservices/trunk/dev/modules/webadminconsole/pom.xml
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/java/org/jboss/reporting/ui/reporttree/MyFacesTreeService.java
labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/WEB-INF/web.xml
labs/reportingservices/trunk/dev/pom.xml
labs/reportingservices/trunk/pom.xml
Log:
Refactoring :
- Engines
- Deployers
TODO : tests
Modified: labs/reportingservices/tags/reportingservices_0_1_preview/src/tests/org/jboss/test/reporting/simple/jfreereport/SampleData3.java
===================================================================
--- labs/reportingservices/tags/reportingservices_0_1_preview/src/tests/org/jboss/test/reporting/simple/jfreereport/SampleData3.java 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/reportingservices/tags/reportingservices_0_1_preview/src/tests/org/jboss/test/reporting/simple/jfreereport/SampleData3.java 2006-09-30 17:33:01 UTC (rev 6474)
@@ -29,7 +29,7 @@
* $Id: SampleData3.java,v 1.7 2005/02/23 21:04:39 taqua Exp $
*
*/
-package org.jboss.test.reporting.simple.jfreereport;
+package org.jboss.reporting.client.impl.jfreereport;
import java.io.Serializable;
Modified: labs/reportingservices/trunk/dev/distribs/deployer/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/distribs/deployer/pom.xml 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/reportingservices/trunk/dev/distribs/deployer/pom.xml 2006-09-30 17:33:01 UTC (rev 6474)
@@ -26,6 +26,9 @@
<configuration>
<tasks>
<delete dir="${JBOSS_HOME}/server/${jboss4x.config}/deploy/reporting-services.sar" />
+ <!-- look for a sar packaging ... -->
+ <move toFile="../sar/target/reporting-services-sar.dir/engine-jasperreports-0.2-SNAPSHOT.sar" file="../sar/target/reporting-services-sar.dir/engine-jasperreports-0.2-SNAPSHOT.jar"/>
+ <move toFile="../sar/target/reporting-services-sar.dir/engine-jfreereport-0.2-SNAPSHOT.sar" file="../sar/target/reporting-services-sar.dir/engine-jfreereport-0.2-SNAPSHOT.jar"/>
<copy todir="${JBOSS_HOME}/server/${jboss4x.config}/deploy/reporting-services.sar">
<fileset dir="../sar/target/reporting-services-sar.dir" includes="**/*" excludes="**/sar*.jar" />
</copy>
Modified: labs/reportingservices/trunk/dev/distribs/sar/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/distribs/sar/pom.xml 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/reportingservices/trunk/dev/distribs/sar/pom.xml 2006-09-30 17:33:01 UTC (rev 6474)
@@ -44,11 +44,25 @@
<artifactId>server-impl</artifactId>
<type>jar</type>
</dependency>
+
+ <!-- console admin -->
<dependency>
<groupId>jboss.reportingservices</groupId>
<artifactId>webadminconsole</artifactId>
<type>war</type>
</dependency>
+
+ <!-- engines -->
+ <dependency>
+ <groupId>jboss.reportingservices</groupId>
+ <artifactId>engine-jasperreports</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>jboss.reportingservices</groupId>
+ <artifactId>engine-jfreereport</artifactId>
+ <type>jar</type>
+ </dependency>
</dependencies>
Modified: labs/reportingservices/trunk/dev/distribs/sar/src/main/resources/META-INF/jboss-service.xml
===================================================================
--- labs/reportingservices/trunk/dev/distribs/sar/src/main/resources/META-INF/jboss-service.xml 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/reportingservices/trunk/dev/distribs/sar/src/main/resources/META-INF/jboss-service.xml 2006-09-30 17:33:01 UTC (rev 6474)
@@ -136,27 +136,10 @@
</mbean>
- <!-- TREE : it's a ListenerServiceMBean -->
- <mbean code="org.jboss.reporting.ui.reporttree.MyFacesTreeService"
- name="reporting:service=ReportsTree,type=MyFaces">
- <attribute name="SubscriptionList">
- <subscription-list>
- <!-- all reports deployers (could be other than jasperreports) are able to notify the tree -->
- <mbean name="reporting:service=ReportsDeployer,*">
- <notification type="org.jboss.reporting.deployer.add"/>
- <notification type="org.jboss.reporting.deployer.remove"/>
- <notification type="org.jboss.reporting.deployer.remove.archive"/>
- </mbean>
- </subscription-list>
- </attribute>
- </mbean>
-
-
-
<!--
| ENGINES : type= should correspond to the file extension of reports files .
| It's used by the Deployer to build the right engine ObjectName
- -->
+
<mbean code="org.jboss.reporting.server.engine.JasperReports"
name="reporting:service=ReportEngine,type=JRXML">
<attribute name="JasperReportsJar">jasperreports-0.6.8.jar</attribute>
@@ -164,7 +147,7 @@
<mbean code="org.jboss.reporting.server.engine.JFreeReport"
name="reporting:service=ReportEngine,type=JFXML">
</mbean>
-
+-->
<mbean code="org.jboss.reporting.server.engine.ReportEngine"
name="reporting:service=ReportEngine,type=generic">
<depends optional-attribute-name="ReportRepository">reporting:service=ReportRepository</depends>
Copied: labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting/engine/JasperReports.java (from rev 6469, labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/JasperReports.java)
Copied: labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting/engine/JasperReportsMBean.java (from rev 6469, labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/JasperReportsMBean.java)
Copied: labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/java/org/jboss/reporting/engine/JFreeReport.java (from rev 6469, labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/JFreeReport.java)
===================================================================
--- labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/JFreeReport.java 2006-09-29 14:11:47 UTC (rev 6469)
+++ labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/java/org/jboss/reporting/engine/JFreeReport.java 2006-09-30 17:33:01 UTC (rev 6474)
@@ -0,0 +1,196 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.reporting.server.engine;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.sql.Connection;
+import java.util.Calendar;
+import java.util.Map;
+
+import javax.naming.InitialContext;
+import javax.sql.DataSource;
+import javax.swing.table.TableModel;
+
+import org.jboss.logging.Logger;
+import org.jboss.mx.util.MBeanProxyExt;
+import org.jboss.reporting.api.ReportData;
+import org.jboss.system.ServiceMBeanSupport;
+import org.jboss.system.server.ServerConfigImplMBean;
+import org.jfree.report.EmptyReportException;
+import org.jfree.report.ReportProcessingException;
+import org.jfree.report.modules.output.pageable.base.PageableReportProcessor;
+import org.jfree.report.modules.output.pageable.pdf.PDFOutputTarget;
+import org.jfree.report.modules.parser.base.ReportGenerator;
+
+
+/**
+ *
+ * @author noel.rocher at jboss.org
+ * @version $Revision: 1.0 $
+ *
+ *
+ * @jmx:mbean
+ * description="JFreeReport Engine"
+ * name="reporting:service=ReportEngine,type=JFXML"
+ * extends="org.jboss.system.ServiceMBean"
+ *
+ */
+public class JFreeReport extends ServiceMBeanSupport
+implements JFreeReportMBean, ReportEngineModule
+{
+ // provide logging
+ private final Logger log = Logger.getLogger(JFreeReport.class);
+
+ // tmp dir name for jasper to work
+ private final String JF_TEMP_DIR_NAME = "jfreereport";
+ // temp dir
+ private File jfTempDir=null;
+
+ // default separator
+ private final static String DEFAULT_SEPARATOR=",";
+
+ // report generator
+ final ReportGenerator generator = ReportGenerator.getInstance();
+
+
+
+ /** @jmx:managed-operation */
+ public Object compileReport(InputStream in_stream) throws Exception
+ {
+ org.jfree.report.JFreeReport report=null;
+ File file=null;
+ try
+ {
+ // there is no parseReport method with InputStream arg in JFreeReport APIs
+ // create a file in temp and give it as arg to the parse method
+ // TODO: optimized process should detect when input stream is already
+ // a file and not a zipEntry to use it directly
+ file=new File(jfTempDir, "jfreereport-"+Calendar.getInstance().getTimeInMillis());
+ BufferedOutputStream out = new BufferedOutputStream( new FileOutputStream(file));
+ BufferedInputStream in = new BufferedInputStream(in_stream);
+ int b=0;
+ while ( (b = in.read()) >= 0)
+ {
+ out.write(b);
+ }
+ in.close();
+ out.close();
+ report = generator.parseReport(file);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ log.error("JFreeReport compileReport failed", e);
+ throw new Exception("JFreeReport compileReport failed",e);
+ }
+ finally
+ {
+ if (file != null && file.exists())
+ {
+ file.delete();
+ }
+ }
+ return report;
+ }
+
+
+ /*
+ * --- run to PDF set of methods
+ */
+
+
+ /** @jmx:managed-operation */
+ public byte[] runReportToPdf(String in_reportName, Object in_report, Map in_parameters, String in_datasource_jndi_name) throws Exception
+ {
+ Exception e = new Exception("Datasource is unsupported by JFreeReport APIs. Report name = " + in_reportName);
+ log.error("JFreeReport runReport failed", e);
+ throw e;
+ }
+
+ /** @jmx:managed-operation
+ * a really bad implementation
+ * TODO: refactor ReportEngineModule interface to allow the best choice when
+ * finally a file is necessary (scheduled reports)
+ */
+ public byte[] runReportToPdf(String in_reportName, Object in_report, Map in_parameters, ReportData in_data) throws Exception
+ {
+ byte[] result=null;
+ File file=null;
+
+ try
+ {
+ file=new File(jfTempDir,in_reportName.replaceAll("/","_")+"-"+Calendar.getInstance().getTimeInMillis());
+ BufferedOutputStream out = new BufferedOutputStream( new FileOutputStream( file ) );
+ org.jfree.report.JFreeReport report = (org.jfree.report.JFreeReport)in_report;
+ report.setData( (TableModel)in_data );
+ PageableReportProcessor processor = new PageableReportProcessor(report);
+ PDFOutputTarget target = new PDFOutputTarget(out);
+ target.configure(report.getReportConfiguration());
+ target.open();
+ processor.setOutputTarget( target );
+ processor.processReport();
+ target.close();
+ BufferedInputStream in = new BufferedInputStream( new FileInputStream(file));
+ ByteArrayOutputStream outBao = new ByteArrayOutputStream();
+ int b=0;
+ while ( (b = in.read()) >= 0)
+ {
+ outBao.write(b);
+ }
+ in.close();
+ out.close();
+ result = outBao.toByteArray();
+ }
+ catch (Exception e)
+ {
+ log.error("JFreeReport runReportToPdf error for report \"" + in_reportName + "\".",e);
+ throw e;
+ }
+ finally
+ {
+ if (file != null && file.exists())
+ {
+ file.delete();
+ }
+ }
+
+
+ return result;
+ }
+
+
+
+
+ /**
+ * Configure required properties from server config info
+ */
+ public void startService() throws Exception
+ {
+ File home_dir=null;
+ File temp_dir=null;
+ String classpath="";
+
+ ServerConfigImplMBean serverConfig = (ServerConfigImplMBean)
+ MBeanProxyExt.create(ServerConfigImplMBean.class,
+ ServerConfigImplMBean.OBJECT_NAME, server);
+ home_dir = serverConfig.getServerHomeDir();
+ temp_dir = serverConfig.getServerTempDir();
+ jfTempDir = new File(temp_dir,JF_TEMP_DIR_NAME);
+ if ( ! jfTempDir.exists()) jfTempDir.mkdir();
+ }
+
+
+}
\ No newline at end of file
Copied: labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/java/org/jboss/reporting/engine/JFreeReportMBean.java (from rev 6469, labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/JFreeReportMBean.java)
Modified: labs/reportingservices/trunk/dev/modules/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/pom.xml 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/reportingservices/trunk/dev/modules/pom.xml 2006-09-30 17:33:01 UTC (rev 6474)
@@ -18,6 +18,7 @@
<module>common</module>
<module>client</module>
<module>server</module>
+ <module>engine</module>
<module>webadminconsole</module>
</modules>
Copied: labs/reportingservices/trunk/dev/modules/server/api/src/main/java/org/jboss/reporting/server/ReportInfo.java (from rev 6469, labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/ReportInfo.java)
Copied: labs/reportingservices/trunk/dev/modules/server/api/src/main/java/org/jboss/reporting/server/scheduler/ScheduleInfo.java (from rev 6469, labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/scheduler/ScheduleInfo.java)
Modified: labs/reportingservices/trunk/dev/modules/server/impl/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/server/impl/pom.xml 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/reportingservices/trunk/dev/modules/server/impl/pom.xml 2006-09-30 17:33:01 UTC (rev 6474)
@@ -58,10 +58,6 @@
</dependency>
<dependency>
<groupId>jboss</groupId>
- <artifactId>jmx-adaptor-plugin</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
<artifactId>jboss-j2ee</artifactId>
</dependency>
<dependency>
@@ -94,19 +90,5 @@
<groupId>jasperreports</groupId>
<artifactId>jasperreports</artifactId>
</dependency>
-
- <dependency>
- <groupId>myfaces</groupId>
- <artifactId>tomahawk</artifactId>
- <version>1.1.3</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>1.1.2</version>
- <scope>provided</scope>
- </dependency>
-
</dependencies>
</project>
\ No newline at end of file
Deleted: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/ReportInfo.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/ReportInfo.java 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/ReportInfo.java 2006-09-30 17:33:01 UTC (rev 6474)
@@ -1,72 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-*
-* Distributable under LGPL license.
-* See terms of license at gnu.org.
-*/
-package org.jboss.reporting.server;
-
-import org.jboss.logging.Logger;
-import org.jboss.reporting.api.Report;
-
-import java.io.Serializable;
-import java.io.File;
-import java.text.DateFormat;
-import java.util.Map;
-import javax.management.ObjectName;
-
-/**
- * Contains a Report plus some more info
- *
- * @version <tt>$Revision: 1.0 $</tt>
- * @author <a href="mailto:noel.rocher at jboss.org">Noel Rocher</a>
- */
-public class ReportInfo extends Object implements Serializable
-{
- private static final long serialVersionUID = -8459757864666101421L;
- private static Logger log = Logger.getLogger(ReportInfo.class);
-
- /** the file from which the report is deployed (xxx.jrxml or archive) */
- private File file;
-
- private Report report;
-
-/**
- * @return Returns the file.
- */
-public File getFile() {
- return file;
-}
-/**
- * @param file The file to set.
- */
-public void setFile(File file) {
- this.file = file;
-}
-
-/**
- * @return Returns the file's size.
- */
-public long getFileSize() {
- return file.length();
-}
-
-/**
- * @return Returns the file's last Modified.
- */
-public long getFileLastModified() {
- return file.lastModified();
-}
-
-public Report getReport()
-{
- return report;
-}
-public void setReport(Report report)
-{
- this.report = report;
-}
-
-
-
-}
Deleted: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/JFreeReport.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/JFreeReport.java 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/JFreeReport.java 2006-09-30 17:33:01 UTC (rev 6474)
@@ -1,200 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.reporting.server.engine;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.sql.Connection;
-import java.util.Calendar;
-import java.util.Map;
-
-import javax.naming.InitialContext;
-import javax.sql.DataSource;
-import javax.swing.table.TableModel;
-
-import net.sf.jasperreports.engine.JREmptyDataSource;
-import net.sf.jasperreports.engine.JasperReport;
-import net.sf.jasperreports.engine.JasperRunManager;
-
-import org.jboss.logging.Logger;
-import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.reporting.api.ReportData;
-import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerConfigImplMBean;
-import org.jfree.report.EmptyReportException;
-import org.jfree.report.ReportProcessingException;
-import org.jfree.report.modules.output.pageable.base.PageableReportProcessor;
-import org.jfree.report.modules.output.pageable.pdf.PDFOutputTarget;
-import org.jfree.report.modules.parser.base.ReportGenerator;
-
-
-/**
- *
- * @author noel.rocher at jboss.org
- * @version $Revision: 1.0 $
- *
- *
- * @jmx:mbean
- * description="JFreeReport Engine"
- * name="reporting:service=ReportEngine,type=JFXML"
- * extends="org.jboss.system.ServiceMBean"
- *
- */
-public class JFreeReport extends ServiceMBeanSupport
-implements JFreeReportMBean, ReportEngineModule
-{
- // provide logging
- private final Logger log = Logger.getLogger(JFreeReport.class);
-
- // tmp dir name for jasper to work
- private final String JF_TEMP_DIR_NAME = "jfreereport";
- // temp dir
- private File jfTempDir=null;
-
- // default separator
- private final static String DEFAULT_SEPARATOR=",";
-
- // report generator
- final ReportGenerator generator = ReportGenerator.getInstance();
-
-
-
- /** @jmx:managed-operation */
- public Object compileReport(InputStream in_stream) throws Exception
- {
- org.jfree.report.JFreeReport report=null;
- File file=null;
- try
- {
- // there is no parseReport method with InputStream arg in JFreeReport APIs
- // create a file in temp and give it as arg to the parse method
- // TODO: optimized process should detect when input stream is already
- // a file and not a zipEntry to use it directly
- file=new File(jfTempDir, "jfreereport-"+Calendar.getInstance().getTimeInMillis());
- BufferedOutputStream out = new BufferedOutputStream( new FileOutputStream(file));
- BufferedInputStream in = new BufferedInputStream(in_stream);
- int b=0;
- while ( (b = in.read()) >= 0)
- {
- out.write(b);
- }
- in.close();
- out.close();
- report = generator.parseReport(file);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- log.error("JFreeReport compileReport failed", e);
- throw new Exception("JFreeReport compileReport failed",e);
- }
- finally
- {
- if (file != null && file.exists())
- {
- file.delete();
- }
- }
- return report;
- }
-
-
- /*
- * --- run to PDF set of methods
- */
-
-
- /** @jmx:managed-operation */
- public byte[] runReportToPdf(String in_reportName, Object in_report, Map in_parameters, String in_datasource_jndi_name) throws Exception
- {
- Exception e = new Exception("Datasource is unsupported by JFreeReport APIs. Report name = " + in_reportName);
- log.error("JFreeReport runReport failed", e);
- throw e;
- }
-
- /** @jmx:managed-operation
- * a really bad implementation
- * TODO: refactor ReportEngineModule interface to allow the best choice when
- * finally a file is necessary (scheduled reports)
- */
- public byte[] runReportToPdf(String in_reportName, Object in_report, Map in_parameters, ReportData in_data) throws Exception
- {
- byte[] result=null;
- File file=null;
-
- try
- {
- file=new File(jfTempDir,in_reportName.replaceAll("/","_")+"-"+Calendar.getInstance().getTimeInMillis());
- BufferedOutputStream out = new BufferedOutputStream( new FileOutputStream( file ) );
- org.jfree.report.JFreeReport report = (org.jfree.report.JFreeReport)in_report;
- report.setData( (TableModel)in_data );
- PageableReportProcessor processor = new PageableReportProcessor(report);
- PDFOutputTarget target = new PDFOutputTarget(out);
- target.configure(report.getReportConfiguration());
- target.open();
- processor.setOutputTarget( target );
- processor.processReport();
- target.close();
- BufferedInputStream in = new BufferedInputStream( new FileInputStream(file));
- ByteArrayOutputStream outBao = new ByteArrayOutputStream();
- int b=0;
- while ( (b = in.read()) >= 0)
- {
- outBao.write(b);
- }
- in.close();
- out.close();
- result = outBao.toByteArray();
- }
- catch (Exception e)
- {
- log.error("JFreeReport runReportToPdf error for report \"" + in_reportName + "\".",e);
- throw e;
- }
- finally
- {
- if (file != null && file.exists())
- {
- file.delete();
- }
- }
-
-
- return result;
- }
-
-
-
-
- /**
- * Configure required properties from server config info
- */
- public void startService() throws Exception
- {
- File home_dir=null;
- File temp_dir=null;
- String classpath="";
-
- ServerConfigImplMBean serverConfig = (ServerConfigImplMBean)
- MBeanProxyExt.create(ServerConfigImplMBean.class,
- ServerConfigImplMBean.OBJECT_NAME, server);
- home_dir = serverConfig.getServerHomeDir();
- temp_dir = serverConfig.getServerTempDir();
- jfTempDir = new File(temp_dir,JF_TEMP_DIR_NAME);
- if ( ! jfTempDir.exists()) jfTempDir.mkdir();
- }
-
-
-}
\ No newline at end of file
Deleted: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/JFreeReportMBean.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/JFreeReportMBean.java 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/JFreeReportMBean.java 2006-09-30 17:33:01 UTC (rev 6474)
@@ -1,20 +0,0 @@
-/*
- * Generated file - Do not edit!
- */
-package org.jboss.reporting.server.engine;
-
-/**
- * MBean interface.
- */
-public interface JFreeReportMBean extends org.jboss.system.ServiceMBean {
-
- //default object name
- public static final javax.management.ObjectName OBJECT_NAME = org.jboss.mx.util.ObjectNameFactory.create("reporting:service=ReportEngine,type=JFXML");
-
- java.lang.Object compileReport(java.io.InputStream in_stream) throws java.lang.Exception;
-
- byte[] runReportToPdf(java.lang.String in_reportName,java.lang.Object in_report,java.util.Map in_parameters,java.lang.String in_datasource_jndi_name) throws java.lang.Exception;
-
- byte[] runReportToPdf(java.lang.String in_reportName,java.lang.Object in_report,java.util.Map in_parameters,org.jboss.reporting.api.ReportData in_data) throws java.lang.Exception;
-
-}
Deleted: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/JasperReports.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/JasperReports.java 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/JasperReports.java 2006-09-30 17:33:01 UTC (rev 6474)
@@ -1,473 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.reporting.server.engine;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.sql.Connection;
-import java.util.Map;
-
-import javax.naming.InitialContext;
-import javax.sql.DataSource;
-
-import net.sf.jasperreports.engine.JRDataSource;
-import net.sf.jasperreports.engine.JREmptyDataSource;
-import net.sf.jasperreports.engine.JasperCompileManager;
-import net.sf.jasperreports.engine.JasperFillManager;
-import net.sf.jasperreports.engine.JasperPrintManager;
-import net.sf.jasperreports.engine.JasperReport;
-import net.sf.jasperreports.engine.JasperRunManager;
-import net.sf.jasperreports.engine.data.JRTableModelDataSource;
-import net.sf.jasperreports.view.JasperViewer;
-
-import org.jboss.logging.Logger;
-import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.reporting.api.ReportData;
-import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerConfigImplMBean;
-
-
-/**
- *
- * @author noel.rocher at jboss.org
- * @version $Revision: 1.0 $
- *
- *
- * @jmx:mbean
- * description="JasperReports Engine"
- * name="reporting:service=ReportEngine,type=JRXML"
- * extends="org.jboss.system.ServiceMBean"
- *
- * @since 07-October-2004
- */
-public class JasperReports extends ServiceMBeanSupport
-implements JasperReportsMBean, ReportEngineModule
-{
- // provide logging
- private final Logger log = Logger.getLogger(JasperReports.class);
-
- // tmp dir name for jasper to work
- private final String JR_TEMP_DIR_NAME = "jasperreports";
-
- // default separator
- private final static String DEFAULT_SEPARATOR=",";
-
- // jasperreports jar file name
- private String jasperReportsJar="";
-
-
- /** @jmx:managed-attribute */
- public String getJasperReportsJar()
- {
- return jasperReportsJar;
- }
-
-
- /** @jmx:managed-attribute */
- public void setJasperReportsJar(String jasperReportsJar)
- {
- this.jasperReportsJar = jasperReportsJar;
- }
-
-
- /** @jmx:managed-operation */
- public Object compileReport(InputStream in_stream) throws Exception
- {
- JasperReport report=null;
- try{
- report = JasperCompileManager.compileReport(in_stream);
- }
- catch (Exception e){e.printStackTrace();log.error("JasperReport compileReport failed", e);}
- return report;
- }
-
-
- /*
- * --- run to PDF set of methods
- */
-
-
- /** @jmx:managed-operation */
- public byte[] runReportToPdf(String in_reportName, Object in_report, Map in_parameters, String in_datasource_jndi_name) throws Exception
- {
- byte[] jr_result=null;
- JasperReport report=(JasperReport)in_report;
- JREmptyDataSource empty_datasource = new JREmptyDataSource();
- Connection conn=null;
- InitialContext ctx = null;
-
- try{
- ctx = new InitialContext();
-
- // report
- log.info("runToPDF : report name = "+ in_reportName + ", datasource = " + in_datasource_jndi_name);
-
- // datasource
- if (in_datasource_jndi_name != null && in_datasource_jndi_name.length() > 0)
- {
- if (in_datasource_jndi_name.startsWith("java:/") == false)in_datasource_jndi_name = "java:/"+in_datasource_jndi_name;
- try{
- conn = ((DataSource)ctx.lookup(in_datasource_jndi_name)).getConnection();
- }
- catch (Exception dse)
- {
- log.error(dse.getMessage());
- }
- }
-
- if (conn == null)
- {
- jr_result = JasperRunManager.runReportToPdf(report, in_parameters, empty_datasource);
- }
- else
- {
- jr_result = JasperRunManager.runReportToPdf(report, in_parameters, conn);
- }
- log.info("runToPDF : report length = " + jr_result.length);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- log.error("JasperReport runReport failed", e);
- throw e;
- }
- return jr_result;
-
- }
-
-
-
-
-
-
- /** @jmx:managed-operation */
- public byte[] runReportToPdf(String in_reportName, Object in_report, Map in_parameters, ReportData in_data) throws Exception
- {
- byte[] jr_result=null;
- try
- {
- JasperReport report=(JasperReport)in_report;
- JRDataSource data = new JRTableModelDataSource( in_data );
- jr_result = JasperRunManager.runReportToPdf(report, in_parameters, data);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- log.error("JasperReport runReport failed", e);
- throw e;
- }
- return jr_result;
- }
-
-
-
-
-
-
- /** @jmx:managed-operation
- * description = "run to PDF, Parameters: jndi_name, Parameters as a string of key value pairs, separator string, datasource_jndi_name. Leave blank if nothing"
- *
- * parameters should be provided as a string with key=value pairs separated by
- * a "separator" (nothing means comma)
- */
- public byte[] runReportToPdf(String in_report_jndi_name, String in_parameters, String in_separator, String in_datasource_jndi_name)
- {
- Map parameters=null;
- String separator = DEFAULT_SEPARATOR;
- String[] splitted = null;
- String[] key_value = null;
-
- log.info("runToPDF : report = " + in_report_jndi_name + ", params = " + in_parameters + ", separator = " + in_separator + ", DS = " + in_datasource_jndi_name);
-
-
- if (in_separator != null && in_separator.trim().length() > 0)
- {
- separator = in_separator.trim();
- }
-
- if (in_parameters != null && in_parameters.trim().length() > 0)
- {
- splitted = in_parameters.trim().split(separator);
- parameters = new java.util.HashMap(splitted.length);
-
- for (int i=0 ; i < splitted.length ; i++)
- {
- key_value = splitted[i].split("=");
- parameters.put(key_value[0], key_value[0]);
- }
- }
- return runReportToPdf(in_report_jndi_name, parameters, in_datasource_jndi_name);
- }
-
- /** @jmx:managed-operation
- * description = "Run a report and return it as PDF"
- */
- public byte[] runReportToPdf(String in_report_jndi_name, Map in_parameters, String in_datasource_jndi_name)
- {
- ByteArrayOutputStream result=null;
- byte[] jr_result=null;
- JasperReport report;
- Map final_map;
- JREmptyDataSource empty_datasource = new JREmptyDataSource();
- Connection conn=null;
- InitialContext ctx = null;
-
- try{
- ctx = new InitialContext();
-
- // report
- log.info(">>> looking for report with jndi name = "+in_report_jndi_name);
- report = (JasperReport)ctx.lookup(in_report_jndi_name);
-
- // parameters
- final_map = in_parameters;
-
- // datasource
- if (in_datasource_jndi_name != null && in_datasource_jndi_name.length() > 0)
- {
- if (in_datasource_jndi_name.startsWith("java:/") == false)in_datasource_jndi_name = "java:/"+in_datasource_jndi_name;
- try{
- conn = ((DataSource)ctx.lookup(in_datasource_jndi_name)).getConnection();
- }
- catch (Exception dse)
- {
- log.error(dse.getMessage());
- }
- }
-
- report = (JasperReport)(new InitialContext()).lookup(in_report_jndi_name);
- log.info("runToPDF : report = " + in_report_jndi_name + ", DS = " + in_datasource_jndi_name);
- if (conn == null)
- {
- jr_result = JasperRunManager.runReportToPdf(report, final_map, empty_datasource);
- }
- else
- {
- jr_result = JasperRunManager.runReportToPdf(report, final_map, conn);
- }
- log.info("runToPDF : report length = " + jr_result.length);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- log.error("JasperReport runReport failed", e);
- }
- return jr_result;
- }
-
-
-
- /*
- * --- print report on printer set of methods
- */
-
-
- /** @jmx:managed-operation
- * description = "print a report, Parameters: jndi_name, Parameters as a string of key value pairs, separator string, datasource_jndi_name. Leave blank if nothing"
- *
- * parameters should be provided as a string with key=value pairs separated by
- * a "separator" (nothing means comma)
- */
- public void printReport(String in_report_jndi_name, String in_parameters, String in_separator, String in_datasource_jndi_name)
- {
- Map parameters=null;
- String separator = DEFAULT_SEPARATOR;
- String[] splitted = null;
- String[] key_value = null;
- if (in_separator != null && in_separator.trim().length() > 0)
- {
- separator = in_separator.trim();
- }
-
- if (in_parameters != null && in_parameters.trim().length() > 0)
- {
- splitted = in_parameters.trim().split(separator);
- parameters = new java.util.HashMap(splitted.length);
-
- for (int i=0 ; i < splitted.length ; i++)
- {
- key_value = splitted[i].split("=");
- parameters.put(key_value[0], key_value[0]);
- }
- }
- printReport(in_report_jndi_name, parameters, in_datasource_jndi_name);
- }
-
- /** @jmx:managed-operation
- * description = "print a report on a printer"
- */
- public void printReport(String in_report_jndi_name, Map in_parameters, String in_datasource_jndi_name)
- {
- JasperReport report;
- Map final_map;
- JREmptyDataSource empty_datasource = new JREmptyDataSource();
- Connection final_conn;
- Connection conn=null;
- InitialContext ctx = null;
-
- try{
- ctx = new InitialContext();
-
- // report
- report = (JasperReport)ctx.lookup(in_report_jndi_name);
-
- // parameters
- final_map = in_parameters;
-
- // datasource
- if (in_datasource_jndi_name != null && in_datasource_jndi_name.length() > 0)
- {
- try{
- conn = ((DataSource)ctx.lookup(in_datasource_jndi_name)).getConnection();
- }catch (Exception dse){log.error(dse.getMessage());}
- }
- final_conn = conn;
-
- report = (JasperReport)(new InitialContext()).lookup(in_report_jndi_name);
- JasperPrintManager.printReport( JasperFillManager.fillReport(report, final_map, final_conn) , false );
- }
- catch (Exception e){e.printStackTrace();log.error("JasperReport runReport failed", e);}
- }
-
-
-
-
-
-
-
-
-
-
-
- /*
- * --- view reports (JRViewer) set of methods
- */
-
-
- /** @jmx:managed-operation
- * description = "JRViewer, Parameters: jndi_name, Parameters as a string of key value pairs, separator string, datasource_jndi_name. Leave blank if nothing"
- *
- * parameters should be provided as a string with key=value pairs separated by
- * a "separator" (nothing means comma)
- */
- public void viewReport(String in_report_jndi_name, String in_parameters, String in_separator, String in_datasource_jndi_name)
- {
- Map parameters=null;
- String separator = DEFAULT_SEPARATOR;
- String[] splitted = null;
- String[] key_value = null;
- if (in_separator != null && in_separator.trim().length() > 0)
- {
- separator = in_separator.trim();
- }
-
- if (in_parameters != null && in_parameters.trim().length() > 0)
- {
- splitted = in_parameters.trim().split(separator);
- parameters = new java.util.HashMap(splitted.length);
-
- for (int i=0 ; i < splitted.length ; i++)
- {
- key_value = splitted[i].split("=");
- parameters.put(key_value[0], key_value[0]);
- }
- }
- viewReport(in_report_jndi_name, parameters, in_datasource_jndi_name);
- }
-
- /** @jmx:managed-operation
- * description = "Launch JRViewer"
- */
- public void viewReport(String in_report_jndi_name, Map in_parameters, String in_datasource_jndi_name)
- {
- final JasperReport report;
- final Map final_map;
- final JREmptyDataSource empty_datasource = new JREmptyDataSource();
- final Connection final_conn;
- Connection conn=null;
- InitialContext ctx = null;
-
- try{
- ctx = new InitialContext();
-
- // report
- report = (JasperReport)ctx.lookup(in_report_jndi_name);
-
- // parameters
- final_map = in_parameters;
-
- // datasource
- if (in_datasource_jndi_name != null && in_datasource_jndi_name.length() > 0)
- {
- try{
- conn = ((DataSource)ctx.lookup(in_datasource_jndi_name)).getConnection();
- }catch (Exception dse){log.error(dse.getMessage());}
- }
- final_conn = conn;
-
- // ========================
- // Start ReportViewer in new thread
- new Thread()
- {
- public void run()
- {
- JasperViewer viewer;
- try
- {
- if (final_conn == null)
- {
- viewer = new JasperViewer( JasperFillManager.fillReport(report, final_map, empty_datasource) ,false);
- }
- else
- {
- viewer = new JasperViewer( JasperFillManager.fillReport(report, final_map, final_conn) ,false);
- }
- viewer.setVisible(true);
- }
- catch (Exception e)
- {
- log.info("Failed to start Report Viewer", e);
- }
- }
- }.start();
-
- // ========================
- }
- catch (Exception e){e.printStackTrace();log.error("JasperReport viewReport failed", e);}
- }
-
-
-
-
- /**
- * Configure required properties from server config info
- */
- public void startService() throws Exception
- {
- File home_dir=null;
- File temp_dir=null;
- File jr_temp_dir=null;
- String classpath="";
-
- ServerConfigImplMBean serverConfig = (ServerConfigImplMBean)
- MBeanProxyExt.create(ServerConfigImplMBean.class,
- ServerConfigImplMBean.OBJECT_NAME, server);
- home_dir = serverConfig.getServerHomeDir();
- temp_dir = serverConfig.getServerTempDir();
- jr_temp_dir = new File(temp_dir,JR_TEMP_DIR_NAME);
- if ( ! jr_temp_dir.exists()) jr_temp_dir.mkdir();
- classpath = home_dir.getAbsolutePath() + "/deploy/reporting-services.sar/" + getJasperReportsJar();
- classpath = classpath + ";" + home_dir.getAbsolutePath() + "/deploy/reporting-services.sar/fonts";
-
- System.setProperty("jasper.reports.compile.class.path", classpath );
- System.setProperty("jasper.reports.compile.temp", jr_temp_dir.getAbsolutePath());
- }
-
-
-}
\ No newline at end of file
Deleted: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/JasperReportsMBean.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/JasperReportsMBean.java 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/JasperReportsMBean.java 2006-09-30 17:33:01 UTC (rev 6474)
@@ -1,37 +0,0 @@
-/*
- * Generated file - Do not edit!
- */
-package org.jboss.reporting.server.engine;
-
-/**
- * MBean interface.
- * @since 07-October-2004
- */
-public interface JasperReportsMBean extends org.jboss.system.ServiceMBean {
-
- //default object name
- public static final javax.management.ObjectName OBJECT_NAME = org.jboss.mx.util.ObjectNameFactory.create("reporting:service=ReportEngine,type=JRXML");
-
- java.lang.String getJasperReportsJar() ;
-
- void setJasperReportsJar(java.lang.String jasperReportsJar) ;
-
- java.lang.Object compileReport(java.io.InputStream in_stream) throws java.lang.Exception;
-
- byte[] runReportToPdf(java.lang.String in_reportName,java.lang.Object in_report,java.util.Map in_parameters,java.lang.String in_datasource_jndi_name) throws java.lang.Exception;
-
- byte[] runReportToPdf(java.lang.String in_reportName,java.lang.Object in_report,java.util.Map in_parameters,org.jboss.reporting.api.ReportData in_data) throws java.lang.Exception;
-
- byte[] runReportToPdf(java.lang.String in_report_jndi_name,java.lang.String in_parameters,java.lang.String in_separator,java.lang.String in_datasource_jndi_name) ;
-
- byte[] runReportToPdf(java.lang.String in_report_jndi_name,java.util.Map in_parameters,java.lang.String in_datasource_jndi_name) ;
-
- void printReport(java.lang.String in_report_jndi_name,java.lang.String in_parameters,java.lang.String in_separator,java.lang.String in_datasource_jndi_name) ;
-
- void printReport(java.lang.String in_report_jndi_name,java.util.Map in_parameters,java.lang.String in_datasource_jndi_name) ;
-
- void viewReport(java.lang.String in_report_jndi_name,java.lang.String in_parameters,java.lang.String in_separator,java.lang.String in_datasource_jndi_name) ;
-
- void viewReport(java.lang.String in_report_jndi_name,java.util.Map in_parameters,java.lang.String in_datasource_jndi_name) ;
-
-}
Modified: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/request/ReportRequestProcessor.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/request/ReportRequestProcessor.java 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/request/ReportRequestProcessor.java 2006-09-30 17:33:01 UTC (rev 6474)
@@ -19,7 +19,6 @@
import org.jboss.reporting.api.distribute.*;
import org.jboss.reporting.api.output.*;
import org.jboss.reporting.api.schedule.*;
-import org.jboss.reporting.server.engine.JasperReportsMBean;
import org.jboss.reporting.server.engine.ReportEngine;
import org.jboss.reporting.server.engine.ReportEngineMBean;
import org.jboss.reporting.server.remoting.ReportRequestHandler;
Deleted: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/scheduler/ScheduleInfo.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/scheduler/ScheduleInfo.java 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/scheduler/ScheduleInfo.java 2006-09-30 17:33:01 UTC (rev 6474)
@@ -1,305 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-*
-* Distributable under LGPL license.
-* See terms of license at gnu.org.
-*/
-package org.jboss.reporting.server.scheduler;
-
-import org.jboss.logging.Logger;
-
-import java.io.Serializable;
-import java.io.File;
-import java.text.DateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Map;
-import javax.management.ObjectName;
-
-import org.jboss.reporting.server.ReportInfo;
-
-/**
- * Contains info on the Report execution schedule
- *
- * @version <tt>$Revision: 1.0 $</tt>
- * @author <a href="mailto:noel.rocher at jboss.org">Noel Rocher</a>
- */
-public class ScheduleInfo extends Object implements Serializable
-{
- private static Logger log = Logger.getLogger(ScheduleInfo.class);
-
- /** this schedule ID
- * It will be set up by the scheduler service when creating the timer.
- * Will be useful for cancelling it
- */
- private String scheduleId="";
-
- /**
- * simple optional string to trace which user scheduled the report execution
- */
- private String userInfo="";
-
- /** the report to execute */
- private ReportInfo report;
-
- /** when the process should start,
- * when already passed, the process is launched */
- private Date start_date;
-
- /** period */
- private long periode=0;
-
- /** to calculate the periode: number * unit */
- private int periode_number=0;
- private int periode_unit=0;
- public final static long PERIODE_ONCE=0;
- public final static long PERIODE_MINUTE=1;
- public final static long PERIODE_HOUR=2;
- public final static long PERIODE_DAY=3;
- public final static long PERIODE_WEEK=4;
- public final static long PERIODE_MONTH=5;
-
- /**
- * valid days list : if periode unit <= DAY, we will test
- * if the current day is in this list.
- * Default : not the we
- */
- private int[] valid_days={Calendar.MONDAY,
- Calendar.TUESDAY,
- Calendar.WEDNESDAY,
- Calendar.THURSDAY,
- Calendar.FRIDAY};
-
- /* delivery info */
- /** output format */
- private int output_format=1;
- public final static int FORMAT_PDF=1;
- public final static int FORMAT_HTML=2;
- public final static int FORMAT_TXT=3;
- public final static int FORMAT_CSV=4;
- public final static int FORMAT_XML=5;
- public final static int FORMAT_XLS=6;
-
-
- /** delivery mean */
- private int delivery_by=1;
- public final static int BY_RESPONSE=1;
- public final static int BY_EMAIL=2;
-
- /** mail address */
- private String delivery_email="";
-
-
-
- public ScheduleInfo()
- {
- start_date = Calendar.getInstance().getTime();
- periode = 0;
- output_format = FORMAT_PDF;
- delivery_by=BY_RESPONSE;
- delivery_email="xx at xxx.xx";
- }
-
-
-
- /* --- accessors --- */
- /**
- * @return Returns the delivery_by.
- */
- public int getDelivery_by() {
- return delivery_by;
- }
- public String getDelivery_by_string() {
- return ""+delivery_by;
- }
- /**
- * @param delivery_by The delivery_by to set.
- */
- public void setDelivery_by(int delivery_by) {
- this.delivery_by = delivery_by;
- }
- public void setDelivery_by_string(String delivery_by) {
- this.delivery_by = new Integer(delivery_by).intValue();
- }
- /**
- * @return Returns the delivery_email.
- */
- public String getDelivery_email() {
- return delivery_email;
- }
- /**
- * @param delivery_email The delivery_email to set.
- */
- public void setDelivery_email(String delivery_email) {
- this.delivery_email = delivery_email;
- }
- /**
- * @return Returns the output_format.
- */
- public int getOutput_format() {
- return output_format;
- }
- /**
- * @param output_format The output_format to set.
- */
- public void setOutput_format(int output_format) {
- this.output_format = output_format;
- }
- /**
- * @return Returns the periode.
- */
- public long getPeriode() {
- return periode;
- }
- /**
- * @param periode The periode to set.
- */
- public void setPeriode(long periode) {
- this.periode = periode;
- }
- /**
- * @return Returns the report.
- */
- public ReportInfo getReport() {
- return report;
- }
- /**
- * @param report The report to set.
- */
- public void setReport(ReportInfo report) {
- this.report = report;
- }
- /**
- * @return Returns the start_date.
- */
- public Date getStart_date() {
- return start_date;
- }
- /**
- * @param start_date The start_date to set.
- */
- public void setStart_date(Date start_date) {
- this.start_date = start_date;
- }
-
- public int getBY_EMAIL() {
- return BY_EMAIL;
- }
- public int getBY_RESPONSE() {
- return BY_RESPONSE;
- }
- public int getFORMAT_CSV() {
- return FORMAT_CSV;
- }
- public int getFORMAT_HTML() {
- return FORMAT_HTML;
- }
- public int getFORMAT_PDF() {
- return FORMAT_PDF;
- }
- public int getFORMAT_TXT() {
- return FORMAT_TXT;
- }
- public int getFORMAT_XLS() {
- return FORMAT_XLS;
- }
- public int getFORMAT_XML() {
- return FORMAT_XML;
- }
-/**
- * @return Returns the periode_number.
- */
-public int getPeriode_number() {
- return periode_number;
-}
-/**
- * @param periode_number The periode_number to set.
- */
-public void setPeriode_number(int periode_number) {
- this.periode_number = periode_number;
-}
-/**
- * @return Returns the periode_unit.
- */
-public int getPeriode_unit() {
- return periode_unit;
-}
-/**
- * @param periode_unit The periode_unit to set.
- */
-public void setPeriode_unit(int periode_unit) {
- this.periode_unit = periode_unit;
-}
-/**
- * @return Returns the scheduleId.
- */
-public String getScheduleId() {
- return scheduleId;
-}
-/**
- * @param scheduleId The scheduleId to set.
- */
-public void setScheduleId(String scheduleId) {
- this.scheduleId = scheduleId;
-}
-/**
- * @return Returns the valid_days.
- */
-public int[] getValid_days() {
- return valid_days;
-}
-/**
- * @param valid_days The valid_days to set.
- */
-public void setValid_days(int[] valid_days) {
- this.valid_days = valid_days;
-}
-/**
- * @return Returns the pERIODE_DAY.
- */
-public static long getPERIODE_DAY() {
- return PERIODE_DAY;
-}
-/**
- * @return Returns the pERIODE_HOUR.
- */
-public static long getPERIODE_HOUR() {
- return PERIODE_HOUR;
-}
-/**
- * @return Returns the pERIODE_MINUTE.
- */
-public static long getPERIODE_MINUTE() {
- return PERIODE_MINUTE;
-}
-/**
- * @return Returns the pERIODE_MONTH.
- */
-public static long getPERIODE_MONTH() {
- return PERIODE_MONTH;
-}
-/**
- * @return Returns the pERIODE_ONCE.
- */
-public static long getPERIODE_ONCE() {
- return PERIODE_ONCE;
-}
-/**
- * @return Returns the pERIODE_WEEK.
- */
-public static long getPERIODE_WEEK() {
- return PERIODE_WEEK;
-}
- /**
- * @return Returns the userInfo.
- */
- public String getUserInfo() {
- return userInfo;
- }
- /**
- * @param userInfo The userInfo to set.
- */
- public void setUserInfo(String userInfo) {
- this.userInfo = userInfo;
- }
-}
Modified: labs/reportingservices/trunk/dev/modules/webadminconsole/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/webadminconsole/pom.xml 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/reportingservices/trunk/dev/modules/webadminconsole/pom.xml 2006-09-30 17:33:01 UTC (rev 6474)
@@ -19,13 +19,58 @@
<dependency>
<groupId>jboss.reportingservices</groupId>
<artifactId>client-api</artifactId>
+ <scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>jboss.reportingservices</groupId>
+ <artifactId>server-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- external dependencies -->
<dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-system</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jmx-adaptor-plugin</artifactId>
+ </dependency>
+
+ <!-- UI : JSF -->
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- TODO: UnComment theses lines -->
+ <!--
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ </dependency>
+ -->
+
+ <dependency>
<groupId>myfaces</groupId>
<artifactId>tomahawk</artifactId>
<version>1.1.1</version>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+
+
</dependencies>
</project>
\ No newline at end of file
Copied: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/java/org/jboss/reporting/servlet (from rev 6469, labs/reportingservices/trunk/src/main/org/jboss/reporting/servlet)
Deleted: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/java/org/jboss/reporting/servlet/JasperReportServlet.java
===================================================================
--- labs/reportingservices/trunk/src/main/org/jboss/reporting/servlet/JasperReportServlet.java 2006-09-29 14:11:47 UTC (rev 6469)
+++ labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/java/org/jboss/reporting/servlet/JasperReportServlet.java 2006-09-30 17:33:01 UTC (rev 6474)
@@ -1,101 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.reporting.servlet;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanException;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import javax.management.ReflectionException;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
-
-/**
- * <description>
- *
- * @author <a href="mailto:noel.rocher at jboss.org">Noel Rocher</a>.
- */
-public class JasperReportServlet
- extends javax.servlet.http.HttpServlet
-{
-
- // Constants -----------------------------------------------------
-
-
- // Attributes ----------------------------------------------------
-
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
-
- // Z implementation ----------------------------------------------
-
- // HttpServlet overrides -----------------------------------------
- public void service(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException
- {
-
-
- try {
- RMIAdaptor server = (RMIAdaptor)(new InitialContext()).lookup("jmx/invoker/RMIAdaptor");
- response.setContentType("application/pdf");
- byte[] result = (byte[]) server.invoke(new ObjectName("reporting:service=ReportEngine,type=JRXML"),
- "runReportToPdf",
- new Object[]{request.getParameter("report"), "","",request.getParameter("datasource")},
- new String[]{String.class.getName(), String.class.getName(), String.class.getName(), String.class.getName()});
-
-
- System.out.println(">>>>> JRServlet result length = " + result.length);
- java.io.OutputStream out = response.getOutputStream();
- out.write(result);
- out.flush();
- } catch (InstanceNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (MalformedObjectNameException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (MBeanException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (ReflectionException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (NullPointerException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (NamingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
-}
Copied: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/java/org/jboss/reporting/ui (from rev 6469, labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/ui)
Deleted: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/java/org/jboss/reporting/ui/ReportScheduleForm.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/ui/ReportScheduleForm.java 2006-09-29 14:11:47 UTC (rev 6469)
+++ labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/java/org/jboss/reporting/ui/ReportScheduleForm.java 2006-09-30 17:33:01 UTC (rev 6474)
@@ -1,58 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.reporting.ui;
-
-import java.io.Serializable;
-import javax.faces.event.ValueChangeEvent;
-import org.jboss.logging.Logger;
-import org.jboss.reporting.server.scheduler.ScheduleInfo;
-
-/**
- *
- * @author noel.rocher at jboss.org
- * @version $Revision: 1.0 $
- *
- * @since 07-October-2004
- */
-public class ReportScheduleForm extends Object implements Serializable
-{
- // provide logging
- private final Logger log = Logger.getLogger(ReportScheduleForm.class);
-
- private ScheduleInfo scheduleInfo;
-
- public ReportScheduleForm()
- {
- scheduleInfo = new ScheduleInfo();
- }
-
-
- public void delivery_by_valueChanged(ValueChangeEvent e)
- {
- this.scheduleInfo.setDelivery_by_string((String)e.getNewValue());
- }
-
-
-
-
- /**
- * @return Returns the scheduleInfo.
- */
- public ScheduleInfo getScheduleInfo() {
- return scheduleInfo;
- }
- /**
- * @param scheduleInfo The scheduleInfo to set.
- */
- public void setScheduleInfo(ScheduleInfo scheduleInfo) {
- this.scheduleInfo = scheduleInfo;
- }
-
-
-
-}
\ No newline at end of file
Copied: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/java/org/jboss/reporting/ui/ReportScheduleForm.java (from rev 6473, labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/ui/ReportScheduleForm.java)
Copied: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/java/org/jboss/reporting/ui/reportlist (from rev 6473, labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/ui/reportlist)
Copied: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/java/org/jboss/reporting/ui/reporttree (from rev 6473, labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/ui/reporttree)
Modified: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/java/org/jboss/reporting/ui/reporttree/MyFacesTreeService.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/ui/reporttree/MyFacesTreeService.java 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/java/org/jboss/reporting/ui/reporttree/MyFacesTreeService.java 2006-09-30 17:33:01 UTC (rev 6474)
@@ -17,10 +17,8 @@
import org.jboss.logging.Logger;
import org.jboss.system.ListenerServiceMBeanSupport;
import org.jboss.reporting.server.ReportInfo;
-import org.jboss.reporting.server.deployer.AbstractReportDeployer;
-
/**
* A listener MBean for all ReportDeployer services
* Notified when a new report is deployed
@@ -54,7 +52,8 @@
* CTOR
**/
public MyFacesTreeService()
- {
+ {
+ System.out.println("MyFacesTreeService constructor ....");
// empty
}
@@ -131,13 +130,13 @@
log.trace("Got notification TYPE: " + notification.getType() );
- if (notification.getType().equalsIgnoreCase(AbstractReportDeployer.ADD_REPORT_NOTIFICATION))
+ if (notification.getType().equalsIgnoreCase("org.jboss.reporting.deployer.add"))
{
// add report
log.trace("Got notification ADD: Report JNDI Name = " + report_info.getReport().getReport_path() + "/" + report_info.getReport().getReport_name() );
addReport(report_info);
}
- else if (notification.getType().equalsIgnoreCase(AbstractReportDeployer.REMOVE_REPORT_NOTIFICATION))
+ else if (notification.getType().equalsIgnoreCase("org.jboss.reporting.deployer.remove"))
{
// remove report
log.trace("Got notification REMOVE: Report Name = " + report_info.getReport().getReport_path() + "/" + report_info.getReport().getReport_name());
@@ -341,8 +340,4 @@
}
-
-
-
-
}
\ No newline at end of file
Copied: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/resources/messages.properties (from rev 6469, labs/reportingservices/trunk/src/resources/messages.properties)
Copied: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/WEB-INF/faces-config.xml (from rev 6469, labs/reportingservices/trunk/src/webapp/WEB-INF/faces-config.xml)
Copied: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/WEB-INF/jboss-web.xml (from rev 6469, labs/reportingservices/trunk/src/webapp/WEB-INF/jboss-web.xml)
Modified: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/WEB-INF/web.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/WEB-INF/web.xml 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/WEB-INF/web.xml 2006-09-30 17:33:01 UTC (rev 6474)
@@ -1,8 +1,150 @@
<?xml version="1.0"?>
-<web-app
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
-</web-app>
+<web-app>
+
+ <context-param>
+ <param-name>javax.faces.CONFIG_FILES</param-name>
+ <param-value>
+ /WEB-INF/faces-config.xml
+ </param-value>
+ <description>
+ Comma separated list of URIs of (additional) faces config files.
+ (e.g. /WEB-INF/my-config.xml)
+ See JSF 1.0 PRD2, 10.3.2
+ </description>
+ </context-param>
+
+ <context-param>
+ <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+ <param-value>server</param-value>
+ <description>
+ State saving method: "client" or "server" (= default)
+ See JSF Specification 2.5.2
+ </description>
+ </context-param>
+
+ <context-param>
+ <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
+ <param-value>true</param-value>
+ <description>
+ This parameter tells MyFaces if javascript code should be allowed in the
+ rendered HTML output.
+ If javascript is allowed, command_link anchors will have javascript code
+ that submits the corresponding form.
+ If javascript is not allowed, the state saving info and nested parameters
+ will be added as url parameters.
+ Default: "true"
+ </description>
+ </context-param>
+
+ <context-param>
+ <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
+ <param-value>false</param-value>
+ <description>
+ This parameter tells MyFaces if javascript code should be allowed in the
+ rendered HTML output.
+ If javascript is allowed, command_link anchors will have javascript code
+ that submits the corresponding form.
+ If javascript is not allowed, the state saving info and nested parameters
+ will be added as url parameters.
+ Default: "false"
+
+ Setting this param to true should be combined with STATE_SAVING_METHOD "server" for
+ best results.
+
+ This is an EXPERIMENTAL feature. You also have to enable the detector filter/filter mapping below to get
+ JavaScript detection working.
+ </description>
+ </context-param>
+
+ <context-param>
+ <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
+ <param-value>true</param-value>
+ <description>
+ If true, rendered HTML code will be formatted, so that it is "human readable".
+ i.e. additional line separators and whitespace will be written, that do not
+ influence the HTML code.
+ Default: "true"
+ </description>
+ </context-param>
+
+ <context-param>
+ <param-name>org.apache.myfaces.AUTO_SCROLL</param-name>
+ <param-value>true</param-value>
+ <description>
+ If true, a javascript function will be rendered that is able to restore the
+ former vertical scroll on every request. Convenient feature if you have pages
+ with long lists and you do not want the browser page to always jump to the top
+ if you trigger a link or button action that stays on the same page.
+ Default: "false"
+ </description>
+ </context-param>
+
+ <!-- Extensions Filter -->
+ <filter>
+ <filter-name>extensionsFilter</filter-name>
+ <filter-class>org.apache.myfaces.component.html.util.ExtensionsFilter</filter-class>
+ <init-param>
+ <param-name>uploadMaxFileSize</param-name>
+ <param-value>100m</param-value>
+ <description>Set the size limit for uploaded files.
+ Format: 10 - 10 bytes
+ 10k - 10 KB
+ 10m - 10 MB
+ 1g - 1 GB
+ </description>
+ </init-param>
+ <init-param>
+ <param-name>uploadThresholdSize</param-name>
+ <param-value>100k</param-value>
+ <description>Set the threshold size - files
+ below this limit are stored in memory, files above
+ this limit are stored on disk.
+
+ Format: 10 - 10 bytes
+ 10k - 10 KB
+ 10m - 10 MB
+ 1g - 1 GB
+ </description>
+ </init-param>
+ </filter>
+
+
+ <!-- Filter Mappings -->
+ <filter-mapping>
+ <filter-name>extensionsFilter</filter-name>
+ <url-pattern>*.jsf</url-pattern>
+ </filter-mapping>
+
+
+ <!-- Listener, that does all the startup work (configuration, init). -->
+ <listener>
+ <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+ </listener>
+
+
+ <!-- Faces Servlet -->
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+
+ <!-- Faces Servlet Mapping -->
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+
+
+ <!-- Welcome files -->
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
+
+</web-app>
\ No newline at end of file
Copied: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/explorer.jsp (from rev 6469, labs/reportingservices/trunk/src/webapp/explorer.jsp)
Copied: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/include (from rev 6469, labs/reportingservices/trunk/src/webapp/include)
Deleted: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/include/head.inc
===================================================================
--- labs/reportingservices/trunk/src/webapp/include/head.inc 2006-09-29 14:11:47 UTC (rev 6469)
+++ labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/include/head.inc 2006-09-30 17:33:01 UTC (rev 6474)
@@ -1,15 +0,0 @@
-<head>
- <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
- <title>Reporting Services</title>
- <link rel="stylesheet" type="text/css" href="styles.css">
-
- <!-- JSCook Menu -->
- <script language="JavaScript" src="jscookmenu/JSCookMenu.js" type="text/javascript"></script>
- <script language="JavaScript" src="jscookmenu/jboss/theme.js"></script>
- <link rel="stylesheet" href="jscookmenu/jboss/theme.css" type="text/css">
-
-
- <!-- JSCalendar -->
- <script language="JavaScript" src="jscalendar/popcalendar.js" type="text/javascript"></script>
- <link rel="stylesheet" href="jscalendar/jboss/theme.css" type="text/css">
-</head>
Copied: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/include/head.inc (from rev 6473, labs/reportingservices/trunk/src/webapp/include/head.inc)
Deleted: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/include/navigation.jsp
===================================================================
--- labs/reportingservices/trunk/src/webapp/include/navigation.jsp 2006-09-29 14:11:47 UTC (rev 6469)
+++ labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/include/navigation.jsp 2006-09-30 17:33:01 UTC (rev 6474)
@@ -1,17 +0,0 @@
-<%@ 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:panelNavigation id="nav"
- styleClass="navigation"
- separatorClass="navseparator"
- itemClass="navitem"
- activeItemClass="navitem_active"
- openItemClass="navitem_open" >
- <x:commandNavigation id="nav_1" value="#{messages['nav.explorer']}" action="action.explorer.display" />
- <x:commandNavigation id="nav_2" value="#{messages['nav.scheduled']}" action="action.scheduled.display" />
- <f:verbatim> </f:verbatim>
- <x:commandNavigation id="nav_3" value="#{messages['nav.info']}" >
- <x:commandNavigation id="nav_3_1" value="#{messages['nav.contact']}" action="action.contact.display" />
- <x:commandNavigation id="nav_3_2" value="#{messages['nav.project']}" action="action.project.display" />
- </x:commandNavigation>
-</x:panelNavigation>
Copied: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/include/navigation.jsp (from rev 6473, labs/reportingservices/trunk/src/webapp/include/navigation.jsp)
Deleted: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/include/page_footer.jsp
===================================================================
--- labs/reportingservices/trunk/src/webapp/include/page_footer.jsp 2006-09-29 14:11:47 UTC (rev 6469)
+++ labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/include/page_footer.jsp 2006-09-30 17:33:01 UTC (rev 6474)
@@ -1,10 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
- <f:facet name="footer">
- <h:panelGroup id="footer">
- <f:verbatim>
- <a href="http://www.jboss.org" class="pageFooter">JBoss</a>
-
- </f:verbatim>
- </h:panelGroup>
- </f:facet>
Copied: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/include/page_footer.jsp (from rev 6473, labs/reportingservices/trunk/src/webapp/include/page_footer.jsp)
Deleted: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/include/page_header.jsp
===================================================================
--- labs/reportingservices/trunk/src/webapp/include/page_header.jsp 2006-09-29 14:11:47 UTC (rev 6469)
+++ labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/include/page_header.jsp 2006-09-30 17:33:01 UTC (rev 6474)
@@ -1,33 +0,0 @@
-<%@ 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"%>
-
-<h:panelGrid id="header_group1" columns="2" styleClass="pageHeader1" >
- <h:graphicImage id="logo" url="images/logo.jpg" alt="#{messages['common.project']}" />
- <f:verbatim>
-
- <font size="+1" color="#FFFFFF">Reporting Services</font>
- <font size="-1" color="#FFFFFF">(Version 0.1)</font>
- </f:verbatim>
-</h:panelGrid>
-
-<h:panelGrid id="header_group2" columns="1" styleClass="pageHeader2" columnClasses="pageHeader2col1" >
- <x:jscookMenu layout="hbr" theme="jboss" >
- <%/* if you want to use jscookMenu in your application, you will have to:
- - add jscookmenu directory to your web directory
- - add scripts and stylesheets to html-header (see inc/header.inc for details)
- availaible themes: ThemeIE, ThemeMiniBlack, ThemeOffice, ThemePanel
- layout: hbr, hbl, hur, hul, vbr, vbl, vur, vul
- respect to Heng Yuan http://www.cs.ucla.edu/~heng/JSCookMenu
- */%>
- <x:navigationMenuItem id="nav_1" itemLabel="#{messages['nav.explorer']}" action="action.explorer.display" />
- <x:navigationMenuItem id="nav_2" itemLabel="#{messages['nav.scheduled']}" action="action.scheduled.display"/>
- <f:verbatim> | </f:verbatim>
- <x:navigationMenuItem id="nav_3" itemLabel="#{messages['nav.info']}" >
- <x:navigationMenuItem id="nav_3_1" itemLabel="#{messages['nav.contact']}" action="action.contact.display" />
- <x:navigationMenuItem id="nav_3_2" itemLabel="#{messages['nav.project']}" action="action.project.display" />
- </x:navigationMenuItem>
-
- </x:jscookMenu>
-</h:panelGrid>
-
Copied: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/include/page_header.jsp (from rev 6473, labs/reportingservices/trunk/src/webapp/include/page_header.jsp)
Copied: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/index.jsp (from rev 6469, labs/reportingservices/trunk/src/webapp/index.jsp)
Copied: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report (from rev 6469, labs/reportingservices/trunk/src/webapp/report)
Deleted: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/execute_now.jsp
===================================================================
Copied: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/execute_now.jsp (from rev 6473, labs/reportingservices/trunk/src/webapp/report/execute_now.jsp)
Deleted: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/list.jsp
===================================================================
--- labs/reportingservices/trunk/src/webapp/report/list.jsp 2006-09-29 14:11:47 UTC (rev 6469)
+++ labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/list.jsp 2006-09-30 17:33:01 UTC (rev 6474)
@@ -1,66 +0,0 @@
-<%@ 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: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>
-
-
- <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.jndi_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>
-
-
Copied: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/list.jsp (from rev 6473, labs/reportingservices/trunk/src/webapp/report/list.jsp)
Deleted: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/schedule.jsp
===================================================================
--- labs/reportingservices/trunk/src/webapp/report/schedule.jsp 2006-09-29 14:11:47 UTC (rev 6469)
+++ labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/schedule.jsp 2006-09-30 17:33:01 UTC (rev 6474)
@@ -1,61 +0,0 @@
-<%@ 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="java.util.Date"%>
-<%@ page contentType="text/html;charset=iso-8859-1"%>
-<html>
-<%@include file="../include/head.inc" %>
-<body>
-
-<f:view>
- <f:loadBundle basename="messages" var="messages"/>
-
- <x:panelLayout id="page"
- styleClass="pageLayout"
- headerClass="pageHeader"
- navigationClass="pageNavigation"
- bodyClass="pageBody"
- footerClass="pageFooter" >
-
-
-
-
- <f:facet name="body">
-
- <h:form id="scheduleinfo" name="scheduleinfo">
-
- <x:panelTabbedPane bgcolor="#FFFFCC" >
- <x:panelTab id="tab_parms" label="Parameters" rendered="true">
- <h:inputText id="inp1"/><f:verbatim><br></f:verbatim>
- <h:inputText id="inp2" required="true" />
- </x:panelTab>
-
- <f:subview id="schedule_tab_delivery" >
- <jsp:include page="schedule_tab_delivery.jsp"/>
- </f:subview>
-
- <%/* <f:subview id="schedule_tab_schedule_params" >
- <jsp:include page="schedule_tab_schedule_params.jsp"/>
- </f:subview>
- */%>
-
- <f:verbatim><br></f:verbatim>
- <f:verbatim><br></f:verbatim>
- <f:verbatim><br></f:verbatim>
-
- <h:commandButton value="Go" />
-
- </x:panelTabbedPane>
- </h:form>
-
- </f:facet>
-
-
-
- </x:panelLayout>
-
-</f:view>
-
-</body>
-
-</html>
\ No newline at end of file
Copied: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/schedule.jsp (from rev 6473, labs/reportingservices/trunk/src/webapp/report/schedule.jsp)
Deleted: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/schedule_tab_delivery.jsp
===================================================================
--- labs/reportingservices/trunk/src/webapp/report/schedule_tab_delivery.jsp 2006-09-29 14:11:47 UTC (rev 6469)
+++ labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/schedule_tab_delivery.jsp 2006-09-30 17:33:01 UTC (rev 6474)
@@ -1,44 +0,0 @@
-<%@ 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:panelTab id="tab_delivery" label="#{messages['delivery']} " rendered="true">
-
- <f:verbatim><br></f:verbatim>
- <h:outputLabel for="output_format" value="#{messages['delivery.output.format']} " />
- <h:selectOneMenu id="output_format" value="#{reportscheduleform.scheduleInfo.output_format}" >
- <f:selectItem itemValue="#{reportscheduleform.scheduleInfo.FORMAT_PDF}" itemLabel="#{messages['format.pdf']}" />
- <f:selectItem itemValue="#{reportscheduleform.scheduleInfo.FORMAT_HTML}" itemLabel="#{messages['format.html']}" />
- <f:selectItem itemValue="#{reportscheduleform.scheduleInfo.FORMAT_TXT}" itemLabel="#{messages['format.txt']}" />
- <f:selectItem itemValue="#{reportscheduleform.scheduleInfo.FORMAT_CSV}" itemLabel="#{messages['format.csv']}" />
- <f:selectItem itemValue="#{reportscheduleform.scheduleInfo.FORMAT_XML}" itemLabel="#{messages['format.xml']}" />
- <f:selectItem itemValue="#{reportscheduleform.scheduleInfo.FORMAT_XLS}" itemLabel="#{messages['format.xls']}" />
- </h:selectOneMenu>
-
-
- <f:verbatim><br/><br/></f:verbatim>
-
- <h:outputLabel for="selone_menu_panel" value="#{messages['delivery.by']} " />
- <h:selectOneMenu id="selone_menu_panel" value="#{reportscheduleform.scheduleInfo.delivery_by_string}"
- styleClass="selectOneMenu"
- valueChangeListener="#{reportscheduleform.delivery_by_valueChanged}"
- onchange="document.forms['scheduleinfo'].submit()">
- <f:selectItem itemValue="#{reportscheduleform.scheduleInfo.BY_RESPONSE}" itemLabel="#{messages['delivery.by.response']}" />
- <f:selectItem itemValue="#{reportscheduleform.scheduleInfo.BY_EMAIL}" itemLabel="#{messages['delivery.by.email']}" />
- </h:selectOneMenu>
- <f:verbatim><br/><br/></f:verbatim>
-
- <x:panelStack id="stack" selectedPanel="#{reportscheduleform.scheduleInfo.delivery_by_string}">
- <h:panelGroup id="1">
- <f:verbatim><br/></f:verbatim>
- </h:panelGroup>
- <h:panelGroup id="2">
- <h:outputLabel for="delivery_email" value="Email: " />
- <h:inputText id="delivery_email" value="#{reportscheduleform.scheduleInfo.delivery_email}" />
- </h:panelGroup>
- </x:panelStack>
-
-
-
-</x:panelTab>
-
Copied: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/schedule_tab_delivery.jsp (from rev 6473, labs/reportingservices/trunk/src/webapp/report/schedule_tab_delivery.jsp)
Deleted: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/schedule_tab_schedule_params.jsp
===================================================================
--- labs/reportingservices/trunk/src/webapp/report/schedule_tab_schedule_params.jsp 2006-09-29 14:11:47 UTC (rev 6469)
+++ labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/schedule_tab_schedule_params.jsp 2006-09-30 17:33:01 UTC (rev 6474)
@@ -1,99 +0,0 @@
-<%@ 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:panelStack id="stack" selectedPanel="#{stackState.selected}">
-
- <h:panelGroup id="treePanel">
- <x:tree id="tree" value="#{treeModel}"
- styleClass="tree"
- nodeClass="treenode"
- selectedNodeClass="treenodeSelected"
- expandRoot="true">
- </x:tree>
- <f:verbatim><br></f:verbatim>
- </h:panelGroup>
-
-
- <h:panelGroup id="selectBoxPanel">
-
- <h:form name="formName">
-
- <h:panelGrid columns="2">
-
- <h:outputLabel for="selone_lb" value="#{example_messages['label_cars']}" />
- <h:selectOneListbox id="selone_lb" size="3" value="#{carconf.car}"
- styleClass="selectOneListbox">
- <f:selectItems id="selone_lb_cars" value="#{carconf.cars}" />
- </h:selectOneListbox>
-
- <h:outputLabel for="selone_menu_colors" value="#{example_messages['label_colors']}" />
- <h:selectOneMenu id="selone_menu_colors" value="#{carconf.color}" styleClass="selectOneMenu">
- <f:selectItem itemValue="" itemLabel="#{example_messages['empty_selitem']}" />
- <f:selectItems value="#{carconf.colors}" />
- </h:selectOneMenu>
-
- <h:outputLabel for="selone_menu_extras" value="#{example_messages['label_extras']}" />
- <h:selectManyCheckbox id="selone_menu_extras" value="#{carconf.extras}" layout="pageDirection" styleClass="selectManyCheckbox">
- <f:selectItems value="#{carconf.extrasList}" />
- </h:selectManyCheckbox>
-
- <f:verbatim> </f:verbatim>
- <h:panelGroup >
- <h:selectOneRadio id="r1" value="#{carconf.discount}" layout="pageDirection" styleClass="selectOneRadio">
- <f:selectItem itemValue="1" itemLabel="#{example_messages['discount_0']}" />
- <f:selectItem itemValue="2" itemLabel="#{example_messages['discount_1']}" />
- <f:selectItem itemValue="3" itemLabel="#{example_messages['discount_2']}" />
- </h:selectOneRadio>
- </h:panelGroup>
-
- <h:panelGroup ></h:panelGroup>
- <h:panelGroup ></h:panelGroup>
-
- <f:verbatim> </f:verbatim>
- <h:panelGrid columns="1" >
- <%/* x:selectOneRadio is an extension of h:selectOneRadio
- if layout="spread" selectitems wont get rendered
- instead x:radio components are getting rendered
- */%>
- <x:selectOneRadio id="discount2" value="#{carconf.discount2}" layout="spread" styleClass="selectOneRadio">
- <f:selectItem itemValue="0" itemLabel="#{example_messages['discount_2_0']}" />
- <f:selectItem itemValue="1" itemLabel="#{example_messages['discount_2_1']}" />
- <f:selectItem itemValue="2" itemLabel="#{example_messages['discount_2_2']}" />
- </x:selectOneRadio>
- <h:panelGroup>
- <x:radio for="discount2" index="2" /><f:verbatim> </f:verbatim>
- <h:inputText value="#{carconf.bandName}" />
- </h:panelGroup>
- <%/* x:radio is a myfaces extension. renders the selectItem at the
- given index (starting with 0). the for attribute must be the id
- of the corresponding x:selectOneRadio */%>
- <x:radio for="discount2" index="0" />
- <x:radio for="discount2" index="1" />
-
- </h:panelGrid>
-
- <h:outputLabel for="doors" value="#{example_messages['doors']}" />
- <h:selectOneMenu id="doors" value="#{carconf.doors}">
- <f:selectItem itemValue="2" itemLabel="2" />
- <f:selectItem itemValue="4" itemLabel="4" />
- <f:selectItem itemValue="7" itemLabel="7" />
- </h:selectOneMenu>
-
- <h:outputLabel for="selboolean" value="#{example_messages['sales_tax']}" />
- <h:selectBooleanCheckbox id="selboolean" value="#{carconf.salesTax}"/>
-
- <f:verbatim> </f:verbatim>
- <h:commandButton action="#{carconf.calcPrice}" value="#{example_messages['button_calcprice']}" />
-
- </h:panelGrid>
- </h:form>
-
- <h:outputFormat value="#{example_messages['msg_price']}" >
- <f:param value="#{carconf.price}" />
- </h:outputFormat>
-
- </h:panelGroup>
-
-
- </x:panelStack>
Copied: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/schedule_tab_schedule_params.jsp (from rev 6473, labs/reportingservices/trunk/src/webapp/report/schedule_tab_schedule_params.jsp)
Deleted: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/tree.jsp
===================================================================
--- labs/reportingservices/trunk/src/webapp/report/tree.jsp 2006-09-29 14:11:47 UTC (rev 6469)
+++ labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/tree.jsp 2006-09-30 17:33:01 UTC (rev 6474)
@@ -1,40 +0,0 @@
-<%@ 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>
-
Copied: labs/reportingservices/trunk/dev/modules/webadminconsole/src/main/webapp/report/tree.jsp (from rev 6473, labs/reportingservices/trunk/src/webapp/report/tree.jsp)
Modified: labs/reportingservices/trunk/dev/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/pom.xml 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/reportingservices/trunk/dev/pom.xml 2006-09-30 17:33:01 UTC (rev 6474)
@@ -31,6 +31,7 @@
<type>jar</type>
</dependency>
+ <!-- client part -->
<dependency>
<groupId>jboss.reportingservices</groupId>
<artifactId>client-api</artifactId>
@@ -44,6 +45,7 @@
<type>jar</type>
</dependency>
+ <!-- server part -->
<dependency>
<groupId>jboss.reportingservices</groupId>
<artifactId>server-api</artifactId>
@@ -56,6 +58,8 @@
<version>${project.version}</version>
<type>jar</type>
</dependency>
+
+ <!-- admin console -->
<dependency>
<groupId>jboss.reportingservices</groupId>
<artifactId>webadminconsole</artifactId>
@@ -63,7 +67,21 @@
<type>war</type>
</dependency>
+ <!-- engines -->
+ <dependency>
+ <groupId>jboss.reportingservices</groupId>
+ <artifactId>engine-jasperreports</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>jboss.reportingservices</groupId>
+ <artifactId>engine-jfreereport</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ </dependency>
+
<!-- external dependencies-->
<!-- Apache commons -->
@@ -157,6 +175,20 @@
</dependency>
+ <!-- JSF -->
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <!-- UnComment theses lines
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ -->
+
</dependencies>
</dependencyManagement>
Modified: labs/reportingservices/trunk/pom.xml
===================================================================
--- labs/reportingservices/trunk/pom.xml 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/reportingservices/trunk/pom.xml 2006-09-30 17:33:01 UTC (rev 6474)
@@ -369,6 +369,22 @@
<version>1.3.3</version>
<scope>provided</scope>
</dependency>
+
+ <!-- JSF -->
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>1.1.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Un Comment theses lines
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>1.1.2</version>
+ <scope>provided</scope>
+ </dependency>
+ -->
</dependencies>
</profile>
Deleted: labs/reportingservices/trunk/src/resources/messages.properties
===================================================================
--- labs/reportingservices/trunk/src/resources/messages.properties 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/reportingservices/trunk/src/resources/messages.properties 2006-09-30 17:33:01 UTC (rev 6474)
@@ -1,23 +0,0 @@
-
-common.project=Reporting Services
-
-
-nav.explorer=Explorer
-nav.scheduled=Scheduled
-nav.info=Info
-nav.contact=Contact
-nav.project=Reporting Services
-
-format.pdf=.pdf
-format.html=.html
-format.txt=.txt
-format.csv=.csv
-format.xml=.xml
-format.xls=.xls
-
-delivery=Delivery
-delivery.output.format =Output format:
-delivery.by =Deliver the report:
-delivery.by.response=In response to this request
-delivery.by.email=By email ...
-
Deleted: labs/reportingservices/trunk/src/webapp/WEB-INF/faces-config.xml
===================================================================
--- labs/reportingservices/trunk/src/webapp/WEB-INF/faces-config.xml 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/reportingservices/trunk/src/webapp/WEB-INF/faces-config.xml 2006-09-30 17:33:01 UTC (rev 6474)
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
-
-
-<faces-config>
-
- <!--
- | Managed Beans
- -->
-
- <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
- -->
-
- <!-- Global -->
- <navigation-rule>
- <from-view-id>*</from-view-id>
- <navigation-case>
- <from-outcome>action.explorer.display</from-outcome>
- <to-view-id>/explorer.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>action.scheduled.display</from-outcome>
- <to-view-id>/explorer.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>action.contact.display</from-outcome>
- <to-view-id>/explorer.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>action.projet.display</from-outcome>
- <to-view-id>/explorer.jsp</to-view-id>
- </navigation-case>
- </navigation-rule>
-
-
-
- <!-- Explorer -->
- <navigation-rule>
- <from-view-id>/explorer.jsp</from-view-id>
- <navigation-case>
- <from-outcome>action.report.execute_now</from-outcome>
- <to-view-id>/report/execute_now.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>action.report.quick_view</from-outcome>
- <to-view-id>/report/quick_view.jsp</to-view-id>
- </navigation-case>
- <navigation-case>
- <from-outcome>action.report.schedule</from-outcome>
- <to-view-id>/report/schedule.jsp</to-view-id>
- </navigation-case>
- </navigation-rule>
-
-
-</faces-config>
Deleted: labs/reportingservices/trunk/src/webapp/WEB-INF/jboss-web.xml
===================================================================
--- labs/reportingservices/trunk/src/webapp/WEB-INF/jboss-web.xml 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/reportingservices/trunk/src/webapp/WEB-INF/jboss-web.xml 2006-09-30 17:33:01 UTC (rev 6474)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE jboss-web
- PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd">
-
-<jboss-web>
-
- <!--
- <security-domain>java:/jaas/reports-console</security-domain>
- -->
- <context-root>reports-console</context-root>
-
-</jboss-web>
Deleted: labs/reportingservices/trunk/src/webapp/explorer.jsp
===================================================================
--- labs/reportingservices/trunk/src/webapp/explorer.jsp 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/reportingservices/trunk/src/webapp/explorer.jsp 2006-09-30 17:33:01 UTC (rev 6474)
@@ -1,47 +0,0 @@
-<%@ 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="java.util.Date"%>
-<%@ page contentType="text/html;charset=iso-8859-1"%>
-<html>
-<%@include file="include/head.inc" %>
-<body>
-
-<f:view>
- <f:loadBundle basename="messages" var="messages"/>
-
- <x:panelLayout id="page"
- styleClass="pageLayout"
- headerClass="pageHeader"
- navigationClass="pageNavigation"
- bodyClass="pageBody"
- footerClass="pageFooter" >
-
- <f:facet name="header">
- <f:subview id="header">
- <jsp:include page="include/page_header.jsp" />
- </f:subview>
- </f:facet>
-
- <f:facet name="navigation">
- <f:subview id="menu" >
- <jsp:include page="report/tree.jsp" />
- </f:subview>
- </f:facet>
-
- <f:facet name="body">
- <f:subview id="body" >
- <jsp:include page="report/list.jsp" />
- </f:subview>
- </f:facet>
-
-
- <%@include file="include/page_footer.jsp" %>
-
- </x:panelLayout>
-
-</f:view>
-
-</body>
-
-</html>
\ No newline at end of file
Deleted: labs/reportingservices/trunk/src/webapp/index.jsp
===================================================================
--- labs/reportingservices/trunk/src/webapp/index.jsp 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/reportingservices/trunk/src/webapp/index.jsp 2006-09-30 17:33:01 UTC (rev 6474)
@@ -1,4 +0,0 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%
-response.sendRedirect("explorer.jsf");
-%>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list