[jboss-svn-commits] JBL Code SVN: r7767 - in labs/reportingservices/trunk/dev/modules/server/impl: . src/main/java/org/jboss/reporting/server/deployer

[jboss-svn-commits at lists.jboss.org]

Author: noel.rocher at jboss.com
Date: 2006-11-22 04:12:14 -0500 (Wed, 22 Nov 2006)
New Revision: 7767

Modified:
   labs/reportingservices/trunk/dev/modules/server/impl/pom.xml
   labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/deployer/DeployerRPTDESIGN.java
Log:


Modified: labs/reportingservices/trunk/dev/modules/server/impl/pom.xml
===================================================================
--- labs/reportingservices/trunk/dev/modules/server/impl/pom.xml	2006-11-22 09:12:01 UTC (rev 7766)
+++ labs/reportingservices/trunk/dev/modules/server/impl/pom.xml	2006-11-22 09:12:14 UTC (rev 7767)
@@ -83,15 +83,15 @@
 			<version>1.2.5</version>
 		</dependency>
 		
-		<!-- BIRT engine -->
+		<!-- 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/DeployerRPTDESIGN.java
===================================================================
--- labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/deployer/DeployerRPTDESIGN.java	2006-11-22 09:12:01 UTC (rev 7766)
+++ labs/reportingservices/trunk/dev/modules/server/impl/src/main/java/org/jboss/reporting/server/deployer/DeployerRPTDESIGN.java	2006-11-22 09:12:14 UTC (rev 7767)
@@ -13,7 +13,7 @@
 import javax.management.Notification;
 import javax.management.ObjectName;
 
-import org.eclipse.birt.report.engine.api.IReportDocument;
+//import org.eclipse.birt.report.engine.api.IReportDocument;
 import org.jboss.deployment.DeploymentException;
 import org.jboss.deployment.DeploymentInfo;
 import org.jboss.mx.util.MBeanProxyExt;
@@ -135,42 +135,42 @@
     public synchronized void start(DeploymentInfo di) throws DeploymentException
     {
         super.start(di);
-        try
-        {
-            ObjectName engineName = new ObjectName("reporting:service=ReportEngine,type=" + di.shortName.substring(di.shortName.lastIndexOf('.') + 1).toUpperCase());
-            IReportDocument report = (IReportDocument) engine.compile(new java.io.FileInputStream(di.url.getFile()), engineName);
-            String jndi_name = toJndiName(di.shortName);
-            String jndi_path = DEFAULT_DOMAIN;
-            repository.put(jndi_path + "/" + jndi_name, new RepositoryEntry(report, engineName));
+//        try
+//        {
+//            ObjectName engineName = new ObjectName("reporting:service=ReportEngine,type=" + di.shortName.substring(di.shortName.lastIndexOf('.') + 1).toUpperCase());
+//            IReportDocument report = (IReportDocument) engine.compile(new java.io.FileInputStream(di.url.getFile()), engineName);
+//            String jndi_name = toJndiName(di.shortName);
+//            String jndi_path = DEFAULT_DOMAIN;
+//            repository.put(jndi_path + "/" + jndi_name, new RepositoryEntry(report, engineName));
+//
+//            // build the ReportInfo for notification
+//            ReportInfo ri = new ReportInfo();
+//            ri.setFile(new File(di.url.getFile()));
+//
+//            Report r = new Report();
+//            r.setReport_name(jndi_name);
+//            r.setReport_path(jndi_path);
+//            /*
+//             * JRParameter[] jr_params = report.getParameters(); if (jr_params !=
+//             * null && jr_params.length > 0) { Map parameters = new
+//             * java.util.HashMap(jr_params.length); for (int i=0; i <
+//             * jr_params.length ; i++ ) { if (jr_params[i].isForPrompting()) {
+//             * parameters.put(jr_params[i].getName(),
+//             * jr_params[i].getDescription()); } } r.setParameters(parameters); }
+//             */
+//
+//            ri.setReport(r);
+//
+//            // Issue the DeployerJRXML.ADD_REPORT_NOTIFICATION
+//            Notification msg = new Notification(AbstractReportDeployer.ADD_REPORT_NOTIFICATION, this, getNextNotificationSequenceNumber());
+//            msg.setUserData(ri);
+//            sendNotification(msg);
+//        }
+//        catch (Exception e)
+//        {
+//            log.error(e.getMessage());
+//        }
 
-            // build the ReportInfo for notification
-            ReportInfo ri = new ReportInfo();
-            ri.setFile(new File(di.url.getFile()));
-
-            Report r = new Report();
-            r.setReport_name(jndi_name);
-            r.setReport_path(jndi_path);
-            /*
-             * JRParameter[] jr_params = report.getParameters(); if (jr_params !=
-             * null && jr_params.length > 0) { Map parameters = new
-             * java.util.HashMap(jr_params.length); for (int i=0; i <
-             * jr_params.length ; i++ ) { if (jr_params[i].isForPrompting()) {
-             * parameters.put(jr_params[i].getName(),
-             * jr_params[i].getDescription()); } } r.setParameters(parameters); }
-             */
-
-            ri.setReport(r);
-
-            // Issue the DeployerJRXML.ADD_REPORT_NOTIFICATION
-            Notification msg = new Notification(AbstractReportDeployer.ADD_REPORT_NOTIFICATION, this, getNextNotificationSequenceNumber());
-            msg.setUserData(ri);
-            sendNotification(msg);
-        }
-        catch (Exception e)
-        {
-            log.error(e.getMessage());
-        }
-
     }
 
     /**
@@ -260,6 +260,6 @@
 
     protected static String toJndiName(String in_string)
     {
-        return in_string.replaceAll(".jrxml", "").replaceAll(".RPTDESIGN", "").replaceAll(" ", "_");
+        return in_string.replaceAll(".rptdesign", "").replaceAll(".RPTDESIGN", "").replaceAll(" ", "_");
     }
 }