diff --git a/build.third.gradle b/build.third.gradle index 4d964922e..f94ca0dc8 100644 --- a/build.third.gradle +++ b/build.third.gradle @@ -19,10 +19,17 @@ def srcDir="." sourceSets{ main{ java{ - srcDirs=["${srcDir}/fine-druid/src", + srcDirs=[ + "${srcDir}/fine-jpa/src", + "${srcDir}/fine-jboss-transaction-api/src", + "${srcDir}/fine-jboss-logging/src", + "${srcDir}/fine-classmate/src", + "${srcDir}/fine-hibernate/src", + "${srcDir}/fine-druid/src", "${srcDir}/fine-poi/src", "${srcDir}/fine-quartz/src", - "${srcDir}/fine-spring/src"] + "${srcDir}/fine-spring/src" + ] } } @@ -43,6 +50,8 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-poi/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-quartz/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-spring/lib",include:'**/*.jar') + compile fileTree(dir:"${srcDir}/fine-jboss-logging/lib",include:'**/*.jar') + compile fileTree(dir:"${srcDir}/fine-hibernate/lib",include:'**/*.jar') compile fileTree(dir:"../../finereport-lib-base/${branchName}",include:'**/*.jar') compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar') testCompile 'junit:junit:4.12' @@ -92,6 +101,11 @@ def dataContent ={def dir -> task copyFiles(type:Copy,dependsOn:'compileJava'){ copy{ println "------------------------------------------------copyfiles" + with dataContent.call("${srcDir}/fine-jpa/src") + with dataContent.call("${srcDir}/fine-jboss-transaction-api/src") + with dataContent.call("${srcDir}/fine-jboss-logging/src") + with dataContent.call("${srcDir}/fine-classmate/src") + with dataContent.call("${srcDir}/fine-hibernate/src") with dataContent.call("${srcDir}/fine-druid/src") with dataContent.call("${srcDir}/fine-poi/src") with dataContent.call("${srcDir}/fine-quartz/src") diff --git a/fine-hibernate/fine-hibernate.iml b/fine-hibernate/fine-hibernate.iml index a8a973893..34472121c 100644 --- a/fine-hibernate/fine-hibernate.iml +++ b/fine-hibernate/fine-hibernate.iml @@ -12,5 +12,7 @@ + + \ No newline at end of file diff --git a/fine-hibernate/lib/jboss-transaction-api_1.1_spec-1.0.1.Final.jar b/fine-hibernate/lib/jboss-transaction-api_1.1_spec-1.0.1.Final.jar deleted file mode 100644 index 981f8f991..000000000 Binary files a/fine-hibernate/lib/jboss-transaction-api_1.1_spec-1.0.1.Final.jar and /dev/null differ diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/Transaction.java b/fine-hibernate/src/com/fr/third/org/hibernate/Transaction.java index cbef4f478..1bf572803 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/Transaction.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/Transaction.java @@ -6,7 +6,7 @@ */ package com.fr.third.org.hibernate; -import javax.transaction.Synchronization; +import com.fr.third.javax.transaction.Synchronization; import com.fr.third.org.hibernate.resource.transaction.spi.TransactionStatus; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/boot/SessionFactoryBuilder.java b/fine-hibernate/src/com/fr/third/org/hibernate/boot/SessionFactoryBuilder.java index d50be38b3..b9995d057 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/boot/SessionFactoryBuilder.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/boot/SessionFactoryBuilder.java @@ -8,6 +8,8 @@ package com.fr.third.org.hibernate.boot; import java.util.Map; +import com.fr.third.javax.transaction.Transaction; +import com.fr.third.javax.transaction.UserTransaction; import com.fr.third.org.hibernate.ConnectionReleaseMode; import com.fr.third.org.hibernate.CustomEntityDirtinessStrategy; import com.fr.third.org.hibernate.EntityMode; @@ -375,10 +377,10 @@ public interface SessionFactoryBuilder { /** * If using the built-in Hibernate JTA-based TransactionCoordinator/Builder, should it prefer to use - * {@link javax.transaction.UserTransaction} over {@link javax.transaction.Transaction}? + * {@link UserTransaction} over {@link Transaction}? * - * @param preferUserTransactions {@code true} indicates we should prefer {@link javax.transaction.UserTransaction}; - * {@code false} indicates we should prefer {@link javax.transaction.Transaction} + * @param preferUserTransactions {@code true} indicates we should prefer {@link UserTransaction}; + * {@code false} indicates we should prefer {@link Transaction} * * @return {@code this}, for method chaining * diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/cfg/AvailableSettings.java b/fine-hibernate/src/com/fr/third/org/hibernate/cfg/AvailableSettings.java index 3d46e60f0..0ac6a9122 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/cfg/AvailableSettings.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/cfg/AvailableSettings.java @@ -6,6 +6,8 @@ */ package com.fr.third.org.hibernate.cfg; +import com.fr.third.javax.transaction.TransactionManager; +import com.fr.third.javax.transaction.UserTransaction; import com.fr.third.org.hibernate.boot.MetadataBuilder; import com.fr.third.org.hibernate.tool.schema.JdbcMetadaAccessStrategy; import com.fr.third.org.hibernate.tool.schema.SourceType; @@ -212,7 +214,7 @@ public interface AvailableSettings { /** * A configuration value key used to indicate that it is safe to cache - * {@link javax.transaction.TransactionManager} references. + * {@link TransactionManager} references. * * @since 4.0 */ @@ -220,7 +222,7 @@ public interface AvailableSettings { /** * A configuration value key used to indicate that it is safe to cache - * {@link javax.transaction.UserTransaction} references. + * {@link UserTransaction} references. * * @since 4.0 */ diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/context/internal/JTASessionContext.java b/fine-hibernate/src/com/fr/third/org/hibernate/context/internal/JTASessionContext.java index 6ba39f3ce..bb019bbd5 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/context/internal/JTASessionContext.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/context/internal/JTASessionContext.java @@ -8,9 +8,9 @@ package com.fr.third.org.hibernate.context.internal; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.transaction.Synchronization; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; +import com.fr.third.javax.transaction.Synchronization; +import com.fr.third.javax.transaction.Transaction; +import com.fr.third.javax.transaction.TransactionManager; import com.fr.third.org.hibernate.ConnectionReleaseMode; import com.fr.third.org.hibernate.HibernateException; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/context/internal/ThreadLocalSessionContext.java b/fine-hibernate/src/com/fr/third/org/hibernate/context/internal/ThreadLocalSessionContext.java index ba4281277..6edcd4db4 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/context/internal/ThreadLocalSessionContext.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/context/internal/ThreadLocalSessionContext.java @@ -17,7 +17,7 @@ import java.lang.reflect.Proxy; import java.util.HashMap; import java.util.Locale; import java.util.Map; -import javax.transaction.Synchronization; +import com.fr.third.javax.transaction.Synchronization; import com.fr.third.org.hibernate.ConnectionReleaseMode; import com.fr.third.org.hibernate.HibernateException; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/spi/SessionImplementor.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/spi/SessionImplementor.java index 58f1650b9..3859d52ae 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/spi/SessionImplementor.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/spi/SessionImplementor.java @@ -11,6 +11,7 @@ import java.sql.Connection; import java.util.Iterator; import java.util.List; +import com.fr.third.javax.transaction.Synchronization; import com.fr.third.org.hibernate.CacheMode; import com.fr.third.org.hibernate.Criteria; import com.fr.third.org.hibernate.FlushMode; @@ -79,7 +80,7 @@ public interface SessionImplementor extends Serializable, LobCreationContext, Wr /** * Disable automatic transaction joining. The really only has any effect for CMT transactions. The default - * Hibernate behavior is to auto join any active JTA transaction (register {@link javax.transaction.Synchronization}). + * Hibernate behavior is to auto join any active JTA transaction (register {@link Synchronization}). * JPA however defines an explicit join transaction operation. *

* See com.fr.third.javax.persistence.EntityManager#joinTransaction diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/internal/SynchronizationRegistryImpl.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/internal/SynchronizationRegistryImpl.java index 592cc365e..b0376a482 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/internal/SynchronizationRegistryImpl.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/internal/SynchronizationRegistryImpl.java @@ -7,7 +7,7 @@ package com.fr.third.org.hibernate.engine.transaction.internal; import java.util.LinkedHashSet; -import javax.transaction.Synchronization; +import com.fr.third.javax.transaction.Synchronization; import com.fr.third.org.hibernate.engine.transaction.spi.SynchronizationRegistry; import com.fr.third.org.hibernate.internal.CoreMessageLogger; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/internal/TransactionImpl.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/internal/TransactionImpl.java index d163e99e2..13cfab8c4 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/internal/TransactionImpl.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/internal/TransactionImpl.java @@ -6,7 +6,7 @@ */ package com.fr.third.org.hibernate.engine.transaction.internal; -import javax.transaction.Synchronization; +import com.fr.third.javax.transaction.Synchronization; import com.fr.third.org.hibernate.HibernateException; import com.fr.third.org.hibernate.Transaction; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/internal/jta/JtaStatusHelper.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/internal/jta/JtaStatusHelper.java index dc2d42105..02ad8022a 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/internal/jta/JtaStatusHelper.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/internal/jta/JtaStatusHelper.java @@ -6,10 +6,11 @@ */ package com.fr.third.org.hibernate.engine.transaction.internal.jta; -import javax.transaction.Status; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import com.fr.third.javax.transaction.Status; +import com.fr.third.javax.transaction.SystemException; +import com.fr.third.javax.transaction.Transaction; +import com.fr.third.javax.transaction.TransactionManager; +import com.fr.third.javax.transaction.UserTransaction; import com.fr.third.org.hibernate.TransactionException; @@ -45,7 +46,7 @@ public final class JtaStatusHelper { } /** - * Extract the status code from the current {@link javax.transaction.Transaction} associated with the + * Extract the status code from the current {@link Transaction} associated with the * given {@link TransactionManager} * * @param transactionManager The {@link TransactionManager} from which to extract the status. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/AbstractJtaPlatform.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/AbstractJtaPlatform.java index 6b0ddb90b..2928fd0c6 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/AbstractJtaPlatform.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/AbstractJtaPlatform.java @@ -7,11 +7,11 @@ package com.fr.third.org.hibernate.engine.transaction.jta.platform.internal; import java.util.Map; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import com.fr.third.javax.transaction.Synchronization; +import com.fr.third.javax.transaction.SystemException; +import com.fr.third.javax.transaction.Transaction; +import com.fr.third.javax.transaction.TransactionManager; +import com.fr.third.javax.transaction.UserTransaction; import com.fr.third.org.hibernate.cfg.AvailableSettings; import com.fr.third.org.hibernate.engine.jndi.spi.JndiService; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/BitronixJtaPlatform.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/BitronixJtaPlatform.java index 33ce209c5..897109511 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/BitronixJtaPlatform.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/BitronixJtaPlatform.java @@ -7,8 +7,8 @@ package com.fr.third.org.hibernate.engine.transaction.jta.platform.internal; import java.lang.reflect.Method; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import com.fr.third.javax.transaction.TransactionManager; +import com.fr.third.javax.transaction.UserTransaction; import com.fr.third.org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import com.fr.third.org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/BorlandEnterpriseServerJtaPlatform.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/BorlandEnterpriseServerJtaPlatform.java index e0baeb9f3..8fb6a0c4a 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/BorlandEnterpriseServerJtaPlatform.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/BorlandEnterpriseServerJtaPlatform.java @@ -6,8 +6,8 @@ */ package com.fr.third.org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import com.fr.third.javax.transaction.TransactionManager; +import com.fr.third.javax.transaction.UserTransaction; /** * @author Steve Ebersole diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/JBossAppServerJtaPlatform.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/JBossAppServerJtaPlatform.java index 99ceb3c4c..a99256cec 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/JBossAppServerJtaPlatform.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/JBossAppServerJtaPlatform.java @@ -6,8 +6,8 @@ */ package com.fr.third.org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import com.fr.third.javax.transaction.TransactionManager; +import com.fr.third.javax.transaction.UserTransaction; import com.fr.third.org.hibernate.engine.jndi.JndiException; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/JBossStandAloneJtaPlatform.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/JBossStandAloneJtaPlatform.java index d1ef21e83..19333d07c 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/JBossStandAloneJtaPlatform.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/JBossStandAloneJtaPlatform.java @@ -6,8 +6,8 @@ */ package com.fr.third.org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import com.fr.third.javax.transaction.TransactionManager; +import com.fr.third.javax.transaction.UserTransaction; import com.fr.third.org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import com.fr.third.org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/JOTMJtaPlatform.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/JOTMJtaPlatform.java index 03efa09d7..7118905ca 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/JOTMJtaPlatform.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/JOTMJtaPlatform.java @@ -7,8 +7,8 @@ package com.fr.third.org.hibernate.engine.transaction.jta.platform.internal; import java.lang.reflect.Method; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import com.fr.third.javax.transaction.TransactionManager; +import com.fr.third.javax.transaction.UserTransaction; import com.fr.third.org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import com.fr.third.org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/JOnASJtaPlatform.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/JOnASJtaPlatform.java index 21855129a..50e223167 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/JOnASJtaPlatform.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/JOnASJtaPlatform.java @@ -7,8 +7,8 @@ package com.fr.third.org.hibernate.engine.transaction.jta.platform.internal; import java.lang.reflect.Method; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import com.fr.third.javax.transaction.TransactionManager; +import com.fr.third.javax.transaction.UserTransaction; import com.fr.third.org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/JRun4JtaPlatform.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/JRun4JtaPlatform.java index 9f37642e7..f57591ef2 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/JRun4JtaPlatform.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/JRun4JtaPlatform.java @@ -6,8 +6,8 @@ */ package com.fr.third.org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import com.fr.third.javax.transaction.TransactionManager; +import com.fr.third.javax.transaction.UserTransaction; /** * {@link com.fr.third.org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for JRun4 AS diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/JtaSynchronizationStrategy.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/JtaSynchronizationStrategy.java index a1dc2f6ef..7dcd3c6f1 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/JtaSynchronizationStrategy.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/JtaSynchronizationStrategy.java @@ -7,7 +7,7 @@ package com.fr.third.org.hibernate.engine.transaction.jta.platform.internal; import java.io.Serializable; -import javax.transaction.Synchronization; +import com.fr.third.javax.transaction.Synchronization; /** * Contract used to centralize {@link Synchronization} handling logic. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/NoJtaPlatform.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/NoJtaPlatform.java index 5fee0d635..23f1dd500 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/NoJtaPlatform.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/NoJtaPlatform.java @@ -6,12 +6,12 @@ */ package com.fr.third.org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import com.fr.third.javax.transaction.Status; +import com.fr.third.javax.transaction.Synchronization; +import com.fr.third.javax.transaction.SystemException; +import com.fr.third.javax.transaction.Transaction; +import com.fr.third.javax.transaction.TransactionManager; +import com.fr.third.javax.transaction.UserTransaction; import com.fr.third.org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/OC4JJtaPlatform.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/OC4JJtaPlatform.java index af22a09e1..e88d3a1f3 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/OC4JJtaPlatform.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/OC4JJtaPlatform.java @@ -6,8 +6,8 @@ */ package com.fr.third.org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import com.fr.third.javax.transaction.TransactionManager; +import com.fr.third.javax.transaction.UserTransaction; /** * {@link com.fr.third.org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for the OC4J (Oracle) AS. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/OrionJtaPlatform.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/OrionJtaPlatform.java index f53a42529..08627eb30 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/OrionJtaPlatform.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/OrionJtaPlatform.java @@ -6,8 +6,8 @@ */ package com.fr.third.org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import com.fr.third.javax.transaction.TransactionManager; +import com.fr.third.javax.transaction.UserTransaction; /** * {@link com.fr.third.org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for Orion diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/ResinJtaPlatform.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/ResinJtaPlatform.java index dd1ffbdab..e4528f7a1 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/ResinJtaPlatform.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/ResinJtaPlatform.java @@ -6,8 +6,8 @@ */ package com.fr.third.org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import com.fr.third.javax.transaction.TransactionManager; +import com.fr.third.javax.transaction.UserTransaction; /** * {@link com.fr.third.org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for Resin diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/SunOneJtaPlatform.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/SunOneJtaPlatform.java index 237466dba..9fba84dfb 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/SunOneJtaPlatform.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/SunOneJtaPlatform.java @@ -6,8 +6,8 @@ */ package com.fr.third.org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import com.fr.third.javax.transaction.TransactionManager; +import com.fr.third.javax.transaction.UserTransaction; /** * {@link com.fr.third.org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for Sun ONE Application Server 7 and above diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryAccess.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryAccess.java index 51373b181..721fce68c 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryAccess.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryAccess.java @@ -7,7 +7,7 @@ package com.fr.third.org.hibernate.engine.transaction.jta.platform.internal; import java.io.Serializable; -import javax.transaction.TransactionSynchronizationRegistry; +import com.fr.third.javax.transaction.TransactionSynchronizationRegistry; /** * Provides access to a {@link TransactionSynchronizationRegistry} for use by {@link TransactionSynchronizationRegistry}-based diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryBasedSynchronizationStrategy.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryBasedSynchronizationStrategy.java index bba94130c..267a110ec 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryBasedSynchronizationStrategy.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/SynchronizationRegistryBasedSynchronizationStrategy.java @@ -6,8 +6,8 @@ */ package com.fr.third.org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.Synchronization; -import javax.transaction.TransactionSynchronizationRegistry; +import com.fr.third.javax.transaction.Synchronization; +import com.fr.third.javax.transaction.TransactionSynchronizationRegistry; import com.fr.third.org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerAccess.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerAccess.java index a4870a96e..b0cc0fd03 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerAccess.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerAccess.java @@ -7,7 +7,7 @@ package com.fr.third.org.hibernate.engine.transaction.jta.platform.internal; import java.io.Serializable; -import javax.transaction.TransactionManager; +import com.fr.third.javax.transaction.TransactionManager; /** * Provides access to a {@link TransactionManager} for use by {@link TransactionManager}-based diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerBasedSynchronizationStrategy.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerBasedSynchronizationStrategy.java index 7038923b1..7d2d8945a 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerBasedSynchronizationStrategy.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/TransactionManagerBasedSynchronizationStrategy.java @@ -6,14 +6,15 @@ */ package com.fr.third.org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.Synchronization; +import com.fr.third.javax.transaction.Synchronization; +import com.fr.third.javax.transaction.TransactionManager; import com.fr.third.org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; import com.fr.third.org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; /** * Implementation of the {@link JtaSynchronizationStrategy} contract based on using a - * {@link javax.transaction.TransactionManager} + * {@link TransactionManager} * * @author Steve Ebersole */ diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/WebSphereExtendedJtaPlatform.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/WebSphereExtendedJtaPlatform.java index 9c0e24454..98c870a2b 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/WebSphereExtendedJtaPlatform.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/WebSphereExtendedJtaPlatform.java @@ -9,15 +9,15 @@ package com.fr.third.org.hibernate.engine.transaction.jta.platform.internal; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import javax.transaction.NotSupportedException; -import javax.transaction.RollbackException; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; -import javax.transaction.xa.XAResource; +import com.fr.third.javax.transaction.NotSupportedException; +import com.fr.third.javax.transaction.RollbackException; +import com.fr.third.javax.transaction.Status; +import com.fr.third.javax.transaction.Synchronization; +import com.fr.third.javax.transaction.SystemException; +import com.fr.third.javax.transaction.Transaction; +import com.fr.third.javax.transaction.TransactionManager; +import com.fr.third.javax.transaction.UserTransaction; +import com.fr.third.javax.transaction.xa.XAResource; import com.fr.third.org.hibernate.HibernateException; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/WebSphereJtaPlatform.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/WebSphereJtaPlatform.java index ea23e46cc..4cf584fca 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/WebSphereJtaPlatform.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/WebSphereJtaPlatform.java @@ -7,8 +7,8 @@ package com.fr.third.org.hibernate.engine.transaction.jta.platform.internal; import java.lang.reflect.Method; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import com.fr.third.javax.transaction.TransactionManager; +import com.fr.third.javax.transaction.UserTransaction; import com.fr.third.org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformException; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/WeblogicJtaPlatform.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/WeblogicJtaPlatform.java index 8a6b5a4ef..983259365 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/WeblogicJtaPlatform.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/internal/WeblogicJtaPlatform.java @@ -6,8 +6,8 @@ */ package com.fr.third.org.hibernate.engine.transaction.jta.platform.internal; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import com.fr.third.javax.transaction.TransactionManager; +import com.fr.third.javax.transaction.UserTransaction; /** * {@link com.fr.third.org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform} implementation for Weblogic @@ -16,8 +16,8 @@ import javax.transaction.UserTransaction; * @author Steve Ebersole */ public class WeblogicJtaPlatform extends AbstractJtaPlatform { - public static final String TM_NAME = "javax.transaction.TransactionManager"; - public static final String UT_NAME = "javax.transaction.UserTransaction"; + public static final String TM_NAME = "TransactionManager"; + public static final String UT_NAME = "UserTransaction"; @Override protected TransactionManager locateTransactionManager() { diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatform.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatform.java index 69d7f0600..dd922107e 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatform.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/jta/platform/spi/JtaPlatform.java @@ -6,11 +6,11 @@ */ package com.fr.third.org.hibernate.engine.transaction.jta.platform.spi; -import javax.transaction.Synchronization; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import com.fr.third.javax.transaction.Synchronization; +import com.fr.third.javax.transaction.SystemException; +import com.fr.third.javax.transaction.Transaction; +import com.fr.third.javax.transaction.TransactionManager; +import com.fr.third.javax.transaction.UserTransaction; import com.fr.third.org.hibernate.service.Service; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/spi/SynchronizationRegistry.java b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/spi/SynchronizationRegistry.java index d93842a4e..87d5b982f 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/spi/SynchronizationRegistry.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/engine/transaction/spi/SynchronizationRegistry.java @@ -7,7 +7,9 @@ package com.fr.third.org.hibernate.engine.transaction.spi; import java.io.Serializable; -import javax.transaction.Synchronization; + +import com.fr.third.javax.transaction.Status; +import com.fr.third.javax.transaction.Synchronization; /** * Manages a registry of {@link Synchronization Synchronizations}. @@ -34,7 +36,7 @@ public interface SynchronizationRegistry extends Serializable { * Delegate {@link Synchronization#afterCompletion} calls to {@link #registerSynchronization registered} * {@link Synchronization Synchronizations} * - * @param status The transaction status (if known) per {@link javax.transaction.Status} + * @param status The transaction status (if known) per {@link Status} */ void notifySynchronizationsAfterTransactionCompletion(int status); } diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/antlr/HqlBaseLexer.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/antlr/HqlBaseLexer.java index 66bf9b194..e2f263a92 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/antlr/HqlBaseLexer.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/antlr/HqlBaseLexer.java @@ -4,25 +4,25 @@ package com.fr.third.org.hibernate.hql.internal.antlr; import java.io.InputStream; -import antlr.TokenStreamException; -import antlr.TokenStreamIOException; -import antlr.TokenStreamRecognitionException; -import antlr.CharStreamException; -import antlr.CharStreamIOException; +import com.fr.third.antlr.TokenStreamException; +import com.fr.third.antlr.TokenStreamIOException; +import com.fr.third.antlr.TokenStreamRecognitionException; +import com.fr.third.antlr.CharStreamException; +import com.fr.third.antlr.CharStreamIOException; import java.io.Reader; import java.util.Hashtable; -import antlr.InputBuffer; -import antlr.ByteBuffer; -import antlr.CharBuffer; -import antlr.Token; -import antlr.RecognitionException; -import antlr.NoViableAltForCharException; -import antlr.TokenStream; -import antlr.ANTLRHashString; -import antlr.LexerSharedInputState; -import antlr.collections.impl.BitSet; +import com.fr.third.antlr.InputBuffer; +import com.fr.third.antlr.ByteBuffer; +import com.fr.third.antlr.CharBuffer; +import com.fr.third.antlr.Token; +import com.fr.third.antlr.RecognitionException; +import com.fr.third.antlr.NoViableAltForCharException; +import com.fr.third.antlr.TokenStream; +import com.fr.third.antlr.ANTLRHashString; +import com.fr.third.antlr.LexerSharedInputState; +import com.fr.third.antlr.collections.impl.BitSet; /** * Hibernate Query Language Lexer @@ -30,7 +30,7 @@ import antlr.collections.impl.BitSet; * This lexer provides the HQL parser with tokens. * @author Joshua Davis (pgmjsd@sourceforge.net) */ -public class HqlBaseLexer extends antlr.CharScanner implements HqlTokenTypes, TokenStream +public class HqlBaseLexer extends com.fr.third.antlr.CharScanner implements HqlTokenTypes, TokenStream { // NOTE: The real implementations are in the subclass. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/antlr/HqlBaseParser.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/antlr/HqlBaseParser.java index 0c48c3412..4634e2583 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/antlr/HqlBaseParser.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/antlr/HqlBaseParser.java @@ -5,19 +5,19 @@ package com.fr.third.org.hibernate.hql.internal.antlr; import com.fr.third.org.hibernate.hql.internal.ast.util.*; -import antlr.TokenBuffer; -import antlr.TokenStreamException; -import antlr.Token; -import antlr.TokenStream; -import antlr.RecognitionException; -import antlr.NoViableAltException; -import antlr.SemanticException; -import antlr.ParserSharedInputState; -import antlr.collections.impl.BitSet; -import antlr.collections.AST; -import antlr.ASTFactory; -import antlr.ASTPair; -import antlr.collections.impl.ASTArray; +import com.fr.third.antlr.TokenBuffer; +import com.fr.third.antlr.TokenStreamException; +import com.fr.third.antlr.Token; +import com.fr.third.antlr.TokenStream; +import com.fr.third.antlr.RecognitionException; +import com.fr.third.antlr.NoViableAltException; +import com.fr.third.antlr.SemanticException; +import com.fr.third.antlr.ParserSharedInputState; +import com.fr.third.antlr.collections.impl.BitSet; +import com.fr.third.antlr.collections.AST; +import com.fr.third.antlr.ASTFactory; +import com.fr.third.antlr.ASTPair; +import com.fr.third.antlr.collections.impl.ASTArray; /** * Hibernate Query Language Grammar @@ -29,7 +29,7 @@ import antlr.collections.impl.ASTArray; * Text from the original reference BNF is prefixed with '//##'. * @author Joshua Davis (pgmjsd@sourceforge.net) */ -public class HqlBaseParser extends antlr.LLkParser implements HqlTokenTypes +public class HqlBaseParser extends com.fr.third.antlr.LLkParser implements HqlTokenTypes { /** True if this is a filter query (allow no FROM clause). **/ diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/antlr/HqlSqlBaseWalker.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/antlr/HqlSqlBaseWalker.java index 01d62061e..5a2ffcaad 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/antlr/HqlSqlBaseWalker.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/antlr/HqlSqlBaseWalker.java @@ -7,13 +7,13 @@ import java.util.Stack; import com.fr.third.org.hibernate.internal.CoreMessageLogger; import com.fr.third.org.jboss.logging.Logger; -import antlr.collections.AST; -import antlr.RecognitionException; -import antlr.NoViableAltException; -import antlr.SemanticException; -import antlr.collections.impl.BitSet; -import antlr.ASTPair; -import antlr.collections.impl.ASTArray; +import com.fr.third.antlr.collections.AST; +import com.fr.third.antlr.RecognitionException; +import com.fr.third.antlr.NoViableAltException; +import com.fr.third.antlr.SemanticException; +import com.fr.third.antlr.collections.impl.BitSet; +import com.fr.third.antlr.ASTPair; +import com.fr.third.antlr.collections.impl.ASTArray; /** @@ -28,7 +28,7 @@ import antlr.collections.impl.ASTArray; * DO NOT EDIT THE GENERATED JAVA SOURCE CODE. * @author Joshua Davis (joshua@hibernate.org) */ -public class HqlSqlBaseWalker extends antlr.TreeParser implements HqlSqlTokenTypes +public class HqlSqlBaseWalker extends com.fr.third.antlr.TreeParser implements HqlSqlTokenTypes { private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, HqlSqlBaseWalker.class.getName()); diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/antlr/SqlGeneratorBase.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/antlr/SqlGeneratorBase.java index a88097a00..19f72bbba 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/antlr/SqlGeneratorBase.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/antlr/SqlGeneratorBase.java @@ -2,11 +2,11 @@ package com.fr.third.org.hibernate.hql.internal.antlr; -import antlr.collections.AST; -import antlr.RecognitionException; -import antlr.NoViableAltException; -import antlr.MismatchedTokenException; -import antlr.collections.impl.BitSet; +import com.fr.third.antlr.collections.AST; +import com.fr.third.antlr.RecognitionException; +import com.fr.third.antlr.NoViableAltException; +import com.fr.third.antlr.MismatchedTokenException; +import com.fr.third.antlr.collections.impl.BitSet; /** @@ -17,7 +17,7 @@ import antlr.collections.impl.BitSet; * code into a sub-class that will override some of the methods, just like the other two grammars in this system. * @author Joshua Davis (joshua@hibernate.org) */ -public class SqlGeneratorBase extends antlr.TreeParser implements SqlTokenTypes +public class SqlGeneratorBase extends com.fr.third.antlr.TreeParser implements SqlTokenTypes { diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/antlr/SqlStatementLexer.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/antlr/SqlStatementLexer.java index 19e4ccd2b..21ba6918c 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/antlr/SqlStatementLexer.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/antlr/SqlStatementLexer.java @@ -3,26 +3,26 @@ package com.fr.third.org.hibernate.hql.internal.antlr; import java.io.InputStream; -import antlr.TokenStreamException; -import antlr.TokenStreamIOException; -import antlr.TokenStreamRecognitionException; -import antlr.CharStreamException; -import antlr.CharStreamIOException; +import com.fr.third.antlr.TokenStreamException; +import com.fr.third.antlr.TokenStreamIOException; +import com.fr.third.antlr.TokenStreamRecognitionException; +import com.fr.third.antlr.CharStreamException; +import com.fr.third.antlr.CharStreamIOException; import java.io.Reader; import java.util.Hashtable; -import antlr.InputBuffer; -import antlr.ByteBuffer; -import antlr.CharBuffer; -import antlr.Token; -import antlr.RecognitionException; -import antlr.NoViableAltForCharException; -import antlr.TokenStream; -import antlr.LexerSharedInputState; -import antlr.collections.impl.BitSet; +import com.fr.third.antlr.InputBuffer; +import com.fr.third.antlr.ByteBuffer; +import com.fr.third.antlr.CharBuffer; +import com.fr.third.antlr.Token; +import com.fr.third.antlr.RecognitionException; +import com.fr.third.antlr.NoViableAltForCharException; +import com.fr.third.antlr.TokenStream; +import com.fr.third.antlr.LexerSharedInputState; +import com.fr.third.antlr.collections.impl.BitSet; -public class SqlStatementLexer extends antlr.CharScanner implements SqlStatementParserTokenTypes, TokenStream +public class SqlStatementLexer extends com.fr.third.antlr.CharScanner implements SqlStatementParserTokenTypes, TokenStream { public SqlStatementLexer(InputStream in) { this(new ByteBuffer(in)); diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/antlr/SqlStatementParser.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/antlr/SqlStatementParser.java index f0d18b76d..c07505543 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/antlr/SqlStatementParser.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/antlr/SqlStatementParser.java @@ -8,13 +8,13 @@ import java.util.LinkedList; import com.fr.third.org.hibernate.hql.internal.ast.ErrorReporter; -import antlr.TokenBuffer; -import antlr.TokenStreamException; -import antlr.Token; -import antlr.TokenStream; -import antlr.RecognitionException; -import antlr.ParserSharedInputState; -import antlr.collections.impl.BitSet; +import com.fr.third.antlr.TokenBuffer; +import com.fr.third.antlr.TokenStreamException; +import com.fr.third.antlr.Token; +import com.fr.third.antlr.TokenStream; +import com.fr.third.antlr.RecognitionException; +import com.fr.third.antlr.ParserSharedInputState; +import com.fr.third.antlr.collections.impl.BitSet; /** * Lexer and parser used to extract single statements from import SQL script. Supports instructions/comments and quoted @@ -22,7 +22,7 @@ import antlr.collections.impl.BitSet; * * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -public class SqlStatementParser extends antlr.LLkParser implements SqlStatementParserTokenTypes +public class SqlStatementParser extends com.fr.third.antlr.LLkParser implements SqlStatementParserTokenTypes { private ErrorHandler errorHandler = new ErrorHandler(); diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/DetailedSemanticException.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/DetailedSemanticException.java index ff4fe7b74..d933439f4 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/DetailedSemanticException.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/DetailedSemanticException.java @@ -8,7 +8,7 @@ package com.fr.third.org.hibernate.hql.internal.ast; import java.io.PrintStream; import java.io.PrintWriter; -import antlr.SemanticException; +import com.fr.third.antlr.SemanticException; /** * Thrown when a call to the underlying Hibernate engine fails, indicating diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/ErrorCounter.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/ErrorCounter.java index effdd1b1a..4c366aa27 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/ErrorCounter.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/ErrorCounter.java @@ -15,7 +15,7 @@ import com.fr.third.org.hibernate.internal.CoreMessageLogger; import com.fr.third.org.jboss.logging.Logger; -import antlr.RecognitionException; +import com.fr.third.antlr.RecognitionException; /** * An error handler that counts parsing errors and warnings. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/ErrorReporter.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/ErrorReporter.java index a1151fadb..9994421e8 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/ErrorReporter.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/ErrorReporter.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package com.fr.third.org.hibernate.hql.internal.ast; -import antlr.RecognitionException; +import com.fr.third.antlr.RecognitionException; /** * Implementations will report or handle errors invoked by an ANTLR base parser. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/HqlASTFactory.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/HqlASTFactory.java index b7e26114f..7fa7b0635 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/HqlASTFactory.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/HqlASTFactory.java @@ -8,7 +8,7 @@ package com.fr.third.org.hibernate.hql.internal.ast; import com.fr.third.org.hibernate.hql.internal.ast.tree.Node; -import antlr.ASTFactory; +import com.fr.third.antlr.ASTFactory; /** * User: Joshua Davis
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/HqlLexer.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/HqlLexer.java index ffc830276..705c4f571 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/HqlLexer.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/HqlLexer.java @@ -11,7 +11,7 @@ import java.io.Reader; import com.fr.third.org.hibernate.QueryException; import com.fr.third.org.hibernate.hql.internal.antlr.HqlBaseLexer; -import antlr.Token; +import com.fr.third.antlr.Token; /** * Custom lexer for the HQL grammar. Extends the base lexer generated by ANTLR diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/HqlParser.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/HqlParser.java index bf75c1b8a..6a03fd7a2 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/HqlParser.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/HqlParser.java @@ -24,12 +24,12 @@ import com.fr.third.org.hibernate.internal.CoreLogging; import com.fr.third.org.hibernate.internal.CoreMessageLogger; import com.fr.third.org.hibernate.internal.util.StringHelper; -import antlr.ASTPair; -import antlr.MismatchedTokenException; -import antlr.RecognitionException; -import antlr.Token; -import antlr.TokenStreamException; -import antlr.collections.AST; +import com.fr.third.antlr.ASTPair; +import com.fr.third.antlr.MismatchedTokenException; +import com.fr.third.antlr.RecognitionException; +import com.fr.third.antlr.Token; +import com.fr.third.antlr.TokenStreamException; +import com.fr.third.antlr.collections.AST; /** * Implements the semantic action methods defined in the HQL base parser to keep the grammar @@ -122,8 +122,8 @@ public final class HqlParser extends HqlBaseParser { * * @return AST - The new AST. * - * @throws antlr.RecognitionException if the substitution was not possible. - * @throws antlr.TokenStreamException if the substitution was not possible. + * @throws com.fr.third.antlr.RecognitionException if the substitution was not possible. + * @throws com.fr.third.antlr.TokenStreamException if the substitution was not possible. */ @Override public AST handleIdentifierError(Token token, RecognitionException ex) diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/HqlSqlWalker.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/HqlSqlWalker.java index 569655ae0..62be3e501 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/HqlSqlWalker.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/HqlSqlWalker.java @@ -87,10 +87,10 @@ import com.fr.third.org.hibernate.type.Type; import com.fr.third.org.hibernate.type.VersionType; import com.fr.third.org.hibernate.usertype.UserVersionType; -import antlr.ASTFactory; -import antlr.RecognitionException; -import antlr.SemanticException; -import antlr.collections.AST; +import com.fr.third.antlr.ASTFactory; +import com.fr.third.antlr.RecognitionException; +import com.fr.third.antlr.SemanticException; +import com.fr.third.antlr.collections.AST; /** * Implements methods used by the HQL->SQL tree transform grammar (a.k.a. the second phase). diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/HqlToken.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/HqlToken.java index 2383de4b3..16dcaeec0 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/HqlToken.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/HqlToken.java @@ -11,7 +11,7 @@ package com.fr.third.org.hibernate.hql.internal.ast; *

NOTE: This class must be public becuase it is instantiated by the ANTLR library. Ignore any suggestions * by various code 'analyzers' about this class being package local.

*/ -public class HqlToken extends antlr.CommonToken { +public class HqlToken extends com.fr.third.antlr.CommonToken { /** * True if this token could be an identifier. */ diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/InvalidPathException.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/InvalidPathException.java index fe81769c1..f3778ca3a 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/InvalidPathException.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/InvalidPathException.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package com.fr.third.org.hibernate.hql.internal.ast; -import antlr.SemanticException; +import com.fr.third.antlr.SemanticException; /** * Exception thrown when an invalid path is found in a query. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/QuerySyntaxException.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/QuerySyntaxException.java index d02526a2c..67902ba87 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/QuerySyntaxException.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/QuerySyntaxException.java @@ -8,7 +8,7 @@ package com.fr.third.org.hibernate.hql.internal.ast; import com.fr.third.org.hibernate.QueryException; -import antlr.RecognitionException; +import com.fr.third.antlr.RecognitionException; /** * Exception thrown when there is a syntax error in the HQL. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/QueryTranslatorImpl.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/QueryTranslatorImpl.java index 92aa25237..e7968fcca 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/QueryTranslatorImpl.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/QueryTranslatorImpl.java @@ -56,10 +56,10 @@ import com.fr.third.org.hibernate.type.Type; import com.fr.third.org.jboss.logging.Logger; -import antlr.ANTLRException; -import antlr.RecognitionException; -import antlr.TokenStreamException; -import antlr.collections.AST; +import com.fr.third.antlr.ANTLRException; +import com.fr.third.antlr.RecognitionException; +import com.fr.third.antlr.TokenStreamException; +import com.fr.third.antlr.collections.AST; /** * A QueryTranslator that uses an Antlr-based parser. @@ -224,13 +224,13 @@ public class QueryTranslatorImpl implements FilterTranslator { catch ( RecognitionException e ) { // we do not actually propagate ANTLRExceptions as a cause, so // log it here for diagnostic purposes - LOG.trace( "Converted antlr.RecognitionException", e ); + LOG.trace( "Converted com.fr.third.antlr.RecognitionException", e ); throw QuerySyntaxException.convert( e, hql ); } catch ( ANTLRException e ) { // we do not actually propagate ANTLRExceptions as a cause, so // log it here for diagnostic purposes - LOG.trace( "Converted antlr.ANTLRException", e ); + LOG.trace( "Converted com.fr.third.antlr.ANTLRException", e ); throw new QueryException( e.getMessage(), hql ); } diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/SqlASTFactory.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/SqlASTFactory.java index 84f59ebc9..7a573fe57 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/SqlASTFactory.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/SqlASTFactory.java @@ -53,9 +53,9 @@ import com.fr.third.org.hibernate.hql.internal.ast.tree.UnaryArithmeticNode; import com.fr.third.org.hibernate.hql.internal.ast.tree.UnaryLogicOperatorNode; import com.fr.third.org.hibernate.hql.internal.ast.tree.UpdateStatement; -import antlr.ASTFactory; -import antlr.Token; -import antlr.collections.AST; +import com.fr.third.antlr.ASTFactory; +import com.fr.third.antlr.Token; +import com.fr.third.antlr.collections.AST; /** * Custom AST factory the intermediate tree that causes ANTLR to create specialized diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/SqlGenerator.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/SqlGenerator.java index 611c0b0bd..eaa8e0e66 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/SqlGenerator.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/SqlGenerator.java @@ -30,8 +30,8 @@ import com.fr.third.org.hibernate.internal.util.collections.CollectionHelper; import com.fr.third.org.hibernate.param.ParameterSpecification; import com.fr.third.org.hibernate.type.Type; -import antlr.RecognitionException; -import antlr.collections.AST; +import com.fr.third.antlr.RecognitionException; +import com.fr.third.antlr.collections.AST; /** * Generates SQL by overriding callback methods in the base class, which does diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/exec/BasicExecutor.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/exec/BasicExecutor.java index 3902a406b..32ff2005e 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/exec/BasicExecutor.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/exec/BasicExecutor.java @@ -24,7 +24,7 @@ import com.fr.third.org.hibernate.hql.internal.ast.SqlGenerator; import com.fr.third.org.hibernate.param.ParameterSpecification; import com.fr.third.org.hibernate.persister.entity.Queryable; -import antlr.RecognitionException; +import com.fr.third.antlr.RecognitionException; /** * Implementation of BasicExecutor. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/exec/DeleteExecutor.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/exec/DeleteExecutor.java index 7d3cda2c3..60475c0b3 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/exec/DeleteExecutor.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/exec/DeleteExecutor.java @@ -27,8 +27,8 @@ import com.fr.third.org.hibernate.type.Type; import com.fr.third.org.jboss.logging.Logger; -import antlr.RecognitionException; -import antlr.collections.AST; +import com.fr.third.antlr.RecognitionException; +import com.fr.third.antlr.collections.AST; /** diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/AbstractMapComponentNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/AbstractMapComponentNode.java index ef88f6036..89399a0ca 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/AbstractMapComponentNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/AbstractMapComponentNode.java @@ -15,8 +15,8 @@ import com.fr.third.org.hibernate.persister.collection.QueryableCollection; import com.fr.third.org.hibernate.type.CollectionType; import com.fr.third.org.hibernate.type.Type; -import antlr.SemanticException; -import antlr.collections.AST; +import com.fr.third.antlr.SemanticException; +import com.fr.third.antlr.collections.AST; /** * Basic support for KEY, VALUE and ENTRY based "qualified identification variables". diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/AbstractNullnessCheckNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/AbstractNullnessCheckNode.java index 651083069..8c2622188 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/AbstractNullnessCheckNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/AbstractNullnessCheckNode.java @@ -12,7 +12,7 @@ import com.fr.third.org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; import com.fr.third.org.hibernate.internal.util.StringHelper; import com.fr.third.org.hibernate.type.Type; -import antlr.collections.AST; +import com.fr.third.antlr.collections.AST; /** * Base class for nodes dealing 'is null' and 'is not null' operators. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/AbstractRestrictableStatement.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/AbstractRestrictableStatement.java index feb616db1..892fa6883 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/AbstractRestrictableStatement.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/AbstractRestrictableStatement.java @@ -10,7 +10,7 @@ import com.fr.third.org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; import com.fr.third.org.hibernate.hql.internal.ast.util.ASTUtil; import com.fr.third.org.hibernate.internal.CoreMessageLogger; -import antlr.collections.AST; +import com.fr.third.antlr.collections.AST; /** * Convenience implementation of {@link RestrictableStatement} diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/AbstractSelectExpression.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/AbstractSelectExpression.java index 67ae4fecc..ae49645ed 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/AbstractSelectExpression.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/AbstractSelectExpression.java @@ -8,7 +8,7 @@ package com.fr.third.org.hibernate.hql.internal.ast.tree; import com.fr.third.org.hibernate.type.Type; -import antlr.SemanticException; +import com.fr.third.antlr.SemanticException; /** * Partial implementation of SelectExpression for all the nodes that aren't constructors. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/AggregateNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/AggregateNode.java index c17d7c781..2c616e0e7 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/AggregateNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/AggregateNode.java @@ -14,8 +14,8 @@ import com.fr.third.org.hibernate.type.Type; import com.fr.third.org.jboss.logging.Logger; -import antlr.SemanticException; -import antlr.collections.AST; +import com.fr.third.antlr.SemanticException; +import com.fr.third.antlr.collections.AST; /** * Represents an aggregate function i.e. min, max, sum, avg. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/AssignmentSpecification.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/AssignmentSpecification.java index c43f16d82..89a4436b8 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/AssignmentSpecification.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/AssignmentSpecification.java @@ -21,7 +21,7 @@ import com.fr.third.org.hibernate.param.ParameterSpecification; import com.fr.third.org.hibernate.persister.entity.Queryable; import com.fr.third.org.hibernate.persister.entity.UnionSubclassEntityPersister; -import antlr.collections.AST; +import com.fr.third.antlr.collections.AST; /** * Encapsulates the information relating to an individual assignment within the diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/BetweenOperatorNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/BetweenOperatorNode.java index d5c0cbc80..e0c0a6100 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/BetweenOperatorNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/BetweenOperatorNode.java @@ -9,7 +9,7 @@ package com.fr.third.org.hibernate.hql.internal.ast.tree; import com.fr.third.org.hibernate.type.StandardBasicTypes; import com.fr.third.org.hibernate.type.Type; -import antlr.SemanticException; +import com.fr.third.antlr.SemanticException; /** * Contract for nodes representing logical BETWEEN (ternary) operators. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/BinaryArithmeticOperatorNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/BinaryArithmeticOperatorNode.java index d3a17641c..d77ee0548 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/BinaryArithmeticOperatorNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/BinaryArithmeticOperatorNode.java @@ -11,7 +11,7 @@ import com.fr.third.org.hibernate.hql.internal.ast.util.ColumnHelper; import com.fr.third.org.hibernate.type.StandardBasicTypes; import com.fr.third.org.hibernate.type.Type; -import antlr.SemanticException; +import com.fr.third.antlr.SemanticException; /** * Nodes which represent binary arithmetic operators. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/BinaryLogicOperatorNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/BinaryLogicOperatorNode.java index 193b3c804..97c619342 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/BinaryLogicOperatorNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/BinaryLogicOperatorNode.java @@ -20,8 +20,8 @@ import com.fr.third.org.hibernate.type.OneToOneType; import com.fr.third.org.hibernate.type.StandardBasicTypes; import com.fr.third.org.hibernate.type.Type; -import antlr.SemanticException; -import antlr.collections.AST; +import com.fr.third.antlr.SemanticException; +import com.fr.third.antlr.collections.AST; /** * Contract for nodes representing binary operators. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/CastFunctionNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/CastFunctionNode.java index f08bf5fcd..070e23894 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/CastFunctionNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/CastFunctionNode.java @@ -12,7 +12,7 @@ import com.fr.third.org.hibernate.dialect.function.SQLFunction; import com.fr.third.org.hibernate.hql.internal.ast.util.ColumnHelper; import com.fr.third.org.hibernate.type.Type; -import antlr.SemanticException; +import com.fr.third.antlr.SemanticException; /** * Represents a cast function call. We handle this specially because its type diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/CollectionFunction.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/CollectionFunction.java index e317a1c04..1ca894455 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/CollectionFunction.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/CollectionFunction.java @@ -5,8 +5,8 @@ * See the lgpl.txt file in the root directory or . */ package com.fr.third.org.hibernate.hql.internal.ast.tree; -import antlr.SemanticException; -import antlr.collections.AST; +import com.fr.third.antlr.SemanticException; +import com.fr.third.antlr.collections.AST; /** * Represents 'elements()' or 'indices()'. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/ConstructorNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/ConstructorNode.java index cabe5b6c6..8d35f9ccb 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/ConstructorNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/ConstructorNode.java @@ -25,8 +25,8 @@ import com.fr.third.org.hibernate.transform.Transformers; import com.fr.third.org.hibernate.type.PrimitiveType; import com.fr.third.org.hibernate.type.Type; -import antlr.SemanticException; -import antlr.collections.AST; +import com.fr.third.antlr.SemanticException; +import com.fr.third.antlr.collections.AST; /** * Represents a constructor (new) in a SELECT. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/CountNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/CountNode.java index a00bc23bd..d8a84a8e9 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/CountNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/CountNode.java @@ -9,7 +9,7 @@ package com.fr.third.org.hibernate.hql.internal.ast.tree; import com.fr.third.org.hibernate.hql.internal.ast.util.ColumnHelper; import com.fr.third.org.hibernate.type.Type; -import antlr.SemanticException; +import com.fr.third.antlr.SemanticException; /** * Represents a COUNT expression in a select. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/DotNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/DotNode.java index ae3214463..b4f2fb15c 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/DotNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/DotNode.java @@ -25,8 +25,8 @@ import com.fr.third.org.hibernate.type.CollectionType; import com.fr.third.org.hibernate.type.EntityType; import com.fr.third.org.hibernate.type.Type; -import antlr.SemanticException; -import antlr.collections.AST; +import com.fr.third.antlr.SemanticException; +import com.fr.third.antlr.collections.AST; /** * Represents a reference to a property or alias expression. This should duplicate the relevant behaviors in diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/FromClause.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/FromClause.java index cbc1b091f..1d6965586 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/FromClause.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/FromClause.java @@ -20,8 +20,8 @@ import com.fr.third.org.hibernate.hql.internal.ast.util.ASTUtil; import com.fr.third.org.hibernate.internal.CoreLogging; import com.fr.third.org.hibernate.internal.CoreMessageLogger; -import antlr.SemanticException; -import antlr.collections.AST; +import com.fr.third.antlr.SemanticException; +import com.fr.third.antlr.collections.AST; /** * Represents the 'FROM' part of a query or subquery, containing all mapped class references. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/FromElementFactory.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/FromElementFactory.java index d63638613..828ac287f 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/FromElementFactory.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/FromElementFactory.java @@ -26,9 +26,9 @@ import com.fr.third.org.hibernate.type.CompositeType; import com.fr.third.org.hibernate.type.EntityType; import com.fr.third.org.hibernate.type.Type; -import antlr.ASTFactory; -import antlr.SemanticException; -import antlr.collections.AST; +import com.fr.third.antlr.ASTFactory; +import com.fr.third.antlr.SemanticException; +import com.fr.third.antlr.collections.AST; /** * Encapsulates the creation of FromElements and JoinSequences. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/FromElementType.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/FromElementType.java index 990e634a7..6d74d349c 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/FromElementType.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/FromElementType.java @@ -32,7 +32,7 @@ import com.fr.third.org.hibernate.persister.entity.Queryable; import com.fr.third.org.hibernate.type.EntityType; import com.fr.third.org.hibernate.type.Type; -import antlr.SemanticException; +import com.fr.third.antlr.SemanticException; /** * Delegate that handles the type and join sequence information for a FromElement. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/FromReferenceNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/FromReferenceNode.java index 85176a12d..3c22ceb9a 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/FromReferenceNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/FromReferenceNode.java @@ -10,8 +10,8 @@ import com.fr.third.org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; import com.fr.third.org.hibernate.internal.CoreLogging; import com.fr.third.org.hibernate.internal.CoreMessageLogger; -import antlr.SemanticException; -import antlr.collections.AST; +import com.fr.third.antlr.SemanticException; +import com.fr.third.antlr.collections.AST; /** * Represents a reference to a FROM element, for example a class alias in a WHERE clause. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/HqlSqlWalkerNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/HqlSqlWalkerNode.java index a1dae708f..d6b4ccd07 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/HqlSqlWalkerNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/HqlSqlWalkerNode.java @@ -10,7 +10,7 @@ import com.fr.third.org.hibernate.hql.internal.ast.HqlSqlWalker; import com.fr.third.org.hibernate.hql.internal.ast.util.AliasGenerator; import com.fr.third.org.hibernate.hql.internal.ast.util.SessionFactoryHelper; -import antlr.ASTFactory; +import com.fr.third.antlr.ASTFactory; /** * A semantic analysis node, that points back to the main analyzer. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/IdentNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/IdentNode.java index f33e32c31..96c0d4d67 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/IdentNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/IdentNode.java @@ -21,8 +21,8 @@ import com.fr.third.org.hibernate.sql.JoinType; import com.fr.third.org.hibernate.type.CollectionType; import com.fr.third.org.hibernate.type.Type; -import antlr.SemanticException; -import antlr.collections.AST; +import com.fr.third.antlr.SemanticException; +import com.fr.third.antlr.collections.AST; /** * Represents an identifier all by itself, which may be a function name, diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/InLogicOperatorNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/InLogicOperatorNode.java index 2320ef1a9..a42ecb1f5 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/InLogicOperatorNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/InLogicOperatorNode.java @@ -15,8 +15,8 @@ import com.fr.third.org.hibernate.hql.internal.antlr.HqlTokenTypes; import com.fr.third.org.hibernate.param.ParameterSpecification; import com.fr.third.org.hibernate.type.Type; -import antlr.SemanticException; -import antlr.collections.AST; +import com.fr.third.antlr.SemanticException; +import com.fr.third.antlr.collections.AST; /** * @author Steve Ebersole diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/IndexNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/IndexNode.java index 68fe3c3aa..ecf61410a 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/IndexNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/IndexNode.java @@ -23,9 +23,9 @@ import com.fr.third.org.hibernate.persister.collection.QueryableCollection; import com.fr.third.org.hibernate.type.CollectionType; import com.fr.third.org.hibernate.type.Type; -import antlr.RecognitionException; -import antlr.SemanticException; -import antlr.collections.AST; +import com.fr.third.antlr.RecognitionException; +import com.fr.third.antlr.SemanticException; +import com.fr.third.antlr.collections.AST; /** * Represents the [] operator and provides it's semantics. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/IntoClause.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/IntoClause.java index 8552c8688..192c27846 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/IntoClause.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/IntoClause.java @@ -18,7 +18,7 @@ import com.fr.third.org.hibernate.persister.entity.Queryable; import com.fr.third.org.hibernate.type.CompositeType; import com.fr.third.org.hibernate.type.Type; -import antlr.collections.AST; +import com.fr.third.antlr.collections.AST; /** * Represents an entity referenced in the INTO clause of an HQL diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/LiteralNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/LiteralNode.java index 65dd892ce..de985985c 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/LiteralNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/LiteralNode.java @@ -18,7 +18,7 @@ import com.fr.third.org.hibernate.type.StandardBasicTypes; import com.fr.third.org.hibernate.type.Type; import com.fr.third.org.hibernate.type.descriptor.converter.AttributeConverterTypeAdapter; -import antlr.SemanticException; +import com.fr.third.antlr.SemanticException; /** * Represents a literal. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/MapEntryNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/MapEntryNode.java index 38d02bcf3..86ba145bf 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/MapEntryNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/MapEntryNode.java @@ -11,7 +11,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import antlr.collections.AST; +import com.fr.third.antlr.collections.AST; import com.fr.third.org.hibernate.HibernateException; import com.fr.third.org.hibernate.engine.spi.SessionFactoryImplementor; import com.fr.third.org.hibernate.hql.internal.NameGenerator; @@ -25,7 +25,7 @@ import com.fr.third.org.hibernate.transform.ResultTransformer; import com.fr.third.org.hibernate.type.EntityType; import com.fr.third.org.hibernate.type.Type; -import antlr.SemanticException; +import com.fr.third.antlr.SemanticException; /** * Tree node representing reference to the entry ({@link Map.Entry}) of a Map association. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/MethodNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/MethodNode.java index 93fc534a9..edd00cc37 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/MethodNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/MethodNode.java @@ -21,8 +21,8 @@ import com.fr.third.org.hibernate.type.Type; import com.fr.third.org.jboss.logging.Logger; -import antlr.SemanticException; -import antlr.collections.AST; +import com.fr.third.antlr.SemanticException; +import com.fr.third.antlr.collections.AST; import java.util.Locale; /** diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/Node.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/Node.java index 8dfff35ee..f70a21234 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/Node.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/Node.java @@ -9,8 +9,8 @@ package com.fr.third.org.hibernate.hql.internal.ast.tree; import com.fr.third.org.hibernate.engine.spi.SessionFactoryImplementor; import com.fr.third.org.hibernate.internal.util.StringHelper; -import antlr.Token; -import antlr.collections.AST; +import com.fr.third.antlr.Token; +import com.fr.third.antlr.collections.AST; /** * Base node class for use by Hibernate within its AST trees. @@ -18,7 +18,7 @@ import antlr.collections.AST; * @author Joshua Davis * @author Steve Ebersole */ -public class Node extends antlr.CommonAST { +public class Node extends com.fr.third.antlr.CommonAST { private String filename; private int line; private int column; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/NullNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/NullNode.java index 879e3cda7..170ef9b5e 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/NullNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/NullNode.java @@ -6,7 +6,7 @@ */ package com.fr.third.org.hibernate.hql.internal.ast.tree; -import antlr.SemanticException; +import com.fr.third.antlr.SemanticException; import com.fr.third.org.hibernate.engine.spi.SessionFactoryImplementor; import com.fr.third.org.hibernate.hql.internal.ast.util.ColumnHelper; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/OperatorNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/OperatorNode.java index 671149ae3..3f85bb224 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/OperatorNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/OperatorNode.java @@ -8,7 +8,7 @@ package com.fr.third.org.hibernate.hql.internal.ast.tree; import com.fr.third.org.hibernate.type.Type; -import antlr.SemanticException; +import com.fr.third.antlr.SemanticException; /** * Contract for nodes representing operators (logic or arithmetic). diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/OrderByClause.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/OrderByClause.java index b860170c9..2d5ff2aae 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/OrderByClause.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/OrderByClause.java @@ -9,7 +9,7 @@ package com.fr.third.org.hibernate.hql.internal.ast.tree; import com.fr.third.org.hibernate.hql.internal.antlr.HqlSqlTokenTypes; import com.fr.third.org.hibernate.hql.internal.ast.util.ASTUtil; -import antlr.collections.AST; +import com.fr.third.antlr.collections.AST; /** * Implementation of OrderByClause. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/QueryNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/QueryNode.java index 2ff6d1b6c..6bf8a80e5 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/QueryNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/QueryNode.java @@ -14,8 +14,8 @@ import com.fr.third.org.hibernate.internal.CoreLogging; import com.fr.third.org.hibernate.internal.CoreMessageLogger; import com.fr.third.org.hibernate.type.Type; -import antlr.SemanticException; -import antlr.collections.AST; +import com.fr.third.antlr.SemanticException; +import com.fr.third.antlr.collections.AST; /** * Defines a top-level AST node representing an HQL select statement. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/ResolvableNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/ResolvableNode.java index ba9653ee1..c8002d418 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/ResolvableNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/ResolvableNode.java @@ -5,8 +5,8 @@ * See the lgpl.txt file in the root directory or . */ package com.fr.third.org.hibernate.hql.internal.ast.tree; -import antlr.SemanticException; -import antlr.collections.AST; +import com.fr.third.antlr.SemanticException; +import com.fr.third.antlr.collections.AST; /** * The contract for expression sub-trees that can resolve themselves. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/RestrictableStatement.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/RestrictableStatement.java index 68ca477fe..89d7ba489 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/RestrictableStatement.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/RestrictableStatement.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ package com.fr.third.org.hibernate.hql.internal.ast.tree; -import antlr.collections.AST; +import com.fr.third.antlr.collections.AST; /** * Type definition for Statements which are restrictable via a where-clause (and diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/ResultVariableRefNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/ResultVariableRefNode.java index 8ef0712c8..5edcfbf49 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/ResultVariableRefNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/ResultVariableRefNode.java @@ -9,7 +9,7 @@ package com.fr.third.org.hibernate.hql.internal.ast.tree; import com.fr.third.org.hibernate.engine.spi.SessionFactoryImplementor; import com.fr.third.org.hibernate.internal.util.StringHelper; -import antlr.SemanticException; +import com.fr.third.antlr.SemanticException; /** * Represents a reference to a result_variable as defined in the JPA 2 spec. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/SearchedCaseNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/SearchedCaseNode.java index 66837ea52..0a056de53 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/SearchedCaseNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/SearchedCaseNode.java @@ -12,8 +12,8 @@ import com.fr.third.org.hibernate.hql.internal.ast.util.ASTUtil; import com.fr.third.org.hibernate.hql.internal.ast.util.ColumnHelper; import com.fr.third.org.hibernate.type.Type; -import antlr.SemanticException; -import antlr.collections.AST; +import com.fr.third.antlr.SemanticException; +import com.fr.third.antlr.collections.AST; /** * Models what ANSI SQL terms a searched case expression. This is a CASE expression diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/SelectClause.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/SelectClause.java index a2d967dba..449383ec9 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/SelectClause.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/SelectClause.java @@ -18,8 +18,8 @@ import com.fr.third.org.hibernate.hql.internal.ast.util.ASTIterator; import com.fr.third.org.hibernate.hql.internal.ast.util.ASTPrinter; import com.fr.third.org.hibernate.type.Type; -import antlr.SemanticException; -import antlr.collections.AST; +import com.fr.third.antlr.SemanticException; +import com.fr.third.antlr.collections.AST; /** * Represents the list of expressions in a SELECT clause. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/SelectExpression.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/SelectExpression.java index 3d08f581d..5c38326fd 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/SelectExpression.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/SelectExpression.java @@ -8,7 +8,7 @@ package com.fr.third.org.hibernate.hql.internal.ast.tree; import com.fr.third.org.hibernate.type.Type; -import antlr.SemanticException; +import com.fr.third.antlr.SemanticException; /** * Represents an element of a projection list, i.e. a select expression. @@ -29,7 +29,7 @@ public interface SelectExpression { * * @param i The index of the select expression in the projection list. * - * @throws antlr.SemanticException if a semantic error occurs + * @throws com.fr.third.antlr.SemanticException if a semantic error occurs */ void setScalarColumnText(int i) throws SemanticException; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/SelectExpressionImpl.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/SelectExpressionImpl.java index c0684d858..bb880e0c6 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/SelectExpressionImpl.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/SelectExpressionImpl.java @@ -5,8 +5,8 @@ * See the lgpl.txt file in the root directory or . */ package com.fr.third.org.hibernate.hql.internal.ast.tree; -import antlr.SemanticException; -import antlr.collections.AST; +import com.fr.third.antlr.SemanticException; +import com.fr.third.antlr.collections.AST; /** * A select expression that was generated by a FROM element. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/SelectExpressionList.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/SelectExpressionList.java index afc8e1c8e..dab69fe2b 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/SelectExpressionList.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/SelectExpressionList.java @@ -12,7 +12,7 @@ import java.util.List; import com.fr.third.org.hibernate.hql.internal.antlr.SqlTokenTypes; import com.fr.third.org.hibernate.hql.internal.ast.util.ASTPrinter; -import antlr.collections.AST; +import com.fr.third.antlr.collections.AST; /** * Common behavior - a node that contains a list of select expressions. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/SimpleCaseNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/SimpleCaseNode.java index 15f5bd33f..3a55c3c01 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/SimpleCaseNode.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/SimpleCaseNode.java @@ -12,8 +12,8 @@ import com.fr.third.org.hibernate.hql.internal.ast.util.ASTUtil; import com.fr.third.org.hibernate.hql.internal.ast.util.ColumnHelper; import com.fr.third.org.hibernate.type.Type; -import antlr.SemanticException; -import antlr.collections.AST; +import com.fr.third.antlr.SemanticException; +import com.fr.third.antlr.collections.AST; /** * Models what ANSI SQL terms a simple case statement. This is a CASE expression in the form
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/UnaryArithmeticNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/UnaryArithmeticNode.java
index 32fb33fd8..58493efe6 100644
--- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/UnaryArithmeticNode.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/UnaryArithmeticNode.java
@@ -9,7 +9,7 @@ package com.fr.third.org.hibernate.hql.internal.ast.tree;
 import com.fr.third.org.hibernate.hql.internal.ast.util.ColumnHelper;
 import com.fr.third.org.hibernate.type.Type;
 
-import antlr.SemanticException;
+import com.fr.third.antlr.SemanticException;
 
 public class UnaryArithmeticNode extends AbstractSelectExpression implements UnaryOperatorNode {
 
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/UnaryLogicOperatorNode.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/UnaryLogicOperatorNode.java
index a1cacac05..d6abf179c 100644
--- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/UnaryLogicOperatorNode.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/UnaryLogicOperatorNode.java
@@ -6,7 +6,7 @@
  */
 package com.fr.third.org.hibernate.hql.internal.ast.tree;
 
-import antlr.SemanticException;
+import com.fr.third.antlr.SemanticException;
 
 import com.fr.third.org.hibernate.hql.internal.ast.util.ColumnHelper;
 import com.fr.third.org.hibernate.type.StandardBasicTypes;
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/UpdateStatement.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/UpdateStatement.java
index 1864cfa1d..70bd54b00 100644
--- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/UpdateStatement.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/tree/UpdateStatement.java
@@ -12,7 +12,7 @@ import com.fr.third.org.hibernate.hql.internal.ast.util.ASTUtil;
 import com.fr.third.org.hibernate.internal.CoreLogging;
 import com.fr.third.org.hibernate.internal.CoreMessageLogger;
 
-import antlr.collections.AST;
+import com.fr.third.antlr.collections.AST;
 
 /**
  * Defines a top-level AST node representing an HQL update statement.
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/ASTAppender.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/ASTAppender.java
index 3a1f4a4d0..3bbae090d 100644
--- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/ASTAppender.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/ASTAppender.java
@@ -5,8 +5,8 @@
  * See the lgpl.txt file in the root directory or .
  */
 package com.fr.third.org.hibernate.hql.internal.ast.util;
-import antlr.ASTFactory;
-import antlr.collections.AST;
+import com.fr.third.antlr.ASTFactory;
+import com.fr.third.antlr.collections.AST;
 
 /**
  * Appends child nodes to a parent efficiently.
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/ASTIterator.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/ASTIterator.java
index bb4c6d68e..395bc175b 100644
--- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/ASTIterator.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/ASTIterator.java
@@ -9,7 +9,7 @@ package com.fr.third.org.hibernate.hql.internal.ast.util;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import antlr.collections.AST;
+import com.fr.third.antlr.collections.AST;
 
 /**
  * Depth first iteration of an ANTLR AST.
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/ASTParentsFirstIterator.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/ASTParentsFirstIterator.java
index f4911f64c..046854ed2 100644
--- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/ASTParentsFirstIterator.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/ASTParentsFirstIterator.java
@@ -9,7 +9,7 @@ package com.fr.third.org.hibernate.hql.internal.ast.util;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import antlr.collections.AST;
+import com.fr.third.antlr.collections.AST;
 
 /**
  * Depth first iteration of an ANTLR AST.
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/ASTPrinter.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/ASTPrinter.java
index 535dbf7a3..f34e62408 100644
--- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/ASTPrinter.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/ASTPrinter.java
@@ -15,7 +15,7 @@ import java.util.Map;
 import com.fr.third.org.hibernate.hql.internal.ast.tree.DisplayableNode;
 import com.fr.third.org.hibernate.internal.util.StringHelper;
 
-import antlr.collections.AST;
+import com.fr.third.antlr.collections.AST;
 
 /**
  * Utility for generating pretty "ASCII art" representations of syntax trees.
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/ASTUtil.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/ASTUtil.java
index 826ec9f14..4e3923888 100644
--- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/ASTUtil.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/ASTUtil.java
@@ -13,9 +13,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import antlr.ASTFactory;
-import antlr.collections.AST;
-import antlr.collections.impl.ASTArray;
+import com.fr.third.antlr.ASTFactory;
+import com.fr.third.antlr.collections.AST;
+import com.fr.third.antlr.collections.impl.ASTArray;
 
 /**
  * Provides utility methods for AST traversal and manipulation.
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/ColumnHelper.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/ColumnHelper.java
index 36d5ebae6..976cc60f8 100644
--- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/ColumnHelper.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/ColumnHelper.java
@@ -10,8 +10,8 @@ import com.fr.third.org.hibernate.hql.internal.NameGenerator;
 import com.fr.third.org.hibernate.hql.internal.antlr.SqlTokenTypes;
 import com.fr.third.org.hibernate.hql.internal.ast.tree.HqlSqlWalkerNode;
 
-import antlr.ASTFactory;
-import antlr.collections.AST;
+import com.fr.third.antlr.ASTFactory;
+import com.fr.third.antlr.collections.AST;
 
 /**
  * Provides utility methods for dealing with arrays of SQL column names.
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/LiteralProcessor.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/LiteralProcessor.java
index 1b8372d3f..c414c847f 100644
--- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/LiteralProcessor.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/LiteralProcessor.java
@@ -32,8 +32,8 @@ import com.fr.third.org.hibernate.type.Type;
 
 import com.fr.third.org.jboss.logging.Logger;
 
-import antlr.SemanticException;
-import antlr.collections.AST;
+import com.fr.third.antlr.SemanticException;
+import com.fr.third.antlr.collections.AST;
 
 /**
  * A delegate that handles literals and constants for HqlSqlWalker, performing the token replacement functions and
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/NodeTraverser.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/NodeTraverser.java
index 2dac26560..f692d6183 100644
--- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/NodeTraverser.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/NodeTraverser.java
@@ -9,7 +9,7 @@ package com.fr.third.org.hibernate.hql.internal.ast.util;
 import java.util.ArrayDeque;
 import java.util.Deque;
 
-import antlr.collections.AST;
+import com.fr.third.antlr.collections.AST;
 
 /**
  * A visitor for traversing an AST tree.
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/PathHelper.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/PathHelper.java
index 85ddb2458..cce953449 100644
--- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/PathHelper.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/PathHelper.java
@@ -12,8 +12,8 @@ import com.fr.third.org.hibernate.internal.util.StringHelper;
 
 import com.fr.third.org.jboss.logging.Logger;
 
-import antlr.ASTFactory;
-import antlr.collections.AST;
+import com.fr.third.antlr.ASTFactory;
+import com.fr.third.antlr.collections.AST;
 
 /**
  * Provides utility methods for paths.
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/SessionFactoryHelper.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/SessionFactoryHelper.java
index e46244abd..b09568c75 100644
--- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/SessionFactoryHelper.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/SessionFactoryHelper.java
@@ -30,8 +30,8 @@ import com.fr.third.org.hibernate.type.CollectionType;
 import com.fr.third.org.hibernate.type.EntityType;
 import com.fr.third.org.hibernate.type.Type;
 
-import antlr.SemanticException;
-import antlr.collections.AST;
+import com.fr.third.antlr.SemanticException;
+import com.fr.third.antlr.collections.AST;
 
 /**
  * Helper for performing common and/or complex operations with the
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/SyntheticAndFactory.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/SyntheticAndFactory.java
index c92fc7952..787b41b59 100644
--- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/SyntheticAndFactory.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/internal/ast/util/SyntheticAndFactory.java
@@ -23,7 +23,7 @@ import com.fr.third.org.hibernate.persister.entity.Queryable;
 import com.fr.third.org.hibernate.sql.JoinFragment;
 import com.fr.third.org.hibernate.type.Type;
 
-import antlr.collections.AST;
+import com.fr.third.antlr.collections.AST;
 
 /**
  * Creates synthetic and nodes based on the where fragment part of a JoinSequence.
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/hql/spi/id/AbstractTableBasedBulkIdHandler.java b/fine-hibernate/src/com/fr/third/org/hibernate/hql/spi/id/AbstractTableBasedBulkIdHandler.java
index 580e19161..e7c176ae5 100644
--- a/fine-hibernate/src/com/fr/third/org/hibernate/hql/spi/id/AbstractTableBasedBulkIdHandler.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/hql/spi/id/AbstractTableBasedBulkIdHandler.java
@@ -23,8 +23,8 @@ import com.fr.third.org.hibernate.sql.InsertSelect;
 import com.fr.third.org.hibernate.sql.Select;
 import com.fr.third.org.hibernate.sql.SelectValues;
 
-import antlr.RecognitionException;
-import antlr.collections.AST;
+import com.fr.third.antlr.RecognitionException;
+import com.fr.third.antlr.collections.AST;
 
 /**
  * Convenience base class for {@link MultiTableBulkIdStrategy.UpdateHandler}
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/internal/CoreMessageLogger.java b/fine-hibernate/src/com/fr/third/org/hibernate/internal/CoreMessageLogger.java
index 1d966b33b..3cf346c31 100644
--- a/fine-hibernate/src/com/fr/third/org/hibernate/internal/CoreMessageLogger.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/internal/CoreMessageLogger.java
@@ -18,8 +18,8 @@ import java.util.Properties;
 import java.util.Set;
 import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
-import javax.transaction.Synchronization;
-import javax.transaction.SystemException;
+import com.fr.third.javax.transaction.Synchronization;
+import com.fr.third.javax.transaction.SystemException;
 
 import com.fr.third.org.hibernate.HibernateException;
 import com.fr.third.org.hibernate.LockMode;
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/internal/CoreMessageLogger_$logger.java b/fine-hibernate/src/com/fr/third/org/hibernate/internal/CoreMessageLogger_$logger.java
index 42c45ab23..8095824d3 100644
--- a/fine-hibernate/src/com/fr/third/org/hibernate/internal/CoreMessageLogger_$logger.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/internal/CoreMessageLogger_$logger.java
@@ -14,7 +14,7 @@ import java.lang.String;
 import java.util.Properties;
 import java.net.URL;
 import com.fr.third.org.hibernate.engine.jdbc.dialect.spi.DialectResolver;
-import javax.transaction.SystemException;
+import com.fr.third.javax.transaction.SystemException;
 import com.fr.third.org.jboss.logging.BasicLogger;
 import com.fr.third.org.hibernate.engine.jndi.JndiNameException;
 import com.fr.third.org.hibernate.dialect.Dialect;
@@ -31,7 +31,7 @@ import java.io.IOException;
 import java.lang.reflect.Method;
 import com.fr.third.org.hibernate.LockMode;
 import com.fr.third.org.hibernate.engine.loading.internal.CollectionLoadContext;
-import javax.transaction.Synchronization;
+import com.fr.third.javax.transaction.Synchronization;
 import java.lang.Exception;
 import com.fr.third.org.hibernate.type.Type;
 import java.lang.ClassCastException;
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/internal/SessionImpl.java b/fine-hibernate/src/com/fr/third/org/hibernate/internal/SessionImpl.java
index 788f80a1a..a69bd647e 100644
--- a/fine-hibernate/src/com/fr/third/org/hibernate/internal/SessionImpl.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/internal/SessionImpl.java
@@ -26,7 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import com.fr.third.javax.persistence.EntityNotFoundException;
-import javax.transaction.SystemException;
+import com.fr.third.javax.transaction.SystemException;
 
 import com.fr.third.org.hibernate.CacheMode;
 import com.fr.third.org.hibernate.ConnectionReleaseMode;
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/internal/StatelessSessionImpl.java b/fine-hibernate/src/com/fr/third/org/hibernate/internal/StatelessSessionImpl.java
index 239b24239..ff705e230 100755
--- a/fine-hibernate/src/com/fr/third/org/hibernate/internal/StatelessSessionImpl.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/internal/StatelessSessionImpl.java
@@ -11,7 +11,7 @@ import java.sql.Connection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import javax.transaction.SystemException;
+import com.fr.third.javax.transaction.SystemException;
 
 import com.fr.third.org.hibernate.CacheMode;
 import com.fr.third.org.hibernate.Criteria;
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/jpa/internal/EntityManagerImpl.java b/fine-hibernate/src/com/fr/third/org/hibernate/jpa/internal/EntityManagerImpl.java
index 7d3162a1b..657f75556 100755
--- a/fine-hibernate/src/com/fr/third/org/hibernate/jpa/internal/EntityManagerImpl.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/jpa/internal/EntityManagerImpl.java
@@ -13,7 +13,7 @@ import com.fr.third.javax.persistence.PersistenceContextType;
 import com.fr.third.javax.persistence.PersistenceException;
 import com.fr.third.javax.persistence.SynchronizationType;
 import com.fr.third.javax.persistence.spi.PersistenceUnitTransactionType;
-import javax.transaction.SystemException;
+import com.fr.third.javax.transaction.SystemException;
 
 import com.fr.third.org.hibernate.FlushMode;
 import com.fr.third.org.hibernate.HibernateException;
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/jpa/spi/AbstractEntityManagerImpl.java b/fine-hibernate/src/com/fr/third/org/hibernate/jpa/spi/AbstractEntityManagerImpl.java
index 13cb7dbd7..ae3519e88 100755
--- a/fine-hibernate/src/com/fr/third/org/hibernate/jpa/spi/AbstractEntityManagerImpl.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/jpa/spi/AbstractEntityManagerImpl.java
@@ -47,9 +47,9 @@ import com.fr.third.javax.persistence.criteria.CriteriaUpdate;
 import com.fr.third.javax.persistence.criteria.Selection;
 import com.fr.third.javax.persistence.metamodel.Metamodel;
 import com.fr.third.javax.persistence.spi.PersistenceUnitTransactionType;
-import javax.transaction.Status;
-import javax.transaction.SystemException;
-import javax.transaction.TransactionManager;
+import com.fr.third.javax.transaction.Status;
+import com.fr.third.javax.transaction.SystemException;
+import com.fr.third.javax.transaction.TransactionManager;
 
 import com.fr.third.org.hibernate.AssertionFailure;
 import com.fr.third.org.hibernate.CacheMode;
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/SynchronizationRegistry.java b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/SynchronizationRegistry.java
index eea662ee5..9a89f3bdc 100644
--- a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/SynchronizationRegistry.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/SynchronizationRegistry.java
@@ -7,7 +7,7 @@
 package com.fr.third.org.hibernate.resource.transaction;
 
 import java.io.Serializable;
-import javax.transaction.Synchronization;
+import com.fr.third.javax.transaction.Synchronization;
 
 /**
  * Manages a registry of (local) JTA {@link Synchronization} instances
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorImpl.java b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorImpl.java
index d3f45537a..9e7609cc0 100644
--- a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorImpl.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcResourceLocalTransactionCoordinatorImpl.java
@@ -8,7 +8,7 @@ package com.fr.third.org.hibernate.resource.transaction.backend.jdbc.internal;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.transaction.Status;
+import com.fr.third.javax.transaction.Status;
 
 import com.fr.third.org.hibernate.TransactionException;
 import com.fr.third.org.hibernate.engine.jdbc.spi.JdbcServices;
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/DdlTransactionIsolatorJtaImpl.java b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/DdlTransactionIsolatorJtaImpl.java
index 6d75808cf..27ad07bd0 100644
--- a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/DdlTransactionIsolatorJtaImpl.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/DdlTransactionIsolatorJtaImpl.java
@@ -8,8 +8,8 @@ package com.fr.third.org.hibernate.resource.transaction.backend.jta.internal;
 
 import java.sql.Connection;
 import java.sql.SQLException;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
+import com.fr.third.javax.transaction.SystemException;
+import com.fr.third.javax.transaction.Transaction;
 
 import com.fr.third.org.hibernate.HibernateException;
 import com.fr.third.org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/JtaIsolationDelegate.java b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/JtaIsolationDelegate.java
index 34ee11bb7..0e47a82c3 100644
--- a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/JtaIsolationDelegate.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/JtaIsolationDelegate.java
@@ -6,10 +6,10 @@
  */
 package com.fr.third.org.hibernate.resource.transaction.backend.jta.internal;
 
-import javax.transaction.NotSupportedException;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
+import com.fr.third.javax.transaction.NotSupportedException;
+import com.fr.third.javax.transaction.SystemException;
+import com.fr.third.javax.transaction.Transaction;
+import com.fr.third.javax.transaction.TransactionManager;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.concurrent.Callable;
diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapter.java b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapter.java
index 8abe95fb9..5f78d1827 100644
--- a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapter.java
+++ b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapter.java
@@ -6,13 +6,15 @@
  */
 package com.fr.third.org.hibernate.resource.transaction.backend.jta.internal;
 
+import com.fr.third.javax.transaction.Transaction;
+import com.fr.third.javax.transaction.UserTransaction;
 import com.fr.third.org.hibernate.resource.transaction.spi.TransactionStatus;
 
 /**
  * Adapter for abstracting the physical means of interacting with JTA transactions.
  * 

- * JTA transactions can concretely be interacted with through {@link javax.transaction.UserTransaction} - * or {@link javax.transaction.Transaction} depending on environment and situation. This adapter hides + * JTA transactions can concretely be interacted with through {@link UserTransaction} + * or {@link Transaction} depending on environment and situation. This adapter hides * this difference. * * @author Steve Ebersole diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapterTransactionManagerImpl.java b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapterTransactionManagerImpl.java index 1d24bcb58..003f1ec4d 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapterTransactionManagerImpl.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapterTransactionManagerImpl.java @@ -6,8 +6,8 @@ */ package com.fr.third.org.hibernate.resource.transaction.backend.jta.internal; -import javax.transaction.SystemException; -import javax.transaction.TransactionManager; +import com.fr.third.javax.transaction.SystemException; +import com.fr.third.javax.transaction.TransactionManager; import com.fr.third.org.jboss.logging.Logger; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapterUserTransactionImpl.java b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapterUserTransactionImpl.java index ea0bea0ce..adcab9c43 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapterUserTransactionImpl.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionAdapterUserTransactionImpl.java @@ -6,8 +6,8 @@ */ package com.fr.third.org.hibernate.resource.transaction.backend.jta.internal; -import javax.transaction.SystemException; -import javax.transaction.UserTransaction; +import com.fr.third.javax.transaction.SystemException; +import com.fr.third.javax.transaction.UserTransaction; import com.fr.third.org.jboss.logging.Logger; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionCoordinatorImpl.java b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionCoordinatorImpl.java index 459da23ed..f14e5163c 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionCoordinatorImpl.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/JtaTransactionCoordinatorImpl.java @@ -9,9 +9,9 @@ package com.fr.third.org.hibernate.resource.transaction.backend.jta.internal; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.transaction.Status; -import javax.transaction.TransactionManager; -import javax.transaction.UserTransaction; +import com.fr.third.javax.transaction.Status; +import com.fr.third.javax.transaction.TransactionManager; +import com.fr.third.javax.transaction.UserTransaction; import com.fr.third.org.hibernate.HibernateException; import com.fr.third.org.hibernate.boot.spi.SessionFactoryOptions; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/StatusTranslator.java b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/StatusTranslator.java index b74568757..91ae9b1d4 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/StatusTranslator.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/StatusTranslator.java @@ -6,7 +6,7 @@ */ package com.fr.third.org.hibernate.resource.transaction.backend.jta.internal; -import javax.transaction.Status; +import com.fr.third.javax.transaction.Status; import com.fr.third.org.hibernate.TransactionException; import com.fr.third.org.hibernate.resource.transaction.spi.TransactionStatus; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/AfterCompletionAction.java b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/AfterCompletionAction.java index 4517ea6d7..3a62b8068 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/AfterCompletionAction.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/AfterCompletionAction.java @@ -6,12 +6,14 @@ */ package com.fr.third.org.hibernate.resource.transaction.backend.jta.internal.synchronization; +import com.fr.third.javax.transaction.Synchronization; + import java.io.Serializable; /** * A pluggable strategy for defining any actions to be performed during - * {@link javax.transaction.Synchronization#afterCompletion} processing from the the - * {@link javax.transaction.Synchronization} registered by Hibernate with the underlying JTA platform. + * {@link Synchronization#afterCompletion} processing from the the + * {@link Synchronization} registered by Hibernate with the underlying JTA platform. * * @author Steve Ebersole */ diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/ExceptionMapper.java b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/ExceptionMapper.java index 534c921b2..fc8d7e8f1 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/ExceptionMapper.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/ExceptionMapper.java @@ -6,18 +6,19 @@ */ package com.fr.third.org.hibernate.resource.transaction.backend.jta.internal.synchronization; -import javax.transaction.SystemException; +import com.fr.third.javax.transaction.Synchronization; +import com.fr.third.javax.transaction.SystemException; import java.io.Serializable; /** - * A pluggable strategy for defining how the {@link javax.transaction.Synchronization} registered by Hibernate handles + * A pluggable strategy for defining how the {@link Synchronization} registered by Hibernate handles * exceptions. * * @author Steve Ebersole */ public interface ExceptionMapper extends Serializable { /** - * Map a JTA {@link javax.transaction.SystemException} to the appropriate runtime-based exception. + * Map a JTA {@link SystemException} to the appropriate runtime-based exception. * * @param message The message to use for the returned exception * @param systemException The causal exception diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/ManagedFlushChecker.java b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/ManagedFlushChecker.java index 2ab2dad2f..b52769255 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/ManagedFlushChecker.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/ManagedFlushChecker.java @@ -8,10 +8,11 @@ package com.fr.third.org.hibernate.resource.transaction.backend.jta.internal.syn import java.io.Serializable; +import com.fr.third.javax.transaction.Synchronization; import com.fr.third.org.hibernate.internal.SessionImpl; /** - * A pluggable strategy for defining how the {@link javax.transaction.Synchronization} registered by Hibernate determines + * A pluggable strategy for defining how the {@link Synchronization} registered by Hibernate determines * whether to perform a managed flush. An exceptions from either this delegate or the subsequent flush are routed * through the sister strategy {@link ExceptionMapper}. * diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/RegisteredSynchronization.java b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/RegisteredSynchronization.java index 1fa0a3aac..43e101896 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/RegisteredSynchronization.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/RegisteredSynchronization.java @@ -6,14 +6,14 @@ */ package com.fr.third.org.hibernate.resource.transaction.backend.jta.internal.synchronization; -import javax.transaction.Synchronization; +import com.fr.third.javax.transaction.Synchronization; import com.fr.third.org.jboss.logging.Logger; import static com.fr.third.org.hibernate.internal.CoreLogging.logger; /** - * The JTA {@link javax.transaction.Synchronization} Hibernate registers when needed for JTA callbacks. + * The JTA {@link Synchronization} Hibernate registers when needed for JTA callbacks. *

* Note that we split the notion of the registered Synchronization and the processing of the Synchronization callbacks * mainly to account for "separation of concerns", but also so that the transaction engine does not have to hold diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinator.java b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinator.java index 0722fa27a..387a68d20 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinator.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinator.java @@ -6,7 +6,7 @@ */ package com.fr.third.org.hibernate.resource.transaction.backend.jta.internal.synchronization; -import javax.transaction.Synchronization; +import com.fr.third.javax.transaction.Synchronization; /** * Manages funneling JTA Synchronization callbacks back into the Hibernate transaction engine. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinatorNonTrackingImpl.java b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinatorNonTrackingImpl.java index 92194e520..e1d1fca1a 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinatorNonTrackingImpl.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackCoordinatorNonTrackingImpl.java @@ -6,12 +6,13 @@ */ package com.fr.third.org.hibernate.resource.transaction.backend.jta.internal.synchronization; +import com.fr.third.javax.transaction.Synchronization; import com.fr.third.org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; import com.fr.third.org.hibernate.internal.CoreLogging; import com.fr.third.org.hibernate.internal.CoreMessageLogger; /** - * Manages callbacks from the {@link javax.transaction.Synchronization} registered by Hibernate. + * Manages callbacks from the {@link Synchronization} registered by Hibernate. * * @author Steve Ebersole */ diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackTarget.java b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackTarget.java index 03612bce4..75ea933be 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackTarget.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/SynchronizationCallbackTarget.java @@ -6,13 +6,15 @@ */ package com.fr.third.org.hibernate.resource.transaction.backend.jta.internal.synchronization; +import com.fr.third.javax.transaction.Synchronization; + /** * Defines "inflow" for JTA transactions from the perspective of Hibernate's registered JTA Synchronization * back into the TransactionCoordinator by means of the SynchronizationCallbackCoordinator. *

* That's a mouthful :) The way it works is like this...

    *
  • - * Hibernate will register a JTA {@link javax.transaction.Synchronization} implementation + * Hibernate will register a JTA {@link Synchronization} implementation * ({@link RegisteredSynchronization}) which allows * it to listen for completion of the JTA transaction. *
  • @@ -44,7 +46,7 @@ public interface SynchronizationCallbackTarget { /** * Callback of before-completion. * - * @see javax.transaction.Synchronization#beforeCompletion + * @see Synchronization#beforeCompletion */ void beforeCompletion(); @@ -53,7 +55,7 @@ public interface SynchronizationCallbackTarget { * * @param successful Was the transaction successful? * - * @see javax.transaction.Synchronization#afterCompletion + * @see Synchronization#afterCompletion */ void afterCompletion(boolean successful, boolean delayed); } diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/package-info.java b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/package-info.java index 4eaf764a1..2cdd1282a 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/package-info.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/backend/jta/internal/synchronization/package-info.java @@ -6,7 +6,7 @@ */ /** - * Internal implementation details for reacting to JTA transaction completion via {@link javax.transaction.Synchronization} + * Internal implementation details for reacting to JTA transaction completion via {@link com.fr.third.javax.transaction.Synchronization} * callbacks */ package com.fr.third.org.hibernate.resource.transaction.backend.jta.internal.synchronization; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/internal/SynchronizationRegistryStandardImpl.java b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/internal/SynchronizationRegistryStandardImpl.java index e95379e8c..609a4d58f 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/internal/SynchronizationRegistryStandardImpl.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/internal/SynchronizationRegistryStandardImpl.java @@ -7,7 +7,7 @@ package com.fr.third.org.hibernate.resource.transaction.internal; import java.util.LinkedHashSet; -import javax.transaction.Synchronization; +import com.fr.third.javax.transaction.Synchronization; import com.fr.third.org.hibernate.internal.CoreLogging; import com.fr.third.org.hibernate.internal.CoreMessageLogger; diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/package-info.java b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/package-info.java index 15c0d5c0b..6adc581d6 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/package-info.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/package-info.java @@ -27,8 +27,8 @@ * This is the physical underlying transaction that ultimately controls the database transaction. This * can be:
      *
    • - * a JTA transaction, as expressed by {@link javax.transaction.UserTransaction} or - * {@link javax.transaction.Transaction}) + * a JTA transaction, as expressed by {@link com.fr.third.javax.transaction.UserTransaction} or + * {@link com.fr.third.javax.transaction.Transaction}) *
    • *
    • * a "JDBC transaction", as expressed through the JDBC {@link java.sql.Connection} object diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/spi/SynchronizationRegistryImplementor.java b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/spi/SynchronizationRegistryImplementor.java index fcd9163c6..de5860a9b 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/spi/SynchronizationRegistryImplementor.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/resource/transaction/spi/SynchronizationRegistryImplementor.java @@ -6,6 +6,8 @@ */ package com.fr.third.org.hibernate.resource.transaction.spi; +import com.fr.third.javax.transaction.Status; +import com.fr.third.javax.transaction.Synchronization; import com.fr.third.org.hibernate.resource.transaction.SynchronizationRegistry; /** @@ -15,15 +17,15 @@ import com.fr.third.org.hibernate.resource.transaction.SynchronizationRegistry; */ public interface SynchronizationRegistryImplementor extends SynchronizationRegistry { /** - * Delegates the {@link javax.transaction.Synchronization#beforeCompletion} call to each registered Synchronization + * Delegates the {@link Synchronization#beforeCompletion} call to each registered Synchronization */ void notifySynchronizationsBeforeTransactionCompletion(); /** - * Delegates the {@link javax.transaction.Synchronization#afterCompletion} call to each registered Synchronization. Will also + * Delegates the {@link Synchronization#afterCompletion} call to each registered Synchronization. Will also * clear the registered Synchronizations after all have been notified. * - * @param status The transaction status, per {@link javax.transaction.Status} constants + * @param status The transaction status, per {@link Status} constants */ void notifySynchronizationsAfterTransactionCompletion(int status); diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/Factory.java b/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/Factory.java index ef75433f7..217caf71c 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/Factory.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/Factory.java @@ -6,7 +6,7 @@ */ package com.fr.third.org.hibernate.sql.ordering.antlr; -import antlr.ASTFactory; +import com.fr.third.antlr.ASTFactory; /** * Acts as a {@link ASTFactory} for injecting our specific AST node classes into the Antlr generated trees. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/GeneratedOrderByFragmentParser.java b/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/GeneratedOrderByFragmentParser.java index 72ad39848..d3f9ce58d 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/GeneratedOrderByFragmentParser.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/GeneratedOrderByFragmentParser.java @@ -26,26 +26,26 @@ */ package com.fr.third.org.hibernate.sql.ordering.antlr; -import antlr.TokenBuffer; -import antlr.TokenStreamException; -import antlr.Token; -import antlr.TokenStream; -import antlr.RecognitionException; -import antlr.NoViableAltException; -import antlr.SemanticException; -import antlr.ParserSharedInputState; -import antlr.collections.impl.BitSet; -import antlr.collections.AST; -import antlr.ASTFactory; -import antlr.ASTPair; -import antlr.collections.impl.ASTArray; +import com.fr.third.antlr.TokenBuffer; +import com.fr.third.antlr.TokenStreamException; +import com.fr.third.antlr.Token; +import com.fr.third.antlr.TokenStream; +import com.fr.third.antlr.RecognitionException; +import com.fr.third.antlr.NoViableAltException; +import com.fr.third.antlr.SemanticException; +import com.fr.third.antlr.ParserSharedInputState; +import com.fr.third.antlr.collections.impl.BitSet; +import com.fr.third.antlr.collections.AST; +import com.fr.third.antlr.ASTFactory; +import com.fr.third.antlr.ASTPair; +import com.fr.third.antlr.collections.impl.ASTArray; /** * Antlr grammar for dealing with order-by mapping fragments. * @author Steve Ebersole */ -public class GeneratedOrderByFragmentParser extends antlr.LLkParser implements OrderByTemplateTokenTypes +public class GeneratedOrderByFragmentParser extends com.fr.third.antlr.LLkParser implements OrderByTemplateTokenTypes { /** diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/GeneratedOrderByFragmentRenderer.java b/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/GeneratedOrderByFragmentRenderer.java index d294e3493..2c00a0504 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/GeneratedOrderByFragmentRenderer.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/GeneratedOrderByFragmentRenderer.java @@ -26,9 +26,9 @@ */ package com.fr.third.org.hibernate.sql.ordering.antlr; -import antlr.collections.AST; -import antlr.RecognitionException; -import antlr.NoViableAltException; +import com.fr.third.antlr.collections.AST; +import com.fr.third.antlr.RecognitionException; +import com.fr.third.antlr.NoViableAltException; /** @@ -37,7 +37,7 @@ import antlr.NoViableAltException; * @author Steve Ebersole * @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com) */ -public class GeneratedOrderByFragmentRenderer extends antlr.TreeParser implements GeneratedOrderByFragmentRendererTokenTypes +public class GeneratedOrderByFragmentRenderer extends com.fr.third.antlr.TreeParser implements GeneratedOrderByFragmentRendererTokenTypes { // the buffer to which we write the resulting SQL. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/GeneratedOrderByLexer.java b/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/GeneratedOrderByLexer.java index bda2051a3..d69376239 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/GeneratedOrderByLexer.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/GeneratedOrderByLexer.java @@ -27,25 +27,25 @@ package com.fr.third.org.hibernate.sql.ordering.antlr; import java.io.InputStream; -import antlr.TokenStreamException; -import antlr.TokenStreamIOException; -import antlr.TokenStreamRecognitionException; -import antlr.CharStreamException; -import antlr.CharStreamIOException; +import com.fr.third.antlr.TokenStreamException; +import com.fr.third.antlr.TokenStreamIOException; +import com.fr.third.antlr.TokenStreamRecognitionException; +import com.fr.third.antlr.CharStreamException; +import com.fr.third.antlr.CharStreamIOException; import java.io.Reader; import java.util.Hashtable; -import antlr.InputBuffer; -import antlr.ByteBuffer; -import antlr.CharBuffer; -import antlr.Token; -import antlr.RecognitionException; -import antlr.NoViableAltForCharException; -import antlr.TokenStream; -import antlr.ANTLRHashString; -import antlr.LexerSharedInputState; -import antlr.collections.impl.BitSet; +import com.fr.third.antlr.InputBuffer; +import com.fr.third.antlr.ByteBuffer; +import com.fr.third.antlr.CharBuffer; +import com.fr.third.antlr.Token; +import com.fr.third.antlr.RecognitionException; +import com.fr.third.antlr.NoViableAltForCharException; +import com.fr.third.antlr.TokenStream; +import com.fr.third.antlr.ANTLRHashString; +import com.fr.third.antlr.LexerSharedInputState; +import com.fr.third.antlr.collections.impl.BitSet; /** * Lexer for the order-by fragment parser @@ -53,7 +53,7 @@ import antlr.collections.impl.BitSet; * @author Steve Ebersole * @author Joshua Davis */ -public class GeneratedOrderByLexer extends antlr.CharScanner implements OrderByTemplateTokenTypes, TokenStream +public class GeneratedOrderByLexer extends com.fr.third.antlr.CharScanner implements OrderByTemplateTokenTypes, TokenStream { public GeneratedOrderByLexer(InputStream in) { this(new ByteBuffer(in)); diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/NodeSupport.java b/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/NodeSupport.java index b8f96d20b..497f414d7 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/NodeSupport.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/NodeSupport.java @@ -6,7 +6,7 @@ */ package com.fr.third.org.hibernate.sql.ordering.antlr; -import antlr.CommonAST; +import com.fr.third.antlr.CommonAST; /** * Basic implementation of a {@link Node} briding to the Antlr {@link CommonAST} hierarchy. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/OrderByFragmentParser.java b/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/OrderByFragmentParser.java index e412fce98..abc997e3e 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/OrderByFragmentParser.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/OrderByFragmentParser.java @@ -18,9 +18,9 @@ import com.fr.third.org.hibernate.sql.Template; import com.fr.third.org.jboss.logging.Logger; -import antlr.CommonAST; -import antlr.TokenStream; -import antlr.collections.AST; +import com.fr.third.antlr.CommonAST; +import com.fr.third.antlr.TokenStream; +import com.fr.third.antlr.collections.AST; /** * Extension of the Antlr-generated parser for the purpose of adding our custom parsing behavior diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/OrderByFragmentRenderer.java b/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/OrderByFragmentRenderer.java index f2174bd76..62f667921 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/OrderByFragmentRenderer.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/OrderByFragmentRenderer.java @@ -13,7 +13,7 @@ import com.fr.third.org.hibernate.internal.util.StringHelper; import com.fr.third.org.jboss.logging.Logger; -import antlr.collections.AST; +import com.fr.third.antlr.collections.AST; /** * Extension of the Antlr-generated tree walker for rendering the parsed order-by tree back to String form. diff --git a/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/SortSpecification.java b/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/SortSpecification.java index f75193b29..cd70cf8f2 100644 --- a/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/SortSpecification.java +++ b/fine-hibernate/src/com/fr/third/org/hibernate/sql/ordering/antlr/SortSpecification.java @@ -6,7 +6,7 @@ */ package com.fr.third.org.hibernate.sql.ordering.antlr; -import antlr.collections.AST; +import com.fr.third.antlr.collections.AST; /** * Models each sorting expression. diff --git a/fine-jboss-transaction-api/README.md b/fine-jboss-transaction-api/README.md new file mode 100644 index 000000000..286158091 --- /dev/null +++ b/fine-jboss-transaction-api/README.md @@ -0,0 +1,5 @@ +# fine-jboss-transaction-api + +改包名的jboss-transaction-api(1.1_spec-1.0.1.Final),以下模块需要依赖该模块: + +- fine-hibernate diff --git a/fine-jboss-transaction-api/fine-jboss-transaction-api.iml b/fine-jboss-transaction-api/fine-jboss-transaction-api.iml new file mode 100644 index 000000000..c90834f2d --- /dev/null +++ b/fine-jboss-transaction-api/fine-jboss-transaction-api.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/HeuristicCommitException.java b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/HeuristicCommitException.java new file mode 100644 index 000000000..9e2f68475 --- /dev/null +++ b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/HeuristicCommitException.java @@ -0,0 +1,35 @@ +package com.fr.third.javax.transaction; + +/** + * This exception is meant to be thrown by the rollback operation on + * a resource to report that a heuristic decision was made and that all + * relevant updates have been committed. + *

      + * But though defined in JTA this exception is used nowhere in JTA, and + * it seems impossible to report a heuristic commit decision with the JTA + * API in a portable way. + * + * @version $Revision$ + */ +public class HeuristicCommitException extends Exception +{ + + /** + * Creates a new HeuristicMixedException without a + * detail message. + */ + public HeuristicCommitException() + { + } + + /** + * Constructs an HeuristicCommitException with the + * specified detail message. + * + * @param msg the detail message. + */ + public HeuristicCommitException(String msg) + { + super(msg); + } +} diff --git a/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/HeuristicMixedException.java b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/HeuristicMixedException.java new file mode 100644 index 000000000..dd0c20da5 --- /dev/null +++ b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/HeuristicMixedException.java @@ -0,0 +1,31 @@ +package com.fr.third.javax.transaction; + +/** + * This exception is thrown to report that a heuristic decision was made and + * that some some parts of the transaction have been committed while other + * parts have been rolled back. + * + * @version $Revision$ + */ +public class HeuristicMixedException extends Exception +{ + + /** + * Creates a new HeuristicMixedException without a + * detail message. + */ + public HeuristicMixedException() + { + } + + /** + * Constructs an HeuristicMixedException with the + * specified detail message. + * + * @param msg the detail message. + */ + public HeuristicMixedException(String msg) + { + super(msg); + } +} diff --git a/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/HeuristicRollbackException.java b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/HeuristicRollbackException.java new file mode 100644 index 000000000..5bfd511ca --- /dev/null +++ b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/HeuristicRollbackException.java @@ -0,0 +1,31 @@ +package com.fr.third.javax.transaction; + +/** + * This exception is thrown by the commit operation to report that a + * heuristic decision was made and that all relevant updates have been + * rolled back. + * + * @version $Revision$ + */ +public class HeuristicRollbackException extends Exception +{ + + /** + * Creates a new HeuristicRollbackException without a + * detail message. + */ + public HeuristicRollbackException() + { + } + + /** + * Constructs an HeuristicRollbackException with the + * specified detail message. + * + * @param msg the detail message. + */ + public HeuristicRollbackException(String msg) + { + super(msg); + } +} diff --git a/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/InvalidTransactionException.java b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/InvalidTransactionException.java new file mode 100644 index 000000000..e33d43d40 --- /dev/null +++ b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/InvalidTransactionException.java @@ -0,0 +1,36 @@ +package com.fr.third.javax.transaction; + +import java.rmi.RemoteException; + +/** + * This exception indicates an invalid transaction. + *

      + * It is thrown from the {@link TransactionManager#resume(Transaction)} + * method if the argument is not a valid transaction. + * It may also be thrown from an EJB container invocation is the invocation + * request carries an invalid transaction propagation context. + * + * @version $Revision$ + */ +public class InvalidTransactionException extends RemoteException +{ + + /** + * Creates a new InvalidTransactionException without a + * detail message. + */ + public InvalidTransactionException() + { + } + + /** + * Constructs an InvalidTransactionException with the + * specified detail message. + * + * @param msg the detail message. + */ + public InvalidTransactionException(String msg) + { + super(msg); + } +} diff --git a/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/NotSupportedException.java b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/NotSupportedException.java new file mode 100644 index 000000000..a28503629 --- /dev/null +++ b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/NotSupportedException.java @@ -0,0 +1,35 @@ +package com.fr.third.javax.transaction; + +/** + * The NotSupportedException exception indicates that an operation is not + * supported. + * + * For example, the {@link TransactionManager#begin()} and + * {@link UserTransaction#begin()} methods throw this exception if the + * calling thread is already associated with a transaction, and nested + * transactions are not supported. + * + * @version $Revision$ + */ +public class NotSupportedException extends Exception +{ + + /** + * Creates a new NotSupportedException without a + * detail message. + */ + public NotSupportedException() + { + } + + /** + * Constructs an NotSupportedException with the specified + * detail message. + * + * @param msg the detail message. + */ + public NotSupportedException(String msg) + { + super(msg); + } +} diff --git a/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/RollbackException.java b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/RollbackException.java new file mode 100644 index 000000000..b4ecc732a --- /dev/null +++ b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/RollbackException.java @@ -0,0 +1,52 @@ +package com.fr.third.javax.transaction; + +import com.fr.third.javax.transaction.xa.XAResource; + +/** + * The RollbackException exception indicates that either the transaction + * has been rolled back or an operation cannot complete because the + * transaction is marked for rollback only. + *

      + * It is thrown under two circumstances: + *

        + *
      • + * At transaction commit time, if the transaction has been marked for + * rollback only. In this case, the commit method will roll + * back the transaction and throw this exception to indicate that the + * transaction could not be committed. + *
      • + *
      • + * At other times, if an operation cannot be completed because the + * transaction is marked for rollback only. + * The {@link Transaction#enlistResource(XAResource) enlistResource} + * and {@link Transaction#registerSynchronization(Synchronization) registerSynchronization} + * methods in the {@link Transaction} interface throw this exception to + * indicate that the operation cannot be completed because the transaction + * is marked for rollback only. In this case, the state of the transaction + * remains unchanged. + *
      • + *
      + * + * @version $Revision$ + */ +public class RollbackException extends Exception +{ + + /** + * Creates a new RollbackException without a detail message. + */ + public RollbackException() + { + } + + /** + * Constructs an RollbackException with the specified + * detail message. + * + * @param msg the detail message. + */ + public RollbackException(String msg) + { + super(msg); + } +} diff --git a/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/Status.java b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/Status.java new file mode 100644 index 000000000..fd69efcc5 --- /dev/null +++ b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/Status.java @@ -0,0 +1,74 @@ +package com.fr.third.javax.transaction; + +/** + * The Status interface defines the constants for transaction status codes. + * + * @version $Revision$ + */ +public interface Status +{ + /** + * Status code indicating an active transaction. + */ + public static final int STATUS_ACTIVE = 0; + + /** + * Status code indicating a transaction that has been marked for + * rollback only. + */ + public static final int STATUS_MARKED_ROLLBACK = 1; + + /** + * Status code indicating a transaction that has completed the first + * phase of the two-phase commit protocol, but not yet begun the + * second phase. + * Probably the transaction is waiting for instruction from a superior + * coordinator on how to proceed. + */ + public static final int STATUS_PREPARED = 2; + + /** + * Status code indicating a transaction that has been committed. + * Probably heuristics still exists, or the transaction would no + * longer exist. + */ + public static final int STATUS_COMMITTED = 3; + + /** + * Status code indicating a transaction that has been rolled back. + * Probably heuristics still exists, or the transaction would no + * longer exist. + */ + public static final int STATUS_ROLLEDBACK = 4; + + /** + * Status code indicating that the transaction status could not be + * determined. + */ + public static final int STATUS_UNKNOWN = 5; + + /** + * Status code indicating that no transaction exists. + */ + public static final int STATUS_NO_TRANSACTION = 6; + + /** + * Status code indicating a transaction that has begun the first + * phase of the two-phase commit protocol, not not yet completed + * this phase. + */ + public static final int STATUS_PREPARING = 7; + + /** + * Status code indicating a transaction that has begun the second + * phase of the two-phase commit protocol, but not yet completed + * this phase. + */ + public static final int STATUS_COMMITTING = 8; + + /** + * Status code indicating a transaction that is in the process of + * rolling back. + */ + public static final int STATUS_ROLLING_BACK = 9; +} diff --git a/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/Synchronization.java b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/Synchronization.java new file mode 100644 index 000000000..5f94326a5 --- /dev/null +++ b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/Synchronization.java @@ -0,0 +1,32 @@ +package com.fr.third.javax.transaction; + +/** + * This is the callback interface that has to be implemented by objects + * interested in receiving notification before and after a transaction + * commits or rolls back. + * + * An interested party can give an instance implementing this interface + * as an argument to the + * {@link Transaction#registerSynchronization(Synchronization) Transaction.registerSynchronization} + * method to receive callbacks before and after a transaction commits or + * rolls back. + * + * @version $Revision$ + */ +public interface Synchronization +{ + /** + * This method is invoked before the start of the commit + * process. The method invocation is done in the context of the + * transaction that is about to be committed. + */ + public void beforeCompletion(); + + /** + * This method is invoked after the transaction has committed or + * rolled back. + * + * @param status The status of the completed transaction. + */ + public void afterCompletion(int status); +} diff --git a/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/SystemException.java b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/SystemException.java new file mode 100644 index 000000000..3c8390f27 --- /dev/null +++ b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/SystemException.java @@ -0,0 +1,46 @@ +package com.fr.third.javax.transaction; + +/** + * This exception is thrown to indicate that the transaction manager has + * encountered an unexpected error condition that prevents future + * transaction services from proceeding. + * + * @version $Revision$ + */ +public class SystemException extends Exception +{ + /** + * The error code of this exception. Values of this field are not + * specified by JTA. + */ + public int errorCode; + + /** + * Creates a new SystemException without a detail message. + */ + public SystemException() + { + } + + /** + * Constructs an SystemException with the specified + * detail message. + * + * @param msg the detail message. + */ + public SystemException(String msg) + { + super(msg); + } + + /** + * Constructs an SystemException with the specified + * detail message. + * + * @param errcode the error code for the exception + */ + public SystemException(int errcode) + { + this.errorCode = errcode; + } +} diff --git a/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/Transaction.java b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/Transaction.java new file mode 100644 index 000000000..ddcd46c20 --- /dev/null +++ b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/Transaction.java @@ -0,0 +1,117 @@ +package com.fr.third.javax.transaction; + +import java.lang.SecurityException; +import com.fr.third.javax.transaction.xa.XAResource; + +/** + * The Transaction interface allows operations to be performed on + * transactions. + * + * @version $Revision$ + */ +public interface Transaction +{ + /** + * Attempt to commit this transaction. + * + * @throws RollbackException If the transaction was marked for rollback + * only, the transaction is rolled back and this exception is + * thrown. + * @throws SystemException If the transaction service fails in an + * unexpected way. + * @throws HeuristicMixedException If a heuristic decision was made and + * some some parts of the transaction have been committed while + * other parts have been rolled back. + * @throws HeuristicRollbackException If a heuristic decision to roll + * back the transaction was made. + * @throws SecurityException If the caller is not allowed to commit this + * transaction. + */ + public void commit() + throws RollbackException, HeuristicMixedException, + HeuristicRollbackException, SecurityException, SystemException; + + /** + * Rolls back this transaction. + * + * @throws IllegalStateException If the transaction is in a state + * where it cannot be rolled back. This could be because the + * transaction is no longer active, or because it is in the + * {@link Status#STATUS_PREPARED prepared state}. + * @throws SystemException If the transaction service fails in an + * unexpected way. + */ + public void rollback() + throws IllegalStateException, SystemException; + + /** + * Mark the transaction so that the only possible outcome is a rollback. + * + * @throws IllegalStateException If the transaction is not in an active + * state. + * @throws SystemException If the transaction service fails in an + * unexpected way. + */ + public void setRollbackOnly() + throws IllegalStateException, SystemException; + + /** + * Get the status of the transaction. + * + * @return The status of the transaction. This is one of the + * {@link Status} constants. + * + * @throws SystemException If the transaction service fails in an + * unexpected way. + */ + public int getStatus() throws SystemException; + + /** + * Enlist an XA resource with this transaction. + * + * @return true if the resource could be enlisted with + * this transaction, otherwise false. + * + * @throws RollbackException If the transaction is marked for rollback + * only. + * @throws IllegalStateException If the transaction is in a state + * where resources cannot be enlisted. This could be because the + * transaction is no longer active, or because it is in the + * {@link Status#STATUS_PREPARED prepared state}. + * @throws SystemException If the transaction service fails in an + * unexpected way. + */ + public boolean enlistResource(XAResource xaRes) + throws RollbackException, IllegalStateException, SystemException; + + /** + * Delist an XA resource from this transaction. + * + * @return true if the resource could be delisted from + * this transaction, otherwise false. + * + * @throws IllegalStateException If the transaction is in a state + * where resources cannot be delisted. This could be because the + * transaction is no longer active. + * @throws SystemException If the transaction service fails in an + * unexpected way. + */ + public boolean delistResource(XAResource xaRes, int flag) + throws IllegalStateException, SystemException; + + /** + * Register a {@link Synchronization} callback with this transaction. + * + * @throws RollbackException If the transaction is marked for rollback + * only. + * @throws IllegalStateException If the transaction is in a state + * where {@link Synchronization} callbacks cannot be registered. + * This could be because the transaction is no longer active, + * or because it is in the + * {@link Status#STATUS_PREPARED prepared state}. + * @throws SystemException If the transaction service fails in an + * unexpected way. + */ + public void registerSynchronization(Synchronization sync) + throws RollbackException, IllegalStateException, SystemException; +} diff --git a/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/TransactionManager.java b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/TransactionManager.java new file mode 100644 index 000000000..36194ec7a --- /dev/null +++ b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/TransactionManager.java @@ -0,0 +1,150 @@ +package com.fr.third.javax.transaction; + +/** + * The TransactionManager interface defines the methods that allow an + * application server to manage transactions on behalf of the applications. + *

      + * User applications should not use this interface directly, but use + * {@link UserTransaction} insted if they need to do their own transaction + * management. + *

      + * Internally, the transaction manager associates transactions with threads, + * and the methods here operate on the transaction associated with the + * calling thread. + * + * @version $Revision$ + */ +public interface TransactionManager +{ + /** + * Starts a new transaction, and associate it with the calling thread. + * + * @throws NotSupportedException If the calling thread is already + * associated with a transaction, and nested transactions are + * not supported. + * @throws SystemException If the transaction service fails in an + * unexpected way. + */ + public void begin() throws NotSupportedException, SystemException; + + /** + * Commit the transaction associated with the calling thread. + * + * @throws RollbackException If the transaction was marked for rollback + * only, the transaction is rolled back and this exception is + * thrown. + * @throws IllegalStateException If the calling thread is not associated + * with a transaction. + * @throws SystemException If the transaction service fails in an + * unexpected way. + * @throws HeuristicMixedException If a heuristic decision was made and + * some some parts of the transaction have been committed while + * other parts have been rolled back. + * @throws HeuristicRollbackException If a heuristic decision to roll + * back the transaction was made. + * @throws SecurityException If the caller is not allowed to commit this + * transaction. + */ + public void commit() throws RollbackException, HeuristicMixedException, + HeuristicRollbackException, SecurityException, + IllegalStateException, SystemException; + + /** + * Rolls back the transaction associated with the calling thread. + * + * @throws IllegalStateException If the transaction is in a state + * where it cannot be rolled back. This could be because the + * calling thread is not associated with a transaction, or + * because it is in the + * {@link Status#STATUS_PREPARED prepared state}. + * @throws SecurityException If the caller is not allowed to roll back + * this transaction. + * @throws SystemException If the transaction service fails in an + * unexpected way. + */ + public void rollback() throws IllegalStateException, SecurityException, + SystemException; + + /** + * Mark the transaction associated with the calling thread for rollback + * only. + * + * @throws IllegalStateException If the transaction is in a state + * where it cannot be rolled back. This could be because the + * calling thread is not associated with a transaction, or + * because it is in the + * {@link Status#STATUS_PREPARED prepared state}. + * @throws SystemException If the transaction service fails in an + * unexpected way. + */ + public void setRollbackOnly() throws IllegalStateException, SystemException; + + /** + * Get the status of the transaction associated with the calling thread. + * + * @return The status of the transaction. This is one of the + * {@link Status} constants. If no transaction is associated + * with the calling thread, + * {@link Status#STATUS_NO_TRANSACTION} is returned. + * + * @throws SystemException If the transaction service fails in an + * unexpected way. + */ + public int getStatus() throws SystemException; + + /** + * Get the transaction associated with the calling thread. + * + * @return The transaction associated with the calling thread, or + * null if the calling thread is not associated + * with a transaction. + * + * @throws SystemException If the transaction service fails in an + * unexpected way. + */ + public Transaction getTransaction() throws SystemException; + + /** + * Change the transaction timeout for transactions started by the calling + * thread with the {@link #begin()} method. + * + * @param seconds The new timeout value, in seconds. If this parameter + * is 0, the timeout value is reset to the default + * value. + * + * @throws SystemException If the transaction service fails in an + * unexpected way. + */ + public void setTransactionTimeout(int seconds) throws SystemException; + + /** + * Suspend the association the calling thread has to a transaction, + * and return the suspended transaction. + * When returning from this method, the calling thread is no longer + * associated with a transaction. + * + * @return The transaction that the calling thread was associated with, + * or null if the calling thread was not associated + * with a transaction. + * + * @throws SystemException If the transaction service fails in an + * unexpected way. + */ + public Transaction suspend() throws SystemException; + + /** + * Resume the association of the calling thread with the given + * transaction. + * + * @param tobj The transaction to be associated with the calling thread. + * + * @throws com.fr.third.javax.transaction.InvalidTransactionException If the argument does not represent + * a valid transaction. + * @throws IllegalStateException If the calling thread is already + * associated with a transaction. + * @throws SystemException If the transaction service fails in an + * unexpected way. + */ + public void resume(Transaction tobj) throws com.fr.third.javax.transaction.InvalidTransactionException, + IllegalStateException, SystemException; +} diff --git a/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/TransactionRequiredException.java b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/TransactionRequiredException.java new file mode 100644 index 000000000..37a626c91 --- /dev/null +++ b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/TransactionRequiredException.java @@ -0,0 +1,32 @@ +package com.fr.third.javax.transaction; + +import java.rmi.RemoteException; + +/** + * This exception indicates that a remote invocation request carried a null + * transaction context, but that an active transaction context was needed. + * + * @version $Revision$ + */ +public class TransactionRequiredException extends RemoteException +{ + + /** + * Creates a new TransactionRequiredException without a + * detail message. + */ + public TransactionRequiredException() + { + } + + /** + * Constructs an TransactionRequiredException with the + * specified detail message. + * + * @param msg the detail message. + */ + public TransactionRequiredException(String msg) + { + super(msg); + } +} diff --git a/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/TransactionRolledbackException.java b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/TransactionRolledbackException.java new file mode 100644 index 000000000..211c965d8 --- /dev/null +++ b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/TransactionRolledbackException.java @@ -0,0 +1,35 @@ +package com.fr.third.javax.transaction; + +import java.rmi.RemoteException; + +/** + * This exception indicates that the transaction context carried in the + * remote invocation has been rolled back, or was marked for roll back only. + * + * This indicates to the client that further computation on behalf of this + * transaction would be fruitless. + * + * @version $Revision$ + */ +public class TransactionRolledbackException extends RemoteException +{ + + /** + * Creates a new TransactionRolledbackException without + * a detail message. + */ + public TransactionRolledbackException() + { + } + + /** + * Constructs an TransactionRolledbackException with the + * specified detail message. + * + * @param msg the detail message. + */ + public TransactionRolledbackException(String msg) + { + super(msg); + } +} diff --git a/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/TransactionSynchronizationRegistry.java b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/TransactionSynchronizationRegistry.java new file mode 100644 index 000000000..31ee4c0fd --- /dev/null +++ b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/TransactionSynchronizationRegistry.java @@ -0,0 +1,80 @@ +package com.fr.third.javax.transaction; + +/** + * TransactionSynchronizationRegistry. + * + * @author Adrian Brock + * @version $Revision$ + */ +public interface TransactionSynchronizationRegistry +{ + /** + * An object that has the same equals/hashCode behaviour + * as the transaction currently associated with the thread + * + * @return the key or null if there is no current transaction + */ + Object getTransactionKey(); + + /** + * Get the transaction status of the current thread + * + * @return the status + */ + int getTransactionStatus(); + + /** + * Get the rollback status of the transaction associated with the + * current thread. + * + * @return true when the transaction is rollback only + * @throws IllegalStateException if there is no current transaction + */ + boolean getRollbackOnly() throws IllegalStateException; + + /** + * Set the transaction associated with the current thread to force a rollback + * + * @throws IllegalStateException if there is no current transaction + */ + void setRollbackOnly() throws IllegalStateException; + + /** + * Add a transaction synchronization that is invoked "last", + * i.e. after SessionSynchronizations and directly registered transaction synchronizations.

      + * + * The beforeCompletion is invoked in the context of the transaction, + * the afterCompletion in an undefined transaction context. + * Other context is the same as when the one used to register the synchronization.

      + * + * Access to "user components" is not allowed, e.g. ejb bean methods.

      + * + * Access to other resources, e.g. jca, is allowed in the beforeCompletion, + * but not transactional work is allowed in the afterCompletion. e.g. + * typically only "close()" is allowed. + * + * @param sync the synchronization + * @throws IllegalStateException if there is no current transaction + */ + void registerInterposedSynchronization(Synchronization sync) throws IllegalStateException; + + /** + * Get a transaction local for the current transaction + * + * @param key the key to the value + * @return the value + * @throws IllegalStateException if there is no current transaction + * @throws NullPointerException if the key is null + */ + Object getResource(Object key) throws IllegalStateException; + + /** + * Set a transaction local for the current transaction + * + * @param key the key to the value + * @param value the value + * @throws IllegalStateException if there is no current transaction + * @throws NullPointerException if the key is null + */ + void putResource(Object key, Object value) throws IllegalStateException; +} diff --git a/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/UserTransaction.java b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/UserTransaction.java new file mode 100644 index 000000000..cf395c85d --- /dev/null +++ b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/UserTransaction.java @@ -0,0 +1,98 @@ +package com.fr.third.javax.transaction; + +/** + * This interface allows an application to explicitly manage transactions. + * + * @version $Revision$ + */ +public interface UserTransaction +{ + /** + * Starts a new transaction, and associate it with the calling thread. + * + * @throws NotSupportedException If the calling thread is already + * associated with a transaction, and nested transactions are + * not supported. + * @throws SystemException If the transaction service fails in an + * unexpected way. + */ + public void begin() throws NotSupportedException, SystemException; + + /** + * Commit the transaction associated with the calling thread. + * + * @throws RollbackException If the transaction was marked for rollback + * only, the transaction is rolled back and this exception is + * thrown. + * @throws IllegalStateException If the calling thread is not associated + * with a transaction. + * @throws SystemException If the transaction service fails in an + * unexpected way. + * @throws HeuristicMixedException If a heuristic decision was made and + * some some parts of the transaction have been committed while + * other parts have been rolled back. + * @throws HeuristicRollbackException If a heuristic decision to roll + * back the transaction was made. + * @throws SecurityException If the caller is not allowed to commit this + * transaction. + */ + public void commit() throws RollbackException, HeuristicMixedException, + HeuristicRollbackException, SecurityException, + IllegalStateException, SystemException; + + /** + * Rolls back the transaction associated with the calling thread. + * + * @throws IllegalStateException If the transaction is in a state + * where it cannot be rolled back. This could be because the + * calling thread is not associated with a transaction, or + * because it is in the + * {@link Status#STATUS_PREPARED prepared state}. + * @throws SecurityException If the caller is not allowed to roll back + * this transaction. + * @throws SystemException If the transaction service fails in an + * unexpected way. + */ + public void rollback() throws IllegalStateException, SecurityException, + SystemException; + + /** + * Mark the transaction associated with the calling thread for rollback + * only. + * + * @throws IllegalStateException If the transaction is in a state + * where it cannot be rolled back. This could be because the + * calling thread is not associated with a transaction, or + * because it is in the + * {@link Status#STATUS_PREPARED prepared state}. + * @throws SystemException If the transaction service fails in an + * unexpected way. + */ + public void setRollbackOnly() throws IllegalStateException, SystemException; + + /** + * Get the status of the transaction associated with the calling thread. + * + * @return The status of the transaction. This is one of the + * {@link Status} constants. If no transaction is associated + * with the calling thread, + * {@link Status#STATUS_NO_TRANSACTION} is returned. + * + * @throws SystemException If the transaction service fails in an + * unexpected way. + */ + public int getStatus() throws SystemException; + + /** + * Change the transaction timeout for transactions started by the calling + * thread with the {@link #begin()} method. + * + * @param seconds The new timeout value, in seconds. If this parameter + * is 0, the timeout value is reset to the default + * value. + * + * @throws SystemException If the transaction service fails in an + * unexpected way. + */ + public void setTransactionTimeout(int seconds) throws SystemException; +} diff --git a/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/xa/XAException.java b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/xa/XAException.java new file mode 100644 index 000000000..bf6c268b6 --- /dev/null +++ b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/xa/XAException.java @@ -0,0 +1,200 @@ +package com.fr.third.javax.transaction.xa; + +/** + * The XAException is thrown by resource managers in case of problems. + * + * @version $Revision$ + */ +public class XAException extends java.lang.Exception { + + /** + * The error code. + */ + public int errorCode = 0; + + /** + * Creates new XAException without detail message. + */ + public XAException() { + } + + /** + * Constructs an XAException with the specified detail + * message. + * + * @param msg the detail message. + */ + public XAException(String msg) { + super(msg); + } + + /** + * Constructs an XAException for the specified error code. + * + * @param errorCode the error code. + */ + public XAException(int errorCode) { + super(); + this.errorCode = errorCode; + } + + // STATIC VARIABLES --------------------------------- + + // changed numbers to match SUNs by pkendall for interoperability + + // added by kimptoc - needed for jbossmq to compile... + // others added by jwalters for completeness + + /** + * Error code indicating that an asynchronous operation is outstanding. + */ + public static final int XAER_ASYNC = -2; + + /** + * Error code indicating that a resource manager error has occurred. + */ + public static final int XAER_RMERR = -3; + + /** + * Error code indicating that an {@link com.fr.third.javax.transaction.xa.Xid} is not valid. + */ + public static final int XAER_NOTA = -4; + + /** + * Error code indicating that invalid arguments were passed. + */ + public static final int XAER_INVAL = -5; + + /** + * Error code indicating a protocol error. This happens if a method + * is invoked on a resource when it is not in the correct state for it. + */ + public static final int XAER_PROTO = -6; + + /** + * Error code indicating that the resource manager has failed and is + * not available. + */ + public static final int XAER_RMFAIL = -7; + + /** + * Error code indicating that a Xid given as an argument is already + * known to the resource manager. + */ + public static final int XAER_DUPID = -8; + + /** + * Error code indicating that the resource manager is doing work + * outside the global transaction. + */ + public static final int XAER_OUTSIDE = -9; + + // added by jwalters - needed for jboss + + /** + * Error code indicating that the transaction branch was read-only, + * and has already been committed. + */ + public static final int XA_RDONLY = 3; + + /** + * Error code indicating that the method invoked returned without having + * any effect, and that it may be invoked again. + * Note that this constant is not defined in JTA 1.0.1, but appears in + * J2EE(TM) as shipped by SUN. + */ + public static final int XA_RETRY = 4; + + /** + * Error code indicating that a heuristic mixed decision was made. + * This indicates that parts of the transaction were committed, + * while other parts were rolled back. + */ + public static final int XA_HEURMIX = 5; + + /** + * Error code indicating that a heuristic rollback decision was made. + */ + public static final int XA_HEURRB = 6; + + /** + * Error code indicating that a heuristic commit decision was made. + */ + public static final int XA_HEURCOM = 7; + + /** + * Error code indicating that a heuristic decision may have been made. + * The outcome of all parts of the transaction is not known, but the + * outcome of the known parts are either all committed, or all rolled + * back. + */ + public static final int XA_HEURHAZ = 8; + + /** + * Error code indicating that the transaction resumption must happen + * where the suspension occurred. + */ + public static final int XA_NOMIGRATE = 9; + + /** + * This is not an error code, but the same as the rollback error code + * with the lowest number. + */ + public static final int XA_RBBASE = 100; + + /** + * Rollback error code indicating that the rollback happened for + * an unspecified reason. + */ + public static final int XA_RBROLLBACK = 100; + + /** + * Rollback error code indicating that the rollback happened due to a + * communications failure. + */ + public static final int XA_RBCOMMFAIL = 101; + + /** + * Rollback error code indicating that the rollback happened because + * deadlock was detected. + */ + public static final int XA_RBDEADLOCK = 102; + + /** + * Rollback error code indicating that the rollback happened because + * an internal integrity check failed. + */ + public static final int XA_RBINTEGRITY = 103; + + /** + * Rollback error code indicating that the rollback happened for some + * reason not fitting any of the other rollback error codes. + */ + public static final int XA_RBOTHER = 104; + + /** + * Rollback error code indicating that the rollback happened due to + * a protocol error in the resource manager. + */ + public static final int XA_RBPROTO = 105; + + /** + * Rollback error code indicating that the rollback happened because + * of a timeout. + */ + public static final int XA_RBTIMEOUT = 106; + + /** + * Rollback error code indicating that the rollback happened due to a + * transient failure. The transaction branch may be retried. + */ + public static final int XA_RBTRANSIENT = 107; + + /** + * This is not an error code, but the same as the rollback error code + * with the highest number. + */ + public static final int XA_RBEND = 107; +} + + diff --git a/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/xa/XAResource.java b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/xa/XAResource.java new file mode 100644 index 000000000..c269da6ee --- /dev/null +++ b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/xa/XAResource.java @@ -0,0 +1,268 @@ +package com.fr.third.javax.transaction.xa; + +/** + * The XAResource interface is a Java mapping of the industry standard XA + * interface based on the X/Open CAE Specification (Distributed Transaction + * Processing: The XA Specification). + *

      + * The XA interface defines the contract between a Resource Manager and a + * Transaction Manager in a distributed transaction processing (DTP) + * environment. + * An XA resource such as a JDBC driver or a JMS provider implements this + * interface to support association between a global transaction and a + * database or message service connection. + *

      + * The XAResource interface can be supported by any transactional resource + * that is intended to be used by application programs in an environment + * where transactions are controlled by an external transaction manager. + * An example of such a resource is a database management system. + * An application may access data through multiple database connections. + * Each database connection is enlisted with the transaction manager as a + * transactional resource. The transaction manager obtains an XAResource for + * each connection participating in a global transaction. The transaction + * manager uses the {@link #start(com.fr.third.javax.transaction.xa.Xid, int) start} method to associate the + * global transaction with the resource, and it uses the + * {@link #end(com.fr.third.javax.transaction.xa.Xid, int) end} method to disassociate the transaction from + * the resource. + * The resource manager is responsible for associating the global + * transaction to all work performed on its data between the start and + * end method invocation. + *

      + * At transaction commit time, the resource managers are informed by the + * transaction manager to prepare, commit, or rollback a transaction + * according to the two-phase commit protocol. + *

      + * Behind the resources that implement this interface the resource manager + * exists. The resource manager does not have a public interface or direct + * references, and can manage several resources. + * To see if two resources are managed by the same resource manager, the + * {@link #isSameRM(XAResource)} method can be used. + * + * @version $Revision$ + */ +public interface XAResource +{ + /** + * Flag value indicating that no flags are set. + */ + public static final int TMNOFLAGS = 0; + + /** + * JTA specifies this constant and states that it indicates that the + * caller is using one-phase optimization, but this constant seems + * not to be used by JTA. + */ + public static final int TMONEPHASE = 1073741824; + + /** + * Flag value for the {@link #start(com.fr.third.javax.transaction.xa.Xid, int) start} method indicating + * that the resource should associate with a transaction previously seen + * by this resource manager. + */ + public static final int TMJOIN = 2097152; + + /** + * Flag value for the {@link #start(com.fr.third.javax.transaction.xa.Xid, int) start} method indicating + * that the resource should associate with a transaction where the + * association was suspended. + */ + public static final int TMRESUME = 134217728; + + /** + * Flag value for the {@link #end(com.fr.third.javax.transaction.xa.Xid, int) end} method indicating that + * the transaction should be disassociated, and that the work has + * completed sucessfully. + */ + public static final int TMSUCCESS = 67108864; + + /** + * Flag value for the {@link #end(com.fr.third.javax.transaction.xa.Xid, int) end} method indicating that + * the transaction should be disassociated, and that the work has + * failed + */ + public static final int TMFAIL = 536870912; + + /** + * Flag value for the {@link #end(com.fr.third.javax.transaction.xa.Xid, int) end} method indicating that + * the resource should temporarily suspend the association with the + * transaction. + */ + public static final int TMSUSPEND = 33554432; + + /** + * Value returned from the {@link #prepare(com.fr.third.javax.transaction.xa.Xid) prepare} method to + * indicate that the resource was not changed in this transaction. + */ + public static final int XA_RDONLY = 3; + + /** + * Value returned from the {@link #prepare(com.fr.third.javax.transaction.xa.Xid) prepare} method to + * indicate that the resource has successfully prepared to commit + * the transaction. + */ + public static final int XA_OK = 0; + + /** + * Flag value for the {@link #recover(int) recover} method indicating + * that the resource manager should start a new recovery scan. + */ + public static final int TMSTARTRSCAN = 16777216; + + /** + * Flag value for the {@link #recover(int) recover} method indicating + * that the resource manager should end the current recovery scan. + */ + public static final int TMENDRSCAN = 8388608; + + + /** + * Called to associate the resource with a transaction. + * + * If the flags argument is {@link #TMNOFLAGS}, the transaction must not + * previously have been seen by this resource manager, or an + * {@link com.fr.third.javax.transaction.xa.XAException} with error code XAER_DUPID will be thrown. + * + * If the flags argument is {@link #TMJOIN}, the resource will join a + * transaction previously seen by tis resource manager. + * + * If the flags argument is {@link #TMRESUME} the resource will + * resume the transaction association that was suspended with + * end(TMSUSPEND). + * + * @param xid The id of the transaction to associate with. + * @param flags Must be either {@link #TMNOFLAGS}, {@link #TMJOIN} + * or {@link #TMRESUME}. + * @throws com.fr.third.javax.transaction.xa.XAException If an error occurred. + */ + public void start(com.fr.third.javax.transaction.xa.Xid xid, int flags) throws com.fr.third.javax.transaction.xa.XAException; + + /** + * Called to disassociate the resource from a transaction. + * + * If the flags argument is {@link #TMSUCCESS}, the portion of work + * was done sucessfully. + * + * If the flags argument is {@link #TMFAIL}, the portion of work + * failed. The resource manager may mark the transaction for + * rollback only to avoid the transaction being committed. + * + * If the flags argument is {@link #TMSUSPEND} the resource will + * temporarily suspend the transaction association. The transaction + * must later be re-associated by giving the {@link #TMRESUME} flag + * to the {@link #start(com.fr.third.javax.transaction.xa.Xid,int) start} method. + * + * @param xid The id of the transaction to disassociate from. + * @param flags Must be either {@link #TMSUCCESS}, {@link #TMFAIL} + * or {@link #TMSUSPEND}. + * @throws com.fr.third.javax.transaction.xa.XAException If an error occurred. + */ + public void end(com.fr.third.javax.transaction.xa.Xid xid, int flags) throws com.fr.third.javax.transaction.xa.XAException; + + /** + * Prepare to commit the work done on this resource in the given + * transaction. + * + * This method cannot return a status indicating that the transaction + * should be rolled back. If the resource wants the transaction to + * be rolled back, it should throw an XAException at the + * caller. + * + * @param xid The id of the transaction to prepare to commit work for. + * @return Either {@link #XA_OK} or {@link #XA_RDONLY}. + * @throws com.fr.third.javax.transaction.xa.XAException If an error occurred. + */ + public int prepare(com.fr.third.javax.transaction.xa.Xid xid) throws com.fr.third.javax.transaction.xa.XAException; + + /** + * Commit the work done on this resource in the given transaction. + * + * If the onePhase argument is true, one-phase + * optimization is being used, and the {@link #prepare(com.fr.third.javax.transaction.xa.Xid) prepare} + * method must not have been called for this transaction. + * Otherwise, this is the second phase of the two-phase commit protocol. + * + * @param xid The id of the transaction to commit work for. + * @param onePhase If true, the transaction manager is using one-phase + * optimization. + * @throws com.fr.third.javax.transaction.xa.XAException If an error occurred. + */ + public void commit(com.fr.third.javax.transaction.xa.Xid xid, boolean onePhase) throws com.fr.third.javax.transaction.xa.XAException; + + /** + * Roll back the work done on this resource in the given transaction. + * + * @param xid The id of the transaction to commit work for. + * @throws com.fr.third.javax.transaction.xa.XAException If an error occurred. + */ + public void rollback(com.fr.third.javax.transaction.xa.Xid xid) throws com.fr.third.javax.transaction.xa.XAException; + + /** + * Tells the resource manager to forget about a heuristic decision. + * + * @param xid The id of the transaction that was ended with a heuristic + * decision. + * @throws com.fr.third.javax.transaction.xa.XAException If an error occurred. + */ + public void forget(com.fr.third.javax.transaction.xa.Xid xid) throws com.fr.third.javax.transaction.xa.XAException; + + /** + * Return a list of transactions that are in a prepared or heuristically + * state. + * + * This method looks not only at the resource it is invoked on, but + * also on all other resources managed by the same resource manager. + * It is intended to be used by the application server when recovering + * after a server crash. + *

      + * A recovery scan is done with one or more calls to this method. + * At the first call, {@link #TMSTARTRSCAN} must be in the + * flag argument to indicate that the scan should be started. + * During the recovery scan, the resource manager maintains an internal + * cursor that keeps track of the progress of the recovery scan. + * To end the recovery scan, the {@link #TMENDRSCAN} must be passed + * in the flag argument. + * + * @param flag Must be either {@link #TMNOFLAGS}, {@link #TMSTARTRSCAN}, + * {@link #TMENDRSCAN} or TMSTARTRSCAN|TMENDRSCAN. + * @return An array of zero or more transaction ids. + * @throws com.fr.third.javax.transaction.xa.XAException If an error occurred. + */ + public com.fr.third.javax.transaction.xa.Xid[] recover(int flag) throws com.fr.third.javax.transaction.xa.XAException; + + /** + * Tells the caller if this resource has the same resource manager + * as the argument resource. + * + * The transaction manager needs this method to be able to decide + * if the {@link #start(com.fr.third.javax.transaction.xa.Xid,int) start} method should be given the + * {@link #TMJOIN} flag. + * + * @throws com.fr.third.javax.transaction.xa.XAException If an error occurred. + */ + public boolean isSameRM(XAResource xaRes) throws com.fr.third.javax.transaction.xa.XAException; + + /** + * Get the current transaction timeout value for this resource. + * + * @return The current timeout value, in seconds. + * @throws com.fr.third.javax.transaction.xa.XAException If an error occurred. + */ + public int getTransactionTimeout() throws com.fr.third.javax.transaction.xa.XAException; + + /** + * Set the transaction timeout value for this resource. + * + * If the seconds argument is 0, the + * timeout value is set to the default timeout value of the resource + * manager. + * + * Not all resource managers support setting the timeout value. + * If the resource manager does not support setting the timeout + * value, it should return false. + * + * @param seconds The timeout value, in seconds. + * @return True if the timeout value could be set, otherwise false. + * @throws com.fr.third.javax.transaction.xa.XAException If an error occurred. + */ + public boolean setTransactionTimeout(int seconds) throws com.fr.third.javax.transaction.xa.XAException; +} diff --git a/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/xa/Xid.java b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/xa/Xid.java new file mode 100644 index 000000000..b634650eb --- /dev/null +++ b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/xa/Xid.java @@ -0,0 +1,72 @@ +package com.fr.third.javax.transaction.xa; + +/** + * The Xid interface is a Java mapping of the X/Open transaction identifier + * XID structure. + *

      + * A transaction id is an aggregate of three parts: + *

        + *
      • The format identifier indicates the transaction family and tells + * how the other two parts should be interpreted. + *
      • + *
      • The global transaction id denotes, with the format specifier, the + * id of the global transaction. + *
      • + *
      • The branch qualifier denotes a particular branch of the global + * transaction. + *
      • + *
      + *

      + * The Xid interface is used by the application server, the transaction manager + * and the resource managers, and is not used in application programs. + * + * @version $Revision$ + */ +public interface Xid +{ + /** + * The maximum possible size of a global transaction id. + * This is the largest possible array returned by the + * {@link #getGlobalTransactionId() getGlobalTransactionId} method. + */ + public static final int MAXGTRIDSIZE = 64; + + /** + * The maximum possible size of a transaction branch qualifier. + * This is the largest possible array returned by the + * {@link #getBranchQualifier() getBranchQualifier} method. + */ + public static final int MAXBQUALSIZE = 64; + + /** + * Get the format identifier. + * + * @return An integer denoting the family of this transaction, and + * telling how the two other parts can be interpreted. + */ + public int getFormatId(); + + /** + * Get the global transaction id of this transaction. + * + * Please note that JTA does not define if this method returns + * a copy or a reference to an internal byte array. For maximum + * portability, do not modify the returned array. + * + * @return A byte array that together with the format ID + * defines the globally unique ID of this transaction. + */ + public byte[] getGlobalTransactionId(); + + /** + * Get the transaction branch qualifier of this transaction. + * + * Please note that JTA does not define if this method returns + * a copy or a reference to an internal byte array. For maximum + * portability, do not modify the returned array. + * + * @return A byte array that identifies the branch of this + * transaction. + */ + public byte[] getBranchQualifier(); +} diff --git a/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/xa/package.html b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/xa/package.html new file mode 100644 index 000000000..9547f0053 --- /dev/null +++ b/fine-jboss-transaction-api/src/com/fr/third/javax/transaction/xa/package.html @@ -0,0 +1,17 @@ + + +This package contains the classes and interfaces that define the interaction +between the transaction manager and the resources it manages. +

      +Classes and interfaces here are conforming to the +Java Transaction API + (JTA) 1.0.1 specification. + +

      +The interaction is modelled after the X/Open CAE Specification +(Distributed Transaction Processing: The XA Specification). + +The CORBA CosTransactions specification is freely available, and gives +a pretty good overview of the XA protocol. + +