[jboss-svn-commits] JBL Code SVN: r7136 - in labs/reportingservices/trunk/dev: distribs/deployer distribs/sar/src/main/resources/META-INF modules/engine modules/engine/jfreereport/src/main/resources/META-INF modules/server/api/src/main/java/org/jboss/reporting/server modules/server/api/src/main/java/org/jboss/reporting/server/scheduler modules/server/impl modules/server/impl/src/main/java/org/jboss/reporting/server/deployer
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 26 05:35:55 EDT 2006
Author: cyril.joui at supinfo.com
Date: 2006-10-26 05:35:43 -0400 (Thu, 26 Oct 2006)
New Revision: 7136
Modified:
labs/reportingservices/trunk/dev/distribs/deployer/pom.xml
labs/reportingservices/trunk/dev/distribs/sar/src/main/resources/META-INF/jboss-service.xml
labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/resources/META-INF/jboss-service.xml
labs/reportingservices/trunk/dev/modules/engine/pom.xml
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/ScheduleInfo.java
labs/reportingservices/trunk/dev/modules/server/impl/pom.xml
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/deployer/DeployerRPTDESIGN.java
Log:
Modifications in order to create a first snapshot (without BIRT ?)
Try to deploy this version !
Modified: labs/reportingservices/trunk/dev/distribs/deployer/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/distribs/deployer/pom.xml 2006-10-26 09:08:05 UTC (rev 7135)
+++ labs/reportingservices/trunk/dev/distribs/deployer/pom.xml 2006-10-26 09:35:43 UTC (rev 7136)
@@ -29,7 +29,6 @@
<!-- 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"/>
- <move toFile="../sar/target/reporting-services-sar.dir/engine-birt-0.2-SNAPSHOT.sar" file="../../modules/engine/birtreport/target/engine-BIRT-0.2-SNAPSHOT.sar"/>
<move toFile="../sar/target/reporting-services-sar.dir/adminconsole-service-impl-0.2-SNAPSHOT.sar" file="../sar/target/reporting-services-sar.dir/adminconsole-service-impl-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" />
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-10-26 09:08:05 UTC (rev 7135)
+++ labs/reportingservices/trunk/dev/distribs/sar/src/main/resources/META-INF/jboss-service.xml 2006-10-26 09:35:43 UTC (rev 7136)
@@ -162,12 +162,14 @@
name="reporting:service=ReportsDeployer,type=JRXML">
<depends optional-attribute-name="ReportEngine">reporting:service=ReportEngine,type=generic</depends>
</mbean>
+
<!-- JFreeReport -->
<mbean code="org.jboss.reporting.server.deployer.DeployerJFXML"
name="reporting:service=ReportsDeployer,type=JFXML">
<depends optional-attribute-name="ReportEngine">reporting:service=ReportEngine,type=generic</depends>
</mbean>
+
<!-- ERA -->
<mbean code="org.jboss.reporting.server.deployer.DeployerERA"
Modified: labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/resources/META-INF/jboss-service.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/resources/META-INF/jboss-service.xml 2006-10-26 09:08:05 UTC (rev 7135)
+++ labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/resources/META-INF/jboss-service.xml 2006-10-26 09:35:43 UTC (rev 7136)
@@ -4,15 +4,15 @@
<!-- ==================================================================== -->
<!-- JFREE REPORT ENGINE -->
- <!-- ==================================================================== -->
-
+ <!-- ==================================================================== -->
- <!--
- | ENGINES : type= should correspond to the file extension of reports files .
- | It's used by the Deployer to build the right engine ObjectName
+
+ <!--
+ | 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.BirtReport"
- name="reporting:service=ReportEngine,type=RPTDESIGN">
+ <mbean code="org.jboss.reporting.server.engine.JFreeReport"
+ name="reporting:service=ReportEngine,type=JFXML">
</mbean>
</server>
\ No newline at end of file
Modified: labs/reportingservices/trunk/dev/modules/engine/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/engine/pom.xml 2006-10-26 09:08:05 UTC (rev 7135)
+++ labs/reportingservices/trunk/dev/modules/engine/pom.xml 2006-10-26 09:35:43 UTC (rev 7136)
@@ -16,7 +16,9 @@
<modules>
<module>jasperreports</module>
<module>jfreereport</module>
+ <!--
<module>birtreport</module>
+ -->
</modules>
</project>
\ No newline at end of file
Modified: 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/ReportInfo.java 2006-10-26 09:08:05 UTC (rev 7135)
+++ labs/reportingservices/trunk/dev/modules/server/api/src/main/java/org/jboss/reporting/server/ReportInfo.java 2006-10-26 09:35:43 UTC (rev 7136)
@@ -9,7 +9,7 @@
import java.io.File;
import java.io.Serializable;
-import org.jboss.logging.Logger;
+//import org.jboss.logging.Logger;
import org.jboss.reporting.api.Report;
/**
@@ -21,7 +21,7 @@
public class ReportInfo extends Object implements Serializable
{
private static final long serialVersionUID = -8459757864666101421L;
- private static Logger log = Logger.getLogger(ReportInfo.class);
+ //private static Logger log = Logger.getLogger(ReportInfo.class);
/** the file from which the report is deployed (xxx.jrxml or archive) */
private File file;
Modified: labs/reportingservices/trunk/dev/modules/server/api/src/main/java/org/jboss/reporting/server/scheduler/ScheduleInfo.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/server/api/src/main/java/org/jboss/reporting/server/scheduler/ScheduleInfo.java 2006-10-26 09:08:05 UTC (rev 7135)
+++ labs/reportingservices/trunk/dev/modules/server/api/src/main/java/org/jboss/reporting/server/scheduler/ScheduleInfo.java 2006-10-26 09:35:43 UTC (rev 7136)
@@ -10,7 +10,7 @@
import java.util.Calendar;
import java.util.Date;
-import org.jboss.logging.Logger;
+//import org.jboss.logging.Logger;
import org.jboss.reporting.server.ReportInfo;
/**
@@ -21,7 +21,7 @@
*/
public class ScheduleInfo extends Object implements Serializable
{
- private static Logger log = Logger.getLogger(ScheduleInfo.class);
+ //private static Logger log = Logger.getLogger(ScheduleInfo.class);
/** this schedule ID
* It will be set up by the scheduler service when creating the timer.
Modified: labs/reportingservices/trunk/dev/modules/server/impl/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/server/impl/pom.xml 2006-10-26 09:08:05 UTC (rev 7135)
+++ labs/reportingservices/trunk/dev/modules/server/impl/pom.xml 2006-10-26 09:35:43 UTC (rev 7136)
@@ -84,11 +84,13 @@
</dependency>
<!-- BIRT engine -->
+ <!--
<dependency>
<groupId>org.eclipse.birt</groupId>
<artifactId>engineapi</artifactId>
<version>2.1</version>
</dependency>
+ -->
</dependencies>
Modified: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/deployer/DeployerRPTDESIGN.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/deployer/DeployerRPTDESIGN.java 2006-10-26 09:08:05 UTC (rev 7135)
+++ labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/deployer/DeployerRPTDESIGN.java 2006-10-26 09:35:43 UTC (rev 7136)
@@ -6,14 +6,11 @@
*/
package org.jboss.reporting.server.deployer;
-import java.io.File;
-
import javax.management.MBeanServer;
import javax.management.MalformedObjectNameException;
import javax.management.Notification;
import javax.management.ObjectName;
-import org.eclipse.birt.report.engine.api.IReportDocument;
import org.jboss.deployment.DeploymentException;
import org.jboss.deployment.DeploymentInfo;
import org.jboss.mx.util.MBeanProxyExt;
@@ -21,7 +18,6 @@
import org.jboss.reporting.api.Report;
import org.jboss.reporting.server.ReportInfo;
import org.jboss.reporting.server.engine.ReportEngineMBean;
-import org.jboss.reporting.server.repository.RepositoryEntry;
/**
* This deployer compiles a JasperReports xml file and put the result into the
@@ -138,6 +134,8 @@
super.start(di);
try
{
+ /*
+ // TODO : remove comments
ObjectName engineName = new ObjectName("reporting:service=ReportEngine,type=" + di.shortName.substring(di.shortName.lastIndexOf('.') + 1).toUpperCase());
IReportDocument report = (IReportDocument) engine.compile(new java.io.FileInputStream(di.url.getFile()), engineName);
String jndi_name = toJndiName(di.shortName);
@@ -151,6 +149,8 @@
Report r = new Report();
r.setReport_name(jndi_name);
r.setReport_path(jndi_path);
+ */
+
/*
* JRParameter[] jr_params = report.getParameters(); if (jr_params !=
* null && jr_params.length > 0) { Map parameters = new
@@ -160,12 +160,15 @@
* jr_params[i].getDescription()); } } r.setParameters(parameters); }
*/
+ /*
+ // TODO : remove comments
ri.setReport(r);
// Issue the DeployerJRXML.ADD_REPORT_NOTIFICATION
Notification msg = new Notification(AbstractReportDeployer.ADD_REPORT_NOTIFICATION, this, getNextNotificationSequenceNumber());
msg.setUserData(ri);
sendNotification(msg);
+ */
}
catch (Exception e)
{
More information about the jboss-svn-commits
mailing list