You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/03/14 15:49:57 UTC
[isis] branch master updated (1749bf8 -> ca2f3af)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 1749bf8 ISIS-1911 adding option to disable TranslationServicePO
new 3f337f8 ISIS-1902 consistently apply Isis' default class loader on PMF creation
new ca2f3af ISIS-1902 fixes missing bundle attribute
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../DataNucleusApplicationComponents5.java | 19 ++++++++++++-------
core/pom.xml | 1 +
2 files changed, 13 insertions(+), 7 deletions(-)
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.
[isis] 02/02: ISIS-1902 fixes missing bundle attribute
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit ca2f3afc8f1c9ec7b0801a5f74f5b466e920fc72
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Mar 14 16:49:51 2018 +0100
ISIS-1902 fixes missing bundle attribute
... for DN to properly identify extensions
---
core/pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/core/pom.xml b/core/pom.xml
index e93e7ba..81aacfc 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -867,6 +867,7 @@
<Automatic-Module-Name>${jar-plugin.automaticModuleName}</Automatic-Module-Name>
<Implementation-Vendor-Id>org.apache.isis</Implementation-Vendor-Id>
<Implementation-Vendor>Apache Isis™ Project</Implementation-Vendor>
+ <Bundle-SymbolicName>${jar-plugin.automaticModuleName}</Bundle-SymbolicName>
<SCM-Revision>${git.commit.id.abbrev}</SCM-Revision>
</manifestEntries>
</archive>
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.
[isis] 01/02: ISIS-1902 consistently apply Isis' default class
loader on PMF creation
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 3f337f8af78afbd980680b3b46f161789a135291
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Mar 14 16:48:45 2018 +0100
ISIS-1902 consistently apply Isis' default class loader on PMF creation
---
.../DataNucleusApplicationComponents5.java | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents5.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents5.java
index fab3dd2..0d361f1 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents5.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents5.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.core.runtime.system.persistence;
+import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
@@ -124,13 +125,18 @@ public class DataNucleusApplicationComponents5 implements ApplicationScopedCompo
persistenceManagerFactory = null;
}
}
-
+
+ private static PersistenceManagerFactory newPersistenceManagerFactory(Map<String, String> datanucleusProps) {
+ return JDOHelper.getPersistenceManagerFactory(datanucleusProps, IsisContext.getClassLoader());
+ }
+
private static boolean isSchemaAwareStoreManager(Map<String,String> datanucleusProps) {
// we create a throw-away instance of PMF so that we can probe whether DN has
// been configured with a schema-aware store manager or not.
- final JDOPersistenceManagerFactory probePmf =
- (JDOPersistenceManagerFactory)JDOHelper.getPersistenceManagerFactory(datanucleusProps);
+ final JDOPersistenceManagerFactory probePmf =
+ (JDOPersistenceManagerFactory) newPersistenceManagerFactory(datanucleusProps);
+
try {
final PersistenceNucleusContext nucleusContext = probePmf.getNucleusContext();
final StoreManager storeManager = nucleusContext.getStoreManager();
@@ -164,12 +170,11 @@ public class DataNucleusApplicationComponents5 implements ApplicationScopedCompo
datanucleusProps.put(PropertyNames.PROPERTY_SCHEMA_AUTOCREATE_COLUMNS, "true");
datanucleusProps.put(PropertyNames.PROPERTY_SCHEMA_AUTOCREATE_CONSTRAINTS, "true");
- persistenceManagerFactory = JDOHelper
- .getPersistenceManagerFactory(datanucleusProps, IsisContext.getClassLoader() );
+ persistenceManagerFactory = newPersistenceManagerFactory(datanucleusProps);
createSchema(persistenceManagerFactory, persistableClassNameSet, datanucleusProps);
} else {
- persistenceManagerFactory = JDOHelper.getPersistenceManagerFactory(datanucleusProps);
+ persistenceManagerFactory = newPersistenceManagerFactory(datanucleusProps);
}
} else {
@@ -178,7 +183,7 @@ public class DataNucleusApplicationComponents5 implements ApplicationScopedCompo
// otherwise NPEs occur later.
configureAutoStart(persistableClassNameSet, datanucleusProps);
- persistenceManagerFactory = JDOHelper.getPersistenceManagerFactory(this.datanucleusProps);
+ persistenceManagerFactory = newPersistenceManagerFactory(this.datanucleusProps);
}
return persistenceManagerFactory;
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.