| commit | 35403c792c31a66dd11b51e62a4bf2f91a673fea | [log] [tgz] |
|---|---|---|
| author | kmoore <kmoore> | Mon May 25 12:57:50 2009 +0000 |
| committer | kmoore <kmoore> | Mon May 25 12:57:50 2009 +0000 |
| tree | 6ace8ee1d7047e096987b1aedc81504fe3bf80bd | |
| parent | ce8ebf0fc11e128c8fab87f26c5f98fe9824c835 [diff] |
277524 - persistence.xml: transaction type default missing from drop down
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/AbstractPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/AbstractPersistenceUnit.java index 2af4002..d541c4d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/AbstractPersistenceUnit.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/AbstractPersistenceUnit.java
@@ -976,7 +976,7 @@ * is not specified, a default of RESOURCE_LOCAL may be assumed." */ protected PersistenceUnitTransactionType buildDefaultTransactionType() { - return null; + return PersistenceUnitTransactionType.JTA; //return JTA for now, fixing regression in bug 277524 } /**
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/TransactionTypeComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/TransactionTypeComposite.java index 152db42..116cc33 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/TransactionTypeComposite.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/TransactionTypeComposite.java
@@ -48,6 +48,7 @@ protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); propertyNames.add(PersistenceUnit.SPECIFIED_TRANSACTION_TYPE_PROPERTY); + propertyNames.add(PersistenceUnit.DEFAULT_TRANSACTION_TYPE_PROPERTY); } @Override @@ -67,7 +68,7 @@ @Override protected PersistenceUnitTransactionType getValue() { - return getSubject().getTransactionType(); + return getSubject().getSpecifiedTransactionType(); } @Override