You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/05/20 13:34:25 UTC
[50/51] [abbrv] isis git commit: ISIS-1291: removed
InstallerLookupAware and other unused code,
simplified InstallerLookup and removed installer-registry.properties
ISIS-1291: removed InstallerLookupAware and other unused code, simplified InstallerLookup and removed installer-registry.properties
Namely:
- AboutIsis, ComponentDetails, IsisInstallerRegistry, InstallerVersion, OptionHandlerDiagnostics, OptionHandlerVersion
Also:
- renamed PersistenceSessionInternal back to PersistenceSession, to avoid unnecessary breakage (this class isn't an internal domain service, anyway)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b319973f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b319973f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b319973f
Branch: refs/heads/master
Commit: b319973f1fca979917ab3ab0fbd713dbfd9f806a
Parents: fc57e47
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri May 20 14:30:13 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri May 20 14:30:13 2016 +0100
----------------------------------------------------------------------
.../guides/_rgcfg_specifying-components.adoc | 4 +-
.../fixtures/switchuser/SwitchUserService.java | 8 +
.../switchuser/SwitchUserServiceAware.java | 8 +-
.../integtestsupport/IsisSystemForTest.java | 8 +-
.../metamodel/services/ServicesInjector.java | 1 +
.../isis/core/runtime/about/AboutIsis.java | 141 --
.../core/runtime/about/ComponentDetails.java | 32 -
.../isis/core/runtime/sysout/SystemPrinter.java | 104 -
.../core/runtime/IsisInstallerRegistry.java | 33 -
.../ObjectFixtureFilePersistor.java | 6 +-
.../ObjectFixtureService.java | 4 +-
.../fixtures/FixturesInstallerDelegate.java | 18 +-
.../installerregistry/InstallerLookup.java | 173 +-
.../installerregistry/InstallerLookupAware.java | 25 -
.../installerregistry/InstallerRepository.java | 28 -
.../installerregistry/InstallerVersion.java | 78 -
.../PersistenceMechanismInstaller.java | 4 +-
.../isis/core/runtime/memento/Memento.java | 4 +-
.../core/runtime/memento/StandaloneData.java | 4 +-
.../persistence/FixturesInstalledFlag.java | 4 +-
.../persistence/adapter/PojoAdapter.java | 8 +-
.../container/DomainObjectContainerResolve.java | 10 +-
.../runner/opts/OptionHandlerDiagnostics.java | 61 -
.../runner/opts/OptionHandlerVersion.java | 58 -
.../background/BackgroundCommandExecution.java | 4 +-
.../HomePageProviderServiceDefault.java | 4 +-
...ersistenceSessionServiceInternalDefault.java | 4 +-
.../PublishingServiceInternalDefault.java | 4 +-
...TransactionStateProviderInternalDefault.java | 4 +-
.../xmlsnapshot/XmlSnapshotServiceDefault.java | 4 +-
.../AbstractIsisSessionTemplate.java | 10 +-
.../runtime/snapshot/XmlSnapshotBuilder.java | 4 +-
.../isis/core/runtime/system/IsisSystem.java | 4 +-
.../runtime/system/context/IsisContext.java | 10 +-
.../system/persistence/ObjectFactory.java | 4 +-
.../system/persistence/PersistenceSession.java | 2306 +++++++++++++++++
.../persistence/PersistenceSessionFactory.java | 6 +-
.../persistence/PersistenceSessionInternal.java | 2320 ------------------
.../runtime/system/session/IsisSession.java | 12 +-
.../system/session/IsisSessionFactory.java | 8 +-
.../SystemDependencyInjector.java | 26 -
.../SystemDependencyInjectorAware.java | 25 -
.../IsisConfigurationForJdoIntegTests.java | 8 +-
.../persistence/IsisLifecycleListener.java | 4 +-
.../service/support/IsisJdoSupportImpl.java | 4 +-
.../core/runtime/installer-registry.properties | 28 -
.../adapterfactory/pojo/PojoAdapterTest.java | 4 +-
.../transaction/PojoAdapterBuilder.java | 6 +-
.../rendering/RendererContext.java | 4 +-
.../domainobjects/JsonValueEncoder.java | 4 +-
.../restfulobjects/server/ResourceContext.java | 8 +-
.../conneg/RestfulObjectsJaxbWriterForXml.java | 4 +-
.../server/resources/DomainResourceHelper.java | 4 +-
.../server/resources/ResourceAbstract.java | 4 +-
.../server/resources/SwaggerSpecResource.java | 4 +-
.../restfulobjects/server/util/OidUtils.java | 4 +-
.../wicket/ConverterForObjectAdapter.java | 4 +-
.../ConverterForObjectAdapterMemento.java | 4 +-
.../integration/wicket/LocalizerForIsis.java | 4 +-
.../viewer/services/DeepLinkServiceWicket.java | 4 +-
.../model/isis/PersistenceSessionProvider.java | 4 +-
.../model/mementos/ObjectAdapterMemento.java | 4 +-
.../model/models/EntityCollectionModel.java | 4 +-
.../wicket/model/models/ModelAbstract.java | 4 +-
.../entityactions/EntityActionLinkFactory.java | 4 +-
.../FormComponentPanelAbstract.java | 4 +-
.../linkandlabel/ActionLinkFactoryAbstract.java | 4 +-
.../viewer/wicket/ui/pages/PageAbstract.java | 4 +-
.../viewer/wicket/ui/panels/FormAbstract.java | 4 +-
.../viewer/wicket/ui/panels/PanelAbstract.java | 4 +-
.../apache/isis/core/webserver/WebServer.java | 2 -
71 files changed, 2505 insertions(+), 3226 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/adocs/documentation/src/main/asciidoc/guides/_rgcfg_specifying-components.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgcfg_specifying-components.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgcfg_specifying-components.adoc
index f5bc353..36963b3 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgcfg_specifying-components.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgcfg_specifying-components.adoc
@@ -89,7 +89,7 @@ This property is also IGNORED completely in 1.13.0+; the `configuration-and-anno
[TIP]
====
-The values `"shiro"`, `"bypass"` etc are actually aliases for concrete implementations listed in Apache Isis' `installer-registry.properties` file (in `isis-core-runtime.jar`). It is -- at least in theory -- possible to specify a fully qualified class name to replace either of the two security components.
+The values `"shiro"`, `"bypass"` etc are actually aliases for concrete implementations. It is also possible to specify a fully qualified class name to replace either of the two security components, implementing the appropriate interface.
====
If the `AppManifest` is _not_ being used then there are number of other configuration properties that also must be specified: `isis.services`, `isis.services.ServicesInstallerFromAnnotation.packagePrefix` and `isis.persistor.datanucleus.RegisterEntities.packagePrefix` and `isis.fixtures`; these are listed in the sections below.
@@ -108,5 +108,5 @@ Viewers are specified by way of the filters and servlets in the xref:ugbtb.adoc#
</context-param>
----
-The net effect of this configuration is simply to ensure that the `viewer_wicket.properties` and/or the `viewer_restfulobjects.properties` files are read.
+As of `1.13.0-SNAPSHOT`, this configuration property has no effect: the `viewer_wicket.properties` and `viewer_restulobjects.properties` are always checked. In previous versions, this context param was used to indicate which of the two config files should be read.
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/applib/src/main/java/org/apache/isis/applib/fixtures/switchuser/SwitchUserService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/switchuser/SwitchUserService.java b/core/applib/src/main/java/org/apache/isis/applib/fixtures/switchuser/SwitchUserService.java
index 2d20aa7..54d9c11 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixtures/switchuser/SwitchUserService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixtures/switchuser/SwitchUserService.java
@@ -20,6 +20,8 @@
package org.apache.isis.applib.fixtures.switchuser;
import java.util.List;
+
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.fixtures.AbstractFixture;
import org.apache.isis.applib.services.sudo.SudoService;
@@ -39,13 +41,19 @@ public interface SwitchUserService {
/**
* Switches the current user with the list of specified roles.
+ *
+ * @deprecated
*/
@Deprecated
+ @Programmatic
void switchUser(String username, String... roles);
/**
* Switches the current user with the list of specified roles.
+ * @deprecated
*/
+ @Deprecated
+ @Programmatic
void switchUser(String username, List<String> roles);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/applib/src/main/java/org/apache/isis/applib/fixtures/switchuser/SwitchUserServiceAware.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixtures/switchuser/SwitchUserServiceAware.java b/core/applib/src/main/java/org/apache/isis/applib/fixtures/switchuser/SwitchUserServiceAware.java
index dee03f3..b261ae2 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixtures/switchuser/SwitchUserServiceAware.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixtures/switchuser/SwitchUserServiceAware.java
@@ -19,13 +19,19 @@
package org.apache.isis.applib.fixtures.switchuser;
+import org.apache.isis.applib.services.sudo.SudoService;
+
/**
* Implement if require {@link SwitchUserService} to be injected into fixture.
*
- * @deprecated - use instead OverrideUserService
+ * @deprecated - use instead {@link SudoService}
*/
@Deprecated
public interface SwitchUserServiceAware {
+ /**
+ * @deprecated - use instead {@link SudoService}
+ */
+ @Deprecated
void setService(SwitchUserService switchUserService);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
index b9e3f77..4c81c29 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
@@ -60,7 +60,7 @@ import org.apache.isis.core.runtime.services.ServicesInstallerFromConfigurationA
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.transaction.IsisTransaction;
import org.apache.isis.core.runtime.system.transaction.IsisTransaction.State;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
@@ -606,7 +606,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
public ObjectAdapter reload(RootOid oid) {
ensureSessionInProgress();
- final PersistenceSessionInternal persistenceSession = getPersistenceSession();
+ final PersistenceSession persistenceSession = getPersistenceSession();
return persistenceSession.loadObjectInTransaction(oid);
}
@@ -856,7 +856,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
return getPersistenceSession().getTransactionManager();
}
- public PersistenceSessionInternal getPersistor() {
+ public PersistenceSession getPersistor() {
return getPersistenceSession();
}
@@ -864,7 +864,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
return getPersistor();
}
- protected PersistenceSessionInternal getPersistenceSession() {
+ protected PersistenceSession getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
index 716bb02..9896993 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
@@ -66,6 +66,7 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
*/
public class ServicesInjector implements ApplicationScopedComponent {
+
private static final Logger LOG = LoggerFactory.getLogger(ServicesInjector.class);
//region > constructor, fields
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/metamodel/src/main/java/org/apache/isis/core/runtime/about/AboutIsis.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/about/AboutIsis.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/about/AboutIsis.java
deleted file mode 100644
index f8775fc..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/about/AboutIsis.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-package org.apache.isis.core.runtime.about;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.Properties;
-import java.util.ResourceBundle;
-
-import org.apache.isis.core.commons.exceptions.IsisException;
-
-public class AboutIsis {
- private static String applicationCopyrightNotice;
- private static String applicationName;
- private static String applicationVersion;
- private static String frameworkName;
- private static String frameworkVersion;
- private static String logo;
- private static String frameworkCopyright;
- private static String frameworkCompileDate;
- private static List<ComponentDetails> componentDetails;
-
- static {
- try {
- final ResourceBundle bundle = ResourceBundle.getBundle("isis-version");
- logo = bundle.getString("framework.logo");
- frameworkVersion = bundle.getString("framework.version");
- frameworkName = bundle.getString("framework.name");
- frameworkCopyright = bundle.getString("framework.copyright");
- frameworkCompileDate = bundle.getString("framework.compile.date");
- } catch (final MissingResourceException ex) {
- logo = "splash-logo";
- frameworkVersion = "${project.version}-r${buildNumber}";
- frameworkCopyright = "Copyright (c) 2010~2013 Apache Software Foundation";
- frameworkName = "${project.parent.name}";
- }
-
- // NOT in use yet: frameworkVersion = findVersion();
- }
-
- public static String findVersion() {
- try {
- final String moduleId = "org.apache.isis.plugins:dndviewer";
- final String module = moduleId.replace(":", "/");
- final InputStream resourceAsStream = AboutIsis.class.getClassLoader().getResourceAsStream("META-INF/maven/" + module + "/pom.properties");
- if (resourceAsStream == null) {
- return "no version";
- }
- final Properties p = new Properties();
- p.load(resourceAsStream);
- final String version = p.getProperty("version");
- return version;
- } catch (final IOException e) {
- throw new IsisException(e);
- }
-
- }
-
- public static String getApplicationCopyrightNotice() {
- return applicationCopyrightNotice;
- }
-
- public static String getApplicationName() {
- return applicationName;
- }
-
- public static String getApplicationVersion() {
- return applicationVersion;
- }
-
- public static String getFrameworkCopyrightNotice() {
- return select(frameworkCopyright, "Copyright Apache Software Foundation");
- }
-
- public static String getFrameworkCompileDate() {
- return frameworkCompileDate;
- }
-
- public static String getFrameworkName() {
- return select(frameworkName, "Apache Isis");
- }
-
- public static String getImageName() {
- return select(logo, "splash-logo");
- }
-
- public static String getFrameworkVersion() {
- final String version = "Version " + select(frameworkVersion, "unreleased");
- /*
- * NOT in use yet: for (ComponentDetails details : componentDetails) {
- * version += "\n" + details.getName() + " " + details.getModule() + " "
- * + details.getVersion(); }
- */
- return version;
- }
-
- public static void main(final String[] args) {
- System.out.println(getFrameworkName() + ", " + getFrameworkVersion());
- System.out.println(getFrameworkCopyrightNotice());
- }
-
- private static String select(final String value, final String defaultValue) {
- return value == null || value.startsWith("${") ? defaultValue : value;
- }
-
- public static void setApplicationCopyrightNotice(final String applicationCopyrightNotice) {
- AboutIsis.applicationCopyrightNotice = applicationCopyrightNotice;
- }
-
- public static void setApplicationName(final String applicationName) {
- AboutIsis.applicationName = applicationName;
- }
-
- public static void setApplicationVersion(final String applicationVersion) {
- AboutIsis.applicationVersion = applicationVersion;
- }
-
- public static void setComponentDetails(final List<ComponentDetails> componentDetails) {
- AboutIsis.componentDetails = componentDetails;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/metamodel/src/main/java/org/apache/isis/core/runtime/about/ComponentDetails.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/about/ComponentDetails.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/about/ComponentDetails.java
deleted file mode 100644
index 6b3d2ea..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/about/ComponentDetails.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-package org.apache.isis.core.runtime.about;
-
-public interface ComponentDetails {
-
- public abstract String getName();
-
- public abstract String getModule();
-
- public abstract String getVersion();
-
- public abstract boolean isInstalled();
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/metamodel/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java
index 3c74e07..2045226 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/sysout/SystemPrinter.java
@@ -19,19 +19,7 @@
package org.apache.isis.core.runtime.sysout;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FilenameFilter;
-import java.io.LineNumberReader;
import java.io.PrintStream;
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.Properties;
-import java.util.TimeZone;
-
-import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.commons.lang.CloseableExtensions;
-import org.apache.isis.core.runtime.about.AboutIsis;
public class SystemPrinter {
@@ -49,98 +37,6 @@ public class SystemPrinter {
return output;
}
- void print(final String string) {
- output.println(string);
- }
-
- void printBlock(final String title) {
- print("");
- print("------------------------------------------");
- print(title);
- print("------------------------------------------");
- }
-
- public void printDiagnostics() {
- print("------- Apache Isis diagnostics report -------");
- printVersion();
-
- printBlock("System properties");
- final Properties properties = System.getProperties();
- final Enumeration<?> propertyNames = properties.propertyNames();
- while (propertyNames.hasMoreElements()) {
- final String name = (String) propertyNames.nextElement();
- final String property = properties.getProperty(name);
- final StringBuilder buf = new StringBuilder();
- if (name.endsWith(".path") || name.endsWith(".dirs")) {
- final String[] split = property.split(":");
- buf.append(split[0]);
- for (int i = 1; i < split.length; i++) {
- buf.append("\n\t\t" + split[i]);
- }
- }
- print(name + "= " + buf.toString());
- }
-
- File file = new File("../lib");
- if (file.isDirectory()) {
- final String[] files = file.list(new FilenameFilter() {
- @Override
- public boolean accept(final File dir, final String name) {
- return name.endsWith(".jar");
- }
- });
- printBlock("Libs");
- for (final String file2 : files) {
- print(file2);
- }
- }
-
- printBlock("Locale information");
- print("Default locale: " + Locale.getDefault());
- print("Default timezone: " + TimeZone.getDefault());
-
- file = new File("config");
- if (file.isDirectory()) {
- final String[] files = file.list(new FilenameFilter() {
- @Override
- public boolean accept(final File dir, final String name) {
- return new File(dir, name).isFile();
- }
- });
- printBlock("Config files");
- for (final String file2 : files) {
- print(file2);
- }
-
- for (final String file2 : files) {
- print("");
- print("--------------------------------------------------------------------------------------------------------");
- print(file2);
- print("");
- LineNumberReader fileInputStream = null;
- try {
- fileInputStream = new LineNumberReader(new FileReader(new File(file, file2)));
- String line;
- while ((line = fileInputStream.readLine()) != null) {
- print(fileInputStream.getLineNumber() + " " + line);
- }
- } catch (final Exception e) {
- throw new IsisException(e);
- } finally {
- CloseableExtensions.closeSafely(fileInputStream);
- }
- print("");
- }
-
- }
- }
-
- public void printVersion() {
- final String date = AboutIsis.getFrameworkCompileDate();
- final String compileDate = date == null ? "" : ", compiled on " + date;
- print(AboutIsis.getFrameworkName() + ", " + AboutIsis.getFrameworkVersion() + compileDate);
- }
-
public void printErrorMessage(final String message) {
output.println("Error: " + message);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisInstallerRegistry.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisInstallerRegistry.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisInstallerRegistry.java
deleted file mode 100644
index 7f0bbee..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisInstallerRegistry.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.apache.isis.core.runtime;
-
-import java.io.InputStream;
-
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to You 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.
- */
-
-public final class IsisInstallerRegistry {
-
- public final static String INSTALLER_REGISTRY_FILE = "installer-registry.properties";
-
- private IsisInstallerRegistry() {
- }
-
- public static InputStream getPropertiesAsStream() {
- return IsisInstallerRegistry.class.getResourceAsStream(IsisInstallerRegistry.INSTALLER_REGISTRY_FILE);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
index 849443d..b7d4390 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
@@ -47,7 +47,7 @@ import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
public class ObjectFixtureFilePersistor {
@@ -179,7 +179,7 @@ public class ObjectFixtureFilePersistor {
- protected PersistenceSessionInternal getPersistenceSession() {
+ protected PersistenceSession getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
@@ -216,7 +216,7 @@ class LoadedObjects {
}
- protected PersistenceSessionInternal getPersistenceSession() {
+ protected PersistenceSession getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java
index 6484454..8ec93fd 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java
@@ -48,7 +48,7 @@ import org.apache.isis.core.metamodel.spec.Persistability;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
public class ObjectFixtureService {
@@ -231,7 +231,7 @@ public class ObjectFixtureService {
// from context
// //////////////////////////////////////////////////////////////////
- protected PersistenceSessionInternal getPersistenceSession() {
+ protected PersistenceSession getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
index cbcf47b..c54a01b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
@@ -34,7 +34,7 @@ import org.apache.isis.core.commons.lang.ObjectExtensions;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
/**
@@ -53,7 +53,7 @@ public class FixturesInstallerDelegate {
protected final List<Object> fixtures = new ArrayList<Object>();
private final SwitchUserServiceImpl switchUserService = new SwitchUserServiceImpl();
- private final PersistenceSessionInternal persistenceSession;
+ private final PersistenceSession persistenceSession;
/**
* The requested {@link LogonFixture}, if any.
@@ -70,7 +70,7 @@ public class FixturesInstallerDelegate {
// /////////////////////////////////////////////////////////
/**
- * The {@link PersistenceSessionInternal} used will be that from
+ * The {@link PersistenceSession} used will be that from
* {@link IsisContext#getPersistenceSession() IsisContext}.
*/
public FixturesInstallerDelegate() {
@@ -78,12 +78,12 @@ public class FixturesInstallerDelegate {
}
/**
- * For testing, supply own {@link PersistenceSessionInternal} rather than lookup
+ * For testing, supply own {@link PersistenceSession} rather than lookup
* from context.
*
* @param persistenceSession
*/
- public FixturesInstallerDelegate(final PersistenceSessionInternal persistenceSession) {
+ public FixturesInstallerDelegate(final PersistenceSession persistenceSession) {
this.persistenceSession = persistenceSession;
}
@@ -148,7 +148,7 @@ public class FixturesInstallerDelegate {
/**
* Hook - default does nothing.
*/
- protected void preInstallFixtures(final PersistenceSessionInternal persistenceSession) {
+ protected void preInstallFixtures(final PersistenceSession persistenceSession) {
}
// ///////////////////////////////////////
@@ -239,7 +239,7 @@ public class FixturesInstallerDelegate {
/**
* Hook - default does nothing.
*/
- protected void postInstallFixtures(final PersistenceSessionInternal persistenceSession) {
+ protected void postInstallFixtures(final PersistenceSession persistenceSession) {
}
// /////////////////////////////////////////////////////////
@@ -265,11 +265,11 @@ public class FixturesInstallerDelegate {
* persistor or the persistor specified in the constructor.
*
* <p>
- * Note: if a {@link PersistenceSessionInternal persistor} was specified via the
+ * Note: if a {@link PersistenceSession persistor} was specified via the
* constructor, this is not cached (to do so would cause the usage of tests
* that use the singleton to break).
*/
- private PersistenceSessionInternal getPersistenceSession() {
+ private PersistenceSession getPersistenceSession() {
return persistenceSession != null ? persistenceSession : IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerLookup.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerLookup.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerLookup.java
index cac2a50..5b07625 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerLookup.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerLookup.java
@@ -19,11 +19,6 @@
package org.apache.isis.core.runtime.installerregistry;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
import java.util.List;
import com.google.common.collect.Lists;
@@ -33,112 +28,79 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.components.Installer;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.ensure.Assert;
-import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.factory.InstanceCreationClassException;
import org.apache.isis.core.commons.factory.InstanceCreationException;
import org.apache.isis.core.commons.factory.InstanceUtil;
import org.apache.isis.core.commons.factory.UnavailableClassException;
import org.apache.isis.core.commons.lang.ObjectExtensions;
-import org.apache.isis.core.commons.lang.StringExtensions;
-import org.apache.isis.core.runtime.IsisInstallerRegistry;
-import org.apache.isis.core.runtime.about.AboutIsis;
-import org.apache.isis.core.runtime.about.ComponentDetails;
import org.apache.isis.core.runtime.authentication.AuthenticationManagerInstaller;
import org.apache.isis.core.runtime.authorization.AuthorizationManagerInstaller;
-import org.apache.isis.core.runtime.fixtures.FixturesInstaller;
-import org.apache.isis.core.runtime.fixtures.FixturesInstallerFromConfiguration;
-import org.apache.isis.core.runtime.services.ServicesInstaller;
-import org.apache.isis.core.runtime.services.ServicesInstallerFromConfigurationAndAnnotation;
import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.runtime.system.SystemConstants;
-import org.apache.isis.core.runtime.systemdependencyinjector.SystemDependencyInjector;
-import org.apache.isis.core.runtime.systemdependencyinjector.SystemDependencyInjectorAware;
/**
- * The installers correspond more-or-less to the configurable top-level
- * components of {@link IsisSystem}.
- *
- * <p>
- * The methods of {@link InstallerRepository} may be called without
- * {@link #init() initializing} this class, but other methods may not.
- *
- * <p>
- * This class retrieves named {@link Installer}s from those loaded at creation,
- * updating the {@link IsisConfiguration} as it goes.
- * </p>
+ * Looks up authorization and authentication implementations.
*
- * <p>
- * A list of possible classes are read in from the resource file
- * <tt>installer-registry.properties</tt>. Each installer has a unique name
- * (with respect to its type) that will be compared when one of this classes
- * methods are called. These are instantiated when requested.
+ * Previously this class was used to lookup the top-level components of
+ * {@link IsisSystem} (persistence, authentication, authorization, reflector and so on),
+ * each being looked up from a file called <tt>installer-registry.properties</tt>.
+ * Of these responsibilities, only the support for authentication and authorization remains,
+ * the remainder have only a single implementation. The implementation has been
+ * substantially simplified.
+ *
+ * Note that it <i>is</i> possible to use other {@link Installer} implementations;
+ * just specify the {@link Installer}'s fully qualified class name.
*
- * <p>
- * Note that it <i>is</i> possible to use an {@link Installer} implementation
- * even if it has not been registered in <tt>installer-registry.properties</tt>
- * : just specify the {@link Installer}'s fully qualified class name.
+ * @deprecated - intention is to replace in future using CDI
*/
-public class InstallerLookup implements ApplicationScopedComponent, SystemDependencyInjector {
+@Deprecated
+public class InstallerLookup implements ApplicationScopedComponent {
private static final Logger LOG = LoggerFactory.getLogger(InstallerLookup.class);
- private final IsisConfigurationDefault isisConfiguration;
-
- //region > Constructor
+ //region > constructor, fields
+ private final IsisConfigurationDefault isisConfiguration;
private final List<Installer> installerList = Lists.newArrayList();
- public InstallerLookup(final IsisConfigurationDefault isisConfiguration) {
+ public InstallerLookup(final IsisConfigurationDefault isisConfiguration) throws InstanceCreationException {
this.isisConfiguration = isisConfiguration;
- final InputStream in = getInstallerRegistryStream(IsisInstallerRegistry.INSTALLER_REGISTRY_FILE);
- final BufferedReader reader = new BufferedReader(new InputStreamReader(in));
- try {
- String line;
- while ((line = reader.readLine()) != null) {
- final String className = StringExtensions.asFirstWord(line);
- if (className.length() == 0 || className.startsWith("#")) {
- continue;
- }
- try {
- final Installer object = (Installer) InstanceUtil.createInstance(className, isisConfiguration);
- LOG.debug("created component installer: " + object.getName() + " - " + className);
- installerList.add(object);
- } catch (final UnavailableClassException e) {
- LOG.info("component installer not found; it will not be available: " + className);
- } catch (final InstanceCreationClassException e) {
- LOG.info("instance creation exception: " + e.getMessage());
- } catch (final InstanceCreationException e) {
- throw e;
- }
- }
- } catch (final IOException e) {
- throw new IsisException(e);
- } finally {
- close(reader);
- }
+ final List<String> installerClassNames = Lists.newArrayList(
+ "org.apache.isis.core.security.authentication.BypassAuthenticationManagerInstaller", // bypass
+ "org.apache.isis.security.shiro.authentication.ShiroAuthenticationManagerInstaller", // shiro
+ "org.apache.isis.core.security.authorization.BypassAuthorizationManagerInstaller", // bypass
+ "org.apache.isis.security.shiro.authorization.ShiroAuthorizationManagerInstaller" // shiro
+ );
- final List<ComponentDetails> installerVersionList = new ArrayList<ComponentDetails>();
- for (final Installer installer : installerList) {
- installerVersionList.add(new InstallerVersion(installer));
+ for (String className : installerClassNames) {
+ if (className.length() == 0 || className.startsWith("#")) {
+ continue;
+ }
+ try {
+ final Installer object = (Installer) InstanceUtil.createInstance(className, isisConfiguration);
+ LOG.debug("created component installer: " + object.getName() + " - " + className);
+ installerList.add(object);
+ } catch (final UnavailableClassException e) {
+ LOG.info("component installer not found; it will not be available: " + className);
+ } catch (final InstanceCreationClassException e) {
+ LOG.info("instance creation exception: " + e.getMessage());
+ }
}
- AboutIsis.setComponentDetails(installerVersionList);
}
- //endregion
-
- //region > Configuration
public IsisConfigurationDefault getConfiguration() {
return isisConfiguration;
}
+
//endregion
//region > framework
public AuthenticationManagerInstaller authenticationManagerInstaller(final String requested) {
+
return getInstaller(
AuthenticationManagerInstaller.class,
requested,
@@ -155,13 +117,12 @@ public class InstallerLookup implements ApplicationScopedComponent, SystemDepend
//endregion
- //region > framework - generic
+ //region > helpers
@SuppressWarnings("unchecked")
private <T extends Installer> T getInstaller(final Class<T> cls, final String implName) {
Assert.assertNotNull("No name specified", implName);
for (final Installer installer : installerList) {
if (cls.isAssignableFrom(installer.getClass()) && installer.getName().equals(implName)) {
- injectDependenciesInto(installer);
return (T) installer;
}
}
@@ -171,23 +132,17 @@ public class InstallerLookup implements ApplicationScopedComponent, SystemDepend
@SuppressWarnings("unchecked")
public Installer getInstaller(final String implClassName) {
try {
- final Installer installer = ObjectExtensions.asT(InstanceUtil.createInstance(implClassName));
- if (installer != null) {
- injectDependenciesInto(installer);
- }
- return installer;
- } catch (final InstanceCreationException e) {
- throw new InstanceCreationException(
- "Specification error in " + IsisInstallerRegistry.INSTALLER_REGISTRY_FILE, e);
+ return ObjectExtensions.asT(InstanceUtil.createInstance(implClassName));
} catch (final UnavailableClassException e) {
return null;
}
}
- //endregion
-
- //region > Helpers
- private <T extends Installer> T getInstaller(final Class<T> requiredType, String reqImpl, final String key, final String defaultImpl) {
+ private <T extends Installer> T getInstaller(
+ final Class<T> requiredType,
+ String reqImpl,
+ final String key,
+ final String defaultImpl) {
if (reqImpl == null) {
reqImpl = getConfiguration().getString(key, defaultImpl);
}
@@ -196,48 +151,12 @@ public class InstallerLookup implements ApplicationScopedComponent, SystemDepend
}
final T installer = getInstaller(requiredType, reqImpl);
if (installer == null) {
- throw new InstanceCreationException("Failed to load installer; named/class:'" + reqImpl + "' (of type " + requiredType.getName() + ")");
+ throw new InstanceCreationException(
+ "Failed to load installer; named/class:'" + reqImpl + "' (of type " + requiredType.getName() + ")");
}
return installer;
}
- private void close(final BufferedReader reader) {
- if (reader != null) {
- try {
- reader.close();
- } catch (final IOException e) {
- throw new IsisException(e);
- }
- }
- }
-
- private InputStream getInstallerRegistryStream(final String componentFile) {
- final InputStream in = IsisInstallerRegistry.getPropertiesAsStream();
- if (in == null) {
- throw new IsisException("No resource found: " + componentFile);
- }
- return in;
- }
- //endregion
-
- //region > SystemDependencyInjector, Injectable
- @Override
- public <T> T injectDependenciesInto(final T candidate) {
- injectInto(candidate);
- return candidate;
- }
-
- public void injectInto(final Object candidate) {
- if (SystemDependencyInjectorAware.class.isAssignableFrom(candidate.getClass())) {
- final SystemDependencyInjectorAware cast = SystemDependencyInjectorAware.class.cast(candidate);
- cast.setSystemDependencyInjector(this);
- }
- if (InstallerLookupAware.class.isAssignableFrom(candidate.getClass())) {
- final InstallerLookupAware cast = InstallerLookupAware.class.cast(candidate);
- cast.setInstallerLookup(this);
- }
- }
//endregion
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerLookupAware.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerLookupAware.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerLookupAware.java
deleted file mode 100644
index 20022d1..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerLookupAware.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-package org.apache.isis.core.runtime.installerregistry;
-
-public interface InstallerLookupAware {
-
- void setInstallerLookup(final InstallerLookup installerLookup);
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerRepository.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerRepository.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerRepository.java
deleted file mode 100644
index d7e33f7..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerRepository.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-package org.apache.isis.core.runtime.installerregistry;
-
-import org.apache.isis.core.commons.components.Installer;
-
-public interface InstallerRepository {
-
- public Installer[] getInstallers(final Class<?> cls);
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerVersion.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerVersion.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerVersion.java
deleted file mode 100644
index b3ef921..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerVersion.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-package org.apache.isis.core.runtime.installerregistry;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-import org.apache.isis.core.commons.components.Installer;
-import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.runtime.about.AboutIsis;
-import org.apache.isis.core.runtime.about.ComponentDetails;
-
-/**
- * Details name and version of installer.
- */
-public class InstallerVersion implements ComponentDetails {
-
- private final Installer installer;
-
- public InstallerVersion(final Installer installer) {
- this.installer = installer;
- }
-
- @Override
- public String getName() {
- return installer.getName();
- }
-
- @Override
- public String getModule() {
- return "org.apache.isis.plugins:dndviewer";
- }
-
- @Override
- public String getVersion() {
- return findVersion(getModule());
- }
-
- @Override
- public boolean isInstalled() {
- return false;
- }
-
- private String findVersion(final String moduleId) {
- try {
- final String module = moduleId.replace(":", "/");
- final InputStream resourceAsStream = AboutIsis.class.getClassLoader().getResourceAsStream("META-INF/maven/" + module + "/pom.properties");
- if (resourceAsStream == null) {
- return "no version";
- }
- final Properties p = new Properties();
- p.load(resourceAsStream);
- final String version = p.getProperty("version");
- return version;
- } catch (final IOException e) {
- throw new IsisException(e);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstaller.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstaller.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstaller.java
index 1b18d43..47ccb7a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstaller.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstaller.java
@@ -22,11 +22,11 @@ package org.apache.isis.core.runtime.installerregistry.installerapi;
import org.apache.isis.core.commons.components.Installer;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory;
/**
- * Installs a {@link PersistenceSessionInternal} during system start up.
+ * Installs a {@link PersistenceSession} during system start up.
*/
public interface PersistenceMechanismInstaller extends Installer {
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
index a719c9a..3ebbb98 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
@@ -47,7 +47,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
/**
* Holds the state for the specified object in serializable form.
@@ -403,7 +403,7 @@ public class Memento implements Serializable {
return IsisContext.getSpecificationLoader();
}
- protected PersistenceSessionInternal getPersistenceSession() {
+ protected PersistenceSession getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
index 037d9ad..b93074a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
public class StandaloneData extends Data {
@@ -127,7 +127,7 @@ public class StandaloneData extends Data {
}
}
- protected PersistenceSessionInternal getPersistenceSession() {
+ protected PersistenceSession getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/FixturesInstalledFlag.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/FixturesInstalledFlag.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/FixturesInstalledFlag.java
index b4cc992..8eacc26 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/FixturesInstalledFlag.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/FixturesInstalledFlag.java
@@ -19,11 +19,11 @@
package org.apache.isis.core.runtime.persistence;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
/**
* For {@link org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory} implementations that can cache the
- * {@link PersistenceSessionInternal#isFixturesInstalled()} so is only called once per
+ * {@link PersistenceSession#isFixturesInstalled()} so is only called once per
* application scope.
*/
public interface FixturesInstalledFlag {
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
index df03789c..89ab049 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
@@ -43,7 +43,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.Specification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
@@ -57,7 +57,7 @@ public class PojoAdapter extends InstanceAbstract implements ObjectAdapter {
private final AuthenticationSession authenticationSession;
private final SpecificationLoader specificationLoader;
private final Localization localization;
- private final PersistenceSessionInternal persistenceSession;
+ private final PersistenceSession persistenceSession;
/**
* can be {@link #replacePojo(Object) replace}d.
@@ -79,7 +79,7 @@ public class PojoAdapter extends InstanceAbstract implements ObjectAdapter {
final AuthenticationSession authenticationSession,
final Localization localization,
final SpecificationLoader specificationLoader,
- final PersistenceSessionInternal persistenceSession) {
+ final PersistenceSession persistenceSession) {
this.persistenceSession = persistenceSession;
@@ -428,7 +428,7 @@ public class PojoAdapter extends InstanceAbstract implements ObjectAdapter {
*
* <p>
* Specifically, if an action which has been annotated (is copied by {@link org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacet action invocation facet}), and for a parented collection
- * (is copied by the {@link PersistenceSessionInternal} when {@link PersistenceSessionInternal#adapterFor(Object, ObjectAdapter, OneToManyAssociation) creating} an adapter for a collection.
+ * (is copied by the {@link PersistenceSession} when {@link PersistenceSession#adapterFor(Object, ObjectAdapter, OneToManyAssociation) creating} an adapter for a collection.
* </p>
*/
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/container/DomainObjectContainerResolve.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/container/DomainObjectContainerResolve.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/container/DomainObjectContainerResolve.java
index 59d2159..7e51973 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/container/DomainObjectContainerResolve.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/container/DomainObjectContainerResolve.java
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
/**
* Helper class that encapsulates the processing performed by domain object
@@ -38,10 +38,10 @@ import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInterna
* <p>
* Implementation note: rather than inject in its dependencies, we instead look
* up dependencies from the {@link IsisContext}. This is necessary, for the
- * {@link PersistenceSessionInternal} at least, because class enhancers may hold a
+ * {@link PersistenceSession} at least, because class enhancers may hold a
* reference to the factory as part of the generated bytecode. Since the
- * {@link PersistenceSessionInternal} could change over the lifetime of the instance,
- * we must always look the {@link PersistenceSessionInternal} from the {@link IsisContext}.
+ * {@link PersistenceSession} could change over the lifetime of the instance,
+ * we must always look the {@link PersistenceSession} from the {@link IsisContext}.
* The same applies to the {@link ServicesInjector}.
*/
public class DomainObjectContainerResolve {
@@ -107,7 +107,7 @@ public class DomainObjectContainerResolve {
// Dependencies (looked up from context)
// /////////////////////////////////////////////////////////////////
- protected PersistenceSessionInternal getPersistenceSession() {
+ protected PersistenceSession getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerDiagnostics.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerDiagnostics.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerDiagnostics.java
deleted file mode 100644
index 479cba4..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerDiagnostics.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-package org.apache.isis.core.runtime.runner.opts;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Options;
-
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
-import org.apache.isis.core.runtime.optionhandler.BootPrinter;
-import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
-import org.apache.isis.core.runtime.runner.Constants;
-
-import static org.apache.isis.core.runtime.runner.Constants.DIAGNOSTICS_OPT;
-
-/**
- * @deprecated - this seems to be a no-op; it is no longer registered in IsisRunner/IsisWebServer
- */
-@Deprecated
-public class OptionHandlerDiagnostics extends OptionHandlerAbstract {
-
- public OptionHandlerDiagnostics() {
- super();
- }
-
- @Override
- public void addOption(final Options options) {
- options.addOption(DIAGNOSTICS_OPT, false, "print information that can be used diagnose or report problems");
- }
-
- @Override
- public boolean handle(final CommandLine commandLine, final BootPrinter bootPrinter, final Options options) {
- if (commandLine.hasOption(Constants.DIAGNOSTICS_OPT)) {
- bootPrinter.printDiagnostics();
- return false;
- }
- return true;
- }
-
- @Override
- public void prime(final IsisConfigurationBuilder isisConfigurationBuilder) {
- // TODO need to do what, exactly?
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerVersion.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerVersion.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerVersion.java
deleted file mode 100644
index 3cd6bc6..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerVersion.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-
-package org.apache.isis.core.runtime.runner.opts;
-
-import static org.apache.isis.core.runtime.runner.Constants.VERSION_OPT;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Options;
-
-import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
-import org.apache.isis.core.runtime.optionhandler.BootPrinter;
-import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
-import org.apache.isis.core.runtime.runner.Constants;
-
-public class OptionHandlerVersion extends OptionHandlerAbstract {
-
- public OptionHandlerVersion() {
- super();
- }
-
- @Override
- public void addOption(final Options options) {
- options.addOption(VERSION_OPT, false, "print version information");
- }
-
- @Override
- public boolean handle(final CommandLine commandLine, final BootPrinter bootPrinter, final Options options) {
- if (commandLine.hasOption(Constants.VERSION_OPT)) {
- bootPrinter.printVersion();
- return false;
- }
- return true;
- }
-
- @Override
- public void prime(final IsisConfigurationBuilder isisConfigurationBuilder) {
- // nothing to do
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java
index 4ae9afd..2b3c8cb 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundCommandExecution.java
@@ -44,7 +44,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.runtime.services.memento.MementoServiceDefault;
import org.apache.isis.core.runtime.sessiontemplate.AbstractIsisSessionTemplate;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
import org.apache.isis.core.runtime.system.transaction.TransactionalClosure;
import org.apache.isis.schema.cmd.v1.ActionDto;
@@ -80,7 +80,7 @@ public abstract class BackgroundCommandExecution extends AbstractIsisSessionTemp
protected void doExecute(Object context) {
- final PersistenceSessionInternal persistenceSession = getPersistenceSession();
+ final PersistenceSession persistenceSession = getPersistenceSession();
final IsisTransactionManager transactionManager = getTransactionManager(persistenceSession);
final List<Command> backgroundCommands = Lists.newArrayList();
transactionManager.executeWithinTransaction(new TransactionalClosure() {
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
index 9018e0e..f712a5b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
@DomainService(
nature = NatureOfService.DOMAIN
@@ -105,7 +105,7 @@ public class HomePageProviderServiceDefault implements HomePageProviderService {
// for any other value for Where
protected static final Where WHERE_FOR_ACTION_INVOCATION = Where.ANYWHERE;
- protected PersistenceSessionInternal getPersistenceSession() {
+ protected PersistenceSession getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
index eae20d9..ebe975d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.runtime.persistence.container.DomainObjectContainerResolve;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
@DomainService(
@@ -146,7 +146,7 @@ public class PersistenceSessionServiceInternalDefault implements PersistenceSess
return getPersistenceSession().firstMatchingQuery(query);
}
- public static PersistenceSessionInternal getPersistenceSession() {
+ public static PersistenceSession getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java
index f84f6a3..dea1dc3 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java
@@ -71,7 +71,7 @@ import org.apache.isis.core.metamodel.services.publishing.PublishingServiceInter
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.runtime.services.changes.ChangedObjectsServiceInternal;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
/**
@@ -98,7 +98,7 @@ public class PublishingServiceInternalDefault implements PublishingServiceIntern
getPersistenceSession().remapRecreatedPojo(adapter, replacementObject);
return adapter;
}
- protected PersistenceSessionInternal getPersistenceSession() {
+ protected PersistenceSession getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/services/transtate/TransactionStateProviderInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/transtate/TransactionStateProviderInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/transtate/TransactionStateProviderInternalDefault.java
index c30b8f3..7d68cc3 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/transtate/TransactionStateProviderInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/transtate/TransactionStateProviderInternalDefault.java
@@ -23,7 +23,7 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.core.metamodel.services.transtate.TransactionStateProviderInternal;
import org.apache.isis.core.metamodel.transactions.TransactionState;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.transaction.IsisTransaction;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
@@ -48,7 +48,7 @@ public class TransactionStateProviderInternalDefault implements TransactionState
return getPersistenceSession().getTransactionManager();
}
- private static PersistenceSessionInternal getPersistenceSession() {
+ private static PersistenceSession getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
index a2ed146..e31d155 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.runtime.snapshot.XmlSnapshot;
import org.apache.isis.core.runtime.snapshot.XmlSnapshotBuilder;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
/**
* This service allows an XML document to be generated capturing the data of a root entity and specified related
@@ -90,7 +90,7 @@ public class XmlSnapshotServiceDefault extends XmlSnapshotServiceAbstract {
// //////////////////////////////////////
- protected PersistenceSessionInternal gerPersistenceSession() {
+ protected PersistenceSession gerPersistenceSession() {
return IsisContext.getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
index 8fa7749..324dd6c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
@@ -22,7 +22,7 @@ import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.session.IsisSession;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
import org.apache.isis.core.runtime.system.transaction.TransactionalClosure;
@@ -35,7 +35,7 @@ public abstract class AbstractIsisSessionTemplate {
public void execute(final AuthenticationSession authSession, final Object context) {
try {
IsisContext.openSession(authSession);
- PersistenceSessionInternal persistenceSession = getPersistenceSession();
+ PersistenceSession persistenceSession = getPersistenceSession();
persistenceSession.getServicesInjector().injectServicesInto(this);
doExecute(context);
} finally {
@@ -58,7 +58,7 @@ public abstract class AbstractIsisSessionTemplate {
* transaction handling.
*/
protected void doExecute(final Object context) {
- final PersistenceSessionInternal persistenceSession = getPersistenceSession();
+ final PersistenceSession persistenceSession = getPersistenceSession();
final IsisTransactionManager transactionManager = getTransactionManager(persistenceSession);
transactionManager.executeWithinTransaction(new TransactionalClosure() {
@Override
@@ -90,11 +90,11 @@ public abstract class AbstractIsisSessionTemplate {
// //////////////////////////////////////
- protected PersistenceSessionInternal getPersistenceSession() {
+ protected PersistenceSession getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
- protected IsisTransactionManager getTransactionManager(PersistenceSessionInternal persistenceSession) {
+ protected IsisTransactionManager getTransactionManager(PersistenceSession persistenceSession) {
return persistenceSession.getTransactionManager();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshotBuilder.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshotBuilder.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshotBuilder.java
index 2070ddb..6c50c59 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshotBuilder.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshotBuilder.java
@@ -25,7 +25,7 @@ import com.google.common.collect.Lists;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
/**
* Builds an {@link XmlSnapshot} using a fluent use through a builder:
@@ -93,7 +93,7 @@ public class XmlSnapshotBuilder {
// Dependencies (from context)
// ///////////////////////////////////////////////////////
- private static PersistenceSessionInternal getPersistenceSession() {
+ private static PersistenceSession getPersistenceSession() {
return IsisContext.getPersistenceSession();
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/b319973f/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
index 1a5c1a6..71e5d9b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
@@ -55,7 +55,7 @@ import org.apache.isis.core.runtime.system.internal.IsisLocaleInitializer;
import org.apache.isis.core.runtime.system.internal.IsisTimeZoneInitializer;
import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory;
import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactoryMetamodelRefiner;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionInternal;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManagerException;
@@ -324,7 +324,7 @@ public class IsisSystem implements ApplicationScopedComponent {
return getPersistenceSession().getServicesInjector();
}
- private PersistenceSessionInternal getPersistenceSession() {
+ private PersistenceSession getPersistenceSession() {
return IsisContext.getPersistenceSession();
}