[jboss-svn-commits] JBL Code SVN: r6427 - in labs/reportingservices/trunk/dev: . applications applications/sar modules modules/client modules/client/api modules/client/impl modules/common modules/rs-api modules/rs-service/src/main/java/org/jboss/reporting/server modules/rs-service/src/main/java/org/jboss/reporting/server/distribute modules/rs-service/src/main/java/org/jboss/reporting/server/engine modules/rs-service/src/main/java/org/jboss/reporting/server/scheduler modules/rs-service-common/src/main/java/org/jboss/reporting/server modules/rs-service-common/src/main/java/org/jboss/reporting/server/scheduler modules/rs-service-ejb/src/main/java/org/jboss/reporting/server modules/rs-service-ejb/src/main/resources modules/rs-util/src/main/java/org/jboss/reporting modules/server modules/server/api modules/server/api/src modules/server/api/src/main modules/server/api/src/main/java modules/server/api/src/main/java/org modules/server/api/src/main/java/org/jboss modules/server/api/src/main/ja! va/org/jboss/reporting modules/server/impl modules/server/impl/src modules/server/impl/src/main modules/server/impl/src/main/java modules/server/impl/src/main/java/org modules/server/impl/src/main/java/org/jboss modules/server/impl/src/main/java/org/jboss/reporting modules/server/impl/src/main/java/org/jboss/reporting/server modules/server/impl/src/main/java/org/jboss/reporting/server/distribute modules/server/impl/src/main/java/org/jboss/reporting/server/engine modules/server/impl/src/main/java/org/jboss/reporting/server/scheduler modules/server/impl/src/resources modules/webadminconsole
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Sep 25 18:05:27 EDT 2006
Author: cyril.joui at supinfo.com
Date: 2006-09-25 18:04:53 -0400 (Mon, 25 Sep 2006)
New Revision: 6427
Added:
labs/reportingservices/trunk/dev/applications/sar/
labs/reportingservices/trunk/dev/modules/client/
labs/reportingservices/trunk/dev/modules/client/api/
labs/reportingservices/trunk/dev/modules/client/api/pom.xml
labs/reportingservices/trunk/dev/modules/client/api/src/
labs/reportingservices/trunk/dev/modules/client/impl/
labs/reportingservices/trunk/dev/modules/client/impl/pom.xml
labs/reportingservices/trunk/dev/modules/client/pom.xml
labs/reportingservices/trunk/dev/modules/common/
labs/reportingservices/trunk/dev/modules/common/pom.xml
labs/reportingservices/trunk/dev/modules/server/
labs/reportingservices/trunk/dev/modules/server/api/
labs/reportingservices/trunk/dev/modules/server/api/pom.xml
labs/reportingservices/trunk/dev/modules/server/api/src/
labs/reportingservices/trunk/dev/modules/server/api/src/main/
labs/reportingservices/trunk/dev/modules/server/api/src/main/java/
labs/reportingservices/trunk/dev/modules/server/api/src/main/java/org/
labs/reportingservices/trunk/dev/modules/server/api/src/main/java/org/jboss/
labs/reportingservices/trunk/dev/modules/server/api/src/main/java/org/jboss/reporting/
labs/reportingservices/trunk/dev/modules/server/api/src/main/java/org/jboss/reporting/server/
labs/reportingservices/trunk/dev/modules/server/impl/
labs/reportingservices/trunk/dev/modules/server/impl/pom.xml
labs/reportingservices/trunk/dev/modules/server/impl/src/
labs/reportingservices/trunk/dev/modules/server/impl/src/main/
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/
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/deployer/
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/distribute/
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/distribute/DistributeService.java
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/
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/JasperReports.java
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/ReportEngine.java
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/ReportEngineModule.java
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/metadata/
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/remoting/
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/repository/
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/request/
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/scheduler/
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/scheduler/ScheduleException.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/server/scheduler/SchedulerService.java
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/scheduler/SchedulerServiceMBean.java
labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/util/
labs/reportingservices/trunk/dev/modules/server/impl/src/resources/
labs/reportingservices/trunk/dev/modules/server/impl/src/resources/META-INF/
labs/reportingservices/trunk/dev/modules/server/pom.xml
labs/reportingservices/trunk/dev/modules/webadminconsole/
Removed:
labs/reportingservices/trunk/dev/applications/rs-sar/
labs/reportingservices/trunk/dev/modules/rs-api/pom.xml
labs/reportingservices/trunk/dev/modules/rs-api/src/
labs/reportingservices/trunk/dev/modules/rs-service-common/src/main/java/org/jboss/reporting/server/distribute/
labs/reportingservices/trunk/dev/modules/rs-service-common/src/main/java/org/jboss/reporting/server/engine/
labs/reportingservices/trunk/dev/modules/rs-service-common/src/main/java/org/jboss/reporting/server/repository/
labs/reportingservices/trunk/dev/modules/rs-service-common/src/main/java/org/jboss/reporting/server/scheduler/ScheduleException.java
labs/reportingservices/trunk/dev/modules/rs-service-common/src/main/java/org/jboss/reporting/server/scheduler/SchedulerServiceMBean.java
labs/reportingservices/trunk/dev/modules/rs-service-ejb/src/main/java/org/jboss/reporting/server/scheduler/
labs/reportingservices/trunk/dev/modules/rs-service-ejb/src/main/resources/META-INF/
labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/ReportInfo.java
labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/deployer/
labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/distribute/DistributeService.java
labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/engine/JFreeReport.java
labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/engine/JasperReports.java
labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/engine/ReportEngine.java
labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/engine/ReportEngineModule.java
labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/metadata/
labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/remoting/
labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/repository/
labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/request/
labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/scheduler/ScheduleInfo.java
labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/scheduler/SchedulerService.java
labs/reportingservices/trunk/dev/modules/rs-util/src/main/java/org/jboss/reporting/util/
labs/reportingservices/trunk/dev/modules/rs-webadminconsole/
Modified:
labs/reportingservices/trunk/dev/applications/pom.xml
labs/reportingservices/trunk/dev/applications/sar/pom.xml
labs/reportingservices/trunk/dev/modules/pom.xml
labs/reportingservices/trunk/dev/modules/webadminconsole/pom.xml
labs/reportingservices/trunk/dev/pom.xml
Log:
New structure refactoring after monday morning (25/09/06)
Modified: labs/reportingservices/trunk/dev/applications/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/applications/pom.xml 2006-09-25 21:26:46 UTC (rev 6426)
+++ labs/reportingservices/trunk/dev/applications/pom.xml 2006-09-25 22:04:53 UTC (rev 6427)
@@ -15,7 +15,7 @@
<modules>
- <module>rs-sar</module>
+ <module>sar</module>
</modules>
</project>
\ No newline at end of file
Copied: labs/reportingservices/trunk/dev/applications/sar (from rev 6407, labs/reportingservices/trunk/dev/applications/rs-sar)
Modified: labs/reportingservices/trunk/dev/applications/sar/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/applications/rs-sar/pom.xml 2006-09-25 09:34:18 UTC (rev 6407)
+++ labs/reportingservices/trunk/dev/applications/sar/pom.xml 2006-09-25 22:04:53 UTC (rev 6427)
@@ -10,62 +10,13 @@
<modelVersion>4.0.0</modelVersion>
- <artifactId>rs-sar</artifactId>
+ <artifactId>sar</artifactId>
<name>Applications - SAR</name>
<packaging>jar</packaging>
<dependencies>
<!-- internal dependencies -->
- <dependency>
- <groupId>jboss.reportingservices</groupId>
- <artifactId>rs-api</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>jboss.reportingservices</groupId>
- <artifactId>rs-client</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>jboss.reportingservices</groupId>
- <artifactId>rs-service-common</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>jboss.reportingservices</groupId>
- <artifactId>rs-service-ejb</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- <type>ejb</type>
- </dependency>
- <dependency>
- <groupId>jboss.reportingservices</groupId>
- <artifactId>rs-service</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>jboss.reportingservices</groupId>
- <artifactId>rs-util</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>jboss.reportingservices</groupId>
- <artifactId>rs-webadminconsole</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- <type>war</type>
- </dependency>
</dependencies>
<build>
Copied: labs/reportingservices/trunk/dev/modules/client/api/pom.xml (from rev 6407, labs/reportingservices/trunk/dev/modules/rs-api/pom.xml)
===================================================================
--- labs/reportingservices/trunk/dev/modules/rs-api/pom.xml 2006-09-25 09:34:18 UTC (rev 6407)
+++ labs/reportingservices/trunk/dev/modules/client/api/pom.xml 2006-09-25 22:04:53 UTC (rev 6427)
@@ -0,0 +1,34 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>jboss.reportingservices</groupId>
+ <artifactId>client</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ </parent>
+
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>client-api</artifactId>
+ <name>Client - API Provider</name>
+ <packaging>jar</packaging>
+
+
+ <dependencies>
+ <!-- internal dependencies -->
+
+
+ <!-- external dependencies -->
+ <dependency>
+ <groupId>jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common</artifactId>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Copied: labs/reportingservices/trunk/dev/modules/client/api/src (from rev 6407, labs/reportingservices/trunk/dev/modules/rs-api/src)
Added: labs/reportingservices/trunk/dev/modules/client/impl/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/client/impl/pom.xml 2006-09-25 21:26:46 UTC (rev 6426)
+++ labs/reportingservices/trunk/dev/modules/client/impl/pom.xml 2006-09-25 22:04:53 UTC (rev 6427)
@@ -0,0 +1,29 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>jboss.reportingservices</groupId>
+ <artifactId>client</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ </parent>
+
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>client-impl</artifactId>
+ <name>Client - API Implementation</name>
+ <packaging>jar</packaging>
+
+
+ <dependencies>
+ <!-- internal dependencies -->
+ <dependency>
+ <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
Added: labs/reportingservices/trunk/dev/modules/client/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/client/pom.xml 2006-09-25 21:26:46 UTC (rev 6426)
+++ labs/reportingservices/trunk/dev/modules/client/pom.xml 2006-09-25 22:04:53 UTC (rev 6427)
@@ -0,0 +1,21 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>jboss.reportingservices</groupId>
+ <artifactId>modules</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ </parent>
+
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>client</artifactId>
+ <name>Modules - Client</name>
+ <packaging>pom</packaging>
+
+
+ <modules>
+ <module>api</module>
+ <module>impl</module>
+ </modules>
+
+</project>
\ No newline at end of file
Added: labs/reportingservices/trunk/dev/modules/common/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/common/pom.xml 2006-09-25 21:26:46 UTC (rev 6426)
+++ labs/reportingservices/trunk/dev/modules/common/pom.xml 2006-09-25 22:04:53 UTC (rev 6427)
@@ -0,0 +1,21 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>jboss.reportingservices</groupId>
+ <artifactId>modules</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ </parent>
+
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>common</artifactId>
+ <name>Modules - Common (client and server)</name>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <!-- internal dependencies -->
+
+ <!-- external dependencies -->
+
+ </dependencies>
+</project>
\ No newline at end of file
Modified: labs/reportingservices/trunk/dev/modules/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/pom.xml 2006-09-25 21:26:46 UTC (rev 6426)
+++ labs/reportingservices/trunk/dev/modules/pom.xml 2006-09-25 22:04:53 UTC (rev 6427)
@@ -15,13 +15,9 @@
<modules>
- <module>rs-util</module>
- <module>rs-api</module>
- <module>rs-client</module>
- <module>rs-service-common</module>
- <module>rs-service-ejb</module>
- <module>rs-service</module>
- <module>rs-webadminconsole</module>
+ <module>common</module>
+ <module>client</module>
+ <module>server</module>
</modules>
</project>
\ No newline at end of file
Deleted: labs/reportingservices/trunk/dev/modules/rs-api/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/rs-api/pom.xml 2006-09-25 21:26:46 UTC (rev 6426)
+++ labs/reportingservices/trunk/dev/modules/rs-api/pom.xml 2006-09-25 22:04:53 UTC (rev 6427)
@@ -1,36 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>jboss.reportingservices</groupId>
- <artifactId>modules</artifactId>
- <version>0.2-SNAPSHOT</version>
- </parent>
-
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>rs-api</artifactId>
- <name>Modules - API Provider</name>
- <packaging>jar</packaging>
-
- <dependencies>
- <!-- internal dependencies -->
- <dependency>
- <groupId>jboss.reportingservices</groupId>
- <artifactId>rs-util</artifactId>
- </dependency>
-
- <!-- external dependencies -->
- <dependency>
- <groupId>jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-remoting</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common</artifactId>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Deleted: labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/ReportInfo.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/ReportInfo.java 2006-09-25 21:26:46 UTC (rev 6426)
+++ labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/ReportInfo.java 2006-09-25 22:04:53 UTC (rev 6427)
@@ -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/rs-service/src/main/java/org/jboss/reporting/server/distribute/DistributeService.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/distribute/DistributeService.java 2006-09-25 21:26:46 UTC (rev 6426)
+++ labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/distribute/DistributeService.java 2006-09-25 22:04:53 UTC (rev 6427)
@@ -1,147 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.reporting.server.distribute;
-
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanException;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import javax.management.ReflectionException;
-
-import org.jboss.logging.Logger;
-import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.mx.util.ObjectNameFactory;
-import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerConfig;
-import org.jboss.reporting.api.ReportTask;
-import org.jboss.reporting.api.distribute.Distribute;
-import org.jboss.reporting.server.repository.RepositoryServiceMBean;
-import org.jboss.reporting.server.scheduler.ScheduleInfo;
-
-/**
- * This is the generic distribute service. It will use all specific
- * distribute MBeans
- * @author noel.rocher at jboss.org
- * @version $Revision: 1.0 $
- *
- * @jmx:mbean
- * description="Reports Distribute Service"
- * name="reporting:service=Distribute"
- * extends="org.jboss.system.ServiceMBean"
- */
-public class DistributeService extends ServiceMBeanSupport
-implements DistributeServiceMBean
-{
-
- // provide logging
- private final Logger log = Logger.getLogger(DistributeService.class);
-
- // MBean name
- public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("reporting:service=Distribute");
-
- // server config MBean
- ServerConfig serverConfig = null;
-
- // temporary directory
- private java.io.File tempDirectory;
-
- // byMail MBean Object name
- private ObjectName byMail=null;
-
- // byFileCopy MBean Object name
- private ObjectName byFileCopy=null;
-
-
-
- protected ObjectName getObjectName(MBeanServer server, ObjectName name)
- throws MalformedObjectNameException
- {
- return name == null ? OBJECT_NAME : name;
- }
-
-
- protected void startService() throws Exception
- {
- serverConfig = (ServerConfig)
- MBeanProxyExt.create(ServerConfig.class,
- "jboss.system:type=ServerConfig", server);
- tempDirectory = serverConfig.getServerTempDir();
- // register with MainDeployer
- super.startService();
- }
-
- protected void stopService() throws Exception
- {
- serverConfig = null;
- tempDirectory = null;
- super.stopService();
- }
-
-
- /** @jmx:managed-operation */
- public void distribute(ReportTask in_reportTask, Object in_result) throws DistributeException
- {
- try
- {
- ObjectName moduleName=null;
- switch(in_reportTask.getDistribute().getType())
- {
- case Distribute.TYPE_BY_FILE_COPY:
- moduleName=byFileCopy;
- break;
- case Distribute.TYPE_BY_MAIL:
- moduleName=byMail;
- break;
- default:
- throw new DistributeException("Unknown distribute type");
- }
-
- // invoke the engine
- server.invoke(moduleName,
- "distribute",
- new Object[]{in_reportTask, in_result},
- new String[]{"org.jboss.reporting.api.ReportTask", "java.lang.Object"});
- } catch (Exception e)
- {
- log.error(e);
- throw new DistributeException("Distribute fails for report task : "+in_reportTask, e);
- }
- }
-
-
- /** @jmx:managed-attribute */
- public ObjectName getByMail()
- {
- return byMail;
- }
-
-
- /** @jmx:managed-attribute */
- public void setByMail(ObjectName byMail)
- {
- this.byMail = byMail;
- }
-
- /** @jmx:managed-attribute */
- public ObjectName getByFileCopy()
- {
- return byFileCopy;
- }
-
-
- /** @jmx:managed-attribute */
- public void setByFileCopy(ObjectName byFileCopy)
- {
- this.byFileCopy = byFileCopy;
- }
-
-
-
-
-
-}
Deleted: labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/engine/JFreeReport.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/engine/JFreeReport.java 2006-09-25 21:26:46 UTC (rev 6426)
+++ labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/engine/JFreeReport.java 2006-09-25 22:04:53 UTC (rev 6427)
@@ -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/rs-service/src/main/java/org/jboss/reporting/server/engine/JasperReports.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/engine/JasperReports.java 2006-09-25 21:26:46 UTC (rev 6426)
+++ labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/engine/JasperReports.java 2006-09-25 22:04:53 UTC (rev 6427)
@@ -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/rs-service/src/main/java/org/jboss/reporting/server/engine/ReportEngine.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/engine/ReportEngine.java 2006-09-25 21:26:46 UTC (rev 6426)
+++ labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/engine/ReportEngine.java 2006-09-25 22:04:53 UTC (rev 6427)
@@ -1,167 +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.InputStream;
-import java.util.ArrayList;
-
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanException;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import javax.management.ReflectionException;
-
-import org.jboss.logging.Logger;
-import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.mx.util.ObjectNameFactory;
-import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.reporting.api.Report;
-import org.jboss.reporting.api.ReportTask;
-import org.jboss.reporting.api.metadata.ReportMetaData;
-import org.jboss.reporting.server.repository.RepositoryEntry;
-import org.jboss.reporting.server.repository.RepositoryServiceMBean;
-
-/**
- *
- * @author noel.rocher at jboss.org
- * @version $Revision: 1.0 $
- *
- *
- * @jmx:mbean
- * description="Generic Report Engine"
- * name="reporting:service=ReportEngine,type=generic"
- * extends="org.jboss.system.ServiceMBean"
- *
- */
-public class ReportEngine extends ServiceMBeanSupport
- implements ReportEngineMBean
-{
- // provide logging
- private final Logger log = Logger.getLogger(ReportEngine.class);
-
-
- // MBean name
- public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("reporting:service=ReportEngine,type=generic");
-
- // report repository
- private ObjectName reportRepository=null;
- private RepositoryServiceMBean repositoryService=null;
-
- protected ObjectName getObjectName(MBeanServer server, ObjectName name) throws MalformedObjectNameException
- {
- return name == null ? OBJECT_NAME : name;
- }
-
-
- /** @jmx:managed-attribute */
- public ObjectName getReportRepository()
- {
- return reportRepository;
- }
-
-
- /** @jmx:managed-attribute */
- public void setReportRepository(ObjectName reportRepository)
- {
- this.reportRepository = reportRepository;
- }
-
-
-
- protected void startService() throws Exception
- {
- repositoryService = (RepositoryServiceMBean)
- MBeanProxyExt.create(RepositoryServiceMBean.class,
- reportRepository, server);
- super.startService();
- }
-
- protected void stopService() throws Exception
- {
- super.stopService();
- repositoryService = null;
- }
-
-
-
-
- /**
- * Compiles the report with the right engine
- * @jmx:managed-operation
- */
- public Object compile(InputStream in_reportInputStream, ObjectName in_engineName) throws Exception
- {
- Object result=null;
-
- // invoke the engine
- result = (Object)server.invoke(in_engineName,
- "compileReport",
- new Object[]{in_reportInputStream},
- new String[]{"java.io.InputStream"});
-
-
- return result;
- }
-
-
-
-
- /** @jmx:managed-operation */
- public byte[] runReportToPdf(ReportTask in_reportTask) throws Exception
- {
- byte[] result=null;
-
- try
- {
- Report report = in_reportTask.getReport();
- RepositoryEntry re = (RepositoryEntry)repositoryService.get(in_reportTask.getReport().getId());
- if (re == null) throw new org.jboss.reporting.api.exception.UnknownReportException(report);
-
- log.info(re.getReportEngineName());
-
- report = mergeWithMetadata(report, re.getMetadata());
-
- if (report.getData() == null)
- {
- log.info("Uses Datasource");
- // invoke the engine using the datasource
- result = (byte[])server.invoke(re.getReportEngineName(),
- "runReportToPdf",
- new Object[]{report.getId(), re.getCompiledReport(), report.getParameters(), report.getDatasource()},
- new String[]{"java.lang.String", "java.lang.Object", "java.util.Map","java.lang.String"});
- }
- else
- {
- log.info("Doesn't use Datasource, uses data instead");
- // invoke the engine using the data
- result = (byte[])server.invoke(re.getReportEngineName(),
- "runReportToPdf",
- new Object[]{report.getId(), re.getCompiledReport(), report.getParameters(), report.getData()},
- new String[]{"java.lang.String", "java.lang.Object", "java.util.Map","org.jboss.reporting.api.ReportData"});
- }
- } catch (Exception e)
- {
- log.error("Engine error", e);
- throw e;
- }
-
-
-
- return result;
- }
-
- /*
- * TODO: merge with metadata
- */
- private Report mergeWithMetadata(Report in_report, ReportMetaData in_metadata)
- {
- return in_report;
- }
-
-}
\ No newline at end of file
Deleted: labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/engine/ReportEngineModule.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/engine/ReportEngineModule.java 2006-09-25 21:26:46 UTC (rev 6426)
+++ labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/engine/ReportEngineModule.java 2006-09-25 22:04:53 UTC (rev 6427)
@@ -1,24 +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.InputStream;
-import java.util.Map;
-
-import org.jboss.reporting.api.ReportData;
-
-/**
- * The contract for an engine
- * @author noel
- *
- */
-public interface ReportEngineModule
-{
- public Object compileReport(InputStream in_stream) throws Exception;
- public byte[] runReportToPdf(String in_reportName, Object in_report, Map in_parameters, String in_datasource_jndi_name) throws Exception;
- public byte[] runReportToPdf(String in_reportName, Object in_report, Map in_parameters, ReportData in_data) throws Exception;
-}
Deleted: labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/scheduler/ScheduleInfo.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/scheduler/ScheduleInfo.java 2006-09-25 21:26:46 UTC (rev 6426)
+++ labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/scheduler/ScheduleInfo.java 2006-09-25 22:04:53 UTC (rev 6427)
@@ -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;
- }
-}
Deleted: labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/scheduler/SchedulerService.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/scheduler/SchedulerService.java 2006-09-25 21:26:46 UTC (rev 6426)
+++ labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/scheduler/SchedulerService.java 2006-09-25 22:04:53 UTC (rev 6427)
@@ -1,220 +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 java.io.Serializable;
-import java.rmi.RemoteException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-import javax.naming.InitialContext;
-
-import org.jboss.logging.Logger;
-import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerInfoMBean;
-import org.jboss.reporting.api.ReportTask;
-import org.jboss.reporting.api.schedule.*;
-import org.jboss.reporting.server.ReportInfo;
-
-/**
- *
- * @author noel.rocher at jboss.org
- * @version $Revision: 1.0 $
- *
- *
- * @jmx:mbean
- * description="Scheduler"
- * name="reporting:service=Scheduler"
- * extends="org.jboss.system.ServiceMBean"
- *
- * @since 07-November-2004
- */
-public class SchedulerService extends ServiceMBeanSupport
- implements SchedulerServiceMBean
-{
- // constants used for translation in milliseconds
- public final static long COEF_SECOND=1000;
- public final static long COEF_MINUTE=60*COEF_SECOND;
- public final static long COEF_HOUR=60*COEF_MINUTE;
- public final static long COEF_DAY=24*COEF_HOUR;
- public final static long COEF_WEEK=7*COEF_DAY;
-
- // provide logging
- private final Logger log = Logger.getLogger(SchedulerService.class);
- private SchedulerSessionHome timerHome=null;
- private SchedulerSession timer=null;
-
- /**
- * Configure required properties from server config info
- */
- public void startService() throws Exception
- {
- ServerInfoMBean serverInfo = (ServerInfoMBean)
- MBeanProxyExt.create(ServerInfoMBean.class,
- ServerInfoMBean.OBJECT_NAME, server);
-
- timerHome= (SchedulerSessionHome)new InitialContext().lookup("ejb/SchedulerSession");
- timer=timerHome.create();
- }
-
-
- /** @jmx:managed-operation
- * description = "Schedule a report"
- */
- public void scheduleReport(ReportTask in_reportTask) throws ScheduleException
- {
- long period=0L;
-
- log.info("Receive Scheduling task " + in_reportTask);
-
- try
- {
- if (in_reportTask.getSchedule().getType() == Schedule.TYPE_NOW ||
- in_reportTask.getSchedule().getType() == Schedule.TYPE_ONCE )
- {
- log.info("Now or Once");
- // schedule only for one time
- try
- {
- timer.createTimer(new Date(in_reportTask.getSchedule().getStartDate().getTimeInMillis()),0L, (Serializable)in_reportTask);
- }
- catch (RemoteException re)
- {
- log.error(re);
- throw re;
- }
- }
- else
- {
- // cast : should be periodic, else throw an exception
- SchedulePeriodic schedule = (SchedulePeriodic)in_reportTask.getSchedule();
-
- // first calculate the period
- try
- {
- switch(schedule.getPeriodUnit())
- {
- case SchedulePeriodic.PERIODE_UNIT_MINUTE:
- period=schedule.getPeriodQuantity() * COEF_MINUTE;
- log.info("Schedule every " + schedule.getPeriodQuantity() + " * " + COEF_MINUTE + " milliseconds");
- break;
- case SchedulePeriodic.PERIODE_UNIT_HOUR:
- period=schedule.getPeriodQuantity() * COEF_HOUR;
- break;
- case SchedulePeriodic.PERIODE_UNIT_DAY:
- period=schedule.getPeriodQuantity() * COEF_DAY;
- break;
- case SchedulePeriodic.PERIODE_UNIT_WEEK:
- period=schedule.getPeriodQuantity() * COEF_WEEK;
- break;
- case SchedulePeriodic.PERIODE_UNIT_MONTH:
- case SchedulePeriodic.PERIODE_UNIT_YEAR:
- // we will not use the periodic schedule
- // the process will start with the schedule of the next time
- // instead as months & years are not a unique amount of millis
- period=0L;
- break;
-
- default:
- throw new Exception("invalid period unit");
- }
-
- log.info("Schedule every " + period + " milliseconds");
- timer.createTimer(new Date(in_reportTask.getSchedule().getStartDate().getTimeInMillis()) ,period , (Serializable)in_reportTask);
- }
- catch (RemoteException re)
- {
- log.error(re);
- throw re;
- }
- }
- }
- catch (Exception e)
- {
- log.error(e);
- throw new ScheduleException("Schedule of report task : " + in_reportTask + " failed.", e);
- }
- }
-
-
- /** @jmx:managed-operation
- * description = "test : Schedule a report"
- */
-// public void testScheduleReport(String report_jndi_name, String datasource, String email)
-// {
-// Calendar start = Calendar.getInstance();
-// start.add(Calendar.MINUTE,1);
-// ScheduleInfo schedule_info = new ScheduleInfo();
-// ReportInfo report = new ReportInfo();
-// report.setJndi_path("");
-// report.setJndi_name(report_jndi_name);
-// report.setDatasource(datasource);
-// schedule_info.setStart_date(start.getTime());
-// schedule_info.setReport(report);
-// schedule_info.setDelivery_email(email);
-// scheduleReport(schedule_info);
-// }
-
-
-
- /** @jmx:managed-operation
- * description = "Cancel a Scheduled report task"
- */
- public void cancelScheduledReport(String in_reportTaskID) throws ScheduleException
- {
- try
- {
- timer.cancelTimer(in_reportTaskID);
- } catch (RemoteException e) {
- log.error(e);
- throw new ScheduleException("Cancel of scheduled report task : " + in_reportTaskID + " failed.", e);
- }
- }
-
- /** @jmx:managed-operation
- * description = "Cancel a Scheduled report task"
- */
- public void cancelScheduledReport(ReportTask in_reportTask) throws ScheduleException
- {
- cancelScheduledReport(in_reportTask.getID());
- }
-
- /** @jmx:managed-operation
- * description = "Cancel all Scheduled reports"
- */
- public void cancelAllScheduledReport() throws ScheduleException
- {
- try
- {
- timer.cancelAllTimers();
- } catch (RemoteException e) {
- log.error(e);
- throw new ScheduleException("Cancel of all scheduled report tasks failed.", e);
- }
- }
-
- /** @jmx:managed-operation
- * description = "get the list of Scheduled report"
- */
- public List getScheduledReports() throws ScheduleException
- {
- List result=new ArrayList();
- try
- {
- result = timer.getTimers();
- } catch (RemoteException e) {
- log.error(e);
- throw new ScheduleException("Get scheduled report tasks failed.", e);
- }
- return result;
- }
-
-}
\ No newline at end of file
Deleted: labs/reportingservices/trunk/dev/modules/rs-service-common/src/main/java/org/jboss/reporting/server/scheduler/ScheduleException.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/rs-service-common/src/main/java/org/jboss/reporting/server/scheduler/ScheduleException.java 2006-09-25 21:26:46 UTC (rev 6426)
+++ labs/reportingservices/trunk/dev/modules/rs-service-common/src/main/java/org/jboss/reporting/server/scheduler/ScheduleException.java 2006-09-25 22:04:53 UTC (rev 6427)
@@ -1,20 +0,0 @@
-package org.jboss.reporting.server.scheduler;
-
-/**
- * This exception may be thrown if there is an error in scheduling
- * a report task.
- * @author <a href="mailto:noel.rocher at jboss.org">Noel Rocher</a>
- */
-public class ScheduleException extends Exception
-{
- public ScheduleException(String message)
- {
- super(message);
- }
-
- public ScheduleException(String message, Throwable cause)
- {
- super(message, cause);
- }
-}
-
Deleted: labs/reportingservices/trunk/dev/modules/rs-service-common/src/main/java/org/jboss/reporting/server/scheduler/SchedulerServiceMBean.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/rs-service-common/src/main/java/org/jboss/reporting/server/scheduler/SchedulerServiceMBean.java 2006-09-25 21:26:46 UTC (rev 6426)
+++ labs/reportingservices/trunk/dev/modules/rs-service-common/src/main/java/org/jboss/reporting/server/scheduler/SchedulerServiceMBean.java 2006-09-25 22:04:53 UTC (rev 6427)
@@ -1,25 +0,0 @@
-/*
- * Generated file - Do not edit!
- */
-package org.jboss.reporting.server.scheduler;
-
-/**
- * MBean interface.
- * @since 07-November-2004
- */
-public interface SchedulerServiceMBean extends org.jboss.system.ServiceMBean {
-
- //default object name
- public static final javax.management.ObjectName OBJECT_NAME = org.jboss.mx.util.ObjectNameFactory.create("reporting:service=Scheduler");
-
- void scheduleReport(org.jboss.reporting.api.ReportTask in_reportTask) throws org.jboss.reporting.server.scheduler.ScheduleException;
-
- void cancelScheduledReport(java.lang.String in_reportTaskID) throws org.jboss.reporting.server.scheduler.ScheduleException;
-
- void cancelScheduledReport(org.jboss.reporting.api.ReportTask in_reportTask) throws org.jboss.reporting.server.scheduler.ScheduleException;
-
- void cancelAllScheduledReport() throws org.jboss.reporting.server.scheduler.ScheduleException;
-
- java.util.List getScheduledReports() throws org.jboss.reporting.server.scheduler.ScheduleException;
-
-}
Added: labs/reportingservices/trunk/dev/modules/server/api/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/server/api/pom.xml 2006-09-25 21:26:46 UTC (rev 6426)
+++ labs/reportingservices/trunk/dev/modules/server/api/pom.xml 2006-09-25 22:04:53 UTC (rev 6427)
@@ -0,0 +1,22 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>jboss.reportingservices</groupId>
+ <artifactId>server</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ </parent>
+
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>server-api</artifactId>
+ <name>Server - API</name>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <!-- internal dependencies -->
+
+ <!-- external dependencies -->
+ </dependencies>
+</project>
\ No newline at end of file
Added: labs/reportingservices/trunk/dev/modules/server/impl/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/server/impl/pom.xml 2006-09-25 21:26:46 UTC (rev 6426)
+++ labs/reportingservices/trunk/dev/modules/server/impl/pom.xml 2006-09-25 22:04:53 UTC (rev 6427)
@@ -0,0 +1,52 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>jboss.reportingservices</groupId>
+ <artifactId>server</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ </parent>
+
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>server-impl</artifactId>
+ <name>Server - Implementation</name>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <!-- internal dependencies -->
+ <dependency>
+ <groupId>jboss.reportingservices</groupId>
+ <artifactId>server-api</artifactId>
+ </dependency>
+
+ <!-- external dependencies -->
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-system</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-j2ee</artifactId>
+ </dependency>
+
+ </dependencies>
+</project>
\ No newline at end of file
Copied: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/ReportInfo.java (from rev 6407, labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/ReportInfo.java)
Copied: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/deployer (from rev 6407, labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/deployer)
Copied: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/distribute (from rev 6407, labs/reportingservices/trunk/dev/modules/rs-service-common/src/main/java/org/jboss/reporting/server/distribute)
Copied: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/distribute/DistributeService.java (from rev 6407, labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/distribute/DistributeService.java)
Copied: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine (from rev 6407, labs/reportingservices/trunk/dev/modules/rs-service-common/src/main/java/org/jboss/reporting/server/engine)
Copied: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/JFreeReport.java (from rev 6407, labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/engine/JFreeReport.java)
Copied: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/JasperReports.java (from rev 6407, labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/engine/JasperReports.java)
Copied: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/ReportEngine.java (from rev 6407, labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/engine/ReportEngine.java)
Copied: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/engine/ReportEngineModule.java (from rev 6407, labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/engine/ReportEngineModule.java)
Copied: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/metadata (from rev 6407, labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/metadata)
Copied: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/remoting (from rev 6407, labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/remoting)
Copied: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/repository (from rev 6407, labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/repository)
Copied: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/request (from rev 6407, labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/request)
Copied: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/scheduler (from rev 6407, labs/reportingservices/trunk/dev/modules/rs-service-ejb/src/main/java/org/jboss/reporting/server/scheduler)
Copied: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/scheduler/ScheduleException.java (from rev 6407, labs/reportingservices/trunk/dev/modules/rs-service-common/src/main/java/org/jboss/reporting/server/scheduler/ScheduleException.java)
Copied: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/scheduler/ScheduleInfo.java (from rev 6407, labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/scheduler/ScheduleInfo.java)
Copied: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/scheduler/SchedulerService.java (from rev 6407, labs/reportingservices/trunk/dev/modules/rs-service/src/main/java/org/jboss/reporting/server/scheduler/SchedulerService.java)
Copied: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/scheduler/SchedulerServiceMBean.java (from rev 6407, labs/reportingservices/trunk/dev/modules/rs-service-common/src/main/java/org/jboss/reporting/server/scheduler/SchedulerServiceMBean.java)
Copied: labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/util (from rev 6407, labs/reportingservices/trunk/dev/modules/rs-util/src/main/java/org/jboss/reporting/util)
Copied: labs/reportingservices/trunk/dev/modules/server/impl/src/resources/META-INF (from rev 6407, labs/reportingservices/trunk/dev/modules/rs-service-ejb/src/main/resources/META-INF)
Added: labs/reportingservices/trunk/dev/modules/server/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/server/pom.xml 2006-09-25 21:26:46 UTC (rev 6426)
+++ labs/reportingservices/trunk/dev/modules/server/pom.xml 2006-09-25 22:04:53 UTC (rev 6427)
@@ -0,0 +1,21 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>jboss.reportingservices</groupId>
+ <artifactId>modules</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ </parent>
+
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>server</artifactId>
+ <name>Modules - Server</name>
+ <packaging>pom</packaging>
+
+
+ <modules>
+ <module>api</module>
+ <module>impl</module>
+ </modules>
+
+</project>
\ No newline at end of file
Copied: labs/reportingservices/trunk/dev/modules/webadminconsole (from rev 6407, labs/reportingservices/trunk/dev/modules/rs-webadminconsole)
Modified: labs/reportingservices/trunk/dev/modules/webadminconsole/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/rs-webadminconsole/pom.xml 2006-09-25 09:34:18 UTC (rev 6407)
+++ labs/reportingservices/trunk/dev/modules/webadminconsole/pom.xml 2006-09-25 22:04:53 UTC (rev 6427)
@@ -8,12 +8,12 @@
<modelVersion>4.0.0</modelVersion>
- <artifactId>rs-webadminconsole</artifactId>
+ <artifactId>webadminconsole</artifactId>
<name>Modules - Web admin console</name>
<packaging>war</packaging>
<dependencies>
- <!-- internal dependencies -->
+ <!-- internal dependencies
<dependency>
<groupId>jboss.reportingservices</groupId>
<artifactId>rs-api</artifactId>
@@ -24,6 +24,7 @@
<artifactId>rs-util</artifactId>
<scope>provided</scope>
</dependency>
+ -->
<!--
<dependency>
<groupId>jboss.reportingservices</groupId>
Modified: labs/reportingservices/trunk/dev/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/pom.xml 2006-09-25 21:26:46 UTC (rev 6426)
+++ labs/reportingservices/trunk/dev/pom.xml 2006-09-25 22:04:53 UTC (rev 6427)
@@ -27,44 +27,33 @@
<!-- internal dependencies -->
<dependency>
<groupId>jboss.reportingservices</groupId>
- <artifactId>rs-api</artifactId>
+ <artifactId>client-api</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>jboss.reportingservices</groupId>
- <artifactId>rs-client</artifactId>
+ <artifactId>client-impl</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
+
<dependency>
<groupId>jboss.reportingservices</groupId>
- <artifactId>rs-service-common</artifactId>
+ <artifactId>server-api</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>jboss.reportingservices</groupId>
- <artifactId>rs-service-ejb</artifactId>
+ <artifactId>server-impl</artifactId>
<version>${project.version}</version>
- <type>ejb</type>
- </dependency>
- <dependency>
- <groupId>jboss.reportingservices</groupId>
- <artifactId>rs-service</artifactId>
- <version>${project.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>jboss.reportingservices</groupId>
- <artifactId>rs-util</artifactId>
+ <artifactId>webadminconsole</artifactId>
<version>${project.version}</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>jboss.reportingservices</groupId>
- <artifactId>rs-webadminconsole</artifactId>
- <version>${project.version}</version>
<type>war</type>
</dependency>
More information about the jboss-svn-commits
mailing list