Menu
▾
▴
[Hibernate-commits] Hibernate Code SVN: r9796 - in trunk/HibernateExt/ejb: . src/java/org/hibernate/ejb src/java/org/hibernate/ejb/connection src/java/org/hibernate/ejb/event src/java/org/hibernate/ejb/instrument src/java/org/hibernate/ejb/packaging src/java/org/hibernate/ejb/transaction src/java/org/hibernate/ejb/util src/resources/org/hibernate/ejb src/test/org/hibernate/ejb/test src/test/org/hibernate/ejb/test/callbacks src/test/org/hibernate/ejb/test/cascade src/test/org/hibernate/ejb/test/connection src/test/org/hibernate/ejb/test/ejb3configuration src/test/org/hibernate/ejb/test/instrument src/test/org/hibernate/ejb/test/lob src/test/org/hibernate/ejb/test/lock src/test/org/hibernate/ejb/test/ops src/test/org/hibernate/ejb/test/pack/cfgxmlpar src/test/org/hibernate/ejb/test/pack/defaultpar src/test/org/hibernate/ejb/test/pack/excludehbmpar src/test/org/hibernate/ejb/test/pack/explodedpar src/test/org/hibernate/ejb/test/packaging src/test/org/hibernate/ejb/test/transaction src/te! st/org/hibernate/ejb/test/xml src/test-resources/cfgxmlpar/META-INF src/test-resources/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar src/test-resources/defaultpar/META-INF src/test-resources/defaultpar/org/hibernate/ejb/test/pack/defaultpar src/test-resources/excludehbmpar/META-INF src/test-resources/excludehbmpar/org/hibernate/ejb/test/pack/excludehbmpar src/test-resources/explicitpar src/test-resources/explicitpar/META-INF src/test-resources/explodedpar/META-INF src/test-resources/explodedpar/org/hibernate/ejb/test/pack/explodedpar
Author: epbernard
Date: 2006-04-26 02:46:52 -0400 (Wed, 26 Apr 2006)
New Revision: 9796
Modified:
trunk/HibernateExt/ejb/build.xml
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/EntityManagerImpl.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/EventListenerConfigurator.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/HibernateEntityManagerImplementor.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/HibernatePersistence.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/HibernateQuery.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/InjectionSettingsFactory.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/QueryImpl.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/TransactionImpl.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Version.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/Callback.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/CallbackResolver.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/EJB3DeleteEventListener.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/EJB3FlushEntityEventListener.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/EJB3MergeEventListener.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/EJB3PersistEventListener.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/EJB3PostDeleteEventListener.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/EJB3PostInsertEventListener.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/EJB3PostLoadEventListener.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/EJB3PostUpdateEventListener.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/EJB3SaveEventListener.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/EJB3SaveOrUpdateEventListener.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/EntityCallbackHandler.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/ListenerCallback.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/instrument/InterceptFieldClassFileTransformer.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/packaging/InputStreamZippedJarVisitor.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/packaging/JarVisitor.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/packaging/XmlHelper.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/transaction/JoinableCMTTransaction.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/transaction/JoinableCMTTransactionFactory.java
trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/util/LogHelper.java
trunk/HibernateExt/ejb/src/resources/org/hibernate/ejb/persistence_1_0.xsd
trunk/HibernateExt/ejb/src/test-resources/cfgxmlpar/META-INF/persistence.xml
trunk/HibernateExt/ejb/src/test-resources/cfgxmlpar/org/hibernate/ejb/test/pack/cfgxmlpar/hibernate.cfg.xml
trunk/HibernateExt/ejb/src/test-resources/defaultpar/META-INF/orm.xml
trunk/HibernateExt/ejb/src/test-resources/defaultpar/META-INF/persistence.xml
trunk/HibernateExt/ejb/src/test-resources/defaultpar/org/hibernate/ejb/test/pack/defaultpar/Mouse.hbm.xml
trunk/HibernateExt/ejb/src/test-resources/excludehbmpar/META-INF/persistence.xml
trunk/HibernateExt/ejb/src/test-resources/excludehbmpar/org/hibernate/ejb/test/pack/excludehbmpar/Mouse.hbm.xml
trunk/HibernateExt/ejb/src/test-resources/explicitpar/META-INF/persistence.xml
trunk/HibernateExt/ejb/src/test-resources/explicitpar/orm2.xml
trunk/HibernateExt/ejb/src/test-resources/explodedpar/META-INF/persistence.xml
trunk/HibernateExt/ejb/src/test-resources/explodedpar/org/hibernate/ejb/test/pack/explodedpar/Elephant.hbm.xml
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/Cat.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/Distributor.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/EJB3TestCase.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/EntityManagerTest.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/Item.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/PackagedEntityManagerTest.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/QueryTest.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/TestCase.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/ValidatorIntegrationTest.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/callbacks/CallbacksTest.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/callbacks/CommunicationSystem.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/callbacks/CountryChecker.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/callbacks/CountryNameCheckerListener.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/callbacks/IncreaseListener.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/callbacks/Person.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/callbacks/RemoteControl.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/callbacks/Television.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/callbacks/Translation.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/callbacks/VideoSystem.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/cascade/Conference.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/cascade/ExtractionDocument.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/cascade/ExtractionDocumentInfo.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/cascade/FetchTest.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/cascade/Grandson.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/cascade/Parent.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/cascade/Soldier.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/cascade/Son.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/cascade/Troop.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/connection/DataSourceInjectionTest.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/connection/FakeDataSource.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/connection/FakeDataSourceException.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/ejb3configuration/EntityManagerSerializationTest.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/ejb3configuration/EventOverridingTest.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/ejb3configuration/ExceptionInterceptor.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/ejb3configuration/InterceptorTest.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/ejb3configuration/TestCase.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/hibernate.cfg.xml
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/instrument/InstrumentedClassLoader.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/instrument/InterceptFieldClassFileTransformerTest.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/lob/BlobTest.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/lob/ImageReader.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/lock/Lock.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/lock/LockTest.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/ops/Child.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/ops/Employer.hbm.xml
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/ops/FlushTest.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/ops/GetLoadTest.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/ops/MergeNewTest.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/ops/Node.hbm.xml
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/ops/Parent.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/ops/ParentChild.hbm.xml
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/ops/PersistTest.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/ops/Workload.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/pack/cfgxmlpar/Morito.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/pack/defaultpar/ApplicationServer.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/pack/defaultpar/Version.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/pack/defaultpar/package-info.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/pack/excludehbmpar/Caipirinha.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/pack/explodedpar/Carpet.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/pack/explodedpar/package-info.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/package-info.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/packaging/JarVisitorTest.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/transaction/Book.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/xml/XmlTest.java
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/xml/orm.xml
trunk/HibernateExt/ejb/src/test/org/hibernate/ejb/test/xml/orm2.xml
Log:
Style clean
Modified: trunk/HibernateExt/ejb/build.xml
===================================================================
--- trunk/HibernateExt/ejb/build.xml 2006-04-26 06:41:18 UTC (rev 9795)
+++ trunk/HibernateExt/ejb/build.xml 2006-04-26 06:46:52 UTC (rev 9796)
@@ -18,7 +18,7 @@
<property name="name" value="hibernate-entitymanager"/>
<property name="version" value="3.1beta7"/>
<property name="javadoc.packagenames" value="org.hibernate.ejb.*"/>
- <property name="jdbc.dir" value="jdbc"/>
+ <property name="jdbc.dir" value="jdbc"/>
<property name="copy.test" value="true"/>
<property name="common.dir" value="../common"/>
@@ -30,21 +30,21 @@
<property name="build.testresources.dir" value="${build.dir}/testresources"/>
<property name="build.temp.dir" value="${build.dir}/temp"/>
- <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
- source="1.5"
- srcdir="${src.dir}"
- destdir="${classes.dir}"
- classpathref="lib.class.path"
- debug="${javac.debug}"
- optimize="${javac.optimize}"
- nowarn="on"
- >
+ <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
+ source="1.5"
+ srcdir="${src.dir}"
+ destdir="${classes.dir}"
+ classpathref="lib.class.path"
+ debug="${javac.debug}"
+ optimize="${javac.optimize}"
+ nowarn="on"
+ >
</javac>
</target>
@@ -64,11 +64,11 @@
<delete dir="${build.temp.dir}"/>
</target>
- <target name="packexploded" >
+ <target name="packexploded">
<property name="extension" value="jar"/>
<!-- property name="jarname"/ -->
<mkdir dir="${build.testresources.dir}/${jarname}.${extension}"/>
- <copy todir="${build.testresources.dir}/${jarname}.${extension}">
+ <copy todir="${build.testresources.dir}/${jarname}.${extension}">
<!-- fileset dir="${build.temp.dir}"/ -->
<fileset dir="${classes.dir}">
<include name="**/test/pack/${jarname}/**.*"/>
@@ -107,57 +107,59 @@
</antcall>
</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
- source="1.5"
- srcdir="${test.dir}"
- destdir="${classes.dir}"
- debug="${javac.debug}"
- optimize="${javac.optimize}"
- nowarn="on">
+ <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
+ source="1.5"
+ srcdir="${test.dir}"
+ destdir="${classes.dir}"
+ debug="${javac.debug}"
+ optimize="${javac.optimize}"
+ nowarn="on">
<classpath>
<path refid="lib.class.path"/>
</classpath>
- </javac>
- </target>
-
+ </javac>
+ </target>
+
<target name="junit" depends="compiletest,test-resources">
<mkdir dir="test_output"/>
<mkdir dir="${classes.dir}/META-INF/services"/>
<copy todir="${classes.dir}">
- <fileset dir="${resources.dir}">
+ <fileset dir="${resources.dir}">
<include name="**/*.*"/>
</fileset>
- </copy>
+ </copy>
<junit fork="once" printsummary="yes" haltonfailure="yes">
<classpath>
<fileset dir="${jdbc.dir}">
- <include name="**/*.jar"/>
- <include name="**/*.zip"/>
- </fileset>
+ <include name="**/*.jar"/>
+ <include name="**/*.zip"/>
+ </fileset>
<dirset dir="${build.testresources.dir}">
<include name="**/*.jar"/>
<include name="**/*.par"/>
</dirset>
<fileset dir="${build.testresources.dir}">
- <include name="**/*.jar"/>
- <include name="**/*.par"/>
- </fileset>
- <path refid="lib.class.path"/>
+ <include name="**/*.jar"/>
+ <include name="**/*.par"/>
+ </fileset>
+ <path refid="lib.class.path"/>
<!-- pathelement path="${classes.dir}"/ -->
<dirset dir="${classes.dir}">
<exclude name="**/pack/**.*"/>
</dirset>
-
+
<!-- pathelement path="build/test.par"/ -->
- <pathelement path="${src.dir}"/> <!-- pick up properties from here -->
- <pathelement path="${test.dir}"/> <!-- pick up mappings from here -->
+ <pathelement path="${src.dir}"/>
+ <!-- pick up properties from here -->
+ <pathelement path="${test.dir}"/>
+ <!-- pick up mappings from here -->
</classpath>
<formatter type="plain"/>
<formatter type="xml"/>
@@ -169,34 +171,37 @@
</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>
- <fileset dir="${jdbc.dir}">
- <include name="**/*.jar"/>
- <include name="**/*.zip"/>
- </fileset>
- <path refid="lib.class.path"/>
- <pathelement path="build/test.par"/>
- <pathelement path="target/hibernate-entitymanager/hibernate-entitymanager.jar"/>
- <pathelement path="${src.dir}"/> <!-- pick up properties from here -->
- <pathelement path="${test.dir}"/> <!-- pick up mappings from here -->
- </classpath>
- <formatter type="plain"/>
- <formatter type="xml"/>
- <test fork="yes" todir="test_output" haltonfailure="no" name="${testname}"/>
- </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>
+ <fileset dir="${jdbc.dir}">
+ <include name="**/*.jar"/>
+ <include name="**/*.zip"/>
+ </fileset>
+ <path refid="lib.class.path"/>
+ <pathelement path="build/test.par"/>
+ <pathelement path="target/hibernate-entitymanager/hibernate-entitymanager.jar"/>
+ <pathelement path="${src.dir}"/>
+ <!-- pick up properties from here -->
+ <pathelement path="${test.dir}"/>
+ <!-- pick up mappings from here -->
+ </classpath>
+ <formatter type="plain"/>
+ <formatter type="xml"/>
+ <test fork="yes" todir="test_output" haltonfailure="no" name="${testname}"/>
+ </junit>
+ </target>
<target name="jar" depends="compile" description="Build the distribution .jar file">
<mkdir dir="${classes.dir}/META-INF/services"/>
<copy todir="${classes.dir}">
- <fileset dir="${resources.dir}">
+ <fileset dir="${resources.dir}">
<include name="**/*.*"/>
</fileset>
- </copy>
+ </copy>
<manifest file="${classes.dir}/META-INF/MANIFEST.MF">
<attribute name="Product" value="${Name}"/>
<attribute name="Version" value="${version}"/>
@@ -238,37 +243,39 @@
<antcall target="common-build.dist"/>
</target>
- <target name="zip-dist" description="zip the dist">
- <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="zip-dist" description="zip the dist">
+ <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="profile" depends="compiletest">
<java classname="org.hibernate.ejb.test.Profile" fork="true">
<jvmarg value="-XrunjbossInspector:c:\profiler\data,include=org.hibernate.ejb,ignore=*,wakeupOnStartup=true"/>
<classpath>
<fileset dir="${jdbc.dir}">
- <include name="**/*.jar"/>
- <include name="**/*.zip"/>
- </fileset>
+ <include name="**/*.jar"/>
+ <include name="**/*.zip"/>
+ </fileset>
<dirset dir="${build.testresources.dir}">
<include name="**/*.jar"/>
<include name="**/*.par"/>
</dirset>
<fileset dir="${build.testresources.dir}">
- <include name="**/*.jar"/>
- <include name="**/*.par"/>
- </fileset>
- <path refid="lib.class.path"/>
+ <include name="**/*.jar"/>
+ <include name="**/*.par"/>
+ </fileset>
+ <path refid="lib.class.path"/>
<pathelement path="${classes.dir}"/>
<!-- pathelement path="build/test.par"/ -->
- <pathelement path="${src.dir}"/> <!-- pick up properties from here -->
- <pathelement path="${test.dir}"/> <!-- pick up mappings from here -->
+ <pathelement path="${src.dir}"/>
+ <!-- pick up properties from here -->
+ <pathelement path="${test.dir}"/>
+ <!-- pick up mappings from here -->
</classpath>
</java>
</target>
Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java 2006-04-26 06:41:18 UTC (rev 9795)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/AbstractEntityManagerImpl.java 2006-04-26 06:46:52 UTC (rev 9796)
@@ -68,7 +68,7 @@
protected void postInit() {
//register in Sync if needed
- if ( PersistenceUnitTransactionType.JTA.equals(transactionType) ) joinTransaction( true );
+ if ( PersistenceUnitTransactionType.JTA.equals( transactionType ) ) joinTransaction( true );
}
public Query createQuery(String ejbqlString) {
@@ -419,18 +419,20 @@
final JoinableCMTTransaction joinableCMTTransaction = (JoinableCMTTransaction) session.getTransaction();
if ( joinableCMTTransaction.getStatus() == JoinableCMTTransaction.JoinStatus.JOINED ) {
- log.debug("Transaction already joined");
+ log.debug( "Transaction already joined" );
return; //no-op
}
joinableCMTTransaction.markForJoined();
session.isOpen(); //register to the Tx
if ( joinableCMTTransaction.getStatus() == JoinableCMTTransaction.JoinStatus.NOT_JOINED ) {
- if (ignoreNotJoining) {
+ if ( ignoreNotJoining ) {
log.debug( "No JTA transaction found" );
return;
}
else {
- throw new TransactionRequiredException( "No active JTA transaction on joinTransaction call" );
+ throw new TransactionRequiredException(
+ "No active JTA transaction on joinTransaction call"
+ );
}
}
else
@@ -439,7 +441,7 @@
}
//flush before completion and
//register clear on rollback
- log.trace("Adding flush() and close() synchronization");
+ log.trace( "Adding flush() and close() synchronization" );
joinableCMTTransaction.registerSynchronization(
new Synchronization() {
public void beforeCompletion() {
@@ -506,7 +508,7 @@
);
}
else {
- log.warn("Cannot join transaction, not a JoinableCMTTransaction");
+ log.warn( "Cannot join transaction, not a JoinableCMTTransaction" );
}
}
catch (HibernateException he) {
@@ -514,7 +516,7 @@
}
}
else {
- if (!ignoreNotJoining) log.warn("Calling joinTransaction() on a non JTA EntityManager");
+ if ( !ignoreNotJoining ) log.warn( "Calling joinTransaction() on a non JTA EntityManager" );
}
}
Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java 2006-04-26 06:41:18 UTC (rev 9795)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Ejb3Configuration.java 2006-04-26 06:46:52 UTC (rev 9796)
@@ -138,8 +138,8 @@
* appropriate extra properties. Those properties override the one get through
* the peristence.xml file.
*
- * @param emName entity manager name
- * @param integration properties passed to the persistence provider
+ * @param emName entity manager name
+ * @param integration properties passed to the persistence provider
* @return initialized EntityManagerFactory
*/
public EntityManagerFactory createEntityManagerFactory(String emName, Map integration) {
@@ -154,7 +154,7 @@
while ( xmls.hasMoreElements() ) {
URL url = xmls.nextElement();
log.trace( "Analyse of persistence.xml: " + url );
- List<PersistenceMetadata> metadataFiles = PersistenceXmlLoader.deploy(
+ List<PersistenceMetadata> metadataFiles = PersistenceXmlLoader.deploy(
url,
integration,
cfg.getEntityResolver()
@@ -231,15 +231,15 @@
log.info( "Processing PersistenceUnitInfo [\n\tname: " + info.getPersistenceUnitName() + "\n\t...]" );
}
- integration = integration != null ? Collections.unmodifiableMap(integration) : CollectionHelper.EMPTY_MAP;
+ integration = integration != null ? Collections.unmodifiableMap( integration ) : CollectionHelper.EMPTY_MAP;
String provider = (String) integration.get( HibernatePersistence.PROVIDER );
- if (provider == null) provider = info.getPersistenceProviderClassName();
+ if ( provider == null ) provider = info.getPersistenceProviderClassName();
if ( provider != null && ! provider.trim().startsWith( IMPLEMENTATION_NAME ) ) {
log.info( "Required a different provider: " + provider );
return null;
}
if ( info.getClassLoader() == null ) {
- throw new IllegalStateException("PersistenceUnitInfo.getClassLoader() id null");
+ throw new IllegalStateException( "PersistenceUnitInfo.getClassLoader() id null" );
}
//set the classloader
Thread thread = Thread.currentThread();
@@ -258,13 +258,13 @@
List<String> packages = new ArrayList<String>();
List<String> xmlFiles = new ArrayList<String>( 50 );
if ( info.getMappingFileNames() != null ) xmlFiles.addAll( info.getMappingFileNames() );
- // Object overridenTxType = integration.get( HibernatePersistence.TRANSACTION_TYPE );
- // if (overridenTxType != null) {
- // defineTransactionType( overridenTxType, info.getPersistenceUnitName() );
- // }
- // else {
+ // Object overridenTxType = integration.get( HibernatePersistence.TRANSACTION_TYPE );
+ // if (overridenTxType != null) {
+ // defineTransactionType( overridenTxType, info.getPersistenceUnitName() );
+ // }
+ // else {
defineTransactionType( info.getTransactionType(), info.getPersistenceUnitName() );
- // }
+ // }
//workingVars.put( HibernatePersistence.TRANSACTION_TYPE, transactionType );
boolean[] detectArtifact = getDetectedArtifacts( info.getProperties(), null );
for ( URL jar : info.getJarFileUrls() ) {
@@ -282,7 +282,7 @@
ConfigurationHelper.overrideProperties( properties, integration );
//FIXME send the appropriate entites.
- if ( "true".equalsIgnoreCase( properties.getProperty(HibernatePersistence.USE_CLASS_ENHANCER) ) ) {
+ if ( "true".equalsIgnoreCase( properties.getProperty( HibernatePersistence.USE_CLASS_ENHANCER ) ) ) {
info.addTransformer( new InterceptFieldClassFileTransformer( entities ) );
}
@@ -294,21 +294,23 @@
//datasources
boolean overridenDatasource = false;
String dataSource = (String) integration.get( HibernatePersistence.JTA_DATASOURCE );
- if (dataSource != null) {
+ if ( dataSource != null ) {
overridenDatasource = true;
properties.setProperty( Environment.DATASOURCE, dataSource );
}
dataSource = (String) integration.get( HibernatePersistence.NON_JTA_DATASOURCE );
- if (dataSource != null) {
+ if ( dataSource != null ) {
overridenDatasource = true;
properties.setProperty( Environment.DATASOURCE, dataSource );
}
- if ( ! overridenDatasource && (info.getJtaDataSource() != null || info.getNonJtaDataSource() != null ) ) {
+ if ( ! overridenDatasource && ( info.getJtaDataSource() != null || info.getNonJtaDataSource() != null ) ) {
this.setDataSource(
info.getJtaDataSource() != null ? info.getJtaDataSource() : info.getNonJtaDataSource()
);
- this.setProperty( Environment.CONNECTION_PROVIDER, InjectedDataSourceConnectionProvider.class.getName() );
+ this.setProperty(
+ Environment.CONNECTION_PROVIDER, InjectedDataSourceConnectionProvider.class.getName()
+ );
}
entityManagerFactory = createEntityManagerFactory( properties, workingVars );
@@ -323,21 +325,21 @@
}
private void defineTransactionType(Object overridenTxType, String persistenceUnitName) {
- if (overridenTxType == null) {
- if (transactionType == null) {
- transactionType = PersistenceUnitTransactionType.JTA; //this is the default value
- }
+ if ( overridenTxType == null ) {
+ if ( transactionType == null ) {
+ transactionType = PersistenceUnitTransactionType.JTA; //this is the default value
+ }
}
- else if (overridenTxType instanceof String) {
+ else if ( overridenTxType instanceof String ) {
transactionType = PersistenceXmlLoader.getTransactionType( (String) overridenTxType );
}
- else if (overridenTxType instanceof PersistenceUnitTransactionType) {
+ else if ( overridenTxType instanceof PersistenceUnitTransactionType ) {
transactionType = (PersistenceUnitTransactionType) overridenTxType;
}
else {
throw new PersistenceException(
- HibernatePersistence.TRANSACTION_TYPE + " of the wrong class type"
- + (persistenceUnitName != null ? " in unit " + persistenceUnitName : "")
+ HibernatePersistence.TRANSACTION_TYPE + " of the wrong class type"
+ + ( persistenceUnitName != null ? " in unit " + persistenceUnitName : "" )
+ ": " + overridenTxType.getClass()
);
}
@@ -393,7 +395,7 @@
if ( result[1] ) {
filters[size - 1] = new JarVisitor.FileFilter( true ) {
public boolean accept(String javaElementName) {
- return javaElementName.endsWith( "hbm.xml" ) || javaElementName.endsWith("META-INF/orm.xml");
+ return javaElementName.endsWith( "hbm.xml" ) || javaElementName.endsWith( "META-INF/orm.xml" );
}
};
}
@@ -641,8 +643,9 @@
if ( ! "true".equalsIgnoreCase( cfg.getProperty( Environment.AUTOCOMMIT ) ) ) {
log.warn( Environment.AUTOCOMMIT + " = false break the EJB3 specification" );
}
- boolean discardOnClose = preparedProperties.getProperty( HibernatePersistence.DISCARD_PC_ON_CLOSE).equals( "true");
- return buildEntityManagerFactory(discardOnClose);
+ boolean discardOnClose = preparedProperties.getProperty( HibernatePersistence.DISCARD_PC_ON_CLOSE )
+ .equals( "true" );
+ return buildEntityManagerFactory( discardOnClose );
}
private void addClassesToSessionFactory(Map workingVars) {
@@ -684,7 +687,7 @@
}
}
- private Properties prepareProperties(Properties properties, Map workingVars ) {
+ private Properties prepareProperties(Properties properties, Map workingVars) {
Properties preparedProperties = new Properties();
//defaults different to Hibernate
@@ -701,19 +704,25 @@
preparedProperties.getProperty( HibernatePersistence.TRANSACTION_TYPE ),
(String) workingVars.get( HibernatePersistence.PERSISTENCE_UNIT_NAME )
);
- boolean hasTxStrategy = StringHelper.isNotEmpty( preparedProperties.getProperty( Environment.TRANSACTION_STRATEGY ) );
- if (! hasTxStrategy && transactionType == PersistenceUnitTransactionType.JTA) {
- preparedProperties.setProperty( Environment.TRANSACTION_STRATEGY, JoinableCMTTransactionFactory.class.getName() );
+ boolean hasTxStrategy = StringHelper.isNotEmpty(
+ preparedProperties.getProperty( Environment.TRANSACTION_STRATEGY )
+ );
+ if ( ! hasTxStrategy && transactionType == PersistenceUnitTransactionType.JTA ) {
+ preparedProperties.setProperty(
+ Environment.TRANSACTION_STRATEGY, JoinableCMTTransactionFactory.class.getName()
+ );
}
- else if (! hasTxStrategy && transactionType == PersistenceUnitTransactionType.RESOURCE_LOCAL) {
+ else if ( ! hasTxStrategy && transactionType == PersistenceUnitTransactionType.RESOURCE_LOCAL ) {
preparedProperties.setProperty( Environment.TRANSACTION_STRATEGY, JDBCTransactionFactory.class.getName() );
}
- if (hasTxStrategy) {
- log.warn("Overriding " + Environment.TRANSACTION_STRATEGY + " is dangerous, this might break the EJB3 specification implementation");
+ if ( hasTxStrategy ) {
+ log.warn(
+ "Overriding " + Environment.TRANSACTION_STRATEGY + " is dangerous, this might break the EJB3 specification implementation"
+ );
}
if ( preparedProperties.getProperty( Environment.FLUSH_BEFORE_COMPLETION ).equals( "true" ) ) {
preparedProperties.setProperty( Environment.FLUSH_BEFORE_COMPLETION, "false" );
- log.warn("Defining " + Environment.FLUSH_BEFORE_COMPLETION + "=true ignored in HEM");
+ log.warn( "Defining " + Environment.FLUSH_BEFORE_COMPLETION + "=true ignored in HEM" );
}
return preparedProperties;
}
@@ -721,7 +730,7 @@
private Class classForName(
String className
) throws ClassNotFoundException {
- return ReflectHelper.classForName( className, this.getClass() );
+ return ReflectHelper.classForName( className, this.getClass() );
}
private void setCacheStrategy(String propertyKey, Map properties, boolean isClass) {
Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/EntityManagerImpl.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/EntityManagerImpl.java 2006-04-26 06:41:18 UTC (rev 9795)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/EntityManagerImpl.java 2006-04-26 06:46:52 UTC (rev 9796)
@@ -5,12 +5,12 @@
import javax.persistence.spi.PersistenceUnitTransactionType;
import javax.transaction.Synchronization;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
-import org.hibernate.HibernateException;
import org.hibernate.engine.SessionImplementor;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* @author Gavin King
@@ -55,20 +55,21 @@
if ( !open ) throw new IllegalStateException( "EntityManager is closed" );
if ( !discardOnClose && isTransactionInProgress() ) {
//delay the closing till the end of the enlisted transaction
- getSession().getTransaction().registerSynchronization( new Synchronization() {
- public void beforeCompletion() {
- //nothing to do
- }
+ getSession().getTransaction().registerSynchronization(
+ new Synchronization() {
+ public void beforeCompletion() {
+ //nothing to do
+ }
- public void afterCompletion(int i) {
- //TODO should I check for isOpen() ?
- if (session != null) {
- log.debug( "Closing session after transaction completion");
- session.close();
+ public void afterCompletion(int i) {
+ //TODO should I check for isOpen() ?
+ if ( session != null ) {
+ log.debug( "Closing session after transaction completion" );
+ session.close();
+ }
+ //TODO session == null should not happen
}
- //TODO session == null should not happen
}
- }
);
}
else {
@@ -81,11 +82,11 @@
public boolean isOpen() {
//adjustFlushMode(); //don't adjust, can't be done on closed EM
try {
- if (open) getSession().isOpen(); //to force enlistment in tx
+ if ( open ) getSession().isOpen(); //to force enlistment in tx
return open;
}
catch (HibernateException he) {
- throwPersistenceException(he);
+ throwPersistenceException( he );
return false;
}
}
Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/EventListenerConfigurator.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/EventListenerConfigurator.java 2006-04-26 06:41:18 UTC (rev 9795)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/EventListenerConfigurator.java 2006-04-26 06:46:52 UTC (rev 9796)
@@ -14,10 +14,13 @@
import org.hibernate.HibernateException;
import org.hibernate.ejb.event.CallbackHandlerConsumer;
+import org.hibernate.ejb.event.EJB3AutoFlushEventListener;
import org.hibernate.ejb.event.EJB3DeleteEventListener;
import org.hibernate.ejb.event.EJB3FlushEntityEventListener;
+import org.hibernate.ejb.event.EJB3FlushEventListener;
import org.hibernate.ejb.event.EJB3MergeEventListener;
import org.hibernate.ejb.event.EJB3PersistEventListener;
+import org.hibernate.ejb.event.EJB3PersistOnFlushEventListener;
import org.hibernate.ejb.event.EJB3PostDeleteEventListener;
import org.hibernate.ejb.event.EJB3PostInsertEventListener;
import org.hibernate.ejb.event.EJB3PostLoadEventListener;
@@ -25,9 +28,6 @@
import org.hibernate.ejb.event.EJB3SaveEventListener;
import org.hibernate.ejb.event.EJB3SaveOrUpdateEventListener;
import org.hibernate.ejb.event.EntityCallbackHandler;
-import org.hibernate.ejb.event.EJB3AutoFlushEventListener;
-import org.hibernate.ejb.event.EJB3FlushEventListener;
-import org.hibernate.ejb.event.EJB3PersistOnFlushEventListener;
import org.hibernate.event.AutoFlushEventListener;
import org.hibernate.event.DeleteEventListener;
import org.hibernate.event.EventListeners;
@@ -80,7 +80,9 @@
);
listenerConfig.setMergeEventListeners( new MergeEventListener[]{new EJB3MergeEventListener()} );
listenerConfig.setPersistEventListeners( new PersistEventListener[]{new EJB3PersistEventListener()} );
- listenerConfig.setPersistOnFlushEventListeners( new PersistEventListener[]{new EJB3PersistOnFlushEventListener()} );
+ listenerConfig.setPersistOnFlushEventListeners(
+ new PersistEventListener[]{new EJB3PersistOnFlushEventListener()}
+ );
listenerConfig.setSaveEventListeners( new SaveOrUpdateEventListener[]{new EJB3SaveEventListener()} );
listenerConfig.setSaveOrUpdateEventListeners(
new SaveOrUpdateEventListener[]{new EJB3SaveOrUpdateEventListener()}
Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/HibernateEntityManagerImplementor.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/HibernateEntityManagerImplementor.java 2006-04-26 06:41:18 UTC (rev 9795)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/HibernateEntityManagerImplementor.java 2006-04-26 06:46:52 UTC (rev 9796)
@@ -10,6 +10,8 @@
*/
public interface HibernateEntityManagerImplementor extends HibernateEntityManager {
boolean isTransactionInProgress();
+
public void throwPersistenceException(PersistenceException e);
+
public void throwPersistenceException(HibernateException e);
}
Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/HibernatePersistence.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/HibernatePersistence.java 2006-04-26 06:41:18 UTC (rev 9795)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/HibernatePersistence.java 2006-04-26 06:46:52 UTC (rev 9796)
@@ -2,7 +2,6 @@
package org.hibernate.ejb;
import java.util.Map;
-
import javax.persistence.EntityManagerFactory;
import javax.persistence.spi.PersistenceUnitInfo;
@@ -17,7 +16,8 @@
* Provider
*/
public static final String PROVIDER = "javax.persistence.provider";
- /**
+ /**
+ *
* transaction type
*/
public static final String TRANSACTION_TYPE = "javax.persistence.transactionType";
@@ -106,7 +106,7 @@
* the peristence.xml file.
*
* @param persistenceUnitName entity manager name
- * @param overridenProperties properties passed to the persistence provider
+ * @param overridenProperties properties passed to the persistence provider
* @return initialized EntityManagerFactory
*/
public EntityManagerFactory createEntityManagerFactory(String persistenceUnitName, Map overridenProperties) {
Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/HibernateQuery.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/HibernateQuery.java 2006-04-26 06:41:18 UTC (rev 9795)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/HibernateQuery.java 2006-04-26 06:46:52 UTC (rev 9796)
@@ -3,6 +3,6 @@
import javax.persistence.Query;
-public interface HibernateQuery extends Query{
+public interface HibernateQuery extends Query {
public org.hibernate.Query getHibernateQuery();
}
Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/InjectionSettingsFactory.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/InjectionSettingsFactory.java 2006-04-26 06:41:18 UTC (rev 9795)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/InjectionSettingsFactory.java 2006-04-26 06:46:52 UTC (rev 9796)
@@ -19,6 +19,7 @@
* Object will be injected
*
* @param connectionProviderInjectionData
+ *
*/
public void setConnectionProviderInjectionData(Map connectionProviderInjectionData) {
this.connectionProviderInjectionData = connectionProviderInjectionData;
Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/QueryImpl.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/QueryImpl.java 2006-04-26 06:41:18 UTC (rev 9795)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/QueryImpl.java 2006-04-26 06:46:52 UTC (rev 9796)
@@ -37,13 +37,13 @@
public int executeUpdate() {
try {
if ( ! em.isTransactionInProgress() ) {
- em.throwPersistenceException( new TransactionRequiredException("Executing an update/delete query") );
+ em.throwPersistenceException( new TransactionRequiredException( "Executing an update/delete query" ) );
return 0;
}
return query.executeUpdate();
}
catch (HibernateException he) {
- em.throwPersistenceException(he);
+ em.throwPersistenceException( he );
return 0;
}
}
@@ -53,7 +53,7 @@
return query.list();
}
catch (HibernateException he) {
- em.throwPersistenceException(he);
+ em.throwPersistenceException( he );
return null;
}
}
@@ -69,7 +69,7 @@
return result;
}
catch (HibernateException he) {
- em.throwPersistenceException(he);
+ em.throwPersistenceException( he );
return null;
}
}
@@ -78,8 +78,8 @@
if ( maxResult < 0 ) {
throw new IllegalArgumentException(
"Negative ("
- + maxResult
- + ") parameter passed in to setMaxResults"
+ + maxResult
+ + ") parameter passed in to setMaxResults"
);
}
query.setMaxResults( maxResult );
@@ -90,8 +90,8 @@
if ( firstResult < 0 ) {
throw new IllegalArgumentException(
"Negative ("
- + firstResult
- + ") parameter passed in to setMaxResults"
+ + firstResult
+ + ") parameter passed in to setMaxResults"
);
}
query.setFirstResult( firstResult );
@@ -146,7 +146,7 @@
return this;
}
catch (HibernateException he) {
- em.throwPersistenceException(he);
+ em.throwPersistenceException( he );
return null;
}
}
@@ -165,7 +165,7 @@
return this;
}
catch (HibernateException he) {
- em.throwPersistenceException(he);
+ em.throwPersistenceException( he );
return null;
}
}
@@ -184,7 +184,7 @@
return this;
}
catch (HibernateException he) {
- em.throwPersistenceException(he);
+ em.throwPersistenceException( he );
return null;
}
}
@@ -192,7 +192,7 @@
public Query setParameter(int position, Object value) {
try {
if ( isEJBQLQuery() ) {
- this.setParameter( Integer.toString(position), value );
+ this.setParameter( Integer.toString( position ), value );
}
else {
query.setParameter( position - 1, value );
@@ -200,19 +200,19 @@
return this;
}
catch (HibernateException he) {
- em.throwPersistenceException(he);
+ em.throwPersistenceException( he );
return null;
}
}
private boolean isEJBQLQuery() {
- return ! (query instanceof SQLQuery);
+ return ! ( query instanceof SQLQuery );
}
public Query setParameter(int position, Date value, TemporalType temporalType) {
try {
if ( isEJBQLQuery() ) {
- String name = Integer.toString(position);
+ String name = Integer.toString( position );
this.setParameter( name, value, temporalType );
}
else {
@@ -229,7 +229,7 @@
return this;
}
catch (HibernateException he) {
- em.throwPersistenceException(he);
+ em.throwPersistenceException( he );
return null;
}
}
@@ -237,8 +237,8 @@
public Query setParameter(int position, Calendar value, TemporalType temporalType) {
try {
if ( isEJBQLQuery() ) {
- String name = Integer.toString(position);
- this.setParameter( name, value, temporalType);
+ String name = Integer.toString( position );
+ this.setParameter( name, value, temporalType );
}
else {
if ( temporalType == DATE ) {
@@ -254,7 +254,7 @@
return this;
}
catch (HibernateException he) {
- em.throwPersistenceException(he);
+ em.throwPersistenceException( he );
return null;
}
}
Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/TransactionImpl.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/TransactionImpl.java 2006-04-26 06:41:18 UTC (rev 9795)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/TransactionImpl.java 2006-04-26 06:46:52 UTC (rev 9796)
@@ -5,9 +5,9 @@
import javax.persistence.PersistenceException;
import javax.persistence.RollbackException;
+import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.Transaction;
-import org.hibernate.HibernateException;
/**
* @author Gavin King
@@ -37,7 +37,7 @@
tx = getSession().beginTransaction();
}
catch (HibernateException he) {
- entityManager.throwPersistenceException(he);
+ entityManager.throwPersistenceException( he );
}
}
@@ -45,9 +45,9 @@
if ( tx == null || !tx.isActive() ) {
throw new IllegalStateException( "Transaction not active" );
}
- if (rollbackOnly) {
+ if ( rollbackOnly ) {
tx.rollback();
- throw new RollbackException("Transaction marked as rollbackOnly");
+ throw new RollbackException( "Transaction marked as rollbackOnly" );
}
try {
tx.commit();
@@ -60,7 +60,7 @@
catch (Exception re) {
//swallow
}
- throw new RollbackException( "Error while commiting the transaction", e);
+ throw new RollbackException( "Error while commiting the transaction", e );
}
finally {
rollbackOnly = false;
@@ -77,7 +77,7 @@
tx.rollback();
}
catch (Exception e) {
- throw new PersistenceException("unexpected error when rollbacking", e);
+ throw new PersistenceException( "unexpected error when rollbacking", e );
}
finally {
rollbackOnly = false;
@@ -100,7 +100,7 @@
return tx != null && tx.isActive();
}
catch (RuntimeException e) {
- throw new PersistenceException("unexpected error when checking transaction status", e);
+ throw new PersistenceException( "unexpected error when checking transaction status", e );
}
}
Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Version.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Version.java 2006-04-26 06:41:18 UTC (rev 9795)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/Version.java 2006-04-26 06:46:52 UTC (rev 9796)
@@ -15,5 +15,6 @@
log.info( "Hibernate EntityManager " + VERSION );
}
- public static void touch() {}
+ public static void touch() {
+ }
}
Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java 2006-04-26 06:41:18 UTC (rev 9795)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java 2006-04-26 06:46:52 UTC (rev 9796)
@@ -13,22 +13,23 @@
/**
* A connection provider that uses an injected <tt>DataSource</tt>.
* Setters has to be called before configure()
+ *
+ * @author Emmanuel Bernard
* @see org.hibernate.connection.ConnectionProvider
- * @author Emmanuel Bernard
*/
public class InjectedDataSourceConnectionProvider extends DatasourceConnectionProvider {
private String user;
private String pass;
- private static final Log log = LogFactory.getLog(InjectedDataSourceConnectionProvider.class);
+ private static final Log log = LogFactory.getLog( InjectedDataSourceConnectionProvider.class );
public void setDataSource(DataSource ds) {
super.setDataSource( ds );
}
public void configure(Properties props) throws HibernateException {
- user = props.getProperty(Environment.USER);
- pass = props.getProperty(Environment.PASS);
+ user = props.getProperty( Environment.USER );
+ pass = props.getProperty( Environment.PASS );
if ( getDataSource() == null ) throw new HibernateException( "No datasource provided" );
log.info( "Using provided datasource" );
Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/Callback.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/Callback.java 2006-04-26 06:41:18 UTC (rev 9795)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/Callback.java 2006-04-26 06:46:52 UTC (rev 9796)
@@ -11,9 +11,9 @@
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
import java.util.StringTokenizer;
-import java.util.List;
-import java.util.ArrayList;
import org.hibernate.util.ReflectHelper;
@@ -39,10 +39,10 @@
oos.writeObject( callbackMethod.toGenericString() );
}
- private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
+ private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
ois.defaultReadObject();
String signature = (String) ois.readObject();
- StringTokenizer st = new StringTokenizer(signature, " ", false);
+ StringTokenizer st = new StringTokenizer( signature, " ", false );
String usefulSignature = null;
while ( st.hasMoreElements() ) usefulSignature = (String) st.nextElement();
int parenthesis = usefulSignature.indexOf( "(" );
@@ -51,9 +51,9 @@
String clazzName = methodAndClass.substring( 0, lastDot );
Class callbackClass = ReflectHelper.classForName( clazzName, this.getClass() );
String parametersString = usefulSignature.substring( parenthesis + 1, usefulSignature.length() - 1 );
- st = new StringTokenizer( parametersString, ", ", false);
+ st = new StringTokenizer( parametersString, ", ", false );
List<Class> parameters = new ArrayList<Class>();
- while( st.hasMoreElements() ) {
+ while ( st.hasMoreElements() ) {
String parameter = (String) st.nextElement();
parameters.add( ReflectHelper.classForName( parameter, this.getClass() ) );
}
Modified: trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/CallbackResolver.java
===================================================================
--- trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/CallbackResolver.java 2006-04-26 06:41:18 UTC (rev 9795)
+++ trunk/HibernateExt/ejb/src/java/org/hibernate/ejb/event/CallbackResolver.java 2006-04-26 06:46:52 UTC (rev 9796)
@@ -14,9 +14,9 @@
import java.util.List;
import javax.persistence.Entity;
import javax.persistence.EntityListeners;
+import javax.persistence.ExcludeSuperclassListeners;
import javax.persistence.MappedSuperclass;
import javax.persistence.PersistenceException;
-import javax.persistence.ExcludeSuperclassListeners;
/**
* @author <a href="mailto:kab...@jb...">Kabir Khan</a>
@@ -24,24 +24,26 @@
*/
public final class CallbackResolver {
private static boolean useAnnotationAnnotatedByListener;
+
{
//check whether reading annotations of annotations is useful or not
useAnnotationAnnotatedByListener = false;
Target target = (Target) EntityListeners.class.getAnnotation( Target.class );
- if (target != null) {
+ if ( target != null ) {
for ( ElementType type : target.value() ) {
if ( type.equals( ElementType.ANNOTATION_TYPE ) ) useAnnotationAnnotatedByListener = true;
}
}
}
- private CallbackResolver() {}
+ private CallbackResolver() {
+ }
public static Callback resolveCallback(Class beanClass, Class annotation, List<Class> listeners) throws Exception {
Callback callback = null;
Method[] methods = beanClass.getDeclaredMethods();
- for ( int i = 0 ; i < methods.length ; i++ ) {
+ for ( int i = 0; i < methods.length ; i++ ) {
if ( methods[i].getAnnotation( annotation ) != null ) {
if ( callback == null ) {
callback = new BeanCallback( methods[i] );
@@ -49,7 +51,8 @@
Class[] args = methods[i].getParameterTypes();
if ( returnType != Void.TYPE || args.length != 0 ) {
throw new RuntimeException(
- "Callback methods annotated on the bean class must return void and take no arguments: " + annotation.getName() + " - " + methods[i]
+ "Callback methods annotated on the bean class must return void and take no arguments: " + annotation
+ .getName() + " - " + methods[i]
);
}
if ( ! methods[i].isAccessible() ) {
@@ -59,7 +62,7 @@
else {
throw new RuntimeException(
"You can only annotate one callback method with "
- + annotation.getName() + " in bean class: " + beanClass.getName()
+ + annotation.getName() + " in bean class: " + beanClass.getName()
);
}
}
@@ -69,7 +72,7 @@
if ( listener != null ) {
try {
methods = listener.getDeclaredMethods();
- for ( int i = 0 ; i < methods.length ; i++ ) {
+ for ( int i = 0; i < methods.length ; i++ ) {
if ( methods[i].getAnnotation( annotation ) != null ) {
if ( callback == null ) {
callback = new ListenerCallback( methods[i], listener.newInstance() );
@@ -77,7 +80,8 @@
Class[] args = methods[i].getParameterTypes();
if ( returnType != Void.TYPE || args.length != 1 ) {
throw new RuntimeException(
- "Callback methods annotated in a listener bean class must return void and take one argument: " + annotation.getName() + " - " + methods[i]
+ "Callback methods annotated in a listener bean class must return void and take one argument: " + annotation
+ .getName() + " - " + methods[i]
);
}
if ( ! methods[i].isAccessible() ) {
@@ -87,8 +91,8 @@
else {
throw new RuntimeException(
"You can only annotate one callback method with "
- + annotation.getName() + " in bean class: " + beanClass.getName() + " and callback listener: "
- + listener.getName()
+ + annotation.getName() + " in bean class: " + beanClass.getName() + " and callback listener: "
+ + listener.getName()
);
}
}
@@ -112,79 +116,86 @@
//FIXME exclude overriden callback methods
Callback callback = null;
Method[] methods = currentClazz.getDeclaredMethods();
- for ( int i = 0 ; i < methods.length ; i++ ) {
+ for ( int i = 0; i < methods.length ; i++ ) {
if ( methods[i].getAnnotation( annotation ) != null ) {
- if (callback == null) {
+ if ( callback == null ) {
callback = new BeanCallback( methods[i] );
Class returnType = methods[i].getReturnType();
Class[] args = methods[i].getParameterTypes();
if ( returnType != Void.TYPE || args.length != 0 ) {
throw new RuntimeException(
- "Callback methods annotated on the bean class must return void and take no arguments: " + annotation.getName() + " - " + methods[i]
+ "Callback methods annotated on the bean class must return void and take no arguments: " + annotation
+ .getName() + " - " + methods[i]
);
}
if ( ! methods[i].isAccessible() ) {
methods[i].setAccessible( true );
}
- callbacks.add(0, callback); //superclass first
+ callbacks.add( 0, callback ); //superclass first
}
else {
throw new PersistenceException(
"You can only annotate one callback method with "
- + annotation.getName() + " in bean class: " + beanClass.getName()
+ + annotation.getName() + " in bean class: " + beanClass.getName()
);
}
}
}
- if (!stopListeners) {
+ if ( !stopListeners ) {
getListeners( currentClazz, orderedListeners );
stopListeners = currentClazz.isAnnotationPresent( ExcludeSuperclassListeners.class );
}
do {
currentClazz = currentClazz.getSuperclass();
- } while (currentClazz != null
- && ! ( currentClazz.isAnnotationPresent( Entity.class)
- || currentClazz.isAnnotationPresent( MappedSuperclass.class) )
- );
+ }
+ while ( currentClazz != null
+ && ! ( currentClazz.isAnnotationPresent( Entity.class )
+ || currentClazz.isAnnotationPresent( MappedSuperclass.class ) )
+ );
}
while ( currentClazz != null );
- for (Class listener : orderedListeners) {
+ for ( Class listener : orderedListeners ) {
Callback callback = null;
if ( listener != null ) {
Method[] methods = listener.getDeclaredMethods();
- for ( int i = 0 ; i < methods.length ; i++ ) {
+ for ( int i = 0; i < methods.length ; i++ ) {
if ( methods[i].getAnnotation( annotation ) != null ) {
if ( callback == null ) {
try {
callback = new ListenerCallback( methods[i], listener.newInstance() );
}
catch (IllegalAccessException e) {
- throw new PersistenceException( "Unable to create instance of " + listener.getName()
- + " as a listener of beanClass", e);
+ throw new PersistenceException(
+ "Unable to create instance of " + listener.getName()
+ + " as a listener of beanClass", e
+ );
}
catch (InstantiationException e) {
- throw new PersistenceException( "Unable to create instance of " + listener.getName()
- + " as a listener of beanClass", e);
+ throw new PersistenceException(
+ "Unable to create instance of " + listener.getName()
+ + " as a listener of beanClass", e
+ );
}
Class returnType = methods[i].getReturnType();
Class[] args = methods[i].getParameterTypes();
if ( returnType != Void.TYPE || args.length != 1 ) {
throw new PersistenceException(
- "Callback methods annotated in a listener bean class must return void and take one argument: " + annotation.getName() + " - " + methods[i]
+ "Callback methods annotated in a listener bean class must return void and take one argument: " + annotation
+ .getName() + " - " + methods[i]
);
}
if ( ! methods[i].isAccessible() ) {
methods[i].setAccessible( true );
}
- callbacks.add(0, callback); // listeners first
+ callbacks.add( 0, callback ); // listeners first
}
else {
throw new PersistenceException(
"You can only annotate one callback method with "
- + annotation.getName() + " in bean class: " + beanClass.getName() + " and callback listener: "
- + listener.getName()
+ + annotation.getName() + " in bean class: " + beanClass.getName() + " and callback listener: "
+ + listener.getName()
);
}
}
@@ -199,18 +210,18 @@
if ( entityListeners != null ) {
Class[] classes = entityListeners.value();
int size = classes.length;
- for (int index = size - 1 ; index >= 0 ; index--) {
+ for ( int index = size - 1; index >= 0 ; index-- ) {
orderedListeners.add( classes[index] );
}
}
- if (useAnnotationAnnotatedByListener) {
+ if ( useAnnotationAnnotatedByListener ) {
Annotation[] annotations = currentClazz.getAnnotations();
- for (Annotation anno...
[truncated message content] |
