[jboss-svn-commits] JBL Code SVN: r6037 - in labs/reportingservices/trunk: . src/main/org/jboss/reporting/api src/main/org/jboss/reporting/api/schedule src/main/org/jboss/reporting/server/deployer src/main/org/jboss/reporting/server/distribute src/main/org/jboss/reporting/server/engine src/main/org/jboss/reporting/server/remoting src/main/org/jboss/reporting/ui/reporttree src/tests/org/jboss/test/reporting/simple testsuite
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Aug 31 03:30:05 EDT 2006
Author: noel.rocher at jboss.com
Date: 2006-08-31 03:29:48 -0400 (Thu, 31 Aug 2006)
New Revision: 6037
Modified:
labs/reportingservices/trunk/build.xml
labs/reportingservices/trunk/src/main/org/jboss/reporting/api/Report.java
labs/reportingservices/trunk/src/main/org/jboss/reporting/api/schedule/Schedule.java
labs/reportingservices/trunk/src/main/org/jboss/reporting/server/deployer/DeployerERA.java
labs/reportingservices/trunk/src/main/org/jboss/reporting/server/deployer/DeployerJFXML.java
labs/reportingservices/trunk/src/main/org/jboss/reporting/server/deployer/DeployerJRXML.java
labs/reportingservices/trunk/src/main/org/jboss/reporting/server/distribute/DistributeByFileCopy.java
labs/reportingservices/trunk/src/main/org/jboss/reporting/server/distribute/DistributeByMail.java
labs/reportingservices/trunk/src/main/org/jboss/reporting/server/engine/JasperReports.java
labs/reportingservices/trunk/src/main/org/jboss/reporting/server/engine/ReportEngine.java
labs/reportingservices/trunk/src/main/org/jboss/reporting/server/remoting/ReportRequestHandler.java
labs/reportingservices/trunk/src/main/org/jboss/reporting/ui/reporttree/MyFacesTreeNode.java
labs/reportingservices/trunk/src/main/org/jboss/reporting/ui/reporttree/MyFacesTreeService.java
labs/reportingservices/trunk/src/tests/org/jboss/test/reporting/simple/SimpleClient.java
labs/reportingservices/trunk/testsuite/build.xml
labs/reportingservices/trunk/testsuite/local.properties
Log:
minor changes to throw an exception for unknown reports
Modified: labs/reportingservices/trunk/build.xml
===================================================================
--- labs/reportingservices/trunk/build.xml 2006-08-31 00:43:34 UTC (rev 6036)
+++ labs/reportingservices/trunk/build.xml 2006-08-31 07:29:48 UTC (rev 6037)
@@ -10,7 +10,9 @@
<!-- ====================================================================== -->
<project default="most" name="ReportingServices">
-
+
+ <property file="local.properties"/>
+
<!-- ================================================================== -->
<!-- Configuration -->
<!-- ================================================================== -->
@@ -48,8 +50,8 @@
<property name="tests.compile.dir" value="${output.dir}/tests/classes"/>
<!-- deploy dir from JBoss AS install -->
- <property name="jboss.dir" value="../jboss" />
- <property name="jboss.conf.dir" value="${jboss.dir}/server/default" />
+ <property name="jboss.dir" value="${env.JBOSS_HOME}" />
+ <property name="jboss.conf.dir" value="${jboss.dir}/server/${env.JBOSS_CONF}" />
<property name="jboss.deploy.dir" value="${jboss.conf.dir}/deploy" />
<!-- The combined library classpath -->
Modified: labs/reportingservices/trunk/src/main/org/jboss/reporting/api/Report.java
===================================================================
--- labs/reportingservices/trunk/src/main/org/jboss/reporting/api/Report.java 2006-08-31 00:43:34 UTC (rev 6036)
+++ labs/reportingservices/trunk/src/main/org/jboss/reporting/api/Report.java 2006-08-31 07:29:48 UTC (rev 6037)
@@ -20,10 +20,10 @@
private static final long serialVersionUID = -7038507128988043970L;
/** jndi name */
- private String jndi_name;
+ private String report_name;
/** path : it's the path inside the reports jndi namespace */
- private String jndi_path;
+ private String report_path;
/** parameters */
private Map parameters;
@@ -51,14 +51,14 @@
public Report(String in_jndiPath, String in_jndiName)
{
- this.setJndi_path(in_jndiPath);
- this.setJndi_name(in_jndiName);
+ this.setReport_path(in_jndiPath);
+ this.setReport_name(in_jndiName);
}
public Report(String in_absoluteName)
{
int i = in_absoluteName.lastIndexOf("/");
- this.setJndi_path(in_absoluteName.substring(0,i));
- this.setJndi_name(in_absoluteName.substring(i+1, in_absoluteName.length()));
+ this.setReport_path(in_absoluteName.substring(0,i));
+ this.setReport_name(in_absoluteName.substring(i+1, in_absoluteName.length()));
}
@@ -77,16 +77,16 @@
}
/**
- * @return Returns the jndi_name.
+ * @return Returns the report_name.
*/
- public String getJndi_name() {
- return jndi_name;
+ public String getReport_name() {
+ return report_name;
}
/**
- * @param jndi_name The jndi_name to set.
+ * @param report_name The report_name to set.
*/
- public void setJndi_name(String jndi_name) {
- this.jndi_name = jndi_name;
+ public void setReport_name(String jndi_name) {
+ this.report_name = jndi_name;
}
/**
* @return Returns the parameters.
@@ -110,21 +110,21 @@
this.display_name = display_name;
}
/**
- * @return Returns the jndi_path.
+ * @return Returns the report_path.
*/
- public String getJndi_path() {
- return jndi_path;
+ public String getReport_path() {
+ return report_path;
}
/**
- * @param jndi_path The jndi_path to set.
+ * @param report_path The report_path to set.
*/
- public void setJndi_path(String jndi_path) {
- this.jndi_path = jndi_path;
+ public void setReport_path(String jndi_path) {
+ this.report_path = jndi_path;
}
public String getId(){
- return this.jndi_path + "/" + this.jndi_name;
+ return this.report_path + "/" + this.report_name;
}
@@ -132,7 +132,7 @@
if (this.display_name != null && this.display_name.length() > 0)
return this.display_name;
else
- return this.jndi_path + "/" + this.jndi_name;
+ return this.report_path + "/" + this.report_name;
}
Modified: labs/reportingservices/trunk/src/main/org/jboss/reporting/api/schedule/Schedule.java
===================================================================
--- labs/reportingservices/trunk/src/main/org/jboss/reporting/api/schedule/Schedule.java 2006-08-31 00:43:34 UTC (rev 6036)
+++ labs/reportingservices/trunk/src/main/org/jboss/reporting/api/schedule/Schedule.java 2006-08-31 07:29:48 UTC (rev 6037)
@@ -23,6 +23,7 @@
public final static int TYPE_ONCE=100;
public final static int TYPE_NOW=200;
public final static int TYPE_PERIODIC=300;
+ public final static int TYPE_CANCEL=400;
public static int TYPE=TYPE_NONE;
protected Calendar startDate=null;
Modified: labs/reportingservices/trunk/src/main/org/jboss/reporting/server/deployer/DeployerERA.java
===================================================================
--- labs/reportingservices/trunk/src/main/org/jboss/reporting/server/deployer/DeployerERA.java 2006-08-31 00:43:34 UTC (rev 6036)
+++ labs/reportingservices/trunk/src/main/org/jboss/reporting/server/deployer/DeployerERA.java 2006-08-31 07:29:48 UTC (rev 6037)
@@ -328,8 +328,8 @@
ReportInfo ri = new ReportInfo();
ri.setFile(new File(in_archive_file_name));
Report r = new Report();
- r.setJndi_name(jndi_name);
- r.setJndi_path(in_jndi_path);
+ r.setReport_name(jndi_name);
+ r.setReport_path(in_jndi_path);
r.setParameters(getParameters(report));
ri.setReport(r);
@@ -397,8 +397,8 @@
// build the ReportInfo for notification (only jndi path & name are necessary)
ReportInfo ri = new ReportInfo();
Report r = new Report();
- r.setJndi_path(jndi_path);
- r.setJndi_name("");
+ r.setReport_path(jndi_path);
+ r.setReport_name("");
ri.setReport(r);
// Issue the REMOVE_REPORT_NOTIFICATION
Notification msg = new Notification(AbstractReportDeployer.REMOVE_REPORT_ARCHIVE_NOTIFICATION, this,
Modified: labs/reportingservices/trunk/src/main/org/jboss/reporting/server/deployer/DeployerJFXML.java
===================================================================
--- labs/reportingservices/trunk/src/main/org/jboss/reporting/server/deployer/DeployerJFXML.java 2006-08-31 00:43:34 UTC (rev 6036)
+++ labs/reportingservices/trunk/src/main/org/jboss/reporting/server/deployer/DeployerJFXML.java 2006-08-31 07:29:48 UTC (rev 6037)
@@ -180,8 +180,8 @@
ri.setFile( new File(di.url.getFile()) );
Report r = new Report();
- r.setJndi_name(jndi_name);
- r.setJndi_path( jndi_path );
+ r.setReport_name(jndi_name);
+ r.setReport_path( jndi_path );
// -- no parameters for JFreeReports
@@ -214,8 +214,8 @@
// build the ReportInfo for notification (only jndi path & name are necessary)
ReportInfo ri = new ReportInfo();
Report r = new Report();
- r.setJndi_path(jndi_path);
- r.setJndi_name(jndi_name);
+ r.setReport_path(jndi_path);
+ r.setReport_name(jndi_name);
ri.setReport(r);
// Issue the DeployerJRXML.REMOVE_REPORT_NOTIFICATION
Modified: labs/reportingservices/trunk/src/main/org/jboss/reporting/server/deployer/DeployerJRXML.java
===================================================================
--- labs/reportingservices/trunk/src/main/org/jboss/reporting/server/deployer/DeployerJRXML.java 2006-08-31 00:43:34 UTC (rev 6036)
+++ labs/reportingservices/trunk/src/main/org/jboss/reporting/server/deployer/DeployerJRXML.java 2006-08-31 07:29:48 UTC (rev 6037)
@@ -182,8 +182,8 @@
ri.setFile( new File(di.url.getFile()) );
Report r = new Report();
- r.setJndi_name(jndi_name);
- r.setJndi_path( jndi_path );
+ r.setReport_name(jndi_name);
+ r.setReport_path( jndi_path );
JRParameter[] jr_params = report.getParameters();
if (jr_params != null && jr_params.length > 0)
{
@@ -227,8 +227,8 @@
// build the ReportInfo for notification (only jndi path & name are necessary)
ReportInfo ri = new ReportInfo();
Report r = new Report();
- r.setJndi_path(jndi_path);
- r.setJndi_name(jndi_name);
+ r.setReport_path(jndi_path);
+ r.setReport_name(jndi_name);
ri.setReport(r);
// Issue the DeployerJRXML.REMOVE_REPORT_NOTIFICATION
Modified: labs/reportingservices/trunk/src/main/org/jboss/reporting/server/distribute/DistributeByFileCopy.java
===================================================================
--- labs/reportingservices/trunk/src/main/org/jboss/reporting/server/distribute/DistributeByFileCopy.java 2006-08-31 00:43:34 UTC (rev 6036)
+++ labs/reportingservices/trunk/src/main/org/jboss/reporting/server/distribute/DistributeByFileCopy.java 2006-08-31 07:29:48 UTC (rev 6037)
@@ -95,7 +95,7 @@
fileName = distribute.getFileName();
if (fileName == null || fileName.length() == 0)
{
- fileName = in_reportTask.getReport().getJndi_name() + "_" + System.currentTimeMillis()
+ fileName = in_reportTask.getReport().getReport_name() + "_" + System.currentTimeMillis()
+ OutputFormat.getFileExtension(in_reportTask.getOutputFormat());
}
Modified: labs/reportingservices/trunk/src/main/org/jboss/reporting/server/distribute/DistributeByMail.java
===================================================================
--- labs/reportingservices/trunk/src/main/org/jboss/reporting/server/distribute/DistributeByMail.java 2006-08-31 00:43:34 UTC (rev 6036)
+++ labs/reportingservices/trunk/src/main/org/jboss/reporting/server/distribute/DistributeByMail.java 2006-08-31 07:29:48 UTC (rev 6037)
@@ -179,7 +179,7 @@
}
else
{
- message.setSubject("Reporting Services - Your requested report : " + in_reportTask.getReport().getJndi_name().replaceAll("/","-"));
+ message.setSubject("Reporting Services - Your requested report : " + in_reportTask.getReport().getReport_name().replaceAll("/","-"));
}
// -- date
Modified: labs/reportingservices/trunk/src/main/org/jboss/reporting/server/engine/JasperReports.java
===================================================================
--- labs/reportingservices/trunk/src/main/org/jboss/reporting/server/engine/JasperReports.java 2006-08-31 00:43:34 UTC (rev 6036)
+++ labs/reportingservices/trunk/src/main/org/jboss/reporting/server/engine/JasperReports.java 2006-08-31 07:29:48 UTC (rev 6037)
@@ -428,7 +428,7 @@
{
viewer = new JasperViewer( JasperFillManager.fillReport(report, final_map, final_conn) ,false);
}
- viewer.show();
+ viewer.setVisible(true);
}
catch (Exception e)
{
Modified: labs/reportingservices/trunk/src/main/org/jboss/reporting/server/engine/ReportEngine.java
===================================================================
--- labs/reportingservices/trunk/src/main/org/jboss/reporting/server/engine/ReportEngine.java 2006-08-31 00:43:34 UTC (rev 6036)
+++ labs/reportingservices/trunk/src/main/org/jboss/reporting/server/engine/ReportEngine.java 2006-08-31 07:29:48 UTC (rev 6037)
@@ -121,6 +121,7 @@
{
Report report = in_reportTask.getReport();
RepositoryEntry re = (RepositoryEntry)repositoryService.get(in_reportTask.getReport().getId());
+ if (re == null) throw new org.jboss.reporting.server.repository.UnknownReportException(report);
log.info(re.getReportEngineName());
Modified: labs/reportingservices/trunk/src/main/org/jboss/reporting/server/remoting/ReportRequestHandler.java
===================================================================
--- labs/reportingservices/trunk/src/main/org/jboss/reporting/server/remoting/ReportRequestHandler.java 2006-08-31 00:43:34 UTC (rev 6036)
+++ labs/reportingservices/trunk/src/main/org/jboss/reporting/server/remoting/ReportRequestHandler.java 2006-08-31 07:29:48 UTC (rev 6037)
@@ -42,11 +42,17 @@
{
Object result = null;
- ReportTask reportTask = (ReportTask)in_request.getParameter();
- log.info("Report Request received: " + reportTask);
+ try
+ {
+ ReportTask reportTask = (ReportTask)in_request.getParameter();
+ log.info("Report Request received: " + reportTask);
+
+ result = processor.process(reportTask);
+ } catch (RuntimeException e)
+ {
+ throw new Throwable(e.getMessage());
+ }
- result = processor.process(reportTask);
-
return result;
}
Modified: labs/reportingservices/trunk/src/main/org/jboss/reporting/ui/reporttree/MyFacesTreeNode.java
===================================================================
--- labs/reportingservices/trunk/src/main/org/jboss/reporting/ui/reporttree/MyFacesTreeNode.java 2006-08-31 00:43:34 UTC (rev 6036)
+++ labs/reportingservices/trunk/src/main/org/jboss/reporting/ui/reporttree/MyFacesTreeNode.java 2006-08-31 07:29:48 UTC (rev 6037)
@@ -42,9 +42,9 @@
{
ReportInfo ri_o = (ReportInfo)((MyFacesTreeNode)o).getUserObject();
ReportInfo ri = (ReportInfo)this.getUserObject();
- if ( ri.getReport().getJndi_name().equals(ri_o.getReport().getJndi_name()) )
+ if ( ri.getReport().getReport_name().equals(ri_o.getReport().getReport_name()) )
{
- if ( ri.getReport().getJndi_path().equals(ri_o.getReport().getJndi_path()) )
+ if ( ri.getReport().getReport_path().equals(ri_o.getReport().getReport_path()) )
{
result = true;
}
Modified: labs/reportingservices/trunk/src/main/org/jboss/reporting/ui/reporttree/MyFacesTreeService.java
===================================================================
--- labs/reportingservices/trunk/src/main/org/jboss/reporting/ui/reporttree/MyFacesTreeService.java 2006-08-31 00:43:34 UTC (rev 6036)
+++ labs/reportingservices/trunk/src/main/org/jboss/reporting/ui/reporttree/MyFacesTreeService.java 2006-08-31 07:29:48 UTC (rev 6037)
@@ -134,19 +134,19 @@
if (notification.getType().equalsIgnoreCase(AbstractReportDeployer.ADD_REPORT_NOTIFICATION))
{
// add report
- log.trace("Got notification ADD: Report JNDI Name = " + report_info.getReport().getJndi_path() + "/" + report_info.getReport().getJndi_name() );
+ log.trace("Got notification ADD: Report JNDI Name = " + report_info.getReport().getReport_path() + "/" + report_info.getReport().getReport_name() );
addReport(report_info);
}
else if (notification.getType().equalsIgnoreCase(AbstractReportDeployer.REMOVE_REPORT_NOTIFICATION))
{
// remove report
- log.trace("Got notification REMOVE: Report Name = " + report_info.getReport().getJndi_path() + "/" + report_info.getReport().getJndi_name());
+ log.trace("Got notification REMOVE: Report Name = " + report_info.getReport().getReport_path() + "/" + report_info.getReport().getReport_name());
removeReport(report_info);
}
else
{
// remove archive
- log.trace("Got notification REMOVE ARCHIVE: Report Archive Name = " + report_info.getReport().getJndi_path() );
+ log.trace("Got notification REMOVE ARCHIVE: Report Archive Name = " + report_info.getReport().getReport_path() );
removeReportArchive(report_info);
}
}
@@ -157,7 +157,7 @@
protected void addReport(ReportInfo in_report_info)
{
- String[] path=in_report_info.getReport().getJndi_path().split("/");
+ String[] path=in_report_info.getReport().getReport_path().split("/");
Iterator children;
MyFacesTreeNode child_node=null;
MyFacesTreeNode current_node=root;
@@ -193,17 +193,17 @@
// reports List modification
- if (reportsLists.containsKey(in_report_info.getReport().getJndi_path()))
+ if (reportsLists.containsKey(in_report_info.getReport().getReport_path()))
{
- Map list = (HashMap)reportsLists.get(in_report_info.getReport().getJndi_path());
+ Map list = (HashMap)reportsLists.get(in_report_info.getReport().getReport_path());
if (list == null) list = new HashMap();
- list.put(in_report_info.getReport().getJndi_name(), in_report_info);
+ list.put(in_report_info.getReport().getReport_name(), in_report_info);
}
else
{
Map list = new HashMap();
- list.put(in_report_info.getReport().getJndi_name(), in_report_info);
- reportsLists.put(in_report_info.getReport().getJndi_path(), list);
+ list.put(in_report_info.getReport().getReport_name(), in_report_info);
+ reportsLists.put(in_report_info.getReport().getReport_path(), list);
}
reportsCounter++;
@@ -215,7 +215,7 @@
protected void removeReport(ReportInfo in_report_info)
{
- String[] path=in_report_info.getReport().getJndi_path().split("/");
+ String[] path=in_report_info.getReport().getReport_path().split("/");
Iterator children;
MyFacesTreeNode child_node=null;
MyFacesTreeNode parent_node=null;
@@ -224,9 +224,9 @@
synchronized(this)
{
// reports List modification
- Map list = (HashMap)reportsLists.get(in_report_info.getReport().getJndi_path());
- list.remove(in_report_info.getReport().getJndi_name());
- if (list.size() == 0) reportsLists.remove(in_report_info.getReport().getJndi_path());
+ Map list = (HashMap)reportsLists.get(in_report_info.getReport().getReport_path());
+ list.remove(in_report_info.getReport().getReport_name());
+ if (list.size() == 0) reportsLists.remove(in_report_info.getReport().getReport_path());
// Tree modification
@@ -251,7 +251,7 @@
// process the node removal upward
parent_node = (MyFacesTreeNode)current_node.getParent();
- String path_string = in_report_info.getReport().getJndi_path();
+ String path_string = in_report_info.getReport().getReport_path();
while ( !current_node.equals(root) && current_node.getChildCount() == 0 && reportsLists.get(path_string) == null )
{
current_node.removeFromParent();
@@ -272,7 +272,7 @@
protected void removeReportArchive(ReportInfo in_report_info)
{
- String[] path=in_report_info.getReport().getJndi_path().split("/");
+ String[] path=in_report_info.getReport().getReport_path().split("/");
Iterator children;
int removed_count=0;
MyFacesTreeNode child_node=null;
@@ -291,10 +291,10 @@
while (it.hasNext())
{
key = (String)it.next();
- log.trace(" current jndi path = "+in_report_info.getReport().getJndi_path() );
+ log.trace(" current jndi path = "+in_report_info.getReport().getReport_path() );
log.trace(" current key = "+key );
- if ( key.indexOf(in_report_info.getReport().getJndi_path()) >= 0 )
+ if ( key.indexOf(in_report_info.getReport().getReport_path()) >= 0 )
{
removed_count = removed_count + ((Map)reportsLists.get(key)).size();
keys_to_delete.add(key);
Modified: labs/reportingservices/trunk/src/tests/org/jboss/test/reporting/simple/SimpleClient.java
===================================================================
--- labs/reportingservices/trunk/src/tests/org/jboss/test/reporting/simple/SimpleClient.java 2006-08-31 00:43:34 UTC (rev 6036)
+++ labs/reportingservices/trunk/src/tests/org/jboss/test/reporting/simple/SimpleClient.java 2006-08-31 07:29:48 UTC (rev 6037)
@@ -50,9 +50,10 @@
/* result = ReportTaskFactory.getInstance().executeToByteArray("reports/test1.era/RotationReport1");
System.out.println("result size = " + result.length);
SimpleClient.writeToFile(directoryName, "test1Rotation.pdf", result);
-
+*/
// a simple jfreereport example
- r = new Report("reports/test2.era/test2/test2_2/report3");
+// r = new Report("reports/test2.era/test2/test2_2/report3");
+ r = new Report("reports/report3");
r.setData( new ReportData( new SampleData3() ) );
rt = ReportTaskFactory.getInstance();
rt.setReport( r );
@@ -61,21 +62,21 @@
System.out.println("result size = " + result.length);
SimpleClient.writeToFile(directoryName, "report3.pdf", result);
-*/
- // a simple jasperreport example scheduled in three minutes by file copy
- r = new Report("reports/test1.era/RotationReport1");
- rt = ReportTaskFactory.getInstance();
- rt.setReport( r );
- rt.setDistribute(new DistributeByFileCopy());
- Calendar inThreeMin = Calendar.getInstance();
- inThreeMin.add(Calendar.MINUTE, 3);
- rt.setSchedule(new ScheduleOnce( inThreeMin ));
-// rt.setSchedule(new ScheduleNow());
- rt.submit();
+//
+// // a simple jasperreport example scheduled in three minutes by file copy
+// r = new Report("reports/test1.era/RotationReport1");
+// rt = ReportTaskFactory.getInstance();
+// rt.setReport( r );
+// rt.setDistribute(new DistributeByFileCopy());
+// Calendar inThreeMin = Calendar.getInstance();
+// inThreeMin.add(Calendar.MINUTE, 3);
+// rt.setSchedule(new ScheduleOnce( inThreeMin ));
+//// rt.setSchedule(new ScheduleNow());
+// rt.submit();
+//
+// rt.setSchedule(new SchedulePeriodic(Calendar.getInstance(),1, SchedulePeriodic.PERIODE_UNIT_MINUTE));
+// rt.submit();
- rt.setSchedule(new SchedulePeriodic(Calendar.getInstance(),1, SchedulePeriodic.PERIODE_UNIT_MINUTE));
- rt.submit();
-
} catch (Exception e)
{
// TODO Auto-generated catch block
@@ -93,6 +94,7 @@
if (file.exists()) file.delete();
BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(file));
out.write(in_content);
+ out.close();
} catch (Exception e)
{
e.printStackTrace();
Modified: labs/reportingservices/trunk/testsuite/build.xml
===================================================================
--- labs/reportingservices/trunk/testsuite/build.xml 2006-08-31 00:43:34 UTC (rev 6036)
+++ labs/reportingservices/trunk/testsuite/build.xml 2006-08-31 07:29:48 UTC (rev 6037)
@@ -24,11 +24,12 @@
<!-- JBOSS_HOME -->
<condition property="jbosshome.available" value="true">
<and>
- <isset property="env.JBOSS_HOME"/>
- <available file="${env.JBOSS_HOME}/server/default/deploy" type="dir"/>
+ <isset property="env.JBOSS_HOME"/>
+ <isset property="env.JBOSS_CONF"/>
+ <available file="${env.JBOSS_HOME}/server/${env.JBOSS_HOME}/deploy" type="dir"/>
</and>
</condition>
- <fail unless="jbosshome.available" message="JBOSS_HOME property must be set"/>
+ <fail unless="jbosshome.available" message="JBOSS_HOME and JBOSS_CONF properties must be set. See local.properties file"/>
<!-- /JBOSS_HOME -->
</target>
@@ -62,7 +63,7 @@
<!-- deploy dir from JBoss AS install -->
<property name="jboss.dir" value="${env.JBOSS_HOME}" />
- <property name="jboss.conf.dir" value="${jboss.dir}/server/default" />
+ <property name="jboss.conf.dir" value="${jboss.dir}/server/${env.JBOSS_CONF}" />
<property name="jboss.deploy.dir" value="${jboss.conf.dir}/deploy" />
<!-- The combined library classpath -->
Modified: labs/reportingservices/trunk/testsuite/local.properties
===================================================================
--- labs/reportingservices/trunk/testsuite/local.properties 2006-08-31 00:43:34 UTC (rev 6036)
+++ labs/reportingservices/trunk/testsuite/local.properties 2006-08-31 07:29:48 UTC (rev 6037)
@@ -9,4 +9,5 @@
### ====================================================================== ###
#
-env.JBOSS_HOME=../jboss
\ No newline at end of file
+env.JBOSS_HOME=/app/jboss/jboss-4.0.4.GA
+env.JBOSS_CONF=reporting-services
More information about the jboss-svn-commits
mailing list