incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1234516 [3/9] - in /incubator/isis/trunk/framework: ./ quickstart-archetype/ quickstart-archetype/src/main/appended-resources/ quickstart-archetype/src/main/resources/META-INF/maven/ quickstart-archetype/src/main/resources/archetype-resour...
Date Sun, 22 Jan 2012 14:30:12 GMT
Modified: incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/tests-junit/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/tests-junit/isis.properties?rev=1234516&r1=1234515&r2=1234516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/tests-junit/isis.properties (original)
+++ incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/tests-junit/isis.properties Sun Jan 22 14:30:07 2012
@@ -1,47 +1,47 @@
 #set( $symbol_pound = '#' )
 #set( $symbol_dollar = '$' )
 #set( $symbol_escape = '\' )
-${symbol_pound}  Licensed to the Apache Software Foundation (ASF) under one
-${symbol_pound}  or more contributor license agreements.  See the NOTICE file
-${symbol_pound}  distributed with this work for additional information
-${symbol_pound}  regarding copyright ownership.  The ASF licenses this file
-${symbol_pound}  to you under the Apache License, Version 2.0 (the
-${symbol_pound}  "License"); you may not use this file except in compliance
-${symbol_pound}  with the License.  You may obtain a copy of the License at
-${symbol_pound}  
-${symbol_pound}         http://www.apache.org/licenses/LICENSE-2.0
-${symbol_pound}         
-${symbol_pound}  Unless required by applicable law or agreed to in writing,
-${symbol_pound}  software distributed under the License is distributed on an
-${symbol_pound}  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-${symbol_pound}  KIND, either express or implied.  See the License for the
-${symbol_pound}  specific language governing permissions and limitations
-${symbol_pound}  under the License.
-isis.services.prefix = objstore.dflt
-isis.services = todo.ToDoItemRepositoryDefault
-
-isis.fixtures.prefix= fixture
-isis.fixtures= LogonAsSvenFixture,todo.ToDoItemsFixture
-
-isis.exploration.users=sven, dick, bob
-
-
-isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.dflt.classsubstitutor.CglibClassSubstitutor
-${symbol_pound}isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.javassist.classsubstitutor.JavassistClassSubstitutor
-${symbol_pound}isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.identity.classsubstitutor.ClassSubstitutorIdentity
-
-isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.dflt.objectfactory.CglibObjectFactory
-${symbol_pound}isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.javassist.objectfactory.JavassistObjectFactory
-${symbol_pound}isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.identity.objectfactory.ObjectFactoryBasic
-
-
-isis.persistor.domain-object-container=org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault
-${symbol_pound}isis.persistor.domain-object-container=org.apache.isis.progmodel.wrapper.metamodel.DomainObjectContainerWrapperFactory
-
-
-${symbol_pound}isis.reflector.facets.include=org.apache.isis.runtimes.dflt.runtime.authorization.standard.AuthorizationFacetFactoryImpl
-${symbol_pound}isis.authorization.learn=true
-
-isis.user-profile-store=in-memory
-isis.persistor=in-memory
+${symbol_pound}  Licensed to the Apache Software Foundation (ASF) under one
+${symbol_pound}  or more contributor license agreements.  See the NOTICE file
+${symbol_pound}  distributed with this work for additional information
+${symbol_pound}  regarding copyright ownership.  The ASF licenses this file
+${symbol_pound}  to you under the Apache License, Version 2.0 (the
+${symbol_pound}  "License"); you may not use this file except in compliance
+${symbol_pound}  with the License.  You may obtain a copy of the License at
+${symbol_pound}  
+${symbol_pound}         http://www.apache.org/licenses/LICENSE-2.0
+${symbol_pound}         
+${symbol_pound}  Unless required by applicable law or agreed to in writing,
+${symbol_pound}  software distributed under the License is distributed on an
+${symbol_pound}  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+${symbol_pound}  KIND, either express or implied.  See the License for the
+${symbol_pound}  specific language governing permissions and limitations
+${symbol_pound}  under the License.
+isis.services.prefix = objstore.dflt
+isis.services = todo.ToDoItemRepositoryDefault
+
+isis.fixtures.prefix= fixture
+isis.fixtures= LogonAsSvenFixture,todo.ToDoItemsFixture
+
+isis.exploration.users=sven, dick, bob
+
+
+isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.dflt.classsubstitutor.CglibClassSubstitutor
+${symbol_pound}isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.javassist.classsubstitutor.JavassistClassSubstitutor
+${symbol_pound}isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.identity.classsubstitutor.ClassSubstitutorIdentity
+
+isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.dflt.objectfactory.CglibObjectFactory
+${symbol_pound}isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.javassist.objectfactory.JavassistObjectFactory
+${symbol_pound}isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.identity.objectfactory.ObjectFactoryBasic
+
+
+isis.persistor.domain-object-container=org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault
+${symbol_pound}isis.persistor.domain-object-container=org.apache.isis.progmodel.wrapper.metamodel.DomainObjectContainerWrapperFactory
+
+
+${symbol_pound}isis.reflector.facets.include=org.apache.isis.runtimes.dflt.runtime.authorization.standard.AuthorizationFacetFactoryImpl
+${symbol_pound}isis.authorization.learn=true
+
+isis.user-profile-store=in-memory
+isis.persistor=in-memory
 ${symbol_pound}isis.xmlos.dir=/tmp/xml
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/tests-junit/isis.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/tests-junit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/tests-junit/pom.xml?rev=1234516&r1=1234515&r2=1234516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/tests-junit/pom.xml (original)
+++ incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/tests-junit/pom.xml Sun Jan 22 14:30:07 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -16,67 +16,67 @@
   KIND, either express or implied.  See the License for the
   specific language governing permissions and limitations
   under the License.
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-    	<groupId>${groupId}</groupId>
-    	<artifactId>${rootArtifactId}</artifactId>
-		<version>${version}</version>
-	</parent>
-
-	<artifactId>${artifactId}</artifactId>
-	<name>Quickstart JUnit Tests</name>
-
-	<dependencies>
-
-        <!-- this project's dependencies -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>${rootArtifactId}-fixture</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.isis.core</groupId>
-            <artifactId>runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.isis.runtimes.dflt</groupId>
-            <artifactId>webserver</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
-            <artifactId>dflt</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
-            <artifactId>dflt</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
-            <artifactId>xml</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
-            <artifactId>dflt</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.isis.progmodels</groupId>
-            <artifactId>dflt</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.isis.security</groupId>
-            <artifactId>dflt</artifactId>
-        </dependency>
-
-        <!-- isis viewers -->
-        <dependency>
-            <groupId>org.apache.isis.viewer</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-	</dependencies>
-
-</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/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+    	<groupId>${groupId}</groupId>
+    	<artifactId>${rootArtifactId}</artifactId>
+		<version>${version}</version>
+	</parent>
+
+	<artifactId>${artifactId}</artifactId>
+	<name>Quickstart JUnit Tests</name>
+
+	<dependencies>
+
+        <!-- this project's dependencies -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>${rootArtifactId}-fixture</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.isis.core</groupId>
+            <artifactId>runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.isis.runtimes.dflt</groupId>
+            <artifactId>webserver</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
+            <artifactId>dflt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
+            <artifactId>dflt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
+            <artifactId>xml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
+            <artifactId>dflt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.isis.progmodels</groupId>
+            <artifactId>dflt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.isis.security</groupId>
+            <artifactId>dflt</artifactId>
+        </dependency>
+
+        <!-- isis viewers -->
+        <dependency>
+            <groupId>org.apache.isis.viewer</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+	</dependencies>
+
+</project>

Propchange: incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/tests-junit/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/tests-junit/src/test/java/junit/AbstractTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/tests-junit/src/test/java/junit/todo/ToDoItemRepositoryTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/tests-junit/src/test/java/junit/todo/ToDoItemTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/pom.xml?rev=1234516&r1=1234515&r2=1234516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/pom.xml (original)
+++ incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/pom.xml Sun Jan 22 14:30:07 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -16,139 +16,139 @@
   KIND, either express or implied.  See the License for the
   specific language governing permissions and limitations
   under the License.
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>${groupId}</groupId>
-        <artifactId>${rootArtifactId}</artifactId>
-        <version>${version}</version>
-    </parent>
-
-	<artifactId>${artifactId}</artifactId>
-	<name>Quickstart Webapp with HTML+JSON Viewers</name>
-	
-	<packaging>war</packaging>
-
-	<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>
-                        </configuration>
-                        <phase>package</phase>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- prereqs: mvn package -->
-            <!-- mvn 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.war" />
-                        </exec>
-                    </tasks>
-                </configuration>
-            </plugin>
-
-		</plugins>
-	</build>
-
-	<dependencies>
-	
-        <!-- other modules in this project -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>${rootArtifactId}-dom</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>${rootArtifactId}-fixture</artifactId>
-        </dependency>
-
-
-        <!-- isis viewer -->
-		<dependency>
-	        <groupId>org.apache.isis.viewer</groupId>
-			<artifactId>html</artifactId>
-		</dependency>
-
-        <dependency>
-            <groupId>org.apache.isis.viewer</groupId>
-            <artifactId>json-viewer</artifactId>
-        </dependency>
-
-        <!-- isis runtime -->
-        <dependency>
-            <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
-            <artifactId>dflt</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
-            <artifactId>dflt</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
-            <artifactId>xml</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
-            <artifactId>dflt</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
-            <artifactId>xml</artifactId>
-        </dependency>
-        
-        <!-- isis progmodel -->
-        <dependency>
-            <groupId>org.apache.isis.progmodels</groupId>
-            <artifactId>dflt</artifactId>
-        </dependency>
-
-        <!-- isis security implementations -->        
-        <dependency>
-            <groupId>org.apache.isis.security</groupId>
-            <artifactId>file</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.isis.security</groupId>
-            <artifactId>dflt</artifactId>
-        </dependency>
-        
-        <!-- to run using WebServer (optional) -->
-        <dependency>
-            <groupId>org.apache.isis.runtimes.dflt</groupId>
-            <artifactId>webserver</artifactId>
-            <scope>runtime</scope>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <version>1.2</version>
-        </dependency>
-
-	</dependencies>
-
-</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/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>${groupId}</groupId>
+        <artifactId>${rootArtifactId}</artifactId>
+        <version>${version}</version>
+    </parent>
+
+	<artifactId>${artifactId}</artifactId>
+	<name>Quickstart Webapp with HTML+JSON Viewers</name>
+	
+	<packaging>war</packaging>
+
+	<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>
+                        </configuration>
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- prereqs: mvn package -->
+            <!-- mvn 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.war" />
+                        </exec>
+                    </tasks>
+                </configuration>
+            </plugin>
+
+		</plugins>
+	</build>
+
+	<dependencies>
+	
+        <!-- other modules in this project -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>${rootArtifactId}-dom</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>${rootArtifactId}-fixture</artifactId>
+        </dependency>
+
+
+        <!-- isis viewer -->
+		<dependency>
+	        <groupId>org.apache.isis.viewer</groupId>
+			<artifactId>html</artifactId>
+		</dependency>
+
+        <dependency>
+            <groupId>org.apache.isis.viewer</groupId>
+            <artifactId>json-viewer</artifactId>
+        </dependency>
+
+        <!-- isis runtime -->
+        <dependency>
+            <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
+            <artifactId>dflt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
+            <artifactId>dflt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
+            <artifactId>xml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
+            <artifactId>dflt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
+            <artifactId>xml</artifactId>
+        </dependency>
+        
+        <!-- isis progmodel -->
+        <dependency>
+            <groupId>org.apache.isis.progmodels</groupId>
+            <artifactId>dflt</artifactId>
+        </dependency>
+
+        <!-- isis security implementations -->        
+        <dependency>
+            <groupId>org.apache.isis.security</groupId>
+            <artifactId>file</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.isis.security</groupId>
+            <artifactId>dflt</artifactId>
+        </dependency>
+        
+        <!-- to run using WebServer (optional) -->
+        <dependency>
+            <groupId>org.apache.isis.runtimes.dflt</groupId>
+            <artifactId>webserver</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <version>1.2</version>
+        </dependency>
+
+	</dependencies>
+
+</project>

Propchange: incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties?rev=1234516&r1=1234515&r2=1234516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties (original)
+++ incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties Sun Jan 22 14:30:07 2012
@@ -17,36 +17,36 @@ ${symbol_pound}  "AS IS" BASIS, WITHOUT 
 ${symbol_pound}  KIND, either express or implied.  See the License for the
 ${symbol_pound}  specific language governing permissions and limitations
 ${symbol_pound}  under the License.
-isis.services.prefix = objstore.dflt
-isis.services = todo.ToDoItemsDefault
-
-isis.fixtures.prefix= fixture
+isis.services.prefix = objstore.dflt
+isis.services = todo.ToDoItemsDefault
+
+isis.fixtures.prefix= fixture
 isis.fixtures= LogonAsSvenFixture,todo.ToDoItemsFixture
-${symbol_pound}isis.fixtures= todo.ToDoItemsFixture
-
-isis.exploration.users=sven, dick, bob
-
-
-isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.dflt.classsubstitutor.CglibClassSubstitutor
-${symbol_pound}isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.javassist.classsubstitutor.JavassistClassSubstitutor
-${symbol_pound}isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.identity.classsubstitutor.ClassSubstitutorIdentity
-
-isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.dflt.objectfactory.CglibObjectFactory
-${symbol_pound}isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.javassist.objectfactory.JavassistObjectFactory
-${symbol_pound}isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.identity.objectfactory.ObjectFactoryBasic
-
-
-isis.persistor.domain-object-container=org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault
-${symbol_pound}isis.persistor.domain-object-container=org.apache.isis.progmodel.wrapper.metamodel.DomainObjectContainerWrapperFactory
-
+${symbol_pound}isis.fixtures= todo.ToDoItemsFixture
+
+isis.exploration.users=sven, dick, bob
+
+
+isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.dflt.classsubstitutor.CglibClassSubstitutor
+${symbol_pound}isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.javassist.classsubstitutor.JavassistClassSubstitutor
+${symbol_pound}isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.identity.classsubstitutor.ClassSubstitutorIdentity
+
+isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.dflt.objectfactory.CglibObjectFactory
+${symbol_pound}isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.javassist.objectfactory.JavassistObjectFactory
+${symbol_pound}isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.identity.objectfactory.ObjectFactoryBasic
+
+
+isis.persistor.domain-object-container=org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault
+${symbol_pound}isis.persistor.domain-object-container=org.apache.isis.progmodel.wrapper.metamodel.DomainObjectContainerWrapperFactory
+
 
 isis.authentication=org.apache.isis.security.file.authentication.FileAuthenticationManagerInstaller
 
-
-${symbol_pound}isis.reflector.facets.include=org.apache.isis.runtimes.dflt.runtime.authorization.standard.AuthorizationFacetFactoryImpl
-${symbol_pound}isis.authorization.learn=true
-
-
-isis.user-profile-store=in-memory
-isis.persistor=in-memory
+
+${symbol_pound}isis.reflector.facets.include=org.apache.isis.runtimes.dflt.runtime.authorization.standard.AuthorizationFacetFactoryImpl
+${symbol_pound}isis.authorization.learn=true
+
+
+isis.user-profile-store=in-memory
+isis.persistor=in-memory
 ${symbol_pound}isis.xmlos.dir=/tmp/xml
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/logging.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/logging.properties?rev=1234516&r1=1234515&r2=1234516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/logging.properties (original)
+++ incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/logging.properties Sun Jan 22 14:30:07 2012
@@ -1,35 +1,35 @@
 #set( $symbol_pound = '#' )
 #set( $symbol_dollar = '$' )
 #set( $symbol_escape = '\' )
-${symbol_pound}  Licensed to the Apache Software Foundation (ASF) under one
-${symbol_pound}  or more contributor license agreements.  See the NOTICE file
-${symbol_pound}  distributed with this work for additional information
-${symbol_pound}  regarding copyright ownership.  The ASF licenses this file
-${symbol_pound}  to you under the Apache License, Version 2.0 (the
-${symbol_pound}  "License"); you may not use this file except in compliance
-${symbol_pound}  with the License.  You may obtain a copy of the License at
-${symbol_pound}  
-${symbol_pound}         http://www.apache.org/licenses/LICENSE-2.0
-${symbol_pound}         
-${symbol_pound}  Unless required by applicable law or agreed to in writing,
-${symbol_pound}  software distributed under the License is distributed on an
-${symbol_pound}  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-${symbol_pound}  KIND, either express or implied.  See the License for the
-${symbol_pound}  specific language governing permissions and limitations
-${symbol_pound}  under the License.
-
-
-${symbol_pound} the framework uses log4j is used to provide system logging.
-log4j.rootCategory=INFO, Console
-
-${symbol_pound} The console appender
-log4j.appender.Console=org.apache.log4j.ConsoleAppender
-log4j.appender.Console.target=System.out
-log4j.appender.Console.layout=org.apache.log4j.PatternLayout
-log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE}  [%-20c{1} %-10t %-5p]  %m%n
-
-log4j.appender.File=org.apache.log4j.RollingFileAppender
-log4j.appender.File.file=isis.log
-log4j.appender.File.append=false
-log4j.appender.File.layout=org.apache.log4j.PatternLayout
-log4j.appender.File.layout.ConversionPattern=%d [%-20c{1} %-10t %-5p]  %m%n
+${symbol_pound}  Licensed to the Apache Software Foundation (ASF) under one
+${symbol_pound}  or more contributor license agreements.  See the NOTICE file
+${symbol_pound}  distributed with this work for additional information
+${symbol_pound}  regarding copyright ownership.  The ASF licenses this file
+${symbol_pound}  to you under the Apache License, Version 2.0 (the
+${symbol_pound}  "License"); you may not use this file except in compliance
+${symbol_pound}  with the License.  You may obtain a copy of the License at
+${symbol_pound}  
+${symbol_pound}         http://www.apache.org/licenses/LICENSE-2.0
+${symbol_pound}         
+${symbol_pound}  Unless required by applicable law or agreed to in writing,
+${symbol_pound}  software distributed under the License is distributed on an
+${symbol_pound}  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+${symbol_pound}  KIND, either express or implied.  See the License for the
+${symbol_pound}  specific language governing permissions and limitations
+${symbol_pound}  under the License.
+
+
+${symbol_pound} the framework uses log4j is used to provide system logging.
+log4j.rootCategory=INFO, Console
+
+${symbol_pound} The console appender
+log4j.appender.Console=org.apache.log4j.ConsoleAppender
+log4j.appender.Console.target=System.out
+log4j.appender.Console.layout=org.apache.log4j.PatternLayout
+log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE}  [%-20c{1} %-10t %-5p]  %m%n
+
+log4j.appender.File=org.apache.log4j.RollingFileAppender
+log4j.appender.File.file=isis.log
+log4j.appender.File.append=false
+log4j.appender.File.layout=org.apache.log4j.PatternLayout
+log4j.appender.File.layout.ConversionPattern=%d [%-20c{1} %-10t %-5p]  %m%n

Propchange: incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/logging.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_html.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_html.properties?rev=1234516&r1=1234515&r2=1234516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_html.properties (original)
+++ incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_html.properties Sun Jan 22 14:30:07 2012
@@ -1,30 +1,30 @@
 #set( $symbol_pound = '#' )
 #set( $symbol_dollar = '$' )
 #set( $symbol_escape = '\' )
-${symbol_pound}  Licensed to the Apache Software Foundation (ASF) under one
-${symbol_pound}  or more contributor license agreements.  See the NOTICE file
-${symbol_pound}  distributed with this work for additional information
-${symbol_pound}  regarding copyright ownership.  The ASF licenses this file
-${symbol_pound}  to you under the Apache License, Version 2.0 (the
-${symbol_pound}  "License"); you may not use this file except in compliance
-${symbol_pound}  with the License.  You may obtain a copy of the License at
-${symbol_pound}  
-${symbol_pound}         http://www.apache.org/licenses/LICENSE-2.0
-${symbol_pound}         
-${symbol_pound}  Unless required by applicable law or agreed to in writing,
-${symbol_pound}  software distributed under the License is distributed on an
-${symbol_pound}  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-${symbol_pound}  KIND, either express or implied.  See the License for the
-${symbol_pound}  specific language governing permissions and limitations
-${symbol_pound}  under the License.
-
-${symbol_pound}
-${symbol_pound} configuration file for the HTML viewer
-${symbol_pound}
-
-${symbol_pound} customization for the header and footer
-isis.viewer.html.header=<div id="site-header"><div id="site-logo">&nbsp;</div></div>
-isis.viewer.html.footer=<div id="page-footer"><small>Powered by Apache Isis</small></div>
-
-${symbol_pound} not used by the onlinedemo; deploy the WAR as usual
-isis.viewer.html.port=8080
+${symbol_pound}  Licensed to the Apache Software Foundation (ASF) under one
+${symbol_pound}  or more contributor license agreements.  See the NOTICE file
+${symbol_pound}  distributed with this work for additional information
+${symbol_pound}  regarding copyright ownership.  The ASF licenses this file
+${symbol_pound}  to you under the Apache License, Version 2.0 (the
+${symbol_pound}  "License"); you may not use this file except in compliance
+${symbol_pound}  with the License.  You may obtain a copy of the License at
+${symbol_pound}  
+${symbol_pound}         http://www.apache.org/licenses/LICENSE-2.0
+${symbol_pound}         
+${symbol_pound}  Unless required by applicable law or agreed to in writing,
+${symbol_pound}  software distributed under the License is distributed on an
+${symbol_pound}  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+${symbol_pound}  KIND, either express or implied.  See the License for the
+${symbol_pound}  specific language governing permissions and limitations
+${symbol_pound}  under the License.
+
+${symbol_pound}
+${symbol_pound} configuration file for the HTML viewer
+${symbol_pound}
+
+${symbol_pound} customization for the header and footer
+isis.viewer.html.header=<div id="site-header"><div id="site-logo">&nbsp;</div></div>
+isis.viewer.html.footer=<div id="page-footer"><small>Powered by Apache Isis</small></div>
+
+${symbol_pound} not used by the onlinedemo; deploy the WAR as usual
+isis.viewer.html.port=8080

Propchange: incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_html.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml?rev=1234516&r1=1234515&r2=1234516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml Sun Jan 22 14:30:07 2012
@@ -1,253 +1,253 @@
 #set( $symbol_pound = '#' )
 #set( $symbol_dollar = '$' )
 #set( $symbol_escape = '\' )
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-         http://www.apache.org/licenses/LICENSE-2.0
-         
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<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>Apache Isis Webapp</display-name>
-
-
-    <!--
-    -
-    -
-    - config common to all viewer(s)
-    -
-    -
-    -->
-    
-    <!-- bootstrap the Isis metamodel and runtime -->
-    <listener>
-        <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
-    </listener>
-
-    <!-- which (optional) configuration file(s) to load -->
-    <context-param>
-        <param-name>isis.viewers</param-name>
-        <param-value>html,json</param-value>
-    </context-param>
-
-    <!-- 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>
-    
-    <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>
-    
-
-
-
-
-    <!--
-    -
-    -
-    - config specific to the html-viewer
-    -
-    -
-    -->
-    <!-- determine the format of the paths of the links etc that it generates -->
-    <context-param>
-        <param-name>viewer-html.suffix</param-name>
-        <param-value>htmlviewer</param-value>
-    </context-param>
-
-    <!-- redirect requests to 'htmlviewer' to the HTML viewer's start page -->
-    <filter>
-        <filter-name>RedirectFilterForHtml</filter-name>
-        <filter-class>org.apache.isis.core.webapp.routing.RedirectFilter</filter-class>
-        <init-param>
-            <param-name>redirectTo</param-name>
-            <param-value>/start.htmlviewer</param-value>
-        </init-param>
-    </filter>
-    <filter-mapping>
-        <filter-name>RedirectFilterForHtml</filter-name>
-        <url-pattern>/htmlviewer</url-pattern>
-    </filter-mapping>
-
-    <!-- authenticate user, and set up an Isis Session -->
-    <filter>
-        <filter-name>IsisSessionFilterForHtml</filter-name>
-        <filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class>
-        <init-param>
-            <!-- lookup from cache, or if a logon filter was provided -->
-            <param-name>authenticationSessionStrategy</param-name>
-            <param-value>org.apache.isis.runtimes.dflt.webapp.auth.AuthenticationSessionStrategyDefault</param-value>
-        </init-param>
-        <init-param>
-            <!-- what to do if no session was found; we indicate access only to a restricted list of paths -->
-            <param-name>whenNoSession</param-name>
-            <param-value>restricted</param-value>
-        </init-param>
-        <init-param>
-            <!-- the list of paths that are accessible if no session was found -->
-            <param-name>restricted</param-name>
-            <param-value>/logon.htmlviewer,/register.htmlviewer</param-value>
-        </init-param>
-    </filter>
-    <filter-mapping>
-        <filter-name>IsisSessionFilterForHtml</filter-name>
-        <url-pattern>*.htmlviewer</url-pattern>
-    </filter-mapping>
-
-    <servlet>
-        <servlet-name>Logon</servlet-name>
-        <servlet-class>org.apache.isis.viewer.html.servlet.LogonServlet</servlet-class>
-        <init-param>
-            <param-name>authenticationSessionStrategy</param-name>
-            <param-value>org.apache.isis.runtimes.dflt.webapp.auth.AuthenticationSessionStrategyDefault</param-value>
-        </init-param>
-        <init-param>
-            <param-name>startPage</param-name>
-            <param-value>start.htmlviewer</param-value>
-        </init-param>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>Logon</servlet-name>
-        <url-pattern>/logon.htmlviewer</url-pattern>
-    </servlet-mapping>
-
-    <servlet>
-        <servlet-name>Controller</servlet-name>
-        <servlet-class>org.apache.isis.viewer.html.servlet.ControllerServlet</servlet-class>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>Controller</servlet-name>
-        <url-pattern>*.htmlviewer</url-pattern>
-    </servlet-mapping>
-
-
-
-
-    <!--
-    -
-    -
-    - config specific to the json-viewer
-    -
-    -
-    -->
-    
-    <!-- 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.json.viewer.JsonApplication</param-value>
-    </context-param>
-
-    <!-- authenticate user, set up an Isis session -->
-    <filter>
-        <filter-name>IsisSessionFilterForJson</filter-name>
-        <filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class>
-        <!-- authentication required for REST -->
-        <init-param>
-            <param-name>authenticationSessionStrategy</param-name>
-            <param-value>org.apache.isis.viewer.json.viewer.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>
-        <init-param>
-            <!-- ignores any requests to the HTML viewer resources -->
-            <param-name>ignoreExtensions</param-name>
-            <param-value>htmlviewer</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>IsisSessionFilterForJson</filter-name>
-        <url-pattern>*</url-pattern>
-    </filter-mapping>
-
-
-    <servlet>
-        <servlet-name>RestEasy</servlet-name>
-        <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>RestEasy</servlet-name>
-        <url-pattern>/</url-pattern>
-    </servlet-mapping>
-	
-</web-app>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+         http://www.apache.org/licenses/LICENSE-2.0
+         
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<web-app 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>Apache Isis Webapp</display-name>
+
+
+    <!--
+    -
+    -
+    - config common to all viewer(s)
+    -
+    -
+    -->
+    
+    <!-- bootstrap the Isis metamodel and runtime -->
+    <listener>
+        <listener-class>org.apache.isis.runtimes.dflt.webapp.IsisWebAppBootstrapper</listener-class>
+    </listener>
+
+    <!-- which (optional) configuration file(s) to load -->
+    <context-param>
+        <param-name>isis.viewers</param-name>
+        <param-value>html,json</param-value>
+    </context-param>
+
+    <!-- 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>
+    
+    <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>
+    
+
+
+
+
+    <!--
+    -
+    -
+    - config specific to the html-viewer
+    -
+    -
+    -->
+    <!-- determine the format of the paths of the links etc that it generates -->
+    <context-param>
+        <param-name>viewer-html.suffix</param-name>
+        <param-value>htmlviewer</param-value>
+    </context-param>
+
+    <!-- redirect requests to 'htmlviewer' to the HTML viewer's start page -->
+    <filter>
+        <filter-name>RedirectFilterForHtml</filter-name>
+        <filter-class>org.apache.isis.core.webapp.routing.RedirectFilter</filter-class>
+        <init-param>
+            <param-name>redirectTo</param-name>
+            <param-value>/start.htmlviewer</param-value>
+        </init-param>
+    </filter>
+    <filter-mapping>
+        <filter-name>RedirectFilterForHtml</filter-name>
+        <url-pattern>/htmlviewer</url-pattern>
+    </filter-mapping>
+
+    <!-- authenticate user, and set up an Isis Session -->
+    <filter>
+        <filter-name>IsisSessionFilterForHtml</filter-name>
+        <filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class>
+        <init-param>
+            <!-- lookup from cache, or if a logon filter was provided -->
+            <param-name>authenticationSessionStrategy</param-name>
+            <param-value>org.apache.isis.runtimes.dflt.webapp.auth.AuthenticationSessionStrategyDefault</param-value>
+        </init-param>
+        <init-param>
+            <!-- what to do if no session was found; we indicate access only to a restricted list of paths -->
+            <param-name>whenNoSession</param-name>
+            <param-value>restricted</param-value>
+        </init-param>
+        <init-param>
+            <!-- the list of paths that are accessible if no session was found -->
+            <param-name>restricted</param-name>
+            <param-value>/logon.htmlviewer,/register.htmlviewer</param-value>
+        </init-param>
+    </filter>
+    <filter-mapping>
+        <filter-name>IsisSessionFilterForHtml</filter-name>
+        <url-pattern>*.htmlviewer</url-pattern>
+    </filter-mapping>
+
+    <servlet>
+        <servlet-name>Logon</servlet-name>
+        <servlet-class>org.apache.isis.viewer.html.servlet.LogonServlet</servlet-class>
+        <init-param>
+            <param-name>authenticationSessionStrategy</param-name>
+            <param-value>org.apache.isis.runtimes.dflt.webapp.auth.AuthenticationSessionStrategyDefault</param-value>
+        </init-param>
+        <init-param>
+            <param-name>startPage</param-name>
+            <param-value>start.htmlviewer</param-value>
+        </init-param>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>Logon</servlet-name>
+        <url-pattern>/logon.htmlviewer</url-pattern>
+    </servlet-mapping>
+
+    <servlet>
+        <servlet-name>Controller</servlet-name>
+        <servlet-class>org.apache.isis.viewer.html.servlet.ControllerServlet</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>Controller</servlet-name>
+        <url-pattern>*.htmlviewer</url-pattern>
+    </servlet-mapping>
+
+
+
+
+    <!--
+    -
+    -
+    - config specific to the json-viewer
+    -
+    -
+    -->
+    
+    <!-- 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.json.viewer.JsonApplication</param-value>
+    </context-param>
+
+    <!-- authenticate user, set up an Isis session -->
+    <filter>
+        <filter-name>IsisSessionFilterForJson</filter-name>
+        <filter-class>org.apache.isis.runtimes.dflt.webapp.IsisSessionFilter</filter-class>
+        <!-- authentication required for REST -->
+        <init-param>
+            <param-name>authenticationSessionStrategy</param-name>
+            <param-value>org.apache.isis.viewer.json.viewer.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>
+        <init-param>
+            <!-- ignores any requests to the HTML viewer resources -->
+            <param-name>ignoreExtensions</param-name>
+            <param-value>htmlviewer</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>IsisSessionFilterForJson</filter-name>
+        <url-pattern>*</url-pattern>
+    </filter-mapping>
+
+
+    <servlet>
+        <servlet-name>RestEasy</servlet-name>
+        <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>RestEasy</servlet-name>
+        <url-pattern>/</url-pattern>
+    </servlet-mapping>
+	
+</web-app>

Propchange: incubator/isis/trunk/framework/quickstart-archetype/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/isis/trunk/framework/quickstart-archetype/src/test/resources/projects/basic/archetype.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/quickstart-archetype/src/test/resources/projects/basic/archetype.properties?rev=1234516&r1=1234515&r2=1234516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/quickstart-archetype/src/test/resources/projects/basic/archetype.properties (original)
+++ incubator/isis/trunk/framework/quickstart-archetype/src/test/resources/projects/basic/archetype.properties Sun Jan 22 14:30:07 2012
@@ -1,5 +1,5 @@
-#Sun Jan 08 14:26:05 GMT 2012
-package=it.pkg
-version=0.1-SNAPSHOT
-groupId=archetype.it
-artifactId=basic
+#Sun Jan 08 14:26:05 GMT 2012
+package=it.pkg
+version=0.1-SNAPSHOT
+groupId=archetype.it
+artifactId=basic

Propchange: incubator/isis/trunk/framework/quickstart-archetype/src/test/resources/projects/basic/archetype.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/isis/trunk/framework/quickstart-archetype/src/test/resources/projects/basic/goal.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/isis/trunk/framework/searchandreplace.groovy
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/searchandreplace.groovy?rev=1234516&r1=1234515&r2=1234516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/searchandreplace.groovy (original)
+++ incubator/isis/trunk/framework/searchandreplace.groovy Sun Jan 22 14:30:07 2012
@@ -1,74 +1,74 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-//
-// For adhoc search-and-replace of files. 
-//
-
-def cli = new CliBuilder( usage: 'groovy searchandreplace [-xv]')
-cli.x(argName: 'exec', longOpt: 'exec', 'execute (perform changes if any found)')
-cli.v(argName: 'verbose', longOpt: 'verbose', 'verbose')
-
-def options=cli.parse(args)
-
-if(options.x) {
-   println("-x (execute) flag specified: will make changes to files (if any replacements found)")
-} else {
-   println("-x (execute) flag not specified: no changes will be made to files")
-}
-
-
-//
-//
-//
-def replacements = [
-"isis-parent": "isis"
-
-]
-
-
-
-//
-//
-//
-//def fileEndings = [".xml", ".java", ".launch", ".properties"]
-def fileEndings = [".xml"]
-
-
-
-def currentDir = new File(".");
-
-currentDir.eachFileRecurse { file ->
-  def endsWithFileEnding = 
-    fileEndings.inject(false) { endsWith, fileEnding -> 
-      endsWith || file.name.endsWith(fileEnding) 
-    }
-  if (endsWithFileEnding) {
-    def fileText = file.text;
-    replacements.each { from, to -> 
-      def newFileText = fileText.replaceAll(from, to)
-      if(fileText != newFileText) {
-        if(options.v || !options.x) {
-            println(file.path)
-        }
-        if(options.x) {
-            file.write(newFileText);
-        }
-      }
-    }    
-  }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+//
+// For adhoc search-and-replace of files. 
+//
+
+def cli = new CliBuilder( usage: 'groovy searchandreplace [-xv]')
+cli.x(argName: 'exec', longOpt: 'exec', 'execute (perform changes if any found)')
+cli.v(argName: 'verbose', longOpt: 'verbose', 'verbose')
+
+def options=cli.parse(args)
+
+if(options.x) {
+   println("-x (execute) flag specified: will make changes to files (if any replacements found)")
+} else {
+   println("-x (execute) flag not specified: no changes will be made to files")
+}
+
+
+//
+//
+//
+def replacements = [
+"isis-parent": "isis"
+
+]
+
+
+
+//
+//
+//
+//def fileEndings = [".xml", ".java", ".launch", ".properties"]
+def fileEndings = [".xml"]
+
+
+
+def currentDir = new File(".");
+
+currentDir.eachFileRecurse { file ->
+  def endsWithFileEnding = 
+    fileEndings.inject(false) { endsWith, fileEnding -> 
+      endsWith || file.name.endsWith(fileEnding) 
+    }
+  if (endsWithFileEnding) {
+    def fileText = file.text;
+    replacements.each { from, to -> 
+      def newFileText = fileText.replaceAll(from, to)
+      if(fileText != newFileText) {
+        if(options.v || !options.x) {
+            println(file.path)
+        }
+        if(options.x) {
+            file.write(newFileText);
+        }
+      }
+    }    
+  }
+}

Propchange: incubator/isis/trunk/framework/searchandreplace.groovy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/isis/trunk/framework/site-skin/NOTICE
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/isis/trunk/framework/site-skin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/site-skin/pom.xml?rev=1234516&r1=1234515&r2=1234516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/site-skin/pom.xml (original)
+++ incubator/isis/trunk/framework/site-skin/pom.xml Sun Jan 22 14:30:07 2012
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-         http://www.apache.org/licenses/LICENSE-2.0
-         
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-		<groupId>org.apache.isis</groupId>
-		<artifactId>isis</artifactId>
-		<version>0.2.0-incubating-SNAPSHOT</version>
-	</parent>  
-
-    <groupId>org.apache.isis.skins</groupId>
-    <artifactId>classic-skin</artifactId>
-
-    <name>Isis Skin</name>
-
-    <properties>
-        <siteBaseDir>..</siteBaseDir>
-        <relativeUrl>site-skin/</relativeUrl>
-    </properties>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+         http://www.apache.org/licenses/LICENSE-2.0
+         
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+		<groupId>org.apache.isis</groupId>
+		<artifactId>isis</artifactId>
+		<version>0.2.0-incubating-SNAPSHOT</version>
+	</parent>  
+
+    <groupId>org.apache.isis.skins</groupId>
+    <artifactId>classic-skin</artifactId>
+
+    <name>Isis Skin</name>
+
+    <properties>
+        <siteBaseDir>..</siteBaseDir>
+        <relativeUrl>site-skin/</relativeUrl>
+    </properties>
+
+</project>

Propchange: incubator/isis/trunk/framework/site-skin/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/isis/trunk/framework/site-skin/src/main/appended-resources/supplemental-models.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/site-skin/src/main/appended-resources/supplemental-models.xml?rev=1234516&r1=1234515&r2=1234516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/site-skin/src/main/appended-resources/supplemental-models.xml (original)
+++ incubator/isis/trunk/framework/site-skin/src/main/appended-resources/supplemental-models.xml Sun Jan 22 14:30:07 2012
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
-    license agreements. See the NOTICE file distributed with this work for additional 
-    information regarding copyright ownership. The ASF licenses this file to 
-    you under the Apache License, Version 2.0 (the "License"); you may not use 
-    this file except in compliance with the License. You may obtain a copy of 
-    the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-    by applicable law or agreed to in writing, software distributed under the 
-    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-    OF ANY KIND, either express or implied. See the License for the specific 
-    language governing permissions and limitations under the License. -->
-<supplementalDataModels xmlns="http://maven.apache.org/supplemental-model/1.0.0"
-                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                        xsi:schemaLocation="http://maven.apache.org/supplemental-model/1.0.0 http://maven.apache.org/xsd/supplemental-model-1.0.0.xsd">
-  
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+    license agreements. See the NOTICE file distributed with this work for additional 
+    information regarding copyright ownership. The ASF licenses this file to 
+    you under the Apache License, Version 2.0 (the "License"); you may not use 
+    this file except in compliance with the License. You may obtain a copy of 
+    the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+    by applicable law or agreed to in writing, software distributed under the 
+    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+    OF ANY KIND, either express or implied. See the License for the specific 
+    language governing permissions and limitations under the License. -->
+<supplementalDataModels xmlns="http://maven.apache.org/supplemental-model/1.0.0"
+                        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                        xsi:schemaLocation="http://maven.apache.org/supplemental-model/1.0.0 http://maven.apache.org/xsd/supplemental-model-1.0.0.xsd">
+  
 </supplementalDataModels>
\ No newline at end of file

Propchange: incubator/isis/trunk/framework/site-skin/src/main/appended-resources/supplemental-models.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/isis/trunk/framework/site-skin/src/main/resources/resources.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/isis/trunk/framework/src/docbkx/dtd-4.5/README
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/isis/trunk/framework/src/docbkx/dtd-4.5/calstblx.dtd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/isis/trunk/framework/src/docbkx/dtd-4.5/catalog.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/isis/trunk/framework/src/docbkx/dtd-4.5/docbookx.dtd
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/src/docbkx/dtd-4.5/docbookx.dtd?rev=1234516&r1=1234515&r2=1234516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/src/docbkx/dtd-4.5/docbookx.dtd (original)
+++ incubator/isis/trunk/framework/src/docbkx/dtd-4.5/docbookx.dtd Sun Jan 22 14:30:07 2012
@@ -127,7 +127,7 @@
 <!-- DTD modules .......................................................... -->
 
 <!-- Information pool .............. -->
-
+
 <!ENTITY % dbpool.module "INCLUDE">
 <![ %dbpool.module;[
 <!ENTITY % dbpool PUBLIC

Propchange: incubator/isis/trunk/framework/src/docbkx/dtd-4.5/docbookx.dtd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/isis/trunk/framework/src/docbkx/dtd-4.5/ent/README
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/isis/trunk/framework/src/docbkx/dtd-4.5/soextblx.dtd
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/isis/trunk/framework/src/docbkx/dtd-4.5/usage.txt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/src/docbkx/dtd-4.5/usage.txt?rev=1234516&r1=1234515&r2=1234516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/src/docbkx/dtd-4.5/usage.txt (original)
+++ incubator/isis/trunk/framework/src/docbkx/dtd-4.5/usage.txt Sun Jan 22 14:30:07 2012
@@ -1,15 +1,15 @@
-"file:///C|/1KevDev/docbook-xml-4.5/docbookx.dtd"
-
-Level 1
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"file:../../../../../resources/docbook-xml-4.5/docbookx.dtd">
-
-
-Level 2
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"file:../../../../../../resources/docbook-xml-4.5/docbookx.dtd">
-
-
-Level 3
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"file:../../../../../../../resources/docbook-xml-4.5/docbookx.dtd">
+"file:///C|/1KevDev/docbook-xml-4.5/docbookx.dtd"
+
+Level 1
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"file:../../../../../resources/docbook-xml-4.5/docbookx.dtd">
+
+
+Level 2
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"file:../../../../../../resources/docbook-xml-4.5/docbookx.dtd">
+
+
+Level 3
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"file:../../../../../../../resources/docbook-xml-4.5/docbookx.dtd">

Propchange: incubator/isis/trunk/framework/src/docbkx/dtd-4.5/usage.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/isis/trunk/framework/src/docbkx/guide/DRAFT/isis-contributors-guide.POSSIBLY-TO-INCLUDE.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml?rev=1234516&r1=1234515&r2=1234516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml (original)
+++ incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml Sun Jan 22 14:30:07 2012
@@ -391,6 +391,50 @@
           of wisdom here.</para>
         </sect2>
       </sect1>
+
+      <sect1>
+        <title>Setting up Subversion Client</title>
+
+        <para>As per <ulink
+        url="http://www.apache.org/dev/version-control.html#https-svn-config">Apache
+        standards</ulink>, the <varname>svn:eol-style</varname> and/or
+        <varname>svn:mime-type</varname> property must be set on every file.
+        Subversion can be configured to do this automatically for all new
+        files:</para>
+
+        <itemizedlist>
+          <listitem>
+            <para>Download the Apache subversion config file <ulink
+            url="http://www.apache.org/dev/svn-eol-style.txt">svn-eol-style.txt</ulink>;</para>
+          </listitem>
+
+          <listitem>
+            <para>As instructed, append to your local config file:</para>
+
+            <itemizedlist>
+              <listitem>
+                <para>on *Nix, this is at
+                <filename>~/.subversion/config</filename></para>
+              </listitem>
+
+              <listitem>
+                <para>on Windows &lt;Vista, this is at <filename>C:\Documents
+                and Settings\{username}\Application
+                Data\Subversion\config</filename></para>
+              </listitem>
+
+              <listitem>
+                <para>on Windows &gt;Vista, this is at
+                <filename>C:\Users\{username}\AppData\Roaming\Subversion\config</filename></para>
+              </listitem>
+            </itemizedlist>
+          </listitem>
+        </itemizedlist>
+
+        <para>Note that in the code release chapter <xref
+        linkend="chp.FormalRelease" /> there is also a manual procedure to
+        ensure that all files are set correctly.</para>
+      </sect1>
     </chapter>
 
     <chapter id="chp.SetUpDevelopmentEnvironment">
@@ -1536,6 +1580,13 @@ protected IsisConfiguration getConfigura
           reformatting all lines clearly could cause a lot of changes.</para>
         </warning>
       </sect1>
+
+      <sect1>
+        <title>Subversion Properties</title>
+
+        <para>An the svn:eol-style property should be set for each
+        file.</para>
+      </sect1>
     </chapter>
 
     <chapter id="chp.CodeQuality">
@@ -3395,8 +3446,8 @@ public class FooBar {
         </listitem>
 
         <listitem>
-          <para>next, , the <code>mvn release:prepare</code> command is used
-          to upload the signed versions of the artifacts (which includes the
+          <para>next, the <code>mvn release:perform</code> command is used to
+          upload the signed versions of the artifacts (which includes the
           source release <acronym>ZIP</acronym>) to the Apache staging
           repository. See <xref
           linkend="sec.UploadReleaseForVoting" />.</para>
@@ -3677,6 +3728,12 @@ public class FooBar {
         </sect2>
 
         <sect2>
+          <title>Fix Line Endings and Subversion Properties</title>
+
+          <para>The </para>
+        </sect2>
+
+        <sect2>
           <title>Code Cleanup / Formatting</title>
 
           <para>Make sure that all source code has been cleaned up and
@@ -5822,7 +5879,7 @@ gpg --armor --export nnnnnnnn &gt;&gt;KE
 
                 <para>This is convenient both for demos or (so long as an
                 in-memory object store is used) for distribution to business
-                stakeholders. </para>
+                stakeholders.</para>
               </listitem>
             </itemizedlist>
 

Propchange: incubator/isis/trunk/framework/src/docbkx/guide/isis-contributors-guide.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message