[jboss-svn-commits] JBL Code SVN: r6350 - labs/reportingservices/trunk
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Sep 22 06:00:35 EDT 2006
Author: cyril.joui at supinfo.com
Date: 2006-09-22 06:00:32 -0400 (Fri, 22 Sep 2006)
New Revision: 6350
Added:
labs/reportingservices/trunk/output/
Removed:
labs/reportingservices/trunk/local.properties
Modified:
labs/reportingservices/trunk/.classpath
labs/reportingservices/trunk/build.xml
Log:
default.properties => not user properties dependent ! create a local.properties to override properties
Modified: labs/reportingservices/trunk/.classpath
===================================================================
--- labs/reportingservices/trunk/.classpath 2006-09-22 09:59:47 UTC (rev 6349)
+++ labs/reportingservices/trunk/.classpath 2006-09-22 10:00:32 UTC (rev 6350)
@@ -19,7 +19,6 @@
<classpathentry kind="lib" path="lib/apache-myfaces/myfaces.jar"/>
<classpathentry kind="lib" path="lib/apache-myfaces/myfaces-extensions.jar"/>
<classpathentry kind="lib" path="lib/apache-myfaces/myfaces-impl.jar"/>
- <classpathentry kind="lib" path="lib/jasperreports/jasperreports-0.6.8.jar"/>
<classpathentry kind="lib" path="lib/jboss-remoting/jboss-remoting.jar"/>
<classpathentry kind="lib" path="lib/jboss-serialization/jboss-serialization.jar"/>
<classpathentry kind="lib" path="lib/junit/junit.jar"/>
@@ -46,6 +45,6 @@
<classpathentry kind="lib" path="lib/jfreereport/pixie-0.8.4.jar"/>
<classpathentry kind="lib" path="lib/jfreereport/poi-2.5.1-final-20040804.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/jasperreports/itext-1.01.jar"/>
+ <classpathentry kind="lib" path="lib/jasperreports/jasperreports-1.2.5.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: labs/reportingservices/trunk/build.xml
===================================================================
--- labs/reportingservices/trunk/build.xml 2006-09-22 09:59:47 UTC (rev 6349)
+++ labs/reportingservices/trunk/build.xml 2006-09-22 10:00:32 UTC (rev 6350)
@@ -1,416 +1,416 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, Home of Professional Open Source -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<project default="most" name="ReportingServices">
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, Home of Professional Open Source -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<project default="most" name="ReportingServices">
+
+ <property file="default.properties"/>
<property file="local.properties"/>
-
- <!-- ================================================================== -->
- <!-- Configuration -->
- <!-- ================================================================== -->
-
- <target name="configure" unless="configure.disable">
-
- <!-- Module name(s) & version -->
- <property name="module.name" value="reporting"/>
- <property name="module.Name" value="Reporting Services"/>
- <property name="module.version" value="1.0.0alpha"/>
-
- <property name="implementation.url" value="http://www.jboss.org/projects/reportingservices"/>
- <property name="root.dir" value="${basedir}"/>
- <property name="doc.dir" value="${root.dir}/docs"/>
- <property name="src.dir" value="${root.dir}/src/main"/>
- <property name="src.webapp.dir" value="${root.dir}/src/webapp"/>
- <property name="src.resources.dir" value="${root.dir}/src/resources"/>
- <property name="tests.dir" value="${root.dir}/src/tests"/>
- <property name="etc.dir" value="${root.dir}/src/etc"/>
- <property name="output.dir" value="${root.dir}/output"/>
- <property name="output.gen-src.dir" value="${output.dir}/gen-src"/>
- <property name="output.lib.dir" value="${output.dir}/lib"/>
- <property name="output.etc.dir" value="${output.dir}/etc"/>
- <property name="output.doc.dir" value="${output.dir}/doc"/>
- <property name="output.api.dir" value="${output.doc.dir}/api"/>
- <property name="compile.dir" value="${output.dir}/classes"/>
- <property name="lib.dir" value="${root.dir}/lib"/>
- <property name="dist.dir" value="${output.dir}/dist"/>
- <!-- javadoc includes -->
- <property name="javadoc.packages" value="org.jboss.reporting.*"/>
- <property name="manifest.file" value="${output.etc.dir}/default.mf"/>
-
- <!-- test properties -->
- <property name="tests.src.dir" value="${tests.dir}"/>
- <property name="tests.compile.dir" value="${output.dir}/tests/classes"/>
-
- <!-- deploy dir from JBoss AS install -->
+
+ <!-- ================================================================== -->
+ <!-- Configuration -->
+ <!-- ================================================================== -->
+
+ <target name="configure" unless="configure.disable">
+
+ <!-- Module name(s) & version -->
+ <property name="module.name" value="reporting"/>
+ <property name="module.Name" value="Reporting Services"/>
+ <property name="module.version" value="1.0.0alpha"/>
+
+ <property name="implementation.url" value="http://www.jboss.org/projects/reportingservices"/>
+ <property name="root.dir" value="${basedir}"/>
+ <property name="doc.dir" value="${root.dir}/docs"/>
+ <property name="src.dir" value="${root.dir}/src/main"/>
+ <property name="src.webapp.dir" value="${root.dir}/src/webapp"/>
+ <property name="src.resources.dir" value="${root.dir}/src/resources"/>
+ <property name="tests.dir" value="${root.dir}/src/tests"/>
+ <property name="etc.dir" value="${root.dir}/src/etc"/>
+ <property name="output.dir" value="${root.dir}/output"/>
+ <property name="output.gen-src.dir" value="${output.dir}/gen-src"/>
+ <property name="output.lib.dir" value="${output.dir}/lib"/>
+ <property name="output.etc.dir" value="${output.dir}/etc"/>
+ <property name="output.doc.dir" value="${output.dir}/doc"/>
+ <property name="output.api.dir" value="${output.doc.dir}/api"/>
+ <property name="compile.dir" value="${output.dir}/classes"/>
+ <property name="lib.dir" value="${root.dir}/lib"/>
+ <property name="dist.dir" value="${output.dir}/dist"/>
+ <!-- javadoc includes -->
+ <property name="javadoc.packages" value="org.jboss.reporting.*"/>
+ <property name="manifest.file" value="${output.etc.dir}/default.mf"/>
+
+ <!-- test properties -->
+ <property name="tests.src.dir" value="${tests.dir}"/>
+ <property name="tests.compile.dir" value="${output.dir}/tests/classes"/>
+
+ <!-- deploy dir from JBoss AS install -->
<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 -->
- <path id="library.classpath">
- <pathelement location="${compile.dir}"/>
- <pathelement location="${etc.dir}"/>
- <fileset dir="${jboss.dir}/lib">
- <include name="**/*.jar"/>
- </fileset>
- <fileset dir="${jboss.conf.dir}/lib">
- <include name="**/*.jar"/>
- </fileset>
- <fileset dir="${lib.dir}">
- <include name="**/*.jar"/>
- <exclude name="**/jboss/**/*.jar"/>
- </fileset>
- </path>
-
- <path id="tests.classpath">
- <path refid="library.classpath"/>
- <pathelement path="${output.lib.dir}/reporting-services.jar"/>
- <pathelement path="${output.lib.dir}/reporting-services-tests.jar"/>
- </path>
-
-
- </target>
-
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
- <target name="compile" description="Compile all source files." depends="configure">
-
- <mkdir dir="${compile.dir}"/>
-
-
- <!-- mbeans source code generation -->
- <property name="mbean.includes"
- value="org/jboss/reporting/server/deployer/DeployerJRXML.java,
- org/jboss/reporting/server/deployer/DeployerJFXML.java,
- org/jboss/reporting/server/deployer/DeployerERA.java,
- org/jboss/reporting/server/distribute/DistributeService.java,
- org/jboss/reporting/server/distribute/DistributeByFileCopy.java,
- org/jboss/reporting/server/distribute/DistributeByMail.java,
- org/jboss/reporting/server/repository/RepositoryService.java,
- org/jboss/reporting/server/engine/JasperReports.java,
- org/jboss/reporting/server/engine/JFreeReport.java,
- org/jboss/reporting/server/engine/ReportEngine.java,
- org/jboss/reporting/server/scheduler/SchedulerService.java"/>
-
- <taskdef name="jmxdoclet"
- classname="xdoclet.modules.jmx.JMXDocletTask"
- classpathref="library.classpath"/>
-
- <mkdir dir="${output.gen-src.dir}"/>
-
- <jmxdoclet destdir="${output.gen-src.dir}"
- excludedtags="@version, at author">
- <fileset dir="${src.dir}"
- includes="${mbean.includes}"/>
- <mbeaninterface mergedir="${root.dir}/etc/xdoclet/templates"/>
- </jmxdoclet>
-
-
-
- <!-- java source compile -->
- <javac destdir="${compile.dir}"
- debug="on"
- deprecation="on"
- optimize="off"
- includes="**/*.java"
- failonerror="true">
- <src path="${output.gen-src.dir}"/>
- <src path="${src.dir}"/>
- <classpath refid="library.classpath"/>
- </javac>
-
- </target>
-
-
- <!-- ================================================================== -->
- <!-- Archives -->
- <!-- ================================================================== -->
-
- <target name="jars" description="Creates the jar files" depends="compile, manifest">
-
- <mkdir dir="${output.lib.dir}"/>
-
- <!-- reporting-services-client.jar -->
- <jar jarfile="${output.lib.dir}/reporting-services-client.jar"
- manifest="${manifest.file}">
- <fileset dir="${compile.dir}">
- <include name="org/jboss/reporting/api/**"/>
- <include name="org/jboss/reporting/util/**"/>
- </fileset>
- <fileset dir="${etc.dir}">
- <!-- Include report client properties -->
- <include name="report-client.properties"/>
- </fileset>
- </jar>
-
-
- <!-- Build reporting-services-ejb.jar (includes EJB Timer) -->
- <jar jarfile="${output.lib.dir}/reporting-services-ejb.jar">
- <fileset dir="${compile.dir}">
- <include name="org/jboss/reporting/server/scheduler/**/*"/>
- </fileset>
- <fileset dir="${src.resources.dir}">
- <include name="META-INF/ejb-jar.xml"/>
- <include name="META-INF/jboss.xml"/>
- </fileset>
- </jar>
-
- <!-- Build reporting-services.jar -->
- <jar jarfile="${output.lib.dir}/reporting-services.jar">
- <fileset dir="${compile.dir}">
- <include name="org/jboss/reporting/**/*"/>
- <exclude name="org/jboss/reporting/server/scheduler/**/*"/>
- </fileset>
- </jar>
-
-
- <!-- Build reporting-services.war -->
-
- <!-- FIXME: lib should be build upon the project lib
- and dhouldn't exist in src.webapp -->
-<!-- <copy todir="${output.dir}/webapp">
- <fileset dir="${src.webapp.dir}">
- <include name="**/*"/>
- </fileset>
- </copy>
- <copy todir="${output.dir}/webapp/WEB-INF/lib">
- <fileset dir="${lib.dir}/apache-myfaces">
- <include name="*.jar"/>
- </fileset>
- </copy>
- <copy todir="${output.dir}/webapp/WEB-INF/lib">
- <fileset dir="${lib.dir}/apache-commons/lib">
- <include name="commons-digester*.jar"/>
- <include name="commons-collections.jar"/>
- <include name="commons-beanutils.jar"/>
- <include name="commons-el.jar"/>
- <include name="commons-fileupload.jar"/>
- <include name="commons-codec-1.2.jar"/>
- <include name="commons-validator-1.1.3.jar"/>
- </fileset>
- </copy>
-
- <mkdir dir="${output.dir}/webapp/WEB-INF/classes" />
- <copy todir="${output.dir}/webapp/WEB-INF/classes">
- <fileset dir="${compile.dir}">
- <include name="org/jboss/reporting/server/servlet/**/*"/>
- </fileset>
- <fileset dir="${src.resources.dir}" >
- <include name="messages.properties" />
- </fileset>
- </copy>
-
- <war warfile="${output.lib.dir}/reporting-services.war" webxml="${output.dir}/webapp/WEB-INF/web.xml" >
- <fileset dir="${output.dir}/webapp">
- <exclude name="WEB-INF/web.xml"/>
- </fileset>
- </war>
--->
- <!-- Build reporting-services.sar -->
- <mkdir dir="${output.lib.dir}/reporting-services.sar"/>
- <copy todir="${output.lib.dir}/reporting-services.sar" filtering="no" overwrite="true">
- <fileset dir="${output.lib.dir}">
- <include name="reporting-services.jar"/>
- <include name="reporting-services-ejb.jar"/>
- <include name="reporting-services.war"/>
- </fileset>
- <fileset dir="${src.resources.dir}">
- <include name="META-INF/jboss-service.xml"/>
- </fileset>
- <fileset dir="${lib.dir}/apache-commons/lib">
- <include name="commons-digester*.jar"/>
- <include name="commons-collections.jar"/>
- <include name="commons-beanutils.jar"/>
- <!--include name="commons-el.jar"/-->
- <include name="commons-fileupload.jar"/>
- <include name="commons-codec-1.2.jar"/>
- <include name="commons-validator-1.1.3.jar"/>
- </fileset>
- <fileset dir="${lib.dir}/jboss-remoting">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${lib.dir}/jboss-serialization">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${lib.dir}/jasperreports">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${lib.dir}/jfreereport">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${lib.dir}/apache-myfaces">
- <include name="*.jar"/>
- </fileset>
- </copy>
-
- </target>
-
-
- <target name="manifest" depends="configure">
- <tstamp/>
- <mkdir dir="${output.etc.dir}"/>
- <manifest file="${manifest.file}">
- <attribute name="Built-By" value="${user.name}"/>
- <attribute name="Created-On" value="${TODAY}"/>
- <section name="ReportingServices">
- <attribute name="Specification-Title" value="ReportingServices"/>
- <attribute name="Specification-Version" value="${module.version}"/>
- <attribute name="Specification-Vendor" value="JBoss Inc."/>
- <attribute name="Implementation-Title" value="${module.name}"/>
- <attribute name="Implementation-Version" value="${module.version}"/>
- <attribute name="Implementation-Vendor" value="JBoss Inc."/>
- </section>
- </manifest>
- </target>
-
-
-
-
-
- <!-- ================================================================== -->
- <!-- Tests -->
- <!-- ================================================================== -->
-
-
- <target name="tests.compile" description="Compile tests source files." depends="configure">
-
- <mkdir dir="${tests.compile.dir}"/>
-
- <!-- java source compile -->
- <javac destdir="${tests.compile.dir}"
- debug="on"
- deprecation="on"
- optimize="off"
- includes="**/*.java"
- excludes="**/metadata/*.java"
- failonerror="true">
- <src path="${tests.src.dir}"/>
- <classpath refid="library.classpath"/>
- </javac>
- </target>
-
-
- <target name="tests.jars" description="Creates the tests jar files" depends="tests.compile, manifest">
-
- <mkdir dir="${output.lib.dir}"/>
- <jar jarfile="${output.lib.dir}/reporting-services-tests.jar"
- manifest="${manifest.file}">
- <fileset dir="${tests.compile.dir}">
- <include name="org/jboss/test/reporting/**"/>
- <exclude name="org/jboss/test/reporting/metadata/**"/>
- </fileset>
- </jar>
- </target>
-
-
- <target name="tests" description="Runs reporting functional tests." depends="jars, tests.jars">
- <java classname="org.jboss.test.reporting.simple.SimpleClient" >
- <arg value="${output.dir}/tests"/>
- <classpath refid="tests.classpath"/>
- </java>
- </target>
-
- <!--target name="testsMetadata" depends="configure">
- <mkdir dir="${tests.compile.dir}"/>
- <path id="testsmetadata.classpath">
- <path refid="library.classpath"/>
- <pathelement path="${output.lib.dir}/reporting-services.jar"/>
- <pathelement path="${output.lib.dir}/reporting-services-tests.jar"/>
- <fileset dir="${lib.dir}">
- <include name="**/jboss/**/*.jar"/>
- </fileset>
- <pathelement location="${tests.compile.dir}"/>
- </path>
-
-
- <javac destdir="${tests.compile.dir}"
- debug="on"
- deprecation="on"
- optimize="off"
- includes="**/*.java"
- failonerror="true">
- <src path="${tests.src.dir}"/>
- <classpath refid="testsmetadata.classpath"/>
- </javac>
- <java classname="org.jboss.test.reporting.metadata.TestMarshallSchemaless" >
- <arg value="${output.dir}/tests"/>
- <classpath refid="testsmetadata.classpath"/>
- </java>
- </target-->
-
-
- <!-- ================================================================== -->
- <!-- General -->
- <!-- ================================================================== -->
-
- <target name="clean" depends="configure">
- <delete dir="${output.dir}"/>
- </target>
-
- <target name="most" depends="clean,jars"/>
-
- <target name="javadoc" description="Generate javadoc" depends="configure">
- <javadoc packagenames="${javadoc.packages}"
- sourcepath="${src.dir}/main"
- destdir="${output.api.dir}"
- classpathref="library.classpath"
- author="true"
- version="true"
- use="true"
- bottom="Copyright © 1998-2005 JBoss Inc . All Rights Reserved."
- useexternalfile="yes"/>
- </target>
-
-
- <!-- ================================================================== -->
- <!-- Misc. -->
- <!-- ================================================================== -->
-
-
- <target name="z_deploy" depends="configure, most">
- <delete>
- <fileset dir="${jboss.deploy.dir}">
- <include name="reporting-services.sar/**/*"/>
- </fileset>
- </delete>
- <copy todir="${jboss.deploy.dir}">
- <fileset dir="${output.lib.dir}">
- <include name="reporting-services.sar/**/*"/>
- </fileset>
- </copy>
-
- <ant target="z_deploy-reports" />
-
- </target>
-
- <target name="z_deploy-reports" depends="configure">
- <delete>
- <fileset dir="${jboss.deploy.dir}">
- <include name="*.era"/>
- <include name="*.jrxml"/>
- <include name="*.jfxml"/>
- </fileset>
- </delete>
- <copy todir="${jboss.deploy.dir}">
- <fileset dir="${root.dir}/sample/era">
- <include name="*.era"/>
- </fileset>
- <fileset dir="${root.dir}/sample">
- <include name="*.jfxml"/>
- </fileset>
- </copy>
- </target>
-
-
-</project>
-
+ <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 -->
+ <path id="library.classpath">
+ <pathelement location="${compile.dir}"/>
+ <pathelement location="${etc.dir}"/>
+ <fileset dir="${jboss.dir}/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${jboss.conf.dir}/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ <exclude name="**/jboss/**/*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="tests.classpath">
+ <path refid="library.classpath"/>
+ <pathelement path="${output.lib.dir}/reporting-services.jar"/>
+ <pathelement path="${output.lib.dir}/reporting-services-tests.jar"/>
+ </path>
+
+
+ </target>
+
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+ <target name="compile" description="Compile all source files." depends="configure">
+
+ <mkdir dir="${compile.dir}"/>
+
+
+ <!-- mbeans source code generation -->
+ <property name="mbean.includes"
+ value="org/jboss/reporting/server/deployer/DeployerJRXML.java,
+ org/jboss/reporting/server/deployer/DeployerJFXML.java,
+ org/jboss/reporting/server/deployer/DeployerERA.java,
+ org/jboss/reporting/server/distribute/DistributeService.java,
+ org/jboss/reporting/server/distribute/DistributeByFileCopy.java,
+ org/jboss/reporting/server/distribute/DistributeByMail.java,
+ org/jboss/reporting/server/repository/RepositoryService.java,
+ org/jboss/reporting/server/engine/JasperReports.java,
+ org/jboss/reporting/server/engine/JFreeReport.java,
+ org/jboss/reporting/server/engine/ReportEngine.java,
+ org/jboss/reporting/server/scheduler/SchedulerService.java"/>
+
+ <taskdef name="jmxdoclet"
+ classname="xdoclet.modules.jmx.JMXDocletTask"
+ classpathref="library.classpath"/>
+
+ <mkdir dir="${output.gen-src.dir}"/>
+
+ <jmxdoclet destdir="${output.gen-src.dir}"
+ excludedtags="@version, at author">
+ <fileset dir="${src.dir}"
+ includes="${mbean.includes}"/>
+ <mbeaninterface mergedir="${root.dir}/etc/xdoclet/templates"/>
+ </jmxdoclet>
+
+
+
+ <!-- java source compile -->
+ <javac destdir="${compile.dir}"
+ debug="on"
+ deprecation="on"
+ optimize="off"
+ includes="**/*.java"
+ failonerror="true">
+ <src path="${output.gen-src.dir}"/>
+ <src path="${src.dir}"/>
+ <classpath refid="library.classpath"/>
+ </javac>
+
+ </target>
+
+
+ <!-- ================================================================== -->
+ <!-- Archives -->
+ <!-- ================================================================== -->
+
+ <target name="jars" description="Creates the jar files" depends="compile, manifest">
+
+ <mkdir dir="${output.lib.dir}"/>
+
+ <!-- reporting-services-client.jar -->
+ <jar jarfile="${output.lib.dir}/reporting-services-client.jar"
+ manifest="${manifest.file}">
+ <fileset dir="${compile.dir}">
+ <include name="org/jboss/reporting/api/**"/>
+ <include name="org/jboss/reporting/util/**"/>
+ </fileset>
+ <fileset dir="${etc.dir}">
+ <!-- Include report client properties -->
+ <include name="report-client.properties"/>
+ </fileset>
+ </jar>
+
+
+ <!-- Build reporting-services-ejb.jar (includes EJB Timer) -->
+ <jar jarfile="${output.lib.dir}/reporting-services-ejb.jar">
+ <fileset dir="${compile.dir}">
+ <include name="org/jboss/reporting/server/scheduler/**/*"/>
+ </fileset>
+ <fileset dir="${src.resources.dir}">
+ <include name="META-INF/ejb-jar.xml"/>
+ <include name="META-INF/jboss.xml"/>
+ </fileset>
+ </jar>
+
+ <!-- Build reporting-services.jar -->
+ <jar jarfile="${output.lib.dir}/reporting-services.jar">
+ <fileset dir="${compile.dir}">
+ <include name="org/jboss/reporting/**/*"/>
+ <exclude name="org/jboss/reporting/server/scheduler/**/*"/>
+ </fileset>
+ </jar>
+
+
+ <!-- Build reporting-services.war -->
+
+ <!-- FIXME: lib should be build upon the project lib
+ and dhouldn't exist in src.webapp -->
+<!-- <copy todir="${output.dir}/webapp">
+ <fileset dir="${src.webapp.dir}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${output.dir}/webapp/WEB-INF/lib">
+ <fileset dir="${lib.dir}/apache-myfaces">
+ <include name="*.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${output.dir}/webapp/WEB-INF/lib">
+ <fileset dir="${lib.dir}/apache-commons/lib">
+ <include name="commons-digester*.jar"/>
+ <include name="commons-collections.jar"/>
+ <include name="commons-beanutils.jar"/>
+ <include name="commons-el.jar"/>
+ <include name="commons-fileupload.jar"/>
+ <include name="commons-codec-1.2.jar"/>
+ <include name="commons-validator-1.1.3.jar"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${output.dir}/webapp/WEB-INF/classes" />
+ <copy todir="${output.dir}/webapp/WEB-INF/classes">
+ <fileset dir="${compile.dir}">
+ <include name="org/jboss/reporting/server/servlet/**/*"/>
+ </fileset>
+ <fileset dir="${src.resources.dir}" >
+ <include name="messages.properties" />
+ </fileset>
+ </copy>
+
+ <war warfile="${output.lib.dir}/reporting-services.war" webxml="${output.dir}/webapp/WEB-INF/web.xml" >
+ <fileset dir="${output.dir}/webapp">
+ <exclude name="WEB-INF/web.xml"/>
+ </fileset>
+ </war>
+-->
+ <!-- Build reporting-services.sar -->
+ <mkdir dir="${output.lib.dir}/reporting-services.sar"/>
+ <copy todir="${output.lib.dir}/reporting-services.sar" filtering="no" overwrite="true">
+ <fileset dir="${output.lib.dir}">
+ <include name="reporting-services.jar"/>
+ <include name="reporting-services-ejb.jar"/>
+ <include name="reporting-services.war"/>
+ </fileset>
+ <fileset dir="${src.resources.dir}">
+ <include name="META-INF/jboss-service.xml"/>
+ </fileset>
+ <fileset dir="${lib.dir}/apache-commons/lib">
+ <include name="commons-digester*.jar"/>
+ <include name="commons-collections.jar"/>
+ <include name="commons-beanutils.jar"/>
+ <!--include name="commons-el.jar"/-->
+ <include name="commons-fileupload.jar"/>
+ <include name="commons-codec-1.2.jar"/>
+ <include name="commons-validator-1.1.3.jar"/>
+ </fileset>
+ <fileset dir="${lib.dir}/jboss-remoting">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${lib.dir}/jboss-serialization">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${lib.dir}/jasperreports">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${lib.dir}/jfreereport">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${lib.dir}/apache-myfaces">
+ <include name="*.jar"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+
+ <target name="manifest" depends="configure">
+ <tstamp/>
+ <mkdir dir="${output.etc.dir}"/>
+ <manifest file="${manifest.file}">
+ <attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Created-On" value="${TODAY}"/>
+ <section name="ReportingServices">
+ <attribute name="Specification-Title" value="ReportingServices"/>
+ <attribute name="Specification-Version" value="${module.version}"/>
+ <attribute name="Specification-Vendor" value="JBoss Inc."/>
+ <attribute name="Implementation-Title" value="${module.name}"/>
+ <attribute name="Implementation-Version" value="${module.version}"/>
+ <attribute name="Implementation-Vendor" value="JBoss Inc."/>
+ </section>
+ </manifest>
+ </target>
+
+
+
+
+
+ <!-- ================================================================== -->
+ <!-- Tests -->
+ <!-- ================================================================== -->
+
+
+ <target name="tests.compile" description="Compile tests source files." depends="configure">
+
+ <mkdir dir="${tests.compile.dir}"/>
+
+ <!-- java source compile -->
+ <javac destdir="${tests.compile.dir}"
+ debug="on"
+ deprecation="on"
+ optimize="off"
+ includes="**/*.java"
+ excludes="**/metadata/*.java"
+ failonerror="true">
+ <src path="${tests.src.dir}"/>
+ <classpath refid="library.classpath"/>
+ </javac>
+ </target>
+
+
+ <target name="tests.jars" description="Creates the tests jar files" depends="tests.compile, manifest">
+
+ <mkdir dir="${output.lib.dir}"/>
+ <jar jarfile="${output.lib.dir}/reporting-services-tests.jar"
+ manifest="${manifest.file}">
+ <fileset dir="${tests.compile.dir}">
+ <include name="org/jboss/test/reporting/**"/>
+ <exclude name="org/jboss/test/reporting/metadata/**"/>
+ </fileset>
+ </jar>
+ </target>
+
+
+ <target name="tests" description="Runs reporting functional tests." depends="jars, tests.jars">
+ <java classname="org.jboss.test.reporting.simple.SimpleClient" >
+ <arg value="${output.dir}/tests"/>
+ <classpath refid="tests.classpath"/>
+ </java>
+ </target>
+
+ <!--target name="testsMetadata" depends="configure">
+ <mkdir dir="${tests.compile.dir}"/>
+ <path id="testsmetadata.classpath">
+ <path refid="library.classpath"/>
+ <pathelement path="${output.lib.dir}/reporting-services.jar"/>
+ <pathelement path="${output.lib.dir}/reporting-services-tests.jar"/>
+ <fileset dir="${lib.dir}">
+ <include name="**/jboss/**/*.jar"/>
+ </fileset>
+ <pathelement location="${tests.compile.dir}"/>
+ </path>
+
+
+ <javac destdir="${tests.compile.dir}"
+ debug="on"
+ deprecation="on"
+ optimize="off"
+ includes="**/*.java"
+ failonerror="true">
+ <src path="${tests.src.dir}"/>
+ <classpath refid="testsmetadata.classpath"/>
+ </javac>
+ <java classname="org.jboss.test.reporting.metadata.TestMarshallSchemaless" >
+ <arg value="${output.dir}/tests"/>
+ <classpath refid="testsmetadata.classpath"/>
+ </java>
+ </target-->
+
+
+ <!-- ================================================================== -->
+ <!-- General -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="configure">
+ <delete dir="${output.dir}"/>
+ </target>
+
+ <target name="most" depends="clean,jars"/>
+
+ <target name="javadoc" description="Generate javadoc" depends="configure">
+ <javadoc packagenames="${javadoc.packages}"
+ sourcepath="${src.dir}/main"
+ destdir="${output.api.dir}"
+ classpathref="library.classpath"
+ author="true"
+ version="true"
+ use="true"
+ bottom="Copyright © 1998-2005 JBoss Inc . All Rights Reserved."
+ useexternalfile="yes"/>
+ </target>
+
+
+ <!-- ================================================================== -->
+ <!-- Misc. -->
+ <!-- ================================================================== -->
+
+
+ <target name="z_deploy" depends="configure, most">
+ <delete>
+ <fileset dir="${jboss.deploy.dir}">
+ <include name="reporting-services.sar/**/*"/>
+ </fileset>
+ </delete>
+ <copy todir="${jboss.deploy.dir}">
+ <fileset dir="${output.lib.dir}">
+ <include name="reporting-services.sar/**/*"/>
+ </fileset>
+ </copy>
+
+ <ant target="z_deploy-reports" />
+
+ </target>
+
+ <target name="z_deploy-reports" depends="configure">
+ <delete>
+ <fileset dir="${jboss.deploy.dir}">
+ <include name="*.era"/>
+ <include name="*.jrxml"/>
+ <include name="*.jfxml"/>
+ </fileset>
+ </delete>
+ <copy todir="${jboss.deploy.dir}">
+ <fileset dir="${root.dir}/sample/era">
+ <include name="*.era"/>
+ </fileset>
+ <fileset dir="${root.dir}/sample">
+ <include name="*.jfxml"/>
+ </fileset>
+ </copy>
+ </target>
+
+
+</project>
\ No newline at end of file
Deleted: labs/reportingservices/trunk/local.properties
===================================================================
--- labs/reportingservices/trunk/local.properties 2006-09-22 09:59:47 UTC (rev 6349)
+++ labs/reportingservices/trunk/local.properties 2006-09-22 10:00:32 UTC (rev 6350)
@@ -1,14 +0,0 @@
-### ====================================================================== ###
-## ##
-## Local project properties. ##
-## ##
-## Define properties that are local to your environment here. This ##
-## file (local.properties) should not be checked in. Modify the ##
-## example to affect all users. ##
-## ##
-### ====================================================================== ###
-
-# this properties are used for the project only.
-# look at the testsuite local.properties for the testsuite setup
-env.JBOSS_HOME=/app/jboss/jboss-4.0.4.GA
-env.JBOSS_CONF=reporting-services
More information about the jboss-svn-commits
mailing list