Hibernate SVN: r12886 - shards.
by hibernate-commits＠lists.jboss.org
Author: max.ross
Date: 2007-08-02 16:27:25 -0400 (Thu, 02 Aug 2007)
New Revision: 12886
Added:
shards/v3_0_0_Beta2/
Log:
3.0.0.Beta2 release
Copied: shards/v3_0_0_Beta2 (from rev 12885, shards/trunk)
17 years, 5 months
Hibernate SVN: r12885 - shards/trunk.
by hibernate-commits＠lists.jboss.org
Author: max.ross
Date: 2007-08-02 16:21:55 -0400 (Thu, 02 Aug 2007)
New Revision: 12885
Modified:
shards/trunk/changelog.txt
shards/trunk/readme.txt
Log:
update release date
Modified: shards/trunk/changelog.txt
===================================================================
--- shards/trunk/changelog.txt 2007-08-02 15:49:25 UTC (rev 12884)
+++ shards/trunk/changelog.txt 2007-08-02 20:21:55 UTC (rev 12885)
@@ -2,7 +2,7 @@
==========================
-3.0.0.Beta2 (7-28-2007)
+3.0.0.Beta2 (8-2-2007)
** Bug
* [HSHARDS-3] - setMaxResults method of Query is behaving wrong
Modified: shards/trunk/readme.txt
===================================================================
--- shards/trunk/readme.txt 2007-08-02 15:49:25 UTC (rev 12884)
+++ shards/trunk/readme.txt 2007-08-02 20:21:55 UTC (rev 12885)
@@ -1,6 +1,6 @@
Hibernate Shards
================
-Version: 3.0.0.Beta2, 28.07.2007
+Version: 3.0.0.Beta2, 02.08.2007
Description
-----------
17 years, 5 months
Hibernate SVN: r12884 - trunk/HibernateExt/search/doc/reference/en.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2007-08-02 11:49:25 -0400 (Thu, 02 Aug 2007)
New Revision: 12884
Modified:
trunk/HibernateExt/search/doc/reference/en/master.xml
Log:
Some changes to the preface.
Modified: trunk/HibernateExt/search/doc/reference/en/master.xml
===================================================================
--- trunk/HibernateExt/search/doc/reference/en/master.xml 2007-08-02 15:49:05 UTC (rev 12883)
+++ trunk/HibernateExt/search/doc/reference/en/master.xml 2007-08-02 15:49:25 UTC (rev 12884)
@@ -2,6 +2,7 @@
<!-- $Id$ -->
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3CR3//EN"
"../../../../../Hibernate3/doc/reference/support/docbook-dtd/docbookx.dtd" [
+<!ENTITY getting-started SYSTEM "modules/getting-started.xml">
<!ENTITY architecture SYSTEM "modules/architecture.xml">
<!ENTITY configuration SYSTEM "modules/configuration.xml">
<!ENTITY mapping SYSTEM "modules/mapping.xml">
@@ -33,21 +34,24 @@
<title>Preface</title>
<para>Full text search engines like <productname>Apache
- Lucene</productname> are a very powerful technology to bring free
- text/efficient queries to applications. If suffers several mismatches when
- dealing with a object domain model (keeping the index up to date, mismatch
- between the index structure and the domain model, querying mismatch...)
+ Lucene</productname> are very powerful technologies to add efficient free
+ text queries to applications. However, they suffer several mismatches when
+ dealing with object domain models, eg indeces have to be kept up to date,
+ mismatches between index structure and domain model as well as query mismatches
+ have to be avoided. <sbr/>
Hibernate Search indexes your domain model thanks to a few annotations,
- takes care of the database / index synchronization and brings you back
- regular managed objects from free text queries. Hibernate Search is using
- <ulink url="http://lucene.apache.org">Apache Lucene</ulink> under the
+ takes care of the database/index synchronization and brings you back
+ regular managed objects from free text queries. To achieve this Hibernate Search
+ is using <ulink url="http://lucene.apache.org">Apache Lucene</ulink> under the
cover.</para>
- <para>Hibernate Search is a work in progress and new features are cooking
+ <important>Hibernate Search is a work in progress and new features are cooking
in this area. So expect some compatibility changes in subsequent
- versions.</para>
+ versions.</important>
</preface>
+ <!-- &getting-started; -->
+
&architecture;
&configuration;
17 years, 5 months
Hibernate SVN: r12883 - trunk/HibernateExt/search/doc/reference/en/modules.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2007-08-02 11:49:05 -0400 (Thu, 02 Aug 2007)
New Revision: 12883
Added:
trunk/HibernateExt/search/doc/reference/en/modules/getting-started.xml
Log:
Added the 'getting started' module - work in progress.
Added: trunk/HibernateExt/search/doc/reference/en/modules/getting-started.xml
===================================================================
--- trunk/HibernateExt/search/doc/reference/en/modules/getting-started.xml (rev 0)
+++ trunk/HibernateExt/search/doc/reference/en/modules/getting-started.xml 2007-08-02 15:49:05 UTC (rev 12883)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id$ -->
+<chapter id="getting-started">
+ <title>Getting started</title>
+
+ <important>Under construction</important>
+
+ <para>
+ The following chapter will guide you through the minimal steps
+ required to integrate Hibernate Search into an existing
+ application.
+ </para>
+
+ <section>
+ <title>System Requirements</title>
+ <table>
+ <title>System requirements</title>
+
+ <tgroup cols="2">
+ <tbody>
+ <row>
+ <entry>Java Runtime</entry>
+ <entry>
+ A JDK or JRE version <emphasis>1.5</emphasis>
+ or greater. You can download a Java Runtime for Windows/Linux/Solaris
+ <ulink url="http://java.sun.com/javase/downloads/"> here </ulink>.
+ </entry>
+ </row>
+ <row>
+ <entry>Hibernate Core</entry>
+ <entry>
+ Version >= 3.2.2
+ </entry>
+ </row>
+ <row>
+ <entry>Hibernate Annotations</entry>
+ <entry>
+ Version 3.3x
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ You can download the dependencies from the Hibernate
+ <ulink url="http://www.hibernate.org/6.html">download site</ulink>. The required dependency versions
+ can also be found in the <ulink url="http://www.hibernate.org/6.html#A3">Compatibility Matrix</ulink>.
+ </section>
+
+ <section>
+ <title>Hibernate Configuration</title>
+ </section>
+
+ <section>
+ <title>First search</title>
+ </section>
+
+</chapter>
\ No newline at end of file
Property changes on: trunk/HibernateExt/search/doc/reference/en/modules/getting-started.xml
___________________________________________________________________
Name: svn:keywords
+ Id
Name: svn:eol-style
+ native
17 years, 5 months
Hibernate SVN: r12882 - shards/trunk/doc/reference.
by hibernate-commits＠lists.jboss.org
Author: max.ross
Date: 2007-08-02 04:01:57 -0400 (Thu, 02 Aug 2007)
New Revision: 12882
Modified:
shards/trunk/doc/reference/build.xml
Log:
still trying to get the build right
Modified: shards/trunk/doc/reference/build.xml
===================================================================
--- shards/trunk/doc/reference/build.xml 2007-08-02 08:01:29 UTC (rev 12881)
+++ shards/trunk/doc/reference/build.xml 2007-08-02 08:01:57 UTC (rev 12882)
@@ -1,7 +1,7 @@
<project name="Documentation" default="all.doc" basedir=".">
<!-- Use the core Hibernate3 doc build system -->
- <import file="../../../common/common-build.xml"/>
+ <import file="../../common-build.xml"/>
<import file="${hibernate-cvs.doc.reference}/build.xml"/>
17 years, 5 months
Hibernate SVN: r12881 - shards/trunk.
by hibernate-commits＠lists.jboss.org
Author: max.ross
Date: 2007-08-02 04:01:29 -0400 (Thu, 02 Aug 2007)
New Revision: 12881
Modified:
shards/trunk/common-build.xml
Log:
still trying to get the build right
Modified: shards/trunk/common-build.xml
===================================================================
--- shards/trunk/common-build.xml 2007-08-02 07:01:48 UTC (rev 12880)
+++ shards/trunk/common-build.xml 2007-08-02 08:01:29 UTC (rev 12881)
@@ -41,12 +41,12 @@
<!-- set Hibernate core related properties -->
- <property name="hibernate-core.home" location="${common-build.basedir}/../hibernate-3.2"/>
+ <property name="hibernate-core.home" location="${common-build.basedir}/../../hibernate-3.2"/>
<property name="hibernate-core.jar" location="${hibernate-core.home}/hibernate3.jar"/>
<property name="hibernate-core.lib.dir" location="${hibernate-core.home}/lib"/>
<property name="hibernate-core.jdbc.dir" location="${hibernate-core.home}/lib"/> <!-- for some reason jdbc.dir is renamed to lib instead of jdbc when doing a dist of hibernate3 -->
<property name="hibernate-core.doc.api" location="${hibernate-core.home}/doc/api"/>
- <property name="hibernate-cvs.doc.reference" location="${common-build.basedir}/../Hibernate3/doc/reference"/>
+ <property name="hibernate-cvs.doc.reference" location="${common-build.basedir}/../../Hibernate3/doc/reference"/>
<!--
Explicitly define tasks from ant..
17 years, 5 months
Hibernate SVN: r12880 - shards/trunk.
by hibernate-commits＠lists.jboss.org
Author: max.ross
Date: 2007-08-02 03:01:48 -0400 (Thu, 02 Aug 2007)
New Revision: 12880
Modified:
shards/trunk/common-build.xml
Log:
update common build file to look for Hibernate core one level lower
Modified: shards/trunk/common-build.xml
===================================================================
--- shards/trunk/common-build.xml 2007-08-02 06:47:27 UTC (rev 12879)
+++ shards/trunk/common-build.xml 2007-08-02 07:01:48 UTC (rev 12880)
@@ -41,12 +41,12 @@
<!-- set Hibernate core related properties -->
- <property name="hibernate-core.home" location="${common-build.basedir}/../../hibernate-3.2"/>
+ <property name="hibernate-core.home" location="${common-build.basedir}/../hibernate-3.2"/>
<property name="hibernate-core.jar" location="${hibernate-core.home}/hibernate3.jar"/>
<property name="hibernate-core.lib.dir" location="${hibernate-core.home}/lib"/>
<property name="hibernate-core.jdbc.dir" location="${hibernate-core.home}/lib"/> <!-- for some reason jdbc.dir is renamed to lib instead of jdbc when doing a dist of hibernate3 -->
<property name="hibernate-core.doc.api" location="${hibernate-core.home}/doc/api"/>
- <property name="hibernate-cvs.doc.reference" location="${common-build.basedir}/../../Hibernate3/doc/reference"/>
+ <property name="hibernate-cvs.doc.reference" location="${common-build.basedir}/../Hibernate3/doc/reference"/>
<!--
Explicitly define tasks from ant..
17 years, 5 months
Hibernate SVN: r12879 - shards/trunk.
by hibernate-commits＠lists.jboss.org
Author: max.ross
Date: 2007-08-02 02:47:27 -0400 (Thu, 02 Aug 2007)
New Revision: 12879
Added:
shards/trunk/common-build.xml
Modified:
shards/trunk/build.xml
Log:
add copy of common build file to shardss and update shards build file to use it
Modified: shards/trunk/build.xml
===================================================================
--- shards/trunk/build.xml 2007-08-02 02:45:31 UTC (rev 12878)
+++ shards/trunk/build.xml 2007-08-02 06:47:27 UTC (rev 12879)
@@ -22,7 +22,7 @@
<property name="javac.source" value="1.5"/>
<property name="javac.target" value="1.5"/>
<property name="jdbc.dir" value="jdbc"/>
- <property name="common.dir" value="${basedir}/../common"/>
+ <property name="common.dir" value="${basedir}"/>
<import file="${common.dir}/common-build.xml"/>
Added: shards/trunk/common-build.xml
===================================================================
--- shards/trunk/common-build.xml (rev 0)
+++ shards/trunk/common-build.xml 2007-08-02 06:47:27 UTC (rev 12879)
@@ -0,0 +1,472 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="common-build" default="dist">
+ <description>Common properties and targets for the HibernateExt project</description>
+
+ <!-- my.basedir property can be used to refer to files/directories relatively to the common-build.xml file -->
+ <dirname property="common-build.basedir" file="${ant.file.common-build}"/>
+
+ <!-- Give user a chance to override without editing this file
+ (and without typing -D each time it compiles it) -->
+ <property file="${common-build.basedir}/build.properties"/>
+ <property file="${user.home}/.ant.properties"/>
+
+ <property name="src.dir" location="src/java"/>
+ <property name="test.dir" location="src/test"/>
+ <property name="lib.dir" location="lib"/>
+ <property name="build.dir" location="build"/>
+ <property name="classes.dir" location="${build.dir}/classes"/>
+ <property name="testclasses.dir" location="${build.dir}/testclasses"/>
+ <property name="dist.target.dir" location="target"/>
+ <property name="dist.dir" location="${dist.target.dir}/${name}"/>
+ <property name="instrumenttest.out.dir" value="instrumenttestout"/>
+ <property name="doc.dir" location="doc"/>
+ <property name="doc.api.dir" location="${doc.dir}/api"/>
+ <property name="doc.reference.dir" location="${doc.dir}/reference"/>
+
+ <property name="dist.doc.dir" location="${dist.dir}/doc"/>
+ <property name="dist.api.dir" location="${dist.dir}/doc/api"/>
+
+ <property name="dist.src.dir" location="${dist.dir}/src"/>
+ <property name="dist.test.dir" location="${dist.dir}/test"/>
+ <property name="dist.lib.dir" location="${dist.dir}/lib"/>
+ <property name="jar.name" value="${name}"/>
+ <property name="jar.file.name" value="${dist.dir}/${jar.name}.jar"/>
+ <property name="jartest.file.name" value="${dist.dir}/${jar.name}-tests.jar"/>
+
+ <property name="javadoc" value="http://java.sun.com/j2se/1.4/docs/api"/>
+ <property name="javac.debug" value="on"/>
+ <property name="javac.optimize" value="off"/>
+ <property name="javac.source" value="1.4"/>
+ <property name="javac.target" value="1.4"/>
+
+
+ <!-- set Hibernate core related properties -->
+ <property name="hibernate-core.home" location="${common-build.basedir}/../../hibernate-3.2"/>
+ <property name="hibernate-core.jar" location="${hibernate-core.home}/hibernate3.jar"/>
+ <property name="hibernate-core.lib.dir" location="${hibernate-core.home}/lib"/>
+ <property name="hibernate-core.jdbc.dir" location="${hibernate-core.home}/lib"/> <!-- for some reason jdbc.dir is renamed to lib instead of jdbc when doing a dist of hibernate3 -->
+ <property name="hibernate-core.doc.api" location="${hibernate-core.home}/doc/api"/>
+ <property name="hibernate-cvs.doc.reference" location="${common-build.basedir}/../../Hibernate3/doc/reference"/>
+
+ <!--
+ Explicitly define tasks from ant..
+ Unfortunately, checkstyle-a<path id="lib.class.path">
+ <path location="${hibernate-core.jar}"></path>
+ <fileset dir="${hibernate-core.lib.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${lib.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ <pathelement path="${clover.jar}"/>
+ </path>ll.jar contains it's own version of ANTLR, so ANTLR cannot be in the classpath.
+ -->
+ <!-- Emmanuel: Removed antlr, shouldn't be useful in Ext package...
+ taskdef name="antlr" classname="org.apache.tools.ant.taskdefs.optional.ANTLR">
+ <classpath>
+ <pathelement location="${hibernate-core.lib.dir}/antlr-2.7.2.jar"/>
+ <pathelement location="${hibernate-core.lib.dir}/ant-antlr-1.6.1.jar"/>
+ </classpath>
+ </taskdef -->
+
+ <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
+ <classpath>
+ <fileset dir="${hibernate-core.lib.dir}">
+ <include name="junit-*.jar"/>
+ <include name="ant-junit-*.jar"/>
+ </fileset>
+ </classpath>
+ </taskdef>
+
+ <taskdef name="junitreport" classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator">
+ <classpath>
+ <fileset dir="${hibernate-core.lib.dir}">
+ <include name="junit-*.jar"/>
+ <include name="ant-junit-*.jar"/>
+ </fileset>
+ </classpath>
+ </taskdef>
+
+ <path id="lib.class.path">
+ <path location="${hibernate-core.jar}"></path>
+ <fileset dir="${hibernate-core.lib.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${lib.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ <path refid="lib.moduleclass.path"/>
+ <pathelement path="${clover.jar}"/>
+ </path>
+
+ <!-- overridable in modules -->
+ <path id="lib.moduleclass.path"/>
+
+ <patternset id="support.files">
+ <include name="**/*.jpg"/>
+ <include name="**/*.gif"/>
+ <include name="**/*.dtd"/>
+ <include name="**/*.xsd"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.xslt"/>
+
+ <!-- exclude everything we don't want in the jar -->
+ <exclude name="${build.dir}/**/*"/>
+ <exclude name="${doc.dir}/**/*"/>
+ <exclude name="classes/**/*"/>
+ <exclude name="build.xml"/>
+ <exclude name="**/*.properties"/>
+ <exclude name="**/*.ccf"/>
+ <exclude name="**/*.cfg.xml"/>
+ <exclude name="**/ehcache.xml"/>
+ </patternset>
+
+ <patternset id="source.files">
+ <include name="**/*.java"/>
+ <include name="**/*.properties"/>
+ </patternset>
+
+ <!-- junit paths/filesets -->
+ <fileset dir="${testclasses.dir}" id="junit.batchtestset">
+ <include name="**/*Test.class"/>
+ </fileset>
+
+ <path id="testsrc.path">
+ <pathelement location="${test.dir}"/>
+ </path>
+
+ <!-- Clover -->
+ <property name="clover.out.dir" value="cloverout"/>
+ <property name="clover.jar" value="${ant.home}/lib/clover.jar"/>
+ <taskdef resource="clovertasks"/>
+
+ <path id="junit.classpath">
+ <fileset dir="${lib.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ <pathelement path="${classes.dir}"/>
+ <pathelement path="${testclasses.dir}"/>
+ <path refid="lib.class.path"/>
+ <path refid="junit.moduleclasspath"/>
+ <path location="${clover.jar}"/>
+ </path>
+
+ <!-- Clover tasks -->
+ <target name="with.clover">
+ <clover-setup initString="clover_coverage.db"/>
+ </target>
+
+ <target name="cloverreport.html" depends="with.clover"
+ description="Generate a clover report from the current clover database.">
+ <clover-report>
+ <current outfile="${clover.out.dir}">
+ <format type="html"/>
+ </current>
+ </clover-report>
+ </target>
+
+ <target name="cloverreport" depends="with.clover,junitreport,cloverreport.html"
+ description="Run the tests and generate a clover report">
+ </target>
+
+ <!-- Tasks -->
+
+ <target name="clean" description="Cleans up build and dist directories">
+ <delete dir="${build.dir}"/>
+ <delete dir="${dist.target.dir}"/>
+ <delete dir="${clover.out.dir}"/>
+ </target>
+
+ <target name="init" description="Initialize the build">
+ <tstamp>
+ <format property="subversion" pattern="yyyy-MM-dd hh:mm:ss"/>
+ </tstamp>
+ <echo message="Build ${Name}-${version} (${subversion})"/>
+ <mkdir dir="${classes.dir}"/>
+ <mkdir dir="${testclasses.dir}"/>
+ <copy todir="${classes.dir}">
+ <fileset dir="${src.dir}">
+ <patternset refid="support.files"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${build.dir}">
+ <fileset dir=".">
+ <include name="readme.txt"/>
+ <include name="lgpl.txt"/>
+ </fileset>
+ </copy>
+
+ <available file="${hibernate-core.jar}" type="file" property="hibernate-core.jar.available"/>
+ <fail unless="hibernate-core.jar.available" message="Cannot locate hibernate-core.jar: ${hibernate-core.jar}"/>
+ </target>
+
+ <target name="compile" depends="init" description="Compile the Java source code">
+ <available
+ classname="org.eclipse.core.launcher.Main"
+ property="build.compiler"
+ value="org.eclipse.jdt.core.JDTCompilerAdapter"
+ classpath="${java.class.path}"/>
+ <javac
+ target="${javac.target}"
+ source="${javac.source}"
+ srcdir="${src.dir}"
+ destdir="${classes.dir}"
+ classpathref="lib.class.path"
+ debug="${javac.debug}"
+ optimize="${javac.optimize}"
+ nowarn="on">
+ </javac>
+ </target>
+
+ <target name="compiletest" depends="compile" description="Compile the tests">
+ <available
+ classname="org.eclipse.core.launcher.Main"
+ property="build.compiler"
+ value="org.eclipse.jdt.core.JDTCompilerAdapter"
+ classpath="${java.class.path}"/>
+ <javac
+ target="${javac.target}"
+ source="${javac.source}"
+ destdir="${testclasses.dir}"
+ classpathref="junit.classpath"
+ debug="${javac.debug}"
+ optimize="${javac.optimize}"
+ nowarn="on">
+ <src refid="testsrc.path"/>
+ </javac>
+ </target>
+
+ <target name="instrument" depends="compiletest"
+ description="Instrument the persistent classes"> <!-- depends="jar" -->
+
+ <taskdef name="instrument" classname="org.hibernate.tool.instrument.InstrumentTask">
+ <classpath path="${classes.dir}"/>
+ <classpath path="${testclasses.dir}"/>
+ <classpath refid="lib.class.path"/>
+ </taskdef>
+
+ <instrument verbose="true">
+ <fileset dir="${testclasses.dir}/org/hibernate/test">
+ <include name="**/*.class"/>
+ <exclude name="**/*Test$*.class"/>
+ <exclude name="**/*Test.class"/>
+ <exclude name="**/*Tests.class"/>
+ </fileset>
+ </instrument>
+
+ <!-- jar jarfile="${build.dir}/instrumented-classes.jar">
+ <fileset dir="${testclasses.dir}">
+ <include name="org/hibernate/test/**/*.class"/>
+ <exclude name="org/hibernate/test/**/*Test.class"/>
+ </fileset>
+ </jar -->
+
+ </target>
+
+ <target name="copytest" description="Copy tests to dist dir" if="copy.test" >
+ <mkdir dir="${dist.test.dir}"/>
+ <copy todir="${dist.test.dir}">
+ <fileset dir="${test.dir}"/>
+ </copy>
+ </target>
+
+ <target name="copysource" depends="copytest" description="Copy sources to dist dir">
+ <mkdir dir="${dist.src.dir}"/>
+ <copy todir="${dist.src.dir}">
+ <fileset dir="${src.dir}">
+ <patternset refid="source.files"/>
+ </fileset>
+ <fileset dir="${src.dir}">
+ <patternset refid="support.files"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${dist.src.dir}"/>
+ <copy todir="${dist.src.dir}">
+ <fileset dir="${src.dir}">
+ <patternset refid="source.files"/>
+ </fileset>
+ <fileset dir="${src.dir}">
+ <patternset refid="support.files"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="copylib" description="Copy jars to lib dir">
+ <mkdir dir="${dist.lib.dir}"/>
+ <copy todir="${dist.lib.dir}">
+ <fileset dir="${lib.dir}">
+ <include name="*.jar"/>
+ <exclude name="log4j.jar"/>
+ <exclude name="checkstyle*.jar"/>
+ <include name="*.txt"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="copydoc" description="Copy doc to dist dir" if="copy.doc">
+ <mkdir dir="${dist.doc.dir}"/>
+ <copy todir="${dist.doc.dir}">
+ <fileset dir="${doc.dir}">
+ <include name="**/*.html"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="jar" depends="compile" description="Build the distribution .jar file">
+ <mkdir dir="${dist.dir}"/>
+ <jar filesetmanifest="merge" jarfile="${jar.file.name}" basedir="${classes.dir}"/>
+ </target>
+
+ <target name="jartest" depends="compiletest" description="Build the distribution .jar file">
+ <mkdir dir="${dist.dir}"/>
+ <jar filesetmanifest="merge" jarfile="${jartest.file.name}" basedir="${testclasses.dir}"/>
+ </target>
+
+ <!-- DOCUMENTATION -->
+
+ <target name="javadoc" description="Compile the Javadoc API documentation to dist dir">
+ <mkdir dir="${dist.api.dir}"/>
+ <javadoc
+ packagenames="${javadoc.packagenames}"
+ classpathref="lib.class.path"
+ destdir="${dist.api.dir}"
+ use="true"
+ protected="true"
+ version="true"
+ windowtitle="${Name} API Documentation"
+ Overview="${doc.api.dir}/package.html"
+ doctitle="${Name} API Documentation"
+ stylesheetfile="${hibernate-core.doc.api}/jdstyle.css"
+ link="${javadoc}">
+ <packageset dir="${src.dir}" defaultexcludes="yes" >
+ <include name="**/*" />
+ </packageset>
+ </javadoc>
+
+
+ </target>
+
+
+ <target name="extras" description="Copies miscellaneous files to root dir">
+ <copy todir="${dist.dir}/bin" failonerror="false">
+ <fileset dir="bin">
+ <include name="*.bat"/>
+ </fileset>
+ </copy>
+ <copy file="readme.txt" todir="${dist.dir}"/>
+ <copy file="lgpl.txt" todir="${dist.dir}"/>
+ <copy file="changelog.txt" todir="${dist.dir}"/>
+ <copy file="build.xml" todir="${dist.dir}"/>
+ <replace file="${dist.dir}/build.xml">
+ <replacetoken><![CDATA[../${name}-${version}]]></replacetoken>
+ <replacevalue><![CDATA[../${name}]]></replacevalue>
+ </replace>
+ </target>
+
+ <target name="dist" depends="jar,javadoc,copysource,copylib,copydoc,extras" description="Build everything">
+ <zip zipfile = "${dist.dir}-${version}.zip">
+ <zipfileset prefix="${name}-${version}" dir="${dist.dir}"/>
+ </zip>
+ <tar compression="gzip" tarfile="${dist.dir}-${version}.tar.gz">
+ <tarfileset prefix="${name}-${version}" dir="${dist.dir}"/>
+ </tar>
+ </target>
+
+ <target name="info" description="Echoes useful system properties">
+ <echo message="java.vm.info=${java.vm.info}"/>
+ <echo message="java.vm.name=${java.vm.name}"/>
+ <echo message="java.vm.vendor=${java.vm.vendor}"/>
+ <echo message="java.vm.version=${java.vm.version}"/>
+ <echo message="os.arch=${os.arch}"/>
+ <echo message="os.name=${os.name}"/>
+ <echo message="os.version=${os.version}"/>
+ <echo message="java.home = ${java.home}"/>
+ <echo message="java.class.path = ${java.class.path}"/>
+ <echo message="build.compiler = ${build.compiler}"/>
+ <echo message="file.encoding=${file.encoding}"/>
+ <echo message="user.home = ${user.home}"/>
+ <echo message="user.language=${user.language}"/>
+ </target>
+
+ <target name="junit" depends="compiletest">
+ <mkdir dir="test_output"/>
+ <junit printsummary="yes" haltonfailure="yes" forkmode="once">
+ <classpath refid="junit.classpath"/>
+ <formatter type="plain"/>
+ <formatter type="xml"/>
+ <batchtest fork="yes" todir="test_output" haltonfailure="no">
+ <fileset refid="junit.batchtestset"/>
+ </batchtest>
+ </junit>
+ </target>
+
+ <!-- Run a single unit test. -->
+ <target name="junitsingle" depends="compiletest" description="Run a single test suite (requires testname and jdbc.driver properties)">
+ <mkdir dir="test_output"/>
+ <junit printsummary="yes" fork="yes" haltonfailure="yes">
+ <classpath refid="junit.classpath"/>
+ <formatter type="plain"/>
+ <formatter type="xml"/>
+ <test fork="yes" todir="test_output" haltonfailure="no" name="${testname}"/>
+ </junit>
+ </target>
+
+ <target name="junitinstrument" depends="compiletest,instrument"
+ description="Run the instrument test suite (requires driver.jar property)">
+ <mkdir dir="${instrumenttest.out.dir}"/>
+ <junit printsummary="yes" haltonfailure="yes" dir="${basedir}"
+ maxmemory="256M" fork="yes" forkmode="perBatch">
+ <classpath refid="junit.classpath"/>
+ <formatter type="plain"/>
+ <formatter type="xml"/>
+ <batchtest todir="${instrumenttest.out.dir}" haltonfailure="no">
+ <fileset dir="${classes.dir}">
+ <include name="org/hibernate/test/**/*Test.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="junitreport" depends="">
+ <junitreport todir="./test_output">
+ <fileset dir="test_output">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <report format="frames" todir="./test_output"/>
+ </junitreport>
+ </target>
+
+ <target name="run" depends="compile" description="Run Hibernate Console">
+ <java classname="org.hibernate.console.Start" classpathref="lib.class.path" fork="true">
+ <classpath>
+ <path location="${build.dir}"/>
+ </classpath>
+ </java>
+ </target>
+
+
+ <target name="checkstyle" description="Check coding style">
+ <taskdef resource="checkstyletask.properties">
+ <classpath>
+ <path refid="lib.class.path"/>
+ <fileset dir="${common-build.basedir}/lib">
+ <include name="checkstyle*.jar"/>
+ </fileset>
+ </classpath>
+ </taskdef>
+
+ <checkstyle config="${common-build.basedir}/checkstyle_checks.xml">
+ <fileset dir="${src.dir}">
+ <include name="**/*.java"/>
+ </fileset>
+ <formatter type="plain"/>
+ </checkstyle>
+ </target>
+
+ <target name="patch" depends="checkstyle"
+ description="Create a patch">
+ <cvs command="-q diff -u -N" output="patch.txt"/>
+ </target>
+
+</project>
\ No newline at end of file
17 years, 5 months
Hibernate SVN: r12878 - core/trunk/core/src/main/java/org/hibernate/util.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2007-08-01 22:45:31 -0400 (Wed, 01 Aug 2007)
New Revision: 12878
Modified:
core/trunk/core/src/main/java/org/hibernate/util/PropertiesHelper.java
Log:
HHH-2761 : null and empty string consistency in PropertiesHelper
Modified: core/trunk/core/src/main/java/org/hibernate/util/PropertiesHelper.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/util/PropertiesHelper.java 2007-08-02 00:04:24 UTC (rev 12877)
+++ core/trunk/core/src/main/java/org/hibernate/util/PropertiesHelper.java 2007-08-02 02:45:31 UTC (rev 12878)
@@ -7,58 +7,65 @@
import java.util.StringTokenizer;
import java.util.Iterator;
-
public final class PropertiesHelper {
private static final String PLACEHOLDER_START = "${";
- public static boolean getBoolean(String property, Properties properties) {
- String setting = properties.getProperty(property);
- return setting != null && Boolean.valueOf( setting.trim() ).booleanValue();
+ public static String getString(String propertyName, Properties properties, String defaultValue) {
+ String value = extractPropertyValue( propertyName, properties );
+ return value == null ? defaultValue : value;
}
- public static boolean getBoolean(String property, Properties properties, boolean defaultValue) {
- String setting = properties.getProperty(property);
- return setting==null ? defaultValue : Boolean.valueOf( setting.trim() ).booleanValue();
+ private static String extractPropertyValue(String propertyName, Properties properties) {
+ String value = properties.getProperty( propertyName );
+ if ( value == null ) {
+ return null;
+ }
+ value = value.trim();
+ if ( StringHelper.isEmpty( value ) ) {
+ return null;
+ }
+ return value;
}
- public static int getInt(String property, Properties properties, int defaultValue) {
- String propValue = properties.getProperty(property);
- return propValue==null ? defaultValue : Integer.parseInt( propValue.trim() );
+ public static boolean getBoolean(String property, Properties properties) {
+ return getBoolean( property, properties, false );
}
- public static String getString(String property, Properties properties, String defaultValue) {
- String propValue = properties.getProperty(property);
- return propValue==null ? defaultValue : propValue;
+ public static boolean getBoolean(String propertyName, Properties properties, boolean defaultValue) {
+ String value = extractPropertyValue( propertyName, properties );
+ return value == null ? defaultValue : Boolean.valueOf( value ).booleanValue();
}
- public static Integer getInteger(String property, Properties properties) {
- String propValue = properties.getProperty(property);
- return propValue==null ? null : Integer.valueOf( propValue.trim() );
+ public static int getInt(String propertyName, Properties properties, int defaultValue) {
+ String value = extractPropertyValue( propertyName, properties );
+ return value == null ? defaultValue : Integer.parseInt( value );
}
- public static Map toMap(String property, String delim, Properties properties) {
+ public static Integer getInteger(String propertyName, Properties properties) {
+ String value = extractPropertyValue( propertyName, properties );
+ return value == null ? null : Integer.valueOf( value );
+ }
+
+ public static Map toMap(String propertyName, String delim, Properties properties) {
Map map = new HashMap();
- String propValue = properties.getProperty(property);
- if (propValue!=null) {
- StringTokenizer tokens = new StringTokenizer(propValue, delim);
+ String value = extractPropertyValue( propertyName, properties );
+ if ( value != null ) {
+ StringTokenizer tokens = new StringTokenizer( value, delim );
while ( tokens.hasMoreTokens() ) {
- map.put(
- tokens.nextToken(),
- tokens.hasMoreElements() ? tokens.nextToken() : ""
- );
+ map.put( tokens.nextToken(), tokens.hasMoreElements() ? tokens.nextToken() : "" );
}
}
return map;
}
- public static String[] toStringArray(String property, String delim, Properties properties) {
- return toStringArray( properties.getProperty(property), delim );
+ public static String[] toStringArray(String propertyName, String delim, Properties properties) {
+ return toStringArray( extractPropertyValue( propertyName, properties ), delim );
}
- public static String[] toStringArray(String propValue, String delim) {
- if (propValue!=null) {
- return StringHelper.split(delim, propValue);
+ public static String[] toStringArray(String stringForm, String delim) {
+ if ( stringForm != null ) {
+ return StringHelper.split( delim, stringForm );
}
else {
return ArrayHelper.EMPTY_STRING_ARRAY;
@@ -73,9 +80,9 @@
* @return cloned and masked properties
*/
public static Properties maskOut(Properties props, String key) {
- Properties clone = (Properties) props.clone();
- if (clone.get(key) != null) {
- clone.setProperty(key, "****");
+ Properties clone = ( Properties ) props.clone();
+ if ( clone.get( key ) != null ) {
+ clone.setProperty( key, "****" );
}
return clone;
}
@@ -145,5 +152,6 @@
}
- private PropertiesHelper() {}
+ private PropertiesHelper() {
+ }
}
17 years, 5 months
Hibernate SVN: r12877 - maven-poms/trunk/core-parent.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2007-08-01 20:04:24 -0400 (Wed, 01 Aug 2007)
New Revision: 12877
Modified:
maven-poms/trunk/core-parent/pom.xml
Log:
jcl/sl4fj
Modified: maven-poms/trunk/core-parent/pom.xml
===================================================================
--- maven-poms/trunk/core-parent/pom.xml 2007-08-01 22:53:24 UTC (rev 12876)
+++ maven-poms/trunk/core-parent/pom.xml 2007-08-02 00:04:24 UTC (rev 12877)
@@ -206,7 +206,8 @@
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
- </dependency>
+ </dependency>
+ <!-- Force commons-logging out of deps, even transitive ones, based on this "hack" -->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -217,8 +218,15 @@
<artifactId>commons-logging-api</artifactId>
<version>99.0-does-not-exist</version>
</dependency>
+ <!-- The slf4j commons-logging replacement -->
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+ <!-- The basic slf4j API -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.4.2</version>
</dependency>
17 years, 5 months