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 2019/01/10 06:41:41 UTC

[isis] branch 2033-IoC updated (45e790f -> 9007c42)

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a change to branch 2033-IoC
in repository https://gitbox.apache.org/repos/asf/isis.git.


    from 45e790f  merge 'v2' into '2033-IoC'
     add 8ef9a72  ISIS-2067: reinstated WebServer for testing.
     new 9007c42  Merge remote-tracking branch 'apache/v2' into 2033-IoC

The 1 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:
 .../guides/cgcom/_cgcom_cutting-a-release.adoc     |  10 ++
 .../guides/dg/_dg_hints-and-tips_enhance-only.adoc |   2 +-
 .../main/asciidoc/guides/dg/_dg_ide_intellij.adoc  |  12 +-
 .../_rgcms_classes_AppManifest-bootstrapping.adoc  |  16 ++-
 ...gbtb_deployment_externalized-configuration.adoc |   6 +
 ...ugfun_getting-started_helloworld-archetype.adoc |   8 +-
 ..._ugfun_getting-started_simpleapp-archetype.adoc |   8 +-
 .../config/builder/IsisConfigurationBuilder.java   |  22 ++--
 .../builder/IsisConfigurationBuilderDefault.java   |  36 ++++--
 core/metamodel/pom.xml                             |   5 -
 .../isis/core/metamodel/facetapi/FacetHolder.java  |   7 -
 .../core/metamodel/facetapi/FacetHolderImpl.java   |   7 +-
 .../isis/core/metamodel/facetapi/FacetUtil.java    |  20 ++-
 .../core/runtime/optionhandler/BootPrinter.java    |  57 --------
 .../core/runtime/optionhandler/OptionHandler.java  |  34 -----
 .../optionhandler/OptionHandlerAbstract.java       |  45 -------
 core/pom.xml                                       |  13 +-
 .../apache/isis/core/runtime/runner/Constants.java |  56 --------
 .../opts/OptionHandlerAdditionalProperty.java      |  75 -----------
 .../runtime/runner/opts/OptionHandlerFixture.java  |  61 ---------
 .../runner/opts/OptionHandlerFixtureAbstract.java  |  53 --------
 ...ptionHandlerFixtureFromEnvironmentVariable.java |  54 --------
 .../runtime/runner/opts/OptionHandlerHelp.java     |  60 ---------
 .../runner/opts/OptionHandlerInitParameters.java   |  89 -------------
 .../runner/opts/OptionHandlerSystemProperties.java |  78 -----------
 .../isis/core/runtime/runner/opts/Strings.java     |  33 -----
 .../system/persistence/PersistenceSession.java     |   3 +-
 .../system/persistence/PersistenceSessionBase.java |   2 -
 core/webserver/pom.xml                             |   6 +
 .../org/apache/isis/{Dummy.java => WebServer.java} |  18 ++-
 .../org/apache/isis/core/webserver/WebServer.java  | 144 +++++++++++++++++++++
 .../services/homepage/HomePageViewModel.layout.xml |   2 +-
 32 files changed, 266 insertions(+), 776 deletions(-)
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/BootPrinter.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandler.java
 delete mode 100644 core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandlerAbstract.java
 delete mode 100644 core/runtime/src/main/java/org/apache/isis/core/runtime/runner/Constants.java
 delete mode 100644 core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAdditionalProperty.java
 delete mode 100644 core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixture.java
 delete mode 100644 core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixtureAbstract.java
 delete mode 100644 core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerFixtureFromEnvironmentVariable.java
 delete mode 100644 core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerHelp.java
 delete mode 100644 core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerInitParameters.java
 delete mode 100644 core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerSystemProperties.java
 delete mode 100644 core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/Strings.java
 copy core/webserver/src/main/java/org/apache/isis/{Dummy.java => WebServer.java} (74%)
 create mode 100644 core/webserver/src/main/java/org/apache/isis/core/webserver/WebServer.java


[isis] 01/01: Merge remote-tracking branch 'apache/v2' into 2033-IoC

Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch 2033-IoC
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 9007c420be9cfbb22b73ee674eaa16e5c43e2c72
Merge: 45e790f 8ef9a72
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Jan 10 07:41:30 2019 +0100

    Merge remote-tracking branch 'apache/v2' into 2033-IoC
    
    Conflicts:
    	core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerAppManifest.java
    	core/runtime/src/main/java/org/apache/isis/core/runtime/runner/opts/OptionHandlerConfiguration.java
    	core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java

 .../guides/cgcom/_cgcom_cutting-a-release.adoc     |  10 ++
 .../guides/dg/_dg_hints-and-tips_enhance-only.adoc |   2 +-
 .../main/asciidoc/guides/dg/_dg_ide_intellij.adoc  |  12 +-
 .../_rgcms_classes_AppManifest-bootstrapping.adoc  |  16 ++-
 ...gbtb_deployment_externalized-configuration.adoc |   6 +
 ...ugfun_getting-started_helloworld-archetype.adoc |   8 +-
 ..._ugfun_getting-started_simpleapp-archetype.adoc |   8 +-
 .../config/builder/IsisConfigurationBuilder.java   |  22 ++--
 .../builder/IsisConfigurationBuilderDefault.java   |  36 ++++--
 core/metamodel/pom.xml                             |   5 -
 .../isis/core/metamodel/facetapi/FacetHolder.java  |   7 -
 .../core/metamodel/facetapi/FacetHolderImpl.java   |   7 +-
 .../isis/core/metamodel/facetapi/FacetUtil.java    |  20 ++-
 .../core/runtime/optionhandler/BootPrinter.java    |  57 --------
 .../core/runtime/optionhandler/OptionHandler.java  |  34 -----
 .../optionhandler/OptionHandlerAbstract.java       |  45 -------
 core/pom.xml                                       |  13 +-
 .../apache/isis/core/runtime/runner/Constants.java |  56 --------
 .../opts/OptionHandlerAdditionalProperty.java      |  75 -----------
 .../runtime/runner/opts/OptionHandlerFixture.java  |  61 ---------
 .../runner/opts/OptionHandlerFixtureAbstract.java  |  53 --------
 ...ptionHandlerFixtureFromEnvironmentVariable.java |  54 --------
 .../runtime/runner/opts/OptionHandlerHelp.java     |  60 ---------
 .../runner/opts/OptionHandlerInitParameters.java   |  89 -------------
 .../runner/opts/OptionHandlerSystemProperties.java |  78 -----------
 .../system/persistence/PersistenceSession.java     |   3 +-
 .../system/persistence/PersistenceSessionBase.java |   2 -
 core/webserver/pom.xml                             |   6 +
 .../src/main/java/org/apache/isis/WebServer.java}  |  23 ++--
 .../org/apache/isis/core/webserver/WebServer.java  | 144 +++++++++++++++++++++
 .../services/homepage/HomePageViewModel.layout.xml |   2 +-
 31 files changed, 268 insertions(+), 746 deletions(-)

diff --cc core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
index c6063f4,f4d7d76..c716ab9
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
@@@ -29,9 -29,9 +29,8 @@@ import org.apache.isis.core.metamodel.a
  import org.apache.isis.core.metamodel.adapter.ObjectAdapterByIdProvider;
  import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
  import org.apache.isis.core.metamodel.adapter.oid.RootOid;
 -import org.apache.isis.core.metamodel.services.ServicesInjector;
  import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommand;
  import org.apache.isis.core.runtime.persistence.objectstore.transaction.TransactionalResource;
- import org.apache.isis.core.runtime.runner.opts.OptionHandlerFixtureAbstract;
  import org.apache.isis.core.runtime.system.persistence.adaptermanager.ObjectAdapterContext.MementoRecreateObjectSupport;
  import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
  
diff --cc core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionBase.java
index 061d0c8,90c98e4..527d09e
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionBase.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionBase.java
@@@ -38,10 -37,9 +38,9 @@@ import org.apache.isis.commons.internal
  import org.apache.isis.config.IsisConfiguration;
  import org.apache.isis.config.internal._Config;
  import org.apache.isis.core.commons.util.ToString;
 -import org.apache.isis.core.metamodel.services.ServicesInjector;
 +import org.apache.isis.core.metamodel.MetaModelContext;
  import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
  import org.apache.isis.core.runtime.persistence.FixturesInstalledFlag;
- import org.apache.isis.core.runtime.runner.opts.OptionHandlerFixtureAbstract;
  import org.apache.isis.core.runtime.services.changes.ChangedObjectsServiceInternal;
  import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
  import org.apache.isis.core.security.authentication.AuthenticationSession;