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/09/12 15:21:46 UTC
[isis] branch v2 updated (08a2207 -> 3d5e624)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 08a2207 ISIS-2158 remove renamed directory
new e4ffe64 ISIS-2158 fixes links to sources for the demo-app
new 3d5e624 ISIS-2158 fixes simple-app launching
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/domainapp/utils/DemoStub.java | 2 +-
.../application/manifest/SimpleAppManifest.java | 6 +-
.../main/java/domainapp/application/SimpleApp.java | 5 -
.../main/{webapp/WEB-INF => resources}/shiro.ini | 0
.../src/main/webapp/WEB-INF/logging.properties | 246 ---------------------
.../webapp/src/main/webapp/WEB-INF/web.xml | 49 ----
6 files changed, 4 insertions(+), 304 deletions(-)
rename examples/apps/simpleapp/webapp/src/main/{webapp/WEB-INF => resources}/shiro.ini (100%)
delete mode 100644 examples/apps/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
delete mode 100644 examples/apps/simpleapp/webapp/src/main/webapp/WEB-INF/web.xml
[isis] 02/02: ISIS-2158 fixes simple-app launching
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 3d5e624eb88f6ac58cd590d76510f29d3eb679d8
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Sep 12 17:21:38 2019 +0200
ISIS-2158 fixes simple-app launching
---
.../application/manifest/SimpleAppManifest.java | 6 +-
.../main/java/domainapp/application/SimpleApp.java | 5 -
.../main/{webapp/WEB-INF => resources}/shiro.ini | 0
.../src/main/webapp/WEB-INF/logging.properties | 246 ---------------------
.../webapp/src/main/webapp/WEB-INF/web.xml | 49 ----
5 files changed, 3 insertions(+), 303 deletions(-)
diff --git a/examples/apps/simpleapp/application/src/main/java/domainapp/application/manifest/SimpleAppManifest.java b/examples/apps/simpleapp/application/src/main/java/domainapp/application/manifest/SimpleAppManifest.java
index fcf7be5..06b2f54 100644
--- a/examples/apps/simpleapp/application/src/main/java/domainapp/application/manifest/SimpleAppManifest.java
+++ b/examples/apps/simpleapp/application/src/main/java/domainapp/application/manifest/SimpleAppManifest.java
@@ -49,8 +49,8 @@ import domainapp.modules.simple.SimpleModule;
@Configuration
@PropertySources({
@PropertySource("classpath:/domainapp/application/manifest/isis-non-changing.properties"),
- @PropertySource(IsisPresets.HsqlDbInMemory),
- @PropertySource(IsisPresets.NoTranslations),
+ @PropertySource(IsisPresets.H2InMemory),
+ //@PropertySource(IsisPresets.NoTranslations),
@PropertySource(IsisPresets.DataNucleusAutoCreate),
})
@Import({
@@ -75,7 +75,7 @@ public class SimpleAppManifest {
public WebAppConfigBean webAppConfigBean() {
return WebAppConfigBean.builder()
.menubarsLayoutXml(new ClassPathResource("menubars.layout.xml", this.getClass()))
- .brandLogoHeader("/images/gift_48.png")
+ .brandLogoHeader("/images/apache-isis/logo-48x48.png")
.applicationCss("css/application.css")
.applicationJs("scripts/application.js")
.applicationName("Apache Isis Simple App")
diff --git a/examples/apps/simpleapp/webapp/src/main/java/domainapp/application/SimpleApp.java b/examples/apps/simpleapp/webapp/src/main/java/domainapp/application/SimpleApp.java
index e55a980..4c2ae24 100644
--- a/examples/apps/simpleapp/webapp/src/main/java/domainapp/application/SimpleApp.java
+++ b/examples/apps/simpleapp/webapp/src/main/java/domainapp/application/SimpleApp.java
@@ -22,11 +22,8 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.PropertySource;
import org.apache.isis.config.IsisPresets;
-import org.apache.isis.security.shiro.IsisBootSecurityShiro;
-import org.apache.isis.viewer.wicket.viewer.IsisBootWebWicket;
import domainapp.application.manifest.SimpleAppManifest;
@@ -36,8 +33,6 @@ import domainapp.application.manifest.SimpleAppManifest;
@SpringBootApplication
@Import({
SimpleAppManifest.class,
- IsisBootWebWicket.class,
- IsisBootSecurityShiro.class
})
public class SimpleApp extends SpringBootServletInitializer {
diff --git a/examples/apps/simpleapp/webapp/src/main/webapp/WEB-INF/shiro.ini b/examples/apps/simpleapp/webapp/src/main/resources/shiro.ini
similarity index 100%
rename from examples/apps/simpleapp/webapp/src/main/webapp/WEB-INF/shiro.ini
rename to examples/apps/simpleapp/webapp/src/main/resources/shiro.ini
diff --git a/examples/apps/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties b/examples/apps/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
deleted file mode 100644
index 5f43016..0000000
--- a/examples/apps/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
+++ /dev/null
@@ -1,246 +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.
-
-
-#
-# Isis uses log4j is used to provide system logging
-#
-log4j.rootCategory=INFO, Console
-#log4j.rootCategory=DEBUG, Console
-
-
-# The console appender
-log4j.appender.Console=org.apache.log4j.ConsoleAppender
-log4j.appender.Console.target=System.out
-log4j.appender.Console.layout=org.apache.log4j.PatternLayout
-log4j.appender.Console.layout.ConversionPattern=%-5r %d{ABSOLUTE} [%-20c{1} %-10t %-5p] %m%n
-
-
-# The stderr appender
-log4j.appender.Stderr=org.apache.log4j.ConsoleAppender
-log4j.appender.Stderr.target=System.err
-log4j.appender.Stderr.layout=org.apache.log4j.PatternLayout
-log4j.appender.Stderr.layout.ConversionPattern=%d{ABSOLUTE} [%-20c{1} %-10t %-5p] %m%n
-
-
-# other appenders
-log4j.appender.File=org.apache.log4j.RollingFileAppender
-log4j.appender.File.file=isis.log
-log4j.appender.File.append=false
-log4j.appender.File.layout=org.apache.log4j.PatternLayout
-log4j.appender.File.layout.ConversionPattern=%d [%-20c{1} %-10t %-5p] %m%n
-
-log4j.appender.sql-dml=org.apache.log4j.RollingFileAppender
-log4j.appender.sql-dml.File=./logs/sql-dml.log
-log4j.appender.sql-dml.Append=false
-log4j.appender.sql-dml.layout=org.apache.log4j.PatternLayout
-log4j.appender.sql-dml.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %m%n
-
-log4j.appender.sql-ddl=org.apache.log4j.RollingFileAppender
-log4j.appender.sql-ddl.File=./logs/sql-ddl.log
-log4j.appender.sql-ddl.Append=false
-log4j.appender.sql-ddl.layout=org.apache.log4j.PatternLayout
-log4j.appender.sql-ddl.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %m%n
-
-log4j.appender.sqltiming=org.apache.log4j.RollingFileAppender
-log4j.appender.sqltiming.File=./logs/sqltiming.log
-log4j.appender.sqltiming.Append=false
-log4j.appender.sqltiming.layout=org.apache.log4j.PatternLayout
-log4j.appender.sqltiming.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %m%n
-
-log4j.appender.jdbc=org.apache.log4j.RollingFileAppender
-log4j.appender.jdbc.File=./logs/jdbc.log
-log4j.appender.jdbc.Append=false
-log4j.appender.jdbc.layout=org.apache.log4j.PatternLayout
-log4j.appender.jdbc.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %m%n
-
-log4j.appender.connection=org.apache.log4j.RollingFileAppender
-log4j.appender.connection.File=./logs/connection.log
-log4j.appender.connection.Append=false
-log4j.appender.connection.layout=org.apache.log4j.PatternLayout
-log4j.appender.connection.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %m%n
-
-log4j.appender.wicket.i18n=org.apache.log4j.RollingFileAppender
-log4j.appender.wicket.i18n.file=./logs/wicket-i18n.log
-log4j.appender.wicket.i18n.append=false
-log4j.appender.wicket.i18n.layout=org.apache.log4j.PatternLayout
-log4j.appender.wicket.i18n.layout.ConversionPattern=%d [%-20c{1} %-10t %-5p] %m%n
-
-
-# publishing
-log4j.appender.PublisherServiceLogging=org.apache.log4j.FileAppender
-log4j.appender.PublisherServiceLogging.File=./logs/PublisherServiceLogging.log
-log4j.appender.PublisherServiceLogging.Append=false
-log4j.appender.PublisherServiceLogging.layout=org.apache.log4j.PatternLayout
-log4j.appender.PublisherServiceLogging.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %m%n
-
-log4j.logger.org.apache.isis.applib.services.publish.PublisherServiceLogging=DEBUG,PublisherServiceLogging
-log4j.additivity.org.apache.isis.applib.services.publish.PublisherServiceLogging=false
-
-
-# auditing
-log4j.appender.AuditerServiceLogging=org.apache.log4j.FileAppender
-log4j.appender.AuditerServiceLogging.File=./logs/AuditerServiceLogging.log
-log4j.appender.AuditerServiceLogging.Append=false
-log4j.appender.AuditerServiceLogging.layout=org.apache.log4j.PatternLayout
-log4j.appender.AuditerServiceLogging.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %m%n
-
-log4j.logger.org.apache.isis.applib.services.audit.AuditerServiceLogging=DEBUG,AuditerServiceLogging
-log4j.additivity.org.apache.isis.applib.services.audit.AuditerServiceLogging=false
-
-
-# threadpool
-log4j.appender.ThreadPoolSupport=org.apache.log4j.FileAppender
-log4j.appender.ThreadPoolSupport.File=./logs/ThreadPoolSupport.log
-log4j.appender.ThreadPoolSupport.Append=false
-log4j.appender.ThreadPoolSupport.layout=org.apache.log4j.PatternLayout
-log4j.appender.ThreadPoolSupport.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %m%n
-
-log4j.logger.org.apache.isis.core.runtime.threadpool.ThreadPoolSupport=DEBUG,ThreadPoolSupport
-log4j.additivity.org.apache.isis.core.runtime.threadpool.ThreadPoolSupport=false
-
-
-! turn on the internal log4j debugging flag so we can see what it is doing
-#log4j.debug=true
-
-
-# DataNucleus
-# the first two log the DML and DDL (if set to DEBUG)
-log4j.logger.DataNucleus.Datastore.Native=INFO, Console, sql-dml
-log4j.logger.DataNucleus.Datastore.Schema=INFO, Console, sql-ddl
-#log4j.logger.DataNucleus.Datastore.Native=WARN, Console, sql-dml
-#log4j.logger.DataNucleus.Datastore.Schema=WARN, Console, sql-ddl
-# the remainder can probably be left to WARN
-log4j.logger.DataNucleus.Persistence=WARN, Console
-log4j.logger.DataNucleus.Transaction=WARN, Console
-log4j.logger.DataNucleus.Connection=WARN, Console
-log4j.logger.DataNucleus.Query=WARN, Console
-log4j.logger.DataNucleus.Cache=WARN, Console
-log4j.logger.DataNucleus.MetaData=WARN, Console
-log4j.logger.DataNucleus.Datastore=WARN, Console
-log4j.logger.DataNucleus.Datastore.Persist=WARN, Console
-log4j.logger.DataNucleus.Datastore.Retrieve=WARN, Console
-log4j.logger.DataNucleus.General=WARN, Console
-log4j.logger.DataNucleus.Lifecycle=WARN, Console
-log4j.logger.DataNucleus.ValueGeneration=WARN, Console
-log4j.logger.DataNucleus.Enhancer=WARN, Console
-log4j.logger.DataNucleus.SchemaTool=ERROR, Console
-log4j.logger.DataNucleus.JDO=WARN, Console
-log4j.logger.DataNucleus.JPA=ERROR, Console
-log4j.logger.DataNucleus.JCA=WARN, Console
-log4j.logger.DataNucleus.IDE=ERROR, Console
-
-log4j.additivity.DataNucleus.Datastore.Native=false
-log4j.additivity.DataNucleus.Datastore.Schema=false
-log4j.additivity.DataNucleus.Datastore.Persistence=false
-log4j.additivity.DataNucleus.Datastore.Transaction=false
-log4j.additivity.DataNucleus.Datastore.Connection=false
-log4j.additivity.DataNucleus.Datastore.Query=false
-log4j.additivity.DataNucleus.Datastore.Cache=false
-log4j.additivity.DataNucleus.Datastore.MetaData=false
-log4j.additivity.DataNucleus.Datastore.Datastore=false
-log4j.additivity.DataNucleus.Datastore.Datastore.Persist=false
-log4j.additivity.DataNucleus.Datastore.Datastore.Retrieve=false
-log4j.additivity.DataNucleus.Datastore.General=false
-log4j.additivity.DataNucleus.Datastore.Lifecycle=false
-log4j.additivity.DataNucleus.Datastore.ValueGeneration=false
-log4j.additivity.DataNucleus.Datastore.Enhancer=false
-log4j.additivity.DataNucleus.Datastore.SchemaTool=false
-log4j.additivity.DataNucleus.Datastore.JDO=false
-log4j.additivity.DataNucleus.Datastore.JPA=false
-log4j.additivity.DataNucleus.Datastore.JCA=false
-log4j.additivity.DataNucleus.Datastore.IDE=false
-
-
-# if using log4jdbc-remix as JDBC driver
-#log4j.logger.jdbc.sqlonly=DEBUG, sql-dml, Console
-#log4j.additivity.jdbc.sqlonly=false
-#log4j.logger.jdbc.resultsettable=DEBUG, jdbc, Console
-#log4j.additivity.jdbc.resultsettable=false
-
-#log4j.logger.jdbc.audit=WARN,jdbc, Console
-#log4j.additivity.jdbc.audit=false
-#log4j.logger.jdbc.resultset=WARN,jdbc
-#log4j.additivity.jdbc.resultset=false
-#log4j.logger.jdbc.sqltiming=WARN,sqltiming
-#log4j.additivity.jdbc.sqltiming=false
-#log4j.logger.jdbc.connection=FATAL,connection
-#log4j.additivity.jdbc.connection=false
-
-
-
-# track Isis/JDO lifecycle integration
-
-#log4j.logger.org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.persistence.FrameworkSynchronizer=DEBUG, Console
-#log4j.additivity.org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.persistence.FrameworkSynchronizer=false
-
-#log4j.logger.org.apache.isis.objectstore.jdo.datanucleus.persistence.IsisLifecycleListener=DEBUG,Console
-#log4j.additivity.org.apache.isis.objectstore.jdo.datanucleus.persistence.IsisLifecycleListener=false
-
-
-
-
-# track Isis/Wicket lifecycle integration
-
-#log4j.logger.org.apache.isis.viewer.wicket.viewer.integration.wicket.WebRequestCycleForIsis=DEBUG, Console
-#log4j.additivity.org.apache.isis.viewer.wicket.viewer.integration.wicket.WebRequestCycleForIsis=false
-
-#log4j.logger.org.apache.isis.viewer.wicket.viewer.integration.isis.IsisContextForWicket=INFO,Console
-#log4j.additivity.org.apache.isis.viewer.wicket.viewer.integration.isis.IsisContextForWicket=false
-
-log4j.logger.org.apache.isis.viewer.wicket.viewer.TargetRespondListenerToResetQueryResultCache=INFO,Console
-log4j.additivity.org.apache.isis.viewer.wicket.viewer.TargetRespondListenerToResetQueryResultCache=false
-
-log4j.logger.org.apache.isis.core.metamodel.specloader.specimpl.ObjectSpecificationAbstract=INFO,Console
-log4j.additivity.org.apache.isis.core.metamodel.specloader.specimpl.ObjectSpecificationAbstract=false
-
-
-# quieten some of the noisier classes in Isis' bootstrapping
-log4j.logger.org.apache.isis.core.metamodel.specloader.specimpl.FacetedMethodsBuilder=WARN,Console
-log4j.additivity.org.apache.isis.core.metamodel.specloader.specimpl.FacetedMethodsBuilder=false
-
-log4j.logger.org.apache.isis.core.metamodel.specloader.ServiceInitializer=WARN,Console
-log4j.additivity.org.apache.isis.core.metamodel.specloader.ServiceInitializer=false
-
-log4j.logger.org.apache.isis.core.runtime.services.ServicesInstallerFromConfiguration=WARN,Console
-log4j.additivity.org.apache.isis.core.runtime.services.ServicesInstallerFromConfiguration=false
-
-log4j.logger.org.apache.isis.core.commons.config.IsisConfigurationDefault=INFO,Console
-log4j.additivity.org.apache.isis.core.commons.config.IsisConfigurationDefault=false
-
-
-log4j.logger.org.apache.isis.core.runtime.installers.InstallerLookupDefault=WARN,Console
-log4j.additivity.org.apache.isis.core.runtime.installers.InstallerLookupDefault=false
-
-
-
-
-# quieten Shiro
-log4j.logger.org.apache.shiro.realm.AuthorizingRealm=WARN,Console
-log4j.additivity.org.apache.shiro.realm.AuthorizingRealm=false
-
-
-# Application-specific logging
-log4j.logger.dom.simple.SimpleObject=DEBUG, Stderr
-log4j.additivity.dom.simple.SimpleObject=false
-
-
-# ERROR to suppress the WARNings we get as of 1.15.0
-log4j.logger.org.apache.wicket.page.XmlPartialPageUpdate=ERROR,Console
-log4j.additivity.org.apache.wicket.page.XmlPartialPageUpdate=false
-
-
diff --git a/examples/apps/simpleapp/webapp/src/main/webapp/WEB-INF/web.xml b/examples/apps/simpleapp/webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 87d6a5c..0000000
--- a/examples/apps/simpleapp/webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- id="WebApp_ID" version="3.1">
-
- <display-name>Simple app</display-name>
-
- <welcome-file-list>
- <welcome-file>about/index.html</welcome-file>
- </welcome-file-list>
-
- <listener>
- <listener-class>org.apache.isis.core.webapp.IsisWebAppContextListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>H2Console</servlet-name>
- <servlet-class>org.h2.server.web.WebServlet</servlet-class>
- <init-param>
- <param-name>webAllowOthers</param-name>
- <param-value>true</param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>H2Console</servlet-name>
- <url-pattern>/db/*</url-pattern>
- </servlet-mapping>
-
-</web-app>
[isis] 01/02: ISIS-2158 fixes links to sources for the demo-app
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e4ffe6497ca1044e213a9e9db35569e0c859e943
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Sep 12 16:51:52 2019 +0200
ISIS-2158 fixes links to sources for the demo-app
---
examples/apps/demo/src/main/java/domainapp/utils/DemoStub.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/apps/demo/src/main/java/domainapp/utils/DemoStub.java b/examples/apps/demo/src/main/java/domainapp/utils/DemoStub.java
index 3063c19..d99a7d8 100644
--- a/examples/apps/demo/src/main/java/domainapp/utils/DemoStub.java
+++ b/examples/apps/demo/src/main/java/domainapp/utils/DemoStub.java
@@ -49,7 +49,7 @@ public abstract class DemoStub {
private static Map<String, String> createConstants() {
val map = new HashMap<String, String>();
map.put("SOURCES_ISIS", "https://github.com/apache/isis/blob/master/core/applib/src/main/java");
- map.put("SOURCES_DEMO", "https://github.com/apache/isis/tree/v2/example/application/demo/src/main/java");
+ map.put("SOURCES_DEMO", "https://github.com/apache/isis/tree/v2/examples/apps/demo/src/main/java");
map.put("ISSUES_DEMO", "https://issues.apache.org/jira/");
return map;
}