committed by
					
						
						GitHub
					
				
			
			
				
	
			
			
			
						parent
						
							656b441e29
						
					
				
				
					commit
					2c93c81cf9
				
			@@ -1,3 +1,4 @@
 | 
			
		||||
<?xml version="1.0" encoding="UTF-8"?>
 | 
			
		||||
<!--
 | 
			
		||||
 | 
			
		||||
    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" />
 | 
			
		||||
    </method>
 | 
			
		||||
  </configuration>
 | 
			
		||||
</component>
 | 
			
		||||
</component>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,4 @@
 | 
			
		||||
<?xml version="1.0" encoding="UTF-8"?>
 | 
			
		||||
<!--
 | 
			
		||||
 | 
			
		||||
    The MIT License
 | 
			
		||||
@@ -23,7 +24,8 @@
 | 
			
		||||
 | 
			
		||||
-->
 | 
			
		||||
<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" />
 | 
			
		||||
    <option name="MAIN_CLASS_NAME" value="org.apache.isis.Dummy" />
 | 
			
		||||
    <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" />
 | 
			
		||||
    </method>
 | 
			
		||||
  </configuration>
 | 
			
		||||
</component>
 | 
			
		||||
</component>
 | 
			
		||||
 
 | 
			
		||||
@@ -23,305 +23,275 @@
 | 
			
		||||
    THE SOFTWARE.
 | 
			
		||||
 | 
			
		||||
-->
 | 
			
		||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 | 
			
		||||
	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 | 
			
		||||
	<modelVersion>4.0.0</modelVersion>
 | 
			
		||||
 | 
			
		||||
	<parent>
 | 
			
		||||
		<groupId>com.iluwatar</groupId>
 | 
			
		||||
		<artifactId>naked-objects</artifactId>
 | 
			
		||||
		<version>1.25.0-SNAPSHOT</version>
 | 
			
		||||
	</parent>
 | 
			
		||||
 | 
			
		||||
	<artifactId>naked-objects-webapp</artifactId>
 | 
			
		||||
 | 
			
		||||
	<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>
 | 
			
		||||
 | 
			
		||||
	<properties>
 | 
			
		||||
		<siteBaseDir>..</siteBaseDir>
 | 
			
		||||
	</properties>
 | 
			
		||||
 | 
			
		||||
	<build>
 | 
			
		||||
		<plugins>
 | 
			
		||||
			<plugin>
 | 
			
		||||
				<groupId>org.mortbay.jetty</groupId>
 | 
			
		||||
				<artifactId>maven-jetty-plugin</artifactId>
 | 
			
		||||
			</plugin>
 | 
			
		||||
 | 
			
		||||
			<!-- mvn package -->
 | 
			
		||||
			<plugin>
 | 
			
		||||
				<groupId>org.simplericity.jettyconsole</groupId>
 | 
			
		||||
				<artifactId>jetty-console-maven-plugin</artifactId>
 | 
			
		||||
				<executions>
 | 
			
		||||
					<execution>
 | 
			
		||||
						<goals>
 | 
			
		||||
							<goal>createconsole</goal>
 | 
			
		||||
						</goals>
 | 
			
		||||
						<configuration>
 | 
			
		||||
							<backgroundImage>${basedir}/src/main/jettyconsole/isis-banner.png</backgroundImage>
 | 
			
		||||
							<destinationFile>${project.build.directory}/${project.build.finalName}-jetty-console.jar</destinationFile>
 | 
			
		||||
						</configuration>
 | 
			
		||||
						<phase>package</phase>
 | 
			
		||||
					</execution>
 | 
			
		||||
				</executions>
 | 
			
		||||
			</plugin>
 | 
			
		||||
 | 
			
		||||
			<plugin>
 | 
			
		||||
				<groupId>org.codehaus.mojo</groupId>
 | 
			
		||||
				<artifactId>build-helper-maven-plugin</artifactId>
 | 
			
		||||
				<version>1.8</version>
 | 
			
		||||
				<executions>
 | 
			
		||||
					<execution>
 | 
			
		||||
						<phase>validate</phase>
 | 
			
		||||
						<goals>
 | 
			
		||||
							<goal>maven-version</goal>
 | 
			
		||||
						</goals>
 | 
			
		||||
					</execution>
 | 
			
		||||
				</executions>
 | 
			
		||||
			</plugin>
 | 
			
		||||
 | 
			
		||||
			<plugin>
 | 
			
		||||
				<artifactId>maven-war-plugin</artifactId>
 | 
			
		||||
				<configuration>
 | 
			
		||||
					<warName>simpleapp</warName>
 | 
			
		||||
					<archive>
 | 
			
		||||
						<manifest>
 | 
			
		||||
							<addClasspath>false</addClasspath>
 | 
			
		||||
						</manifest>
 | 
			
		||||
						<manifestEntries>
 | 
			
		||||
							<Build-Time>${maven.build.timestamp}</Build-Time>
 | 
			
		||||
							<Build-Host>${agent.name}</Build-Host>
 | 
			
		||||
							<Build-User>${user.name}</Build-User>
 | 
			
		||||
							<Build-Maven>Maven ${maven.version}</Build-Maven>
 | 
			
		||||
							<Build-Java>${java.version}</Build-Java>
 | 
			
		||||
							<Build-OS>${os.name}</Build-OS>
 | 
			
		||||
							<Build-Label>${project.version}</Build-Label>
 | 
			
		||||
						</manifestEntries>
 | 
			
		||||
					</archive>
 | 
			
		||||
					<packagingExcludes>WEB-INF/lib/isis-core-webserver*.jar,
 | 
			
		||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 | 
			
		||||
  <modelVersion>4.0.0</modelVersion>
 | 
			
		||||
  <parent>
 | 
			
		||||
    <groupId>com.iluwatar</groupId>
 | 
			
		||||
    <artifactId>naked-objects</artifactId>
 | 
			
		||||
    <version>1.25.0-SNAPSHOT</version>
 | 
			
		||||
  </parent>
 | 
			
		||||
  <artifactId>naked-objects-webapp</artifactId>
 | 
			
		||||
  <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>
 | 
			
		||||
  <properties>
 | 
			
		||||
    <siteBaseDir>..</siteBaseDir>
 | 
			
		||||
  </properties>
 | 
			
		||||
  <build>
 | 
			
		||||
    <plugins>
 | 
			
		||||
      <plugin>
 | 
			
		||||
        <groupId>org.mortbay.jetty</groupId>
 | 
			
		||||
        <artifactId>maven-jetty-plugin</artifactId>
 | 
			
		||||
      </plugin>
 | 
			
		||||
      <!-- mvn package -->
 | 
			
		||||
      <plugin>
 | 
			
		||||
        <groupId>org.simplericity.jettyconsole</groupId>
 | 
			
		||||
        <artifactId>jetty-console-maven-plugin</artifactId>
 | 
			
		||||
        <executions>
 | 
			
		||||
          <execution>
 | 
			
		||||
            <goals>
 | 
			
		||||
              <goal>createconsole</goal>
 | 
			
		||||
            </goals>
 | 
			
		||||
            <configuration>
 | 
			
		||||
              <backgroundImage>${basedir}/src/main/jettyconsole/isis-banner.png</backgroundImage>
 | 
			
		||||
              <destinationFile>${project.build.directory}/${project.build.finalName}-jetty-console.jar</destinationFile>
 | 
			
		||||
            </configuration>
 | 
			
		||||
            <phase>package</phase>
 | 
			
		||||
          </execution>
 | 
			
		||||
        </executions>
 | 
			
		||||
      </plugin>
 | 
			
		||||
      <plugin>
 | 
			
		||||
        <groupId>org.codehaus.mojo</groupId>
 | 
			
		||||
        <artifactId>build-helper-maven-plugin</artifactId>
 | 
			
		||||
        <version>1.8</version>
 | 
			
		||||
        <executions>
 | 
			
		||||
          <execution>
 | 
			
		||||
            <phase>validate</phase>
 | 
			
		||||
            <goals>
 | 
			
		||||
              <goal>maven-version</goal>
 | 
			
		||||
            </goals>
 | 
			
		||||
          </execution>
 | 
			
		||||
        </executions>
 | 
			
		||||
      </plugin>
 | 
			
		||||
      <plugin>
 | 
			
		||||
        <artifactId>maven-war-plugin</artifactId>
 | 
			
		||||
        <configuration>
 | 
			
		||||
          <warName>simpleapp</warName>
 | 
			
		||||
          <archive>
 | 
			
		||||
            <manifest>
 | 
			
		||||
              <addClasspath>false</addClasspath>
 | 
			
		||||
            </manifest>
 | 
			
		||||
            <manifestEntries>
 | 
			
		||||
              <Build-Time>${maven.build.timestamp}</Build-Time>
 | 
			
		||||
              <Build-Host>${agent.name}</Build-Host>
 | 
			
		||||
              <Build-User>${user.name}</Build-User>
 | 
			
		||||
              <Build-Maven>Maven ${maven.version}</Build-Maven>
 | 
			
		||||
              <Build-Java>${java.version}</Build-Java>
 | 
			
		||||
              <Build-OS>${os.name}</Build-OS>
 | 
			
		||||
              <Build-Label>${project.version}</Build-Label>
 | 
			
		||||
            </manifestEntries>
 | 
			
		||||
          </archive>
 | 
			
		||||
          <packagingExcludes>WEB-INF/lib/isis-core-webserver*.jar,
 | 
			
		||||
						WEB-INF/lib/javax.servlet-api-*.jar,
 | 
			
		||||
						WEB-INF/lib/javax.websocket-api-*.jar,
 | 
			
		||||
						WEB-INF/lib/jetty-all-*.jar</packagingExcludes>
 | 
			
		||||
				</configuration>
 | 
			
		||||
			</plugin>
 | 
			
		||||
 | 
			
		||||
		</plugins>
 | 
			
		||||
		<pluginManagement>
 | 
			
		||||
			<plugins>
 | 
			
		||||
				<!--This plugin's configuration is used to store Eclipse m2e settings 
 | 
			
		||||
        </configuration>
 | 
			
		||||
      </plugin>
 | 
			
		||||
    </plugins>
 | 
			
		||||
    <pluginManagement>
 | 
			
		||||
      <plugins>
 | 
			
		||||
        <!--This plugin's configuration is used to store Eclipse m2e settings 
 | 
			
		||||
					only. It has no influence on the Maven build itself. -->
 | 
			
		||||
				<plugin>
 | 
			
		||||
					<groupId>org.eclipse.m2e</groupId>
 | 
			
		||||
					<artifactId>lifecycle-mapping</artifactId>
 | 
			
		||||
					<version>1.0.0</version>
 | 
			
		||||
					<configuration>
 | 
			
		||||
						<lifecycleMappingMetadata>
 | 
			
		||||
							<pluginExecutions>
 | 
			
		||||
								<pluginExecution>
 | 
			
		||||
									<pluginExecutionFilter>
 | 
			
		||||
										<groupId>org.codehaus.mojo</groupId>
 | 
			
		||||
										<artifactId>build-helper-maven-plugin</artifactId>
 | 
			
		||||
										<versionRange>[1.5,)</versionRange>
 | 
			
		||||
										<goals>
 | 
			
		||||
											<goal>maven-version</goal>
 | 
			
		||||
										</goals>
 | 
			
		||||
									</pluginExecutionFilter>
 | 
			
		||||
									<action>
 | 
			
		||||
										<ignore/>
 | 
			
		||||
									</action>
 | 
			
		||||
								</pluginExecution>
 | 
			
		||||
							</pluginExecutions>
 | 
			
		||||
						</lifecycleMappingMetadata>
 | 
			
		||||
					</configuration>
 | 
			
		||||
				</plugin>
 | 
			
		||||
			</plugins>
 | 
			
		||||
		</pluginManagement>
 | 
			
		||||
	</build>
 | 
			
		||||
 | 
			
		||||
	<dependencies>
 | 
			
		||||
 | 
			
		||||
		<!-- other modules in this project -->
 | 
			
		||||
		<dependency>
 | 
			
		||||
			<groupId>${project.groupId}</groupId>
 | 
			
		||||
			<artifactId>naked-objects-dom</artifactId>
 | 
			
		||||
			<exclusions>
 | 
			
		||||
				<exclusion>
 | 
			
		||||
					<!-- so don't pick up transitive dependency to asm 4.0.0 -->
 | 
			
		||||
					<groupId>org.datanucleus</groupId>
 | 
			
		||||
					<artifactId>datanucleus-enhancer</artifactId>
 | 
			
		||||
				</exclusion>
 | 
			
		||||
			</exclusions>
 | 
			
		||||
		</dependency>
 | 
			
		||||
		<dependency>
 | 
			
		||||
			<groupId>${project.groupId}</groupId>
 | 
			
		||||
			<artifactId>naked-objects-fixture</artifactId>
 | 
			
		||||
			<exclusions>
 | 
			
		||||
				<exclusion>
 | 
			
		||||
					<!-- so don't pick up transitive dependency to asm 4.0.0 -->
 | 
			
		||||
					<groupId>org.datanucleus</groupId>
 | 
			
		||||
					<artifactId>datanucleus-enhancer</artifactId>
 | 
			
		||||
				</exclusion>
 | 
			
		||||
			</exclusions>
 | 
			
		||||
		</dependency>
 | 
			
		||||
 | 
			
		||||
		<!-- other isis components -->
 | 
			
		||||
		<dependency>
 | 
			
		||||
			<groupId>org.apache.isis.viewer</groupId>
 | 
			
		||||
			<artifactId>isis-viewer-wicket-impl</artifactId>
 | 
			
		||||
		</dependency>
 | 
			
		||||
		<dependency>
 | 
			
		||||
			<groupId>org.apache.isis.core</groupId>
 | 
			
		||||
			<artifactId>isis-core-viewer-restfulobjects-server</artifactId>
 | 
			
		||||
		</dependency>
 | 
			
		||||
		<dependency>
 | 
			
		||||
			<groupId>org.apache.isis.core</groupId>
 | 
			
		||||
			<artifactId>isis-core-security-shiro</artifactId>
 | 
			
		||||
		</dependency>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		<!-- isis core -->
 | 
			
		||||
		<dependency>
 | 
			
		||||
			<groupId>org.apache.isis.core</groupId>
 | 
			
		||||
			<artifactId>isis-core-runtime</artifactId>
 | 
			
		||||
		</dependency>
 | 
			
		||||
		<dependency>
 | 
			
		||||
			<groupId>org.apache.isis.core</groupId>
 | 
			
		||||
			<artifactId>isis-core-wrapper</artifactId>
 | 
			
		||||
		</dependency>
 | 
			
		||||
		<dependency>
 | 
			
		||||
			<groupId>org.apache.isis.core</groupId>
 | 
			
		||||
			<artifactId>isis-core-security</artifactId>
 | 
			
		||||
		</dependency>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		<!-- to run using WebServer (optional) -->
 | 
			
		||||
		<dependency>
 | 
			
		||||
			<groupId>org.apache.isis.core</groupId>
 | 
			
		||||
			<artifactId>isis-core-webserver</artifactId>
 | 
			
		||||
			<scope>runtime</scope>
 | 
			
		||||
			<optional>true</optional>
 | 
			
		||||
		</dependency>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		<dependency>
 | 
			
		||||
			<groupId>org.apache.geronimo.specs</groupId>
 | 
			
		||||
			<artifactId>geronimo-servlet_3.0_spec</artifactId>
 | 
			
		||||
		</dependency>
 | 
			
		||||
 | 
			
		||||
		<!-- JDBC drivers (for jdo objectstore) -->
 | 
			
		||||
		<dependency>
 | 
			
		||||
			<groupId>org.hsqldb</groupId>
 | 
			
		||||
			<artifactId>hsqldb</artifactId>
 | 
			
		||||
		</dependency>
 | 
			
		||||
 | 
			
		||||
		<dependency>
 | 
			
		||||
			<groupId>junit</groupId>
 | 
			
		||||
			<artifactId>junit</artifactId>
 | 
			
		||||
			<scope>test</scope>
 | 
			
		||||
		</dependency>
 | 
			
		||||
 | 
			
		||||
		<dependency>
 | 
			
		||||
			<groupId>org.junit.vintage</groupId>
 | 
			
		||||
			<artifactId>junit-vintage-engine</artifactId>
 | 
			
		||||
			<scope>test</scope>
 | 
			
		||||
		</dependency>
 | 
			
		||||
	</dependencies>
 | 
			
		||||
 | 
			
		||||
	<profiles>
 | 
			
		||||
		<profile>
 | 
			
		||||
			<id>self-host</id>
 | 
			
		||||
			<build>
 | 
			
		||||
				<plugins>
 | 
			
		||||
					<!-- mvn -P self-host antrun:run -->
 | 
			
		||||
					<plugin>
 | 
			
		||||
						<groupId>org.apache.maven.plugins</groupId>
 | 
			
		||||
						<artifactId>maven-antrun-plugin</artifactId>
 | 
			
		||||
						<configuration>
 | 
			
		||||
							<tasks>
 | 
			
		||||
								<exec executable="java" failonerror="true">
 | 
			
		||||
									<arg value="-jar" />
 | 
			
		||||
                                    <arg value="${project.build.directory}/${project.build.finalName}-jetty-console.jar" />
 | 
			
		||||
								</exec>
 | 
			
		||||
							</tasks>
 | 
			
		||||
						</configuration>
 | 
			
		||||
					</plugin>
 | 
			
		||||
				</plugins>
 | 
			
		||||
			</build>
 | 
			
		||||
		</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; 
 | 
			
		||||
        <plugin>
 | 
			
		||||
          <groupId>org.eclipse.m2e</groupId>
 | 
			
		||||
          <artifactId>lifecycle-mapping</artifactId>
 | 
			
		||||
          <version>1.0.0</version>
 | 
			
		||||
          <configuration>
 | 
			
		||||
            <lifecycleMappingMetadata>
 | 
			
		||||
              <pluginExecutions>
 | 
			
		||||
                <pluginExecution>
 | 
			
		||||
                  <pluginExecutionFilter>
 | 
			
		||||
                    <groupId>org.codehaus.mojo</groupId>
 | 
			
		||||
                    <artifactId>build-helper-maven-plugin</artifactId>
 | 
			
		||||
                    <versionRange>[1.5,)</versionRange>
 | 
			
		||||
                    <goals>
 | 
			
		||||
                      <goal>maven-version</goal>
 | 
			
		||||
                    </goals>
 | 
			
		||||
                  </pluginExecutionFilter>
 | 
			
		||||
                  <action>
 | 
			
		||||
                    <ignore />
 | 
			
		||||
                  </action>
 | 
			
		||||
                </pluginExecution>
 | 
			
		||||
              </pluginExecutions>
 | 
			
		||||
            </lifecycleMappingMetadata>
 | 
			
		||||
          </configuration>
 | 
			
		||||
        </plugin>
 | 
			
		||||
      </plugins>
 | 
			
		||||
    </pluginManagement>
 | 
			
		||||
  </build>
 | 
			
		||||
  <dependencies>
 | 
			
		||||
    <!-- other modules in this project -->
 | 
			
		||||
    <dependency>
 | 
			
		||||
      <groupId>${project.groupId}</groupId>
 | 
			
		||||
      <artifactId>naked-objects-dom</artifactId>
 | 
			
		||||
      <exclusions>
 | 
			
		||||
        <exclusion>
 | 
			
		||||
          <!-- so don't pick up transitive dependency to asm 4.0.0 -->
 | 
			
		||||
          <groupId>org.datanucleus</groupId>
 | 
			
		||||
          <artifactId>datanucleus-enhancer</artifactId>
 | 
			
		||||
        </exclusion>
 | 
			
		||||
      </exclusions>
 | 
			
		||||
    </dependency>
 | 
			
		||||
    <dependency>
 | 
			
		||||
      <groupId>${project.groupId}</groupId>
 | 
			
		||||
      <artifactId>naked-objects-fixture</artifactId>
 | 
			
		||||
      <exclusions>
 | 
			
		||||
        <exclusion>
 | 
			
		||||
          <!-- so don't pick up transitive dependency to asm 4.0.0 -->
 | 
			
		||||
          <groupId>org.datanucleus</groupId>
 | 
			
		||||
          <artifactId>datanucleus-enhancer</artifactId>
 | 
			
		||||
        </exclusion>
 | 
			
		||||
      </exclusions>
 | 
			
		||||
    </dependency>
 | 
			
		||||
    <!-- other isis components -->
 | 
			
		||||
    <dependency>
 | 
			
		||||
      <groupId>org.apache.isis.viewer</groupId>
 | 
			
		||||
      <artifactId>isis-viewer-wicket-impl</artifactId>
 | 
			
		||||
    </dependency>
 | 
			
		||||
    <dependency>
 | 
			
		||||
      <groupId>org.apache.isis.core</groupId>
 | 
			
		||||
      <artifactId>isis-core-viewer-restfulobjects-server</artifactId>
 | 
			
		||||
    </dependency>
 | 
			
		||||
    <dependency>
 | 
			
		||||
      <groupId>org.apache.isis.core</groupId>
 | 
			
		||||
      <artifactId>isis-core-security-shiro</artifactId>
 | 
			
		||||
    </dependency>
 | 
			
		||||
    <!-- isis core -->
 | 
			
		||||
    <dependency>
 | 
			
		||||
      <groupId>org.apache.isis.core</groupId>
 | 
			
		||||
      <artifactId>isis-core-runtime</artifactId>
 | 
			
		||||
    </dependency>
 | 
			
		||||
    <dependency>
 | 
			
		||||
      <groupId>org.apache.isis.core</groupId>
 | 
			
		||||
      <artifactId>isis-core-wrapper</artifactId>
 | 
			
		||||
    </dependency>
 | 
			
		||||
    <dependency>
 | 
			
		||||
      <groupId>org.apache.isis.core</groupId>
 | 
			
		||||
      <artifactId>isis-core-security</artifactId>
 | 
			
		||||
    </dependency>
 | 
			
		||||
    <!-- to run using WebServer (optional) -->
 | 
			
		||||
    <dependency>
 | 
			
		||||
      <groupId>org.apache.isis.core</groupId>
 | 
			
		||||
      <artifactId>isis-core-webserver</artifactId>
 | 
			
		||||
      <scope>runtime</scope>
 | 
			
		||||
      <optional>true</optional>
 | 
			
		||||
    </dependency>
 | 
			
		||||
    <dependency>
 | 
			
		||||
      <groupId>org.apache.geronimo.specs</groupId>
 | 
			
		||||
      <artifactId>geronimo-servlet_3.0_spec</artifactId>
 | 
			
		||||
    </dependency>
 | 
			
		||||
    <!-- JDBC drivers (for jdo objectstore) -->
 | 
			
		||||
    <dependency>
 | 
			
		||||
      <groupId>org.hsqldb</groupId>
 | 
			
		||||
      <artifactId>hsqldb</artifactId>
 | 
			
		||||
    </dependency>
 | 
			
		||||
    <dependency>
 | 
			
		||||
      <groupId>junit</groupId>
 | 
			
		||||
      <artifactId>junit</artifactId>
 | 
			
		||||
      <scope>test</scope>
 | 
			
		||||
    </dependency>
 | 
			
		||||
    <dependency>
 | 
			
		||||
      <groupId>org.junit.vintage</groupId>
 | 
			
		||||
      <artifactId>junit-vintage-engine</artifactId>
 | 
			
		||||
      <scope>test</scope>
 | 
			
		||||
    </dependency>
 | 
			
		||||
  </dependencies>
 | 
			
		||||
  <profiles>
 | 
			
		||||
    <profile>
 | 
			
		||||
      <id>self-host</id>
 | 
			
		||||
      <build>
 | 
			
		||||
        <plugins>
 | 
			
		||||
          <!-- mvn -P self-host antrun:run -->
 | 
			
		||||
          <plugin>
 | 
			
		||||
            <groupId>org.apache.maven.plugins</groupId>
 | 
			
		||||
            <artifactId>maven-antrun-plugin</artifactId>
 | 
			
		||||
            <configuration>
 | 
			
		||||
              <tasks>
 | 
			
		||||
                <exec executable="java" failonerror="true">
 | 
			
		||||
                  <arg value="-jar" />
 | 
			
		||||
                  <arg value="${project.build.directory}/${project.build.finalName}-jetty-console.jar" />
 | 
			
		||||
                </exec>
 | 
			
		||||
              </tasks>
 | 
			
		||||
            </configuration>
 | 
			
		||||
          </plugin>
 | 
			
		||||
        </plugins>
 | 
			
		||||
      </build>
 | 
			
		||||
    </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 -->
 | 
			
		||||
					<scope>compile</scope>
 | 
			
		||||
				</dependency>
 | 
			
		||||
			</dependencies>
 | 
			
		||||
		</profile>
 | 
			
		||||
		<profile>
 | 
			
		||||
			<id>jrebel</id>
 | 
			
		||||
			<properties>
 | 
			
		||||
				<!-- as used in the rebel.xml in the dom project -->
 | 
			
		||||
				<target.dir>target</target.dir>
 | 
			
		||||
				<isis-jrebel-plugin.packagePrefix>dom.simple,org.apache.isis.objectstore.jdo.applib</isis-jrebel-plugin.packagePrefix>
 | 
			
		||||
				<isis-jrebel-plugin.loggingLevel>warn</isis-jrebel-plugin.loggingLevel>
 | 
			
		||||
			</properties>
 | 
			
		||||
			<build>
 | 
			
		||||
				<plugins>
 | 
			
		||||
					<!-- mvn -P jrebel antrun:run \ -Djrebel.jar="C:/Users/Dan/.IdeaIC13/config/plugins/jr-ide-idea/lib/jrebel/jrebel.jar" 
 | 
			
		||||
          <scope>compile</scope>
 | 
			
		||||
        </dependency>
 | 
			
		||||
      </dependencies>
 | 
			
		||||
    </profile>
 | 
			
		||||
    <profile>
 | 
			
		||||
      <id>jrebel</id>
 | 
			
		||||
      <properties>
 | 
			
		||||
        <!-- as used in the rebel.xml in the dom project -->
 | 
			
		||||
        <target.dir>target</target.dir>
 | 
			
		||||
        <isis-jrebel-plugin.packagePrefix>dom.simple,org.apache.isis.objectstore.jdo.applib</isis-jrebel-plugin.packagePrefix>
 | 
			
		||||
        <isis-jrebel-plugin.loggingLevel>warn</isis-jrebel-plugin.loggingLevel>
 | 
			
		||||
      </properties>
 | 
			
		||||
      <build>
 | 
			
		||||
        <plugins>
 | 
			
		||||
          <!-- mvn -P jrebel antrun:run \ -Djrebel.jar="C:/Users/Dan/.IdeaIC13/config/plugins/jr-ide-idea/lib/jrebel/jrebel.jar" 
 | 
			
		||||
						\ -Disis_jrebel_plugin.jar="C:/github/danhaywood/isis-jrebel-plugin/target/danhaywood-isis-jrebel-plugin-1.0.0-SNAPSHOT.jar" -->
 | 
			
		||||
					<plugin>
 | 
			
		||||
						<groupId>org.apache.maven.plugins</groupId>
 | 
			
		||||
						<artifactId>maven-antrun-plugin</artifactId>
 | 
			
		||||
						<configuration>
 | 
			
		||||
							<target>
 | 
			
		||||
								<property name="compile_classpath" refid="maven.compile.classpath" />
 | 
			
		||||
								<property name="runtime_classpath" refid="maven.runtime.classpath" />
 | 
			
		||||
								<property name="test_classpath" refid="maven.test.classpath" />
 | 
			
		||||
								<property name="plugin_classpath" refid="maven.plugin.classpath" />
 | 
			
		||||
 | 
			
		||||
								<echo message="" />
 | 
			
		||||
								<echo message="" />
 | 
			
		||||
								<echo message="jrebel.jar             = ${jrebel.jar}" />
 | 
			
		||||
								<echo message="isis_jrebel_plugin.jar = ${isis_jrebel_plugin.jar}" />
 | 
			
		||||
								<echo message="target.dir             = ${target.dir}" />
 | 
			
		||||
								<echo message="" />
 | 
			
		||||
								<echo message="" />
 | 
			
		||||
 | 
			
		||||
								<exec executable="java" failonerror="true">
 | 
			
		||||
									<arg value="-javaagent:${jrebel.jar}" />
 | 
			
		||||
									<arg value="-Drebel.log=false" />
 | 
			
		||||
									<arg value="-Drebel.check_class_hash=true" />
 | 
			
		||||
									<arg value="-Drebel.packages_exclude=org.apache.isis" />
 | 
			
		||||
 | 
			
		||||
									<!-- as used in the rebel.xml in the dom project -->
 | 
			
		||||
									<arg value="-Dproject.root=${project.basedir}/.." />
 | 
			
		||||
									<arg value="-Dtarget.dir=${target.dir}" />
 | 
			
		||||
 | 
			
		||||
									<arg value="-Drebel.plugins=${isis_jrebel_plugin.jar}" />
 | 
			
		||||
                                    <arg value="-Disis-jrebel-plugin.packagePrefix=${isis-jrebel-plugin.packagePrefix}" />
 | 
			
		||||
                                    <arg value="-Disis-jrebel-plugin.loggingLevel=${isis-jrebel-plugin.loggingLevel}" />
 | 
			
		||||
									<arg value="-XX:MaxPermSize=128m" />
 | 
			
		||||
									<arg value="-classpath" />
 | 
			
		||||
									<arg value="${runtime_classpath}" />
 | 
			
		||||
									<arg value="org.apache.isis.WebServer" />
 | 
			
		||||
								</exec>
 | 
			
		||||
							</target>
 | 
			
		||||
						</configuration>
 | 
			
		||||
					</plugin>
 | 
			
		||||
				</plugins>
 | 
			
		||||
			</build>
 | 
			
		||||
		</profile>
 | 
			
		||||
	</profiles>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
          <plugin>
 | 
			
		||||
            <groupId>org.apache.maven.plugins</groupId>
 | 
			
		||||
            <artifactId>maven-antrun-plugin</artifactId>
 | 
			
		||||
            <configuration>
 | 
			
		||||
              <target>
 | 
			
		||||
                <property name="compile_classpath" refid="maven.compile.classpath" />
 | 
			
		||||
                <property name="runtime_classpath" refid="maven.runtime.classpath" />
 | 
			
		||||
                <property name="test_classpath" refid="maven.test.classpath" />
 | 
			
		||||
                <property name="plugin_classpath" refid="maven.plugin.classpath" />
 | 
			
		||||
                <echo message="" />
 | 
			
		||||
                <echo message="" />
 | 
			
		||||
                <echo message="jrebel.jar             = ${jrebel.jar}" />
 | 
			
		||||
                <echo message="isis_jrebel_plugin.jar = ${isis_jrebel_plugin.jar}" />
 | 
			
		||||
                <echo message="target.dir             = ${target.dir}" />
 | 
			
		||||
                <echo message="" />
 | 
			
		||||
                <echo message="" />
 | 
			
		||||
                <exec executable="java" failonerror="true">
 | 
			
		||||
                  <arg value="-javaagent:${jrebel.jar}" />
 | 
			
		||||
                  <arg value="-Drebel.log=false" />
 | 
			
		||||
                  <arg value="-Drebel.check_class_hash=true" />
 | 
			
		||||
                  <arg value="-Drebel.packages_exclude=org.apache.isis" />
 | 
			
		||||
                  <!-- as used in the rebel.xml in the dom project -->
 | 
			
		||||
                  <arg value="-Dproject.root=${project.basedir}/.." />
 | 
			
		||||
                  <arg value="-Dtarget.dir=${target.dir}" />
 | 
			
		||||
                  <arg value="-Drebel.plugins=${isis_jrebel_plugin.jar}" />
 | 
			
		||||
                  <arg value="-Disis-jrebel-plugin.packagePrefix=${isis-jrebel-plugin.packagePrefix}" />
 | 
			
		||||
                  <arg value="-Disis-jrebel-plugin.loggingLevel=${isis-jrebel-plugin.loggingLevel}" />
 | 
			
		||||
                  <arg value="-XX:MaxPermSize=128m" />
 | 
			
		||||
                  <arg value="-classpath" />
 | 
			
		||||
                  <arg value="${runtime_classpath}" />
 | 
			
		||||
                  <arg value="org.apache.isis.WebServer" />
 | 
			
		||||
                </exec>
 | 
			
		||||
              </target>
 | 
			
		||||
            </configuration>
 | 
			
		||||
          </plugin>
 | 
			
		||||
        </plugins>
 | 
			
		||||
      </build>
 | 
			
		||||
    </profile>
 | 
			
		||||
  </profiles>
 | 
			
		||||
</project>
 | 
			
		||||
 
 | 
			
		||||
@@ -23,35 +23,25 @@
 | 
			
		||||
    THE SOFTWARE.
 | 
			
		||||
 | 
			
		||||
-->
 | 
			
		||||
<web-app id="WebApp_ID" version="2.4"
 | 
			
		||||
    xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 | 
			
		||||
    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
 | 
			
		||||
 | 
			
		||||
    <display-name>Simple app</display-name>
 | 
			
		||||
 | 
			
		||||
    <welcome-file-list>
 | 
			
		||||
        <welcome-file>about/index.html</welcome-file>
 | 
			
		||||
    </welcome-file-list>
 | 
			
		||||
 | 
			
		||||
    <!-- shiro security configuration -->
 | 
			
		||||
    <listener>
 | 
			
		||||
        <listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class>
 | 
			
		||||
    </listener>
 | 
			
		||||
 | 
			
		||||
    <filter>
 | 
			
		||||
        <filter-name>ShiroFilter</filter-name>
 | 
			
		||||
        <filter-class>org.apache.shiro.web.servlet.ShiroFilter</filter-class>
 | 
			
		||||
    </filter>
 | 
			
		||||
 | 
			
		||||
    <filter-mapping>
 | 
			
		||||
        <filter-name>ShiroFilter</filter-name>
 | 
			
		||||
        <url-pattern>/*</url-pattern>
 | 
			
		||||
    </filter-mapping>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    <!-- which configuration directory to read overloaded property files from -->
 | 
			
		||||
    <!-- 
 | 
			
		||||
<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">
 | 
			
		||||
  <display-name>Simple app</display-name>
 | 
			
		||||
  <welcome-file-list>
 | 
			
		||||
    <welcome-file>about/index.html</welcome-file>
 | 
			
		||||
  </welcome-file-list>
 | 
			
		||||
  <!-- shiro security configuration -->
 | 
			
		||||
  <listener>
 | 
			
		||||
    <listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class>
 | 
			
		||||
  </listener>
 | 
			
		||||
  <filter>
 | 
			
		||||
    <filter-name>ShiroFilter</filter-name>
 | 
			
		||||
    <filter-class>org.apache.shiro.web.servlet.ShiroFilter</filter-class>
 | 
			
		||||
  </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 
 | 
			
		||||
    application. Especially if your configuration is not know in advance or
 | 
			
		||||
    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>
 | 
			
		||||
    </context-param>
 | 
			
		||||
    -->
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    <!--
 | 
			
		||||
  <!--
 | 
			
		||||
    determines which additional configuration files to search for 
 | 
			
		||||
     -->
 | 
			
		||||
    <context-param>
 | 
			
		||||
        <param-name>isis.viewers</param-name>
 | 
			
		||||
        <param-value>wicket,restfulobjects</param-value>
 | 
			
		||||
    </context-param>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    <!-- 
 | 
			
		||||
  <context-param>
 | 
			
		||||
    <param-name>isis.viewers</param-name>
 | 
			
		||||
    <param-value>wicket,restfulobjects</param-value>
 | 
			
		||||
  </context-param>
 | 
			
		||||
  <!-- 
 | 
			
		||||
    for diagnostics
 | 
			
		||||
    -->
 | 
			
		||||
    <filter>
 | 
			
		||||
        <filter-name>IsisLogOnExceptionFilter</filter-name>
 | 
			
		||||
        <filter-class>org.apache.isis.core.webapp.diagnostics.IsisLogOnExceptionFilter</filter-class>
 | 
			
		||||
    </filter>
 | 
			
		||||
    <filter-mapping>
 | 
			
		||||
        <filter-name>IsisLogOnExceptionFilter</filter-name>
 | 
			
		||||
        <url-pattern>/wicket/*</url-pattern>
 | 
			
		||||
    </filter-mapping>
 | 
			
		||||
    <filter-mapping>
 | 
			
		||||
        <filter-name>IsisLogOnExceptionFilter</filter-name>
 | 
			
		||||
        <url-pattern>/restful/*</url-pattern>
 | 
			
		||||
    </filter-mapping>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    <!-- cache static resources for 1 day -->
 | 
			
		||||
    <filter>
 | 
			
		||||
        <filter-name>ResourceCachingFilter</filter-name>
 | 
			
		||||
        <filter-class>org.apache.isis.core.webapp.content.ResourceCachingFilter</filter-class>
 | 
			
		||||
        <init-param>
 | 
			
		||||
            <param-name>CacheTime</param-name>
 | 
			
		||||
            <param-value>86400</param-value>
 | 
			
		||||
        </init-param>
 | 
			
		||||
    </filter>
 | 
			
		||||
    <filter-mapping>
 | 
			
		||||
        <filter-name>ResourceCachingFilter</filter-name>
 | 
			
		||||
        <url-pattern>*.js</url-pattern>
 | 
			
		||||
    </filter-mapping>
 | 
			
		||||
    <filter-mapping>
 | 
			
		||||
        <filter-name>ResourceCachingFilter</filter-name>
 | 
			
		||||
        <url-pattern>*.css</url-pattern>
 | 
			
		||||
    </filter-mapping>
 | 
			
		||||
    <filter-mapping>
 | 
			
		||||
        <filter-name>ResourceCachingFilter</filter-name>
 | 
			
		||||
        <url-pattern>*.png</url-pattern>
 | 
			
		||||
    </filter-mapping>
 | 
			
		||||
    <filter-mapping>
 | 
			
		||||
        <filter-name>ResourceCachingFilter</filter-name>
 | 
			
		||||
        <url-pattern>*.jpg</url-pattern>
 | 
			
		||||
    </filter-mapping>
 | 
			
		||||
    <filter-mapping>
 | 
			
		||||
        <filter-name>ResourceCachingFilter</filter-name>
 | 
			
		||||
        <url-pattern>*.gif</url-pattern>
 | 
			
		||||
    </filter-mapping>
 | 
			
		||||
    <filter-mapping>
 | 
			
		||||
        <filter-name>ResourceCachingFilter</filter-name>
 | 
			
		||||
        <url-pattern>*.html</url-pattern>
 | 
			
		||||
    </filter-mapping>
 | 
			
		||||
    <filter-mapping>
 | 
			
		||||
        <filter-name>ResourceCachingFilter</filter-name>
 | 
			
		||||
        <url-pattern>*.swf</url-pattern>
 | 
			
		||||
    </filter-mapping>
 | 
			
		||||
    
 | 
			
		||||
    <servlet>
 | 
			
		||||
        <servlet-name>Resource</servlet-name>
 | 
			
		||||
        <servlet-class>org.apache.isis.core.webapp.content.ResourceServlet</servlet-class>
 | 
			
		||||
    </servlet>
 | 
			
		||||
    <servlet-mapping>
 | 
			
		||||
        <servlet-name>Resource</servlet-name>
 | 
			
		||||
        <url-pattern>*.css</url-pattern>
 | 
			
		||||
    </servlet-mapping>
 | 
			
		||||
    <servlet-mapping>
 | 
			
		||||
        <servlet-name>Resource</servlet-name>
 | 
			
		||||
        <url-pattern>*.png</url-pattern>
 | 
			
		||||
    </servlet-mapping>
 | 
			
		||||
    <servlet-mapping>
 | 
			
		||||
        <servlet-name>Resource</servlet-name>
 | 
			
		||||
        <url-pattern>*.jpg</url-pattern>
 | 
			
		||||
    </servlet-mapping>
 | 
			
		||||
    <servlet-mapping>
 | 
			
		||||
        <servlet-name>Resource</servlet-name>
 | 
			
		||||
        <url-pattern>*.gif</url-pattern>
 | 
			
		||||
    </servlet-mapping>
 | 
			
		||||
    <servlet-mapping>
 | 
			
		||||
        <servlet-name>Resource</servlet-name>
 | 
			
		||||
        <url-pattern>*.js</url-pattern>
 | 
			
		||||
    </servlet-mapping>
 | 
			
		||||
    <servlet-mapping>
 | 
			
		||||
        <servlet-name>Resource</servlet-name>
 | 
			
		||||
        <url-pattern>*.html</url-pattern>
 | 
			
		||||
    </servlet-mapping>
 | 
			
		||||
    <servlet-mapping>
 | 
			
		||||
        <servlet-name>Resource</servlet-name>
 | 
			
		||||
        <url-pattern>*.swf</url-pattern>
 | 
			
		||||
    </servlet-mapping>
 | 
			
		||||
    
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    <!--
 | 
			
		||||
  <filter>
 | 
			
		||||
    <filter-name>IsisLogOnExceptionFilter</filter-name>
 | 
			
		||||
    <filter-class>org.apache.isis.core.webapp.diagnostics.IsisLogOnExceptionFilter</filter-class>
 | 
			
		||||
  </filter>
 | 
			
		||||
  <filter-mapping>
 | 
			
		||||
    <filter-name>IsisLogOnExceptionFilter</filter-name>
 | 
			
		||||
    <url-pattern>/wicket/*</url-pattern>
 | 
			
		||||
  </filter-mapping>
 | 
			
		||||
  <filter-mapping>
 | 
			
		||||
    <filter-name>IsisLogOnExceptionFilter</filter-name>
 | 
			
		||||
    <url-pattern>/restful/*</url-pattern>
 | 
			
		||||
  </filter-mapping>
 | 
			
		||||
  <!-- cache static resources for 1 day -->
 | 
			
		||||
  <filter>
 | 
			
		||||
    <filter-name>ResourceCachingFilter</filter-name>
 | 
			
		||||
    <filter-class>org.apache.isis.core.webapp.content.ResourceCachingFilter</filter-class>
 | 
			
		||||
    <init-param>
 | 
			
		||||
      <param-name>CacheTime</param-name>
 | 
			
		||||
      <param-value>86400</param-value>
 | 
			
		||||
    </init-param>
 | 
			
		||||
  </filter>
 | 
			
		||||
  <filter-mapping>
 | 
			
		||||
    <filter-name>ResourceCachingFilter</filter-name>
 | 
			
		||||
    <url-pattern>*.js</url-pattern>
 | 
			
		||||
  </filter-mapping>
 | 
			
		||||
  <filter-mapping>
 | 
			
		||||
    <filter-name>ResourceCachingFilter</filter-name>
 | 
			
		||||
    <url-pattern>*.css</url-pattern>
 | 
			
		||||
  </filter-mapping>
 | 
			
		||||
  <filter-mapping>
 | 
			
		||||
    <filter-name>ResourceCachingFilter</filter-name>
 | 
			
		||||
    <url-pattern>*.png</url-pattern>
 | 
			
		||||
  </filter-mapping>
 | 
			
		||||
  <filter-mapping>
 | 
			
		||||
    <filter-name>ResourceCachingFilter</filter-name>
 | 
			
		||||
    <url-pattern>*.jpg</url-pattern>
 | 
			
		||||
  </filter-mapping>
 | 
			
		||||
  <filter-mapping>
 | 
			
		||||
    <filter-name>ResourceCachingFilter</filter-name>
 | 
			
		||||
    <url-pattern>*.gif</url-pattern>
 | 
			
		||||
  </filter-mapping>
 | 
			
		||||
  <filter-mapping>
 | 
			
		||||
    <filter-name>ResourceCachingFilter</filter-name>
 | 
			
		||||
    <url-pattern>*.html</url-pattern>
 | 
			
		||||
  </filter-mapping>
 | 
			
		||||
  <filter-mapping>
 | 
			
		||||
    <filter-name>ResourceCachingFilter</filter-name>
 | 
			
		||||
    <url-pattern>*.swf</url-pattern>
 | 
			
		||||
  </filter-mapping>
 | 
			
		||||
  <servlet>
 | 
			
		||||
    <servlet-name>Resource</servlet-name>
 | 
			
		||||
    <servlet-class>org.apache.isis.core.webapp.content.ResourceServlet</servlet-class>
 | 
			
		||||
  </servlet>
 | 
			
		||||
  <servlet-mapping>
 | 
			
		||||
    <servlet-name>Resource</servlet-name>
 | 
			
		||||
    <url-pattern>*.css</url-pattern>
 | 
			
		||||
  </servlet-mapping>
 | 
			
		||||
  <servlet-mapping>
 | 
			
		||||
    <servlet-name>Resource</servlet-name>
 | 
			
		||||
    <url-pattern>*.png</url-pattern>
 | 
			
		||||
  </servlet-mapping>
 | 
			
		||||
  <servlet-mapping>
 | 
			
		||||
    <servlet-name>Resource</servlet-name>
 | 
			
		||||
    <url-pattern>*.jpg</url-pattern>
 | 
			
		||||
  </servlet-mapping>
 | 
			
		||||
  <servlet-mapping>
 | 
			
		||||
    <servlet-name>Resource</servlet-name>
 | 
			
		||||
    <url-pattern>*.gif</url-pattern>
 | 
			
		||||
  </servlet-mapping>
 | 
			
		||||
  <servlet-mapping>
 | 
			
		||||
    <servlet-name>Resource</servlet-name>
 | 
			
		||||
    <url-pattern>*.js</url-pattern>
 | 
			
		||||
  </servlet-mapping>
 | 
			
		||||
  <servlet-mapping>
 | 
			
		||||
    <servlet-name>Resource</servlet-name>
 | 
			
		||||
    <url-pattern>*.html</url-pattern>
 | 
			
		||||
  </servlet-mapping>
 | 
			
		||||
  <servlet-mapping>
 | 
			
		||||
    <servlet-name>Resource</servlet-name>
 | 
			
		||||
    <url-pattern>*.swf</url-pattern>
 | 
			
		||||
  </servlet-mapping>
 | 
			
		||||
  <!--
 | 
			
		||||
    -
 | 
			
		||||
    - config specific to the wicket-viewer
 | 
			
		||||
    -
 | 
			
		||||
    -->
 | 
			
		||||
    <filter>
 | 
			
		||||
        <filter-name>WicketFilter</filter-name>
 | 
			
		||||
        <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
 | 
			
		||||
        <init-param>
 | 
			
		||||
            <param-name>applicationClassName</param-name>
 | 
			
		||||
            <param-value>domainapp.webapp.SimpleApplication</param-value>
 | 
			
		||||
        </init-param>
 | 
			
		||||
    </filter>
 | 
			
		||||
    <filter-mapping>
 | 
			
		||||
        <filter-name>WicketFilter</filter-name>
 | 
			
		||||
        <url-pattern>/wicket/*</url-pattern>
 | 
			
		||||
    </filter-mapping>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    <context-param>
 | 
			
		||||
        <param-name>configuration</param-name>
 | 
			
		||||
        <!-- 
 | 
			
		||||
  <filter>
 | 
			
		||||
    <filter-name>WicketFilter</filter-name>
 | 
			
		||||
    <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class>
 | 
			
		||||
    <init-param>
 | 
			
		||||
      <param-name>applicationClassName</param-name>
 | 
			
		||||
      <param-value>domainapp.webapp.SimpleApplication</param-value>
 | 
			
		||||
    </init-param>
 | 
			
		||||
  </filter>
 | 
			
		||||
  <filter-mapping>
 | 
			
		||||
    <filter-name>WicketFilter</filter-name>
 | 
			
		||||
    <url-pattern>/wicket/*</url-pattern>
 | 
			
		||||
  </filter-mapping>
 | 
			
		||||
  <context-param>
 | 
			
		||||
    <param-name>configuration</param-name>
 | 
			
		||||
    <!-- 
 | 
			
		||||
        <param-value>deployment</param-value>
 | 
			
		||||
         -->
 | 
			
		||||
        <param-value>development</param-value>
 | 
			
		||||
    </context-param>
 | 
			
		||||
    
 | 
			
		||||
   
 | 
			
		||||
    <!--
 | 
			
		||||
    <param-value>development</param-value>
 | 
			
		||||
  </context-param>
 | 
			
		||||
  <!--
 | 
			
		||||
    -
 | 
			
		||||
    - config specific to the restfulobjects-viewer
 | 
			
		||||
    -
 | 
			
		||||
    -->
 | 
			
		||||
 | 
			
		||||
    <!--
 | 
			
		||||
  <!--
 | 
			
		||||
    THE FOLLOWING CONFIGURATION IS NOT REQUIRED IF THE WICKET VIEWER IS IN USE.
 | 
			
		||||
    IF THE WICKET VIEWER CONFIGURATION IS REMOVED, THEN UNCOMMENT
 | 
			
		||||
    
 | 
			
		||||
@@ -225,72 +198,62 @@
 | 
			
		||||
        <param-name>isis.viewers</param-name>
 | 
			
		||||
        <param-value>restfulobjects</param-value>
 | 
			
		||||
    </context-param>    
 | 
			
		||||
    -->    
 | 
			
		||||
    
 | 
			
		||||
    <!-- bootstrap the RestEasy framework -->
 | 
			
		||||
    <listener>
 | 
			
		||||
        <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
 | 
			
		||||
    </listener>
 | 
			
		||||
 | 
			
		||||
    <!-- used by RestEasy to determine the JAX-RS resources and other related configuration -->
 | 
			
		||||
    <context-param>
 | 
			
		||||
        <param-name>javax.ws.rs.Application</param-name>
 | 
			
		||||
        <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>
 | 
			
		||||
    
 | 
			
		||||
 | 
			
		||||
    <!-- authenticate user, set up an Isis session -->
 | 
			
		||||
    <filter>
 | 
			
		||||
        <filter-name>IsisSessionFilterForRestfulObjects</filter-name>
 | 
			
		||||
        <filter-class>org.apache.isis.core.webapp.IsisSessionFilter</filter-class>
 | 
			
		||||
        <!-- authentication required for REST -->
 | 
			
		||||
        <init-param>
 | 
			
		||||
            <param-name>authenticationSessionStrategy</param-name>
 | 
			
		||||
            <param-value>org.apache.isis.viewer.restfulobjects.server.authentication.AuthenticationSessionStrategyBasicAuth</param-value>
 | 
			
		||||
        </init-param>
 | 
			
		||||
        <init-param>
 | 
			
		||||
            <!-- what to do if no session was found; we indicate to issue a 401 basic authentication challenge -->
 | 
			
		||||
            <param-name>whenNoSession</param-name>
 | 
			
		||||
            <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
 | 
			
		||||
    -->
 | 
			
		||||
  <!-- bootstrap the RestEasy framework -->
 | 
			
		||||
  <listener>
 | 
			
		||||
    <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
 | 
			
		||||
  </listener>
 | 
			
		||||
  <!-- used by RestEasy to determine the JAX-RS resources and other related configuration -->
 | 
			
		||||
  <context-param>
 | 
			
		||||
    <param-name>javax.ws.rs.Application</param-name>
 | 
			
		||||
    <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>
 | 
			
		||||
  <!-- authenticate user, set up an Isis session -->
 | 
			
		||||
  <filter>
 | 
			
		||||
    <filter-name>IsisSessionFilterForRestfulObjects</filter-name>
 | 
			
		||||
    <filter-class>org.apache.isis.core.webapp.IsisSessionFilter</filter-class>
 | 
			
		||||
    <!-- authentication required for REST -->
 | 
			
		||||
    <init-param>
 | 
			
		||||
      <param-name>authenticationSessionStrategy</param-name>
 | 
			
		||||
      <param-value>org.apache.isis.viewer.restfulobjects.server.authentication.AuthenticationSessionStrategyBasicAuth</param-value>
 | 
			
		||||
    </init-param>
 | 
			
		||||
    <init-param>
 | 
			
		||||
      <!-- what to do if no session was found; we indicate to issue a 401 basic authentication challenge -->
 | 
			
		||||
      <param-name>whenNoSession</param-name>
 | 
			
		||||
      <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 -->
 | 
			
		||||
        <filter-name>IsisSessionFilterForRestfulObjects</filter-name>
 | 
			
		||||
        <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
 | 
			
		||||
    </filter-mapping>
 | 
			
		||||
 | 
			
		||||
    <filter>
 | 
			
		||||
        <filter-name>IsisTransactionFilterForRestfulObjects</filter-name>
 | 
			
		||||
        <filter-class>org.apache.isis.viewer.restfulobjects.server.webapp.IsisTransactionFilterForRestfulObjects</filter-class>
 | 
			
		||||
    </filter>
 | 
			
		||||
    <filter-mapping>
 | 
			
		||||
        <filter-name>IsisTransactionFilterForRestfulObjects</filter-name>
 | 
			
		||||
        <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
 | 
			
		||||
    </filter-mapping>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    <servlet>
 | 
			
		||||
        <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
 | 
			
		||||
        <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
 | 
			
		||||
    </servlet>
 | 
			
		||||
    <servlet-mapping>
 | 
			
		||||
        <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
 | 
			
		||||
        <url-pattern>/restful/*</url-pattern>
 | 
			
		||||
    </servlet-mapping>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    <!-- 
 | 
			
		||||
    <filter-name>IsisSessionFilterForRestfulObjects</filter-name>
 | 
			
		||||
    <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
 | 
			
		||||
  </filter-mapping>
 | 
			
		||||
  <filter>
 | 
			
		||||
    <filter-name>IsisTransactionFilterForRestfulObjects</filter-name>
 | 
			
		||||
    <filter-class>org.apache.isis.viewer.restfulobjects.server.webapp.IsisTransactionFilterForRestfulObjects</filter-class>
 | 
			
		||||
  </filter>
 | 
			
		||||
  <filter-mapping>
 | 
			
		||||
    <filter-name>IsisTransactionFilterForRestfulObjects</filter-name>
 | 
			
		||||
    <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
 | 
			
		||||
  </filter-mapping>
 | 
			
		||||
  <servlet>
 | 
			
		||||
    <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
 | 
			
		||||
    <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
 | 
			
		||||
  </servlet>
 | 
			
		||||
  <servlet-mapping>
 | 
			
		||||
    <servlet-name>RestfulObjectsRestEasyDispatcher</servlet-name>
 | 
			
		||||
    <url-pattern>/restful/*</url-pattern>
 | 
			
		||||
  </servlet-mapping>
 | 
			
		||||
  <!-- 
 | 
			
		||||
    uncomment to use container-managed datasource;
 | 
			
		||||
    for both container-managed (JTA) and non-container-managed transactions
 | 
			
		||||
     -->
 | 
			
		||||
     <!-- 
 | 
			
		||||
  <!-- 
 | 
			
		||||
    <resource-ref>
 | 
			
		||||
        <description>db</description>
 | 
			
		||||
        <res-ref-name>jdbc/quickstart</res-ref-name>
 | 
			
		||||
@@ -298,12 +261,11 @@
 | 
			
		||||
        <res-auth>Container</res-auth>
 | 
			
		||||
    </resource-ref>
 | 
			
		||||
      -->
 | 
			
		||||
 | 
			
		||||
    <!--
 | 
			
		||||
  <!--
 | 
			
		||||
    uncomment to use container-managed datasource
 | 
			
		||||
    with container-managed transactions (JTA).
 | 
			
		||||
    -->
 | 
			
		||||
    <!-- 
 | 
			
		||||
  <!-- 
 | 
			
		||||
    <resource-ref>
 | 
			
		||||
        <description>db</description>
 | 
			
		||||
        <res-ref-name>jdbc/quickstart-nontx</res-ref-name>
 | 
			
		||||
@@ -311,5 +273,4 @@
 | 
			
		||||
        <res-auth>Container</res-auth>
 | 
			
		||||
    </resource-ref>
 | 
			
		||||
     -->
 | 
			
		||||
 | 
			
		||||
</web-app>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user