This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch jpa-SNAPSHOT in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 58cfca5c8b9ec9d48ff7db99e7a51d0e9aad2801 Author: Dan Haywood <[email protected]> AuthorDate: Thu Aug 25 13:48:52 2022 +0100 cleans up. --- .../main/java/domainapp/webapp/AppManifest.java | 22 --------------- .../main/resources/META-INF/persistence.xml-moved | 32 ---------------------- 2 files changed, 54 deletions(-) diff --git a/webapp/src/main/java/domainapp/webapp/AppManifest.java b/webapp/src/main/java/domainapp/webapp/AppManifest.java index bdc0202..dc43bf9 100644 --- a/webapp/src/main/java/domainapp/webapp/AppManifest.java +++ b/webapp/src/main/java/domainapp/webapp/AppManifest.java @@ -1,13 +1,9 @@ package domainapp.webapp; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.PropertySource; import org.springframework.context.annotation.PropertySources; -import org.springframework.instrument.classloading.InstrumentationLoadTimeWeaver; -import org.springframework.orm.jpa.LocalEntityManagerFactoryBean; -import org.springframework.orm.jpa.persistenceunit.DefaultPersistenceUnitManager; import org.apache.isis.applib.IsisModuleApplibChangeAndExecutionLoggers; import org.apache.isis.applib.IsisModuleApplibMixins; @@ -28,7 +24,6 @@ import org.apache.isis.valuetypes.asciidoc.ui.wkt.IsisModuleValAsciidocUiWkt; import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleViewerRestfulObjectsJaxrsResteasy4; import org.apache.isis.viewer.wicket.viewer.IsisModuleViewerWicketViewer; -import domainapp.modules.simple.dom.so.SimpleObject; import domainapp.webapp.application.ApplicationModule; import domainapp.webapp.application.fixture.scenarios.DomainAppDemo; import domainapp.webapp.custom.CustomModule; @@ -72,22 +67,5 @@ import domainapp.webapp.quartz.QuartzModule; }) public class AppManifest { -// @Bean -// public LocalEntityManagerFactoryBean localEntityManagerFactoryBean() { -// return new LocalEntityManagerFactoryBean(); -// } -// @Bean -// public DefaultPersistenceUnitManager defaultPersistenceUnitManager() { -// return new DefaultPersistenceUnitManager() { -// @Override -// public void afterPropertiesSet() { -// if (getLoadTimeWeaver() == null && InstrumentationLoadTimeWeaver.isInstrumentationAvailable()) { -// setLoadTimeWeaver(new InstrumentationLoadTimeWeaver(SimpleObject.class.getClassLoader())); -// } -// preparePersistenceUnitInfos(); -//// super.afterPropertiesSet(); -// } -// }; -// } } diff --git a/webapp/src/main/resources/META-INF/persistence.xml-moved b/webapp/src/main/resources/META-INF/persistence.xml-moved deleted file mode 100644 index 4fc508d..0000000 --- a/webapp/src/main/resources/META-INF/persistence.xml-moved +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<persistence version="2.1" - xmlns="http://xmlns.jcp.org/xml/ns/persistence"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd";> - - <persistence-unit name="default"> -<!-- <class>org.apache.isis.extensions.sessionlog.applib.dom.SessionLogEntry</class> - <class>org.apache.isis.extensions.sessionlog.jpa.dom.SessionLogEntry</class> - <class>org.apache.isis.extensions.sessionlog.jpa.dom.SessionLogEntryPK</class> - <class>org.apache.isis.extensions.commandlog.applib.dom.CommandLogEntry</class> - <class>org.apache.isis.extensions.commandlog.jpa.dom.CommandLogEntry</class> - <class>org.apache.isis.extensions.commandlog.jpa.dom.CommandLogEntryPK</class> - <class>org.apache.isis.extensions.executionoutbox.applib.dom.ExecutionOutboxEntry</class> - <class>org.apache.isis.extensions.executionoutbox.jpa.dom.ExecutionOutboxEntry</class> - <class>org.apache.isis.extensions.executionoutbox.jpa.dom.ExecutionOutboxEntryPK</class> - <class>org.apache.isis.extensions.executionlog.applib.dom.ExecutionLogEntry</class> - <class>org.apache.isis.extensions.executionlog.jpa.dom.ExecutionLogEntry</class> - <class>org.apache.isis.extensions.executionlog.jpa.dom.ExecutionLogEntryPK</class> - <class>org.apache.isis.extensions.audittrail.applib.dom.AuditTrailEntry</class> - <class>org.apache.isis.extensions.audittrail.jpa.dom.AuditTrailEntry</class> - <class>domainapp.modules.simple.dom.so.SimpleObject</class> - <class>org.apache.isis.persistence.jpa.integration.typeconverters.java.util.JavaUtilUuidConverter</class> - <class>org.apache.isis.persistence.jpa.integration.typeconverters.schema.v2.IsisInteractionDtoConverter</class> - <class>org.apache.isis.persistence.jpa.integration.typeconverters.schema.v2.IsisCommandDtoConverter</class> - <class>org.apache.isis.persistence.jpa.integration.typeconverters.applib.IsisBookmarkConverter</class> - <exclude-unlisted-classes>false</exclude-unlisted-classes>--> - <properties> - <property name="eclipselink.weaving" value="true"/> - </properties> - </persistence-unit> - -</persistence>
