http://git-wip-us.apache.org/repos/asf/isis/blob/f349adea/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml deleted file mode 100644 index fc3eefd..0000000 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml +++ /dev/null @@ -1,390 +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. ---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <groupId>${groupId}</groupId> - <artifactId>${artifactId}</artifactId> - <version>${version}</version> - - <name>SimpleApp Parent</name> - - <packaging>pom</packaging> - - <prerequisites> - <maven>3.0.4</maven> - </prerequisites> - - <properties> - <isis.version>1.14.0</isis.version> - - <lombok.version>1.16.10</lombok.version> - <assertj-core.version>3.6.1</assertj-core.version> - - <mavenmixin-cucumberreporting.version>0.0.2</mavenmixin-cucumberreporting.version> - <maven-cucumber-reporting.version>3.2.0</maven-cucumber-reporting.version> - <maven-cucumber-reporting.dependency.log4j.version>2.7</maven-cucumber-reporting.dependency.log4j.version> - - <mavenmixin-datanucleusenhance.version>0.0.4</mavenmixin-datanucleusenhance.version> - <datanucleus-maven-plugin.version>4.0.5</datanucleus-maven-plugin.version> - <datanucleus-core.version>4.1.7</datanucleus-core.version> - <datanucleus-api-jdo.version>4.1.1</datanucleus-api-jdo.version> - <datanucleus-jodatime.version>4.1.0-release</datanucleus-jodatime.version> - - <mavenmixin-enforcerrelaxed.version>0.0.2</mavenmixin-enforcerrelaxed.version> - <maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version> - - <mavenmixin-isisswagger.version>0.0.3</mavenmixin-isisswagger.version> - <mavenmixin-isisvalidate.version>0.0.2</mavenmixin-isisvalidate.version> - <isis-maven-plugin.version>${isis.version}</isis-maven-plugin.version> - - <mavenmixin-jettyconsole.version>0.0.2</mavenmixin-jettyconsole.version> - <jetty-console-maven-plugin.version>1.59</jetty-console-maven-plugin.version> - <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version> - - <mavenmixin-jettywar.version>0.0.2</mavenmixin-jettywar.version> - <maven-war-plugin.version>2.4</maven-war-plugin.version> - <jetty-maven-plugin.version>9.3.5.v20151012</jetty-maven-plugin.version> - - <mavenmixin-sourceandjavadoc.version>0.0.2</mavenmixin-sourceandjavadoc.version> - <maven-javadoc-plugin.version>2.9.1</maven-javadoc-plugin.version> - <maven-jxr-plugin.version>2.4</maven-jxr-plugin.version> - <maven-source-plugin.version>2.2.1</maven-source-plugin.version> - - <mavenmixin-standard.version>0.0.3</mavenmixin-standard.version> - <maven-clean-plugin.version>2.5</maven-clean-plugin.version> - <maven-project-info-reports-plugin.version>2.9</maven-project-info-reports-plugin.version> - <maven-resources-plugin.version>2.6</maven-resources-plugin.version> - <maven-compiler-plugin.version>3.1</maven-compiler-plugin.version> - <maven-jar-plugin.version>2.4</maven-jar-plugin.version> - <maven-install-plugin.version>2.5.1</maven-install-plugin.version> - <maven-deploy-plugin.version>2.8.1</maven-deploy-plugin.version> - <maven-site-plugin.version>3.3</maven-site-plugin.version> - - <mavenmixin-surefire.version>0.0.4</mavenmixin-surefire.version> - <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version> - <maven-surefire-report-plugin.version>2.19.1</maven-surefire-report-plugin.version> - - <mavenmixin-staticanalysis.version>0.0.2</mavenmixin-staticanalysis.version> - <maven-checkstyle-plugin.version>2.11</maven-checkstyle-plugin.version> - <maven-pmd-plugin.version>3.0.1</maven-pmd-plugin.version> - <javancss-maven-plugin.version>2.1</javancss-maven-plugin.version> - <jdepend-maven-plugin.version>2.0-beta-2</jdepend-maven-plugin.version> - <findbugs-maven-plugin.version>2.5</findbugs-maven-plugin.version> - - <mavenmixin-docker.version>0.0.3</mavenmixin-docker.version> - <maven-deploy-plugin.version>2.8.1</maven-deploy-plugin.version> - <docker-maven-plugin.version>0.4.13</docker-maven-plugin.version> - <gmavenplus-plugin.version>1.5</gmavenplus-plugin.version> - - <mavendeps-isistesting.version>0.0.2</mavendeps-isistesting.version> - <mavendeps-isisintellij.version>0.0.1</mavendeps-isisintellij.version> - <mavendeps-isiswebapp.version>0.0.2</mavendeps-isiswebapp.version> - - <compiler-plugin.source>1.7</compiler-plugin.source> - <compiler-plugin.target>1.7</compiler-plugin.target> - - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - </properties> - - <build> - <pluginManagement> - <plugins> - <!-- mavenmixin-cucumberreporting --> - <plugin> - <groupId>net.masterthought</groupId> - <artifactId>maven-cucumber-reporting</artifactId> - <version>${maven-cucumber-reporting.version}</version> - </plugin> - - <!-- mavenmixin-datanucleusenhancer --> - <plugin> - <groupId>org.datanucleus</groupId> - <artifactId>datanucleus-maven-plugin</artifactId> - <version>${datanucleus-maven-plugin.version}</version> - </plugin> - - <!-- mavenmixin-enforcerrelaxed --> - <plugin> - <artifactId>maven-enforcer-plugin</artifactId> - <version>${maven-enforcer-plugin.version}</version> - </plugin> - - <!-- mavenmixin-isisvalidate & mavenmixin-isisswagger --> - <plugin> - <groupId>org.apache.isis.tool</groupId> - <artifactId>isis-maven-plugin</artifactId> - <version>${isis-maven-plugin.version}</version> - </plugin> - - <!-- mavenmixin-jettyconsole --> - <plugin> - <groupId>org.simplericity.jettyconsole</groupId> - <artifactId>jetty-console-maven-plugin</artifactId> - <version>${jetty-console-maven-plugin.version}</version> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>${maven-antrun-plugin.version}</version> - </plugin> - - <!-- mavenmixin-jettywar --> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <version>${maven-war-plugin.version}</version> - </plugin> - <plugin> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>${jetty-maven-plugin.version}</version> - </plugin> - - <!-- mavenmixin-sourceandjavadoc --> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${maven-javadoc-plugin.version}</version> - </plugin> - <plugin> - <artifactId>maven-jxr-plugin</artifactId> - <version>${maven-jxr-plugin.version}</version> - </plugin> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <version>${maven-source-plugin.version}</version> - </plugin> - - <!-- mavenmixin-standard --> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <version>${maven-clean-plugin.version}</version> - </plugin> - <plugin> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>${maven-project-info-reports-plugin.version}</version> - </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>${maven-resources-plugin.version}</version> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>${maven-compiler-plugin.version}</version> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <version>${maven-jar-plugin.version}</version> - </plugin> - <plugin> - <artifactId>maven-install-plugin</artifactId> - <version>${maven-install-plugin.version}</version> - </plugin> - <plugin> - <artifactId>maven-deploy-plugin</artifactId> - <version>${maven-deploy-plugin.version}</version> - </plugin> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <version>${maven-site-plugin.version}</version> - </plugin> - - <!-- mavenmixin-surefire --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>${maven-surefire-plugin.version}</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>${maven-surefire-report-plugin.version}</version> - </plugin> - - <!-- mavenmixin-staticanalysis --> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>${maven-checkstyle-plugin.version}</version> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - <version>${maven-pmd-plugin.version}</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javancss-maven-plugin</artifactId> - <version>${javancss-maven-plugin.version}</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jdepend-maven-plugin</artifactId> - <version>${jdepend-maven-plugin.version}</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>${findbugs-maven-plugin.version}</version> - </plugin> - - <!-- mavenmixin-docker --> - <plugin> - <groupId>com.spotify</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>${docker-maven-plugin.version}</version> - </plugin> - <plugin> - <groupId>org.codehaus.gmavenplus</groupId> - <artifactId>gmavenplus-plugin</artifactId> - <version>${gmavenplus-plugin.version}</version> - </plugin> - - </plugins> - </pluginManagement> - <plugins> - <plugin> - <groupId>com.github.odavid.maven.plugins</groupId> - <artifactId>mixin-maven-plugin</artifactId> - <version>0.1-alpha-39</version> - <extensions>true</extensions> - <configuration> - <mixins> - <mixin> - <groupId>com.danhaywood.mavenmixin</groupId> - <artifactId>standard</artifactId> - <version>${mavenmixin-standard.version}</version> - </mixin> - </mixins> - </configuration> - </plugin> - </plugins> - </build> - - <repositories> - <repository> - <id>apache.snapshots</id> - <name>Apache Snapshots</name> - <url>https://repository.apache.org/content/repositories/snapshots/</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - </snapshots> - </repository> - <repository> - <id>Cloudbees snapshots</id> - <url>http://repository-estatio.forge.cloudbees.com/snapshot/</url> - <name>CloudBees Snapshots (and Interim Releases)</name> - <releases> - <updatePolicy>never</updatePolicy> - <checksumPolicy>fail</checksumPolicy> - </releases> - <snapshots> - <updatePolicy>never</updatePolicy> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <layout>default</layout> - </repository> - <repository> - <id>sonatype-snapshots</id> - <url>https://oss.sonatype.org/content/repositories/snapshots</url> - <snapshots> - </snapshots> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>estatio.snapshots</id> - <name>CloudBees Snapshots (and Interim Releases)</name> - <releases> - <updatePolicy>never</updatePolicy> - <checksumPolicy>fail</checksumPolicy> - </releases> - <url>http://repository-estatio.forge.cloudbees.com/snapshot/</url> - <layout>default</layout> - </pluginRepository> - </pluginRepositories> - - <dependencyManagement> - <dependencies> - - <dependency> - <groupId>org.apache.isis.core</groupId> - <artifactId>isis</artifactId> - <version>${isis.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - - <!-- this project's own modules --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>${rootArtifactId}-module-simple</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>${rootArtifactId}-module-simple</artifactId> - <version>${version}</version> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>${rootArtifactId}-application</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>${rootArtifactId}-webapp</artifactId> - <version>${version}</version> - </dependency> - - <!-- lombok --> - <dependency> - <groupId>org.projectlombok</groupId> - <artifactId>lombok</artifactId> - <version>${lombok.version}</version> - <scope>provided</scope> - </dependency> - - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>org.projectlombok</groupId> - <artifactId>lombok</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <profiles> - <profile> - <id>m2e</id> - <activation> - <property> - <name>m2e.version</name> - </property> - </activation> - <build> - <directory>target-ide</directory> - </build> - </profile> - </profiles> - -</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/f349adea/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/lib/.gitignore ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/lib/.gitignore b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/lib/.gitignore deleted file mode 100644 index 70eee7e..0000000 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/lib/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# -# explicitly ignoring Microsoft JDBC4 jar -# (cannot redistribute, licensing) -# -sqljdbc4.jar http://git-wip-us.apache.org/repos/asf/isis/blob/f349adea/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml deleted file mode 100644 index c1922af..0000000 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml +++ /dev/null @@ -1,248 +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. ---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>${groupId}</groupId> - <artifactId>${rootArtifactId}</artifactId> - <version>${version}</version> - </parent> - - <artifactId>${artifactId}</artifactId> - <name>SimpleApp Webapp</name> - - <description>This assemblies and runs both the Wicket viewer and the Restfulobjects viewer in a single webapp configured to run using the datanucleus object store.</description> - - <packaging>war</packaging> - - <properties> - - <isis-maven-plugin.swagger.appManifest>domainapp.application.manifest.DomainAppAppManifest</isis-maven-plugin.swagger.appManifest> - <isis-maven-plugin.swagger.dependency.groupId>${project.groupId}</isis-maven-plugin.swagger.dependency.groupId> - <isis-maven-plugin.swagger.dependency.artifactId>${project.parent.artifactId}-application</isis-maven-plugin.swagger.dependency.artifactId> - - <jetty-console-maven-plugin.backgroundImage>${basedir}/src/main/jettyconsole/isis-banner.png</jetty-console-maven-plugin.backgroundImage> - - <maven-war-plugin.warName>${project.parent.artifactId}</maven-war-plugin.warName> - - <docker-plugin.imageName>DOCKER_REGISTRY_ACCOUNT/${project.parent.artifactId}</docker-plugin.imageName> - <docker-plugin.resource.include>${maven-war-plugin.warName}.war</docker-plugin.resource.include> - - <docker-plugin.releaseServerId>docker-hub</docker-plugin.releaseServerId> - <docker-plugin.releaseRegistryUrl>https://index.docker.io/v1/</docker-plugin.releaseRegistryUrl> - <docker-plugin.snapshotServerId>docker-hub</docker-plugin.snapshotServerId> - <docker-plugin.snapshotRegistryUrl>https://index.docker.io/v1/</docker-plugin.snapshotRegistryUrl> - - </properties> - - <build> - <resources> - <resource> - <filtering>true</filtering> - <directory>src/main/resources</directory> - </resource> - <resource> - <directory>src/main/java</directory> - <includes> - <include>**</include> - </includes> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>buildnumber-maven-plugin</artifactId> - <version>1.4</version> - <configuration> - <shortRevisionLength>8</shortRevisionLength> - <timestampFormat>{0,date,yyyy-MM-dd HH:mm:ss}</timestampFormat> - </configuration> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>create</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.8</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>maven-version</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>com.github.odavid.maven.plugins</groupId> - <artifactId>mixin-maven-plugin</artifactId> - <version>0.1-alpha-39</version> - <extensions>true</extensions> - <configuration> - <mixins> - <mixin> - <groupId>com.danhaywood.mavenmixin</groupId> - <artifactId>standard</artifactId> - <version>${mavenmixin-standard.version}</version> - </mixin> - <mixin> - <groupId>com.danhaywood.mavenmixin</groupId> - <artifactId>enforcerrelaxed</artifactId> - <version>${mavenmixin-enforcerrelaxed.version}</version> - </mixin> - <mixin> - <groupId>com.danhaywood.mavenmixin</groupId> - <artifactId>isisswagger</artifactId> - <version>${mavenmixin-isisswagger.version}</version> - </mixin> - <mixin> - <groupId>com.danhaywood.mavenmixin</groupId> - <artifactId>jettywar</artifactId> - <version>${mavenmixin-jettywar.version}</version> - </mixin> - <mixin> - <groupId>com.danhaywood.mavenmixin</groupId> - <artifactId>jettyconsole</artifactId> - <version>${mavenmixin-jettyconsole.version}</version> - </mixin> - <mixin> - <groupId>com.danhaywood.mavenmixin</groupId> - <artifactId>docker</artifactId> - <version>${mavenmixin-docker.version}</version> - </mixin> - </mixins> - </configuration> - </plugin> - - </plugins> - </build> - - <dependencies> - - <!-- this app --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>${rootArtifactId}-application</artifactId> - </dependency> - - <!-- isis --> - <dependency> - <groupId>com.danhaywood.mavendeps</groupId> - <artifactId>isiswebapp</artifactId> - <version>${mavendeps-isiswebapp.version}</version> - <type>pom</type> - </dependency> - - <dependency> - <groupId>com.danhaywood.mavendeps</groupId> - <artifactId>isisintellij</artifactId> - <version>${mavendeps-isisintellij.version}</version> - <type>pom</type> - </dependency> - </dependencies> - - <profiles> - - <profile> - <id>jdbc-hsqldb</id> - <activation> - <property> - <name>!skip.jdbc-hsqldb</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>hsqldb</artifactId> - </dependency> - </dependencies> - </profile> - <profile> - <id>jdbc-logging</id> - <activation> - <property> - <name>!skip.jdbc-logging</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.lazyluke</groupId> - <artifactId>log4jdbc-remix</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - </profile> - <profile> - <id>jdbc-postgres</id> - <activation> - <property> - <name>!skip.jdbc-postgres</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>9.1-901.jdbc4</version> - </dependency> - </dependencies> - </profile> - <!-- - <profile> - <id>jdbc-mssql</id> - <activation> - <property> - <name>!skip.jdbc-mssql</name> - </property> - </activation> - - mvn install:install-file -Dfile=sqljdbc4.jar \ - -DgroupId=com.microsoft.sqlserver \ - -DartifactId=jdbc \ - -Dversion=4.0 \ - -Dpackaging=jar - - <dependencies> - <dependency> - <groupId>com.microsoft.sqlserver</groupId> - <artifactId>sqljdbc4</artifactId> - <version>4.0</version> - </dependency> - </dependencies> - </profile> - --> - </profiles> - -</project> http://git-wip-us.apache.org/repos/asf/isis/blob/f349adea/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/domainapp/webapp/DomainApplication.java ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/domainapp/webapp/DomainApplication.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/domainapp/webapp/DomainApplication.java deleted file mode 100644 index cd19361..0000000 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/domainapp/webapp/DomainApplication.java +++ /dev/null @@ -1,105 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -/* - * 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 domainapp.webapp; - -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.Charset; -import java.util.List; - -import com.google.common.base.Joiner; -import com.google.common.io.Resources; -import com.google.inject.AbstractModule; -import com.google.inject.Module; -import com.google.inject.name.Names; -import com.google.inject.util.Modules; -import com.google.inject.util.Providers; - -import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication; - -import de.agilecoders.wicket.core.Bootstrap; -import de.agilecoders.wicket.core.settings.IBootstrapSettings; -import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchTheme; -import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchThemeProvider; - -/** - * As specified in <tt>web.xml</tt>. - * - * <p> - * See: - * <pre> - * <filter> - * <filter-name>wicket</filter-name> - * <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class> - * <init-param> - * <param-name>applicationClassName</param-name> - * <param-value>domainapp.webapp.DomainApplication</param-value> - * </init-param> - * </filter> - * </pre> - * - */ -public class DomainApplication extends IsisWicketApplication { - - private static final long serialVersionUID = 1L; - - @Override - protected void init() { - super.init(); - - IBootstrapSettings settings = Bootstrap.getSettings(); - settings.setThemeProvider(new BootswatchThemeProvider(BootswatchTheme.Flatly)); - } - - @Override - protected Module newIsisWicketModule() { - final Module isisDefaults = super.newIsisWicketModule(); - - final Module overrides = new AbstractModule() { - @Override - protected void configure() { - bind(String.class).annotatedWith(Names.named("applicationName")).toInstance("Simple App"); - bind(String.class).annotatedWith(Names.named("applicationCss")).toInstance("css/application.css"); - bind(String.class).annotatedWith(Names.named("applicationJs")).toInstance("scripts/application.js"); - bind(String.class).annotatedWith(Names.named("welcomeMessage")).toInstance(readLines(getClass(), "welcome.html")); - bind(String.class).annotatedWith(Names.named("aboutMessage")).toInstance("Simple App"); - bind(InputStream.class).annotatedWith(Names.named("metaInfManifest")).toProvider( - Providers.of(getServletContext().getResourceAsStream("/META-INF/MANIFEST.MF"))); - // if uncommented, then overrides isis.appManifest in config file. - // bind(AppManifest.class).toInstance(new DomainAppAppManifest()); - } - }; - - return Modules.override(isisDefaults).with(overrides); - } - - private static String readLines(final Class<?> contextClass, final String resourceName) { - try { - List<String> readLines = Resources.readLines(Resources.getResource(contextClass, resourceName), Charset.defaultCharset()); - final String aboutText = Joiner.on("${symbol_escape}n").join(readLines); - return aboutText; - } catch (IOException e) { - return "This is a simple app"; - } - } - -} http://git-wip-us.apache.org/repos/asf/isis/blob/f349adea/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/domainapp/webapp/DomainApplication.properties ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/domainapp/webapp/DomainApplication.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/domainapp/webapp/DomainApplication.properties deleted file mode 100644 index 690ed9e..0000000 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/domainapp/webapp/DomainApplication.properties +++ /dev/null @@ -1,31 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -${symbol_pound} -${symbol_pound} Licensed to the Apache Software Foundation (ASF) under one -${symbol_pound} or more contributor license agreements. See the NOTICE file -${symbol_pound} distributed with this work for additional information -${symbol_pound} regarding copyright ownership. The ASF licenses this file -${symbol_pound} to you under the Apache License, Version 2.0 (the -${symbol_pound} "License"); you may not use this file except in compliance -${symbol_pound} with the License. You may obtain a copy of the License at -${symbol_pound} -${symbol_pound} http://www.apache.org/licenses/LICENSE-2.0 -${symbol_pound} -${symbol_pound} Unless required by applicable law or agreed to in writing, -${symbol_pound} software distributed under the License is distributed on an -${symbol_pound} "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -${symbol_pound} KIND, either express or implied. See the License for the -${symbol_pound} specific language governing permissions and limitations -${symbol_pound} under the License. -${symbol_pound} - - -${symbol_pound} -${symbol_pound} This file is used by the Wicket viewer, acting as an app-level override for localized messages. -${symbol_pound} -${symbol_pound} Note that as of 1.11.0 it is possible to read localized messages from Isis' own translations.po file instead, -${symbol_pound} so there is much less reason to use this file. -${symbol_pound} - - http://git-wip-us.apache.org/repos/asf/isis/blob/f349adea/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/domainapp/webapp/welcome.html ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/domainapp/webapp/welcome.html b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/domainapp/webapp/welcome.html deleted file mode 100644 index 3c500f8..0000000 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/java/domainapp/webapp/welcome.html +++ /dev/null @@ -1,43 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -<?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. ---> -<p class="intro"> - <a href="http://isis.apache.org" target="_blank">Apache Isis</a>™ is a platform to let you rapidly develop - domain-driven apps in Java. - <br/> - <br/> - This app has been generated using Apache Isis' - <a href="http://isis.apache.org/intro/getting-started/simple%61pp-archetype.html" target="_blank">SimpleApp</a> archetype, - to create a purposefully minimal application that nevertheless includes fixture data, integration tests and BDD specs. - <br/> - <br/> - The application's business logic resides in a single (maven) module, <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/modules/module-simple" target="_blank"><code>module-simple</code></a>, that in turn contains a single domain entity, <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java" target="_blank"><code>SimpleObject</code></a>. The module has its own <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/modules/module-simple/src/main/java/domainapp/modules/simple/fixture" target="_blank">fixtures</a>, <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/modules/module-simple/src/test/java/domainapp/modules/simple/dom/impl" target="_blank">unit tests</a> and <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/modules/module-simp le/src/test/java/domainapp/modules/simple/integtests" target="_blank">integration tests</a>. New modules can be created by copying this first simple module. - <br/> - <br/> - The app also defines the <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/application" target="_blank"><code>application</code></a> (maven) module; this holds <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/application/src/main/java/domainapp/application/fixture" target="_blank">fixtures</a>, <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/application/src/test/java/domainapp/application/integtests" target="_blank">integration/smoke tests</a> and <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/application/src/test/java/domainapp/application/bdd" target="_blank">BDD specs</a> to exercise the entire application. It also holds the <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/application/src/main/java/domainapp/application/manifest/DomainAppAppManifest.java" target="_blank"><code>AppManifest</code></a> used to bootstrap the entire application, as well as application-scoped <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/application/src/main/java/domainapp/application/services" target="_blank">domain services</a> (eg a home page service). - <br/> - <br/> - The app's <a href="https://github.com/apache/isis/blob/master/example/application/simple%61pp/webapp" target="_blank"><code>webapp</code></a> (maven) module is used to assemble the application into a WAR file. - <br/> - <br/> - For more details, see the <a href="http://isis.apache.org/documentation.html" target="_blank">Apache Isis website</a>. -</p> http://git-wip-us.apache.org/repos/asf/isis/blob/f349adea/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/jettyconsole/isis-banner.pdn ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/jettyconsole/isis-banner.pdn b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/jettyconsole/isis-banner.pdn deleted file mode 100644 index 43a53e6..0000000 Binary files a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/jettyconsole/isis-banner.pdn and /dev/null differ http://git-wip-us.apache.org/repos/asf/isis/blob/f349adea/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/jettyconsole/isis-banner.png ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/jettyconsole/isis-banner.png b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/jettyconsole/isis-banner.png deleted file mode 100644 index cf10bef..0000000 Binary files a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/jettyconsole/isis-banner.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/isis/blob/f349adea/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authentication_shiro.properties ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authentication_shiro.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authentication_shiro.properties deleted file mode 100644 index 42aaeb9..0000000 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/authentication_shiro.properties +++ /dev/null @@ -1,28 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -${symbol_pound} Licensed to the Apache Software Foundation (ASF) under one -${symbol_pound} or more contributor license agreements. See the NOTICE file -${symbol_pound} distributed with this work for additional information -${symbol_pound} regarding copyright ownership. The ASF licenses this file -${symbol_pound} to you under the Apache License, Version 2.0 (the -${symbol_pound} "License"); you may not use this file except in compliance -${symbol_pound} with the License. You may obtain a copy of the License at -${symbol_pound} -${symbol_pound} http://www.apache.org/licenses/LICENSE-2.0 -${symbol_pound} -${symbol_pound} Unless required by applicable law or agreed to in writing, -${symbol_pound} software distributed under the License is distributed on an -${symbol_pound} "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -${symbol_pound} KIND, either express or implied. See the License for the -${symbol_pound} specific language governing permissions and limitations -${symbol_pound} under the License. - - - -${symbol_pound} -${symbol_pound} if the shiro Subject is still authenticated, then just reuse. -${symbol_pound} Prior to 1.13.0, we forced an auto-logout, so set to 'true' to reinstate this behaviour. -${symbol_pound} See this thread for further info: http://markmail.org/message/hsjljwgkhhrzxbrm -${symbol_pound} -${symbol_pound}isis.authentication.shiro.autoLogoutIfAlreadyAuthenticated=false http://git-wip-us.apache.org/repos/asf/isis/blob/f349adea/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties deleted file mode 100644 index f8a13fc..0000000 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties +++ /dev/null @@ -1,39 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -${symbol_pound} Licensed to the Apache Software Foundation (ASF) under one -${symbol_pound} or more contributor license agreements. See the NOTICE file -${symbol_pound} distributed with this work for additional information -${symbol_pound} regarding copyright ownership. The ASF licenses this file -${symbol_pound} to you under the Apache License, Version 2.0 (the -${symbol_pound} "License"); you may not use this file except in compliance -${symbol_pound} with the License. You may obtain a copy of the License at -${symbol_pound} -${symbol_pound} http://www.apache.org/licenses/LICENSE-2.0 -${symbol_pound} -${symbol_pound} Unless required by applicable law or agreed to in writing, -${symbol_pound} software distributed under the License is distributed on an -${symbol_pound} "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -${symbol_pound} KIND, either express or implied. See the License for the -${symbol_pound} specific language governing permissions and limitations -${symbol_pound} under the License. - - - - -${symbol_pound} -${symbol_pound} Specify the modules (= entities + services) and other components that make up -${symbol_pound} this application. -${symbol_pound} - -isis.appManifest=domainapp.application.manifest.DomainAppAppManifest -${symbol_pound}isis.appManifest=domainapp.application.manifest.DomainAppAppManifestBypassSecurity -${symbol_pound}isis.appManifest=domainapp.application.manifest.DomainAppAppManifestWithFixtures - - - -${symbol_pound} -${symbol_pound} Remaining properties are loaded programmatically by the AppManifest -${symbol_pound} (they are unlikely to vary between dev/test/prod so can be "baked in") -${symbol_pound} - http://git-wip-us.apache.org/repos/asf/isis/blob/f349adea/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/logging.properties ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/logging.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/logging.properties deleted file mode 100644 index 9c564e3..0000000 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/logging.properties +++ /dev/null @@ -1,225 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -${symbol_pound} Licensed to the Apache Software Foundation (ASF) under one -${symbol_pound} or more contributor license agreements. See the NOTICE file -${symbol_pound} distributed with this work for additional information -${symbol_pound} regarding copyright ownership. The ASF licenses this file -${symbol_pound} to you under the Apache License, Version 2.0 (the -${symbol_pound} "License"); you may not use this file except in compliance -${symbol_pound} with the License. You may obtain a copy of the License at -${symbol_pound} -${symbol_pound} http://www.apache.org/licenses/LICENSE-2.0 -${symbol_pound} -${symbol_pound} Unless required by applicable law or agreed to in writing, -${symbol_pound} software distributed under the License is distributed on an -${symbol_pound} "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -${symbol_pound} KIND, either express or implied. See the License for the -${symbol_pound} specific language governing permissions and limitations -${symbol_pound} under the License. - - -${symbol_pound} -${symbol_pound} Isis uses log4j is used to provide system logging -${symbol_pound} -log4j.rootCategory=INFO, Console -${symbol_pound}log4j.rootCategory=DEBUG, Console - - -${symbol_pound} 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=%d{ABSOLUTE} [%-20c{1} %-10t %-5p] %m%n - - -${symbol_pound} 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 - - -${symbol_pound} 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=org.apache.log4j.RollingFileAppender -log4j.appender.sql.File=./logs/sql.log -log4j.appender.sql.Append=false -log4j.appender.sql.layout=org.apache.log4j.PatternLayout -log4j.appender.sql.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 - - -${symbol_pound} 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 - - -${symbol_pound} 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 - - - - -! turn on the internal log4j debugging flag so we can see what it is doing -${symbol_pound}log4j.debug=true - - -${symbol_pound} DataNucleus -${symbol_pound} the first two log the DML and DDL (if set to DEBUG) -log4j.logger.DataNucleus.Datastore.Native=DEBUG, Console, sql -log4j.logger.DataNucleus.Datastore.Schema=DEBUG, Console, sql -${symbol_pound}log4j.logger.DataNucleus.Datastore.Native=WARN, Console -${symbol_pound}log4j.logger.DataNucleus.Datastore.Schema=WARN, Console -${symbol_pound} 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 - - -${symbol_pound} if using log4jdbc-remix as JDBC driver -${symbol_pound}log4j.logger.jdbc.sqlonly=DEBUG, sql, Console -${symbol_pound}log4j.additivity.jdbc.sqlonly=false -${symbol_pound}log4j.logger.jdbc.resultsettable=DEBUG, jdbc, Console -${symbol_pound}log4j.additivity.jdbc.resultsettable=false - -${symbol_pound}log4j.logger.jdbc.audit=WARN,jdbc, Console -${symbol_pound}log4j.additivity.jdbc.audit=false -${symbol_pound}log4j.logger.jdbc.resultset=WARN,jdbc -${symbol_pound}log4j.additivity.jdbc.resultset=false -${symbol_pound}log4j.logger.jdbc.sqltiming=WARN,sqltiming -${symbol_pound}log4j.additivity.jdbc.sqltiming=false -${symbol_pound}log4j.logger.jdbc.connection=FATAL,connection -${symbol_pound}log4j.additivity.jdbc.connection=false - - - -${symbol_pound} track Isis/JDO lifecycle integration - -${symbol_pound}log4j.logger.org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.persistence.FrameworkSynchronizer=DEBUG, Console -${symbol_pound}log4j.additivity.org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.persistence.FrameworkSynchronizer=false - -${symbol_pound}log4j.logger.org.apache.isis.objectstore.jdo.datanucleus.persistence.IsisLifecycleListener=DEBUG,Console -${symbol_pound}log4j.additivity.org.apache.isis.objectstore.jdo.datanucleus.persistence.IsisLifecycleListener=false - - - - -${symbol_pound} track Isis/Wicket lifecycle integration - -${symbol_pound}log4j.logger.org.apache.isis.viewer.wicket.viewer.integration.wicket.WebRequestCycleForIsis=DEBUG, Console -${symbol_pound}log4j.additivity.org.apache.isis.viewer.wicket.viewer.integration.wicket.WebRequestCycleForIsis=false - -${symbol_pound}log4j.logger.org.apache.isis.viewer.wicket.viewer.integration.isis.IsisContextForWicket=INFO,Console -${symbol_pound}log4j.additivity.org.apache.isis.viewer.wicket.viewer.integration.isis.IsisContextForWicket=false - - - - -${symbol_pound} 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 - -log4j.logger.org.apache.isis.core.runtime.threadpool.ThreadPoolSupport=INFO,Console -log4j.additivity.org.apache.isis.core.runtime.threadpool.ThreadPoolSupport=false - - - -${symbol_pound} quieten Shiro -log4j.logger.org.apache.shiro.realm.AuthorizingRealm=WARN,Console -log4j.additivity.org.apache.shiro.realm.AuthorizingRealm=false - - -${symbol_pound} Application-specific logging -log4j.logger.dom.simple.SimpleObject=DEBUG, Stderr -log4j.additivity.dom.simple.SimpleObject=false \ No newline at end of file http://git-wip-us.apache.org/repos/asf/isis/blob/f349adea/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor.properties ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor.properties deleted file mode 100644 index 0b3da2c..0000000 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/persistor.properties +++ /dev/null @@ -1,116 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -${symbol_pound} Licensed to the Apache Software Foundation (ASF) under one -${symbol_pound} or more contributor license agreements. See the NOTICE file -${symbol_pound} distributed with this work for additional information -${symbol_pound} regarding copyright ownership. The ASF licenses this file -${symbol_pound} to you under the Apache License, Version 2.0 (the -${symbol_pound} "License"); you may not use this file except in compliance -${symbol_pound} with the License. You may obtain a copy of the License at -${symbol_pound} -${symbol_pound} http://www.apache.org/licenses/LICENSE-2.0 -${symbol_pound} -${symbol_pound} Unless required by applicable law or agreed to in writing, -${symbol_pound} software distributed under the License is distributed on an -${symbol_pound} "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -${symbol_pound} KIND, either express or implied. See the License for the -${symbol_pound} specific language governing permissions and limitations -${symbol_pound} under the License. - - - -${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound} -${symbol_pound} -${symbol_pound} JDBC configuration -${symbol_pound} -${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound} - -${symbol_pound} -${symbol_pound} configuration file holding the JDO objectstore's JDBC configuration -${symbol_pound} - - -${symbol_pound} -${symbol_pound} JDBC connection details -${symbol_pound} (also update the pom.xml to reference the appropriate JDBC driver) -${symbol_pound} - -${symbol_pound} -${symbol_pound} HSQLDB in-memory -${symbol_pound} -isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.hsqldb.jdbcDriver -isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:hsqldb:mem:test -isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa -isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword= - -${symbol_pound} -${symbol_pound} HSQLDB in-memory (using log4jdbc-remix) -${symbol_pound} -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=net.sf.log4jdbc.DriverSpy -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:log4jdbc:hsqldb:mem:test -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword= - - - -${symbol_pound} -${symbol_pound} HSQLDB to file -${symbol_pound} -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.hsqldb.jdbcDriver -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:hsqldb:file:/tmp/isis-simple-app/hsql-db;hsqldb.write_delay=false;shutdown=true -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword= - -${symbol_pound} -${symbol_pound} HSQLDB to file (using log4jdbc-remix) -${symbol_pound} -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=net.sf.log4jdbc.DriverSpy -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:log4jdbc:hsqldb:file:/tmp/isis-simple-app/hsql-db;hsqldb.write_delay=false;shutdown=true -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword= - - - -${symbol_pound} -${symbol_pound} PostgreSQL Server -${symbol_pound} -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=org.postgresql.Driver -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:postgresql://localhost:5432/isis -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=isis -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=isis - -${symbol_pound} -${symbol_pound} PostgreSQL Server (using log4jdbc-remix) -${symbol_pound} -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=net.sf.log4jdbc.DriverSpy -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:log4jdbc:postgresql://localhost:5432/isis -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=isis -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=isis - - - -${symbol_pound} -${symbol_pound} MS SQL Server -${symbol_pound} -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=com.microsoft.sqlserver.jdbc.SQLServerDriver -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:sqlserver://127.0.0.1:1433;instance=.;databaseName=simple -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=sa -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=p4ssword - -${symbol_pound} -${symbol_pound} MS SQL Server (using log4jdbc-remix) -${symbol_pound} -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionDriverName=net.sf.log4jdbc.DriverSpy -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=jdbc:log4jdbc:sqlserver://127.0.0.1:1433;instance=SQLEXPRESS;databaseName=jdo -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionUserName=jdo -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionPassword=jdopass - - - -${symbol_pound} -${symbol_pound} neo4j -${symbol_pound} (experimental; run with -P neo4j profile in webapp project) -${symbol_pound} -${symbol_pound}isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL=neo4j:neo4j_DB - http://git-wip-us.apache.org/repos/asf/isis/blob/f349adea/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/shiro.ini ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/shiro.ini b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/shiro.ini deleted file mode 100644 index 971ae69..0000000 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/shiro.ini +++ /dev/null @@ -1,93 +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. -# - -[main] - -contextFactory = org.apache.isis.security.shiro.IsisLdapContextFactory -contextFactory.url = ldap://localhost:10389 -contextFactory.authenticationMechanism = CRAM-MD5 -contextFactory.systemAuthenticationMechanism = simple -contextFactory.systemUsername = uid=admin,ou=system -contextFactory.systemPassword = secret - -ldapRealm = org.apache.isis.security.shiro.IsisLdapRealm -ldapRealm.contextFactory = $contextFactory - -ldapRealm.searchBase = ou=groups,o=mojo -ldapRealm.groupObjectClass = groupOfUniqueNames -ldapRealm.uniqueMemberAttribute = uniqueMember -ldapRealm.uniqueMemberAttributeValueTemplate = uid={0} - -# optional mapping from physical groups to logical application roles -#ldapRealm.rolesByGroup = \ -# LDN_USERS: user_role,\ -# NYK_USERS: user_role,\ -# HKG_USERS: user_role,\ -# GLOBAL_ADMIN: admin_role,\ -# DEMOS: self-install_role - -ldapRealm.permissionsByRole=\ - user_role = *:ToDoItemsJdo:*:*,\ - *:ToDoItem:*:*; \ - self-install_role = *:ToDoItemsFixturesService:install:* ; \ - admin_role = * - -# to use ldap... -# (see docs for details of how to setup users/groups in Apache Directory Studio). -#securityManager.realms = $ldapRealm - -# to use .ini file -securityManager.realms = $iniRealm - - - -# ----------------------------------------------------------------------------- -# Users and their assigned roles -# -# Each line conforms to the format defined in the -# org.apache.shiro.realm.text.TextConfigurationRealm#setUserDefinitions JavaDoc -# ----------------------------------------------------------------------------- - -[users] -# user = password, role1, role2, role3, ... - - -sven = pass, admin_role -dick = pass, user_role, self-install_role -bob = pass, user_role, self-install_role -joe = pass, user_role, self-install_role -guest = guest, user_role - - - -# ----------------------------------------------------------------------------- -# Roles with assigned permissions -# -# Each line conforms to the format defined in the -# org.apache.shiro.realm.text.TextConfigurationRealm#setRoleDefinitions JavaDoc -# ----------------------------------------------------------------------------- - -[roles] -# role = perm1, perm2, perm3, ... -# perm in format: packageName:className:memberName:r,w - -user_role = *:SimpleObjects:*:*,\ - *:SimpleObject:*:* -self-install_role = *:DomainAppFixtureService:*:* -admin_role = *