Hibernate SVN: r14312 - in core/branches/Branch_3_2: src/org/hibernate/engine and 3 other directories.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-02-05 18:55:35 -0500 (Tue, 05 Feb 2008)
New Revision: 14312
Modified:
core/branches/Branch_3_2/src/org/hibernate/action/CollectionRemoveAction.java
core/branches/Branch_3_2/src/org/hibernate/engine/PersistenceContext.java
core/branches/Branch_3_2/src/org/hibernate/engine/StatefulPersistenceContext.java
core/branches/Branch_3_2/src/org/hibernate/event/AbstractCollectionEvent.java
core/branches/Branch_3_2/src/org/hibernate/event/InitializeCollectionEvent.java
core/branches/Branch_3_2/src/org/hibernate/event/PostCollectionRecreateEvent.java
core/branches/Branch_3_2/src/org/hibernate/event/PostCollectionRemoveEvent.java
core/branches/Branch_3_2/src/org/hibernate/event/PostCollectionUpdateEvent.java
core/branches/Branch_3_2/src/org/hibernate/event/PreCollectionRecreateEvent.java
core/branches/Branch_3_2/src/org/hibernate/event/PreCollectionRemoveEvent.java
core/branches/Branch_3_2/src/org/hibernate/event/PreCollectionUpdateEvent.java
core/branches/Branch_3_2/src/org/hibernate/type/CollectionType.java
core/branches/Branch_3_2/test/org/hibernate/test/event/collection/AbstractCollectionEventTest.java
core/branches/Branch_3_2/test/org/hibernate/test/event/collection/BrokenCollectionEventTest.java
Log:
HHH-2616 : added owner ID getter to collection events; added partial support for property-refs; added Javadoc
Modified: core/branches/Branch_3_2/src/org/hibernate/action/CollectionRemoveAction.java
===================================================================
--- core/branches/Branch_3_2/src/org/hibernate/action/CollectionRemoveAction.java 2008-02-04 22:32:36 UTC (rev 14311)
+++ core/branches/Branch_3_2/src/org/hibernate/action/CollectionRemoveAction.java 2008-02-05 23:55:35 UTC (rev 14312)
@@ -1,20 +1,20 @@
//$Id$
package org.hibernate.action;
+import java.io.Serializable;
+
+import org.hibernate.AssertionFailure;
import org.hibernate.HibernateException;
-import org.hibernate.AssertionFailure;
+import org.hibernate.cache.CacheException;
+import org.hibernate.collection.PersistentCollection;
+import org.hibernate.engine.SessionImplementor;
+import org.hibernate.event.EventSource;
import org.hibernate.event.PostCollectionRemoveEvent;
+import org.hibernate.event.PostCollectionRemoveEventListener;
import org.hibernate.event.PreCollectionRemoveEvent;
import org.hibernate.event.PreCollectionRemoveEventListener;
-import org.hibernate.event.EventSource;
-import org.hibernate.event.PostCollectionRemoveEventListener;
-import org.hibernate.cache.CacheException;
-import org.hibernate.collection.PersistentCollection;
-import org.hibernate.engine.SessionImplementor;
import org.hibernate.persister.collection.CollectionPersister;
-import java.io.Serializable;
-
public final class CollectionRemoveAction extends CollectionAction {
private boolean emptySnapshot;
@@ -45,7 +45,7 @@
// the loaded owner will be set to null after the collection is removed,
// so capture its value as the affected owner so it is accessible to
// both pre- and post- events
- this.affectedOwner = session.getPersistenceContext().getLoadedCollectionOwner( collection );
+ this.affectedOwner = session.getPersistenceContext().getLoadedCollectionOwnerOrNull( collection );
}
/**
@@ -68,7 +68,7 @@
final SessionImplementor session)
throws CacheException {
super( persister, null, id, session );
- if (affectedOwner == null) { throw new AssertionFailure("affectedOwner == null"); };
+ if (affectedOwner == null) { throw new AssertionFailure("affectedOwner == null"); }
this.emptySnapshot = emptySnapshot;
this.affectedOwner = affectedOwner;
}
Modified: core/branches/Branch_3_2/src/org/hibernate/engine/PersistenceContext.java
===================================================================
--- core/branches/Branch_3_2/src/org/hibernate/engine/PersistenceContext.java 2008-02-04 22:32:36 UTC (rev 14311)
+++ core/branches/Branch_3_2/src/org/hibernate/engine/PersistenceContext.java 2008-02-05 23:55:35 UTC (rev 14312)
@@ -252,10 +252,22 @@
/**
* Get the entity that owned this persistent collection when it was loaded
+ *
+ * @param collection The persistent collection
+ * @return the owner if its entity ID is available from the collection's loaded key
+ * and the owner entity is in the persistence context; otherwise, returns null
*/
- Object getLoadedCollectionOwner(PersistentCollection collection);
+ Object getLoadedCollectionOwnerOrNull(PersistentCollection collection);
/**
+ * Get the ID for the entity that owned this persistent collection when it was loaded
+ *
+ * @param collection The persistent collection
+ * @return the owner ID if available from the collection's loaded key; otherwise, returns null
+ */
+ public Serializable getLoadedCollectionOwnerIdOrNull(PersistentCollection collection);
+
+ /**
* add a collection we just loaded up (still needs initializing)
*/
public void addUninitializedCollection(CollectionPersister persister,
Modified: core/branches/Branch_3_2/src/org/hibernate/engine/StatefulPersistenceContext.java
===================================================================
--- core/branches/Branch_3_2/src/org/hibernate/engine/StatefulPersistenceContext.java 2008-02-04 22:32:36 UTC (rev 14311)
+++ core/branches/Branch_3_2/src/org/hibernate/engine/StatefulPersistenceContext.java 2008-02-05 23:55:35 UTC (rev 14312)
@@ -680,13 +680,49 @@
/**
* Get the entity that owned this persistent collection when it was loaded
+ *
+ * @param collection The persistent collection
+ * @return the owner, if its entity ID is available from the collection's loaded key
+ * and the owner entity is in the persistence context; otherwise, returns null
*/
- public Object getLoadedCollectionOwner(PersistentCollection collection) {
- CollectionEntry ce = getCollectionEntry(collection);
- if ( ce.getLoadedKey() == null || ce.getLoadedPersister() == null ) {
+ public Object getLoadedCollectionOwnerOrNull(PersistentCollection collection) {
+ CollectionEntry ce = getCollectionEntry( collection );
+ if ( ce.getLoadedPersister() == null ) {
+ return null; // early exit...
+ }
+ Object loadedOwner = null;
+ // TODO: an alternative is to check if the owner has changed; if it hasn't then
+ // return collection.getOwner()
+ Serializable entityId = getLoadedCollectionOwnerIdOrNull( ce );
+ if ( entityId != null ) {
+ loadedOwner = getCollectionOwner( entityId, ce.getLoadedPersister() );
+ }
+ return loadedOwner;
+ }
+
+ /**
+ * Get the ID for the entity that owned this persistent collection when it was loaded
+ *
+ * @param collection The persistent collection
+ * @return the owner ID if available from the collection's loaded key; otherwise, returns null
+ */
+ public Serializable getLoadedCollectionOwnerIdOrNull(PersistentCollection collection) {
+ return getLoadedCollectionOwnerIdOrNull( getCollectionEntry( collection ) );
+ }
+
+ /**
+ * Get the ID for the entity that owned this persistent collection when it was loaded
+ *
+ * @param ce The collection entry
+ * @return the owner ID if available from the collection's loaded key; otherwise, returns null
+ */
+ private Serializable getLoadedCollectionOwnerIdOrNull(CollectionEntry ce) {
+ if ( ce == null || ce.getLoadedKey() == null || ce.getLoadedPersister() == null ) {
return null;
}
- return getCollectionOwner(ce.getLoadedKey(), ce.getLoadedPersister());
+ // TODO: an alternative is to check if the owner has changed; if it hasn't then
+ // get the ID from collection.getOwner()
+ return ce.getLoadedPersister().getCollectionType().getIdOfOwnerOrNull( ce.getLoadedKey(), session );
}
/**
Modified: core/branches/Branch_3_2/src/org/hibernate/event/AbstractCollectionEvent.java
===================================================================
--- core/branches/Branch_3_2/src/org/hibernate/event/AbstractCollectionEvent.java 2008-02-04 22:32:36 UTC (rev 14311)
+++ core/branches/Branch_3_2/src/org/hibernate/event/AbstractCollectionEvent.java 2008-02-05 23:55:35 UTC (rev 14312)
@@ -4,7 +4,7 @@
import java.io.Serializable;
import org.hibernate.collection.PersistentCollection;
-import org.hibernate.engine.SessionImplementor;
+import org.hibernate.engine.EntityEntry;
/**
* Defines a base class for events involving collections.
@@ -15,22 +15,64 @@
private final PersistentCollection collection;
private final Object affectedOwner;
+ private final Serializable affectedOwnerId;
- public AbstractCollectionEvent(PersistentCollection collection, EventSource source, Object affectedOwner) {
+ /**
+ * Constructs an AbstractCollectionEvent object.
+ *
+ * @param collection - the collection
+ * @param source - the Session source
+ * @param affectedOwner - the owner that is affected by this event;
+ * can be null if unavailable
+ * @param affectedOwnerId - the ID for the owner that is affected
+ * by this event; can be null if unavailable
+ * that is affected by this event; can be null if unavailable
+ */
+ public AbstractCollectionEvent(PersistentCollection collection,
+ EventSource source,
+ Object affectedOwner,
+ Serializable affectedOwnerId ) {
super(source);
this.collection = collection;
this.affectedOwner = affectedOwner;
+ this.affectedOwnerId = affectedOwnerId;
}
- protected static Object getLoadedOwner( PersistentCollection collection, EventSource source ) {
- return ( ( SessionImplementor ) source ).getPersistenceContext().getLoadedCollectionOwner( collection );
+ protected static Object getLoadedOwnerOrNull( PersistentCollection collection, EventSource source ) {
+ return source.getPersistenceContext().getLoadedCollectionOwnerOrNull( collection );
}
+ protected static Serializable getLoadedOwnerIdOrNull( PersistentCollection collection, EventSource source ) {
+ return source.getPersistenceContext().getLoadedCollectionOwnerIdOrNull( collection );
+ }
+
+ protected static Serializable getOwnerIdOrNull( Object owner, EventSource source ) {
+ EntityEntry ownerEntry = source.getPersistenceContext().getEntry( owner );
+ return ( ownerEntry == null ? null : ownerEntry.getId() );
+ }
+
public PersistentCollection getCollection() {
return collection;
}
- public Object getAffectedOwner() {
+ /**
+ * Get the collection owner entity that is affected by this event.
+ *
+ * @return the affected owner; returns null if the entity is not in the persistence context
+ * (e.g., because the collection from a detached entity was moved to a new owner)
+ */
+ public Object getAffectedOwnerOrNull() {
return affectedOwner;
}
+
+ /**
+ * Get the ID for the collection owner entity that is affected by this event.
+ *
+ * @return the affected owner ID; returns null if the ID cannot be obtained
+ * from the collection's loaded key (e.g., a property-ref is used for the
+ * collection and does not include the entity's ID)
+ */
+ public Serializable getAffectedOwnerIdOrNull() {
+ return affectedOwnerId;
+ }
}
Modified: core/branches/Branch_3_2/src/org/hibernate/event/InitializeCollectionEvent.java
===================================================================
--- core/branches/Branch_3_2/src/org/hibernate/event/InitializeCollectionEvent.java 2008-02-04 22:32:36 UTC (rev 14311)
+++ core/branches/Branch_3_2/src/org/hibernate/event/InitializeCollectionEvent.java 2008-02-05 23:55:35 UTC (rev 14312)
@@ -12,6 +12,8 @@
public class InitializeCollectionEvent extends AbstractCollectionEvent {
public InitializeCollectionEvent(PersistentCollection collection, EventSource source) {
- super(collection, source, getLoadedOwner( collection, source ) );
+ super( collection, source,
+ getLoadedOwnerOrNull( collection, source ),
+ getLoadedOwnerIdOrNull( collection, source ) );
}
}
Modified: core/branches/Branch_3_2/src/org/hibernate/event/PostCollectionRecreateEvent.java
===================================================================
--- core/branches/Branch_3_2/src/org/hibernate/event/PostCollectionRecreateEvent.java 2008-02-04 22:32:36 UTC (rev 14311)
+++ core/branches/Branch_3_2/src/org/hibernate/event/PostCollectionRecreateEvent.java 2008-02-05 23:55:35 UTC (rev 14312)
@@ -11,6 +11,8 @@
public class PostCollectionRecreateEvent extends AbstractCollectionEvent {
public PostCollectionRecreateEvent(PersistentCollection collection, EventSource source) {
- super(collection, source, collection.getOwner());
+ super( collection, source,
+ collection.getOwner(),
+ getOwnerIdOrNull( collection.getOwner(), source ) );
}
}
Modified: core/branches/Branch_3_2/src/org/hibernate/event/PostCollectionRemoveEvent.java
===================================================================
--- core/branches/Branch_3_2/src/org/hibernate/event/PostCollectionRemoveEvent.java 2008-02-04 22:32:36 UTC (rev 14311)
+++ core/branches/Branch_3_2/src/org/hibernate/event/PostCollectionRemoveEvent.java 2008-02-05 23:55:35 UTC (rev 14312)
@@ -11,6 +11,8 @@
public class PostCollectionRemoveEvent extends AbstractCollectionEvent {
public PostCollectionRemoveEvent(PersistentCollection collection, Object loadedOwner, EventSource source) {
- super(collection, source, loadedOwner);
+ super( collection, source,
+ loadedOwner,
+ getOwnerIdOrNull( loadedOwner, source ) );
}
}
Modified: core/branches/Branch_3_2/src/org/hibernate/event/PostCollectionUpdateEvent.java
===================================================================
--- core/branches/Branch_3_2/src/org/hibernate/event/PostCollectionUpdateEvent.java 2008-02-04 22:32:36 UTC (rev 14311)
+++ core/branches/Branch_3_2/src/org/hibernate/event/PostCollectionUpdateEvent.java 2008-02-05 23:55:35 UTC (rev 14312)
@@ -11,6 +11,8 @@
public class PostCollectionUpdateEvent extends AbstractCollectionEvent {
public PostCollectionUpdateEvent(PersistentCollection collection, EventSource source) {
- super(collection, source, getLoadedOwner( collection, source ));
+ super( collection, source,
+ getLoadedOwnerOrNull( collection, source ),
+ getLoadedOwnerIdOrNull( collection, source ) );
}
}
Modified: core/branches/Branch_3_2/src/org/hibernate/event/PreCollectionRecreateEvent.java
===================================================================
--- core/branches/Branch_3_2/src/org/hibernate/event/PreCollectionRecreateEvent.java 2008-02-04 22:32:36 UTC (rev 14311)
+++ core/branches/Branch_3_2/src/org/hibernate/event/PreCollectionRecreateEvent.java 2008-02-05 23:55:35 UTC (rev 14312)
@@ -11,6 +11,8 @@
public class PreCollectionRecreateEvent extends AbstractCollectionEvent {
public PreCollectionRecreateEvent(PersistentCollection collection, EventSource source) {
- super(collection, source, collection.getOwner());
+ super( collection, source,
+ collection.getOwner(),
+ getOwnerIdOrNull( collection.getOwner(), source ) );
}
}
Modified: core/branches/Branch_3_2/src/org/hibernate/event/PreCollectionRemoveEvent.java
===================================================================
--- core/branches/Branch_3_2/src/org/hibernate/event/PreCollectionRemoveEvent.java 2008-02-04 22:32:36 UTC (rev 14311)
+++ core/branches/Branch_3_2/src/org/hibernate/event/PreCollectionRemoveEvent.java 2008-02-05 23:55:35 UTC (rev 14312)
@@ -11,6 +11,8 @@
public class PreCollectionRemoveEvent extends AbstractCollectionEvent {
public PreCollectionRemoveEvent(PersistentCollection collection, Object loadedOwner, EventSource source) {
- super(collection, source, loadedOwner);
+ super( collection, source,
+ loadedOwner,
+ getOwnerIdOrNull( loadedOwner, source ) );
}
}
Modified: core/branches/Branch_3_2/src/org/hibernate/event/PreCollectionUpdateEvent.java
===================================================================
--- core/branches/Branch_3_2/src/org/hibernate/event/PreCollectionUpdateEvent.java 2008-02-04 22:32:36 UTC (rev 14311)
+++ core/branches/Branch_3_2/src/org/hibernate/event/PreCollectionUpdateEvent.java 2008-02-05 23:55:35 UTC (rev 14312)
@@ -11,6 +11,8 @@
public class PreCollectionUpdateEvent extends AbstractCollectionEvent {
public PreCollectionUpdateEvent(PersistentCollection collection, EventSource source) {
- super(collection, source, getLoadedOwner( collection, source ));
+ super( collection, source,
+ getLoadedOwnerOrNull( collection, source ),
+ getLoadedOwnerIdOrNull( collection, source ) );
}
}
Modified: core/branches/Branch_3_2/src/org/hibernate/type/CollectionType.java
===================================================================
--- core/branches/Branch_3_2/src/org/hibernate/type/CollectionType.java 2008-02-04 22:32:36 UTC (rev 14311)
+++ core/branches/Branch_3_2/src/org/hibernate/type/CollectionType.java 2008-02-05 23:55:35 UTC (rev 14312)
@@ -13,6 +13,7 @@
import org.dom4j.Element;
import org.dom4j.Node;
+
import org.hibernate.EntityMode;
import org.hibernate.Hibernate;
import org.hibernate.HibernateException;
@@ -26,6 +27,7 @@
import org.hibernate.engine.SessionImplementor;
import org.hibernate.persister.collection.CollectionPersister;
import org.hibernate.persister.collection.QueryableCollection;
+import org.hibernate.persister.entity.EntityPersister;
import org.hibernate.persister.entity.Joinable;
import org.hibernate.proxy.HibernateProxy;
import org.hibernate.proxy.LazyInitializer;
@@ -343,6 +345,7 @@
}
// NOTE VERY HACKISH WORKAROUND!!
+ // TODO: Fix this so it will work for non-POJO entity mode
Type keyType = getPersister( session ).getKeyType();
if ( !keyType.getReturnedClass().isInstance( id ) ) {
id = (Serializable) keyType.semiResolve(
@@ -356,6 +359,37 @@
}
}
+ /**
+ * Get the id value from the owning entity key, usually the same as the key, but might be some
+ * other property, in the case of property-ref
+ *
+ * @param key The collection owner key
+ * @param session The session from which the request is originating.
+ * @return The collection owner's id, if it can be obtained from the key;
+ * otherwise, null is returned
+ */
+ public Serializable getIdOfOwnerOrNull(Serializable key, SessionImplementor session) {
+ Serializable ownerId = null;
+ if ( foreignKeyPropertyName == null ) {
+ ownerId = key;
+ }
+ else {
+ Type keyType = getPersister( session ).getKeyType();
+ EntityPersister ownerPersister = getPersister( session ).getOwnerEntityPersister();
+ // TODO: Fix this so it will work for non-POJO entity mode
+ Class ownerMappedClass = ownerPersister.getMappedClass( session.getEntityMode() );
+ if ( ownerMappedClass.isAssignableFrom( keyType.getReturnedClass() ) &&
+ keyType.getReturnedClass().isInstance( key ) ) {
+ // the key is the owning entity itself, so get the ID from the key
+ ownerId = ownerPersister.getIdentifier( key, session.getEntityMode() );
+ }
+ else {
+ // TODO: check if key contains the owner ID
+ }
+ }
+ return ownerId;
+ }
+
public Object hydrate(ResultSet rs, String[] name, SessionImplementor session, Object owner) {
// can't just return null here, since that would
// cause an owning component to become null
Modified: core/branches/Branch_3_2/test/org/hibernate/test/event/collection/AbstractCollectionEventTest.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/event/collection/AbstractCollectionEventTest.java 2008-02-04 22:32:36 UTC (rev 14311)
+++ core/branches/Branch_3_2/test/org/hibernate/test/event/collection/AbstractCollectionEventTest.java 2008-02-05 23:55:35 UTC (rev 14312)
@@ -761,12 +761,12 @@
assertSame( listenerExpected, listeners.getListenersCalled().get( index ) );
assertSame(
ownerExpected,
- ( ( AbstractCollectionEvent ) listeners.getEvents().get( index ) ).getAffectedOwner()
+ ( ( AbstractCollectionEvent ) listeners.getEvents().get( index ) ).getAffectedOwnerOrNull()
);
- //assertSame(
- // ownerExpected.getId(),
- // ( ( AbstractCollectionEvent ) listeners.getEvents().get( index ) ).getAffectedOwnerId()
- //);
+ assertEquals(
+ ownerExpected.getId(),
+ ( ( AbstractCollectionEvent ) listeners.getEvents().get( index ) ).getAffectedOwnerIdOrNull()
+ );
assertSame(
collExpected, ( ( AbstractCollectionEvent ) listeners.getEvents().get( index ) ).getCollection()
);
Modified: core/branches/Branch_3_2/test/org/hibernate/test/event/collection/BrokenCollectionEventTest.java
===================================================================
--- core/branches/Branch_3_2/test/org/hibernate/test/event/collection/BrokenCollectionEventTest.java 2008-02-04 22:32:36 UTC (rev 14311)
+++ core/branches/Branch_3_2/test/org/hibernate/test/event/collection/BrokenCollectionEventTest.java 2008-02-05 23:55:35 UTC (rev 14312)
@@ -311,12 +311,12 @@
assertSame( listenerExpected, listeners.getListenersCalled().get( index ) );
assertSame(
ownerExpected,
- ( ( AbstractCollectionEvent ) listeners.getEvents().get( index ) ).getAffectedOwner()
+ ( ( AbstractCollectionEvent ) listeners.getEvents().get( index ) ).getAffectedOwnerOrNull()
);
- //assertSame(
- // ownerExpected.getId(),
- // ( ( AbstractCollectionEvent ) listeners.getEvents().get( index ) ).getAffectedOwnerId()
- //);
+ assertEquals(
+ ownerExpected.getId(),
+ ( ( AbstractCollectionEvent ) listeners.getEvents().get( index ) ).getAffectedOwnerIdOrNull()
+ );
assertSame(
collExpected, ( ( AbstractCollectionEvent ) listeners.getEvents().get( index ) ).getCollection()
);
16 years, 2 months
- 1
- 0
Hibernate SVN: r14311 - entitymanager/tags.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-02-04 17:32:36 -0500 (Mon, 04 Feb 2008)
New Revision: 14311
Added:
entitymanager/tags/v3_3_2_Beta3/
Log:
Hibernate EntityManager 3.3.2.Beta3
Copied: entitymanager/tags/v3_3_2_Beta3 (from rev 14310, entitymanager/trunk)
16 years, 2 months
- 1
- 0
Hibernate SVN: r14310 - entitymanager/trunk/src/java/org/hibernate/ejb.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-02-04 17:26:07 -0500 (Mon, 04 Feb 2008)
New Revision: 14310
Modified:
entitymanager/trunk/src/java/org/hibernate/ejb/Version.java
Log:
Release hem 3.3.2.Beta3
Modified: entitymanager/trunk/src/java/org/hibernate/ejb/Version.java
===================================================================
--- entitymanager/trunk/src/java/org/hibernate/ejb/Version.java 2008-02-04 22:25:33 UTC (rev 14309)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/Version.java 2008-02-04 22:26:07 UTC (rev 14310)
@@ -8,7 +8,7 @@
* @author Emmanuel Bernard
*/
public class Version {
- public static final String VERSION = "3.3.2.Beta2";
+ public static final String VERSION = "3.3.2.Beta3";
private static Log log = LogFactory.getLog( Version.class );
static {
16 years, 2 months
- 1
- 0
Hibernate SVN: r14309 - in entitymanager/trunk: src/java/org/hibernate/ejb/packaging and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-02-04 17:25:33 -0500 (Mon, 04 Feb 2008)
New Revision: 14309
Modified:
entitymanager/trunk/build.xml
entitymanager/trunk/src/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java
entitymanager/trunk/src/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java
entitymanager/trunk/src/java/org/hibernate/ejb/packaging/InputStreamZippedJarVisitor.java
entitymanager/trunk/src/java/org/hibernate/ejb/packaging/JarVisitorFactory.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/packaging/JarVisitorTest.java
Log:
EJB-332 handled nested jars if the root URL points to one jar:file:...foo.ear!/bar.jar
Modified: entitymanager/trunk/build.xml
===================================================================
--- entitymanager/trunk/build.xml 2008-02-03 05:57:08 UTC (rev 14308)
+++ entitymanager/trunk/build.xml 2008-02-04 22:25:33 UTC (rev 14309)
@@ -17,7 +17,7 @@
<!-- Name of project and version, used to create filenames -->
<property name="Name" value="Hibernate EntityManager"/>
<property name="name" value="hibernate-entitymanager"/>
- <property name="version" value="3.3.2.Beta2"/>
+ <property name="version" value="3.3.2.Beta3"/>
<property name="javadoc.packagenames" value="org.hibernate.ejb.*"/>
<property name="jdbc.dir" value="jdbc"/>
<property name="copy.test" value="true"/>
@@ -203,6 +203,18 @@
<param name="jarname" value="overridenpar"/>
</antcall>
+ <!-- nested jar -->
+ <jar destfile="${build.testresources.dir}/nestedjar.ear">
+ <fileset dir="${build.testresources.dir}">
+ <include name="defaultpar.par"/>
+ </fileset>
+ </jar>
+ <copy todir="${build.testresources.dir}/nesteddir.ear">
+ <fileset dir="${build.testresources.dir}">
+ <include name="defaultpar.par"/>
+ </fileset>
+ </copy>
+
<antcall target="packjar" inheritall="true">
<param name="extension" value="war"/>
<param name="jarname" value="war"/>
Modified: entitymanager/trunk/src/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java
===================================================================
--- entitymanager/trunk/src/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java 2008-02-03 05:57:08 UTC (rev 14308)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/packaging/ExplodedJarVisitor.java 2008-02-04 22:25:33 UTC (rev 14309)
@@ -5,8 +5,14 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.ByteArrayInputStream;
import java.net.URL;
import java.net.URISyntaxException;
+import java.util.zip.ZipEntry;
+import java.util.Enumeration;
+import java.util.jar.JarInputStream;
+import java.util.jar.JarFile;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -51,9 +57,35 @@
else {
rootFile = jarFile;
}
- getClassNamesInTree( rootFile, null );
+ if ( rootFile.isDirectory() ) {
+ getClassNamesInTree( rootFile, null );
+ }
+ else {
+ //assume zipped file
+ processZippedRoot(rootFile);
+ }
}
+ //FIXME shameful copy of FileZippedJarVisitor.doProcess()
+ //TODO long term fix is to introduce a process interface (closure like) to addElements and then share the code
+ private void processZippedRoot(File rootFile) throws IOException {
+ JarFile jarFile = new JarFile(rootFile);
+ Enumeration<? extends ZipEntry> entries = jarFile.entries();
+ while ( entries.hasMoreElements() ) {
+ ZipEntry zipEntry = entries.nextElement();
+ String name = zipEntry.getName();
+ if ( !zipEntry.isDirectory() ) {
+ //build relative name
+ if ( name.startsWith( "/" ) ) name = name.substring( 1 );
+ addElement(
+ name,
+ new BufferedInputStream( jarFile.getInputStream( zipEntry ) ),
+ new BufferedInputStream( jarFile.getInputStream( zipEntry ) )
+ );
+ }
+ }
+ }
+
private void getClassNamesInTree(File jarFile, String header) throws IOException {
File[] files = jarFile.listFiles();
header = header == null ? "" : header + "/";
Modified: entitymanager/trunk/src/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java
===================================================================
--- entitymanager/trunk/src/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java 2008-02-03 05:57:08 UTC (rev 14308)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/packaging/FileZippedJarVisitor.java 2008-02-04 22:25:33 UTC (rev 14309)
@@ -3,10 +3,13 @@
import java.io.BufferedInputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.ByteArrayInputStream;
import java.net.URL;
import java.net.URISyntaxException;
import java.util.Enumeration;
import java.util.jar.JarFile;
+import java.util.jar.JarInputStream;
import java.util.zip.ZipEntry;
import org.apache.commons.logging.Log;
@@ -52,14 +55,45 @@
String name = zipEntry.getName();
if ( entry != null && ! name.startsWith( entry ) ) continue; //filter it out
if ( !zipEntry.isDirectory() ) {
- //build relative name
- if (entry != null) name = name.substring( entry.length() );
- if ( name.startsWith( "/" ) ) name = name.substring( 1 );
- addElement(
- name,
- new BufferedInputStream( jarFile.getInputStream( zipEntry ) ),
- new BufferedInputStream( jarFile.getInputStream( zipEntry ) )
- );
+ if ( name.equals( entry ) ) {
+ //exact match, might be a nested jar entry (ie from jar:file:..../foo.ear!/bar.jar)
+ /*
+ * This algorithm assumes that the zipped file is only the URL root (including entry), not just any random entry
+ */
+ InputStream is = null;
+ try {
+ is = new BufferedInputStream( jarFile.getInputStream( zipEntry ) );
+ JarInputStream jis = new JarInputStream( is );
+ ZipEntry subZipEntry = jis.getNextEntry();
+ while (subZipEntry != null) {
+ if ( ! subZipEntry.isDirectory() ) {
+ //FIXME copy sucks
+ byte[] entryBytes = JarVisitorFactory.getBytesFromInputStream( jis );
+ String subname = subZipEntry.getName();
+ if ( subname.startsWith( "/" ) ) subname = subname.substring( 1 );
+ addElement(
+ subname,
+ new ByteArrayInputStream(entryBytes),
+ new ByteArrayInputStream(entryBytes)
+ );
+ }
+ subZipEntry = jis.getNextEntry();
+ }
+ }
+ finally {
+ if ( is != null) is.close();
+ }
+ }
+ else {
+ //build relative name
+ if (entry != null) name = name.substring( entry.length() );
+ if ( name.startsWith( "/" ) ) name = name.substring( 1 );
+ addElement(
+ name,
+ new BufferedInputStream( jarFile.getInputStream( zipEntry ) ),
+ new BufferedInputStream( jarFile.getInputStream( zipEntry ) )
+ );
+ }
}
}
}
Modified: entitymanager/trunk/src/java/org/hibernate/ejb/packaging/InputStreamZippedJarVisitor.java
===================================================================
--- entitymanager/trunk/src/java/org/hibernate/ejb/packaging/InputStreamZippedJarVisitor.java 2008-02-03 05:57:08 UTC (rev 14308)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/packaging/InputStreamZippedJarVisitor.java 2008-02-04 22:25:33 UTC (rev 14309)
@@ -3,9 +3,12 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.BufferedInputStream;
import java.net.URL;
import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
+import java.util.zip.ZipEntry;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -47,26 +50,46 @@
String name = jarEntry.getName();
if ( entry != null && ! name.startsWith( entry ) ) continue; //filter it out
if ( !jarEntry.isDirectory() ) {
- int size;
- byte[] tmpByte = new byte[ 4096 ];
- byte[] entryBytes = new byte[0];
- for ( ; ; ) {
- size = jis.read( tmpByte );
- if ( size == -1 ) break;
- byte[] current = new byte[ entryBytes.length + size ];
- System.arraycopy( entryBytes, 0, current, 0, entryBytes.length );
- System.arraycopy( tmpByte, 0, current, entryBytes.length, size );
- entryBytes = current;
+ if ( name.equals( entry ) ) {
+ //exact match, might be a nested jar entry (ie from jar:file:..../foo.ear!/bar.jar)
+ /*
+ * This algorithm assumes that the zipped file is only the URL root (including entry), not just any random entry
+ */
+ JarInputStream subJis = null;
+ try {
+ subJis = new JarInputStream( jis );
+ ZipEntry subZipEntry = jis.getNextEntry();
+ while (subZipEntry != null) {
+ if ( ! subZipEntry.isDirectory() ) {
+ //FIXME copy sucks
+ byte[] entryBytes = JarVisitorFactory.getBytesFromInputStream( jis );
+ String subname = subZipEntry.getName();
+ if ( subname.startsWith( "/" ) ) subname = subname.substring( 1 );
+ addElement(
+ subname,
+ new ByteArrayInputStream(entryBytes),
+ new ByteArrayInputStream(entryBytes)
+ );
+ }
+ subZipEntry = jis.getNextJarEntry();
+ }
+ }
+ finally {
+ if (subJis != null) subJis.close();
+ }
}
- //build relative name
- if (entry != null) name = name.substring( entry.length() );
- if ( name.startsWith( "/" ) ) name = name.substring( 1 );
- //this is bad cause we actually read everything instead of walking it lazily
- addElement(
- name,
- new ByteArrayInputStream( entryBytes ),
- new ByteArrayInputStream( entryBytes )
- );
+ else {
+ byte[] entryBytes = JarVisitorFactory.getBytesFromInputStream( jis );
+ //build relative name
+ if (entry != null) name = name.substring( entry.length() );
+ if ( name.startsWith( "/" ) ) name = name.substring( 1 );
+ //this is bad cause we actually read everything instead of walking it lazily
+ addElement(
+ name,
+ new ByteArrayInputStream( entryBytes ),
+ new ByteArrayInputStream( entryBytes )
+ );
+ }
}
}
jis.close();
Modified: entitymanager/trunk/src/java/org/hibernate/ejb/packaging/JarVisitorFactory.java
===================================================================
--- entitymanager/trunk/src/java/org/hibernate/ejb/packaging/JarVisitorFactory.java 2008-02-03 05:57:08 UTC (rev 14308)
+++ entitymanager/trunk/src/java/org/hibernate/ejb/packaging/JarVisitorFactory.java 2008-02-04 22:25:33 UTC (rev 14309)
@@ -5,6 +5,8 @@
import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.io.File;
+import java.io.InputStream;
+import java.io.IOException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -124,4 +126,19 @@
return new InputStreamZippedJarVisitor( jarUrl, filters, entry );
}
}
+
+ public static byte[] getBytesFromInputStream(InputStream inputStream) throws IOException {
+ int size;
+ byte[] tmpByte = new byte[ 4096 ];
+ byte[] entryBytes = new byte[0];
+ for ( ; ; ) {
+ size = inputStream.read( tmpByte );
+ if ( size == -1 ) break;
+ byte[] current = new byte[ entryBytes.length + size ];
+ System.arraycopy( entryBytes, 0, current, 0, entryBytes.length );
+ System.arraycopy( tmpByte, 0, current, entryBytes.length, size );
+ entryBytes = current;
+ }
+ return entryBytes;
+ }
}
Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/packaging/JarVisitorTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/packaging/JarVisitorTest.java 2008-02-03 05:57:08 UTC (rev 14308)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/packaging/JarVisitorTest.java 2008-02-04 22:25:33 UTC (rev 14309)
@@ -79,6 +79,52 @@
// assertTrue( classes.contains( org.hibernate.ejb.test.pack.defaultpar.Version.class.getName() ) );
}
+ public void testNestedJarProtocol() throws Exception {
+ String jarFileName = "jar:file:./build/testresources/nestedjar.ear!/defaultpar.par";
+ //JarVisitor jarVisitor = new ZippedJarVisitor( jarFileName, true, true );
+ Filter[] filters = getFilters();
+ JarVisitor jarVisitor = new JarProtocolVisitor( new URL( jarFileName ), filters, "" );
+ //TODO should we fix the name here to reach defaultpar rather than nestedjar ??
+ //assertEquals( "defaultpar", jarVisitor.getUnqualifiedJarName() );
+ Set entries = jarVisitor.getMatchingEntries()[1];
+ assertEquals( 3, entries.size() );
+ Entry entry = new Entry( ApplicationServer.class.getName(), null );
+ assertTrue( entries.contains( entry ) );
+ entry = new Entry( org.hibernate.ejb.test.pack.defaultpar.Version.class.getName(), null );
+ assertTrue( entries.contains( entry ) );
+ assertNull( ( (Entry) entries.iterator().next() ).getInputStream() );
+ assertEquals( 2, jarVisitor.getMatchingEntries()[2].size() );
+ for (Entry localEntry : (Set<Entry>) jarVisitor.getMatchingEntries()[2] ) {
+ assertNotNull( localEntry.getInputStream() );
+ localEntry.getInputStream().close();
+ }
+
+ jarFileName = "jar:file:./build/testresources/nesteddir.ear!/defaultpar.par";
+ //JarVisitor jarVisitor = new ZippedJarVisitor( jarFileName, true, true );
+ filters = getFilters();
+ jarVisitor = new JarProtocolVisitor( new URL( jarFileName ), filters, "" );
+ //TODO should we fix the name here to reach defaultpar rather than nestedjar ??
+ //assertEquals( "defaultpar", jarVisitor.getUnqualifiedJarName() );
+ entries = jarVisitor.getMatchingEntries()[1];
+ assertEquals( 3, entries.size() );
+ entry = new Entry( ApplicationServer.class.getName(), null );
+ assertTrue( entries.contains( entry ) );
+ entry = new Entry( org.hibernate.ejb.test.pack.defaultpar.Version.class.getName(), null );
+ assertTrue( entries.contains( entry ) );
+ assertNull( ( (Entry) entries.iterator().next() ).getInputStream() );
+ assertEquals( 2, jarVisitor.getMatchingEntries()[2].size() );
+ for (Entry localEntry : (Set<Entry>) jarVisitor.getMatchingEntries()[2] ) {
+ assertNotNull( localEntry.getInputStream() );
+ localEntry.getInputStream().close();
+ }
+
+// Set<String> classes = jarVisitor.getClassNames();
+// assertEquals( 3, classes.size() );
+// assertTrue( classes.contains( ApplicationServer.class.getName() ) );
+// assertTrue( classes.contains( Mouse.class.getName() ) );
+// assertTrue( classes.contains( org.hibernate.ejb.test.pack.defaultpar.Version.class.getName() ) );
+ }
+
public void testJarProtocol() throws Exception {
String jarFileName = "jar:file:./build/testresources/war.war!/WEB-INF/classes";
//JarVisitor jarVisitor = new ZippedJarVisitor( jarFileName, true, true );
@@ -130,6 +176,7 @@
// assertTrue( classes.contains( org.hibernate.ejb.test.pack.defaultpar.Version.class.getName() ) );
}
+
public void testExplodedJar() throws Exception {
String jarFileName = "./build/testresources/explodedpar.par";
//JarVisitor jarVisitor = new ExplodedJarVisitor( jarFileName, true, true );
16 years, 2 months
- 1
- 0
Hibernate SVN: r14308 - core/branches/Branch_3_2/src/org/hibernate/engine.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2008-02-03 00:57:08 -0500 (Sun, 03 Feb 2008)
New Revision: 14308
Modified:
core/branches/Branch_3_2/src/org/hibernate/engine/ActionQueue.java
Log:
HHH-2957 : ActionQueue insertions sorting performance
Modified: core/branches/Branch_3_2/src/org/hibernate/engine/ActionQueue.java
===================================================================
--- core/branches/Branch_3_2/src/org/hibernate/engine/ActionQueue.java 2008-02-03 05:56:39 UTC (rev 14307)
+++ core/branches/Branch_3_2/src/org/hibernate/engine/ActionQueue.java 2008-02-03 05:57:08 UTC (rev 14308)
@@ -1,31 +1,57 @@
-// $Id$
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Middleware LLC.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ *
+ */
package org.hibernate.engine;
-import org.hibernate.action.EntityInsertAction;
-import org.hibernate.action.EntityDeleteAction;
-import org.hibernate.action.Executable;
-import org.hibernate.action.EntityUpdateAction;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.hibernate.AssertionFailure;
+import org.hibernate.HibernateException;
+import org.hibernate.action.BulkOperationCleanupAction;
import org.hibernate.action.CollectionRecreateAction;
import org.hibernate.action.CollectionRemoveAction;
import org.hibernate.action.CollectionUpdateAction;
+import org.hibernate.action.EntityDeleteAction;
import org.hibernate.action.EntityIdentityInsertAction;
-import org.hibernate.action.BulkOperationCleanupAction;
-import org.hibernate.HibernateException;
-import org.hibernate.AssertionFailure;
+import org.hibernate.action.EntityInsertAction;
+import org.hibernate.action.EntityUpdateAction;
+import org.hibernate.action.Executable;
import org.hibernate.cache.CacheException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.hibernate.type.Type;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.io.ObjectInputStream;
-import java.io.IOException;
-import java.io.Serializable;
-import java.io.ObjectOutputStream;
-
/**
* Responsible for maintaining the queue of actions related to events.
* </p>
@@ -167,7 +193,7 @@
final boolean invalidateQueryCache = session.getFactory().getSettings().isQueryCacheEnabled();
for ( int i = 0; i < size; i++ ) {
try {
- Executable exec = ( Executable ) executions.get(i);
+ Executable exec = ( Executable ) executions.get( i );
try {
exec.afterTransactionCompletion( success );
}
@@ -177,11 +203,11 @@
}
}
}
- catch (CacheException ce) {
+ catch ( CacheException ce ) {
log.error( "could not release a cache lock", ce );
// continue loop
}
- catch (Exception e) {
+ catch ( Exception e ) {
throw new AssertionFailure( "Exception releasing cache locks", e );
}
}
@@ -193,16 +219,17 @@
* given the currently queued actions.
*
* @param tables The table/query-spaces to check.
+ *
* @return True if we contain pending actions against any of the given
- * tables; false otherwise.
+ * tables; false otherwise.
*/
public boolean areTablesToBeUpdated(Set tables) {
return areTablesToUpdated( updates, tables ) ||
- areTablesToUpdated( insertions, tables ) ||
- areTablesToUpdated( deletions, tables ) ||
- areTablesToUpdated( collectionUpdates, tables ) ||
- areTablesToUpdated( collectionCreations, tables ) ||
- areTablesToUpdated( collectionRemovals, tables );
+ areTablesToUpdated( insertions, tables ) ||
+ areTablesToUpdated( deletions, tables ) ||
+ areTablesToUpdated( collectionUpdates, tables ) ||
+ areTablesToUpdated( collectionCreations, tables ) ||
+ areTablesToUpdated( collectionRemovals, tables );
}
/**
@@ -217,10 +244,12 @@
private static boolean areTablesToUpdated(List executables, Set tablespaces) {
int size = executables.size();
for ( int j = 0; j < size; j++ ) {
- Serializable[] spaces = ( (Executable) executables.get(j) ).getPropertySpaces();
+ Serializable[] spaces = ( ( Executable ) executables.get( j ) ).getPropertySpaces();
for ( int i = 0; i < spaces.length; i++ ) {
if ( tablespaces.contains( spaces[i] ) ) {
- if ( log.isDebugEnabled() ) log.debug( "changes must be flushed to space: " + spaces[i] );
+ if ( log.isDebugEnabled() ) {
+ log.debug( "changes must be flushed to space: " + spaces[i] );
+ }
return true;
}
}
@@ -231,7 +260,7 @@
private void executeActions(List list) throws HibernateException {
int size = list.size();
for ( int i = 0; i < size; i++ ) {
- execute( (Executable) list.get(i) );
+ execute( ( Executable ) list.get( i ) );
}
list.clear();
session.getBatcher().executeBatch();
@@ -242,18 +271,18 @@
if ( executable.hasAfterTransactionCompletion() || lockQueryCache ) {
executions.add( executable );
}
- if (lockQueryCache) {
+ if ( lockQueryCache ) {
session.getFactory()
- .getUpdateTimestampsCache()
- .preinvalidate( executable.getPropertySpaces() );
+ .getUpdateTimestampsCache()
+ .preinvalidate( executable.getPropertySpaces() );
}
executable.execute();
}
private void prepareActions(List queue) throws HibernateException {
int size = queue.size();
- for ( int i=0; i<size; i++ ) {
- Executable executable = ( Executable ) queue.get(i);
+ for ( int i = 0; i < size; i++ ) {
+ Executable executable = ( Executable ) queue.get( i );
executable.beforeExecutions();
}
}
@@ -265,13 +294,13 @@
*/
public String toString() {
return new StringBuffer()
- .append("ActionQueue[insertions=").append(insertions)
- .append(" updates=").append(updates)
- .append(" deletions=").append(deletions)
- .append(" collectionCreations=").append(collectionCreations)
- .append(" collectionRemovals=").append(collectionRemovals)
- .append(" collectionUpdates=").append(collectionUpdates)
- .append("]")
+ .append( "ActionQueue[insertions=" ).append( insertions )
+ .append( " updates=" ).append( updates )
+ .append( " deletions=" ).append( deletions )
+ .append( " collectionCreations=" ).append( collectionCreations )
+ .append( " collectionRemovals=" ).append( collectionRemovals )
+ .append( " collectionUpdates=" ).append( collectionUpdates )
+ .append( "]" )
.toString();
}
@@ -328,73 +357,11 @@
* violations
*/
private void sortInsertActions() {
- // IMPLEMENTATION NOTES:
- //
- // The main data structure in this ordering algorithm is the 'positionToAction'
- // map. Essentially this can be thought of as an put-ordered map (the problem with
- // actually implementing it that way and doing away with the 'nameList' is that
- // we'd end up having potential duplicate key values). 'positionToAction' maitains
- // a mapping from a position within the 'nameList' structure to a "partial queue"
- // of actions.
-
- HashMap positionToAction = new HashMap();
- List nameList = new ArrayList();
-
- loopInsertion: while( !insertions.isEmpty() ) {
- EntityInsertAction action = ( EntityInsertAction ) insertions.remove( 0 );
- String thisEntityName = action.getEntityName();
-
- // see if we have already encountered this entity-name...
- if ( ! nameList.contains( thisEntityName ) ) {
- // we have not, so create the proper entries in nameList and positionToAction
- ArrayList segmentedActionQueue = new ArrayList();
- segmentedActionQueue.add( action );
- nameList.add( thisEntityName );
- positionToAction.put( new Integer( nameList.indexOf( thisEntityName ) ), segmentedActionQueue );
- }
- else {
- // we have seen it before, so we need to determine if this insert action is
- // is depenedent upon a previously processed action in terms of FK
- // relationships (this FK checking is done against the entity's property-state
- // associated with the action...)
- int lastPos = nameList.lastIndexOf( thisEntityName );
- Object[] states = action.getState();
- for ( int i = 0; i < states.length; i++ ) {
- for ( int j = 0; j < nameList.size(); j++ ) {
- ArrayList tmpList = ( ArrayList ) positionToAction.get( new Integer( j ) );
- for ( int k = 0; k < tmpList.size(); k++ ) {
- final EntityInsertAction checkAction = ( EntityInsertAction ) tmpList.get( k );
- if ( checkAction.getInstance() == states[i] && j > lastPos ) {
- // 'checkAction' is inserting an entity upon which 'action'
- // depends...
- // note: this is an assumption and may not be correct in the case of one-to-one
- ArrayList segmentedActionQueue = new ArrayList();
- segmentedActionQueue.add( action );
- nameList.add( thisEntityName );
- positionToAction.put(new Integer( nameList.lastIndexOf( thisEntityName ) ), segmentedActionQueue );
- continue loopInsertion;
- }
- }
- }
- }
-
- ArrayList actionQueue = ( ArrayList ) positionToAction.get( new Integer( lastPos ) );
- actionQueue.add( action );
- }
- }
-
- // now iterate back through positionToAction map and move entityInsertAction back to insertion list
- for ( int p = 0; p < nameList.size(); p++ ) {
- ArrayList actionQueue = ( ArrayList ) positionToAction.get( new Integer( p ) );
- Iterator itr = actionQueue.iterator();
- while ( itr.hasNext() ) {
- insertions.add( itr.next() );
- }
- }
+ new InsertActionSorter().sort();
}
public ArrayList cloneDeletions() {
- return (ArrayList) deletions.clone();
+ return ( ArrayList ) deletions.clone();
}
public void clearFromFlushNeededCheck(int previousCollectionRemovalSize) {
@@ -403,18 +370,18 @@
updates.clear();
// collection deletions are a special case since update() can add
// deletions of collections not loaded by the session.
- for ( int i = collectionRemovals.size()-1; i >= previousCollectionRemovalSize; i-- ) {
- collectionRemovals.remove(i);
+ for ( int i = collectionRemovals.size() - 1; i >= previousCollectionRemovalSize; i-- ) {
+ collectionRemovals.remove( i );
}
}
public boolean hasAnyQueuedActions() {
return updates.size() > 0 ||
- insertions.size() > 0 ||
- deletions.size() > 0 ||
- collectionUpdates.size() > 0 ||
- collectionRemovals.size() > 0 ||
- collectionCreations.size() > 0;
+ insertions.size() > 0 ||
+ deletions.size() > 0 ||
+ collectionUpdates.size() > 0 ||
+ collectionRemovals.size() > 0 ||
+ collectionCreations.size() > 0;
}
/**
@@ -422,6 +389,7 @@
* action queue
*
* @param oos The stream to which the action queue should get written
+ *
* @throws IOException
*/
public void serialize(ObjectOutputStream oos) throws IOException {
@@ -475,11 +443,12 @@
* action queue
*
* @param ois The stream from which to read the action queue
+ *
* @throws IOException
*/
public static ActionQueue deserialize(
ObjectInputStream ois,
- SessionImplementor session) throws IOException, ClassNotFoundException {
+ SessionImplementor session) throws IOException, ClassNotFoundException {
log.trace( "deserializing action-queue" );
ActionQueue rtn = new ActionQueue( session );
@@ -527,4 +496,120 @@
return rtn;
}
+
+ /**
+ * Sorts the insert actions using more hashes.
+ *
+ * @author Jay Erb
+ */
+ private class InsertActionSorter {
+
+ // the mapping of entity names to their latest batch numbers.
+ private HashMap latestBatches = new HashMap();
+ private HashMap entityBatchNumber;
+
+ // the map of batch numbers to EntityInsertAction lists
+ private HashMap actionBatches = new HashMap();
+
+ public InsertActionSorter() {
+ //optimize the hash size to eliminate a rehash.
+ entityBatchNumber = new HashMap( insertions.size() + 1, 1.0f );
+ }
+
+ /**
+ * Sort the insert actions.
+ */
+ public void sort() {
+
+ // the list of entity names that indicate the batch number
+ for ( Iterator actionItr = insertions.iterator(); actionItr.hasNext(); ) {
+ EntityInsertAction action = ( EntityInsertAction ) actionItr.next();
+ // remove the current element from insertions. It will be added back later.
+ String entityName = action.getEntityName();
+
+ // the entity associated with the current action.
+ Object currentEntity = action.getInstance();
+
+ Integer batchNumber;
+ if ( latestBatches.containsKey( entityName ) ) {
+ // There is already an existing batch for this type of entity.
+ // Check to see if the latest batch is acceptable.
+ batchNumber = findBatchNumber( action, entityName );
+ }
+ else {
+ // add an entry for this type of entity.
+ // we can be assured that all referenced entities have already
+ // been processed,
+ // so specify that this entity is with the latest batch.
+ // doing the batch number before adding the name to the list is
+ // a faster way to get an accurate number.
+
+ batchNumber = new Integer( actionBatches.size() );
+ latestBatches.put( entityName, batchNumber );
+ }
+ entityBatchNumber.put( currentEntity, batchNumber );
+ addToBatch( batchNumber, action );
+ }
+ insertions.clear();
+
+ // now rebuild the insertions list. There is a batch for each entry in the name list.
+ for ( int i = 0; i < actionBatches.size(); i++ ) {
+ List batch = ( List ) actionBatches.get( new Integer( i ) );
+ for ( Iterator batchItr = batch.iterator(); batchItr.hasNext(); ) {
+ EntityInsertAction action = ( EntityInsertAction ) batchItr.next();
+ insertions.add( action );
+ }
+ }
+ }
+
+ /**
+ * Finds an acceptable batch for this entity to be a member.
+ */
+ private Integer findBatchNumber(EntityInsertAction action,
+ String entityName) {
+ // loop through all the associated entities and make sure they have been
+ // processed before the latest
+ // batch associated with this entity type.
+
+ // the current batch number is the latest batch for this entity type.
+ Integer latestBatchNumberForType = ( Integer ) latestBatches.get( entityName );
+
+ // loop through all the associations of the current entity and make sure that they are processed
+ // before the current batch number
+ Object[] propertyValues = action.getState();
+ Type[] propertyTypes = action.getPersister().getClassMetadata()
+ .getPropertyTypes();
+
+ for ( int i = 0; i < propertyValues.length; i++ ) {
+ Object value = propertyValues[i];
+ Type type = propertyTypes[i];
+ if ( type.isEntityType() && value != null ) {
+ // find the batch number associated with the current association, if any.
+ Integer associationBatchNumber = ( Integer ) entityBatchNumber.get( value );
+ if ( associationBatchNumber != null && associationBatchNumber.compareTo( latestBatchNumberForType ) > 0 ) {
+ // create a new batch for this type. The batch number is the number of current batches.
+ latestBatchNumberForType = new Integer( actionBatches.size() );
+ latestBatches.put( entityName, latestBatchNumberForType );
+ // since this entity will now be processed in the latest possible batch,
+ // we can be assured that it will come after all other associations,
+ // there's not need to continue checking.
+ break;
+ }
+ }
+ }
+ return latestBatchNumberForType;
+ }
+
+ private void addToBatch(Integer batchNumber, EntityInsertAction action) {
+ List actions = ( List ) actionBatches.get( batchNumber );
+
+ if ( actions == null ) {
+ actions = new LinkedList();
+ actionBatches.put( batchNumber, actions );
+ }
+ actions.add( action );
+ }
+
+ }
+
}
16 years, 2 months
- 1
- 0
Hibernate SVN: r14307 - core/trunk/core/src/main/java/org/hibernate/engine.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2008-02-03 00:56:39 -0500 (Sun, 03 Feb 2008)
New Revision: 14307
Modified:
core/trunk/core/src/main/java/org/hibernate/engine/ActionQueue.java
Log:
HHH-2957 : ActionQueue insertions sorting performance
Modified: core/trunk/core/src/main/java/org/hibernate/engine/ActionQueue.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/engine/ActionQueue.java 2008-02-02 07:51:59 UTC (rev 14306)
+++ core/trunk/core/src/main/java/org/hibernate/engine/ActionQueue.java 2008-02-03 05:56:39 UTC (rev 14307)
@@ -1,31 +1,57 @@
-// $Id: ActionQueue.java 11402 2007-04-11 14:24:35Z steve.ebersole(a)jboss.com $
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2007, Red Hat Middleware LLC or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Middleware LLC.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ *
+ */
package org.hibernate.engine;
-import org.hibernate.action.EntityInsertAction;
-import org.hibernate.action.EntityDeleteAction;
-import org.hibernate.action.Executable;
-import org.hibernate.action.EntityUpdateAction;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.hibernate.AssertionFailure;
+import org.hibernate.HibernateException;
+import org.hibernate.action.BulkOperationCleanupAction;
import org.hibernate.action.CollectionRecreateAction;
import org.hibernate.action.CollectionRemoveAction;
import org.hibernate.action.CollectionUpdateAction;
+import org.hibernate.action.EntityDeleteAction;
import org.hibernate.action.EntityIdentityInsertAction;
-import org.hibernate.action.BulkOperationCleanupAction;
-import org.hibernate.HibernateException;
-import org.hibernate.AssertionFailure;
+import org.hibernate.action.EntityInsertAction;
+import org.hibernate.action.EntityUpdateAction;
+import org.hibernate.action.Executable;
import org.hibernate.cache.CacheException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.hibernate.type.Type;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.io.ObjectInputStream;
-import java.io.IOException;
-import java.io.Serializable;
-import java.io.ObjectOutputStream;
-
/**
* Responsible for maintaining the queue of actions related to events.
* </p>
@@ -167,7 +193,7 @@
final boolean invalidateQueryCache = session.getFactory().getSettings().isQueryCacheEnabled();
for ( int i = 0; i < size; i++ ) {
try {
- Executable exec = ( Executable ) executions.get(i);
+ Executable exec = ( Executable ) executions.get( i );
try {
exec.afterTransactionCompletion( success );
}
@@ -177,11 +203,11 @@
}
}
}
- catch (CacheException ce) {
+ catch ( CacheException ce ) {
log.error( "could not release a cache lock", ce );
// continue loop
}
- catch (Exception e) {
+ catch ( Exception e ) {
throw new AssertionFailure( "Exception releasing cache locks", e );
}
}
@@ -193,16 +219,17 @@
* given the currently queued actions.
*
* @param tables The table/query-spaces to check.
+ *
* @return True if we contain pending actions against any of the given
- * tables; false otherwise.
+ * tables; false otherwise.
*/
public boolean areTablesToBeUpdated(Set tables) {
return areTablesToUpdated( updates, tables ) ||
- areTablesToUpdated( insertions, tables ) ||
- areTablesToUpdated( deletions, tables ) ||
- areTablesToUpdated( collectionUpdates, tables ) ||
- areTablesToUpdated( collectionCreations, tables ) ||
- areTablesToUpdated( collectionRemovals, tables );
+ areTablesToUpdated( insertions, tables ) ||
+ areTablesToUpdated( deletions, tables ) ||
+ areTablesToUpdated( collectionUpdates, tables ) ||
+ areTablesToUpdated( collectionCreations, tables ) ||
+ areTablesToUpdated( collectionRemovals, tables );
}
/**
@@ -217,10 +244,12 @@
private static boolean areTablesToUpdated(List executables, Set tablespaces) {
int size = executables.size();
for ( int j = 0; j < size; j++ ) {
- Serializable[] spaces = ( (Executable) executables.get(j) ).getPropertySpaces();
+ Serializable[] spaces = ( ( Executable ) executables.get( j ) ).getPropertySpaces();
for ( int i = 0; i < spaces.length; i++ ) {
if ( tablespaces.contains( spaces[i] ) ) {
- if ( log.isDebugEnabled() ) log.debug( "changes must be flushed to space: " + spaces[i] );
+ if ( log.isDebugEnabled() ) {
+ log.debug( "changes must be flushed to space: " + spaces[i] );
+ }
return true;
}
}
@@ -231,7 +260,7 @@
private void executeActions(List list) throws HibernateException {
int size = list.size();
for ( int i = 0; i < size; i++ ) {
- execute( (Executable) list.get(i) );
+ execute( ( Executable ) list.get( i ) );
}
list.clear();
session.getBatcher().executeBatch();
@@ -242,18 +271,18 @@
if ( executable.hasAfterTransactionCompletion() || lockQueryCache ) {
executions.add( executable );
}
- if (lockQueryCache) {
+ if ( lockQueryCache ) {
session.getFactory()
- .getUpdateTimestampsCache()
- .preinvalidate( executable.getPropertySpaces() );
+ .getUpdateTimestampsCache()
+ .preinvalidate( executable.getPropertySpaces() );
}
executable.execute();
}
private void prepareActions(List queue) throws HibernateException {
int size = queue.size();
- for ( int i=0; i<size; i++ ) {
- Executable executable = ( Executable ) queue.get(i);
+ for ( int i = 0; i < size; i++ ) {
+ Executable executable = ( Executable ) queue.get( i );
executable.beforeExecutions();
}
}
@@ -265,13 +294,13 @@
*/
public String toString() {
return new StringBuffer()
- .append("ActionQueue[insertions=").append(insertions)
- .append(" updates=").append(updates)
- .append(" deletions=").append(deletions)
- .append(" collectionCreations=").append(collectionCreations)
- .append(" collectionRemovals=").append(collectionRemovals)
- .append(" collectionUpdates=").append(collectionUpdates)
- .append("]")
+ .append( "ActionQueue[insertions=" ).append( insertions )
+ .append( " updates=" ).append( updates )
+ .append( " deletions=" ).append( deletions )
+ .append( " collectionCreations=" ).append( collectionCreations )
+ .append( " collectionRemovals=" ).append( collectionRemovals )
+ .append( " collectionUpdates=" ).append( collectionUpdates )
+ .append( "]" )
.toString();
}
@@ -319,8 +348,7 @@
}
/**
- * Provided the option is set ({@link org.hibernate.cfg.Environment#ORDER_INSERTS}),
- * then order the {@link #insertions} queue such that we group inserts
+ * Order the {@link #insertions} queue such that we group inserts
* against the same entity together (without violating constraints). The
* original order is generated by cascade order, which in turn is based on
* the directionality of foreign-keys. So even though we will be changing
@@ -329,73 +357,11 @@
* violations
*/
private void sortInsertActions() {
- // IMPLEMENTATION NOTES:
- //
- // The main data structure in this ordering algorithm is the 'positionToAction'
- // map. Essentially this can be thought of as an put-ordered map (the problem with
- // actually implementing it that way and doing away with the 'nameList' is that
- // we'd end up having potential duplicate key values). 'positionToAction' maitains
- // a mapping from a position within the 'nameList' structure to a "partial queue"
- // of actions.
-
- HashMap positionToAction = new HashMap();
- List nameList = new ArrayList();
-
- loopInsertion: while( !insertions.isEmpty() ) {
- EntityInsertAction action = ( EntityInsertAction ) insertions.remove( 0 );
- String thisEntityName = action.getEntityName();
-
- // see if we have already encountered this entity-name...
- if ( ! nameList.contains( thisEntityName ) ) {
- // we have not, so create the proper entries in nameList and positionToAction
- ArrayList segmentedActionQueue = new ArrayList();
- segmentedActionQueue.add( action );
- nameList.add( thisEntityName );
- positionToAction.put( new Integer( nameList.indexOf( thisEntityName ) ), segmentedActionQueue );
- }
- else {
- // we have seen it before, so we need to determine if this insert action is
- // is depenedent upon a previously processed action in terms of FK
- // relationships (this FK checking is done against the entity's property-state
- // associated with the action...)
- int lastPos = nameList.lastIndexOf( thisEntityName );
- Object[] states = action.getState();
- for ( int i = 0; i < states.length; i++ ) {
- for ( int j = 0; j < nameList.size(); j++ ) {
- ArrayList tmpList = ( ArrayList ) positionToAction.get( new Integer( j ) );
- for ( int k = 0; k < tmpList.size(); k++ ) {
- final EntityInsertAction checkAction = ( EntityInsertAction ) tmpList.get( k );
- if ( checkAction.getInstance() == states[i] && j > lastPos ) {
- // 'checkAction' is inserting an entity upon which 'action'
- // depends...
- // note: this is an assumption and may not be correct in the case of one-to-one
- ArrayList segmentedActionQueue = new ArrayList();
- segmentedActionQueue.add( action );
- nameList.add( thisEntityName );
- positionToAction.put(new Integer( nameList.lastIndexOf( thisEntityName ) ), segmentedActionQueue );
- continue loopInsertion;
- }
- }
- }
- }
-
- ArrayList actionQueue = ( ArrayList ) positionToAction.get( new Integer( lastPos ) );
- actionQueue.add( action );
- }
- }
-
- // now iterate back through positionToAction map and move entityInsertAction back to insertion list
- for ( int p = 0; p < nameList.size(); p++ ) {
- ArrayList actionQueue = ( ArrayList ) positionToAction.get( new Integer( p ) );
- Iterator itr = actionQueue.iterator();
- while ( itr.hasNext() ) {
- insertions.add( itr.next() );
- }
- }
+ new InsertActionSorter().sort();
}
public ArrayList cloneDeletions() {
- return (ArrayList) deletions.clone();
+ return ( ArrayList ) deletions.clone();
}
public void clearFromFlushNeededCheck(int previousCollectionRemovalSize) {
@@ -404,18 +370,18 @@
updates.clear();
// collection deletions are a special case since update() can add
// deletions of collections not loaded by the session.
- for ( int i = collectionRemovals.size()-1; i >= previousCollectionRemovalSize; i-- ) {
- collectionRemovals.remove(i);
+ for ( int i = collectionRemovals.size() - 1; i >= previousCollectionRemovalSize; i-- ) {
+ collectionRemovals.remove( i );
}
}
public boolean hasAnyQueuedActions() {
return updates.size() > 0 ||
- insertions.size() > 0 ||
- deletions.size() > 0 ||
- collectionUpdates.size() > 0 ||
- collectionRemovals.size() > 0 ||
- collectionCreations.size() > 0;
+ insertions.size() > 0 ||
+ deletions.size() > 0 ||
+ collectionUpdates.size() > 0 ||
+ collectionRemovals.size() > 0 ||
+ collectionCreations.size() > 0;
}
/**
@@ -423,6 +389,7 @@
* action queue
*
* @param oos The stream to which the action queue should get written
+ *
* @throws IOException
*/
public void serialize(ObjectOutputStream oos) throws IOException {
@@ -476,11 +443,12 @@
* action queue
*
* @param ois The stream from which to read the action queue
+ *
* @throws IOException
*/
public static ActionQueue deserialize(
ObjectInputStream ois,
- SessionImplementor session) throws IOException, ClassNotFoundException {
+ SessionImplementor session) throws IOException, ClassNotFoundException {
log.trace( "deserializing action-queue" );
ActionQueue rtn = new ActionQueue( session );
@@ -528,4 +496,120 @@
return rtn;
}
+
+ /**
+ * Sorts the insert actions using more hashes.
+ *
+ * @author Jay Erb
+ */
+ private class InsertActionSorter {
+
+ // the mapping of entity names to their latest batch numbers.
+ private HashMap latestBatches = new HashMap();
+ private HashMap entityBatchNumber;
+
+ // the map of batch numbers to EntityInsertAction lists
+ private HashMap actionBatches = new HashMap();
+
+ public InsertActionSorter() {
+ //optimize the hash size to eliminate a rehash.
+ entityBatchNumber = new HashMap( insertions.size() + 1, 1.0f );
+ }
+
+ /**
+ * Sort the insert actions.
+ */
+ public void sort() {
+
+ // the list of entity names that indicate the batch number
+ for ( Iterator actionItr = insertions.iterator(); actionItr.hasNext(); ) {
+ EntityInsertAction action = ( EntityInsertAction ) actionItr.next();
+ // remove the current element from insertions. It will be added back later.
+ String entityName = action.getEntityName();
+
+ // the entity associated with the current action.
+ Object currentEntity = action.getInstance();
+
+ Integer batchNumber;
+ if ( latestBatches.containsKey( entityName ) ) {
+ // There is already an existing batch for this type of entity.
+ // Check to see if the latest batch is acceptable.
+ batchNumber = findBatchNumber( action, entityName );
+ }
+ else {
+ // add an entry for this type of entity.
+ // we can be assured that all referenced entities have already
+ // been processed,
+ // so specify that this entity is with the latest batch.
+ // doing the batch number before adding the name to the list is
+ // a faster way to get an accurate number.
+
+ batchNumber = new Integer( actionBatches.size() );
+ latestBatches.put( entityName, batchNumber );
+ }
+ entityBatchNumber.put( currentEntity, batchNumber );
+ addToBatch( batchNumber, action );
+ }
+ insertions.clear();
+
+ // now rebuild the insertions list. There is a batch for each entry in the name list.
+ for ( int i = 0; i < actionBatches.size(); i++ ) {
+ List batch = ( List ) actionBatches.get( new Integer( i ) );
+ for ( Iterator batchItr = batch.iterator(); batchItr.hasNext(); ) {
+ EntityInsertAction action = ( EntityInsertAction ) batchItr.next();
+ insertions.add( action );
+ }
+ }
+ }
+
+ /**
+ * Finds an acceptable batch for this entity to be a member.
+ */
+ private Integer findBatchNumber(EntityInsertAction action,
+ String entityName) {
+ // loop through all the associated entities and make sure they have been
+ // processed before the latest
+ // batch associated with this entity type.
+
+ // the current batch number is the latest batch for this entity type.
+ Integer latestBatchNumberForType = ( Integer ) latestBatches.get( entityName );
+
+ // loop through all the associations of the current entity and make sure that they are processed
+ // before the current batch number
+ Object[] propertyValues = action.getState();
+ Type[] propertyTypes = action.getPersister().getClassMetadata()
+ .getPropertyTypes();
+
+ for ( int i = 0; i < propertyValues.length; i++ ) {
+ Object value = propertyValues[i];
+ Type type = propertyTypes[i];
+ if ( type.isEntityType() && value != null ) {
+ // find the batch number associated with the current association, if any.
+ Integer associationBatchNumber = ( Integer ) entityBatchNumber.get( value );
+ if ( associationBatchNumber != null && associationBatchNumber.compareTo( latestBatchNumberForType ) > 0 ) {
+ // create a new batch for this type. The batch number is the number of current batches.
+ latestBatchNumberForType = new Integer( actionBatches.size() );
+ latestBatches.put( entityName, latestBatchNumberForType );
+ // since this entity will now be processed in the latest possible batch,
+ // we can be assured that it will come after all other associations,
+ // there's not need to continue checking.
+ break;
+ }
+ }
+ }
+ return latestBatchNumberForType;
+ }
+
+ private void addToBatch(Integer batchNumber, EntityInsertAction action) {
+ List actions = ( List ) actionBatches.get( batchNumber );
+
+ if ( actions == null ) {
+ actions = new LinkedList();
+ actionBatches.put( batchNumber, actions );
+ }
+ actions.add( action );
+ }
+
+ }
+
}
16 years, 2 months
- 1
- 0
Hibernate SVN: r14306 - core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-02-02 02:51:59 -0500 (Sat, 02 Feb 2008)
New Revision: 14306
Modified:
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/build.xml
Log:
JBPAPP-595 : minor corrections (already included in the distribution provided to rel-eng)
Modified: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/build.xml
===================================================================
--- core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/build.xml 2008-02-01 22:32:28 UTC (rev 14305)
+++ core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/build.xml 2008-02-02 07:51:59 UTC (rev 14306)
@@ -28,6 +28,9 @@
<property name="version.major_minor" value="${version.major}.${version.minor}"/>
<property name="fullname" value="${name}-${version.full}"/>
+ <!-- ${version.cp} is only used on the zip and tar files generated by "ant dist" -->
+ <property name="version.cp" value="cp01"/>
+
<!-- Various SCM-controlled directories -->
<property name="dir.src" value="src" />
<property name="dir.test" value="test" />
@@ -617,7 +620,7 @@
<replacevalue><![CDATA[name="dir.jdbc" value="lib"]]></replacevalue>
</replace>
- <zip zipfile="${dir.dist}/${fullname}.zip">
+ <zip zipfile="${dir.dist}/${fullname}.${version.cp}.zip">
<zipfileset prefix="${name}-${version.major_minor}/doc/reference" dir="${dir.doc.ref}/build" />
<zipfileset prefix="${name}-${version.major_minor}/doc/tutorial" dir="${dir.doc.ref}/tutorial" >
<include name="src/**" />
@@ -631,6 +634,8 @@
<zipfileset prefix="${name}-${version.major_minor}/eg" dir="${dir.eg}"/>
<zipfileset prefix="${name}-${version.major_minor}/etc" dir="${dir.etc}"/>
<zipfileset prefix="${name}-${version.major_minor}/grammar" dir="${dir.grammar}"/>
+ <zipfileset prefix="${name}-${version.major_minor}/lib" dir="${dir.build}/versioncheck"/>
+ <zipfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/version.properties"/>
<zipfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/antlr.jar"/>
<zipfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/asm-attrs.jar"/>
<zipfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/asm.jar"/>
@@ -654,9 +659,9 @@
<zipfileset prefix="${name}-${version.major_minor}" file="${dir.dist}/build.xml" />
<zipfileset prefix="${name}-${version.major_minor}" file="${dir.build}/${jar.name}.jar" />
</zip>
- <checksum file="${dir.dist}/${fullname}.zip" algorithm="MD5" fileext=".md5.txt"/>
+ <checksum file="${dir.dist}/${fullname}.${version.cp}.zip" algorithm="MD5" fileext=".md5.txt"/>
- <tar tarfile="${dir.dist}/${fullname}.tar">
+ <tar tarfile="${dir.dist}/${fullname}.${version.cp}.tar">
<tarfileset prefix="${name}-${version.major_minor}/doc/reference" dir="${dir.doc.ref}/build" />
<tarfileset prefix="${name}-${version.major_minor}/doc/tutorial" dir="${dir.doc.ref}/tutorial" >
<include name="src/**" />
@@ -670,6 +675,8 @@
<tarfileset prefix="${name}-${version.major_minor}/eg" dir="${dir.eg}"/>
<tarfileset prefix="${name}-${version.major_minor}/etc" dir="${dir.etc}"/>
<tarfileset prefix="${name}-${version.major_minor}/grammar" dir="${dir.grammar}"/>
+ <tarfileset prefix="${name}-${version.major_minor}/lib" dir="${dir.build}/versioncheck"/>
+ <tarfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/version.properties"/>
<tarfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/antlr.jar"/>
<tarfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/asm-attrs.jar"/>
<tarfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/asm.jar"/>
@@ -693,8 +700,8 @@
<tarfileset prefix="${name}-${version.major_minor}" file="${dir.dist}/build.xml" />
<tarfileset prefix="${name}-${version.major_minor}" file="${dir.build}/${jar.name}.jar" />
</tar>
- <gzip src="${dir.dist}/${fullname}.tar" zipfile="${dir.dist}/${fullname}.tar.gz"/>
- <checksum file="${dir.dist}/${fullname}.tar.gz" algorithm="MD5" fileext=".md5.txt"/>
+ <gzip src="${dir.dist}/${fullname}.${version.cp}.tar" zipfile="${dir.dist}/${fullname}.${version.cp}.tar.gz"/>
+ <checksum file="${dir.dist}/${fullname}.${version.cp}.tar.gz" algorithm="MD5" fileext=".md5.txt"/>
<delete file="${dir.dist}/${fullname}.tar"/>
<delete file="${dir.dist}/build.xml"/>
16 years, 2 months
- 1
- 0
Hibernate SVN: r14305 - in core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE: lib and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2008-02-01 17:32:28 -0500 (Fri, 01 Feb 2008)
New Revision: 14305
Added:
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/JBossORG-EULA.txt
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/antlr.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/apache-1.1.txt
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/apache-2.0.txt
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/c3p0.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/cglib-dep.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/commons-collections.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/commons-logging.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/concurrent.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/dom4j.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/ehcache.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jacc.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jaxen.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jboss-cache-jdk50.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jgroups.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/log4j.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/oscache.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/proxool.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/swarmcache.jar
Removed:
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/antlr-2.7.6.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/apache.license-2.0.txt
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/apache.license.txt
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/c3p0-0.9.1.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/cglib-2.1.3.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/commons-collections-2.1.1.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/commons-logging-1.0.4.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/concurrent-1.3.2.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/connector.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/connector.licence.txt
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/dom4j-1.6.1.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/ehcache-1.2.3.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jacc-1_0-fr.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jaxen-1.1-beta-7.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jboss-cache.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jdbc2_0-stdext.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jdbc2_0-stdext.licence.txt
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jgroups-2.2.8.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/log4j-1.2.11.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/oscache-2.1.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/proxool-0.8.3.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/swarmcache-1.0rc2.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/xerces-2.6.2.jar
Modified:
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/build.xml
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/changelog.txt
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/asm-attrs.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/asm.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/javassist.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jboss-common.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jboss-jmx.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jboss-system.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/version.properties
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/xml-apis.jar
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/readme.txt
Log:
JBPAPP-595 : Updates for hibernate-core standalone distribution for EAP 4.2.0-2 CP01
Added: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/JBossORG-EULA.txt
===================================================================
--- core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/JBossORG-EULA.txt (rev 0)
+++ core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/JBossORG-EULA.txt 2008-02-01 22:32:28 UTC (rev 14305)
@@ -0,0 +1,127 @@
+END USER LICENSE AGREEMENT
+JBOSS(r) ENTERPRISE MIDDLEWARE(TM)
+
+This end user license agreement ("EULA") governs the use of the various
+software modules that collectively comprise the JBoss Enterprise Middleware
+and any related updates, source code, appearance, structure and organization
+(the "Programs"), regardless of the delivery mechanism.
+
+1. License Grant. Subject to the following terms, Red Hat, Inc. ("Red Hat")
+grants to you ("User") a license to the Programs pursuant to the GNU Lesser
+General Public License v. 2.1 except for the following Programs: (a) JBoss
+Portal Forums and JBoss Transactions, each of which is licensed pursuant to
+the GNU General Public License v.2; (b) JBoss Rules, which is licensed
+pursuant to the Apache License v.2.0; (c) an optional download for JBoss Cache
+for the Berkeley DB for Java database, which is licensed under the (open
+source) Sleepycat License (if User wishes to obtain a commercial license for
+this database, it may purchase a license from Sleepycat Software); and (d) the
+BPEL extension for JBoss jBPM, which is licensed under the Common Public
+License v.1, and, pursuant to the OASIS BPEL4WS standard, requires parties
+wishing to redistribute to enter various royalty-free patent licenses. Each of
+the foregoing licenses is available at
+www.opensource.org/licenses/alphabetical. The Programs are comprised of
+hundreds of software components. With the exception of certain image files
+identified in Section 2 below, the license agreement for each software
+component is located in the software component's source code and permits User
+to run, copy, modify, and redistribute (subject to certain obligations in some
+cases) the software component, in both source code and binary code forms. This
+agreement does not limit User's rights under, or grant User rights that
+supersede, the license terms of any particular component.
+
+2. Intellectual Property Rights. The Programs and each of their components are
+owned by Red Hat and others and are protected under copyright law and under
+other laws as applicable. Title to the Programs and any component, or to any
+copy, modification, or merged portion shall remain with the aforementioned,
+subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark,
+the individual Program trademarks, and the "Shadowman" logo are registered
+trademarks of Red Hat and its affiliates in the U.S. and other countries. This
+EULA does not permit User to distribute the Programs using Red Hat's
+trademarks, regardless of whether they have been modified. User should read
+the information found at http://www.redhat.com/about/corporate/trademark/
+before distributing a copy of the Programs. User may make a commercial
+redistribution of the Programs only if (a) a separate agreement with Red Hat
+authorizing such commercial redistribution is executed or other written
+permission is granted by Red Hat or (b) User must replace all Red Hat
+trademarks as well as the logos identified at
+http://www.jboss.com/company/logos. Merely deleting the files containing the
+Red Hat trademarks and logos may corrupt the Programs.
+
+3. Limited Warranty. Except as specifically stated in this Section 3, a
+separate agreement with Red Hat, or a license for a particular component, to
+the maximum extent permitted under applicable law, the Programs and the
+components are provided and licensed "as is" without warranty of any kind,
+expressed or implied, including the implied warranties of merchantability,
+non-infringement or fitness for a particular purpose. Red Hat warrants that
+the media on which Programs and the components are furnished will be free from
+defects in materials and manufacture under normal use for a period of 30 days
+from the date of delivery to User. Red Hat does not warrant that the functions
+contained in the Programs will meet User's requirements or that the operation
+of the Programs will be entirely error free, appear precisely as described in
+the accompanying documentation, or comply with regulatory requirements. This
+warranty extends only to the party that purchases services pertaining to the
+Programs from Red Hat or a Red Hat authorized distributor.
+
+4. Limitation of Remedies and Liability. To the maximum extent permitted by
+applicable law, User's exclusive remedy under this EULA is to return any
+defective media within 30 days of delivery along with a copy of User's payment
+receipt and Red Hat, at its option, will replace it or refund the money paid
+by User for the media. To the maximum extent permitted under applicable law,
+neither Red Hat, any Red Hat authorized distributor, nor the licensor of any
+component provided to User under this EULA will be liable to User for any
+incidental or consequential damages, including lost profits or lost savings
+arising out of the use or inability to use the Programs or any component, even
+if Red Hat, such authorized distributor, or licensor has been advised of the
+possibility of such damages. In no event shall Red Hat's liability, an
+authorized distributor's liability or the liability of the licensor of a
+component provided to User under this EULA exceed the amount that User paid to
+Red Hat under this EULA during the twelve months preceding the action.
+
+5. Export Control. As required by the laws of the United States and other
+countries, User represents and warrants that it: (a) understands that the
+Programs and their components are subject to export controls under the U.S.
+Commerce Department's Export Administration Regulations ("EAR"); (b) is not
+located in a prohibited destination country under the EAR or U.S. sanctions
+regulations (currently Cuba, Iran, Iraq, North Korea, Sudan and Syria, subject
+to change as posted by the United States government); (c) will not export,
+re-export, or transfer the Programs to any prohibited destination or entities
+on the U.S. Bureau of Industry and Security Denied Parties List or Entity
+List, or the U.S. Office of Foreign Assets Control list of Specially
+Designated Nationals and Blocked Persons, or any similar lists maintained by
+other countries, without the necessary export license(s) or authorizations(s);
+(d) will not use or transfer the Programs for use in connection with any
+nuclear, chemical or biological weapons, missile technology, or military
+end-uses where prohibited by an applicable arms embargo, unless authorized by
+the relevant government agency individual without the necessary export
+license(s) or authorizations(s) from the U.S. Government; (e) understands and
+agrees that if it is in the United States and exports or transfers the
+Programs to eligible end users, it will, to the extent required by EAR Section
+740.17(e), submit semi-annual reports to the Commerce Department's Bureau of
+Industry and Security, which include the name and address (including country)
+of each transferee; and (f) understands that countries including the United
+States may restrict the import, use, or export of encryption products (which
+may include the Programs and the components) and agrees that it shall be
+solely responsible for compliance with any such import, use, or export
+restrictions.
+
+6. Third Party Programs. Red Hat may distribute third party software programs
+with the Programs that are not part of the Programs. These third party
+software programs are not required to run the Programs, are provided as a
+convenience to User, and are subject to their own license terms. The license
+terms either accompany the third party software programs or can be viewed at
+http://www.redhat.com/licenses/thirdparty/eula.html. If User does not agree to
+abide by the applicable license terms for the third party software programs,
+then User may not install them. If User wishes to install the third party
+software programs on more than one system or transfer the programs to another
+party, then User must contact the licensor of the applicable third party
+software programs.
+
+7. General. If any provision of this agreement is held to be unenforceable,
+that shall not affect the enforceability of the remaining provisions. This
+License Agreement shall be governed by the laws of the State of New York and
+of the United States, without regard to any conflict of laws provisions. The
+rights and obligations of the parties to this EULA shall not be governed by
+the United Nations Convention on the International Sale of Goods.
+
+Copyright (c) 2007 Red Hat, Inc. All rights reserved. "JBoss" and the JBoss logo
+are registered trademarks of Red Hat, Inc. All other trademarks are the
+property of their respective owners.
Modified: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/build.xml
===================================================================
--- core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/build.xml 2008-02-01 17:04:42 UTC (rev 14304)
+++ core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/build.xml 2008-02-01 22:32:28 UTC (rev 14305)
@@ -631,12 +631,22 @@
<zipfileset prefix="${name}-${version.major_minor}/eg" dir="${dir.eg}"/>
<zipfileset prefix="${name}-${version.major_minor}/etc" dir="${dir.etc}"/>
<zipfileset prefix="${name}-${version.major_minor}/grammar" dir="${dir.grammar}"/>
- <zipfileset prefix="${name}-${version.major_minor}/lib" dir="${dir.lib}"/>
- <zipfileset prefix="${name}-${version.major_minor}/lib" dir="${dir.build}/versioncheck"/>
+ <zipfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/antlr.jar"/>
+ <zipfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/asm-attrs.jar"/>
+ <zipfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/asm.jar"/>
+ <zipfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/cglib.jar"/>
+ <zipfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/commons-collections.jar"/>
+ <zipfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/commons-logging.jar"/>
+ <zipfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/dom4j.jar"/>
+ <zipfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/javassist.jar"/>
+ <zipfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/jaxen.jar"/>
+ <zipfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/jta.jar"/>
+ <zipfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/xml-apis.jar"/>
<zipfileset prefix="${name}-${version.major_minor}/src" dir="${dir.src}"/>
<zipfileset prefix="${name}-${version.major_minor}/test" dir="${dir.test}"/>
<zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/readme.txt" />
<zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/lgpl.txt" />
+ <zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/JBossORG-EULA.txt" />
<zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/changelog.txt" />
<zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/build.bat" />
<zipfileset prefix="${name}-${version.major_minor}" file="${basedir}/build.sh" />
@@ -653,18 +663,29 @@
<include name="lib/**" />
<include name="build.xml" />
<include name="runCleanDatabase.sh" />
+ <include name="web.xml" />
</tarfileset>
<tarfileset prefix="${name}-${version.major_minor}/doc/other" dir="${dir.doc}/other" />
<tarfileset prefix="${name}-${version.major_minor}/doc" dir="${dir.out.doc}" />
<tarfileset prefix="${name}-${version.major_minor}/eg" dir="${dir.eg}"/>
<tarfileset prefix="${name}-${version.major_minor}/etc" dir="${dir.etc}"/>
<tarfileset prefix="${name}-${version.major_minor}/grammar" dir="${dir.grammar}"/>
- <tarfileset prefix="${name}-${version.major_minor}/lib" dir="${dir.lib}"/>
- <tarfileset prefix="${name}-${version.major_minor}/lib" dir="${dir.build}/versioncheck"/>
+ <tarfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/antlr.jar"/>
+ <tarfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/asm-attrs.jar"/>
+ <tarfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/asm.jar"/>
+ <tarfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/cglib.jar"/>
+ <tarfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/commons-collections.jar"/>
+ <tarfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/commons-logging.jar"/>
+ <tarfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/dom4j.jar"/>
+ <tarfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/javassist.jar"/>
+ <tarfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/jaxen.jar"/>
+ <tarfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/jta.jar"/>
+ <tarfileset prefix="${name}-${version.major_minor}/lib" file="${dir.lib}/xml-apis.jar"/>
<tarfileset prefix="${name}-${version.major_minor}/src" dir="${dir.src}"/>
<tarfileset prefix="${name}-${version.major_minor}/test" dir="${dir.test}"/>
<tarfileset prefix="${name}-${version.major_minor}" file="${basedir}/readme.txt" />
<tarfileset prefix="${name}-${version.major_minor}" file="${basedir}/lgpl.txt" />
+ <tarfileset prefix="${name}-${version.major_minor}" file="${basedir}/JBossORG-EULA.txt" />
<tarfileset prefix="${name}-${version.major_minor}" file="${basedir}/changelog.txt" />
<tarfileset prefix="${name}-${version.major_minor}" file="${basedir}/build.bat" />
<tarfileset prefix="${name}-${version.major_minor}" file="${basedir}/build.sh" />
Modified: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/changelog.txt
===================================================================
--- core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/changelog.txt 2008-02-01 17:04:42 UTC (rev 14304)
+++ core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/changelog.txt 2008-02-01 22:32:28 UTC (rev 14305)
@@ -5,7 +5,22 @@
refer to the particular case on JIRA using the issue tracking number to learn
more about each case.
+Changes in version 3.2.4.sp1.cp01 (2008.02.01)
+-------------------------------------------
+** Bug
+ * [HHH-1569] - Immutable Natural Id check fails with ArrayIndexOutOfBounds in some cases
+ * [HHH-2631] - Leaking PreparedStatement and ResultSet via CollectionLoadContext instances maintained in Map collectionLoadContexts in LoadContexts
+
+** Improvement
+ * [HHH-2662] - Workaround PostgreSQL issues in testsuite
+ * [HHH-2663] - Map java.sql.Types.REAL to Hibernate FloatType for auto-discovery stuff
+ * [HHH-2665] - Split Oracle9Dialect into Oracle9iDialect and Oracle10gDialect
+
+** Patch
+ * [HHH-2630] - Hibernate Dialect is not auto-detected for Sybase ASE and DB2 (Shelley McGowan)
+
+
Changes in version 3.2.4 (2007.05.18)
-------------------------------------------
Deleted: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/antlr-2.7.6.jar
===================================================================
(Binary files differ)
Added: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/antlr.jar
===================================================================
(Binary files differ)
Property changes on: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/antlr.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/apache-1.1.txt
===================================================================
--- core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/apache-1.1.txt (rev 0)
+++ core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/apache-1.1.txt 2008-02-01 22:32:28 UTC (rev 14305)
@@ -0,0 +1,58 @@
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact apache(a)apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ * Portions of this software are based upon public domain software
+ * originally written at the National Center for Supercomputing Applications,
+ * University of Illinois, Urbana-Champaign.
+ */
+
Added: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/apache-2.0.txt
===================================================================
--- core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/apache-2.0.txt (rev 0)
+++ core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/apache-2.0.txt 2008-02-01 22:32:28 UTC (rev 14305)
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Deleted: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/apache.license-2.0.txt
===================================================================
--- core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/apache.license-2.0.txt 2008-02-01 17:04:42 UTC (rev 14304)
+++ core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/apache.license-2.0.txt 2008-02-01 22:32:28 UTC (rev 14305)
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
Deleted: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/apache.license.txt
===================================================================
--- core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/apache.license.txt 2008-02-01 17:04:42 UTC (rev 14304)
+++ core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/apache.license.txt 2008-02-01 22:32:28 UTC (rev 14305)
@@ -1,57 +0,0 @@
-/*
- *
- * ====================================================================
- *
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowlegement may appear in the software itself,
- * if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
- * Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact apache(a)apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- * nor may "Apache" appear in their names without prior written
- * permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
Modified: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/asm-attrs.jar
===================================================================
(Binary files differ)
Modified: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/asm.jar
===================================================================
(Binary files differ)
Deleted: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/c3p0-0.9.1.jar
===================================================================
(Binary files differ)
Added: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/c3p0.jar
===================================================================
(Binary files differ)
Property changes on: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/c3p0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/cglib-2.1.3.jar
===================================================================
(Binary files differ)
Added: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/cglib-dep.jar
===================================================================
(Binary files differ)
Property changes on: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/cglib-dep.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/commons-collections-2.1.1.jar
===================================================================
(Binary files differ)
Added: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/commons-collections.jar
===================================================================
(Binary files differ)
Property changes on: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/commons-collections.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/commons-logging-1.0.4.jar
===================================================================
(Binary files differ)
Added: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/commons-logging.jar
===================================================================
(Binary files differ)
Property changes on: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/commons-logging.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/concurrent-1.3.2.jar
===================================================================
(Binary files differ)
Added: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/concurrent.jar
===================================================================
(Binary files differ)
Property changes on: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/concurrent.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/connector.jar
===================================================================
(Binary files differ)
Deleted: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/connector.licence.txt
===================================================================
--- core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/connector.licence.txt 2008-02-01 17:04:42 UTC (rev 14304)
+++ core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/connector.licence.txt 2008-02-01 22:32:28 UTC (rev 14305)
@@ -1,48 +0,0 @@
-Sun Microsystems, Inc.
-Binary Code License Agreement
-
-READ THE TERMS OF THIS AGREEMENT AND ANY PROVIDED SUPPLEMENTAL LICENSE TERMS (COLLECTIVELY "AGREEMENT") CAREFULLY BEFORE OPENING THE SOFTWARE MEDIA PACKAGE. BY OPENING THE SOFTWARE MEDIA PACKAGE, YOU AGREE TO THE TERMS OF THIS AGREEMENT. IF YOU ARE ACCESSING THE SOFTWARE ELECTRONICALLY, INDICATE YOUR ACCEPTANCE OF THESE TERMS BY SELECTING THE "ACCEPT" BUTTON AT THE END OF THIS AGREEMENT. IF YOU DO NOT AGREE TO ALL THESE TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE TO YOUR PLACE OF PURCHASE FOR A REFUND OR, IF THE SOFTWARE IS ACCESSED ELECTRONICALLY, SELECT THE "DECLINE" BUTTON AT THE END OF THIS AGREEMENT.
-
-1. LICENSE TO USE. Sun grants you a non-exclusive and non-transferable license for the internal use only of the accompanying software and documentation and any error corrections provided by Sun (collectively "Software"), by the number of users and the class of computer hardware for which the corresponding fee has been paid.
-
-2. RESTRICTIONS. Software is confidential and copyrighted. Title to Software and all associated intellectual property rights is retained by Sun and/or its licensors. Except as specifically authorized in any Supplemental License Terms, you may not make copies of Software, other than a single copy of Software for archival purposes. Unless enforcement is prohibited by applicable law, you may not modify, decompile, or reverse engineer Software. You acknowledge that Software is not designed, licensed or intended for use in the design, construction, operation or maintenance of any nuclear facility. Sun disclaims any express or implied warranty of fitness for such uses. No right, title or interest in or to any trademark, service mark, logo or trade name of Sun or its licensors is granted under this Agreement.
-
-3. LIMITED WARRANTY. Sun warrants to you that for a period of ninety (90) days from the date of purchase, as evidenced by a copy of the receipt, the media on which Software is furnished (if any) will be free of defects in materials and workmanship under normal use. Except for the foregoing, Software is provided "AS IS". Your exclusive remedy and Sun's entire liability under this limited warranty will be at Sun's option to replace Software media or refund the fee paid for Software.
-
-4. DISCLAIMER OF WARRANTY. UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
-
-5. LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. In no event will Sun's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by you for Software under this Agreement. The foregoing limitations will apply even if the above stated warranty fails of its essential purpose.
-
-6. Termination. This Agreement is effective until terminated. You may terminate this Agreement at any time by destroying all copies of Software. This Agreement will terminate immediately without notice from Sun if you fail to comply with any provision of this Agreement. Upon Termination, you must destroy all copies of Software.
-
-7. Export Regulations. All Software and technical data delivered under this Agreement are subject to US export control laws and may be subject to export or import regulations in other countries. You agree to comply strictly with all such laws and regulations and acknowledge that you have the responsibility to obtain such licenses to export, re-export, or import as may be required after delivery to you.
-
-8. U.S. Government Restricted Rights. If Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government prime contractor or subcontractor (at any tier), then the Government's rights in Software and accompanying documentation will be only as set forth in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) acquisitions) and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions).
-
-9. Governing Law. Any action related to this Agreement will be governed by California law and controlling U.S. federal law. No choice of law rules of any jurisdiction will apply.
-
-10. Severability. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate.
-
-11. Integration. This Agreement is the entire agreement between you and Sun relating to its subject matter. It supersedes all prior or contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this Agreement. No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party.
-
-JAVA(TM) INTERFACE CLASSES
-
-J2EE(TM) CONNECTOR ARCHITECTURE, VERSION 1.0
-SUPPLEMENTAL LICENSE TERMS
-
-These supplemental license terms ("Supplemental Terms") add to or modify the terms of the Binary Code License Agreement (collectively, the "Agreement"). Capitalized terms not defined in these Supplemental Terms shall have the same meanings ascribed to them in the Agreement. These Supplemental Terms shall supersede any inconsistent or conflicting terms in the Agreement, or in any license contained within the Software.
-
-1. Software Internal Use and Development License Grant. Subject to the terms and conditions of this Agreement, including, but not limited to Section 3 (Java(TM) Technology Restrictions) of these Supplemental Terms, Sun grants you a non-exclusive, non-transferable, limited license to reproduce internally and use internally the binary form of the Software, complete and unmodified, for the sole purpose of designing, developing and testing your Java applets and applications ("Programs").
-
-2. License to Distribute Software. In addition to the license granted in Section 1 (Software Internal Use and Development License Grant) of these Supplemental Terms, subject to the terms and conditions of this Agreement, including but not limited to Section 3 (Java Technology Restrictions), Sun grants you a non-exclusive, non-transferable, limited license to reproduce and distribute the Software in binary form only, provided that you (i) distribute the Software complete and unmodified and only bundled as part of your Programs, (ii) do not distribute additional software intended to replace any component(s) of the Software, (iii) do not remove or alter any proprietary legends or notices contained in the Software, (iv) only distribute the Software subject to a license agreement that protects Sun's interests consistent with the terms contained in this Agreement, and (v) agree to defend and indemnify Sun and its licensors from and against any damages, costs, liabilities, settle!
ment amounts and/or expenses (including attorneys' fees) incurred in connection with any claim, lawsuit or action by any third party that arises or results from the use or distribution of any and all Programs and/or Software.
-
-3. Java Technology Restrictions. You may not modify the Java Platform Interface ("JPI", identified as classes contained within the "java" package or any subpackages of the "java" package), by creating additional classes within the JPI or otherwise causing the addition to or modification of the classes in the JPI. In the event that you create an additional class and associated API(s) which (i) extends the functionality of the Java Platform, and (ii) is exposed to third party software developers for the purpose of developing additional software which invokes such additional API, you must promptly publish broadly an accurate specification for such API for free use by all developers. You may not create, or authorize your licensees to create additional classes, interfaces, or subpackages that are in any way identified as "java", "javax", "sun" or similar convention as specified by Sun in any naming convention designation.
-
-4. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET trademarks and all SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET-related trademarks, service marks, logos and other brand designations ("Sun Marks"), and you agree to comply with the Sun Trademark and Logo Usage Requirements currently located at http://www.sun.com/policies/trademarks. Any use you make of the Sun Marks inures to Sun's benefit.
-
-5. Source Code. Software may contain source code that is provided solely for reference purposes pursuant to the terms of this Agreement. Source code may not be redistributed unless expressly provided for in this Agreement.
-
-6. Termination for Infringement. Either party may terminate this Agreement immediately should any Software become, or in either party's opinion be likely to become, the subject of a claim of infringement of any intellectual property right.
-
-For inquiries please contact: Sun Microsystems, Inc. 901 San Antonio Road, Palo Alto, California 94303
-
Deleted: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/dom4j-1.6.1.jar
===================================================================
(Binary files differ)
Added: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/dom4j.jar
===================================================================
(Binary files differ)
Property changes on: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/dom4j.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/ehcache-1.2.3.jar
===================================================================
(Binary files differ)
Added: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/ehcache.jar
===================================================================
(Binary files differ)
Property changes on: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/ehcache.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jacc-1_0-fr.jar
===================================================================
(Binary files differ)
Added: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jacc.jar
===================================================================
(Binary files differ)
Property changes on: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jacc.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/javassist.jar
===================================================================
(Binary files differ)
Deleted: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jaxen-1.1-beta-7.jar
===================================================================
(Binary files differ)
Added: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jaxen.jar
===================================================================
(Binary files differ)
Property changes on: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jaxen.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jboss-cache-jdk50.jar
===================================================================
(Binary files differ)
Property changes on: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jboss-cache-jdk50.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jboss-cache.jar
===================================================================
(Binary files differ)
Modified: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jboss-common.jar
===================================================================
(Binary files differ)
Modified: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jboss-jmx.jar
===================================================================
(Binary files differ)
Modified: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jboss-system.jar
===================================================================
(Binary files differ)
Deleted: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jdbc2_0-stdext.jar
===================================================================
(Binary files differ)
Deleted: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jdbc2_0-stdext.licence.txt
===================================================================
--- core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jdbc2_0-stdext.licence.txt 2008-02-01 17:04:42 UTC (rev 14304)
+++ core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jdbc2_0-stdext.licence.txt 2008-02-01 22:32:28 UTC (rev 14305)
@@ -1,199 +0,0 @@
- Sun Microsystems, Inc.
-Binary Code License Agreement
-
-READ THE TERMS OF THIS AGREEMENT AND ANY PROVIDED
-SUPPLEMENTAL LICENSE TERMS (COLLECTIVELY
-"AGREEMENT") CAREFULLY BEFORE OPENING THE SOFTWARE
-MEDIA PACKAGE. BY OPENING THE SOFTWARE MEDIA
-PACKAGE, YOU AGREE TO THE TERMS OF THIS AGREEMENT.
-IF YOU ARE ACCESSING THE SOFTWARE ELECTRONICALLY,
-INDICATE YOUR ACCEPTANCE OF THESE TERMS BY
-SELECTING THE "ACCEPT" BUTTON AT THE END OF THIS
-AGREEMENT. IF YOU DO NOT AGREE TO ALL THESE
-TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE TO YOUR
-PLACE OF PURCHASE FOR A REFUND OR, IF THE SOFTWARE
-IS ACCESSED ELECTRONICALLY, SELECT THE "DECLINE"
-BUTTON AT THE END OF THIS AGREEMENT.
-
-1. LICENSE TO USE. Sun grants you a
-non-exclusive and non-transferable license for the
-internal use only of the accompanying software and
-documentation and any error corrections provided
-by Sun (collectively "Software"), by the number of
-users and the class of computer hardware for which
-the corresponding fee has been paid.
-
-2. RESTRICTIONS Software is confidential and
-copyrighted. Title to Software and all associated
-intellectual property rights is retained by Sun
-and/or its licensors. Except as specifically
-authorized in any Supplemental License Terms, you
-may not make copies of Software, other than a
-single copy of Software for archival purposes.
-Unless enforcement is prohibited by applicable
-law, you may not modify, decompile, or reverse
-engineer Software. Software is not designed or
-licensed for use in on-line control of aircraft,
-air traffic, aircraft navigation or aircraft
-communications; or in the design, construction,
-operation or maintenance of any nuclear facility.
-No right, title or interest in or to any
-trademark, service mark, logo or trade name of Sun
-or its licensors is granted under this Agreement.
-
-3. LIMITED WARRANTY. Sun warrants to you that for
-a period of ninety (90) days from the date of
-purchase, as evidenced by a copy of the receipt,
-the media on which Software is furnished (if any)
-will be free of defects in materials and
-workmanship under normal use. Except for the
-foregoing, Software is provided "AS IS". Your
-exclusive remedy and Sun's entire liability under
-this limited warranty will be at Sun's option to
-replace Software media or refund the fee paid for
-Software.
-
-4. DISCLAIMER OF WARRANTY. UNLESS SPECIFIED IN
-THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS,
-REPRESENTATIONS AND WARRANTIES, INCLUDING ANY
-IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE
-DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE
-DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
-
-5. LIMITATION OF LIABILITY. TO THE EXTENT NOT
-PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS
-LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT
-OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL,
-INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED
-REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT
-OF OR RELATED TO THE USE OF OR INABILITY TO USE
-SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES. In no event will
-Sun's liability to you, whether in contract, tort
-(including negligence), or otherwise, exceed the
-amount paid by you for Software under this
-Agreement. The foregoing limitations will apply
-even if the above stated warranty fails of its
-essential purpose.
-
-6. Termination. This Agreement is effective
-until terminated. You may terminate this
-Agreement at any time by destroying all copies of
-Software. This Agreement will terminate
-immediately without notice from Sun if you fail to
-comply with any provision of this Agreement. Upon
-Termination, you must destroy all copies of
-Software.
-
-7. Export Regulations. All Software and
-technical data delivered under this Agreement are
-subject to US export control laws and may be
-subject to export or import regulations in other
-countries. You agree to comply strictly with all
-such laws and regulations and acknowledge that you
-have the responsibility to obtain such licenses to
-export, re-export, or import as may be required
-after delivery to you.
-
-8. U.S. Government Restricted Rights. If
-Software is being acquired by or on behalf of the
-U.S. Government or by a U.S. Government prime
-contractor or subcontractor (at any tier), then
-the Government's rights in Software and
-accompanying documentation will be only as set
-forth in this Agreement; this is in accordance
-with 48 CFR 227.7201 through 227.7202-4 (for
-Department of Defense (DOD) acquisitions) and with
-48 CFR 2.101 and 12.212 (for non-DOD
-acquisitions).
-
-9. Governing Law. Any action related to this
-Agreement will be governed by California law and
-controlling U.S. federal law. No choice of law
-rules of any jurisdiction will apply.
-
-10. Severability. If any provision of this
-Agreement is held to be unenforceable, this
-Agreement will remain in effect with the provision
-omitted, unless omission would frustrate the
-intent of the parties, in which case this
-Agreement will immediately terminate.
-
-11. Integration. This Agreement is the entire
-agreement between you and Sun relating to its
-subject matter. It supersedes all prior or
-contemporaneous oral or written communications,
-proposals, representations and warranties and
-prevails over any conflicting or additional terms
-of any quote, order, acknowledgment, or other
-communication between the parties relating to its
-subject matter during the term of this Agreement.
-No modification of this Agreement will be binding,
-unless in writing and signed by an authorized
-representative of each party.
-
-For inquiries please contact: Sun Microsystems,
-Inc. 901 San Antonio Road, Palo Alto, California
-94303
-
-
-SUPPLEMENTAL LICENSE TERMS
-JDBCTM 2.0 INTERFACE CLASSES
-
-These supplemental license terms ("Supplement")
-add to or modify the terms of the Binary Code
-License Agreement (collectively, the
-"Agreement"). Capitalized terms not defined in
-this Supplement shall have the same meanings
-ascribed to them in the Agreement. These
-Supplement terms shall supersede any inconsistent
-or conflicting terms in the Agreement, or in any
-license contained within the Software.
-
-1. License to Distribute. Sun grants you a
-non-exclusive, non-transferable, limited license
-to reproduce and distribute the binary and/or
-source code form of the Software to third party
-end users through multiple tiers of distribution,
-provided that you: (i) distribute the Software
-complete and unmodified in its original Java
-Archive file, and only bundled as a part of your
-program that incorporates the Software
-("Program"); (ii) do not distribute additional
-software intended to replace any component(s) of
-the Software; (iii) agree to incorporate the most
-current version of the Software that was available
-from Sun no later than 180 days prior to each
-production release of the Program; (iv) do not
-remove or alter any proprietary legends or notices
-contained in or on the Software; (v) only
-distribute the Program pursuant to a license
-agreement that protects Sun's interest consistent
-with the terms contained in the Agreement; (vi)
-may not create, or authorize your licensees to cr!
-eate additional classes, interfaces, or
-subpackages that are contained in the "java"
-"javax" or "sun" packages or similar as specified
-by Sun in any class file naming convention; and
-(vii) agree to defend and indemnify Sun and its
-licensors from and against any damages, costs,
-liabilities, settlement amounts and/or expenses
-(including attorneys' fees) incurred in connection
-with any claim, lawsuit or action by any third
-party that arises or results from the use or
-distribution of any and all Programs.
-
-2. Trademarks and Logos. You acknowledge as
-between you and Sun that Sun owns the Java
-trademark and all Java-related trademarks, logos
-and icons including the Coffee Cup and Duke ("Java
-Marks") and agree to comply with the Java
-Trademark Guidelines at
-http://java.sun.com/trademarks.html.
-
-
-
-
-
-
\ No newline at end of file
Deleted: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jgroups-2.2.8.jar
===================================================================
(Binary files differ)
Added: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jgroups.jar
===================================================================
(Binary files differ)
Property changes on: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/jgroups.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/log4j-1.2.11.jar
===================================================================
(Binary files differ)
Added: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/log4j.jar
===================================================================
(Binary files differ)
Property changes on: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/log4j.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/oscache-2.1.jar
===================================================================
(Binary files differ)
Added: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/oscache.jar
===================================================================
(Binary files differ)
Property changes on: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/oscache.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Deleted: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/proxool-0.8.3.jar
===================================================================
(Binary files differ)
Added: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/proxool.jar
===================================================================
(Binary files differ)
Property changes on: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/proxool.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/swarmcache-1.0rc2.jar
===================================================================
(Binary files differ)
Added: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/swarmcache.jar
===================================================================
(Binary files differ)
Property changes on: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/swarmcache.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/version.properties
===================================================================
--- core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/version.properties 2008-02-01 17:04:42 UTC (rev 14304)
+++ core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/version.properties 2008-02-01 22:32:28 UTC (rev 14305)
@@ -38,6 +38,7 @@
cleanimports.lib=cleanimports.jar
cleanimports.name=cleanimports
cleanimports.when=buildtime
+
hibernate.version=3.0
hibernate.name=Hibernate core
hibernate.when=runtime, required
@@ -53,142 +54,133 @@
syndiag.when=buildtime
javassist.lib=javassist.jar
-javassist.version=3.4
+javassist.version=3.5.0.GA-brew
javassist.name=Javassist bytecode generator
javassist.when=runtime, required if using 'javassist' bytecode provider
-cglib.lib=cglib-2.1.3.jar
-cglib.version=2.1.3
+cglib.lib=cglib-dep.jar
+cglib.version=2.1.3-brew
cglib.name=CGLIB bytecode generator
cglib.when=runtime, required if using 'cglib' bytecode provider
asm.lib=asm.jar
+asm.version=1.5.3-brew
asm.name=ASM bytecode library
asm.when=runtime, required if using 'cglib' bytecode provider
asm-attrs.lib=asm-attrs.jar
+asm-version=1.5.3-brew
asm-attrs.name=ASM bytecode library
asm-attrs.when=runtime, required if using 'cglib' bytecode provider
-commons-collections.lib=commons-collections-2.1.1.jar
-commons-collections.version=2.1.1
+commons-collections.lib=commons-collections.jar
+commons-collections.version=3.1-brew
commons-collections.name=Commons Collections
commons-collections.when=runtime, required
-commons-logging.lib=commons-logging-1.0.4.jar
-commons-logging.version=1.0.4
+commons-logging.lib=commons-logging.jar
+commons-logging.version=1.1.0.jboss
commons-logging.name=Commons Logging
commons-logging.when=runtime, required
-antlr.lib=antlr-2.7.6.jar
-antlr.version=2.7.6
+antlr.lib=antlr.jar
+antlr.version=2.7.6-brew
antlr.name=ANother Tool for Language Recognition
antlr.when=runtime, required
## xml/xslt handling
-dom4j.lib=dom4j-1.6.1.jar
-dom4j.version=1.6.1
+dom4j.lib=dom4j.jar
+dom4j.version=1.6.1-brew
dom4j.name=XML configuration & mapping parser
dom4j.when=runtime, required
-jaxen.lib=jaxen-1.1-beta-7.jar
-jaxen.version=1.1-beta-7
+jaxen.lib=jaxen.jar
+jaxen.version=1.1-brew
jaxen.name=Jaxen - universal java xpath engine
jaxen.when=runtime, required if you want to deserialize a Configuration to improve startup performance
-xerces.lib=xerces-2.6.2.jar
-xerces.version=2.6.2
-xerces.name=SAX parser
-xerces.when=runtime, required for JDK < 1.4
-
xml-apis.lib=xml-apis.jar
+xml-version=1.3.03-brew
xml-apis.name=Standard JAXP API
xml-apis.when=runtime, some SAX parser is required
## j2ee related
-jdbc-stdext.lib=jdbc2_0-stdext.jar
-jdbc-stdext.version=2.0
-jdbc-stdext.name=Standard Extension JDBC APIs
-jdbc-stdext.when=runtime, required for standalone operation (outside application server)
-
jta.lib=jta.jar
+jta.version=1_0_1B
jta.name=Standard JTA API
jta.when=runtime, required for standalone operation (outside application server)
-connector.lib=connector.jar
-connector.name=Standard JCA API
-connector.when=runtime, optional
-
jaas.lib=jaas.jar
+jaas.version=1_0_01
jaas.name=Standard JAAS API
-jaas.when=runtime, optional (required by JCA)
+jaas.when=runtime, optional (required by JCA); non-supported jar can be downloaded from http://repository.jboss.com/sun-jaas/1_0_01/lib/jaas.jar
-log4j.lib=log4j-1.2.11.jar
-log4j.version=1.2.11
+log4j.lib=log4j.jar
+log4j.version=1.2.14-brew
log4j.name=Log4j Library
-log4j.when=runtime, optional
+log4j.when=runtime, optional; non-supported jar can be downloaded from http://repository.jboss.com/apache-log4j/1.2.14-brew/lib/log4j.jar
## Treecache
-jboss-cache.lib=jboss-cache.jar
-jboss-cache.version=1.2.2 alpha
+jboss-cache.lib=jboss-cache-jdk50.jar
+jboss-cache.version=1.4.1.SP3-brew
jboss-cache.name=TreeCache clustered cache
-jboss-cache.when=runtime, optional
+jboss-cache.when=runtime, optional (required by TreeCache); can only be used with JDK 1.5; non-supported jar can be downloaded from http://repository.jboss.com/jboss/cache/1.4.1.SP3-brew/lib/jboss-cache-jd...
-concurrent.lib=concurrent-1.3.2.jar
-concurrent.version=1.3.2
-concurrent.when=runtime, optional (required by TreeCache)
+concurrent.lib=concurrent.jar
+concurrent.version=1.3.4-brew
+concurrent.when=runtime, optional (required by TreeCache); non-supported jar can be downloaded from http://repository.jboss.com/oswego-concurrent/1.3.4-brew/lib/concurrent.jar
jboss-common.lib=jboss-common.jar
-jboss-common.when=runtime, optional (required by TreeCache)
+jboss-common.version=1.2.0.GA-brew
+jboss-common.when=runtime, optional (required by TreeCache); non-supported jar can be downloaded from http://repository.jboss.com/jboss/common/1.2.0.GA/lib/jboss-common.jar
jboss-jmx.lib=jboss-jmx.jar
-jboss-jmx.when=runtime, optional (required by TreeCache)
+jboss-jmx.version=4.2.0.GA_CP01
+jboss-jmx.when=runtime, optional (required by TreeCache); non-supported jar can be downloaded from http://repository.jboss.com/jboss/jmx/4.2.0.GA_CP01/lib/jboss-jmx.jar
jboss-system.lib=jboss-system.jar
-jboss-system.when=runtime, optional (required by TreeCache)
+jboss-system.version=4.2.0.GA_CP01
+jboss-system.when=runtime, optional (required by TreeCache); non-supported jar can be downloaded from http://repository.jboss.com/jboss/system/4.2.0.GA_CP01/lib/jboss-system.jar
## Replication
-jgroups.lib=jgroups-2.2.8.jar
-jgroups.version=2.2.8
+jgroups.lib=jgroups.jar
+jgroups.version=2.4.1.SP3-brew
jgroups.name=JGroups multicast library
-jgroups.when=runtime, optional (required by replicated caches)
+jgroups.when=runtime, optional (required by replicated caches); non-supported jar can be downloaded from http://repository.jboss.com/jgroups/2.4.1.SP3-brew/lib/jgroups.jar
## cache providers
-ehcache.lib=ehcache-1.2.3.jar
+ehcache.lib=ehcache.jar
ehcache.version=1.2.3
ehcache.name=EHCache cache
-ehcache.when=runtime, optional (required if no other cache provider is set)
+ehcache.when=runtime, optional; non-supported jar can be downloaded from http://repository.jboss.com/ehcache/1.2.3/lib/ehcache.jar
-oscache.lib=oscache-2.1.jar
+oscache.lib=oscache.jar
oscache.version=2.1
oscache.name=OpenSymphony OSCache
-oscache.when=runtime, optional
+oscache.when=runtime, optional; non-supported jar can be downloaded from http://repository.jboss.com/oscache/2.1/lib/oscache.jar
-swarmcache.lib=swarmcache-1.0rc2.jar
+swarmcache.lib=swarmcache.jar
swarmcache.version=1.0rc2
-swarmcache.name=runtime, optional
-swarmcache.when=runtime, optional
+swarmcache.when=runtime, optional; non-supported jar can be downloaded from http://repository.jboss.com/swarmcache/1.0rc2/lib/swarmcache.jar
## connection pool
-c3p0.lib=c3p0-0.9.1.jar
+c3p0.lib=c3p0.jar
c3p0.version=0.9.1
c3p0.name=C3P0 JDBC connection pool
-c3p0.when=runtime, optional (needed if using c3p0 as the connection pooling library)
+c3p0.when=runtime, optional (needed if using c3p0 as the connection pooling library); non-supported jar can be downloaded from http://repository.jboss.com/c3p0/0.9.1/lib/c3p0.jar
-proxool.lib=proxool-0.8.3.jar
+proxool.lib=proxool.jar
proxool.version=0.8.3
proxool.name=Proxool JDBC connection pool
-proxool.when=runtime, optional (needed if using proxool as the connection pooling library)
+proxool.when=runtime, optional (needed if using proxool as the connection pooling library); non-supported jar can be downloaded from http://repository.jboss.com/proxool/0.8.3/lib/proxool.jar
-
-jacc.lib=jacc-1_0-fr.jar
+jacc.lib=jacc.jar
jacc.version=1.0-fr
jacc.name=JACC Library
-jacc.when=runtime, optional
-
+jacc.when=runtime, optional; non-supported jar can be downloaded from http://repository.jboss.com/sun-jacc/1_0-fr/lib/jacc.jar
Deleted: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/xerces-2.6.2.jar
===================================================================
(Binary files differ)
Modified: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/lib/xml-apis.jar
===================================================================
(Binary files differ)
Modified: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/readme.txt
===================================================================
--- core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/readme.txt 2008-02-01 17:04:42 UTC (rev 14304)
+++ core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/readme.txt 2008-02-01 22:32:28 UTC (rev 14305)
@@ -1,6 +1,7 @@
Hibernate - Relational Persistence for Idiomatic Java
=====================================================
-version 3.2.4.sp1, May 18, 2007
+version 3.2.4.sp1.cp01, February 1, 2008
+Copyright © 2008 Red Hat, Inc.
Instructions
------------
@@ -8,47 +9,39 @@
See index.html in the doc/reference directory.
-Required jars are distributed in the lib subdirectory.
+Required jars are distributed in the lib subdirectory. Additional
+optional jars are listed as well in the lib/_README.txt and in
+lib/version.properties files. Distributed jars are supported as
+part of their Hibernate usage.
-Latest Documentation:
+Product Support and License Website Links
+-----------------------------------------
+Support Processes
+http://www.redhat.com/support/process/
- http://hibernate.org
+Production Support Scope of Coverage
+http://www.redhat.com/support/policy/soc/production
-Bug Reports:
-
- Hibernate JIRA (preferred)
- hibernate-devel(a)lists.sourceforge.net
+Production Support Service Level Agreement
+http://www.redhat.com/support/policy/sla/production/
-Free Technical Support:
+Developer Support Scope of Coverage
+http://www.redhat.com/support/policy/soc/developer/
- http://forum.hibernate.org
+Developer Support Service Level Agreement
+http://www.redhat.com/support/policy/sla/developer/
-Commercial Support and Training:
+Product Update and Support Policy by Product
+http://www.redhat.com/security/updates/jboss_notes/
- http://hibernate.org/SupportTraining
-
-
-Get Up And Running Quick
-------------------------
-Demo:
+JBoss End User License Agreement
+http://www.redhat.com/licenses/jboss_eula.html
- (1) copy your JDBC driver to the lib directory
- (2) edit etc/hibernate.properties
- (3) run "ant eg" or "build eg"
- (4) browse the sourcecode in eg/org/hibernate/auction
-
-Tests:
-
- (1) copy your JDBC driver to the lib directory
- (2) edit etc/hibernate.properties
- (3) run "ant junitreport" or "build junitreport"
- (4) see build/test-reports/index.html
-
-
Other Stuff
-----------
This software is distributed under the terms of the FSF Lesser Gnu
-Public License (see lgpl.txt).
+Public License (see lgpl.txt) and the JBoss End User License Agreement
+(see JBossORG-EULA.txt).
This product includes software developed by the Apache Software
Foundation (http://www.apache.org/).
16 years, 2 months
- 1
- 0
Hibernate SVN: r14304 - core/branches.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-02-01 12:04:42 -0500 (Fri, 01 Feb 2008)
New Revision: 14304
Added:
core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE/
Log:
Branch for Hibernate CSP 3.2.4.sp.cp01
Copied: core/branches/BRANCH_3_2_4_SP1_CP01_STANDALONE (from rev 14303, core/tags/JBOSS_EAP_3_2_4_SP1_CP01)
16 years, 2 months
- 1
- 0