[jboss-svn-commits] JBL Code SVN: r7005 - in labs/reportingservices/trunk: . dev dev/distribs/deployer dev/distribs/sar dev/modules/adminconsole/service-client dev/modules/adminconsole/service-impl dev/modules/client/api dev/modules/client/impl dev/modules/common dev/modules/engine dev/modules/engine/jasperreports dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting/server dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting/server/engine dev/modules/engine/jfreereport dev/modules/engine/jfreereport/src/main/java/org/jboss/reporting dev/modules/engine/jfreereport/src/main/java/org/jboss/reporting/server dev/modules/engine/jfreereport/src/main/java/org/jboss/reporting/server/engine dev/modules/engine/jfreereport/src/main/resources/META-INF dev/modules/server/api dev/modules/server/api/src/main/java/org/jboss/reporting/server dev/modules/server/api/src/main/java/org/jboss/reporting/server/sche! duler dev/modules/server/impl dev/modules/server/impl/src/main/java/org/jboss/reporting/server/deployer dev/modules/server/impl/src/main/java/org/jboss/reporting/server/request dev/modules/webadminconsole
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Oct 22 12:01:11 EDT 2006
Author: romainguinot at gmail.com
Date: 2006-10-22 11:59:25 -0400 (Sun, 22 Oct 2006)
New Revision: 7005
Added:
labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting/server/
labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting/server/engine/
labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/java/org/jboss/reporting/server/
labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/java/org/jboss/reporting/server/engine/
Removed:
labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting/engine/
labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/java/org/jboss/reporting/engine/
Modified:
labs/reportingservices/trunk/dev/distribs/deployer/pom.xml
labs/reportingservices/trunk/dev/distribs/sar/
labs/reportingservices/trunk/dev/modules/adminconsole/service-client/
labs/reportingservices/trunk/dev/modules/adminconsole/service-impl/
labs/reportingservices/trunk/dev/modules/client/api/
labs/reportingservices/trunk/dev/modules/client/api/pom.xml
labs/reportingservices/trunk/dev/modules/client/impl/
labs/reportingservices/trunk/dev/modules/client/impl/pom.xml
labs/reportingservices/trunk/dev/modules/common/
labs/reportingservices/trunk/dev/modules/engine/jasperreports/
labs/reportingservices/trunk/dev/modules/engine/jasperreports/pom.xml
labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting/server/engine/JasperReports.java
labs/reportingservices/trunk/dev/modules/engine/jfreereport/
labs/reportingservices/trunk/dev/modules/engine/jfreereport/pom.xml
labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/java/org/jboss/reporting/server/engine/JFreeReport.java
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/
labs/reportingservices/trunk/dev/modules/server/api/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/AbstractReportDeployer.java
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/deployer/DeployerJFXML.java
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/deployer/DeployerJRXML.java
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/request/ReportRequestProcessor.java
labs/reportingservices/trunk/dev/modules/webadminconsole/
labs/reportingservices/trunk/dev/pom.xml
labs/reportingservices/trunk/pom.xml
Log:
- initial BIRT implementation
- various POM corrections
- various imports corrections along the way
Modified: labs/reportingservices/trunk/dev/distribs/deployer/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/distribs/deployer/pom.xml 2006-10-21 20:12:23 UTC (rev 7004)
+++ labs/reportingservices/trunk/dev/distribs/deployer/pom.xml 2006-10-22 15:59:25 UTC (rev 7005)
@@ -29,6 +29,7 @@
<!-- 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="../sar/target/reporting-services-sar.dir/engine-birt-0.2-SNAPSHOT.jar"/>
<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" />
Property changes on: labs/reportingservices/trunk/dev/distribs/sar
___________________________________________________________________
Name: svn:ignore
-
target
+
target
.settings
.classpath
.project
Property changes on: labs/reportingservices/trunk/dev/modules/adminconsole/service-client
___________________________________________________________________
Name: svn:ignore
-
target
+
target
.settings
*.classpath
.project
Property changes on: labs/reportingservices/trunk/dev/modules/adminconsole/service-impl
___________________________________________________________________
Name: svn:ignore
-
target
+
target
*.settings
.classpath
.project
Property changes on: labs/reportingservices/trunk/dev/modules/client/api
___________________________________________________________________
Name: svn:ignore
-
target
+
target
*.settings
.classpath
.project
Modified: labs/reportingservices/trunk/dev/modules/client/api/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/client/api/pom.xml 2006-10-21 20:12:23 UTC (rev 7004)
+++ labs/reportingservices/trunk/dev/modules/client/api/pom.xml 2006-10-22 15:59:25 UTC (rev 7005)
@@ -19,7 +19,13 @@
<groupId>jboss.reportingservices</groupId>
<artifactId>common</artifactId>
</dependency>
-
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ <version>1.4.1_final</version>
+ <scope>provided</scope>
+ </dependency>
<!-- external dependencies -->
<dependency>
<groupId>jboss.logging</groupId>
@@ -27,10 +33,6 @@
</dependency>
<dependency>
<groupId>jboss</groupId>
- <artifactId>jboss-remoting</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
<artifactId>jboss-common</artifactId>
</dependency>
</dependencies>
Property changes on: labs/reportingservices/trunk/dev/modules/client/impl
___________________________________________________________________
Name: svn:ignore
-
target
+
target
.settings
.classpath
.project
Modified: labs/reportingservices/trunk/dev/modules/client/impl/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/client/impl/pom.xml 2006-10-21 20:12:23 UTC (rev 7004)
+++ labs/reportingservices/trunk/dev/modules/client/impl/pom.xml 2006-10-22 15:59:25 UTC (rev 7005)
@@ -19,11 +19,5 @@
<groupId>jboss.reportingservices</groupId>
<artifactId>client-api</artifactId>
</dependency>
-
- <!-- external dependencies -->
- <dependency>
- <groupId>jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Property changes on: labs/reportingservices/trunk/dev/modules/common
___________________________________________________________________
Name: svn:ignore
-
target
+
target
.settings
*.classpath
.project
Property changes on: labs/reportingservices/trunk/dev/modules/engine/jasperreports
___________________________________________________________________
Name: svn:ignore
-
target
+
target
.settings
.classpath
.project
Modified: labs/reportingservices/trunk/dev/modules/engine/jasperreports/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/engine/jasperreports/pom.xml 2006-10-21 20:12:23 UTC (rev 7004)
+++ labs/reportingservices/trunk/dev/modules/engine/jasperreports/pom.xml 2006-10-22 15:59:25 UTC (rev 7005)
@@ -35,10 +35,6 @@
<!-- JBoss -->
<dependency>
- <groupId>jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-system</artifactId>
</dependency>
@@ -46,24 +42,12 @@
<groupId>jboss</groupId>
<artifactId>jboss-jmx</artifactId>
</dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-j2ee</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common</artifactId>
- </dependency>
-
<!-- jasperreports -->
<dependency>
<groupId>jasperreports</groupId>
<artifactId>jasperreports</artifactId>
+ <version>1.2.5</version>
</dependency>
</dependencies>
Copied: labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting/server/engine (from rev 6617, labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting/engine)
Modified: labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting/server/engine/JasperReports.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting/engine/JasperReports.java 2006-10-05 14:30:40 UTC (rev 6617)
+++ labs/reportingservices/trunk/dev/modules/engine/jasperreports/src/main/java/org/jboss/reporting/server/engine/JasperReports.java 2006-10-22 15:59:25 UTC (rev 7005)
@@ -85,6 +85,7 @@
}
catch (Exception e){e.printStackTrace();log.error("JasperReport compileReport failed", e);}
return report;
+
}
Property changes on: labs/reportingservices/trunk/dev/modules/engine/jfreereport
___________________________________________________________________
Name: svn:ignore
-
target
+
target
.settings
.classpath
.project
Modified: labs/reportingservices/trunk/dev/modules/engine/jfreereport/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/engine/jfreereport/pom.xml 2006-10-21 20:12:23 UTC (rev 7004)
+++ labs/reportingservices/trunk/dev/modules/engine/jfreereport/pom.xml 2006-10-22 15:59:25 UTC (rev 7005)
@@ -50,12 +50,9 @@
<groupId>jboss</groupId>
<artifactId>jboss-j2ee</artifactId>
</dependency>
+
<dependency>
<groupId>jboss</groupId>
- <artifactId>jboss</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
<artifactId>jboss-common</artifactId>
</dependency>
Copied: labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/java/org/jboss/reporting/server/engine (from rev 6617, labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/java/org/jboss/reporting/engine)
Modified: labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/java/org/jboss/reporting/server/engine/JFreeReport.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/java/org/jboss/reporting/engine/JFreeReport.java 2006-10-05 14:30:40 UTC (rev 6617)
+++ labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/java/org/jboss/reporting/server/engine/JFreeReport.java 2006-10-22 15:59:25 UTC (rev 7005)
@@ -9,19 +9,14 @@
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
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.FileOutputStream;
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;
@@ -29,8 +24,6 @@
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;
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-21 20:12:23 UTC (rev 7004)
+++ labs/reportingservices/trunk/dev/modules/engine/jfreereport/src/main/resources/META-INF/jboss-service.xml 2006-10-22 15:59:25 UTC (rev 7005)
@@ -11,8 +11,8 @@
| 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.JFreeReport"
- name="reporting:service=ReportEngine,type=JFXML">
+ <mbean code="org.jboss.reporting.server.engine.BirtReport"
+ name="reporting:service=ReportEngine,type=RPTDESIGN">
</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-21 20:12:23 UTC (rev 7004)
+++ labs/reportingservices/trunk/dev/modules/engine/pom.xml 2006-10-22 15:59:25 UTC (rev 7005)
@@ -16,6 +16,7 @@
<modules>
<module>jasperreports</module>
<module>jfreereport</module>
+ <module>birtreport</module>
</modules>
</project>
\ No newline at end of file
Property changes on: labs/reportingservices/trunk/dev/modules/server/api
___________________________________________________________________
Name: svn:ignore
-
target
+
target
.classpath
.project
.settings
Modified: labs/reportingservices/trunk/dev/modules/server/api/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/server/api/pom.xml 2006-10-21 20:12:23 UTC (rev 7004)
+++ labs/reportingservices/trunk/dev/modules/server/api/pom.xml 2006-10-22 15:59:25 UTC (rev 7005)
@@ -22,5 +22,11 @@
</dependency>
<!-- external dependencies -->
+ <dependency>
+ <groupId>jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</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-21 20:12:23 UTC (rev 7004)
+++ labs/reportingservices/trunk/dev/modules/server/api/src/main/java/org/jboss/reporting/server/ReportInfo.java 2006-10-22 15:59:25 UTC (rev 7005)
@@ -6,15 +6,12 @@
*/
package org.jboss.reporting.server;
+import java.io.File;
+import java.io.Serializable;
+
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
*
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-21 20:12:23 UTC (rev 7004)
+++ labs/reportingservices/trunk/dev/modules/server/api/src/main/java/org/jboss/reporting/server/scheduler/ScheduleInfo.java 2006-10-22 15:59:25 UTC (rev 7005)
@@ -6,16 +6,11 @@
*/
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.logging.Logger;
import org.jboss.reporting.server.ReportInfo;
/**
Modified: labs/reportingservices/trunk/dev/modules/server/impl/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/server/impl/pom.xml 2006-10-21 20:12:23 UTC (rev 7004)
+++ labs/reportingservices/trunk/dev/modules/server/impl/pom.xml 2006-10-22 15:59:25 UTC (rev 7005)
@@ -31,18 +31,7 @@
<artifactId>client-api</artifactId>
</dependency>
- <!-- external dependencies -->
- <!-- Standards -->
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </dependency>
-
-
+
<!-- JBoss -->
<dependency>
<groupId>jboss.logging</groupId>
@@ -51,6 +40,7 @@
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-system</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jboss</groupId>
@@ -62,18 +52,19 @@
</dependency>
<dependency>
<groupId>jboss</groupId>
- <artifactId>jboss-remoting</artifactId>
+ <artifactId>jboss-common</artifactId>
</dependency>
<dependency>
<groupId>jboss</groupId>
- <artifactId>jboss</artifactId>
+ <artifactId>jboss-minimal</artifactId>
+ <version>4.0.2</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
- <artifactId>jboss-common</artifactId>
+ <artifactId>jboss-remoting</artifactId>
+ <version>1.4.1_final</version>
</dependency>
-
<!-- freereport -->
<dependency>
<groupId>jfree</groupId>
@@ -89,6 +80,16 @@
<dependency>
<groupId>jasperreports</groupId>
<artifactId>jasperreports</artifactId>
+ <version>1.2.5</version>
</dependency>
+
+ <!-- BIRT engine -->
+ <dependency>
+ <groupId>org.eclipse.birt</groupId>
+ <artifactId>engineapi</artifactId>
+ <version>2.1</version>
+ </dependency>
+
+
</dependencies>
</project>
\ No newline at end of file
Modified: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/deployer/AbstractReportDeployer.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/deployer/AbstractReportDeployer.java 2006-10-21 20:12:23 UTC (rev 7004)
+++ labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/deployer/AbstractReportDeployer.java 2006-10-22 15:59:25 UTC (rev 7005)
@@ -7,8 +7,6 @@
package org.jboss.reporting.server.deployer;
-import java.util.ArrayList;
-
import org.jboss.deployment.SubDeployerSupport;
import org.jboss.mx.util.MBeanProxyExt;
import org.jboss.reporting.server.repository.RepositoryService;
Modified: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/deployer/DeployerJFXML.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/deployer/DeployerJFXML.java 2006-10-21 20:12:23 UTC (rev 7004)
+++ labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/deployer/DeployerJFXML.java 2006-10-22 15:59:25 UTC (rev 7005)
@@ -6,37 +6,21 @@
*/
package org.jboss.reporting.server.deployer;
-import java.io.BufferedInputStream;
import java.io.File;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+
import javax.management.MBeanServer;
import javax.management.MalformedObjectNameException;
import javax.management.Notification;
import javax.management.ObjectName;
-import javax.management.Attribute;
-import javax.naming.InitialContext;
-import javax.naming.Name;
-import javax.naming.NamingException;
-import org.jboss.deployment.DeploymentInfo;
-import org.jboss.deployment.SubDeployer;
-import org.jboss.deployment.SubDeployerSupport;
import org.jboss.deployment.DeploymentException;
-import org.jboss.system.ServiceControllerMBean;
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.mx.util.MBeanProxyExt;
+import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.reporting.api.Report;
import org.jboss.reporting.server.ReportInfo;
-import org.jboss.reporting.server.deployer.DeployerJRXMLMBean;
import org.jboss.reporting.server.engine.ReportEngineMBean;
import org.jboss.reporting.server.repository.RepositoryEntry;
-import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.mx.util.ObjectNameFactory;
-import org.jboss.naming.NonSerializableFactory;
-
import org.jfree.report.JFreeReport;
Modified: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/deployer/DeployerJRXML.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/deployer/DeployerJRXML.java 2006-10-21 20:12:23 UTC (rev 7004)
+++ labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/deployer/DeployerJRXML.java 2006-10-22 15:59:25 UTC (rev 7005)
@@ -6,42 +6,28 @@
*/
package org.jboss.reporting.server.deployer;
-import java.io.BufferedInputStream;
import java.io.File;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
+
import javax.management.MBeanServer;
import javax.management.MalformedObjectNameException;
import javax.management.Notification;
import javax.management.ObjectName;
-import javax.management.Attribute;
-import javax.naming.InitialContext;
-import javax.naming.Name;
-import javax.naming.NamingException;
-import org.jboss.deployment.DeploymentInfo;
-import org.jboss.deployment.SubDeployer;
-import org.jboss.deployment.SubDeployerSupport;
+import net.sf.jasperreports.engine.JRParameter;
+import net.sf.jasperreports.engine.JasperReport;
+
import org.jboss.deployment.DeploymentException;
-import org.jboss.system.ServiceControllerMBean;
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.mx.util.MBeanProxyExt;
+import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.reporting.api.Report;
import org.jboss.reporting.server.ReportInfo;
-import org.jboss.reporting.server.deployer.DeployerJRXMLMBean;
import org.jboss.reporting.server.engine.ReportEngineMBean;
import org.jboss.reporting.server.repository.RepositoryEntry;
-import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.mx.util.ObjectNameFactory;
-import org.jboss.naming.NonSerializableFactory;
-import net.sf.jasperreports.engine.JRParameter;
-import net.sf.jasperreports.engine.JasperReport;
-
/**
* This deployer compiles a JasperReports xml file and
* put the result into the repository
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-10-21 20:12:23 UTC (rev 7004)
+++ labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/request/ReportRequestProcessor.java 2006-10-22 15:59:25 UTC (rev 7005)
@@ -66,7 +66,7 @@
// synchronous response (distribute) first
if (in_reportTask.getDistribute().getType() == Distribute.TYPE_BY_METHOD_RETURN)
{
- log.info("Process a Synchrone request");
+ log.info("Process a Synchronous request");
switch (in_reportTask.getOutputFormat())
{
Property changes on: labs/reportingservices/trunk/dev/modules/webadminconsole
___________________________________________________________________
Name: svn:ignore
-
target
+
target
.settings
.classpath
.project
Modified: labs/reportingservices/trunk/dev/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/pom.xml 2006-10-21 20:12:23 UTC (rev 7004)
+++ labs/reportingservices/trunk/dev/pom.xml 2006-10-22 15:59:25 UTC (rev 7005)
@@ -108,11 +108,13 @@
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.0.2</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.3.3</version>
+ <version>1.4</version>
+ <scope>provided</scope>
</dependency>
<!-- JBoss -->
@@ -132,44 +134,37 @@
<groupId>jboss</groupId>
<artifactId>jboss-common</artifactId>
<version>4.0.2</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
<version>1.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-jmx</artifactId>
<version>4.0.4</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jmx-adaptor-plugin</artifactId>
<version>3.2.1</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-j2ee</artifactId>
<version>4.0.2</version>
- <scope>provided</scope>
</dependency>
<!-- change it ! -->
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-system</artifactId>
<version>4.0.2</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>jboss</groupId>
- <artifactId>jboss</artifactId>
- <version>5.0-SNAPSHOT</version>
- <scope>provided</scope>
+ <artifactId>jboss-minimal</artifactId>
+ <version>4.0.2</version>
</dependency>
<!-- freereport -->
Modified: labs/reportingservices/trunk/pom.xml
===================================================================
--- labs/reportingservices/trunk/pom.xml 2006-10-21 20:12:23 UTC (rev 7004)
+++ labs/reportingservices/trunk/pom.xml 2006-10-22 15:59:25 UTC (rev 7005)
@@ -366,7 +366,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.3.3</version>
+ <version>1.4</version>
<scope>provided</scope>
</dependency>
More information about the jboss-svn-commits
mailing list