April 2011 - hibernate-commits - Jboss List Archives

[hibernate/hibernate-core] 38068e: HHH-6101 - Clean up checks for java 1.3 versus 1.4

by noreply＠github.com

Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-core Commit: 38068e149507f4ad097d474504f34f6aaf6aac07 https://github.com/hibernate/hibernate-core/commit/38068e149507f4ad097d47... Author: Steve Ebersole <steve(a)hibernate.org> Date: 2011-04-08 (Fri, 08 Apr 2011) Changed paths: M hibernate-core/src/main/java/org/hibernate/cfg/Environment.java M hibernate-core/src/main/java/org/hibernate/cfg/HbmBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/SetBinder.java M hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java M hibernate-core/src/main/java/org/hibernate/type/descriptor/java/JdbcTimestampTypeDescriptor.java M hibernate-core/src/test/java/org/hibernate/test/annotations/backquotes/BackquoteTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java Log Message: ----------- HHH-6101 - Clean up checks for java 1.3 versus 1.4

13 years, 8 months

1
0
0 / 0

[hibernate/hibernate-core] 6504cb: HHH-6098 - Slight naming changes in regards to new...

by noreply＠github.com

Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-core Commit: 6504cb6d78740d2a4695096463f40baf18c9af11 https://github.com/hibernate/hibernate-core/commit/6504cb6d78740d2a469509... Author: Steve Ebersole <steve(a)hibernate.org> Date: 2011-04-08 (Fri, 08 Apr 2011) Changed paths: M documentation/src/main/docbook/manual/en-US/content/configuration.xml M documentation/src/main/docbook/manual/en-US/content/performance.xml M hibernate-c3p0/src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0ConnectionProvider.java R hibernate-c3p0/src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0Logger.java A hibernate-c3p0/src/main/java/org/hibernate/service/jdbc/connections/internal/C3P0MessageLogger.java M hibernate-core/src/main/antlr/hql-sql.g M hibernate-core/src/main/java/org/hibernate/AssertionFailure.java R hibernate-core/src/main/java/org/hibernate/HibernateLogger.java M hibernate-core/src/main/java/org/hibernate/LazyInitializationException.java M hibernate-core/src/main/java/org/hibernate/bytecode/internal/javassist/BytecodeProviderImpl.java M hibernate-core/src/main/java/org/hibernate/bytecode/internal/javassist/JavassistClassTransformer.java M hibernate-core/src/main/java/org/hibernate/cache/AbstractJndiBoundCacheProvider.java M hibernate-core/src/main/java/org/hibernate/cache/NonstrictReadWriteCache.java M hibernate-core/src/main/java/org/hibernate/cache/ReadOnlyCache.java M hibernate-core/src/main/java/org/hibernate/cache/ReadWriteCache.java M hibernate-core/src/main/java/org/hibernate/cache/StandardQueryCache.java M hibernate-core/src/main/java/org/hibernate/cache/TransactionalCache.java M hibernate-core/src/main/java/org/hibernate/cache/UpdateTimestampsCache.java M hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/CollectionRegionAdapter.java M hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/EntityRegionAdapter.java M hibernate-core/src/main/java/org/hibernate/cache/impl/bridge/RegionFactoryCacheProviderBridge.java M hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/BinderHelper.java M hibernate-core/src/main/java/org/hibernate/cfg/CollectionSecondPass.java M hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java M hibernate-core/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java M hibernate-core/src/main/java/org/hibernate/cfg/Ejb3Column.java M hibernate-core/src/main/java/org/hibernate/cfg/Environment.java M hibernate-core/src/main/java/org/hibernate/cfg/HbmBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/NamedSQLQuerySecondPass.java M hibernate-core/src/main/java/org/hibernate/cfg/PropertyContainer.java M hibernate-core/src/main/java/org/hibernate/cfg/SettingsFactory.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/ListBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/PropertyBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/QueryBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/ResultsetMappingSecondPass.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/SetBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/SimpleValueBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/TableBinder.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/JPAOverridenAnnotationReader.java M hibernate-core/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java M hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationEventListener.java M hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationIntegrator.java M hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/TypeSafeActivator.java M hibernate-core/src/main/java/org/hibernate/cfg/search/HibernateSearchIntegrator.java M hibernate-core/src/main/java/org/hibernate/collection/PersistentArrayHolder.java M hibernate-core/src/main/java/org/hibernate/context/JTASessionContext.java M hibernate-core/src/main/java/org/hibernate/context/ThreadLocalSessionContext.java M hibernate-core/src/main/java/org/hibernate/dialect/DerbyDialect.java M hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java M hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java M hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java M hibernate-core/src/main/java/org/hibernate/dialect/Oracle9Dialect.java M hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java M hibernate-core/src/main/java/org/hibernate/dialect/RDMSOS2200Dialect.java M hibernate-core/src/main/java/org/hibernate/dialect/function/TemplateRenderer.java M hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java M hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java M hibernate-core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java M hibernate-core/src/main/java/org/hibernate/dialect/resolver/BasicSQLExceptionConverter.java M hibernate-core/src/main/java/org/hibernate/engine/ActionQueue.java M hibernate-core/src/main/java/org/hibernate/engine/Cascade.java M hibernate-core/src/main/java/org/hibernate/engine/CascadingAction.java M hibernate-core/src/main/java/org/hibernate/engine/CollectionEntry.java M hibernate-core/src/main/java/org/hibernate/engine/Collections.java M hibernate-core/src/main/java/org/hibernate/engine/IdentifierValue.java M hibernate-core/src/main/java/org/hibernate/engine/ParameterBinder.java M hibernate-core/src/main/java/org/hibernate/engine/QueryParameters.java M hibernate-core/src/main/java/org/hibernate/engine/StatefulPersistenceContext.java M hibernate-core/src/main/java/org/hibernate/engine/TwoPhaseLoad.java M hibernate-core/src/main/java/org/hibernate/engine/VersionValue.java M hibernate-core/src/main/java/org/hibernate/engine/Versioning.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/ResultSetWrapperProxy.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/AbstractBatchImpl.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchBuilderImpl.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchingBatch.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/NonBatchingBatch.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcResourceRegistryImpl.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcServicesImpl.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/LobCreatorBuilder.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/LogicalConnectionImpl.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/TypeInfoExtracter.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/AbstractResultSetProxyHandler.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/AbstractStatementProxyHandler.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/ConnectionProxyHandler.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/proxy/PreparedStatementProxyHandler.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SqlExceptionHelper.java M hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/SqlStatementLogger.java M hibernate-core/src/main/java/org/hibernate/engine/loading/CollectionLoadContext.java M hibernate-core/src/main/java/org/hibernate/engine/loading/EntityLoadContext.java M hibernate-core/src/main/java/org/hibernate/engine/loading/LoadContexts.java M hibernate-core/src/main/java/org/hibernate/engine/profile/FetchProfile.java M hibernate-core/src/main/java/org/hibernate/engine/query/HQLQueryPlan.java M hibernate-core/src/main/java/org/hibernate/engine/query/NativeSQLQueryPlan.java M hibernate-core/src/main/java/org/hibernate/engine/query/QueryPlanCache.java M hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/SynchronizationRegistryImpl.java M hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionCoordinatorImpl.java M hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/TransactionFactoryInitiator.java M hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jdbc/JdbcIsolationDelegate.java M hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jdbc/JdbcTransaction.java M hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaIsolationDelegate.java M hibernate-core/src/main/java/org/hibernate/engine/transaction/internal/jta/JtaTransaction.java M hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/AbstractTransactionImpl.java M hibernate-core/src/main/java/org/hibernate/engine/transaction/synchronization/internal/RegisteredSynchronization.java M hibernate-core/src/main/java/org/hibernate/engine/transaction/synchronization/internal/SynchronizationCallbackCoordinatorImpl.java M hibernate-core/src/main/java/org/hibernate/event/def/AbstractFlushingEventListener.java M hibernate-core/src/main/java/org/hibernate/event/def/AbstractLockUpgradeEventListener.java M hibernate-core/src/main/java/org/hibernate/event/def/AbstractReassociateEventListener.java M hibernate-core/src/main/java/org/hibernate/event/def/AbstractSaveEventListener.java M hibernate-core/src/main/java/org/hibernate/event/def/DefaultAutoFlushEventListener.java M hibernate-core/src/main/java/org/hibernate/event/def/DefaultDeleteEventListener.java M hibernate-core/src/main/java/org/hibernate/event/def/DefaultDirtyCheckEventListener.java M hibernate-core/src/main/java/org/hibernate/event/def/DefaultEvictEventListener.java M hibernate-core/src/main/java/org/hibernate/event/def/DefaultFlushEntityEventListener.java M hibernate-core/src/main/java/org/hibernate/event/def/DefaultInitializeCollectionEventListener.java M hibernate-core/src/main/java/org/hibernate/event/def/DefaultLoadEventListener.java M hibernate-core/src/main/java/org/hibernate/event/def/DefaultMergeEventListener.java M hibernate-core/src/main/java/org/hibernate/event/def/DefaultPersistEventListener.java M hibernate-core/src/main/java/org/hibernate/event/def/DefaultRefreshEventListener.java M hibernate-core/src/main/java/org/hibernate/event/def/DefaultReplicateEventListener.java M hibernate-core/src/main/java/org/hibernate/event/def/DefaultSaveOrUpdateEventListener.java M hibernate-core/src/main/java/org/hibernate/event/def/EvictVisitor.java M hibernate-core/src/main/java/org/hibernate/event/def/ReattachVisitor.java M hibernate-core/src/main/java/org/hibernate/event/def/WrapVisitor.java M hibernate-core/src/main/java/org/hibernate/exception/SQLExceptionConverterFactory.java M hibernate-core/src/main/java/org/hibernate/hql/QuerySplitter.java M hibernate-core/src/main/java/org/hibernate/hql/ast/ASTQueryTranslatorFactory.java M hibernate-core/src/main/java/org/hibernate/hql/ast/ErrorCounter.java M hibernate-core/src/main/java/org/hibernate/hql/ast/HqlParser.java M hibernate-core/src/main/java/org/hibernate/hql/ast/HqlSqlWalker.java M hibernate-core/src/main/java/org/hibernate/hql/ast/QueryTranslatorImpl.java M hibernate-core/src/main/java/org/hibernate/hql/ast/SqlGenerator.java M hibernate-core/src/main/java/org/hibernate/hql/ast/exec/AbstractStatementExecutor.java M hibernate-core/src/main/java/org/hibernate/hql/ast/exec/MultiTableDeleteExecutor.java M hibernate-core/src/main/java/org/hibernate/hql/ast/exec/MultiTableUpdateExecutor.java M hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AbstractRestrictableStatement.java M hibernate-core/src/main/java/org/hibernate/hql/ast/tree/AggregateNode.java M hibernate-core/src/main/java/org/hibernate/hql/ast/tree/DeleteStatement.java M hibernate-core/src/main/java/org/hibernate/hql/ast/tree/DotNode.java M hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromClause.java M hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromElement.java M hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromElementFactory.java M hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromElementType.java M hibernate-core/src/main/java/org/hibernate/hql/ast/tree/FromReferenceNode.java M hibernate-core/src/main/java/org/hibernate/hql/ast/tree/IndexNode.java M hibernate-core/src/main/java/org/hibernate/hql/ast/tree/MethodNode.java M hibernate-core/src/main/java/org/hibernate/hql/ast/tree/QueryNode.java M hibernate-core/src/main/java/org/hibernate/hql/ast/tree/UpdateStatement.java M hibernate-core/src/main/java/org/hibernate/hql/ast/util/JoinProcessor.java M hibernate-core/src/main/java/org/hibernate/hql/ast/util/LiteralProcessor.java M hibernate-core/src/main/java/org/hibernate/hql/ast/util/PathHelper.java M hibernate-core/src/main/java/org/hibernate/hql/ast/util/SyntheticAndFactory.java M hibernate-core/src/main/java/org/hibernate/hql/classic/QueryTranslatorImpl.java M hibernate-core/src/main/java/org/hibernate/id/GUIDGenerator.java M hibernate-core/src/main/java/org/hibernate/id/IdentifierGeneratorHelper.java M hibernate-core/src/main/java/org/hibernate/id/IncrementGenerator.java M hibernate-core/src/main/java/org/hibernate/id/MultipleHiLoPerTableGenerator.java M hibernate-core/src/main/java/org/hibernate/id/SequenceGenerator.java M hibernate-core/src/main/java/org/hibernate/id/SequenceIdentityGenerator.java M hibernate-core/src/main/java/org/hibernate/id/TableGenerator.java M hibernate-core/src/main/java/org/hibernate/id/UUIDGenerator.java M hibernate-core/src/main/java/org/hibernate/id/UUIDHexGenerator.java M hibernate-core/src/main/java/org/hibernate/id/enhanced/OptimizerFactory.java M hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStructure.java M hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java M hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java M hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java M hibernate-core/src/main/java/org/hibernate/id/factory/DefaultIdentifierGeneratorFactory.java M hibernate-core/src/main/java/org/hibernate/impl/AbstractScrollableResults.java M hibernate-core/src/main/java/org/hibernate/impl/IteratorImpl.java M hibernate-core/src/main/java/org/hibernate/impl/NonFlushedChangesImpl.java M hibernate-core/src/main/java/org/hibernate/impl/SessionFactoryImpl.java M hibernate-core/src/main/java/org/hibernate/impl/SessionFactoryObjectFactory.java M hibernate-core/src/main/java/org/hibernate/impl/SessionImpl.java M hibernate-core/src/main/java/org/hibernate/impl/StatelessSessionImpl.java A hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java M hibernate-core/src/main/java/org/hibernate/internal/util/ConfigHelper.java M hibernate-core/src/main/java/org/hibernate/internal/util/SerializationHelper.java M hibernate-core/src/main/java/org/hibernate/internal/util/jndi/JndiHelper.java M hibernate-core/src/main/java/org/hibernate/internal/util/xml/DTDEntityResolver.java M hibernate-core/src/main/java/org/hibernate/internal/util/xml/ErrorLogger.java M hibernate-core/src/main/java/org/hibernate/internal/util/xml/MappingReader.java M hibernate-core/src/main/java/org/hibernate/internal/util/xml/XMLHelper.java M hibernate-core/src/main/java/org/hibernate/jdbc/Expectations.java M hibernate-core/src/main/java/org/hibernate/jmx/HibernateService.java M hibernate-core/src/main/java/org/hibernate/jmx/SessionFactoryStub.java M hibernate-core/src/main/java/org/hibernate/jmx/StatisticsService.java M hibernate-core/src/main/java/org/hibernate/loader/Loader.java M hibernate-core/src/main/java/org/hibernate/loader/collection/BasicCollectionLoader.java M hibernate-core/src/main/java/org/hibernate/loader/collection/OneToManyLoader.java M hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLCustomQuery.java M hibernate-core/src/main/java/org/hibernate/loader/custom/sql/SQLQueryReturnProcessor.java M hibernate-core/src/main/java/org/hibernate/loader/entity/CollectionElementLoader.java M hibernate-core/src/main/java/org/hibernate/mapping/RootClass.java M hibernate-core/src/main/java/org/hibernate/metamodel/binding/EntityIdentifier.java M hibernate-core/src/main/java/org/hibernate/metamodel/relational/AbstractSimpleValue.java M hibernate-core/src/main/java/org/hibernate/metamodel/relational/ForeignKey.java M hibernate-core/src/main/java/org/hibernate/metamodel/source/ExtendsQueue.java M hibernate-core/src/main/java/org/hibernate/metamodel/source/Metadata.java M hibernate-core/src/main/java/org/hibernate/metamodel/source/MetadataSourceQueue.java M hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java M hibernate-core/src/main/java/org/hibernate/persister/collection/NamedQueryCollectionInitializer.java M hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java M hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractPropertyMapping.java M hibernate-core/src/main/java/org/hibernate/persister/entity/NamedQueryLoader.java M hibernate-core/src/main/java/org/hibernate/pretty/Printer.java M hibernate-core/src/main/java/org/hibernate/property/BasicPropertyAccessor.java M hibernate-core/src/main/java/org/hibernate/proxy/pojo/javassist/JavassistLazyInitializer.java M hibernate-core/src/main/java/org/hibernate/secure/JACCConfiguration.java M hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java M hibernate-core/src/main/java/org/hibernate/service/internal/BasicServiceRegistryImpl.java M hibernate-core/src/main/java/org/hibernate/service/internal/SessionFactoryServiceRegistryImpl.java M hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/ConnectionProviderInitiator.java M hibernate-core/src/main/java/org/hibernate/service/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java M hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/AbstractDialectResolver.java M hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/DialectResolverSet.java M hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/StandardDialectResolver.java M hibernate-core/src/main/java/org/hibernate/service/jmx/internal/JmxServiceImpl.java M hibernate-core/src/main/java/org/hibernate/service/jndi/internal/JndiServiceImpl.java M hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/JtaPlatformInitiator.java M hibernate-core/src/main/java/org/hibernate/service/jta/platform/internal/WebSphereJtaPlatform.java M hibernate-core/src/main/java/org/hibernate/sql/ordering/antlr/OrderByFragmentParser.java M hibernate-core/src/main/java/org/hibernate/sql/ordering/antlr/OrderByFragmentRenderer.java M hibernate-core/src/main/java/org/hibernate/sql/ordering/antlr/OrderByFragmentTranslator.java M hibernate-core/src/main/java/org/hibernate/stat/internal/ConcurrentStatisticsImpl.java M hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsInitiator.java M hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseExporter.java M hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/DatabaseMetadata.java M hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java M hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaUpdate.java M hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/SchemaValidator.java M hibernate-core/src/main/java/org/hibernate/tool/hbm2ddl/TableMetadata.java M hibernate-core/src/main/java/org/hibernate/transform/DistinctResultTransformer.java M hibernate-core/src/main/java/org/hibernate/tuple/PojoInstantiator.java M hibernate-core/src/main/java/org/hibernate/tuple/entity/AbstractEntityTuplizer.java M hibernate-core/src/main/java/org/hibernate/tuple/entity/Dom4jEntityTuplizer.java M hibernate-core/src/main/java/org/hibernate/tuple/entity/DynamicMapEntityTuplizer.java M hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java M hibernate-core/src/main/java/org/hibernate/tuple/entity/PojoEntityTuplizer.java M hibernate-core/src/main/java/org/hibernate/type/BasicTypeRegistry.java M hibernate-core/src/main/java/org/hibernate/type/DbTimestampType.java M hibernate-core/src/main/java/org/hibernate/type/EnumType.java M hibernate-core/src/main/java/org/hibernate/type/NullableType.java M hibernate-core/src/main/java/org/hibernate/type/TypeFactory.java M hibernate-core/src/main/java/org/hibernate/type/descriptor/JdbcTypeNameMapper.java M hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DataHelper.java M hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/BasicBinder.java M hibernate-core/src/main/java/org/hibernate/type/descriptor/sql/BasicExtractor.java M hibernate-core/src/test/java/org/hibernate/test/annotations/backquotes/BackquoteTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/id/EnumIdTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/id/JoinColumnOverrideTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/EnumIdTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/JoinColumnOverrideTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/immutable/ImmutableTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/NamingStrategyTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/NaturalIdOnSingleManyToOneTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/NullablePrimaryKeyTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/LogListener.java M hibernate-core/src/test/java/org/hibernate/test/annotations/reflection/OtherLogListener.java M hibernate-core/src/test/java/org/hibernate/test/dialect/functional/cache/SQLFunctionsInterSystemsTest.java M hibernate-core/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java M hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java M hibernate-core/src/test/java/org/hibernate/test/jpa/cascade/CascadeTest.java M hibernate-core/src/test/java/org/hibernate/test/legacy/FooBarTest.java M hibernate-core/src/test/java/org/hibernate/test/legacy/SQLFunctionsTest.java M hibernate-core/src/test/java/org/hibernate/test/stateless/fetching/StatelessSessionFetchingTest.java M hibernate-core/src/test/java/org/hibernate/test/typeparameters/DefaultValueIntegerType.java M hibernate-core/src/test/java/org/hibernate/testing/tm/SimpleJtaTransactionImpl.java R hibernate-ehcache/src/main/java/org/hibernate/cache/AbstractEhCacheRegionFactory.java R hibernate-ehcache/src/main/java/org/hibernate/cache/EhCache.java R hibernate-ehcache/src/main/java/org/hibernate/cache/EhCacheLogger.java R hibernate-ehcache/src/main/java/org/hibernate/cache/EhCacheProvider.java R hibernate-ehcache/src/main/java/org/hibernate/cache/EhCacheRegionFactory.java R hibernate-ehcache/src/main/java/org/hibernate/cache/SingletonEhCacheProvider.java R hibernate-ehcache/src/main/java/org/hibernate/cache/SingletonEhCacheRegionFactory.java A hibernate-ehcache/src/main/java/org/hibernate/cache/internal/AbstractEhCacheRegionFactory.java A hibernate-ehcache/src/main/java/org/hibernate/cache/internal/EhCache.java A hibernate-ehcache/src/main/java/org/hibernate/cache/internal/EhCacheMessageLogger.java A hibernate-ehcache/src/main/java/org/hibernate/cache/internal/EhCacheProvider.java A hibernate-ehcache/src/main/java/org/hibernate/cache/internal/EhCacheRegionFactory.java A hibernate-ehcache/src/main/java/org/hibernate/cache/internal/SingletonEhCacheProvider.java A hibernate-ehcache/src/main/java/org/hibernate/cache/internal/SingletonEhCacheRegionFactory.java M hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheTest.java M hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractEntityManagerImpl.java M hibernate-entitymanager/src/main/java/org/hibernate/ejb/AbstractQueryImpl.java M hibernate-entitymanager/src/main/java/org/hibernate/ejb/Ejb3Configuration.java M hibernate-entitymanager/src/main/java/org/hibernate/ejb/EntityManagerImpl.java R hibernate-entitymanager/src/main/java/org/hibernate/ejb/EntityManagerLogger.java M hibernate-entitymanager/src/main/java/org/hibernate/ejb/QueryImpl.java M hibernate-entitymanager/src/main/java/org/hibernate/ejb/connection/InjectedDataSourceConnectionProvider.java M hibernate-entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryCompiler.java M hibernate-entitymanager/src/main/java/org/hibernate/ejb/event/CallbackResolver.java A hibernate-entitymanager/src/main/java/org/hibernate/ejb/internal/EntityManagerMessageLogger.java M hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/AttributeFactory.java M hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/MetadataContext.java M hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/AbstractJarVisitor.java M hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java M hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java M hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/InputStreamZippedJarVisitor.java M hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/JarVisitorFactory.java M hibernate-entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceXmlLoader.java M hibernate-entitymanager/src/main/java/org/hibernate/ejb/util/NamingHelper.java M hibernate-entitymanager/src/main/java/org/hibernate/engine/EJB3CascadingAction.java M hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/BaseEntityManagerFunctionalTestCase.java M hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/Cat.java M hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/emops/RemoveTest.java M hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/exception/ExceptionTest.java M hibernate-entitymanager/src/test/java/org/hibernate/ejb/test/lock/LockTest.java R hibernate-envers/src/main/java/org/hibernate/envers/EnversLogger.java M hibernate-envers/src/main/java/org/hibernate/envers/configuration/ClassesAuditingData.java M hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/AuditMetadataGenerator.java M hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/CollectionMetadataGenerator.java M hibernate-envers/src/main/java/org/hibernate/envers/event/EnversIntegrator.java A hibernate-envers/src/main/java/org/hibernate/envers/internal/EnversMessageLogger.java M hibernate-envers/src/main/java/org/hibernate/envers/reader/FirstLevelCache.java M hibernate-envers/src/main/java/org/hibernate/envers/strategy/ValidTimeAuditStrategy.java M hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/DefaultValueComponents.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractGeneralDataRegionTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/AbstractNonFunctionalTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/AbstractCollectionRegionAccessStrategyTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractEntityRegionAccessStrategyTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractTransactionalAccessTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/CacheAccessListener.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/IsolatedClassLoaderTest.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/classloader/SelectedClassnameClassLoader.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/cluster/SessionRefreshTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/query/QueryRegionImplTestCase.java M hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/util/CacheTestSupport.java M hibernate-proxool/src/main/java/org/hibernate/service/jdbc/connections/internal/ProxoolConnectionProvider.java R hibernate-proxool/src/main/java/org/hibernate/service/jdbc/connections/internal/ProxoolLogger.java A hibernate-proxool/src/main/java/org/hibernate/service/jdbc/connections/internal/ProxoolMessageLogger.java M hibernate-testing/src/main/java/org/hibernate/testing/SkipLog.java R hibernate-testing/src/main/java/org/hibernate/testing/TestLogger.java M hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseUnitTestCase.java M hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomRunner.java M hibernate-testing/src/main/java/org/hibernate/testing/junit4/FailureExpectedHandler.java Log Message: ----------- HHH-6098 - Slight naming changes in regards to new logging classes

13 years, 8 months

1
0
0 / 0

Hibernate SVN: r20932 - search/branches/Branch_3_0_1_GA_CP.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2011-04-08 05:21:04 -0400 (Fri, 08 Apr 2011) New Revision: 20932 Removed: search/branches/Branch_3_0_1_GA_CP/common-build.xml Modified: search/branches/Branch_3_0_1_GA_CP/build.xml Log: JBPAPP-6278 update build scripts of hem and hsearch Modified: search/branches/Branch_3_0_1_GA_CP/build.xml =================================================================== --- search/branches/Branch_3_0_1_GA_CP/build.xml 2011-04-08 07:43:09 UTC (rev 20931) +++ search/branches/Branch_3_0_1_GA_CP/build.xml 2011-04-08 09:21:04 UTC (rev 20932) @@ -6,11 +6,10 @@ --> -<project name="Hibernate Search" default="dist" basedir="." - xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> +<project name="Hibernate Search" default="jar" basedir="."> -  +  <property file="build.properties"/> <property file="${user.home}/.ant.properties"/> @@ -19,98 +18,115 @@ <property name="name" value="hibernate-search"/> <property name="version" value="3.0.1.GA.CP01"/> <property name="javadoc.packagenames" value="org.hibernate.search.*"/> + <property name="jdbc.dir" value="jdbc"/> <property name="copy.test" value="true"/> + <property name="src.dir" location="src/java"/> + <property name="test.dir" location="src/test"/> + <property name="lib.dir" location="lib"/> + <property name="build.dir" location="build"/> + <property name="classes.dir" location="${build.dir}/classes"/> + <property name="testclasses.dir" location="${build.dir}/testclasses"/> + <property name="doc.dir" location="doc"/> + <property name="doc.api.dir" location="${doc.dir}/api"/> + <property name="dist.doc.dir" location="${build.dir}/doc"/> + <property name="dist.api.dir" location="${dist.doc.dir}/api"/> + <property name="jar.name" value="${name}"/> + <property name="jar.file.name" value="${build.dir}/${jar.name}.jar"/> + <property name="jartest.file.name" value="${build.dir}/${jar.name}-tests.jar"/> + <property name="javadoc" value="http://java.sun.com/j2se/1.5.0/docs/api"/> + <property name="javac.debug" value="on"/> + <property name="javac.optimize" value="off"/> <property name="javac.source" value="1.5"/> <property name="javac.target" value="1.5"/> - <property name="jdbc.dir" value="jdbc"/> - <property name="common.dir" value="${basedir}"/> - <property name="ivy.dep.dir" value="${basedir}/build/lib" /> -  - <property name="ivy.jar.dir" value="${basedir}/ivy" /> - <property name="ivy.conf.dir" value="${basedir}" /> - <path id="ivy.lib.path"> - <fileset dir="${ivy.jar.dir}" includes="*.jar"/> - </path> - <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml" - uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path"/> + <property name="build.testresources.dir" value="${build.dir}/testresources"/> + <property name="testresources.dir" value="${basedir}/src/test-resources"/> - <import file="${common.dir}/common-build.xml"/> + <property name="hibernate-core.home" location="../core"/> + <property name="hibernate-core.jar" location="${hibernate-core.home}/build/hibernate3.jar"/> + <property name="hibernate-core.lib.dir" location="${hibernate-core.home}/lib"/> + <property name="resources.dir" value="src/resources"/> + <property name="build.temp.dir" value="${build.dir}/temp"/> - - <property name="build.testresources.dir" value="${build.dir}/testresources"/> - <property name="testresources.dir" value="${basedir}/src/test-resources"/> - -  - <path id="junit.classpath"> - <fileset dir="${lib.dir}"> - <include name="*.jar"/> - </fileset> - <pathelement path="${classes.dir}"/> - <pathelement path="${testclasses.dir}"/> - <path refid="junit.moduleclasspath"/> - <path refid="lib.class.path"/> - </path> -  - <path id="lib.class.path"> - <path location="${hibernate-core.jar}"></path> - <fileset dir="${hibernate-core.lib.dir}"> - <include name="*.jar"/> - <exclude name="xml-apis.jar"/> - <exclude name="xerces*.jar"/> - </fileset> - <fileset dir="${lib.dir}"> - <include name="*.jar"/> - </fileset> - <path refid="lib.moduleclass.path"/> - </path> - - - <path id="lib.moduleclass.path"> - <fileset dir="${ivy.dep.dir}/core"> +  + <path id="junit.classpath"> + <fileset dir="${lib.dir}"> <include name="*.jar"/> </fileset> - </path> + <pathelement path="${classes.dir}"/> + <pathelement path="${testclasses.dir}"/> + <path refid="junit.moduleclasspath"/> + <path refid="lib.class.path"/> + </path> +  + <path id="lib.class.path"> + <path location="${hibernate-core.jar}"></path> + <fileset dir="${hibernate-core.lib.dir}"> + <include name="*.jar"/> + <exclude name="xml-apis.jar"/> + <exclude name="xerces*.jar"/> + <exclude name="ant-*.jar"/> + </fileset> + <fileset dir="${lib.dir}"> + <include name="*.jar"/> + </fileset> + </path> <path id="junit.moduleclasspath"> -  - <fileset dir="${lib.dir}/test"> +  + <fileset dir="${lib.dir}/test"> <include name="*.jar"/> <include name="*.zip"/> </fileset> - <pathelement location="${src.dir}"/> + <pathelement location="${src.dir}"/> <pathelement location="${test.dir}"/> - <fileset dir="${ivy.dep.dir}/test"> + <fileset dir="${jdbc.dir}"> <include name="*.jar"/> - </fileset> - <fileset dir="${jdbc.dir}"> - <include name="*.jar"/> <include name="*.zip"/> </fileset> </path> + <patternset id="support.files"> + <include name="**/*.jpg"/> + <include name="**/*.gif"/> + <include name="**/*.dtd"/> + <include name="**/*.xsd"/> + <include name="**/*.xml"/> + <include name="**/*.xslt"/> - <target name="init"> - <antcall target="common-build.init"/> - <tstamp> - <format property="now" pattern="yyyyMMddhhmmss"/> - </tstamp> - <mkdir dir="${ivy.dep.dir}/core"/> - <mkdir dir="${ivy.dep.dir}/test"/> - <ivy:configure file="${ivy.jar.dir}/ivyconf.xml" /> - <mkdir dir="${lib.dir}/test"/> - <mkdir dir="${build.testresources.dir}"/> - </target> +  + <exclude name="${build.dir}/**/*"/> + <exclude name="${doc.dir}/**/*"/> + <exclude name="classes/**/*"/> + <exclude name="build.xml"/> + <exclude name="**/*.properties"/> + <exclude name="**/*.ccf"/> + <exclude name="**/*.cfg.xml"/> + <exclude name="**/ehcache.xml"/> + </patternset> + <target name="init"> + <tstamp> + <format property="subversion" pattern="yyyy-MM-dd hh:mm:ss"/> + </tstamp> + <echo message="Build ${Name}-${version} (${subversion})"/> + <mkdir dir="${classes.dir}"/> + <mkdir dir="${testclasses.dir}"/> + <mkdir dir="${build.testresources.dir}"/> + <copy todir="${classes.dir}"> + <fileset dir="${src.dir}"> + <patternset refid="support.files"/> + </fileset> + </copy> - <target name="get.deps.core" depends="init" description="retrieve the core dependencies"> - <ivy:resolve conf="core" /> - <ivy:retrieve pattern="${ivy.dep.dir}/core/[artifact].[ext]" conf="core" /> - </target> + <copy todir="${build.dir}"> + <fileset dir="."> + <include name="readme.txt"/> + <include name="lgpl.txt"/> + </fileset> + </copy> + <available file="${hibernate-core.jar}" type="file" property="hibernate-core.jar.available"/> + <fail unless="hibernate-core.jar.available" message="Cannot locate hibernate-core.jar: ${hibernate-core.jar}"/> + </target> - <target name="compile" depends="init,get.deps.core" description="Compile the Java source code"> - <available - classname="org.eclipse.core.launcher.Main" - property="build.compiler" - value="org.eclipse.jdt.core.JDTCompilerAdapter" - classpath="${java.class.path}"/> + <target name="compile" depends="init" description="Compile the Java source code"> <javac srcdir="${src.dir}" destdir="${classes.dir}" @@ -118,8 +134,8 @@ debug="${javac.debug}" optimize="${javac.optimize}" nowarn="on" - source="${javac.source}" - target="${javac.target}"> + source="${javac.source}" + target="${javac.target}"> <src path="${src.dir}"/> </javac> <copy todir="${classes.dir}"> @@ -129,165 +145,138 @@ </fileset> </copy> </target> - - <target name="get.deps.test" depends="init" description="retrieve the test dependencies"> - <ivy:resolve conf="test" /> - <ivy:retrieve pattern="${ivy.dep.dir}/test/[artifact].[ext]" conf="test" /> - </target> - - <target name="compiletest" depends="init,get.deps.test,compile" description="Compile the tests"> - <available - classname="org.eclipse.core.launcher.Main" - property="build.compiler" - value="org.eclipse.jdt.core.JDTCompilerAdapter" - classpath="${java.class.path}"/> + <target name="compiletest" depends="init,compile" description="Compile the tests"> <javac + srcdir="${test.dir}" destdir="${testclasses.dir}" classpathref="junit.classpath" debug="${javac.debug}" optimize="${javac.optimize}" nowarn="on" - source="${javac.source}" - target="${javac.target}"> - <src refid="testsrc.path"/> + source="${javac.source}" + target="${javac.target}"> + <classpath> + <path refid="lib.class.path"/> + <pathelement path="${classes.dir}"/> + </classpath> </javac> </target> - <target name="prepare-test-resources" depends="compiletest"> - <copy todir="${build.testresources.dir}"> - <fileset dir="${testresources.dir}"> - <include name="**/*.*"/> - </fileset> - </copy> - <mkdir dir="${build.testresources.dir}/jars"/> - <jar filesetmanifest="merge" jarfile="${build.testresources.dir}/jars/jms-slave.jar" > - <fileset dir="${testclasses.dir}"> - <include name="org/hibernate/search/test/jms/slave/**.*"/> - </fileset> - </jar> - <jar filesetmanifest="merge" jarfile="${build.testresources.dir}/jars/jms-master.jar" > - <fileset dir="${testclasses.dir}"> - <include name="org/hibernate/search/test/jms/master/**.*"/> - </fileset> - </jar> - </target> + <target name="prepare-test-resources" depends="compiletest"> + <copy todir="${build.testresources.dir}"> + <fileset dir="${testresources.dir}"> + <include name="**/*.*"/> + </fileset> + </copy> + <mkdir dir="${build.testresources.dir}/jars"/> + <jar filesetmanifest="merge" jarfile="${build.testresources.dir}/jars/jms-slave.jar"> + <fileset dir="${testclasses.dir}"> + <include name="org/hibernate/search/test/jms/slave/**.*"/> + </fileset> + </jar> + <jar filesetmanifest="merge" jarfile="${build.testresources.dir}/jars/jms-master.jar"> + <fileset dir="${testclasses.dir}"> + <include name="org/hibernate/search/test/jms/master/**.*"/> + </fileset> + </jar> + </target> + <target name="junitreport" depends="junit"> + <taskdef name="junitreport" classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator"> + <classpath> + <fileset dir="${hibernate-core.lib.dir}"> + <include name="junit-*.jar"/> + <include name="ant-junit-*.jar"/> + </fileset> + </classpath> + </taskdef> + <junitreport todir="${build.dir}/test_output"> + <fileset dir="${build.dir}/test_output"> + <include name="TEST-*.xml"/> + </fileset> + <report format="frames" todir="${build.dir}/test_output"/> + </junitreport> + </target> + <target name="junit" depends="compiletest, prepare-test-resources"> + <mkdir dir="${build.dir}/test_output"/> + <junit forkmode="once" printsummary="yes" haltonfailure="yes"> + <classpath> + <fileset dir="${jdbc.dir}"> + <include name="**/*.jar"/> + <include name="**/*.zip"/> + </fileset> + <path path="${build.testresources.dir}"/> + <path refid="junit.classpath"/> + <path refid="lib.class.path"/> + <pathelement path="${classes.dir}"/> + <dirset dir="${testclasses.dir}"> + <exclude name="**/pack/**.*"/> + </dirset> + <pathelement path="${src.dir}"/> + <pathelement path="${test.dir}"/> + </classpath> + <formatter type="plain"/> + <formatter type="xml"/> + <batchtest fork="yes" todir="${build.dir}/test_output" haltonfailure="no"> + <fileset dir="${testclasses.dir}"> + <include name="**/*Test.class"/> + </fileset> + </batchtest> + </junit> + </target> - <target name="junit" depends="compiletest, prepare-test-resources"> - <mkdir dir="test_output"/> - <junit forkmode="once" printsummary="yes" haltonfailure="yes"> - <classpath> - <path path="${build.testresources.dir}"/> - <path refid="junit.classpath"/> - - <fileset dir="${jdbc.dir}"> - <include name="**/*.jar"/> - <include name="**/*.zip"/> - </fileset> - </classpath> - <formatter type="plain"/> - <formatter type="xml"/> - <batchtest fork="yes" todir="test_output" haltonfailure="no"> - <fileset refid="junit.batchtestset"/> - </batchtest> - </junit> - </target> -  <target name="junitsingle" depends="compiletest" description="Run a single test suite (requires testname and jdbc.driver properties)"> - <mkdir dir="test_output"/> + <mkdir dir="${build.dir}/test_output"/> <junit printsummary="yes" fork="yes" haltonfailure="yes"> <classpath> - <path path="${build.testresources.dir}"/> - <path refid="junit.classpath"/> + <path path="${build.testresources.dir}"/> + <path refid="junit.classpath"/> - <fileset dir="${jdbc.dir}"> - <include name="**/*.jar"/> - <include name="**/*.zip"/> - </fileset> - </classpath> - <formatter type="plain"/> + <fileset dir="${jdbc.dir}"> + <include name="**/*.jar"/> + <include name="**/*.zip"/> + </fileset> + </classpath> + <formatter type="plain"/> <formatter type="xml"/> - <test fork="yes" todir="test_output" haltonfailure="no" name="${testname}"/> + <test fork="yes" todir="${build.dir}/test_output" haltonfailure="no" name="${testname}"/> </junit> </target> + <target name="clean" description="Cleans up build and dist directories"> + <delete dir="${build.dir}"/> + <delete dir="${dist.target.dir}"/> + </target> <target name="jar" depends="compile" description="Build the distribution .jar file"> <mkdir dir="${classes.dir}/META-INF"/> <manifest file="${classes.dir}/META-INF/MANIFEST.MF"> <attribute name="Implementation-Title" value="${Name}"/> <attribute name="Implementation-Version" value="${version}"/> - <attribute name="Implementation-Vendor" value="hibernate.org"/> - <attribute name="Implementation-Vendor-Id" value="hibernate.org"/> - <attribute name="Implementation-URL" value="http://search.hibernate.org"/> + <attribute name="Implementation-Vendor" value="hibernate.org"/> + <attribute name="Implementation-Vendor-Id" value="hibernate.org"/> + <attribute name="Implementation-URL" value="http://search.hibernate.org"/> </manifest> - <antcall target="common-build.jar"/> - <ivy:resolve conf="core"/> - <ivy:publish artifactspattern="${dist.dir}/[artifact].[ext]" - resolver="local" - pubrevision="${version}" - pubdate="${now}" - status="integration" - /> - </target> - -  - <target name="dist" depends="get.deps.core,get.deps.test,jar,jar,javadoc,copysource,copytest,copylib,extras" - description="Build everything"> - - <ant inheritall="false" dir="${basedir}/doc/reference"/> - <copy todir="${dist.dir}/doc/reference" failonerror="false"> - <fileset dir="${basedir}/doc/reference/build"> - <include name="**/*.*"/> - </fileset> - </copy> - - <copy todir="${dist.dir}" failonerror="false"> - <fileset dir="${common.dir}"> - <include name="common-build.xml"/> - </fileset> - </copy> - - <copy todir="${dist.dir}/test-resources" failonerror="false"> - <fileset dir="${testresources.dir}"> - <include name="**/*.*"/> - </fileset> - </copy> - <copy todir="${dist.dir}/ivy" failonerror="false"> - <fileset dir="${ivy.jar.dir}"> - <include name="**/*.*"/> - </fileset> - </copy> - -  - <copy todir="${dist.lib.dir}" failonerror="false"> -  - <fileset dir="${ivy.dep.dir}/core"> - <include name="*.jar"/> - </fileset> - </copy> - <mkdir dir="${dist.lib.dir}/test"/> - <copy todir="${dist.lib.dir}/test" failonerror="false"> - <fileset dir="${ivy.dep.dir}/test"> - <include name="*.jar"/> - </fileset> - </copy> - <copy todir="${dist.lib.dir}/test" failonerror="false"> - <fileset file="${lib.dir}/test/*.jar"/> - </copy> - - <copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false"> - </copy> - <antcall target="common-build.dist"/> + <mkdir dir="${build.dir}"/> + <jar filesetmanifest="merge" jarfile="${jar.file.name}" basedir="${classes.dir}"/> </target> - - <target name="zip-dist" description="zip the dist"> - <zip zipfile="${dist.dir}-${version}.zip"> - <zipfileset prefix="${name}-${version}" dir="${dist.dir}"/> - </zip> - <tar compression="gzip" tarfile="${dist.dir}-${version}.tar.gz"> - <tarfileset prefix="${name}-${version}" dir="${dist.dir}"/> - </tar> + <target name="javadoc" description="Compile the Javadoc API documentation to dist dir"> + <mkdir dir="${dist.api.dir}"/> + <javadoc + packagenames="${javadoc.packagenames}" + classpathref="lib.class.path" + destdir="${dist.api.dir}" + use="true" + protected="true" + version="true" + windowtitle="${Name} API Documentation" + Overview="${doc.api.dir}/package.html" + doctitle="${Name} API Documentation" + stylesheetfile="${doc.api.dir}/jdstyle.css" + link="${javadoc}"> + <packageset dir="${src.dir}" defaultexcludes="yes"> + <include name="**/*"/> + </packageset> + </javadoc> </target> </project> Deleted: search/branches/Branch_3_0_1_GA_CP/common-build.xml =================================================================== --- search/branches/Branch_3_0_1_GA_CP/common-build.xml 2011-04-08 07:43:09 UTC (rev 20931) +++ search/branches/Branch_3_0_1_GA_CP/common-build.xml 2011-04-08 09:21:04 UTC (rev 20932) @@ -1,383 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="common-build" default="dist"> - <description>Common properties and targets for the HibernateExt project</description> - -  - <dirname property="common-build.basedir" file="${ant.file.common-build}"/> - -  - <property file="${common-build.basedir}/build.properties"/> - <property file="${user.home}/.ant.properties"/> - - <property name="src.dir" location="src/java"/> - <property name="test.dir" location="src/test"/> - <property name="lib.dir" location="lib"/> - <property name="build.dir" location="build"/> - <property name="classes.dir" location="${build.dir}/classes"/> - <property name="testclasses.dir" location="${build.dir}/testclasses"/> - <property name="dist.target.dir" location="target"/> - <property name="dist.dir" location="${dist.target.dir}/${name}"/> - <property name="instrumenttest.out.dir" value="instrumenttestout"/> - <property name="doc.dir" location="doc"/> - <property name="doc.api.dir" location="${doc.dir}/api"/> - <property name="doc.reference.dir" location="${doc.dir}/reference"/> - - <property name="dist.doc.dir" location="${dist.dir}/doc"/> - <property name="dist.api.dir" location="${dist.dir}/doc/api"/> - - <property name="dist.src.dir" location="${dist.dir}/src"/> - <property name="dist.test.dir" location="${dist.dir}/test"/> - <property name="dist.lib.dir" location="${dist.dir}/lib"/> - <property name="jar.name" value="${name}"/> - <property name="jar.file.name" value="${dist.dir}/${jar.name}.jar"/> - <property name="jartest.file.name" value="${dist.dir}/${jar.name}-tests.jar"/> - - <property name="javadoc" value="http://java.sun.com/j2se/1.5.0/docs/api"/> - <property name="javac.debug" value="on"/> - <property name="javac.optimize" value="off"/> - <property name="javac.source" value="1.5"/> - <property name="javac.target" value="1.5"/> - - -  - <property name="hibernate-core.home" location="${common-build.basedir}/../hibernate-3.2"/> - <property name="hibernate-core.jar" location="${hibernate-core.home}/hibernate3.jar"/> - <property name="hibernate-core.lib.dir" location="${hibernate-core.home}/lib"/> - <property name="hibernate-core.jdbc.dir" location="${hibernate-core.home}/lib"/>  - <property name="hibernate-core.doc.api" location="${hibernate-core.home}/doc/api"/> - <property name="hibernate-cvs.doc.reference" location="${common-build.basedir}/../core/doc/reference"/> - - <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"> - <classpath> - <fileset dir="${hibernate-core.lib.dir}"> - <include name="junit-*.jar"/> - <include name="ant-junit-*.jar"/> - </fileset> - </classpath> - </taskdef> - - <taskdef name="junitreport" classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator"> - <classpath> - <fileset dir="${hibernate-core.lib.dir}"> - <include name="junit-*.jar"/> - <include name="ant-junit-*.jar"/> - </fileset> - </classpath> - </taskdef> - - <path id="lib.class.path"> - <path location="${hibernate-core.jar}"></path> - <fileset dir="${hibernate-core.lib.dir}"> - <include name="*.jar"/> - </fileset> - <fileset dir="${lib.dir}"> - <include name="*.jar"/> - </fileset> - <path refid="lib.moduleclass.path"/> - </path> - -  - <path id="lib.moduleclass.path"/> - - <patternset id="support.files"> - <include name="**/*.jpg"/> - <include name="**/*.gif"/> - <include name="**/*.dtd"/> - <include name="**/*.xsd"/> - <include name="**/*.xml"/> - <include name="**/*.xslt"/> - -  - <exclude name="${build.dir}/**/*"/> - <exclude name="${doc.dir}/**/*"/> - <exclude name="classes/**/*"/> - <exclude name="build.xml"/> - <exclude name="**/*.properties"/> - <exclude name="**/*.ccf"/> - <exclude name="**/*.cfg.xml"/> - <exclude name="**/ehcache.xml"/> - </patternset> - - <patternset id="source.files"> - <include name="**/*.java"/> - <include name="**/*.properties"/> - </patternset> - -  - <fileset dir="${testclasses.dir}" id="junit.batchtestset"> - <include name="**/*Test.class"/> - </fileset> - - <path id="testsrc.path"> - <pathelement location="${test.dir}"/> - </path> - - <path id="junit.classpath"> - <fileset dir="${lib.dir}"> - <include name="*.jar"/> - </fileset> - <pathelement path="${classes.dir}"/> - <pathelement path="${testclasses.dir}"/> - <path refid="lib.class.path"/> - <path refid="junit.moduleclasspath"/> - </path> - -  - - <target name="clean" description="Cleans up build and dist directories"> - <delete dir="${build.dir}"/> - <delete dir="${dist.target.dir}"/> - </target> - - <target name="init" description="Initialize the build"> - <tstamp> - <format property="subversion" pattern="yyyy-MM-dd hh:mm:ss"/> - </tstamp> - <echo message="Build ${Name}-${version} (${subversion})"/> - <mkdir dir="${classes.dir}"/> - <mkdir dir="${testclasses.dir}"/> - <copy todir="${classes.dir}"> - <fileset dir="${src.dir}"> - <patternset refid="support.files"/> - </fileset> - </copy> - - <copy todir="${build.dir}"> - <fileset dir="."> - <include name="readme.txt"/> - <include name="lgpl.txt"/> - </fileset> - </copy> - - <available file="${hibernate-core.jar}" type="file" property="hibernate-core.jar.available"/> - <fail unless="hibernate-core.jar.available" message="Cannot locate hibernate-core.jar: ${hibernate-core.jar}"/> - </target> - - <target name="compile" depends="init" description="Compile the Java source code"> - <available - classname="org.eclipse.core.launcher.Main" - property="build.compiler" - value="org.eclipse.jdt.core.JDTCompilerAdapter" - classpath="${java.class.path}"/> - <javac - target="${javac.target}" - source="${javac.source}" - srcdir="${src.dir}" - destdir="${classes.dir}" - classpathref="lib.class.path" - debug="${javac.debug}" - optimize="${javac.optimize}" - nowarn="on"> - </javac> - </target> - - <target name="compiletest" depends="compile" description="Compile the tests"> - <available - classname="org.eclipse.core.launcher.Main" - property="build.compiler" - value="org.eclipse.jdt.core.JDTCompilerAdapter" - classpath="${java.class.path}"/> - <javac - target="${javac.target}" - source="${javac.source}" - destdir="${testclasses.dir}" - classpathref="junit.classpath" - debug="${javac.debug}" - optimize="${javac.optimize}" - nowarn="on"> - <src refid="testsrc.path"/> - </javac> - </target> - - <target name="instrument" depends="compiletest" - description="Instrument the persistent classes">  - - <taskdef name="instrument" classname="org.hibernate.tool.instrument.InstrumentTask"> - <classpath path="${classes.dir}"/> - <classpath path="${testclasses.dir}"/> - <classpath refid="lib.class.path"/> - </taskdef> - - <instrument verbose="true"> - <fileset dir="${testclasses.dir}/org/hibernate/test"> - <include name="**/*.class"/> - <exclude name="**/*Test$*.class"/> - <exclude name="**/*Test.class"/> - <exclude name="**/*Tests.class"/> - </fileset> - </instrument> - </target> - - <target name="copytest" description="Copy tests to dist dir" if="copy.test" > - <mkdir dir="${dist.test.dir}"/> - <copy todir="${dist.test.dir}"> - <fileset dir="${test.dir}"/> - </copy> - </target> - - <target name="copysource" depends="copytest" description="Copy sources to dist dir"> - <mkdir dir="${dist.src.dir}"/> - <copy todir="${dist.src.dir}"> - <fileset dir="${src.dir}"> - <patternset refid="source.files"/> - </fileset> - <fileset dir="${src.dir}"> - <patternset refid="support.files"/> - </fileset> - </copy> - <mkdir dir="${dist.src.dir}"/> - <copy todir="${dist.src.dir}"> - <fileset dir="${src.dir}"> - <patternset refid="source.files"/> - </fileset> - <fileset dir="${src.dir}"> - <patternset refid="support.files"/> - </fileset> - </copy> - </target> - - <target name="copylib" description="Copy jars to lib dir"> - <mkdir dir="${dist.lib.dir}"/> - <copy todir="${dist.lib.dir}"> - <fileset dir="${lib.dir}"> - <include name="*.jar"/> - <exclude name="log4j.jar"/> - <include name="*.txt"/> - </fileset> - </copy> - </target> - - <target name="copydoc" description="Copy doc to dist dir" if="copy.doc"> - <mkdir dir="${dist.doc.dir}"/> - <copy todir="${dist.doc.dir}"> - <fileset dir="${doc.dir}"> - <include name="**/*.html"/> - </fileset> - </copy> - </target> - - <target name="jar" depends="compile" description="Build the distribution .jar file"> - <mkdir dir="${dist.dir}"/> - <jar filesetmanifest="merge" jarfile="${jar.file.name}" basedir="${classes.dir}"/> - </target> - - <target name="jartest" depends="compiletest" description="Build the distribution .jar file"> - <mkdir dir="${dist.dir}"/> - <jar filesetmanifest="merge" jarfile="${jartest.file.name}" basedir="${testclasses.dir}"/> - </target> - -  - - <target name="javadoc" description="Compile the Javadoc API documentation to dist dir"> - <mkdir dir="${dist.api.dir}"/> - <javadoc - packagenames="${javadoc.packagenames}" - classpathref="lib.class.path" - destdir="${dist.api.dir}" - use="true" - protected="true" - version="true" - windowtitle="${Name} API Documentation" - Overview="${doc.api.dir}/package.html" - doctitle="${Name} API Documentation" - stylesheetfile="${hibernate-core.doc.api}/jdstyle.css" - link="${javadoc}"> - <packageset dir="${src.dir}" defaultexcludes="yes" > - <include name="**/*" /> - </packageset> - </javadoc> - - - </target> - - - <target name="extras" description="Copies miscellaneous files to root dir"> - <copy todir="${dist.dir}/bin" failonerror="false"> - <fileset dir="bin"> - <include name="*.bat"/> - </fileset> - </copy> - <copy file="readme.txt" todir="${dist.dir}"/> - <copy file="lgpl.txt" todir="${dist.dir}"/> - <copy file="changelog.txt" todir="${dist.dir}"/> - <copy file="build.xml" todir="${dist.dir}"/> - <replace file="${dist.dir}/build.xml"> - <replacetoken><![CDATA[../${name}-${version}]]></replacetoken> - <replacevalue><![CDATA[../${name}]]></replacevalue> - </replace> - </target> - - <target name="dist" depends="jar,javadoc,copysource,copylib,copydoc,extras" description="Build everything"> - <zip zipfile = "${dist.dir}-${version}.zip"> - <zipfileset prefix="${name}-${version}" dir="${dist.dir}"/> - </zip> - <tar compression="gzip" tarfile="${dist.dir}-${version}.tar.gz"> - <tarfileset prefix="${name}-${version}" dir="${dist.dir}"/> - </tar> - </target> - - <target name="info" description="Echoes useful system properties"> - <echo message="java.vm.info=${java.vm.info}"/> - <echo message="java.vm.name=${java.vm.name}"/> - <echo message="java.vm.vendor=${java.vm.vendor}"/> - <echo message="java.vm.version=${java.vm.version}"/> - <echo message="os.arch=${os.arch}"/> - <echo message="os.name=${os.name}"/> - <echo message="os.version=${os.version}"/> - <echo message="java.home = ${java.home}"/> - <echo message="java.class.path = ${java.class.path}"/> - <echo message="build.compiler = ${build.compiler}"/> - <echo message="file.encoding=${file.encoding}"/> - <echo message="user.home = ${user.home}"/> - <echo message="user.language=${user.language}"/> - </target> - - <target name="junit" depends="compiletest"> - <mkdir dir="test_output"/> - <junit printsummary="yes" haltonfailure="yes" forkmode="once"> - <classpath refid="junit.classpath"/> - <formatter type="plain"/> - <formatter type="xml"/> - <batchtest fork="yes" todir="test_output" haltonfailure="no"> - <fileset refid="junit.batchtestset"/> - </batchtest> - </junit> - </target> - -  - <target name="junitsingle" depends="compiletest" description="Run a single test suite (requires testname and jdbc.driver properties)"> - <mkdir dir="test_output"/> - <junit printsummary="yes" fork="yes" haltonfailure="yes"> - <classpath refid="junit.classpath"/> - <formatter type="plain"/> - <formatter type="xml"/> - <test fork="yes" todir="test_output" haltonfailure="no" name="${testname}"/> - </junit> - </target> - - <target name="junitinstrument" depends="compiletest,instrument" - description="Run the instrument test suite (requires driver.jar property)"> - <mkdir dir="${instrumenttest.out.dir}"/> - <junit printsummary="yes" haltonfailure="yes" dir="${basedir}" - maxmemory="256M" fork="yes" forkmode="perBatch"> - <classpath refid="junit.classpath"/> - <formatter type="plain"/> - <formatter type="xml"/> - <batchtest todir="${instrumenttest.out.dir}" haltonfailure="no"> - <fileset dir="${classes.dir}"> - <include name="org/hibernate/test/**/*Test.class"/> - </fileset> - </batchtest> - </junit> - </target> - - <target name="junitreport" depends=""> - <junitreport todir="./test_output"> - <fileset dir="test_output"> - <include name="TEST-*.xml"/> - </fileset> - <report format="frames" todir="./test_output"/> - </junitreport> - </target> -</project> \ No newline at end of file

13 years, 8 months

1
0
0 / 0

Hibernate SVN: r20931 - search/branches/Branch_3_0_1_GA_CP/doc/api.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2011-04-08 03:43:09 -0400 (Fri, 08 Apr 2011) New Revision: 20931 Added: search/branches/Branch_3_0_1_GA_CP/doc/api/jdstyle.css Log: JBPAPP-6278 update build scripts of hem and hsearch Added: search/branches/Branch_3_0_1_GA_CP/doc/api/jdstyle.css =================================================================== --- search/branches/Branch_3_0_1_GA_CP/doc/api/jdstyle.css (rev 0) +++ search/branches/Branch_3_0_1_GA_CP/doc/api/jdstyle.css 2011-04-08 07:43:09 UTC (rev 20931) @@ -0,0 +1,117 @@ +/* Javadoc style sheet */ + +/* Define colors, fonts and other style attributes here to override the defaults */ + +/* Page background color */ +body { font-family: Arial; + background-color: white; + font-size: 10pt; + } +td { font-family: Arial; + font-size: 10pt; + } +/* Table colors */ +.TableHeadingColor { background: #F4F4F4 } +.TableSubHeadingColor { background: #F4F4F4 } +.TableRowColor { background: #FFFFFF } + +/* Font used in left-hand frame lists */ +.FrameTitleFont { font-size: normal; font-family: Arial } +.FrameHeadingFont { font-size: normal; font-family: Arial } +.FrameItemFont { font-size: normal; font-family: Arial } + +/* Example of smaller, sans-serif font in frames */ +/* .FrameItemFont { font-size: 10pt; font-family: Helvetica, Arial, sans-serif } */ + +/* Navigation bar fonts and colors */ +.NavBarCell1 { background-color:#F4F4F4;} +.NavBarCell1Rev { background-color:silver;} + +.NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;} +.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;} + +.NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} +.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} + +A { + color: #003399; +} + +A:active { + color: #003399; +} + +A:visited { + color: #888888; +} + +P, OL, UL, LI, DL, DT, DD, BLOCKQUOTE { + color: #000000; +} + +TD, TH, SPAN { + color: #000000; +} + +BLOCKQUOTE { + margin-right: 0px; +} + + +/*H1, H2, H3, H4, H5, H6 { + color: #000000; + font-weight:500; + margin-top:10px; + padding-top:15px; +} + +H1 { font-size: 150%; } +H2 { font-size: 140%; } +H3 { font-size: 110%; font-weight: bold; } +H4 { font-size: 110%; font-weight: bold;} +H5 { font-size: 100%; font-style: italic; } +H6 { font-size: 100%; font-style: italic; }*/ + +TT { +font-size: 90%; + font-family: "Courier New", Courier, monospace; + color: #000000; +} + +PRE { +font-size: 90%; + padding: 5px; + border-style: solid; + border-width: 1px; + border-color: #CCCCCC; + background-color: #F4F4F4; +} + +UL, OL, LI { + list-style: disc; +} + +HR { + width: 100%; + height: 1px; + background-color: #CCCCCC; + border-width: 0px; + padding: 0px; + color: #CCCCCC; +} + +.variablelist { + padding-top: 10; + padding-bottom:10; + margin:0; +} + +.itemizedlist, UL { + padding-top: 0; + padding-bottom:0; + margin:0; +} + +.term { + font-weight:bold; +}

13 years, 8 months

1
0
0 / 0

Hibernate SVN: r20930 - in search/branches/Branch_3_0_1_GA_CP: doc and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2011-04-08 03:42:31 -0400 (Fri, 08 Apr 2011) New Revision: 20930 Removed: search/branches/Branch_3_0_1_GA_CP/doc/reference/ search/branches/Branch_3_0_1_GA_CP/ivy.xml search/branches/Branch_3_0_1_GA_CP/ivy/ Log: JBPAPP-6278 update build scripts of hem and hsearch Deleted: search/branches/Branch_3_0_1_GA_CP/ivy.xml =================================================================== --- search/branches/Branch_3_0_1_GA_CP/ivy.xml 2011-04-08 07:40:36 UTC (rev 20929) +++ search/branches/Branch_3_0_1_GA_CP/ivy.xml 2011-04-08 07:42:31 UTC (rev 20930) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ivy-module version="1.3" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation= - "http://www.jayasoft.org/misc/ivy/ivy.xsd"> - <info organisation="org.hibernate" module="search"/> - <configurations> - <conf name="core" description="Core module dependencies"/> - <conf name="test" visibility="private" description="Dependencies needed for testing purposes"/> - </configurations> - <publications> - <artifact name="hibernate-search" conf="core"/> - </publications> - <dependencies> - <dependency name="jpa-api" rev="1.0.0.GA" conf="core->default"/> - <dependency name="commons-annotations" rev="3.0.0.GA" conf="core->core"/> - <dependency name="entitymanager" rev="3.3.1.GA" conf="test->core"/> - <dependency name="hibernate-annotations" rev="3.3.1.GA" conf="test->core"/> - </dependencies> -</ivy-module> \ No newline at end of file

13 years, 8 months

1
0
0 / 0

Hibernate SVN: r20929 - entitymanager/branches/v3_3_2_GA_CP.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2011-04-08 03:40:36 -0400 (Fri, 08 Apr 2011) New Revision: 20929 Modified: entitymanager/branches/v3_3_2_GA_CP/build.xml Log: JBPAPP-6278 update build scripts of hem and hsearch Modified: entitymanager/branches/v3_3_2_GA_CP/build.xml =================================================================== --- entitymanager/branches/v3_3_2_GA_CP/build.xml 2011-04-08 07:20:42 UTC (rev 20928) +++ entitymanager/branches/v3_3_2_GA_CP/build.xml 2011-04-08 07:40:36 UTC (rev 20929) @@ -269,7 +269,22 @@ </classpath> </javac> </target> - + <target name="junitreport" depends="junit"> + <taskdef name="junitreport" classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator"> + <classpath> + <fileset dir="${hibernate-core.lib.dir}"> + <include name="junit-*.jar"/> + <include name="ant-junit-*.jar"/> + </fileset> + </classpath> + </taskdef> + <junitreport todir="${build.dir}/test_output"> + <fileset dir="${build.dir}/test_output"> + <include name="TEST-*.xml"/> + </fileset> + <report format="frames" todir="${build.dir}/test_output"/> + </junitreport> + </target> <target name="junit" depends="compiletest,test-resources"> <mkdir dir="${build.dir}/test_output"/> <mkdir dir="${classes.dir}/META-INF/services"/>

13 years, 8 months

1
0
0 / 0

Hibernate SVN: r20928 - in entitymanager/branches/v3_3_2_GA_CP: doc and 1 other directories.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2011-04-08 03:20:42 -0400 (Fri, 08 Apr 2011) New Revision: 20928 Added: entitymanager/branches/v3_3_2_GA_CP/doc/ entitymanager/branches/v3_3_2_GA_CP/doc/api/ entitymanager/branches/v3_3_2_GA_CP/doc/api/jdstyle.css entitymanager/branches/v3_3_2_GA_CP/doc/api/package.html Removed: entitymanager/branches/v3_3_2_GA_CP/common-build.xml entitymanager/branches/v3_3_2_GA_CP/ivy.xml entitymanager/branches/v3_3_2_GA_CP/ivy/ Modified: entitymanager/branches/v3_3_2_GA_CP/build.xml Log: JBPAPP-6278 update build scripts of hem and hsearch Modified: entitymanager/branches/v3_3_2_GA_CP/build.xml =================================================================== --- entitymanager/branches/v3_3_2_GA_CP/build.xml 2011-04-08 05:07:29 UTC (rev 20927) +++ entitymanager/branches/v3_3_2_GA_CP/build.xml 2011-04-08 07:20:42 UTC (rev 20928) @@ -6,8 +6,7 @@ --> -<project name="HibernateEntityManager" default="dist" basedir="." - xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> +<project name="HibernateEntityManager" default="jar" basedir=".">  @@ -21,22 +20,62 @@ <property name="javadoc.packagenames" value="org.hibernate.ejb.*"/> <property name="jdbc.dir" value="jdbc"/> <property name="copy.test" value="true"/> + <property name="src.dir" location="src/java"/> + <property name="test.dir" location="src/test"/> + <property name="lib.dir" location="lib"/> + <property name="build.dir" location="build"/> + <property name="classes.dir" location="${build.dir}/classes"/> + <property name="testclasses.dir" location="${build.dir}/testclasses"/> +  + + <property name="doc.dir" location="doc"/> + <property name="doc.api.dir" location="${doc.dir}/api"/> + + + <property name="dist.doc.dir" location="${build.dir}/doc"/> + <property name="dist.api.dir" location="${dist.doc.dir}/api"/> + +  + <property name="jar.name" value="${name}"/> + <property name="jar.file.name" value="${build.dir}/${jar.name}.jar"/> + <property name="jartest.file.name" value="${build.dir}/${jar.name}-tests.jar"/> + + <property name="javadoc" value="http://java.sun.com/j2se/1.5.0/docs/api"/> + <property name="javac.debug" value="on"/> + <property name="javac.optimize" value="off"/> <property name="javac.source" value="1.5"/> <property name="javac.target" value="1.5"/> - <property name="common.dir" value="${basedir}"/> <available property="jpa-present" file="${basedir}/../jpa-api" type="dir"/> - <property name="ivy.dep.dir" value="${basedir}/build/lib" /> - <import file="${common.dir}/common-build.xml"/> <property name="jpa-javadoc.dir" value="${dist.doc.dir}/jpa-api"/> + + +  + <property name="hibernate-core.home" location="../core"/> + <property name="hibernate-core.jar" location="${hibernate-core.home}/build/hibernate3.jar"/> + <property name="hibernate-core.lib.dir" location="${hibernate-core.home}/lib"/> +<property name="resources.dir" value="src/resources"/> +<property name="testresources.dir" value="src/test-resources"/> +  <property name="build.testresources.dir" value="${build.dir}/testresources"/> - <property name="build.temp.dir" value="${build.dir}/temp"/> - - <path id="lib.moduleclass.path"> - <fileset dir="${ivy.dep.dir}/core"> - <include name="*.jar"/> - </fileset> + <property name="build.temp.dir" value="${build.dir}/temp"/> + <path id="lib.class.path"> + <path location="${hibernate-core.jar}" /> + <fileset dir="${hibernate-core.lib.dir}"> + <include name="*.jar"/> + <exclude name="ant-*.jar"/> + </fileset> + <fileset dir="${lib.dir}"> + <include name="*.jar"/> + </fileset> </path> <path id="junit.moduleclasspath"> <pathelement location="${src.dir}"/> @@ -49,43 +88,51 @@ <include name="*.jar"/> <include name="*.zip"/> </fileset> - <fileset dir="${ivy.dep.dir}/test"> - <include name="*.jar"/> - </fileset> </path> + <patternset id="support.files"> + <include name="**/*.jpg"/> + <include name="**/*.gif"/> + <include name="**/*.dtd"/> + <include name="**/*.xsd"/> + <include name="**/*.xml"/> + <include name="**/*.xslt"/> -  - <property name="ivy.jar.dir" value="${basedir}/ivy" /> - <property name="ivy.conf.dir" value="${basedir}" /> - <path id="ivy.lib.path"> - <fileset dir="${ivy.jar.dir}" includes="*.jar"/> - </path> - <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml" - uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path"/> +  + <exclude name="${build.dir}/**/*"/> + <exclude name="${doc.dir}/**/*"/> + <exclude name="classes/**/*"/> + <exclude name="build.xml"/> + <exclude name="**/*.properties"/> + <exclude name="**/*.ccf"/> + <exclude name="**/*.cfg.xml"/> + <exclude name="**/ehcache.xml"/> + </patternset> <target name="init"> - <antcall target="common-build.init"/> <tstamp> - <format property="now" pattern="yyyyMMddhhmmss"/> + <format property="subversion" pattern="yyyy-MM-dd hh:mm:ss"/> </tstamp> - <mkdir dir="${lib.dir}/test"/> - <mkdir dir="${ivy.dep.dir}/core"/> - <mkdir dir="${ivy.dep.dir}/test"/> - <ivy:configure file="${ivy.jar.dir}/ivyconf.xml" /> - </target> + <echo message="Build ${Name}-${version} (${subversion})"/> + <mkdir dir="${classes.dir}"/> + <mkdir dir="${testclasses.dir}"/> + <copy todir="${classes.dir}"> + <fileset dir="${src.dir}"> + <patternset refid="support.files"/> + </fileset> + </copy> + + <copy todir="${build.dir}"> + <fileset dir="."> + <include name="readme.txt"/> + <include name="lgpl.txt"/> + </fileset> + </copy> - <target name="get.deps.core" depends="init" description="retrieve the core dependencies"> - <ivy:resolve conf="core" /> - <ivy:retrieve pattern="${ivy.dep.dir}/core/[artifact].[ext]" conf="core" /> - </target> + <available file="${hibernate-core.jar}" type="file" property="hibernate-core.jar.available"/> + <fail unless="hibernate-core.jar.available" message="Cannot locate hibernate-core.jar: ${hibernate-core.jar}"/> - - <target name="compile" depends="init,get.deps.core" description="Compile the Java source code"> - <available - classname="org.eclipse.core.launcher.Main" - property="build.compiler" - value="org.eclipse.jdt.core.JDTCompilerAdapter" - classpath="${java.class.path}"/> + </target> + <target name="compile" depends="init" description="Compile the Java source code"> <javac srcdir="${src.dir}" destdir="${classes.dir}" @@ -97,6 +144,12 @@ target="${javac.target}" > </javac> + <copy todir="${classes.dir}"> + <fileset dir="${src.dir}"> + <include name="**/resources/*.properties"/> + <include name="**/*.xsd"/> + </fileset> + </copy> </target> <target name="packjar"> @@ -107,7 +160,7 @@ <mkdir dir="${build.testresources.dir}"/> <mkdir dir="${build.temp.dir}/${headerdirectory}"/> <copy todir="${build.temp.dir}/${headerdirectory}"> - <fileset dir="${classes.dir}" > + <fileset dir="${testclasses.dir}" > <include name="**/test/pack/${packagename}/**.*"/> </fileset> </copy> @@ -131,7 +184,7 @@ <mkdir dir="${build.testresources.dir}/${jarname}.${extension}"/> <copy todir="${build.testresources.dir}/${jarname}.${extension}">  - <fileset dir="${classes.dir}"> + <fileset dir="${testclasses.dir}"> <include name="**/test/pack/${jarname}/**.*"/> </fileset> <fileset dir="${testresources.dir}/${jarname}"> @@ -196,12 +249,7 @@ </antcall> </target> - <target name="get.deps.test" depends="init" description="retrieve the test dependencies"> - <ivy:resolve conf="test" /> - <ivy:retrieve pattern="${ivy.dep.dir}/test/[artifact].[ext]" conf="test" /> - </target> - - <target name="compiletest" depends="compile,get.deps.test" description="Compile the tests"> + <target name="compiletest" depends="compile" description="Compile the tests"> <available classname="org.eclipse.core.launcher.Main" property="build.compiler" @@ -209,7 +257,7 @@ classpath="${java.class.path}"/> <javac srcdir="${test.dir}" - destdir="${classes.dir}" + destdir="${testclasses.dir}" debug="${javac.debug}" optimize="${javac.optimize}" nowarn="on" @@ -217,19 +265,20 @@ target="${javac.target}"> <classpath> <path refid="lib.class.path"/> + <pathelement path="${classes.dir}"/> </classpath> </javac> </target> <target name="junit" depends="compiletest,test-resources"> - <mkdir dir="test_output"/> + <mkdir dir="${build.dir}/test_output"/> <mkdir dir="${classes.dir}/META-INF/services"/> <copy todir="${classes.dir}"> <fileset dir="${resources.dir}"> <include name="**/*.*"/> </fileset> </copy> - <junit fork="once" printsummary="yes" haltonfailure="yes"> + <junit fork="once" printsummary="yes" haltonfailure="no"> <classpath> <fileset dir="${jdbc.dir}"> <include name="**/*.jar"/> @@ -245,8 +294,8 @@ <include name="**/*.par"/> </fileset> <path refid="lib.class.path"/> -  - <dirset dir="${classes.dir}"> + <pathelement path="${classes.dir}"/> + <dirset dir="${testclasses.dir}"> <exclude name="**/pack/**.*"/> </dirset> @@ -258,8 +307,8 @@ </classpath> <formatter type="plain"/> <formatter type="xml"/> - <batchtest fork="yes" todir="test_output" haltonfailure="no"> - <fileset dir="${classes.dir}"> + <batchtest fork="yes" todir="${build.dir}/test_output" haltonfailure="no"> + <fileset dir="${testclasses.dir}"> <include name="**/*Test.class"/> </fileset> </batchtest> @@ -269,7 +318,7 @@  <target name="junitsingle" depends="compiletest" description="Run a single test suite (requires testname and jdbc.driver properties)"> - <mkdir dir="test_output"/> + <mkdir dir="${build.dir}/test_output"/> <junit printsummary="yes" fork="yes" haltonfailure="yes"> <classpath> <fileset dir="${jdbc.dir}"> @@ -286,7 +335,7 @@ </classpath> <formatter type="plain"/> <formatter type="xml"/> - <test fork="yes" todir="test_output" haltonfailure="no" name="${testname}"/> + <test fork="yes" todir="${build.dir}/test_output" haltonfailure="no" name="${testname}"/> </junit> </target> @@ -307,16 +356,36 @@ <attribute name="Specification-Version" value="1.0"/> <attribute name="Specification-Vendor" value="jcp.org"/> </manifest> - <antcall target="common-build.jar"/> - <ivy:resolve conf="core"/> - <ivy:publish artifactspattern="${dist.dir}/[artifact].[ext]" - resolver="local" - pubrevision="${version}" - pubdate="${now}" - status="integration" - /> + <mkdir dir="${build.dir}"/> + <jar filesetmanifest="merge" jarfile="${jar.file.name}" basedir="${classes.dir}"/> + </target> + <target name="clean" description="Cleans up build and dist directories"> + <delete dir="${build.dir}"/> + <delete dir="${dist.target.dir}"/> + </target> + <target name="javadoc" description="Compile the Javadoc API documentation to dist dir"> + <mkdir dir="${dist.api.dir}"/> + <javadoc + packagenames="${javadoc.packagenames}" + classpathref="lib.class.path" + destdir="${dist.api.dir}" + use="true" + protected="true" + version="true" + windowtitle="${Name} API Documentation" + Overview="${doc.api.dir}/package.html" + doctitle="${Name} API Documentation" + stylesheetfile="${doc.api.dir}/jdstyle.css" + link="${javadoc}"> + <packageset dir="${src.dir}" defaultexcludes="yes" > + <include name="**/*" /> + </packageset> + </javadoc> + + </target> +  @@ -331,96 +400,4 @@ </copy> </target> -  - <target name="dist" depends="get.deps.core,get.deps.test,jar,javadoc,jpa-javadoc,copysource,copytest,copylib,extras" description="Build everything"> - -  - <copy todir="${dist.dir}/resources" failonerror="false"> - <fileset dir="${resources.dir}"> - <include name="**/*.*"/> - </fileset> - </copy> - <copy todir="${dist.dir}/test-resources" failonerror="false"> - <fileset dir="${testresources.dir}"> - <include name="**/*.*"/> - </fileset> - </copy> - <copy todir="${dist.dir}" failonerror="false"> - <fileset dir="${common.dir}"> - <include name="common-build.xml"/> - </fileset> - </copy> - <copy todir="${dist.dir}/ivy" failonerror="false"> - <fileset dir="${ivy.jar.dir}"> - <include name="**/*.*"/> - </fileset> - </copy> - -  - <copy todir="${dist.lib.dir}" failonerror="false"> -  - <fileset dir="${ivy.dep.dir}/core"> - <include name="*.jar"/> - </fileset> - </copy> - <mkdir dir="${dist.lib.dir}/test"/> - <copy todir="${dist.lib.dir}/test" failonerror="false"> - <fileset dir="${ivy.dep.dir}/test"> - <include name="*.jar"/> - </fileset> - </copy> - <copy todir="${dist.lib.dir}/test" failonerror="false"> - <fileset file="${lib.dir}/test/*.jar"/> - </copy> - - <copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false"> - </copy> - <antcall target="common-build.dist"/> - </target> - - <target name="zip-dist" description="zip the dist"> - <zip zipfile="${dist.dir}-${version}.zip"> - <zipfileset prefix="${name}-${version}" dir="${dist.dir}"/> - </zip> - <tar compression="gzip" tarfile="${dist.dir}-${version}.tar.gz"> - <tarfileset prefix="${name}-${version}" dir="${dist.dir}"/> - </tar> - </target> - - <target name="profile" depends="compiletest"> - <java classname="org.hibernate.ejb.test.Profile" fork="true"> - <jvmarg value="-XrunjbossInspector:c:\profiler\data,include=org.hibernate.ejb,ignore=*,wakeupOnStartup=true"/> - <classpath> - <fileset dir="${jdbc.dir}"> - <include name="**/*.jar"/> - <include name="**/*.zip"/> - </fileset> - <dirset dir="${build.testresources.dir}"> - <include name="**/*.jar"/> - <include name="**/*.par"/> - </dirset> - - <fileset dir="${build.testresources.dir}"> - <include name="**/*.jar"/> - <include name="**/*.par"/> - </fileset> - <path refid="lib.class.path"/> - <pathelement path="${classes.dir}"/> -  - <pathelement path="${src.dir}"/> -  - <pathelement path="${test.dir}"/> -  - </classpath> - </java> - </target> - - </project> Deleted: entitymanager/branches/v3_3_2_GA_CP/common-build.xml =================================================================== --- entitymanager/branches/v3_3_2_GA_CP/common-build.xml 2011-04-08 05:07:29 UTC (rev 20927) +++ entitymanager/branches/v3_3_2_GA_CP/common-build.xml 2011-04-08 07:20:42 UTC (rev 20928) @@ -1,426 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="common-build" default="dist"> - <description>Common properties and targets for the HibernateExt project</description> - -  - <dirname property="common-build.basedir" file="${ant.file.common-build}"/> - -  - <property file="${common-build.basedir}/build.properties"/> - <property file="${user.home}/.ant.properties"/> - - <property name="src.dir" location="src/java"/> - <property name="test.dir" location="src/test"/> - <property name="lib.dir" location="lib"/> - <property name="build.dir" location="build"/> - <property name="classes.dir" location="${build.dir}/classes"/> - <property name="testclasses.dir" location="${build.dir}/testclasses"/> - <property name="dist.target.dir" location="target"/> - <property name="dist.dir" location="${dist.target.dir}/${name}"/> - <property name="instrumenttest.out.dir" value="instrumenttestout"/> - <property name="doc.dir" location="doc"/> - <property name="doc.api.dir" location="${doc.dir}/api"/> - <property name="doc.reference.dir" location="${doc.dir}/reference"/> - - <property name="dist.doc.dir" location="${dist.dir}/doc"/> - <property name="dist.api.dir" location="${dist.dir}/doc/api"/> - - <property name="dist.src.dir" location="${dist.dir}/src"/> - <property name="dist.test.dir" location="${dist.dir}/test"/> - <property name="dist.lib.dir" location="${dist.dir}/lib"/> - <property name="jar.name" value="${name}"/> - <property name="jar.file.name" value="${dist.dir}/${jar.name}.jar"/> - <property name="jartest.file.name" value="${dist.dir}/${jar.name}-tests.jar"/> - - <property name="javadoc" value="http://java.sun.com/j2se/1.5.0/docs/api"/> - <property name="javac.debug" value="on"/> - <property name="javac.optimize" value="off"/> - <property name="javac.source" value="1.5"/> - <property name="javac.target" value="1.5"/> - - -  - <property name="hibernate-core.home" location="${common-build.basedir}/../hibernate-3.2"/> - <property name="hibernate-core.jar" location="${hibernate-core.home}/hibernate3.jar"/> - <property name="hibernate-core.lib.dir" location="${hibernate-core.home}/lib"/> - <property name="hibernate-core.jdbc.dir" location="${hibernate-core.home}/lib"/>  - <property name="hibernate-core.doc.api" location="${hibernate-core.home}/doc/api"/> - <property name="hibernate-cvs.doc.reference" location="${common-build.basedir}/../core/doc/reference"/> - - <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"> - <classpath> - <fileset dir="${hibernate-core.lib.dir}"> - <include name="junit-*.jar"/> - <include name="ant-junit-*.jar"/> - </fileset> - </classpath> - </taskdef> - - <taskdef name="junitreport" classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator"> - <classpath> - <fileset dir="${hibernate-core.lib.dir}"> - <include name="junit-*.jar"/> - <include name="ant-junit-*.jar"/> - </fileset> - </classpath> - </taskdef> - - <path id="lib.class.path"> - <path location="${hibernate-core.jar}"></path> - <fileset dir="${hibernate-core.lib.dir}"> - <include name="*.jar"/> - <exclude name="ant*.jar"/> - </fileset> - <fileset dir="${lib.dir}"> - <include name="*.jar"/> - </fileset> - <path refid="lib.moduleclass.path"/> - </path> - -  - <path id="lib.moduleclass.path"/> - - <patternset id="support.files"> - <include name="**/*.jpg"/> - <include name="**/*.gif"/> - <include name="**/*.dtd"/> - <include name="**/*.xsd"/> - <include name="**/*.xml"/> - <include name="**/*.xslt"/> - -  - <exclude name="${build.dir}/**/*"/> - <exclude name="${doc.dir}/**/*"/> - <exclude name="classes/**/*"/> - <exclude name="build.xml"/> - <exclude name="**/*.properties"/> - <exclude name="**/*.ccf"/> - <exclude name="**/*.cfg.xml"/> - <exclude name="**/ehcache.xml"/> - </patternset> - - <patternset id="source.files"> - <include name="**/*.java"/> - <include name="**/*.properties"/> - </patternset> - -  - <fileset dir="${testclasses.dir}" id="junit.batchtestset"> - <include name="**/*Test.class"/> - </fileset> - - <path id="testsrc.path"> - <pathelement location="${test.dir}"/> - </path> - - <path id="junit.classpath"> - <fileset dir="${lib.dir}"> - <include name="*.jar"/> - </fileset> - <pathelement path="${classes.dir}"/> - <pathelement path="${testclasses.dir}"/> - <path refid="lib.class.path"/> - <path refid="junit.moduleclasspath"/> - </path> - -  - - <target name="clean" description="Cleans up build and dist directories"> - <delete dir="${build.dir}"/> - <delete dir="${dist.target.dir}"/> - </target> - - <target name="init" description="Initialize the build"> - <tstamp> - <format property="subversion" pattern="yyyy-MM-dd hh:mm:ss"/> - </tstamp> - <echo message="Build ${Name}-${version} (${subversion})"/> - <mkdir dir="${classes.dir}"/> - <mkdir dir="${testclasses.dir}"/> - <copy todir="${classes.dir}"> - <fileset dir="${src.dir}"> - <patternset refid="support.files"/> - </fileset> - </copy> - - <copy todir="${build.dir}"> - <fileset dir="."> - <include name="readme.txt"/> - <include name="lgpl.txt"/> - </fileset> - </copy> - - <available file="${hibernate-core.jar}" type="file" property="hibernate-core.jar.available"/> - <fail unless="hibernate-core.jar.available" message="Cannot locate hibernate-core.jar: ${hibernate-core.jar}"/> - </target> - - <target name="compile" depends="init" description="Compile the Java source code"> - <available - classname="org.eclipse.core.launcher.Main" - property="build.compiler" - value="org.eclipse.jdt.core.JDTCompilerAdapter" - classpath="${java.class.path}"/> - <javac - target="${javac.target}" - source="${javac.source}" - srcdir="${src.dir}" - destdir="${classes.dir}" - classpathref="lib.class.path" - debug="${javac.debug}" - optimize="${javac.optimize}" - nowarn="on"> - </javac> - </target> - - <target name="compiletest" depends="compile" description="Compile the tests"> - <available - classname="org.eclipse.core.launcher.Main" - property="build.compiler" - value="org.eclipse.jdt.core.JDTCompilerAdapter" - classpath="${java.class.path}"/> - <javac - target="${javac.target}" - source="${javac.source}" - destdir="${testclasses.dir}" - classpathref="junit.classpath" - debug="${javac.debug}" - optimize="${javac.optimize}" - nowarn="on"> - <src refid="testsrc.path"/> - </javac> - </target> - - <target name="instrument" depends="compiletest" - description="Instrument the persistent classes">  - - <taskdef name="instrument" classname="org.hibernate.tool.instrument.InstrumentTask"> - <classpath path="${classes.dir}"/> - <classpath path="${testclasses.dir}"/> - <classpath refid="lib.class.path"/> - </taskdef> - - <instrument verbose="true"> - <fileset dir="${testclasses.dir}/org/hibernate/test"> - <include name="**/*.class"/> - <exclude name="**/*Test$*.class"/> - <exclude name="**/*Test.class"/> - <exclude name="**/*Tests.class"/> - </fileset> - </instrument> - -  - - </target> - - <target name="copytest" description="Copy tests to dist dir" if="copy.test" > - <mkdir dir="${dist.test.dir}"/> - <copy todir="${dist.test.dir}"> - <fileset dir="${test.dir}"/> - </copy> - </target> - - <target name="copysource" depends="copytest" description="Copy sources to dist dir"> - <mkdir dir="${dist.src.dir}"/> - <copy todir="${dist.src.dir}"> - <fileset dir="${src.dir}"> - <patternset refid="source.files"/> - </fileset> - <fileset dir="${src.dir}"> - <patternset refid="support.files"/> - </fileset> - </copy> - <mkdir dir="${dist.src.dir}"/> - <copy todir="${dist.src.dir}"> - <fileset dir="${src.dir}"> - <patternset refid="source.files"/> - </fileset> - <fileset dir="${src.dir}"> - <patternset refid="support.files"/> - </fileset> - </copy> - </target> - - <target name="copylib" description="Copy jars to lib dir"> - <mkdir dir="${dist.lib.dir}"/> - <copy todir="${dist.lib.dir}"> - <fileset dir="${lib.dir}"> - <include name="*.jar"/> - <exclude name="log4j.jar"/> - <exclude name="checkstyle*.jar"/> - <include name="*.txt"/> - </fileset> - </copy> - </target> - - <target name="copydoc" description="Copy doc to dist dir" if="copy.doc"> - <mkdir dir="${dist.doc.dir}"/> - <copy todir="${dist.doc.dir}"> - <fileset dir="${doc.dir}"> - <include name="**/*.html"/> - </fileset> - </copy> - </target> - - <target name="jar" depends="compile" description="Build the distribution .jar file"> - <mkdir dir="${dist.dir}"/> - <jar filesetmanifest="merge" jarfile="${jar.file.name}" basedir="${classes.dir}"/> - </target> - - <target name="jartest" depends="compiletest" description="Build the distribution .jar file"> - <mkdir dir="${dist.dir}"/> - <jar filesetmanifest="merge" jarfile="${jartest.file.name}" basedir="${testclasses.dir}"/> - </target> - -  - - <target name="javadoc" description="Compile the Javadoc API documentation to dist dir"> - <mkdir dir="${dist.api.dir}"/> - <javadoc - packagenames="${javadoc.packagenames}" - classpathref="lib.class.path" - destdir="${dist.api.dir}" - use="true" - protected="true" - version="true" - windowtitle="${Name} API Documentation" - Overview="${doc.api.dir}/package.html" - doctitle="${Name} API Documentation" - stylesheetfile="${hibernate-core.doc.api}/jdstyle.css" - link="${javadoc}"> - <packageset dir="${src.dir}" defaultexcludes="yes" > - <include name="**/*" /> - </packageset> - </javadoc> - - - </target> - - - <target name="extras" description="Copies miscellaneous files to root dir"> - <copy todir="${dist.dir}/bin" failonerror="false"> - <fileset dir="bin"> - <include name="*.bat"/> - </fileset> - </copy> - <copy file="readme.txt" todir="${dist.dir}"/> - <copy file="lgpl.txt" todir="${dist.dir}"/> - <copy file="changelog.txt" todir="${dist.dir}"/> - <copy file="build.xml" todir="${dist.dir}"/> - <replace file="${dist.dir}/build.xml"> - <replacetoken><![CDATA[../${name}-${version}]]></replacetoken> - <replacevalue><![CDATA[../${name}]]></replacevalue> - </replace> - </target> - - <target name="dist" depends="jar,javadoc,copysource,copylib,copydoc,extras" description="Build everything"> - <zip zipfile = "${dist.dir}-${version}.zip"> - <zipfileset prefix="${name}-${version}" dir="${dist.dir}"/> - </zip> - <tar compression="gzip" tarfile="${dist.dir}-${version}.tar.gz"> - <tarfileset prefix="${name}-${version}" dir="${dist.dir}"/> - </tar> - </target> - - <target name="info" description="Echoes useful system properties"> - <echo message="java.vm.info=${java.vm.info}"/> - <echo message="java.vm.name=${java.vm.name}"/> - <echo message="java.vm.vendor=${java.vm.vendor}"/> - <echo message="java.vm.version=${java.vm.version}"/> - <echo message="os.arch=${os.arch}"/> - <echo message="os.name=${os.name}"/> - <echo message="os.version=${os.version}"/> - <echo message="java.home = ${java.home}"/> - <echo message="java.class.path = ${java.class.path}"/> - <echo message="build.compiler = ${build.compiler}"/> - <echo message="file.encoding=${file.encoding}"/> - <echo message="user.home = ${user.home}"/> - <echo message="user.language=${user.language}"/> - </target> - - <target name="junit" depends="compiletest"> - <mkdir dir="test_output"/> - <junit printsummary="yes" haltonfailure="yes" forkmode="once"> - <classpath refid="junit.classpath"/> - <formatter type="plain"/> - <formatter type="xml"/> - <batchtest fork="yes" todir="test_output" haltonfailure="no"> - <fileset refid="junit.batchtestset"/> - </batchtest> - </junit> - </target> - -  - <target name="junitsingle" depends="compiletest" description="Run a single test suite (requires testname and jdbc.driver properties)"> - <mkdir dir="test_output"/> - <junit printsummary="yes" fork="yes" haltonfailure="yes"> - <classpath refid="junit.classpath"/> - <formatter type="plain"/> - <formatter type="xml"/> - <test fork="yes" todir="test_output" haltonfailure="no" name="${testname}"/> - </junit> - </target> - - <target name="junitinstrument" depends="compiletest,instrument" - description="Run the instrument test suite (requires driver.jar property)"> - <mkdir dir="${instrumenttest.out.dir}"/> - <junit printsummary="yes" haltonfailure="yes" dir="${basedir}" - maxmemory="256M" fork="yes" forkmode="perBatch"> - <classpath refid="junit.classpath"/> - <formatter type="plain"/> - <formatter type="xml"/> - <batchtest todir="${instrumenttest.out.dir}" haltonfailure="no"> - <fileset dir="${classes.dir}"> - <include name="org/hibernate/test/**/*Test.class"/> - </fileset> - </batchtest> - </junit> - </target> - - <target name="junitreport" depends=""> - <junitreport todir="./test_output"> - <fileset dir="test_output"> - <include name="TEST-*.xml"/> - </fileset> - <report format="frames" todir="./test_output"/> - </junitreport> - </target> - - <target name="run" depends="compile" description="Run Hibernate Console"> - <java classname="org.hibernate.console.Start" classpathref="lib.class.path" fork="true"> - <classpath> - <path location="${build.dir}"/> - </classpath> - </java> - </target> - - - <target name="checkstyle" description="Check coding style"> - <taskdef resource="checkstyletask.properties"> - <classpath> - <path refid="lib.class.path"/> - <fileset dir="${common-build.basedir}/lib"> - <include name="checkstyle*.jar"/> - </fileset> - </classpath> - </taskdef> - - <checkstyle config="${common-build.basedir}/checkstyle_checks.xml"> - <fileset dir="${src.dir}"> - <include name="**/*.java"/> - </fileset> - <formatter type="plain"/> - </checkstyle> - </target> - - <target name="patch" depends="checkstyle" - description="Create a patch"> - <cvs command="-q diff -u -N" output="patch.txt"/> - </target> - -</project> \ No newline at end of file Added: entitymanager/branches/v3_3_2_GA_CP/doc/api/jdstyle.css =================================================================== --- entitymanager/branches/v3_3_2_GA_CP/doc/api/jdstyle.css (rev 0) +++ entitymanager/branches/v3_3_2_GA_CP/doc/api/jdstyle.css 2011-04-08 07:20:42 UTC (rev 20928) @@ -0,0 +1,117 @@ +/* Javadoc style sheet */ + +/* Define colors, fonts and other style attributes here to override the defaults */ + +/* Page background color */ +body { font-family: Arial; + background-color: white; + font-size: 10pt; + } +td { font-family: Arial; + font-size: 10pt; + } +/* Table colors */ +.TableHeadingColor { background: #F4F4F4 } +.TableSubHeadingColor { background: #F4F4F4 } +.TableRowColor { background: #FFFFFF } + +/* Font used in left-hand frame lists */ +.FrameTitleFont { font-size: normal; font-family: Arial } +.FrameHeadingFont { font-size: normal; font-family: Arial } +.FrameItemFont { font-size: normal; font-family: Arial } + +/* Example of smaller, sans-serif font in frames */ +/* .FrameItemFont { font-size: 10pt; font-family: Helvetica, Arial, sans-serif } */ + +/* Navigation bar fonts and colors */ +.NavBarCell1 { background-color:#F4F4F4;} +.NavBarCell1Rev { background-color:silver;} + +.NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;} +.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;} + +.NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} +.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} + +A { + color: #003399; +} + +A:active { + color: #003399; +} + +A:visited { + color: #888888; +} + +P, OL, UL, LI, DL, DT, DD, BLOCKQUOTE { + color: #000000; +} + +TD, TH, SPAN { + color: #000000; +} + +BLOCKQUOTE { + margin-right: 0px; +} + + +/*H1, H2, H3, H4, H5, H6 { + color: #000000; + font-weight:500; + margin-top:10px; + padding-top:15px; +} + +H1 { font-size: 150%; } +H2 { font-size: 140%; } +H3 { font-size: 110%; font-weight: bold; } +H4 { font-size: 110%; font-weight: bold;} +H5 { font-size: 100%; font-style: italic; } +H6 { font-size: 100%; font-style: italic; }*/ + +TT { +font-size: 90%; + font-family: "Courier New", Courier, monospace; + color: #000000; +} + +PRE { +font-size: 90%; + padding: 5px; + border-style: solid; + border-width: 1px; + border-color: #CCCCCC; + background-color: #F4F4F4; +} + +UL, OL, LI { + list-style: disc; +} + +HR { + width: 100%; + height: 1px; + background-color: #CCCCCC; + border-width: 0px; + padding: 0px; + color: #CCCCCC; +} + +.variablelist { + padding-top: 10; + padding-bottom:10; + margin:0; +} + +.itemizedlist, UL { + padding-top: 0; + padding-bottom:0; + margin:0; +} + +.term { + font-weight:bold; +} Added: entitymanager/branches/v3_3_2_GA_CP/doc/api/package.html =================================================================== --- entitymanager/branches/v3_3_2_GA_CP/doc/api/package.html (rev 0) +++ entitymanager/branches/v3_3_2_GA_CP/doc/api/package.html 2011-04-08 07:20:42 UTC (rev 20928) @@ -0,0 +1 @@ +<body></body> Deleted: entitymanager/branches/v3_3_2_GA_CP/ivy.xml =================================================================== --- entitymanager/branches/v3_3_2_GA_CP/ivy.xml 2011-04-08 05:07:29 UTC (rev 20927) +++ entitymanager/branches/v3_3_2_GA_CP/ivy.xml 2011-04-08 07:20:42 UTC (rev 20928) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ivy-module version="1.3" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation= - "http://www.jayasoft.org/misc/ivy/ivy.xsd"> - <info organisation="org.hibernate" module="hibernate-entitymanager"/> - <configurations> - <conf name="core" description="Core module dependencies"/> - <conf name="test" visibility="private" description="Dependencies needed for testing purposes"/> - </configurations> - <publications> - <artifact name="hibernate-entitymanager" conf="core"/> - </publications> - <dependencies> - <dependency name="hibernate-annotations" rev="3.3.1.GA" conf="core->core"/> - <dependency name="ejb3-persistence" rev="1.0.1.GA" conf="core->default"/> - <dependency name="commons-annotations" rev="3.0.0.GA" conf="core->core"/> - </dependencies> -</ivy-module> \ No newline at end of file

13 years, 8 months

1
0
0 / 0

Hibernate SVN: r20927 - core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hqlfetchscroll.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2011-04-08 01:07:29 -0400 (Fri, 08 Apr 2011) New Revision: 20927 Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hqlfetchscroll/HQLScrollFetchTest.java Log: JBPAPP-5898 HHH-1283 ScrollableResults JoinFetch don't set child collection correctly Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hqlfetchscroll/HQLScrollFetchTest.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hqlfetchscroll/HQLScrollFetchTest.java 2011-04-07 10:05:34 UTC (rev 20926) +++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hqlfetchscroll/HQLScrollFetchTest.java 2011-04-08 05:07:29 UTC (rev 20927) @@ -36,6 +36,7 @@ public void testScroll() { if( getDialect() instanceof SQLServerDialect || getDialect() instanceof Oracle8iDialect ){ reportSkip( "SQL Server and Oracle do not sort the result set automatically, so failure as expected","HQLScrollFetchTest" ); + return; } try { insertTestData();

13 years, 8 months

1
0
0 / 0

[hibernate/hibernate-core] a616a8: HHH-6097 - Review log levels, especially related t...

by noreply＠github.com

Branch: refs/heads/master Home: https://github.com/hibernate/hibernate-core Commit: a616a83d8e85a2aba5151d8ae5398b0b1f5a4cfc https://github.com/hibernate/hibernate-core/commit/a616a83d8e85a2aba5151d... Author: Steve Ebersole <steve(a)hibernate.org> Date: 2011-04-07 (Thu, 07 Apr 2011) Changed paths: A documentation/src/main/docbook/devguide/en-US/appendix-Troubleshooting.xml Log Message: ----------- HHH-6097 - Review log levels, especially related to i18n messages

13 years, 8 months

1
0
0 / 0

Hibernate SVN: r20926 - core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hqlfetchscroll.

by hibernate-commits＠lists.jboss.org

Author: stliu Date: 2011-04-07 06:05:34 -0400 (Thu, 07 Apr 2011) New Revision: 20926 Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hqlfetchscroll/HQLScrollFetchTest.java Log: JBPAPP-5898 HHH-1283 ScrollableResults JoinFetch don't set child collection correctly Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hqlfetchscroll/HQLScrollFetchTest.java =================================================================== --- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hqlfetchscroll/HQLScrollFetchTest.java 2011-04-06 05:26:11 UTC (rev 20925) +++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hqlfetchscroll/HQLScrollFetchTest.java 2011-04-07 10:05:34 UTC (rev 20926) @@ -7,6 +7,8 @@ import org.hibernate.ScrollableResults; import org.hibernate.Session; import org.hibernate.Transaction; +import org.hibernate.dialect.Oracle8iDialect; +import org.hibernate.dialect.SQLServerDialect; import org.hibernate.junit.functional.FunctionalTestCase; import org.hibernate.transform.DistinctRootEntityResultTransformer; @@ -32,6 +34,9 @@ } public void testScroll() { + if( getDialect() instanceof SQLServerDialect || getDialect() instanceof Oracle8iDialect ){ + reportSkip( "SQL Server and Oracle do not sort the result set automatically, so failure as expected","HQLScrollFetchTest" ); + } try { insertTestData(); Session s = openSession();

13 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

hibernate-commits April 2011