ISIS-1287: recreating simpleapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8e7f8204 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8e7f8204 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8e7f8204 Branch: refs/heads/release-1.12.0-RC1 Commit: 8e7f820498c98b0796a13d75d203e6b9412eddac Parents: 375fa8c Author: Dan Haywood <d...@haywood-associates.co.uk> Authored: Sun Mar 20 12:59:42 2016 +0000 Committer: Dan Haywood <d...@haywood-associates.co.uk> Committed: Sun Mar 20 12:59:42 2016 +0000 ---------------------------------------------------------------------- example/archetype/simpleapp/pom.xml | 2 +- .../homepage/HomePageViewModel.layout.xml | 19 ++ .../dom/simple/SimpleObject.layout.xml | 18 ++ .../main/resources/archetype-resources/pom.xml | 15 +- .../archetype-resources/webapp/pom.xml | 312 +++++++++---------- .../projects/basic/archetype.properties | 2 +- 6 files changed, 184 insertions(+), 184 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/8e7f8204/example/archetype/simpleapp/pom.xml ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml index a0b38f1..61b619f 100644 --- a/example/archetype/simpleapp/pom.xml +++ b/example/archetype/simpleapp/pom.xml @@ -44,7 +44,7 @@ <parent> <groupId>org.apache.isis.core</groupId> <artifactId>isis</artifactId> - <version>1.12.0-SNAPSHOT</version> + <version>1.12.0</version> <relativePath>../../../core/pom.xml</relativePath> </parent> </project> http://git-wip-us.apache.org/repos/asf/isis/blob/8e7f8204/example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/homepage/HomePageViewModel.layout.xml ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/homepage/HomePageViewModel.layout.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/homepage/HomePageViewModel.layout.xml index f351d5e..f9c33fc 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/homepage/HomePageViewModel.layout.xml +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/app/src/main/java/domainapp/app/services/homepage/HomePageViewModel.layout.xml @@ -2,6 +2,24 @@ #set( $symbol_dollar = '$' ) #set( $symbol_escape = '\' ) <?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<!-- + 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. +--> <bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"; xmlns="http://isis.apache.org/applib/layout/component"; xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <bs3:row> <bs3:col span="2"> @@ -9,6 +27,7 @@ <bs3:row> <bs3:col span="12" unreferencedActions="true"> <domainObject/> + <action id="clearHints" hidden="EVERYWHERE"/> </bs3:col> </bs3:row> </bs3:col> http://git-wip-us.apache.org/repos/asf/isis/blob/8e7f8204/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml index f274ccb..4cbc4f7 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml @@ -2,6 +2,24 @@ #set( $symbol_dollar = '$' ) #set( $symbol_escape = '\' ) <?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<!-- + 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. +--> <bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"; xmlns:c="http://isis.apache.org/applib/layout/component"; xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <bs3:row> http://git-wip-us.apache.org/repos/asf/isis/blob/8e7f8204/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 index 69fba1b..05e5ac8 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml @@ -32,7 +32,7 @@ </prerequisites> <properties> - <isis.version>1.12.0-SNAPSHOT</isis.version> + <isis.version>1.12.0</isis.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -193,19 +193,6 @@ <version>2.2</version> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.7</version> - <executions> - <execution> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <!-- Apache Release Audit Tool --> <plugin> <groupId>org.apache.rat</groupId> http://git-wip-us.apache.org/repos/asf/isis/blob/8e7f8204/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 index 5b8c52f..707bf4d 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/pom.xml @@ -53,71 +53,14 @@ </executions> </plugin> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <warName>simpleapp</warName> - <archive> - <manifest> - <addClasspath>false</addClasspath> - </manifest> - <manifestEntries> - <Build-Time>${maven.build.timestamp}</Build-Time> - <Build-Host>${agent.name}</Build-Host> - <Build-User>${user.name}</Build-User> - <Build-Maven>Maven ${maven.version}</Build-Maven> - <Build-Java>${java.version}</Build-Java> - <Build-OS>${os.name}</Build-OS> - <Build-Label>${project.version}</Build-Label> - </manifestEntries> - </archive> - <packagingExcludes>WEB-INF/lib/isis-core-webserver*.jar, - WEB-INF/lib/javax.servlet-api-*.jar, - WEB-INF/lib/javax.websocket-api-*.jar, - WEB-INF/lib/jetty-all-*.jar</packagingExcludes> - </configuration> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <versionRange>[1.5,)</versionRange> - <goals> - <goal>maven-version</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore></ignore> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> </build> <dependencies> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>${rootArtifactId}-app</artifactId> </dependency> - - <!-- other isis components --> <dependency> <groupId>org.apache.isis.viewer</groupId> <artifactId>isis-viewer-wicket-impl</artifactId> @@ -130,72 +73,128 @@ <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-security-shiro</artifactId> </dependency> - - <!-- isis core --> <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-core-security</artifactId> </dependency> - <!-- to run using WebServer (optional) --> - <dependency> - <groupId>org.apache.isis.core</groupId> - <artifactId>isis-core-webserver</artifactId> - <scope>runtime</scope> - <optional>true</optional> - </dependency> - <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-servlet_3.0_spec</artifactId> </dependency> - <!-- - JDBC drivers - (for jdo objectstore) - --> - <dependency> - <groupId>org.hsqldb</groupId> - <artifactId>hsqldb</artifactId> - </dependency> + </dependencies> - <!-- - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>9.1-901.jdbc4</version> - </dependency> - --> + <profiles> + <profile> + <id>package-war</id> + <activation> + <property> + <name>!skip.package-war</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <warName>simpleapp</warName> + <archive> + <manifest> + <addClasspath>false</addClasspath> + </manifest> + <manifestEntries> + <Build-Time>${maven.build.timestamp}</Build-Time> + <Build-Host>${agent.name}</Build-Host> + <Build-User>${user.name}</Build-User> + <Build-Maven>Maven ${maven.version}</Build-Maven> + <Build-Java>${java.version}</Build-Java> + <Build-OS>${os.name}</Build-OS> + <Build-Label>${project.version}</Build-Label> + </manifestEntries> + </archive> + </configuration> + </plugin> + </plugins> + </build> + </profile> - <!-- - mvn install:install-file -Dfile=sqljdbc4.jar \ - -DgroupId=com.microsoft.sqlserver \ - -DartifactId=jdbc \ - -Dversion=4.0 \ - -Dpackaging=jar - --> - <!-- - <dependency> - <groupId>com.microsoft.sqlserver</groupId> - <artifactId>sqljdbc4</artifactId> - <version>4.0</version> - </dependency> - --> + <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> - <dependency> - <groupId>org.lazyluke</groupId> - <artifactId>log4jdbc-remix</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> + mvn install:install-file -Dfile=sqljdbc4.jar \ + -DgroupId=com.microsoft.sqlserver \ + -DartifactId=jdbc \ + -Dversion=4.0 \ + -Dpackaging=jar - </dependencies> + <dependencies> + <dependency> + <groupId>com.microsoft.sqlserver</groupId> + <artifactId>sqljdbc4</artifactId> + <version>4.0</version> + </dependency> + </dependencies> + </profile> + --> - <profiles> <profile> <id>intellij</id> <activation> @@ -205,71 +204,48 @@ </activation> <dependencies> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_3.0_spec</artifactId> - <!-- - Use 'compile' so can run o.a.i.WebServer from within IntelliJ; - can rely on servlet container to ignore this in war file - --> - <scope>compile</scope> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis-core-webserver</artifactId> </dependency> </dependencies> </profile> <profile> - <id>jrebel</id> - <properties> - <!-- as used in the rebel.xml in the dom project --> - <target.dir>target</target.dir> - <isis-jrebel-plugin.packagePrefix>dom.simple,org.apache.isis.objectstore.jdo.applib</isis-jrebel-plugin.packagePrefix> - <isis-jrebel-plugin.loggingLevel>warn</isis-jrebel-plugin.loggingLevel> - </properties> + <id>eclipse-m2e</id> + <activation> + <property> + <name>m2e.version</name> + </property> + </activation> <build> - <plugins> - <!-- - mvn -P jrebel antrun:run \ - -Djrebel.jar="C:/Users/Dan/.IdeaIC13/config/plugins/jr-ide-idea/lib/jrebel/jrebel.jar" \ - -Disis_jrebel_plugin.jar="C:/github/danhaywood/isis-jrebel-plugin/target/danhaywood-isis-jrebel-plugin-1.0.0-SNAPSHOT.jar" - --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <configuration> - <target> - <property name="compile_classpath" refid="maven.compile.classpath" /> - <property name="runtime_classpath" refid="maven.runtime.classpath" /> - <property name="test_classpath" refid="maven.test.classpath" /> - <property name="plugin_classpath" refid="maven.plugin.classpath" /> - - <echo message="" /> - <echo message="" /> - <echo message="jrebel.jar = ${jrebel.jar}" /> - <echo message="isis_jrebel_plugin.jar = ${isis_jrebel_plugin.jar}" /> - <echo message="target.dir = ${target.dir}" /> - <echo message="" /> - <echo message="" /> - - <exec executable="java" failonerror="true"> - <arg value="-javaagent:${jrebel.jar}" /> - <arg value="-Drebel.log=false" /> - <arg value="-Drebel.check_class_hash=true" /> - <arg value="-Drebel.packages_exclude=org.apache.isis" /> - - <!-- as used in the rebel.xml in the dom project --> - <arg value="-Dproject.root=${project.basedir}/.." /> - <arg value="-Dtarget.dir=${target.dir}" /> - - <arg value="-Drebel.plugins=${isis_jrebel_plugin.jar}" /> - <arg value="-Disis-jrebel-plugin.packagePrefix=${isis-jrebel-plugin.packagePrefix}" /> - <arg value="-Disis-jrebel-plugin.loggingLevel=${isis-jrebel-plugin.loggingLevel}" /> - <arg value="-XX:MaxPermSize=128m" /> - <arg value="-classpath" /> - <arg value="${runtime_classpath}" /> - <arg value="org.apache.isis.WebServer" /> - </exec> - </target> - </configuration> - </plugin> - </plugins> + <pluginManagement> + <plugins> + <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <versionRange>[1.5,)</versionRange> + <goals> + <goal>maven-version</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore></ignore> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> </profile> </profiles> http://git-wip-us.apache.org/repos/asf/isis/blob/8e7f8204/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties ---------------------------------------------------------------------- diff --git a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties index 6a6f45c..efa1586 100644 --- a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties +++ b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties @@ -1,4 +1,4 @@ -#Sat Mar 19 14:39:01 GMT 2016 +#Sun Mar 20 12:59:31 GMT 2016 package=it.pkg version=0.1-SNAPSHOT groupId=archetype.it
