maintenance: Update Spacing of XML (#1865)

PR Set 3 of 4
This commit is contained in:
Subhrodip Mohanta 2021-10-19 23:24:24 +05:30 committed by GitHub
parent 656b441e29
commit 2c93c81cf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
47 changed files with 2312 additions and 2510 deletions

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,24 +23,24 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.iluwatar</groupId> <groupId>com.iluwatar</groupId>
<artifactId>java-design-patterns</artifactId> <artifactId>java-design-patterns</artifactId>
<version>1.25.0-SNAPSHOT</version> <version>1.25.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>leader-followers</artifactId> <artifactId>leader-followers</artifactId>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId> <artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -28,14 +28,15 @@
but it adds an empty line after the last line, so the package name can be "separated from the previous statement", but it adds an empty line after the last line, so the package name can be "separated from the previous statement",
according to Google's Checkstyle format --> according to Google's Checkstyle format -->
<additionalHeaders> <additionalHeaders>
<slashstar_custom_style> <slashstar_custom_style>
<firstLine>/*</firstLine> <firstLine>/*</firstLine>
<beforeEachLine> * </beforeEachLine> <beforeEachLine>*</beforeEachLine>
<endLine> */EOL</endLine><!-- Added EOL here --> <endLine>*/EOL</endLine>
<firstLineDetectionPattern>(\\s|\\t)*/\\*.*$</firstLineDetectionPattern> <!-- Added EOL here -->
<lastLineDetectionPattern>.*\\*/(\\s|\\t)*$</lastLineDetectionPattern> <firstLineDetectionPattern>(\\s|\\t)*/\\*.*$</firstLineDetectionPattern>
<allowBlankLines>false</allowBlankLines> <lastLineDetectionPattern>.*\\*/(\\s|\\t)*$</lastLineDetectionPattern>
<isMultiline>true</isMultiline> <allowBlankLines>false</allowBlankLines>
<padLines>false</padLines> <isMultiline>true</isMultiline>
</slashstar_custom_style> <padLines>false</padLines>
</slashstar_custom_style>
</additionalHeaders> </additionalHeaders>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,43 +23,40 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project <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/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" <modelVersion>4.0.0</modelVersion>
xmlns="http://maven.apache.org/POM/4.0.0" <parent>
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <groupId>com.iluwatar</groupId>
<modelVersion>4.0.0</modelVersion> <artifactId>java-design-patterns</artifactId>
<parent> <version>1.25.0-SNAPSHOT</version>
<groupId>com.iluwatar</groupId> </parent>
<artifactId>java-design-patterns</artifactId> <artifactId>lockable-object</artifactId>
<version>1.25.0-SNAPSHOT</version> <dependencies>
</parent> <dependency>
<artifactId>lockable-object</artifactId> <groupId>org.junit.jupiter</groupId>
<dependencies> <artifactId>junit-jupiter-engine</artifactId>
<dependency> <scope>test</scope>
<groupId>org.junit.jupiter</groupId> </dependency>
<artifactId>junit-jupiter-engine</artifactId> </dependencies>
<scope>test</scope> <build>
</dependency> <plugins>
</dependencies> <!-- Maven assembly plugin is invoked with default setting which we have
<build>
<plugins>
<!-- Maven assembly plugin is invoked with default setting which we have
in parent pom and specifying the class having main method --> in parent pom and specifying the class having main method -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<configuration> <configuration>
<archive> <archive>
<manifest> <manifest>
<mainClass>com.iluwatar.lockableobject.App</mainClass> <mainClass>com.iluwatar.lockableobject.App</mainClass>
</manifest> </manifest>
</archive> </archive>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

View File

@ -23,16 +23,13 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <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/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>java-design-patterns</artifactId> <artifactId>java-design-patterns</artifactId>
<groupId>com.iluwatar</groupId> <groupId>com.iluwatar</groupId>
<version>1.25.0-SNAPSHOT</version> <version>1.25.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>marker</artifactId> <artifactId>marker</artifactId>
<dependencies> <dependencies>
<dependency> <dependency>

View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -22,39 +23,38 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion> <parent>
<parent> <groupId>com.iluwatar</groupId>
<groupId>com.iluwatar</groupId> <artifactId>java-design-patterns</artifactId>
<artifactId>java-design-patterns</artifactId> <version>1.25.0-SNAPSHOT</version>
<version>1.25.0-SNAPSHOT</version> </parent>
</parent> <artifactId>master-worker-pattern</artifactId>
<artifactId>master-worker-pattern</artifactId> <dependencies>
<dependencies> <dependency>
<dependency> <groupId>org.junit.jupiter</groupId>
<groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId>
<artifactId>junit-jupiter-engine</artifactId> <scope>test</scope>
<scope>test</scope> </dependency>
</dependency> </dependencies>
</dependencies> <build>
<build> <plugins>
<plugins> <plugin>
<plugin> <groupId>org.apache.maven.plugins</groupId>
<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId>
<artifactId>maven-assembly-plugin</artifactId> <executions>
<executions> <execution>
<execution> <configuration>
<configuration> <archive>
<archive> <manifest>
<manifest> <mainClass>com.iluwatar.masterworker.App</mainClass>
<mainClass>com.iluwatar.masterworker.App</mainClass> </manifest>
</manifest> </archive>
</archive> </configuration>
</configuration> </execution>
</execution> </executions>
</executions> </plugin>
</plugin> </plugins>
</plugins> </build>
</build>
</project> </project>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,8 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <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/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.iluwatar</groupId> <groupId>com.iluwatar</groupId>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,8 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <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/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.iluwatar</groupId> <groupId>com.iluwatar</groupId>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,8 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <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/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.iluwatar</groupId> <groupId>com.iluwatar</groupId>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,8 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <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/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.iluwatar</groupId> <groupId>com.iluwatar</groupId>
@ -41,9 +40,9 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.java.dev.swing-layout</groupId> <groupId>net.java.dev.swing-layout</groupId>
<artifactId>swing-layout</artifactId> <artifactId>swing-layout</artifactId>
<version>1.0.2</version> <version>1.0.2</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>

View File

@ -27,117 +27,115 @@
ZK framework is licensed under LGPL and the license can be found at lgpl-3.0.txt ZK framework is licensed under LGPL and the license can be found at lgpl-3.0.txt
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <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/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <modelVersion>4.0.0</modelVersion>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent>
<modelVersion>4.0.0</modelVersion> <artifactId>java-design-patterns</artifactId>
<parent> <groupId>com.iluwatar</groupId>
<artifactId>java-design-patterns</artifactId> <version>1.25.0-SNAPSHOT</version>
<groupId>com.iluwatar</groupId> </parent>
<version>1.25.0-SNAPSHOT</version> <groupId>com.iluwatar</groupId>
</parent> <artifactId>model-view-viewmodel</artifactId>
<groupId>com.iluwatar</groupId> <version>1.25.0-SNAPSHOT</version>
<artifactId>model-view-viewmodel</artifactId> <properties>
<version>1.25.0-SNAPSHOT</version> <zk.version>9.0.0</zk.version>
<properties> <guava.version>19.0</guava.version>
<zk.version>9.0.0</zk.version> <jetty-maven-plugin.version>9.4.28.v20200408</jetty-maven-plugin.version>
<guava.version>19.0</guava.version> <maven-war-plugin.version>2.1.1</maven-war-plugin.version>
<jetty-maven-plugin.version>9.4.28.v20200408</jetty-maven-plugin.version> <maven-assembly-plugin.version>2.2</maven-assembly-plugin.version>
<maven-war-plugin.version>2.1.1</maven-war-plugin.version> <maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
<maven-assembly-plugin.version>2.2</maven-assembly-plugin.version> <packname>-${project.version}-FL-${maven.build.timestamp}</packname>
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format> </properties>
<packname>-${project.version}-FL-${maven.build.timestamp}</packname> <packaging>war</packaging>
</properties> <name>model-view-viewmodel</name>
<packaging>war</packaging> <description>model-view-viewmodel</description>
<name>model-view-viewmodel</name> <licenses>
<description>model-view-viewmodel</description> <license>
<licenses> <name>GNU LESSER GENERAL PUBLIC LICENSE, Version 3</name>
<license> <url>https://www.gnu.org/licenses/lgpl.html</url>
<name>GNU LESSER GENERAL PUBLIC LICENSE, Version 3</name> <distribution>repo</distribution>
<url>https://www.gnu.org/licenses/lgpl.html</url> </license>
<distribution>repo</distribution> </licenses>
</license> <repositories>
</licenses> <repository>
<repositories> <id>ZK CE</id>
<repository> <name>ZK CE Repository</name>
<id>ZK CE</id> <url>https://mavensync.zkoss.org/maven2</url>
<name>ZK CE Repository</name> </repository>
<url>https://mavensync.zkoss.org/maven2</url> <repository>
</repository> <id>ZK EVAL</id>
<repository> <name>ZK Evaluation Repository</name>
<id>ZK EVAL</id> <url>https://mavensync.zkoss.org/eval</url>
<name>ZK Evaluation Repository</name> </repository>
<url>https://mavensync.zkoss.org/eval</url> </repositories>
</repository> <pluginRepositories>
</repositories> <pluginRepository>
<pluginRepositories> <id>zkmaven</id>
<pluginRepository> <name>ZK Maven Plugin Repository</name>
<id>zkmaven</id> <url>https://mavensync.zkoss.org/maven2/</url>
<name>ZK Maven Plugin Repository</name> </pluginRepository>
<url>https://mavensync.zkoss.org/maven2/</url> </pluginRepositories>
</pluginRepository> <dependencies>
</pluginRepositories> <dependency>
<dependencies> <groupId>org.zkoss.zk</groupId>
<dependency> <artifactId>zkbind</artifactId>
<groupId>org.zkoss.zk</groupId> <version>${zk.version}</version>
<artifactId>zkbind</artifactId> </dependency>
<version>${zk.version}</version> <dependency>
</dependency> <groupId>org.junit.jupiter</groupId>
<dependency> <artifactId>junit-jupiter-engine</artifactId>
<groupId>org.junit.jupiter</groupId> <scope>test</scope>
<artifactId>junit-jupiter-engine</artifactId> </dependency>
<scope>test</scope> <dependency>
</dependency> <groupId>com.google.guava</groupId>
<dependency> <artifactId>guava-testlib</artifactId>
<groupId>com.google.guava</groupId> <version>${guava.version}</version>
<artifactId>guava-testlib</artifactId> <scope>test</scope>
<version>${guava.version}</version> </dependency>
<scope>test</scope> </dependencies>
</dependency> <build>
</dependencies> <finalName>${project.artifactId}</finalName>
<build> <plugins>
<finalName>${project.artifactId}</finalName> <!-- Run with Jetty -->
<plugins> <plugin>
<!-- Run with Jetty --> <groupId>org.eclipse.jetty</groupId>
<plugin> <artifactId>jetty-maven-plugin</artifactId>
<groupId>org.eclipse.jetty</groupId> <version>${jetty-maven-plugin.version}</version>
<artifactId>jetty-maven-plugin</artifactId> <configuration>
<version>${jetty-maven-plugin.version}</version> <webApp>
<configuration> <contextPath>/${project.artifactId}</contextPath>
<webApp> <allowDuplicateFragmentNames>true</allowDuplicateFragmentNames>
<contextPath>/${project.artifactId}</contextPath> </webApp>
<allowDuplicateFragmentNames>true</allowDuplicateFragmentNames> <scanIntervalSeconds>5</scanIntervalSeconds>
</webApp> </configuration>
<scanIntervalSeconds>5</scanIntervalSeconds> </plugin>
</configuration> <!-- Build war -->
</plugin> <plugin>
<!-- Build war --> <artifactId>maven-war-plugin</artifactId>
<plugin> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <version>${maven-war-plugin.version}</version>
<groupId>org.apache.maven.plugins</groupId> </plugin>
<version>${maven-war-plugin.version}</version> <!-- Pack zips -->
</plugin> <plugin>
<!-- Pack zips --> <artifactId>maven-assembly-plugin</artifactId>
<plugin> <version>${maven-assembly-plugin.version}</version>
<artifactId>maven-assembly-plugin</artifactId> <executions>
<version>${maven-assembly-plugin.version}</version> <execution>
<executions> <id>webapp</id>
<execution> <phase>package</phase>
<id>webapp</id> <goals>
<phase>package</phase> <goal>single</goal>
<goals> </goals>
<goal>single</goal> <configuration>
</goals> <finalName>model-view-viewmodel${packname}</finalName>
<configuration> <appendAssemblyId>false</appendAssemblyId>
<finalName>model-view-viewmodel${packname}</finalName> <descriptors>
<appendAssemblyId>false</appendAssemblyId> <descriptor>src/main/assembly/webapp.xml</descriptor>
<descriptors> </descriptors>
<descriptor>src/main/assembly/webapp.xml</descriptor> </configuration>
</descriptors> </execution>
</configuration> </executions>
</execution> </plugin>
</executions> </plugins>
</plugin> </build>
</plugins>
</build>
</project> </project>

View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License (MIT) The MIT License (MIT)
@ -26,29 +27,25 @@
ZK framework is licensed under LGPL and the license can be found at lgpl-3.0.txt ZK framework is licensed under LGPL and the license can be found at lgpl-3.0.txt
--> -->
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<assembly <id>webapp</id>
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" <formats>
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <format>zip</format>
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> </formats>
<id>webapp</id> <fileSets>
<formats> <fileSet>
<format>zip</format> <directory>${project.basedir}/src/main/java</directory>
</formats> <outputDirectory>/${project.artifactId}/src</outputDirectory>
<fileSets> </fileSet>
<fileSet> <fileSet>
<directory>${project.basedir}/src/main/java</directory> <directory>${project.basedir}/src/main/webapp</directory>
<outputDirectory>/${project.artifactId}/src</outputDirectory> <outputDirectory>/${project.artifactId}/WebContent</outputDirectory>
</fileSet> </fileSet>
<fileSet> </fileSets>
<directory>${project.basedir}/src/main/webapp</directory> <files>
<outputDirectory>/${project.artifactId}/WebContent</outputDirectory> <file>
</fileSet> <source>${project.build.directory}/${project.artifactId}.war</source>
</fileSets> <outputDirectory>/</outputDirectory>
<files> </file>
<file> </files>
<source>${project.build.directory}/${project.artifactId}.war</source>
<outputDirectory>/</outputDirectory>
</file>
</files>
</assembly> </assembly>

View File

@ -26,115 +26,109 @@
ZK framework is licensed under LGPL and the license can be found at lgpl-3.0.txt ZK framework is licensed under LGPL and the license can be found at lgpl-3.0.txt
--> -->
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" <web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.4" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <description><![CDATA[My ZK Application]]></description>
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> <display-name>model-view-viewmodel</display-name>
<!-- ZK -->
<description><![CDATA[My ZK Application]]></description> <listener>
<display-name>model-view-viewmodel</display-name> <description>ZK listener for session cleanup</description>
<listener-class>org.zkoss.zk.ui.http.HttpSessionListener</listener-class>
<!-- ZK --> </listener>
<listener> <servlet>
<description>ZK listener for session cleanup</description> <description>ZK loader for ZUML pages</description>
<listener-class>org.zkoss.zk.ui.http.HttpSessionListener</listener-class> <servlet-name>zkLoader</servlet-name>
</listener> <servlet-class>org.zkoss.zk.ui.http.DHtmlLayoutServlet</servlet-class>
<servlet> <!-- Must. Specifies URI of the update engine (DHtmlUpdateServlet).
<description>ZK loader for ZUML pages</description>
<servlet-name>zkLoader</servlet-name>
<servlet-class>org.zkoss.zk.ui.http.DHtmlLayoutServlet</servlet-class>
<!-- Must. Specifies URI of the update engine (DHtmlUpdateServlet).
It must be the same as <url-pattern> for the update engine. It must be the same as <url-pattern> for the update engine.
--> -->
<init-param> <init-param>
<param-name>update-uri</param-name> <param-name>update-uri</param-name>
<param-value>/zkau</param-value> <param-value>/zkau</param-value>
</init-param> </init-param>
<load-on-startup>1</load-on-startup><!-- Must --> <load-on-startup>1</load-on-startup>
</servlet> <!-- Must -->
<servlet-mapping> </servlet>
<servlet-name>zkLoader</servlet-name> <servlet-mapping>
<url-pattern>*.zul</url-pattern> <servlet-name>zkLoader</servlet-name>
</servlet-mapping> <url-pattern>*.zul</url-pattern>
<servlet-mapping> </servlet-mapping>
<servlet-name>zkLoader</servlet-name> <servlet-mapping>
<url-pattern>*.zhtml</url-pattern> <servlet-name>zkLoader</servlet-name>
</servlet-mapping> <url-pattern>*.zhtml</url-pattern>
<servlet> </servlet-mapping>
<description>The asynchronous update engine for ZK</description> <servlet>
<servlet-name>auEngine</servlet-name> <description>The asynchronous update engine for ZK</description>
<servlet-class>org.zkoss.zk.au.http.DHtmlUpdateServlet</servlet-class> <servlet-name>auEngine</servlet-name>
</servlet> <servlet-class>org.zkoss.zk.au.http.DHtmlUpdateServlet</servlet-class>
<servlet-mapping> </servlet>
<servlet-name>auEngine</servlet-name> <servlet-mapping>
<url-pattern>/zkau/*</url-pattern> <servlet-name>auEngine</servlet-name>
</servlet-mapping> <url-pattern>/zkau/*</url-pattern>
<session-config> </servlet-mapping>
<session-timeout>60</session-timeout> <session-config>
</session-config> <session-timeout>60</session-timeout>
</session-config>
<!-- [Optional] MIME mapping --> <!-- [Optional] MIME mapping -->
<mime-mapping> <mime-mapping>
<extension>doc</extension> <extension>doc</extension>
<mime-type>application/vnd.ms-word</mime-type> <mime-type>application/vnd.ms-word</mime-type>
</mime-mapping> </mime-mapping>
<mime-mapping> <mime-mapping>
<extension>gif</extension> <extension>gif</extension>
<mime-type>image/gif</mime-type> <mime-type>image/gif</mime-type>
</mime-mapping> </mime-mapping>
<mime-mapping> <mime-mapping>
<extension>htm</extension> <extension>htm</extension>
<mime-type>text/html</mime-type> <mime-type>text/html</mime-type>
</mime-mapping> </mime-mapping>
<mime-mapping> <mime-mapping>
<extension>html</extension> <extension>html</extension>
<mime-type>text/html</mime-type> <mime-type>text/html</mime-type>
</mime-mapping> </mime-mapping>
<mime-mapping> <mime-mapping>
<extension>jpeg</extension> <extension>jpeg</extension>
<mime-type>image/jpeg</mime-type> <mime-type>image/jpeg</mime-type>
</mime-mapping> </mime-mapping>
<mime-mapping> <mime-mapping>
<extension>jpg</extension> <extension>jpg</extension>
<mime-type>image/jpeg</mime-type> <mime-type>image/jpeg</mime-type>
</mime-mapping> </mime-mapping>
<mime-mapping> <mime-mapping>
<extension>js</extension> <extension>js</extension>
<mime-type>text/javascript</mime-type> <mime-type>text/javascript</mime-type>
</mime-mapping> </mime-mapping>
<mime-mapping> <mime-mapping>
<extension>pdf</extension> <extension>pdf</extension>
<mime-type>application/pdf</mime-type> <mime-type>application/pdf</mime-type>
</mime-mapping> </mime-mapping>
<mime-mapping> <mime-mapping>
<extension>png</extension> <extension>png</extension>
<mime-type>image/png</mime-type> <mime-type>image/png</mime-type>
</mime-mapping> </mime-mapping>
<mime-mapping> <mime-mapping>
<extension>txt</extension> <extension>txt</extension>
<mime-type>text/plain</mime-type> <mime-type>text/plain</mime-type>
</mime-mapping> </mime-mapping>
<mime-mapping> <mime-mapping>
<extension>xls</extension> <extension>xls</extension>
<mime-type>application/vnd.ms-excel</mime-type> <mime-type>application/vnd.ms-excel</mime-type>
</mime-mapping> </mime-mapping>
<mime-mapping> <mime-mapping>
<extension>xml</extension> <extension>xml</extension>
<mime-type>text/xml</mime-type> <mime-type>text/xml</mime-type>
</mime-mapping> </mime-mapping>
<mime-mapping> <mime-mapping>
<extension>zhtml</extension> <extension>zhtml</extension>
<mime-type>text/html</mime-type> <mime-type>text/html</mime-type>
</mime-mapping> </mime-mapping>
<mime-mapping> <mime-mapping>
<extension>zul</extension> <extension>zul</extension>
<mime-type>text/html</mime-type> <mime-type>text/html</mime-type>
</mime-mapping> </mime-mapping>
<welcome-file-list>
<welcome-file-list> <welcome-file>index.zul</welcome-file>
<welcome-file>index.zul</welcome-file> <welcome-file>index.zhtml</welcome-file>
<welcome-file>index.zhtml</welcome-file> <welcome-file>index.html</welcome-file>
<welcome-file>index.html</welcome-file> <welcome-file>index.htm</welcome-file>
<welcome-file>index.htm</welcome-file> </welcome-file-list>
</welcome-file-list>
</web-app> </web-app>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,39 +23,38 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" <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/xsd/maven-4.0.0.xsd">
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion> <parent>
<parent> <groupId>com.iluwatar</groupId>
<groupId>com.iluwatar</groupId> <artifactId>java-design-patterns</artifactId>
<artifactId>java-design-patterns</artifactId> <version>1.25.0-SNAPSHOT</version>
<version>1.25.0-SNAPSHOT</version> </parent>
</parent> <artifactId>module</artifactId>
<artifactId>module</artifactId> <dependencies>
<dependencies> <dependency>
<dependency> <groupId>org.junit.jupiter</groupId>
<groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId>
<artifactId>junit-jupiter-engine</artifactId> <scope>test</scope>
<scope>test</scope> </dependency>
</dependency> </dependencies>
</dependencies> <build>
<build> <plugins>
<plugins> <plugin>
<plugin> <groupId>org.apache.maven.plugins</groupId>
<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId>
<artifactId>maven-assembly-plugin</artifactId> <executions>
<executions> <execution>
<execution> <configuration>
<configuration> <archive>
<archive> <manifest>
<manifest> <mainClass>com.iluwatar.module.App</mainClass>
<mainClass>com.iluwatar.module.App</mainClass> </manifest>
</manifest> </archive>
</archive> </configuration>
</configuration> </execution>
</execution> </executions>
</executions> </plugin>
</plugin> </plugins>
</plugins> </build>
</build>
</project> </project>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,40 +23,38 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <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/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion> <parent>
<parent> <groupId>com.iluwatar</groupId>
<groupId>com.iluwatar</groupId> <artifactId>java-design-patterns</artifactId>
<artifactId>java-design-patterns</artifactId> <version>1.25.0-SNAPSHOT</version>
<version>1.25.0-SNAPSHOT</version> </parent>
</parent> <artifactId>monad</artifactId>
<artifactId>monad</artifactId> <dependencies>
<dependencies> <dependency>
<dependency> <groupId>org.junit.jupiter</groupId>
<groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId>
<artifactId>junit-jupiter-engine</artifactId> <scope>test</scope>
<scope>test</scope> </dependency>
</dependency> </dependencies>
</dependencies> <build>
<build> <plugins>
<plugins> <plugin>
<plugin> <groupId>org.apache.maven.plugins</groupId>
<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId>
<artifactId>maven-assembly-plugin</artifactId> <executions>
<executions> <execution>
<execution> <configuration>
<configuration> <archive>
<archive> <manifest>
<manifest> <mainClass>com.iluwatar.monostate.App</mainClass>
<mainClass>com.iluwatar.monostate.App</mainClass> </manifest>
</manifest> </archive>
</archive> </configuration>
</configuration> </execution>
</execution> </executions>
</executions> </plugin>
</plugin> </plugins>
</plugins> </build>
</build>
</project> </project>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,8 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <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/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.iluwatar</groupId> <groupId>com.iluwatar</groupId>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,8 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <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/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.iluwatar</groupId> <groupId>com.iluwatar</groupId>
@ -38,11 +37,11 @@
<artifactId>junit-jupiter-engine</artifactId> <artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId> <artifactId>junit-jupiter-params</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,40 +23,38 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project <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/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" <modelVersion>4.0.0</modelVersion>
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent>
<modelVersion>4.0.0</modelVersion> <groupId>com.iluwatar</groupId>
<parent> <artifactId>java-design-patterns</artifactId>
<groupId>com.iluwatar</groupId> <version>1.25.0-SNAPSHOT</version>
<artifactId>java-design-patterns</artifactId> </parent>
<version>1.25.0-SNAPSHOT</version> <artifactId>mute-idiom</artifactId>
</parent> <dependencies>
<artifactId>mute-idiom</artifactId> <dependency>
<dependencies> <groupId>org.junit.jupiter</groupId>
<dependency> <artifactId>junit-jupiter-engine</artifactId>
<groupId>org.junit.jupiter</groupId> <scope>test</scope>
<artifactId>junit-jupiter-engine</artifactId> </dependency>
<scope>test</scope> </dependencies>
</dependency> <build>
</dependencies> <plugins>
<build> <plugin>
<plugins> <groupId>org.apache.maven.plugins</groupId>
<plugin> <artifactId>maven-assembly-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId> <executions>
<artifactId>maven-assembly-plugin</artifactId> <execution>
<executions> <configuration>
<execution> <archive>
<configuration> <manifest>
<archive> <mainClass>com.iluwatar.mute.App</mainClass>
<manifest> </manifest>
<mainClass>com.iluwatar.mute.App</mainClass> </archive>
</manifest> </configuration>
</archive> </execution>
</configuration> </executions>
</execution> </plugin>
</executions> </plugins>
</plugin> </build>
</plugins>
</build>
</project> </project>

View File

@ -23,194 +23,181 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion> <parent>
<groupId>com.iluwatar</groupId>
<parent> <artifactId>naked-objects</artifactId>
<groupId>com.iluwatar</groupId> <version>1.25.0-SNAPSHOT</version>
<artifactId>naked-objects</artifactId> </parent>
<version>1.25.0-SNAPSHOT</version> <artifactId>naked-objects-dom</artifactId>
</parent> <build>
<resources>
<artifactId>naked-objects-dom</artifactId> <resource>
<directory>src/main/resources</directory>
<build> </resource>
<resources> <resource>
<resource> <directory>src/main/java</directory>
<directory>src/main/resources</directory> <includes>
</resource> <include>**</include>
<resource> </includes>
<directory>src/main/java</directory> <excludes>
<includes> <exclude>**/*.java</exclude>
<include>**</include> </excludes>
</includes> </resource>
<excludes> </resources>
<exclude>**/*.java</exclude> <plugins>
</excludes> <plugin>
</resource> <groupId>org.apache.maven.plugins</groupId>
</resources> <artifactId>maven-compiler-plugin</artifactId>
<plugins> <version>${compiler.version}</version>
<plugin> <configuration>
<groupId>org.apache.maven.plugins</groupId> <source>8</source>
<artifactId>maven-compiler-plugin</artifactId> <target>8</target>
<version>${compiler.version}</version> </configuration>
<configuration> </plugin>
<source>8</source> </plugins>
<target>8</target> </build>
</configuration> <dependencies>
</plugin> <dependency>
</plugins> <groupId>org.apache.isis.core</groupId>
</build> <artifactId>isis-core-applib</artifactId>
</dependency>
<dependencies> <dependency>
<dependency> <groupId>org.apache.isis.core</groupId>
<groupId>org.apache.isis.core</groupId> <artifactId>isis-core-unittestsupport</artifactId>
<artifactId>isis-core-applib</artifactId> <scope>test</scope>
</dependency> </dependency>
<dependency>
<dependency> <groupId>org.junit.vintage</groupId>
<groupId>org.apache.isis.core</groupId> <artifactId>junit-vintage-engine</artifactId>
<artifactId>isis-core-unittestsupport</artifactId> <scope>test</scope>
<scope>test</scope> </dependency>
</dependency> <!-- Bytecode libraries (for mocking) -->
<dependency>
<dependency> <groupId>org.objenesis</groupId>
<groupId>org.junit.vintage</groupId> <artifactId>objenesis</artifactId>
<artifactId>junit-vintage-engine</artifactId> <scope>test</scope>
<scope>test</scope> </dependency>
</dependency> <dependency>
<groupId>org.assertj</groupId>
<!-- Bytecode libraries (for mocking) --> <artifactId>assertj-core</artifactId>
<dependency> <scope>test</scope>
<groupId>org.objenesis</groupId> </dependency>
<artifactId>objenesis</artifactId> </dependencies>
<scope>test</scope> <profiles>
</dependency> <profile>
<id>enhance</id>
<dependency> <activation>
<groupId>org.assertj</groupId> <activeByDefault>true</activeByDefault>
<artifactId>assertj-core</artifactId> </activation>
<scope>test</scope> <properties>
</dependency> <datanucleus-maven-plugin.version>5.2.1</datanucleus-maven-plugin.version>
</properties>
</dependencies> <build>
<pluginManagement>
<profiles> <plugins>
<profile> <plugin>
<id>enhance</id> <!--This plugin's configuration is used to store Eclipse m2e settings
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<datanucleus-maven-plugin.version>5.2.1</datanucleus-maven-plugin.version>
</properties>
<build>
<pluginManagement>
<plugins>
<plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. --> only. It has no influence on the Maven build itself. -->
<groupId>org.eclipse.m2e</groupId> <groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId> <artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
<configuration> <configuration>
<lifecycleMappingMetadata> <lifecycleMappingMetadata>
<pluginExecutions> <pluginExecutions>
<pluginExecution> <pluginExecution>
<pluginExecutionFilter> <pluginExecutionFilter>
<groupId>org.datanucleus</groupId> <groupId>org.datanucleus</groupId>
<artifactId>datanucleus-maven-plugin</artifactId> <artifactId>datanucleus-maven-plugin</artifactId>
<versionRange>[${datanucleus-maven-plugin.version},)</versionRange> <versionRange>[${datanucleus-maven-plugin.version},)</versionRange>
<goals> <goals>
<goal>enhance</goal> <goal>enhance</goal>
</goals> </goals>
</pluginExecutionFilter> </pluginExecutionFilter>
<action> <action>
<ignore/> <ignore />
</action> </action>
</pluginExecution> </pluginExecution>
</pluginExecutions> </pluginExecutions>
</lifecycleMappingMetadata> </lifecycleMappingMetadata>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.datanucleus</groupId> <groupId>org.datanucleus</groupId>
<artifactId>datanucleus-maven-plugin</artifactId> <artifactId>datanucleus-maven-plugin</artifactId>
<version>${datanucleus-maven-plugin.version}</version> <version>${datanucleus-maven-plugin.version}</version>
<configuration> <configuration>
<fork>false</fork> <fork>false</fork>
<verbose>true</verbose> <verbose>true</verbose>
<props>${basedir}/datanucleus.properties</props> <props>${basedir}/datanucleus.properties</props>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<phase>process-classes</phase> <phase>process-classes</phase>
<goals> <goals>
<goal>enhance</goal> <goal>enhance</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.datanucleus</groupId> <groupId>org.datanucleus</groupId>
<artifactId>datanucleus-core</artifactId> <artifactId>datanucleus-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.datanucleus</groupId> <groupId>org.datanucleus</groupId>
<artifactId>datanucleus-jodatime</artifactId> <artifactId>datanucleus-jodatime</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.datanucleus</groupId> <groupId>org.datanucleus</groupId>
<artifactId>datanucleus-api-jdo</artifactId> <artifactId>datanucleus-api-jdo</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
<profile> <profile>
<id>isis-validate</id> <id>isis-validate</id>
<activation> <activation />
</activation> <build>
<build> <plugins>
<plugins> <plugin>
<plugin> <groupId>org.apache.isis.tool</groupId>
<groupId>org.apache.isis.tool</groupId> <artifactId>isis-maven-plugin</artifactId>
<artifactId>isis-maven-plugin</artifactId> <version>1.9.0-SNAPSHOT</version>
<version>1.9.0-SNAPSHOT</version> <configuration>
<configuration> <isisConfigDir>../webapp/src/main/webapp/WEB-INF</isisConfigDir>
<isisConfigDir>../webapp/src/main/webapp/WEB-INF</isisConfigDir> </configuration>
</configuration> <dependencies>
<dependencies> <dependency>
<dependency> <groupId>org.apache.isis.example.application</groupId>
<groupId>org.apache.isis.example.application</groupId> <artifactId>simpleapp-dom</artifactId>
<artifactId>simpleapp-dom</artifactId> <version>1.9.0-SNAPSHOT</version>
<version>1.9.0-SNAPSHOT</version> </dependency>
</dependency> <!-- ... workaround to avoid conflict with plexus-default (not sure
<!-- ... workaround to avoid conflict with plexus-default (not sure
why exclusions in the isis-maven-plugin aren't sufficient, though ... --> why exclusions in the isis-maven-plugin aren't sufficient, though ... -->
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>16.0.1</version> <version>16.0.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
<executions> <executions>
<execution> <execution>
<phase>test</phase> <phase>test</phase>
<goals> <goals>
<goal>validate</goal> <goal>validate</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
</profiles> </profiles>
</project> </project>

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,10 +23,6 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<persistence xmlns="http://java.sun.com/xml/ns/persistence" <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" version="1.0">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <persistence-unit name="simple" />
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" version="1.0">
<persistence-unit name="simple">
</persistence-unit>
</persistence> </persistence>

View File

@ -23,23 +23,18 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion> <parent>
<groupId>com.iluwatar</groupId>
<parent> <artifactId>naked-objects</artifactId>
<groupId>com.iluwatar</groupId> <version>1.25.0-SNAPSHOT</version>
<artifactId>naked-objects</artifactId> </parent>
<version>1.25.0-SNAPSHOT</version> <artifactId>naked-objects-fixture</artifactId>
</parent> <dependencies>
<dependency>
<artifactId>naked-objects-fixture</artifactId> <groupId>${project.groupId}</groupId>
<artifactId>naked-objects-dom</artifactId>
<dependencies> </dependency>
<dependency> </dependencies>
<groupId>${project.groupId}</groupId>
<artifactId>naked-objects-dom</artifactId>
</dependency>
</dependencies>
</project> </project>

View File

@ -23,93 +23,79 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion> <parent>
<groupId>com.iluwatar</groupId>
<parent> <artifactId>naked-objects</artifactId>
<groupId>com.iluwatar</groupId> <version>1.25.0-SNAPSHOT</version>
<artifactId>naked-objects</artifactId> </parent>
<version>1.25.0-SNAPSHOT</version> <artifactId>naked-objects-integtests</artifactId>
</parent> <build>
<testResources>
<artifactId>naked-objects-integtests</artifactId> <testResource>
<directory>src/test/resources</directory>
<build> </testResource>
<testResources> <testResource>
<testResource> <directory>src/test/java</directory>
<directory>src/test/resources</directory> <includes>
</testResource> <include>**</include>
<testResource> </includes>
<directory>src/test/java</directory> <excludes>
<includes> <exclude>**/*.java</exclude>
<include>**</include> </excludes>
</includes> </testResource>
<excludes> </testResources>
<exclude>**/*.java</exclude> </build>
</excludes> <dependencies>
</testResource> <!-- other modules in this project -->
</testResources> <dependency>
</build> <groupId>${project.groupId}</groupId>
<dependencies> <artifactId>naked-objects-fixture</artifactId>
</dependency>
<!-- other modules in this project --> <dependency>
<dependency> <groupId>org.apache.isis.core</groupId>
<groupId>${project.groupId}</groupId> <artifactId>isis-core-unittestsupport</artifactId>
<artifactId>naked-objects-fixture</artifactId> </dependency>
</dependency> <dependency>
<groupId>org.apache.isis.core</groupId>
<dependency> <artifactId>isis-core-integtestsupport</artifactId>
<groupId>org.apache.isis.core</groupId> </dependency>
<artifactId>isis-core-unittestsupport</artifactId> <dependency>
</dependency> <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-specsupport</artifactId>
<dependency> </dependency>
<groupId>org.apache.isis.core</groupId> <dependency>
<artifactId>isis-core-integtestsupport</artifactId> <groupId>org.hamcrest</groupId>
</dependency> <artifactId>hamcrest-library</artifactId>
<dependency> </dependency>
<groupId>org.apache.isis.core</groupId> <dependency>
<artifactId>isis-core-specsupport</artifactId> <groupId>org.apache.isis.core</groupId>
</dependency> <artifactId>isis-core-wrapper</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.apache.isis.core</groupId>
<artifactId>hamcrest-library</artifactId> <artifactId>isis-core-runtime</artifactId>
</dependency> </dependency>
<dependency>
<dependency> <groupId>org.assertj</groupId>
<groupId>org.apache.isis.core</groupId> <artifactId>assertj-core</artifactId>
<artifactId>isis-core-wrapper</artifactId> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.isis.core</groupId> <groupId>org.junit.vintage</groupId>
<artifactId>isis-core-runtime</artifactId> <artifactId>junit-vintage-engine</artifactId>
</dependency> <scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.assertj</groupId> <groupId>org.hsqldb</groupId>
<artifactId>assertj-core</artifactId> <artifactId>hsqldb</artifactId>
<scope>test</scope> </dependency>
</dependency> <dependency>
<groupId>javax.annotation</groupId>
<dependency> <artifactId>javax.annotation-api</artifactId>
<groupId>org.junit.vintage</groupId> </dependency>
<artifactId>junit-vintage-engine</artifactId> <!--
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
<!--
uncomment to enable enhanced cucumber-jvm reporting uncomment to enable enhanced cucumber-jvm reporting
http://www.masterthought.net/section/cucumber-reporting http://www.masterthought.net/section/cucumber-reporting
<dependency> <dependency>
@ -129,9 +115,8 @@
<version>0.0.4</version> <version>0.0.4</version>
</dependency> </dependency>
--> -->
</dependencies> </dependencies>
<!--
<!--
uncomment for enhanced cucumber-jvm reporting uncomment for enhanced cucumber-jvm reporting
http://www.masterthought.net/section/cucumber-reporting http://www.masterthought.net/section/cucumber-reporting
<repositories> <repositories>
@ -141,5 +126,4 @@
</repository> </repository>
</repositories> </repositories>
--> -->
</project> </project>

View File

@ -23,351 +23,328 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion> <parent>
<parent> <artifactId>java-design-patterns</artifactId>
<artifactId>java-design-patterns</artifactId> <groupId>com.iluwatar</groupId>
<groupId>com.iluwatar</groupId> <version>1.25.0-SNAPSHOT</version>
<version>1.25.0-SNAPSHOT</version> </parent>
</parent> <artifactId>naked-objects</artifactId>
<artifactId>naked-objects</artifactId> <packaging>pom</packaging>
<packaging>pom</packaging> <properties>
<properties> <isis.version>1.9.0</isis.version>
<isis.version>1.9.0</isis.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <assertj-core.version>2.0.0</assertj-core.version>
<assertj-core.version>2.0.0</assertj-core.version> </properties>
</properties> <repositories>
<repositories> <repository>
<repository> <id>apache.snapshots</id>
<id>apache.snapshots</id> <name>Apache Snapshots</name>
<name>Apache Snapshots</name> <url>https://repository.apache.org/content/repositories/snapshots/</url>
<url>https://repository.apache.org/content/repositories/snapshots/</url> <releases>
<releases> <enabled>false</enabled>
<enabled>false</enabled> </releases>
</releases> <snapshots />
<snapshots> </repository>
</snapshots> <repository>
</repository> <id>Cloudbees snapshots</id>
<repository> <url>https://repository-estatio.forge.cloudbees.com/snapshot/</url>
<id>Cloudbees snapshots</id> <snapshots />
<url>https://repository-estatio.forge.cloudbees.com/snapshot/</url> <releases>
<snapshots> <enabled>false</enabled>
</snapshots> </releases>
<releases> </repository>
<enabled>false</enabled> </repositories>
</releases> <build>
</repository> <pluginManagement>
</repositories> <plugins>
<plugin>
<build> <groupId>org.apache.maven.plugins</groupId>
<pluginManagement> <artifactId>maven-enforcer-plugin</artifactId>
<plugins> <version>1.3.1</version>
<plugin> <configuration>
<groupId>org.apache.maven.plugins</groupId> <rules>
<artifactId>maven-enforcer-plugin</artifactId> <requireMavenVersion>
<version>1.3.1</version> <version>[3.2.1,)</version>
<configuration> </requireMavenVersion>
<rules> <requireJavaVersion>
<requireMavenVersion> <version>[1.8.0,)</version>
<version>[3.2.1,)</version> </requireJavaVersion>
</requireMavenVersion> <requirePluginVersions>
<requireJavaVersion> <message>All plugin versions must be
<version>[1.8.0,)</version>
</requireJavaVersion>
<requirePluginVersions>
<message>All plugin versions must be
defined!</message> defined!</message>
<banLatest>true</banLatest> <banLatest>true</banLatest>
<banRelease>true</banRelease> <banRelease>true</banRelease>
</requirePluginVersions> </requirePluginVersions>
<DependencyConvergence /> <DependencyConvergence />
</rules> </rules>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>validate-enforce</id> <id>validate-enforce</id>
<phase>validate</phase> <phase>validate</phase>
<goals> <goals>
<goal>enforce</goal> <goal>enforce</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<includes> <includes>
<include>**/*Test.java</include> <include>**/*Test.java</include>
<include>**/*Test$*.java</include> <include>**/*Test$*.java</include>
<include>**/*Test_*.java</include> <include>**/*Test_*.java</include>
<include>**/*Spec*.java</include> <include>**/*Spec*.java</include>
</includes> </includes>
<excludes> <excludes>
<exclude>**/Test*.java</exclude> <exclude>**/Test*.java</exclude>
<exclude>**/*ForTesting.java</exclude> <exclude>**/*ForTesting.java</exclude>
<exclude>**/*Abstract*.java</exclude> <exclude>**/*Abstract*.java</exclude>
</excludes> </excludes>
<useFile>true</useFile> <useFile>true</useFile>
<printSummary>true</printSummary> <printSummary>true</printSummary>
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory> <reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<plugin> <groupId>org.apache.maven.plugins</groupId>
<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId>
<artifactId>maven-surefire-report-plugin</artifactId> <version>2.16</version>
<version>2.16</version> <configuration>
<configuration> <showSuccess>false</showSuccess>
<showSuccess>false</showSuccess> </configuration>
</configuration> <executions>
<executions> <execution>
<execution> <phase>test</phase>
<phase>test</phase> </execution>
</execution> </executions>
</executions> </plugin>
</plugin> <plugin>
<artifactId>maven-clean-plugin</artifactId>
<plugin> <version>2.5</version>
<artifactId>maven-clean-plugin</artifactId> </plugin>
<version>2.5</version> <plugin>
</plugin> <artifactId>maven-resources-plugin</artifactId>
<plugin> <version>2.6</version>
<artifactId>maven-resources-plugin</artifactId> </plugin>
<version>2.6</version> <plugin>
</plugin> <artifactId>maven-jar-plugin</artifactId>
<plugin> <version>2.4</version>
<artifactId>maven-jar-plugin</artifactId> </plugin>
<version>2.4</version> <plugin>
</plugin> <artifactId>maven-install-plugin</artifactId>
<plugin> <version>2.5.1</version>
<artifactId>maven-install-plugin</artifactId> </plugin>
<version>2.5.1</version> <plugin>
</plugin> <artifactId>maven-deploy-plugin</artifactId>
<plugin> <version>2.8.1</version>
<artifactId>maven-deploy-plugin</artifactId> </plugin>
<version>2.8.1</version> <plugin>
</plugin> <artifactId>maven-site-plugin</artifactId>
<plugin> <version>3.3</version>
<artifactId>maven-site-plugin</artifactId> </plugin>
<version>3.3</version> <plugin>
</plugin> <artifactId>maven-war-plugin</artifactId>
<plugin> <version>2.4</version>
<artifactId>maven-war-plugin</artifactId> </plugin>
<version>2.4</version> <plugin>
</plugin> <groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<plugin> <version>6.1.26</version>
<groupId>org.mortbay.jetty</groupId> </plugin>
<artifactId>maven-jetty-plugin</artifactId> <plugin>
<version>6.1.26</version> <groupId>org.apache.maven.plugins</groupId>
</plugin> <artifactId>maven-shade-plugin</artifactId>
<version>2.2</version>
<plugin> </plugin>
<groupId>org.apache.maven.plugins</groupId> <plugin>
<artifactId>maven-shade-plugin</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>2.2</version> <artifactId>maven-antrun-plugin</artifactId>
</plugin> <version>1.7</version>
<executions>
<plugin> <execution>
<groupId>org.apache.maven.plugins</groupId> <goals>
<artifactId>maven-antrun-plugin</artifactId> <goal>run</goal>
<version>1.7</version> </goals>
<executions> </execution>
<execution> </executions>
<goals> </plugin>
<goal>run</goal> <!-- http://simplericity.com/2009/11/10/1257880778509.html -->
</goals> <plugin>
</execution> <groupId>org.simplericity.jettyconsole</groupId>
</executions> <artifactId>jetty-console-maven-plugin</artifactId>
</plugin> <version>1.56</version>
<!-- http://simplericity.com/2009/11/10/1257880778509.html --> </plugin>
<plugin> <!-- Apache Release Audit Tool -->
<groupId>org.simplericity.jettyconsole</groupId> <plugin>
<artifactId>jetty-console-maven-plugin</artifactId> <groupId>org.apache.rat</groupId>
<version>1.56</version> <artifactId>apache-rat-plugin</artifactId>
</plugin> <version>0.10</version>
<configuration>
<!-- Apache Release Audit Tool --> <addDefaultLicenseMatchers>true</addDefaultLicenseMatchers>
<plugin> <excludeSubProjects>true</excludeSubProjects>
<groupId>org.apache.rat</groupId> <excludes>
<artifactId>apache-rat-plugin</artifactId> <exclude>**/target/**</exclude>
<version>0.10</version> <exclude>**/target-ide/**</exclude>
<configuration> <exclude>**/*.project</exclude>
<addDefaultLicenseMatchers>true</addDefaultLicenseMatchers> <exclude>**/.classpath</exclude>
<excludeSubProjects>true</excludeSubProjects> <exclude>**/.settings/**</exclude>
<excludes> <exclude>**/*.launch</exclude>
<exclude>**/target/**</exclude> <exclude>**/ide/eclipse/launch/**</exclude>
<exclude>**/target-ide/**</exclude> <exclude>**/ide/intellij/launch/**</exclude>
<exclude>src/site/resources/ide/eclipse/**</exclude>
<exclude>**/*.project</exclude> <exclude>**/rebel.xml</exclude>
<exclude>**/.classpath</exclude> <exclude>**/*.gitignore</exclude>
<exclude>**/.settings/**</exclude> <exclude>**/*.log</exclude>
<exclude>**/*.launch</exclude> <exclude>**/*.pdn</exclude>
<exclude>**/ide/eclipse/launch/**</exclude> <exclude>**/*.svg</exclude>
<exclude>**/ide/intellij/launch/**</exclude> <exclude>**/*.json</exclude>
<exclude>src/site/resources/ide/eclipse/**</exclude> <exclude>**/*.min.js</exclude>
<exclude>**/*.js</exclude>
<exclude>**/rebel.xml</exclude> <exclude>**/translations.pot</exclude>
<exclude>**/*.gitignore</exclude> <exclude>**/translations*.po</exclude>
<exclude>**/*.log</exclude> </excludes>
<exclude>**/*.pdn</exclude> <licenses>
<exclude>**/*.svg</exclude> <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
<exclude>**/*.json</exclude> <licenseFamilyCategory>AL2</licenseFamilyCategory>
<exclude>**/*.min.js</exclude> <licenseFamilyName>Apache License 2.0</licenseFamilyName>
<exclude>**/*.js</exclude> <notes />
<patterns>
<exclude>**/translations.pot</exclude> <pattern>Licensed to the Apache Software Foundation (ASF) under one</pattern>
<exclude>**/translations*.po</exclude> </patterns>
</excludes> </license>
<licenses> <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
<license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> <licenseFamilyCategory>JQRY</licenseFamilyCategory>
<licenseFamilyCategory>AL2</licenseFamilyCategory> <licenseFamilyName>MIT</licenseFamilyName>
<licenseFamilyName>Apache License 2.0</licenseFamilyName> <notes />
<notes/> <patterns>
<patterns> <pattern>Dual licensed under the MIT or GPL Version 2 licenses.</pattern>
<pattern>Licensed to the Apache Software Foundation (ASF) under one</pattern> </patterns>
</patterns> </license>
</license> <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
<license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> <licenseFamilyCategory>JMOCK</licenseFamilyCategory>
<licenseFamilyCategory>JQRY</licenseFamilyCategory> <licenseFamilyName>JMock</licenseFamilyName>
<licenseFamilyName>MIT</licenseFamilyName> <notes />
<notes/> <patterns>
<patterns> <pattern>Copyright (c) 2000-2007, jMock.org</pattern>
<pattern>Dual licensed under the MIT or GPL Version 2 licenses.</pattern> </patterns>
</patterns> </license>
</license> <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
<license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> <licenseFamilyCategory>DOCBK</licenseFamilyCategory>
<licenseFamilyCategory>JMOCK</licenseFamilyCategory> <licenseFamilyName>DocBook 4.5</licenseFamilyName>
<licenseFamilyName>JMock</licenseFamilyName> <notes />
<notes/> <patterns>
<patterns> <pattern>Permission to copy in any form is granted for use</pattern>
<pattern>Copyright (c) 2000-2007, jMock.org</pattern> <pattern>Permission to use, copy, modify and distribute the DocBook DTD</pattern>
</patterns> <pattern>is hereby granted in perpetuity, provided that the above copyright</pattern>
</license> <pattern>This is the catalog data file for DocBook XML V4.5. It is provided as</pattern>
<license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> <pattern>XML Catalog data for DocBook XML V4.5</pattern>
<licenseFamilyCategory>DOCBK</licenseFamilyCategory> <pattern>DocBook additional general entities V4.5</pattern>
<licenseFamilyName>DocBook 4.5</licenseFamilyName> <pattern>XML EXCHANGE TABLE MODEL DECLARATION MODULE</pattern>
<notes/> </patterns>
<patterns> </license>
<pattern>Permission to copy in any form is granted for use</pattern> <license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense">
<pattern>Permission to use, copy, modify and distribute the DocBook DTD</pattern> <licenseFamilyCategory>W3C</licenseFamilyCategory>
<pattern>is hereby granted in perpetuity, provided that the above copyright</pattern> <licenseFamilyName>XHTML</licenseFamilyName>
<pattern>This is the catalog data file for DocBook XML V4.5. It is provided as</pattern> <notes />
<pattern>XML Catalog data for DocBook XML V4.5</pattern> <patterns>
<pattern>DocBook additional general entities V4.5</pattern> <pattern>Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),</pattern>
<pattern>XML EXCHANGE TABLE MODEL DECLARATION MODULE</pattern> </patterns>
</patterns> </license>
</license> </licenses>
<license implementation="org.apache.rat.analysis.license.SimplePatternBasedLicense"> <licenseFamilies>
<licenseFamilyCategory>W3C</licenseFamilyCategory> <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
<licenseFamilyName>XHTML</licenseFamilyName> <familyName>Apache License 2.0</familyName>
<notes/> </licenseFamily>
<patterns> <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
<pattern>Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),</pattern> <familyName>MIT</familyName>
</patterns> </licenseFamily>
</license> <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
</licenses> <familyName>JMock</familyName>
<licenseFamilies> </licenseFamily>
<licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
<familyName>Apache License 2.0</familyName> <familyName>DocBook 4.5</familyName>
</licenseFamily> </licenseFamily>
<licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> <licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily">
<familyName>MIT</familyName> <familyName>XHTML</familyName>
</licenseFamily> </licenseFamily>
<licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> </licenseFamilies>
<familyName>JMock</familyName> </configuration>
</licenseFamily> </plugin>
<licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> </plugins>
<familyName>DocBook 4.5</familyName> </pluginManagement>
</licenseFamily> <plugins>
<licenseFamily implementation="org.apache.rat.license.SimpleLicenseFamily"> <plugin>
<familyName>XHTML</familyName> <groupId>org.apache.maven.plugins</groupId>
</licenseFamily> <artifactId>maven-compiler-plugin</artifactId>
</licenseFamilies> </plugin>
</configuration> <plugin>
</plugin> <groupId>org.apache.maven.plugins</groupId>
</plugins> <artifactId>maven-surefire-report-plugin</artifactId>
</pluginManagement> </plugin>
<plugins> </plugins>
<plugin> </build>
<groupId>org.apache.maven.plugins</groupId> <dependencyManagement>
<artifactId>maven-compiler-plugin</artifactId> <dependencies>
</plugin> <dependency>
<plugin> <groupId>org.apache.isis.core</groupId>
<groupId>org.apache.maven.plugins</groupId> <artifactId>isis</artifactId>
<artifactId>maven-surefire-report-plugin</artifactId> <version>${isis.version}</version>
</plugin> <type>pom</type>
</plugins> <scope>import</scope>
</build> </dependency>
<dependency>
<dependencyManagement> <groupId>org.apache.isis.viewer</groupId>
<dependencies> <artifactId>isis-viewer-wicket</artifactId>
<version>${isis.version}</version>
<dependency> <type>pom</type>
<groupId>org.apache.isis.core</groupId> <scope>import</scope>
<artifactId>isis</artifactId> </dependency>
<version>${isis.version}</version> <dependency>
<type>pom</type> <groupId>org.assertj</groupId>
<scope>import</scope> <artifactId>assertj-core</artifactId>
</dependency> <version>${assertj-core.version}</version>
</dependency>
<dependency> <!-- this project's own modules -->
<groupId>org.apache.isis.viewer</groupId> <dependency>
<artifactId>isis-viewer-wicket</artifactId> <groupId>${project.groupId}</groupId>
<version>${isis.version}</version> <artifactId>naked-objects-dom</artifactId>
<type>pom</type> <version>1.25.0-SNAPSHOT</version>
<scope>import</scope> </dependency>
</dependency> <dependency>
<groupId>${project.groupId}</groupId>
<dependency> <artifactId>naked-objects-fixture</artifactId>
<groupId>org.assertj</groupId> <version>1.25.0-SNAPSHOT</version>
<artifactId>assertj-core</artifactId> </dependency>
<version>${assertj-core.version}</version> <dependency>
</dependency> <groupId>${project.groupId}</groupId>
<artifactId>naked-objects-webapp</artifactId>
<version>1.25.0-SNAPSHOT</version>
<!-- this project's own modules --> </dependency>
<dependency> </dependencies>
<groupId>${project.groupId}</groupId> </dependencyManagement>
<artifactId>naked-objects-dom</artifactId> <profiles>
<version>1.25.0-SNAPSHOT</version> <profile>
</dependency> <id>m2e</id>
<dependency> <activation>
<groupId>${project.groupId}</groupId> <property>
<artifactId>naked-objects-fixture</artifactId> <name>m2e.version</name>
<version>1.25.0-SNAPSHOT</version> </property>
</dependency> </activation>
<dependency> <build>
<groupId>${project.groupId}</groupId> <directory>target-ide</directory>
<artifactId>naked-objects-webapp</artifactId> </build>
<version>1.25.0-SNAPSHOT</version> </profile>
</dependency> </profiles>
<modules>
</dependencies> <module>dom</module>
</dependencyManagement> <module>fixture</module>
<module>integtests</module>
<module>webapp</module>
<profiles> </modules>
<profile>
<id>m2e</id>
<activation>
<property>
<name>m2e.version</name>
</property>
</activation>
<build>
<directory>target-ide</directory>
</build>
</profile>
</profiles>
<modules>
<module>dom</module>
<module>fixture</module>
<module>integtests</module>
<module>webapp</module>
</modules>
</project> </project>

View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -49,4 +50,4 @@
<option name="Maven.BeforeRunTask" enabled="true" file="C:/Apache/Isis/example/application/naked-objects/dom/pom.xml" goal="datanucleus:enhance -o" /> <option name="Maven.BeforeRunTask" enabled="true" file="C:/Apache/Isis/example/application/naked-objects/dom/pom.xml" goal="datanucleus:enhance -o" />
</method> </method>
</configuration> </configuration>
</component> </component>

View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,7 +24,8 @@
--> -->
<component name="ProjectRunConfigurationManager"> <component name="ProjectRunConfigurationManager">
s <configuration default="false" name="SimpleApp (enhance only)" type="Application" factoryName="Application"> s
<configuration default="false" name="SimpleApp (enhance only)" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="org.apache.isis.Dummy" /> <option name="MAIN_CLASS_NAME" value="org.apache.isis.Dummy" />
<option name="VM_PARAMETERS" value="" /> <option name="VM_PARAMETERS" value="" />
@ -43,4 +45,4 @@ s <configuration default="false" name="SimpleApp (enhance only)" type="Applicat
<option name="Maven.BeforeRunTask" enabled="true" file="C:/Apache/Isis/example/application/naked-objects/dom/pom.xml" goal="datanucleus:enhance -o" /> <option name="Maven.BeforeRunTask" enabled="true" file="C:/Apache/Isis/example/application/naked-objects/dom/pom.xml" goal="datanucleus:enhance -o" />
</method> </method>
</configuration> </configuration>
</component> </component>

View File

@ -23,305 +23,275 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion> <parent>
<groupId>com.iluwatar</groupId>
<parent> <artifactId>naked-objects</artifactId>
<groupId>com.iluwatar</groupId> <version>1.25.0-SNAPSHOT</version>
<artifactId>naked-objects</artifactId> </parent>
<version>1.25.0-SNAPSHOT</version> <artifactId>naked-objects-webapp</artifactId>
</parent> <description>This module 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>
<artifactId>naked-objects-webapp</artifactId> <properties>
<siteBaseDir>..</siteBaseDir>
<description>This module runs both the Wicket viewer and the Restfulobjects viewer in a single webapp configured to run using the datanucleus object store.</description> </properties>
<build>
<packaging>war</packaging> <plugins>
<plugin>
<properties> <groupId>org.mortbay.jetty</groupId>
<siteBaseDir>..</siteBaseDir> <artifactId>maven-jetty-plugin</artifactId>
</properties> </plugin>
<!-- mvn package -->
<build> <plugin>
<plugins> <groupId>org.simplericity.jettyconsole</groupId>
<plugin> <artifactId>jetty-console-maven-plugin</artifactId>
<groupId>org.mortbay.jetty</groupId> <executions>
<artifactId>maven-jetty-plugin</artifactId> <execution>
</plugin> <goals>
<goal>createconsole</goal>
<!-- mvn package --> </goals>
<plugin> <configuration>
<groupId>org.simplericity.jettyconsole</groupId> <backgroundImage>${basedir}/src/main/jettyconsole/isis-banner.png</backgroundImage>
<artifactId>jetty-console-maven-plugin</artifactId> <destinationFile>${project.build.directory}/${project.build.finalName}-jetty-console.jar</destinationFile>
<executions> </configuration>
<execution> <phase>package</phase>
<goals> </execution>
<goal>createconsole</goal> </executions>
</goals> </plugin>
<configuration> <plugin>
<backgroundImage>${basedir}/src/main/jettyconsole/isis-banner.png</backgroundImage> <groupId>org.codehaus.mojo</groupId>
<destinationFile>${project.build.directory}/${project.build.finalName}-jetty-console.jar</destinationFile> <artifactId>build-helper-maven-plugin</artifactId>
</configuration> <version>1.8</version>
<phase>package</phase> <executions>
</execution> <execution>
</executions> <phase>validate</phase>
</plugin> <goals>
<goal>maven-version</goal>
<plugin> </goals>
<groupId>org.codehaus.mojo</groupId> </execution>
<artifactId>build-helper-maven-plugin</artifactId> </executions>
<version>1.8</version> </plugin>
<executions> <plugin>
<execution> <artifactId>maven-war-plugin</artifactId>
<phase>validate</phase> <configuration>
<goals> <warName>simpleapp</warName>
<goal>maven-version</goal> <archive>
</goals> <manifest>
</execution> <addClasspath>false</addClasspath>
</executions> </manifest>
</plugin> <manifestEntries>
<Build-Time>${maven.build.timestamp}</Build-Time>
<plugin> <Build-Host>${agent.name}</Build-Host>
<artifactId>maven-war-plugin</artifactId> <Build-User>${user.name}</Build-User>
<configuration> <Build-Maven>Maven ${maven.version}</Build-Maven>
<warName>simpleapp</warName> <Build-Java>${java.version}</Build-Java>
<archive> <Build-OS>${os.name}</Build-OS>
<manifest> <Build-Label>${project.version}</Build-Label>
<addClasspath>false</addClasspath> </manifestEntries>
</manifest> </archive>
<manifestEntries> <packagingExcludes>WEB-INF/lib/isis-core-webserver*.jar,
<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.servlet-api-*.jar,
WEB-INF/lib/javax.websocket-api-*.jar, WEB-INF/lib/javax.websocket-api-*.jar,
WEB-INF/lib/jetty-all-*.jar</packagingExcludes> WEB-INF/lib/jetty-all-*.jar</packagingExcludes>
</configuration> </configuration>
</plugin> </plugin>
</plugins>
</plugins> <pluginManagement>
<pluginManagement> <plugins>
<plugins> <!--This plugin's configuration is used to store Eclipse m2e settings
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. --> only. It has no influence on the Maven build itself. -->
<plugin> <plugin>
<groupId>org.eclipse.m2e</groupId> <groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId> <artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
<configuration> <configuration>
<lifecycleMappingMetadata> <lifecycleMappingMetadata>
<pluginExecutions> <pluginExecutions>
<pluginExecution> <pluginExecution>
<pluginExecutionFilter> <pluginExecutionFilter>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<versionRange>[1.5,)</versionRange> <versionRange>[1.5,)</versionRange>
<goals> <goals>
<goal>maven-version</goal> <goal>maven-version</goal>
</goals> </goals>
</pluginExecutionFilter> </pluginExecutionFilter>
<action> <action>
<ignore/> <ignore />
</action> </action>
</pluginExecution> </pluginExecution>
</pluginExecutions> </pluginExecutions>
</lifecycleMappingMetadata> </lifecycleMappingMetadata>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
<dependencies>
<dependencies> <!-- other modules in this project -->
<dependency>
<!-- other modules in this project --> <groupId>${project.groupId}</groupId>
<dependency> <artifactId>naked-objects-dom</artifactId>
<groupId>${project.groupId}</groupId> <exclusions>
<artifactId>naked-objects-dom</artifactId> <exclusion>
<exclusions> <!-- so don't pick up transitive dependency to asm 4.0.0 -->
<exclusion> <groupId>org.datanucleus</groupId>
<!-- so don't pick up transitive dependency to asm 4.0.0 --> <artifactId>datanucleus-enhancer</artifactId>
<groupId>org.datanucleus</groupId> </exclusion>
<artifactId>datanucleus-enhancer</artifactId> </exclusions>
</exclusion> </dependency>
</exclusions> <dependency>
</dependency> <groupId>${project.groupId}</groupId>
<dependency> <artifactId>naked-objects-fixture</artifactId>
<groupId>${project.groupId}</groupId> <exclusions>
<artifactId>naked-objects-fixture</artifactId> <exclusion>
<exclusions> <!-- so don't pick up transitive dependency to asm 4.0.0 -->
<exclusion> <groupId>org.datanucleus</groupId>
<!-- so don't pick up transitive dependency to asm 4.0.0 --> <artifactId>datanucleus-enhancer</artifactId>
<groupId>org.datanucleus</groupId> </exclusion>
<artifactId>datanucleus-enhancer</artifactId> </exclusions>
</exclusion> </dependency>
</exclusions> <!-- other isis components -->
</dependency> <dependency>
<groupId>org.apache.isis.viewer</groupId>
<!-- other isis components --> <artifactId>isis-viewer-wicket-impl</artifactId>
<dependency> </dependency>
<groupId>org.apache.isis.viewer</groupId> <dependency>
<artifactId>isis-viewer-wicket-impl</artifactId> <groupId>org.apache.isis.core</groupId>
</dependency> <artifactId>isis-core-viewer-restfulobjects-server</artifactId>
<dependency> </dependency>
<groupId>org.apache.isis.core</groupId> <dependency>
<artifactId>isis-core-viewer-restfulobjects-server</artifactId> <groupId>org.apache.isis.core</groupId>
</dependency> <artifactId>isis-core-security-shiro</artifactId>
<dependency> </dependency>
<groupId>org.apache.isis.core</groupId> <!-- isis core -->
<artifactId>isis-core-security-shiro</artifactId> <dependency>
</dependency> <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-runtime</artifactId>
</dependency>
<!-- isis core --> <dependency>
<dependency> <groupId>org.apache.isis.core</groupId>
<groupId>org.apache.isis.core</groupId> <artifactId>isis-core-wrapper</artifactId>
<artifactId>isis-core-runtime</artifactId> </dependency>
</dependency> <dependency>
<dependency> <groupId>org.apache.isis.core</groupId>
<groupId>org.apache.isis.core</groupId> <artifactId>isis-core-security</artifactId>
<artifactId>isis-core-wrapper</artifactId> </dependency>
</dependency> <!-- to run using WebServer (optional) -->
<dependency> <dependency>
<groupId>org.apache.isis.core</groupId> <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-security</artifactId> <artifactId>isis-core-webserver</artifactId>
</dependency> <scope>runtime</scope>
<optional>true</optional>
</dependency>
<!-- to run using WebServer (optional) --> <dependency>
<dependency> <groupId>org.apache.geronimo.specs</groupId>
<groupId>org.apache.isis.core</groupId> <artifactId>geronimo-servlet_3.0_spec</artifactId>
<artifactId>isis-core-webserver</artifactId> </dependency>
<scope>runtime</scope> <!-- JDBC drivers (for jdo objectstore) -->
<optional>true</optional> <dependency>
</dependency> <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>junit</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId> <artifactId>junit</artifactId>
</dependency> <scope>test</scope>
</dependency>
<!-- JDBC drivers (for jdo objectstore) --> <dependency>
<dependency> <groupId>org.junit.vintage</groupId>
<groupId>org.hsqldb</groupId> <artifactId>junit-vintage-engine</artifactId>
<artifactId>hsqldb</artifactId> <scope>test</scope>
</dependency> </dependency>
</dependencies>
<dependency> <profiles>
<groupId>junit</groupId> <profile>
<artifactId>junit</artifactId> <id>self-host</id>
<scope>test</scope> <build>
</dependency> <plugins>
<!-- mvn -P self-host antrun:run -->
<dependency> <plugin>
<groupId>org.junit.vintage</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>junit-vintage-engine</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<scope>test</scope> <configuration>
</dependency> <tasks>
</dependencies> <exec executable="java" failonerror="true">
<arg value="-jar" />
<profiles> <arg value="${project.build.directory}/${project.build.finalName}-jetty-console.jar" />
<profile> </exec>
<id>self-host</id> </tasks>
<build> </configuration>
<plugins> </plugin>
<!-- mvn -P self-host antrun:run --> </plugins>
<plugin> </build>
<groupId>org.apache.maven.plugins</groupId> </profile>
<artifactId>maven-antrun-plugin</artifactId> <profile>
<configuration> <id>intellij</id>
<tasks> <activation>
<exec executable="java" failonerror="true"> <property>
<arg value="-jar" /> <name>idea.version</name>
<arg value="${project.build.directory}/${project.build.finalName}-jetty-console.jar" /> </property>
</exec> </activation>
</tasks> <dependencies>
</configuration> <dependency>
</plugin> <groupId>org.apache.geronimo.specs</groupId>
</plugins> <artifactId>geronimo-servlet_3.0_spec</artifactId>
</build> <!-- Use 'compile' so can run o.a.i.WebServer from within IntelliJ;
</profile>
<profile>
<id>intellij</id>
<activation>
<property>
<name>idea.version</name>
</property>
</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 --> can rely on servlet container to ignore this in war file -->
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
<profile> <profile>
<id>jrebel</id> <id>jrebel</id>
<properties> <properties>
<!-- as used in the rebel.xml in the dom project --> <!-- as used in the rebel.xml in the dom project -->
<target.dir>target</target.dir> <target.dir>target</target.dir>
<isis-jrebel-plugin.packagePrefix>dom.simple,org.apache.isis.objectstore.jdo.applib</isis-jrebel-plugin.packagePrefix> <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> <isis-jrebel-plugin.loggingLevel>warn</isis-jrebel-plugin.loggingLevel>
</properties> </properties>
<build> <build>
<plugins> <plugins>
<!-- mvn -P jrebel antrun:run \ -Djrebel.jar="C:/Users/Dan/.IdeaIC13/config/plugins/jr-ide-idea/lib/jrebel/jrebel.jar" <!-- 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" --> \ -Disis_jrebel_plugin.jar="C:/github/danhaywood/isis-jrebel-plugin/target/danhaywood-isis-jrebel-plugin-1.0.0-SNAPSHOT.jar" -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<configuration> <configuration>
<target> <target>
<property name="compile_classpath" refid="maven.compile.classpath" /> <property name="compile_classpath" refid="maven.compile.classpath" />
<property name="runtime_classpath" refid="maven.runtime.classpath" /> <property name="runtime_classpath" refid="maven.runtime.classpath" />
<property name="test_classpath" refid="maven.test.classpath" /> <property name="test_classpath" refid="maven.test.classpath" />
<property name="plugin_classpath" refid="maven.plugin.classpath" /> <property name="plugin_classpath" refid="maven.plugin.classpath" />
<echo message="" />
<echo message="" /> <echo message="" />
<echo message="" /> <echo message="jrebel.jar = ${jrebel.jar}" />
<echo message="jrebel.jar = ${jrebel.jar}" /> <echo message="isis_jrebel_plugin.jar = ${isis_jrebel_plugin.jar}" />
<echo message="isis_jrebel_plugin.jar = ${isis_jrebel_plugin.jar}" /> <echo message="target.dir = ${target.dir}" />
<echo message="target.dir = ${target.dir}" /> <echo message="" />
<echo message="" /> <echo message="" />
<echo message="" /> <exec executable="java" failonerror="true">
<arg value="-javaagent:${jrebel.jar}" />
<exec executable="java" failonerror="true"> <arg value="-Drebel.log=false" />
<arg value="-javaagent:${jrebel.jar}" /> <arg value="-Drebel.check_class_hash=true" />
<arg value="-Drebel.log=false" /> <arg value="-Drebel.packages_exclude=org.apache.isis" />
<arg value="-Drebel.check_class_hash=true" /> <!-- as used in the rebel.xml in the dom project -->
<arg value="-Drebel.packages_exclude=org.apache.isis" /> <arg value="-Dproject.root=${project.basedir}/.." />
<arg value="-Dtarget.dir=${target.dir}" />
<!-- as used in the rebel.xml in the dom project --> <arg value="-Drebel.plugins=${isis_jrebel_plugin.jar}" />
<arg value="-Dproject.root=${project.basedir}/.." /> <arg value="-Disis-jrebel-plugin.packagePrefix=${isis-jrebel-plugin.packagePrefix}" />
<arg value="-Dtarget.dir=${target.dir}" /> <arg value="-Disis-jrebel-plugin.loggingLevel=${isis-jrebel-plugin.loggingLevel}" />
<arg value="-XX:MaxPermSize=128m" />
<arg value="-Drebel.plugins=${isis_jrebel_plugin.jar}" /> <arg value="-classpath" />
<arg value="-Disis-jrebel-plugin.packagePrefix=${isis-jrebel-plugin.packagePrefix}" /> <arg value="${runtime_classpath}" />
<arg value="-Disis-jrebel-plugin.loggingLevel=${isis-jrebel-plugin.loggingLevel}" /> <arg value="org.apache.isis.WebServer" />
<arg value="-XX:MaxPermSize=128m" /> </exec>
<arg value="-classpath" /> </target>
<arg value="${runtime_classpath}" /> </configuration>
<arg value="org.apache.isis.WebServer" /> </plugin>
</exec> </plugins>
</target> </build>
</configuration> </profile>
</plugin> </profiles>
</plugins>
</build>
</profile>
</profiles>
</project> </project>

View File

@ -23,35 +23,25 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<web-app id="WebApp_ID" version="2.4" <web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="WebApp_ID" version="2.4" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <display-name>Simple app</display-name>
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> <welcome-file-list>
<welcome-file>about/index.html</welcome-file>
<display-name>Simple app</display-name> </welcome-file-list>
<!-- shiro security configuration -->
<welcome-file-list> <listener>
<welcome-file>about/index.html</welcome-file> <listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class>
</welcome-file-list> </listener>
<filter>
<!-- shiro security configuration --> <filter-name>ShiroFilter</filter-name>
<listener> <filter-class>org.apache.shiro.web.servlet.ShiroFilter</filter-class>
<listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class> </filter>
</listener> <filter-mapping>
<filter-name>ShiroFilter</filter-name>
<filter> <url-pattern>/*</url-pattern>
<filter-name>ShiroFilter</filter-name> </filter-mapping>
<filter-class>org.apache.shiro.web.servlet.ShiroFilter</filter-class> <!-- which configuration directory to read overloaded property files from -->
</filter> <!--
<filter-mapping>
<filter-name>ShiroFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<!-- which configuration directory to read overloaded property files from -->
<!--
Normally configuration like this should be done from outside your web Normally configuration like this should be done from outside your web
application. Especially if your configuration is not know in advance or application. Especially if your configuration is not know in advance or
if it can change depending on where the application gets deployed. if it can change depending on where the application gets deployed.
@ -71,144 +61,127 @@
<param-value>location of your config directory if fixed</param-value> <param-value>location of your config directory if fixed</param-value>
</context-param> </context-param>
--> -->
<!--
<!--
determines which additional configuration files to search for determines which additional configuration files to search for
--> -->
<context-param> <context-param>
<param-name>isis.viewers</param-name> <param-name>isis.viewers</param-name>
<param-value>wicket,restfulobjects</param-value> <param-value>wicket,restfulobjects</param-value>
</context-param> </context-param>
<!--
<!--
for diagnostics for diagnostics
--> -->
<filter> <filter>
<filter-name>IsisLogOnExceptionFilter</filter-name> <filter-name>IsisLogOnExceptionFilter</filter-name>
<filter-class>org.apache.isis.core.webapp.diagnostics.IsisLogOnExceptionFilter</filter-class> <filter-class>org.apache.isis.core.webapp.diagnostics.IsisLogOnExceptionFilter</filter-class>
</filter> </filter>
<filter-mapping> <filter-mapping>
<filter-name>IsisLogOnExceptionFilter</filter-name> <filter-name>IsisLogOnExceptionFilter</filter-name>
<url-pattern>/wicket/*</url-pattern> <url-pattern>/wicket/*</url-pattern>
</filter-mapping> </filter-mapping>
<filter-mapping> <filter-mapping>
<filter-name>IsisLogOnExceptionFilter</filter-name> <filter-name>IsisLogOnExceptionFilter</filter-name>
<url-pattern>/restful/*</url-pattern> <url-pattern>/restful/*</url-pattern>
</filter-mapping> </filter-mapping>
<!-- cache static resources for 1 day -->
<filter>
<filter-name>ResourceCachingFilter</filter-name>
<!-- cache static resources for 1 day --> <filter-class>org.apache.isis.core.webapp.content.ResourceCachingFilter</filter-class>
<filter> <init-param>
<filter-name>ResourceCachingFilter</filter-name> <param-name>CacheTime</param-name>
<filter-class>org.apache.isis.core.webapp.content.ResourceCachingFilter</filter-class> <param-value>86400</param-value>
<init-param> </init-param>
<param-name>CacheTime</param-name> </filter>
<param-value>86400</param-value> <filter-mapping>
</init-param> <filter-name>ResourceCachingFilter</filter-name>
</filter> <url-pattern>*.js</url-pattern>
<filter-mapping> </filter-mapping>
<filter-name>ResourceCachingFilter</filter-name> <filter-mapping>
<url-pattern>*.js</url-pattern> <filter-name>ResourceCachingFilter</filter-name>
</filter-mapping> <url-pattern>*.css</url-pattern>
<filter-mapping> </filter-mapping>
<filter-name>ResourceCachingFilter</filter-name> <filter-mapping>
<url-pattern>*.css</url-pattern> <filter-name>ResourceCachingFilter</filter-name>
</filter-mapping> <url-pattern>*.png</url-pattern>
<filter-mapping> </filter-mapping>
<filter-name>ResourceCachingFilter</filter-name> <filter-mapping>
<url-pattern>*.png</url-pattern> <filter-name>ResourceCachingFilter</filter-name>
</filter-mapping> <url-pattern>*.jpg</url-pattern>
<filter-mapping> </filter-mapping>
<filter-name>ResourceCachingFilter</filter-name> <filter-mapping>
<url-pattern>*.jpg</url-pattern> <filter-name>ResourceCachingFilter</filter-name>
</filter-mapping> <url-pattern>*.gif</url-pattern>
<filter-mapping> </filter-mapping>
<filter-name>ResourceCachingFilter</filter-name> <filter-mapping>
<url-pattern>*.gif</url-pattern> <filter-name>ResourceCachingFilter</filter-name>
</filter-mapping> <url-pattern>*.html</url-pattern>
<filter-mapping> </filter-mapping>
<filter-name>ResourceCachingFilter</filter-name> <filter-mapping>
<url-pattern>*.html</url-pattern> <filter-name>ResourceCachingFilter</filter-name>
</filter-mapping> <url-pattern>*.swf</url-pattern>
<filter-mapping> </filter-mapping>
<filter-name>ResourceCachingFilter</filter-name> <servlet>
<url-pattern>*.swf</url-pattern> <servlet-name>Resource</servlet-name>
</filter-mapping> <servlet-class>org.apache.isis.core.webapp.content.ResourceServlet</servlet-class>
</servlet>
<servlet> <servlet-mapping>
<servlet-name>Resource</servlet-name> <servlet-name>Resource</servlet-name>
<servlet-class>org.apache.isis.core.webapp.content.ResourceServlet</servlet-class> <url-pattern>*.css</url-pattern>
</servlet> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>Resource</servlet-name> <servlet-name>Resource</servlet-name>
<url-pattern>*.css</url-pattern> <url-pattern>*.png</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>Resource</servlet-name> <servlet-name>Resource</servlet-name>
<url-pattern>*.png</url-pattern> <url-pattern>*.jpg</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>Resource</servlet-name> <servlet-name>Resource</servlet-name>
<url-pattern>*.jpg</url-pattern> <url-pattern>*.gif</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>Resource</servlet-name> <servlet-name>Resource</servlet-name>
<url-pattern>*.gif</url-pattern> <url-pattern>*.js</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>Resource</servlet-name> <servlet-name>Resource</servlet-name>
<url-pattern>*.js</url-pattern> <url-pattern>*.html</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>Resource</servlet-name> <servlet-name>Resource</servlet-name>
<url-pattern>*.html</url-pattern> <url-pattern>*.swf</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping> <!--
<servlet-name>Resource</servlet-name>
<url-pattern>*.swf</url-pattern>
</servlet-mapping>
<!--
- -
- config specific to the wicket-viewer - config specific to the wicket-viewer
- -
--> -->
<filter> <filter>
<filter-name>WicketFilter</filter-name> <filter-name>WicketFilter</filter-name>
<filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class> <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
<init-param> <init-param>
<param-name>applicationClassName</param-name> <param-name>applicationClassName</param-name>
<param-value>domainapp.webapp.SimpleApplication</param-value> <param-value>domainapp.webapp.SimpleApplication</param-value>
</init-param> </init-param>
</filter> </filter>
<filter-mapping> <filter-mapping>
<filter-name>WicketFilter</filter-name> <filter-name>WicketFilter</filter-name>
<url-pattern>/wicket/*</url-pattern> <url-pattern>/wicket/*</url-pattern>
</filter-mapping> </filter-mapping>
<context-param>
<param-name>configuration</param-name>
<context-param> <!--
<param-name>configuration</param-name>
<!--
<param-value>deployment</param-value> <param-value>deployment</param-value>
--> -->
<param-value>development</param-value> <param-value>development</param-value>
</context-param> </context-param>
<!--
<!--
- -
- config specific to the restfulobjects-viewer - config specific to the restfulobjects-viewer
- -
--> -->
<!--
<!--
THE FOLLOWING CONFIGURATION IS NOT REQUIRED IF THE WICKET VIEWER IS IN USE. THE FOLLOWING CONFIGURATION IS NOT REQUIRED IF THE WICKET VIEWER IS IN USE.
IF THE WICKET VIEWER CONFIGURATION IS REMOVED, THEN UNCOMMENT IF THE WICKET VIEWER CONFIGURATION IS REMOVED, THEN UNCOMMENT
@ -225,72 +198,62 @@
<param-name>isis.viewers</param-name> <param-name>isis.viewers</param-name>
<param-value>restfulobjects</param-value> <param-value>restfulobjects</param-value>
</context-param> </context-param>
--> -->
<!-- bootstrap the RestEasy framework -->
<!-- bootstrap the RestEasy framework --> <listener>
<listener> <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
<listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class> </listener>
</listener> <!-- used by RestEasy to determine the JAX-RS resources and other related configuration -->
<context-param>
<!-- used by RestEasy to determine the JAX-RS resources and other related configuration --> <param-name>javax.ws.rs.Application</param-name>
<context-param> <param-value>org.apache.isis.viewer.restfulobjects.server.RestfulObjectsApplication</param-value>
<param-name>javax.ws.rs.Application</param-name> </context-param>
<param-value>org.apache.isis.viewer.restfulobjects.server.RestfulObjectsApplication</param-value> <context-param>
</context-param> <param-name>resteasy.servlet.mapping.prefix</param-name>
<param-value>/restful/</param-value>
<context-param> </context-param>
<param-name>resteasy.servlet.mapping.prefix</param-name> <!-- authenticate user, set up an Isis session -->
<param-value>/restful/</param-value> <filter>
</context-param> <filter-name>IsisSessionFilterForRestfulObjects</filter-name>
<filter-class>org.apache.isis.core.webapp.IsisSessionFilter</filter-class>
<!-- authentication required for REST -->
<!-- authenticate user, set up an Isis session --> <init-param>
<filter> <param-name>authenticationSessionStrategy</param-name>
<filter-name>IsisSessionFilterForRestfulObjects</filter-name> <param-value>org.apache.isis.viewer.restfulobjects.server.authentication.AuthenticationSessionStrategyBasicAuth</param-value>
<filter-class>org.apache.isis.core.webapp.IsisSessionFilter</filter-class> </init-param>
<!-- authentication required for REST --> <init-param>
<init-param> <!-- what to do if no session was found; we indicate to issue a 401 basic authentication challenge -->
<param-name>authenticationSessionStrategy</param-name> <param-name>whenNoSession</param-name>
<param-value>org.apache.isis.viewer.restfulobjects.server.authentication.AuthenticationSessionStrategyBasicAuth</param-value> <param-value>basicAuthChallenge</param-value>
</init-param> </init-param>
<init-param> </filter>
<!-- what to do if no session was found; we indicate to issue a 401 basic authentication challenge --> <filter-mapping>
<param-name>whenNoSession</param-name> <!-- this is mapped to the entire app; however the IsisSessionFilter will "notice" if the session filter has already been
<param-value>basicAuthChallenge</param-value>
</init-param>
</filter>
<filter-mapping>
<!-- this is mapped to the entire app; however the IsisSessionFilter will "notice" if the session filter has already been
executed for the request pipeline, and if so will do nothing --> executed for the request pipeline, and if so will do nothing -->
<filter-name>IsisSessionFilterForRestfulObjects</filter-name> <filter-name>IsisSessionFilterForRestfulObjects</filter-name>
<servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name> <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
</filter-mapping> </filter-mapping>
<filter>
<filter> <filter-name>IsisTransactionFilterForRestfulObjects</filter-name>
<filter-name>IsisTransactionFilterForRestfulObjects</filter-name> <filter-class>org.apache.isis.viewer.restfulobjects.server.webapp.IsisTransactionFilterForRestfulObjects</filter-class>
<filter-class>org.apache.isis.viewer.restfulobjects.server.webapp.IsisTransactionFilterForRestfulObjects</filter-class> </filter>
</filter> <filter-mapping>
<filter-mapping> <filter-name>IsisTransactionFilterForRestfulObjects</filter-name>
<filter-name>IsisTransactionFilterForRestfulObjects</filter-name> <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
<servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name> </filter-mapping>
</filter-mapping> <servlet>
<servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
<servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
<servlet> </servlet>
<servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name> <servlet-mapping>
<servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class> <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
</servlet> <url-pattern>/restful/*</url-pattern>
<servlet-mapping> </servlet-mapping>
<servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name> <!--
<url-pattern>/restful/*</url-pattern>
</servlet-mapping>
<!--
uncomment to use container-managed datasource; uncomment to use container-managed datasource;
for both container-managed (JTA) and non-container-managed transactions for both container-managed (JTA) and non-container-managed transactions
--> -->
<!-- <!--
<resource-ref> <resource-ref>
<description>db</description> <description>db</description>
<res-ref-name>jdbc/quickstart</res-ref-name> <res-ref-name>jdbc/quickstart</res-ref-name>
@ -298,12 +261,11 @@
<res-auth>Container</res-auth> <res-auth>Container</res-auth>
</resource-ref> </resource-ref>
--> -->
<!--
<!--
uncomment to use container-managed datasource uncomment to use container-managed datasource
with container-managed transactions (JTA). with container-managed transactions (JTA).
--> -->
<!-- <!--
<resource-ref> <resource-ref>
<description>db</description> <description>db</description>
<res-ref-name>jdbc/quickstart-nontx</res-ref-name> <res-ref-name>jdbc/quickstart-nontx</res-ref-name>
@ -311,5 +273,4 @@
<res-auth>Container</res-auth> <res-auth>Container</res-auth>
</resource-ref> </resource-ref>
--> -->
</web-app> </web-app>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,8 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <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/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.iluwatar</groupId> <groupId>com.iluwatar</groupId>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,26 +23,24 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" <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/xsd/maven-4.0.0.xsd">
xmlns="http://maven.apache.org/POM/4.0.0" <modelVersion>4.0.0</modelVersion>
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <parent>
<modelVersion>4.0.0</modelVersion> <groupId>com.iluwatar</groupId>
<parent> <artifactId>java-design-patterns</artifactId>
<groupId>com.iluwatar</groupId> <version>1.25.0-SNAPSHOT</version>
<artifactId>java-design-patterns</artifactId> </parent>
<version>1.25.0-SNAPSHOT</version> <artifactId>object-mother</artifactId>
</parent> <dependencies>
<artifactId>object-mother</artifactId> <dependency>
<dependencies> <groupId>org.junit.jupiter</groupId>
<dependency> <artifactId>junit-jupiter-engine</artifactId>
<groupId>org.junit.jupiter</groupId> <scope>test</scope>
<artifactId>junit-jupiter-engine</artifactId> </dependency>
<scope>test</scope> <dependency>
</dependency> <groupId>org.mockito</groupId>
<dependency> <artifactId>mockito-core</artifactId>
<groupId>org.mockito</groupId> <scope>test</scope>
<artifactId>mockito-core</artifactId> </dependency>
<scope>test</scope> </dependencies>
</dependency>
</dependencies>
</project> </project>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,8 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <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/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.iluwatar</groupId> <groupId>com.iluwatar</groupId>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,8 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <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/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.iluwatar</groupId> <groupId>com.iluwatar</groupId>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,54 +23,53 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion> <properties>
<properties> <maven.compiler.source>11</maven.compiler.source>
<maven.compiler.source>11</maven.compiler.source> <maven.compiler.target>11</maven.compiler.target>
<maven.compiler.target>11</maven.compiler.target> </properties>
</properties> <dependencies>
<dependencies> <dependency>
<dependency> <groupId>net.sourceforge.htmlunit</groupId>
<groupId>net.sourceforge.htmlunit</groupId> <artifactId>htmlunit</artifactId>
<artifactId>htmlunit</artifactId> <scope>test</scope>
<scope>test</scope> </dependency>
</dependency> <dependency>
<dependency> <groupId>org.junit.jupiter</groupId>
<groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter</artifactId>
<artifactId>junit-jupiter</artifactId> <version>RELEASE</version>
<version>RELEASE</version> <scope>test</scope>
<scope>test</scope> </dependency>
</dependency> </dependencies>
</dependencies> <parent>
<parent> <groupId>com.iluwatar</groupId>
<groupId>com.iluwatar</groupId> <artifactId>java-design-patterns</artifactId>
<artifactId>java-design-patterns</artifactId> <version>1.25.0-SNAPSHOT</version>
<version>1.25.0-SNAPSHOT</version> </parent>
</parent> <artifactId>page-object</artifactId>
<artifactId>page-object</artifactId> <packaging>pom</packaging>
<packaging>pom</packaging> <modules>
<modules> <module>sample-application</module>
<module>sample-application</module> <module>test-automation</module>
<module>test-automation</module> </modules>
</modules> <build>
<build> <plugins>
<plugins> <plugin>
<plugin> <groupId>org.apache.maven.plugins</groupId>
<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId>
<artifactId>maven-assembly-plugin</artifactId> <executions>
<executions> <execution>
<execution> <configuration>
<configuration> <archive>
<archive> <manifest>
<manifest> <mainClass>com.iluwatar.pageobject.App</mainClass>
<mainClass>com.iluwatar.pageobject.App</mainClass> </manifest>
</manifest> </archive>
</archive> </configuration>
</configuration> </execution>
</execution> </executions>
</executions> </plugin>
</plugin> </plugins>
</plugins> </build>
</build> </project>
</project>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,8 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>page-object</artifactId> <artifactId>page-object</artifactId>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,8 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>page-object</artifactId> <artifactId>page-object</artifactId>
@ -33,14 +32,14 @@
</parent> </parent>
<artifactId>test-automation</artifactId> <artifactId>test-automation</artifactId>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId> <artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sourceforge.htmlunit</groupId> <groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId> <artifactId>htmlunit</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,8 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <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/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.iluwatar</groupId> <groupId>com.iluwatar</groupId>

View File

@ -23,47 +23,44 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <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/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <parent>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <artifactId>java-design-patterns</artifactId>
<parent> <groupId>com.iluwatar</groupId>
<artifactId>java-design-patterns</artifactId> <version>1.25.0-SNAPSHOT</version>
<groupId>com.iluwatar</groupId> </parent>
<version>1.25.0-SNAPSHOT</version> <modelVersion>4.0.0</modelVersion>
</parent> <artifactId>partial-response</artifactId>
<modelVersion>4.0.0</modelVersion> <dependencies>
<dependency>
<artifactId>partial-response</artifactId> <groupId>org.mockito</groupId>
<dependencies> <artifactId>mockito-junit-jupiter</artifactId>
<dependency> <version>3.5.0</version>
<groupId>org.mockito</groupId> <scope>test</scope>
<artifactId>mockito-junit-jupiter</artifactId> </dependency>
<version>3.5.0</version> <dependency>
<scope>test</scope> <groupId>org.junit.jupiter</groupId>
</dependency> <artifactId>junit-jupiter-engine</artifactId>
<dependency> <scope>test</scope>
<groupId>org.junit.jupiter</groupId> </dependency>
<artifactId>junit-jupiter-engine</artifactId> </dependencies>
<scope>test</scope> <build>
</dependency> <plugins>
</dependencies> <plugin>
<build> <groupId>org.apache.maven.plugins</groupId>
<plugins> <artifactId>maven-assembly-plugin</artifactId>
<plugin> <executions>
<groupId>org.apache.maven.plugins</groupId> <execution>
<artifactId>maven-assembly-plugin</artifactId> <configuration>
<executions> <archive>
<execution> <manifest>
<configuration> <mainClass>com.iluwatar.partialresponse.App</mainClass>
<archive> </manifest>
<manifest> </archive>
<mainClass>com.iluwatar.partialresponse.App</mainClass> </configuration>
</manifest> </execution>
</archive> </executions>
</configuration> </plugin>
</execution> </plugins>
</executions> </build>
</plugin> </project>
</plugins>
</build>
</project>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,44 +23,43 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <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/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion> <parent>
<parent> <groupId>com.iluwatar</groupId>
<groupId>com.iluwatar</groupId> <artifactId>java-design-patterns</artifactId>
<artifactId>java-design-patterns</artifactId> <version>1.25.0-SNAPSHOT</version>
<version>1.25.0-SNAPSHOT</version> </parent>
</parent> <artifactId>pipeline</artifactId>
<artifactId>pipeline</artifactId> <dependencies>
<dependencies> <dependency>
<dependency> <groupId>org.junit.jupiter</groupId>
<groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId>
<artifactId>junit-jupiter-engine</artifactId> <scope>test</scope>
<scope>test</scope> </dependency>
</dependency> <dependency>
<dependency> <groupId>org.mockito</groupId>
<groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId>
<artifactId>mockito-core</artifactId> <scope>test</scope>
<scope>test</scope> </dependency>
</dependency> </dependencies>
</dependencies> <build>
<build> <plugins>
<plugins> <plugin>
<plugin> <groupId>org.apache.maven.plugins</groupId>
<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId>
<artifactId>maven-assembly-plugin</artifactId> <executions>
<executions> <execution>
<execution> <configuration>
<configuration> <archive>
<archive> <manifest>
<manifest> <mainClass>com.iluwatar.pipeline.App</mainClass>
<mainClass>com.iluwatar.pipeline.App</mainClass> </manifest>
</manifest> </archive>
</archive> </configuration>
</configuration> </execution>
</execution> </executions>
</executions> </plugin>
</plugin> </plugins>
</plugins> </build>
</build>
</project> </project>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,8 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <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/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.iluwatar</groupId> <groupId>com.iluwatar</groupId>

1103
pom.xml

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -22,42 +23,40 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <modelVersion>4.0.0</modelVersion>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent>
<modelVersion>4.0.0</modelVersion> <groupId>com.iluwatar</groupId>
<parent> <artifactId>java-design-patterns</artifactId>
<groupId>com.iluwatar</groupId> <version>1.25.0-SNAPSHOT</version>
<artifactId>java-design-patterns</artifactId> </parent>
<version>1.25.0-SNAPSHOT</version> <artifactId>presentation</artifactId>
</parent> <dependencies>
<artifactId>presentation</artifactId> <dependency>
<dependencies> <groupId>org.junit.jupiter</groupId>
<dependency> <artifactId>junit-jupiter-engine</artifactId>
<groupId>org.junit.jupiter</groupId> <scope>test</scope>
<artifactId>junit-jupiter-engine</artifactId> </dependency>
<scope>test</scope> </dependencies>
</dependency> <build>
</dependencies> <plugins>
<build> <!-- Maven assembly plugin is invoked with default setting which we have
<plugins>
<!-- Maven assembly plugin is invoked with default setting which we have
in parent pom and specifying the class having main method --> in parent pom and specifying the class having main method -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<configuration> <configuration>
<archive> <archive>
<manifest> <manifest>
<mainClass>com.iluwatar.presentation.App</mainClass> <mainClass>com.iluwatar.presentation.App</mainClass>
</manifest> </manifest>
</archive> </archive>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

View File

@ -23,41 +23,38 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" <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/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <modelVersion>4.0.0</modelVersion>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <artifactId>priority-queue</artifactId>
<modelVersion>4.0.0</modelVersion> <parent>
<artifactId>priority-queue</artifactId> <groupId>com.iluwatar</groupId>
<parent> <artifactId>java-design-patterns</artifactId>
<groupId>com.iluwatar</groupId> <version>1.25.0-SNAPSHOT</version>
<artifactId>java-design-patterns</artifactId> </parent>
<version>1.25.0-SNAPSHOT</version> <dependencies>
</parent> <dependency>
<groupId>org.junit.jupiter</groupId>
<dependencies> <artifactId>junit-jupiter-engine</artifactId>
<dependency> <scope>test</scope>
<groupId>org.junit.jupiter</groupId> </dependency>
<artifactId>junit-jupiter-engine</artifactId> </dependencies>
<scope>test</scope> <build>
</dependency> <plugins>
</dependencies> <plugin>
<build> <groupId>org.apache.maven.plugins</groupId>
<plugins> <artifactId>maven-assembly-plugin</artifactId>
<plugin> <executions>
<groupId>org.apache.maven.plugins</groupId> <execution>
<artifactId>maven-assembly-plugin</artifactId> <configuration>
<executions> <archive>
<execution> <manifest>
<configuration> <mainClass>com.iluwatar.priority.queue.Application</mainClass>
<archive> </manifest>
<manifest> </archive>
<mainClass>com.iluwatar.priority.queue.Application</mainClass> </configuration>
</manifest> </execution>
</archive> </executions>
</configuration> </plugin>
</execution> </plugins>
</executions> </build>
</plugin> </project>
</plugins>
</build>
</project>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,8 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <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/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.iluwatar</groupId> <groupId>com.iluwatar</groupId>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,8 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <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/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.iluwatar</groupId> <groupId>com.iluwatar</groupId>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,8 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <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/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.iluwatar</groupId> <groupId>com.iluwatar</groupId>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,8 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <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/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.iluwatar</groupId> <groupId>com.iluwatar</groupId>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,8 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <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/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.iluwatar</groupId> <groupId>com.iluwatar</groupId>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,8 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <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/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.iluwatar</groupId> <groupId>com.iluwatar</groupId>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
The MIT License The MIT License
@ -23,8 +23,7 @@
THE SOFTWARE. THE SOFTWARE.
--> -->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <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/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.iluwatar</groupId> <groupId>com.iluwatar</groupId>