You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shale.apache.org by ra...@apache.org on 2007/01/11 22:31:41 UTC

svn commit: r495383 [1/2] - in /shale/framework/trunk: ./ shale-application/src/site/ shale-apps/mailreader-jpa/ shale-apps/mailreader-jpa/src/main/assembly/ shale-apps/shale-blank/ shale-apps/shale-blank/src/main/assembly/ shale-apps/shale-blank/src/s...

Author: rahul
Date: Thu Jan 11 13:31:37 2007
New Revision: 495383

URL: http://svn.apache.org/viewvc?view=rev&rev=495383
Log:
Port relevant 1_0_X branch changes to trunk, made as part of the v1.0.4 release preparation: r491965, r492748 (thanks to Niall Pemberton), r493062, r493066, r493067 and r493084.
SHALE-380

Added:
    shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/site/
    shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/site/site.xml   (with props)
    shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/site/xdoc/
    shale/framework/trunk/shale-apps/shale-sql-browser/src/site/
    shale/framework/trunk/shale-apps/shale-sql-browser/src/site/site.xml   (with props)
    shale/framework/trunk/shale-apps/shale-sql-browser/src/site/xdoc/
Removed:
    shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/resources/org/apache/shale/usecases/rolodex/Thumbs.db
    shale/framework/trunk/shale-apps/shale-sql-browser/src/conf/
    shale/framework/trunk/src/site/apt/cobertura/
Modified:
    shale/framework/trunk/pom.xml
    shale/framework/trunk/shale-application/src/site/site.xml
    shale/framework/trunk/shale-apps/mailreader-jpa/pom.xml
    shale/framework/trunk/shale-apps/mailreader-jpa/profiles.xml
    shale/framework/trunk/shale-apps/mailreader-jpa/src/main/assembly/dep.xml
    shale/framework/trunk/shale-apps/shale-blank/pom.xml
    shale/framework/trunk/shale-apps/shale-blank/src/main/assembly/dep.xml
    shale/framework/trunk/shale-apps/shale-blank/src/site/site.xml
    shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/assembly/dep.xml
    shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/resources/org/apache/shale/usecases/rolodex/   (props changed)
    shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/resources/org/apache/shale/usecases/rolodex/address.html
    shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/resources/org/apache/shale/usecases/symbols/inputTextWidget.html
    shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/hrolodex.html
    shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jrolodex.html
    shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jsprolodex.jsp
    shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/viewsource.html
    shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/xhrolodex.html
    shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/businessPerson.html
    shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/businessPerson1.html
    shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/fullperson.html
    shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/header.html
    shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/layout.html
    shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/page3.html
    shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/viewsource.html
    shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/welcome.jsp
    shale/framework/trunk/shale-apps/shale-clay-usecases/src/site/site.xml
    shale/framework/trunk/shale-apps/shale-clay-usecases/src/test/java/org/apache/shale/usecases/rolodex/RolodexTestCase.java
    shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/assembly/dep.xml
    shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/resources/org/apache/shale/examples/mailreaderjpa/Bundle.properties
    shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/webapp/META-INF/context.xml
    shale/framework/trunk/shale-apps/shale-mailreader/src/main/assembly/dep.xml
    shale/framework/trunk/shale-apps/shale-mailreader/src/main/webapp/welcome.jsp
    shale/framework/trunk/shale-apps/shale-mailreader/src/site/site.xml
    shale/framework/trunk/shale-apps/shale-mailreader/src/test/selenium/TestCreateNew.html
    shale/framework/trunk/shale-apps/shale-mailreader/src/test/selenium/TestRegistration.html
    shale/framework/trunk/shale-apps/shale-mailreader/src/test/selenium/TestSuite.html
    shale/framework/trunk/shale-apps/shale-sql-browser/src/main/assembly/dep.xml
    shale/framework/trunk/shale-apps/shale-test-core/pom.xml
    shale/framework/trunk/shale-apps/shale-test-core/src/site/site.xml
    shale/framework/trunk/shale-apps/shale-test-dialog-basic/pom.xml
    shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/site/site.xml
    shale/framework/trunk/shale-apps/shale-test-dialog-scxml/pom.xml
    shale/framework/trunk/shale-apps/shale-test-dialog-scxml/src/site/site.xml
    shale/framework/trunk/shale-apps/shale-test-tiger/pom.xml
    shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/ApplicationBean.java
    shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/Managed.java
    shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/RequestBean.java
    shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/SessionBean.java
    shale/framework/trunk/shale-apps/shale-test-tiger/src/main/webapp/META-INF/context.xml
    shale/framework/trunk/shale-apps/shale-test-tiger/src/site/site.xml
    shale/framework/trunk/shale-apps/shale-test-view/pom.xml
    shale/framework/trunk/shale-apps/shale-test-view/src/main/webapp/META-INF/context.xml
    shale/framework/trunk/shale-apps/shale-test-view/src/site/site.xml
    shale/framework/trunk/shale-apps/shale-usecases/pom.xml   (contents, props changed)
    shale/framework/trunk/shale-apps/shale-usecases/src/main/assembly/dep.xml
    shale/framework/trunk/shale-apps/shale-usecases/src/site/site.xml
    shale/framework/trunk/shale-apps/shale-usecases/src/site/xdoc/dependencies.xml
    shale/framework/trunk/shale-apps/src/site/apt/selenium.apt
    shale/framework/trunk/shale-apps/src/site/site.xml
    shale/framework/trunk/shale-clay/src/site/site.xml
    shale/framework/trunk/shale-clay/src/test/java/org/apache/shale/clay/config/AssignViewRootTestCase.java
    shale/framework/trunk/shale-clay/src/test/java/org/apache/shale/clay/config/ConverterTestCase.java
    shale/framework/trunk/shale-clay/src/test/java/org/apache/shale/clay/config/LimitedJspxTestCase.java
    shale/framework/trunk/shale-core/README.html
    shale/framework/trunk/shale-core/src/site/site.xml
    shale/framework/trunk/shale-dialog-basic/src/site/site.xml
    shale/framework/trunk/shale-dialog-scxml/src/site/site.xml
    shale/framework/trunk/shale-dialog/src/site/site.xml
    shale/framework/trunk/shale-dist/src/assemble/dist.xml
    shale/framework/trunk/shale-remoting/src/site/site.xml
    shale/framework/trunk/shale-spring/src/site/site.xml
    shale/framework/trunk/shale-test/src/site/site.xml
    shale/framework/trunk/shale-tiger/src/site/site.xml
    shale/framework/trunk/shale-tiles/src/site/site.xml
    shale/framework/trunk/shale-validator/src/site/site.xml
    shale/framework/trunk/shale-view/src/site/site.xml
    shale/framework/trunk/src/site/resources/doap_Shale.rdf
    shale/framework/trunk/src/site/site.xml

Modified: shale/framework/trunk/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/pom.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/pom.xml (original)
+++ shale/framework/trunk/pom.xml Thu Jan 11 13:31:37 2007
@@ -200,6 +200,40 @@
 
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Specification-Title>${project.name}</Specification-Title>
+                            <Specification-Version>${project.version}</Specification-Version>
+                            <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+                            <Implementation-Title>${project.name}</Implementation-Title>
+                            <Implementation-Version>${project.version}</Implementation-Version>
+                            <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+                            <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <Specification-Title>${project.name}</Specification-Title>
+                            <Specification-Version>${project.version}</Specification-Version>
+                            <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+                            <Implementation-Title>${project.name}</Implementation-Title>
+                            <Implementation-Version>${project.version}</Implementation-Version>
+                            <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+                            <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
                <artifactId>maven-antrun-plugin</artifactId>
                <inherited>false</inherited>
                <executions>
@@ -278,10 +312,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </reporting>

Modified: shale/framework/trunk/shale-application/src/site/site.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-application/src/site/site.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-application/src/site/site.xml (original)
+++ shale/framework/trunk/shale-application/src/site/site.xml Thu Jan 11 13:31:37 2007
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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 name="Apache Shale Framework - Application Controller">
 
   <bannerLeft>

Modified: shale/framework/trunk/shale-apps/mailreader-jpa/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/mailreader-jpa/pom.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/mailreader-jpa/pom.xml (original)
+++ shale/framework/trunk/shale-apps/mailreader-jpa/pom.xml Thu Jan 11 13:31:37 2007
@@ -33,7 +33,6 @@
   <groupId>org.apache.shale.extras</groupId>
   <artifactId>mailreader-jpa</artifactId>
   <packaging>jar</packaging>
-  <version>1.1.0-SNAPSHOT</version>
   <name>MailReader JPA Entity Classes</name>
 
   <scm>

Modified: shale/framework/trunk/shale-apps/mailreader-jpa/profiles.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/mailreader-jpa/profiles.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/mailreader-jpa/profiles.xml (original)
+++ shale/framework/trunk/shale-apps/mailreader-jpa/profiles.xml Thu Jan 11 13:31:37 2007
@@ -1 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?><profilesXml />
\ No newline at end of file
+<?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.
+ *
+ * $Id$
+ */
+-->
+<profilesXml />

Modified: shale/framework/trunk/shale-apps/mailreader-jpa/src/main/assembly/dep.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/mailreader-jpa/src/main/assembly/dep.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/mailreader-jpa/src/main/assembly/dep.xml (original)
+++ shale/framework/trunk/shale-apps/mailreader-jpa/src/main/assembly/dep.xml Thu Jan 11 13:31:37 2007
@@ -20,7 +20,6 @@
 
     <id></id>
     <formats>
-        <format>tar.gz</format>
         <format>zip</format>
     </formats>
     <includeBaseDirectory>true</includeBaseDirectory>

Modified: shale/framework/trunk/shale-apps/shale-blank/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-blank/pom.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-blank/pom.xml (original)
+++ shale/framework/trunk/shale-apps/shale-blank/pom.xml Thu Jan 11 13:31:37 2007
@@ -42,6 +42,29 @@
         </dependency>
 
         <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>avalon-framework</groupId>
+                    <artifactId>avalon-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>logkit</groupId>
+                    <artifactId>logkit</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
             <groupId>htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
             <version>1.8</version>

Modified: shale/framework/trunk/shale-apps/shale-blank/src/main/assembly/dep.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-blank/src/main/assembly/dep.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-blank/src/main/assembly/dep.xml (original)
+++ shale/framework/trunk/shale-apps/shale-blank/src/main/assembly/dep.xml Thu Jan 11 13:31:37 2007
@@ -22,7 +22,6 @@
 
     <id></id>
     <formats>
-        <format>tar.gz</format>
         <format>zip</format>
     </formats>
     <includeBaseDirectory>true</includeBaseDirectory>

Modified: shale/framework/trunk/shale-apps/shale-blank/src/site/site.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-blank/src/site/site.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-blank/src/site/site.xml (original)
+++ shale/framework/trunk/shale-apps/shale-blank/src/site/site.xml Thu Jan 11 13:31:37 2007
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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 name="Apache Shale Framework - Blank Starter App">
 
   <bannerLeft>

Modified: shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/assembly/dep.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/assembly/dep.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/assembly/dep.xml (original)
+++ shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/assembly/dep.xml Thu Jan 11 13:31:37 2007
@@ -22,7 +22,6 @@
 
     <id></id>
     <formats>
-        <format>tar.gz</format>
         <format>zip</format>
     </formats>
     <includeBaseDirectory>true</includeBaseDirectory>

Propchange: shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/resources/org/apache/shale/usecases/rolodex/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jan 11 13:31:37 2007
@@ -0,0 +1 @@
+Thumbs.db

Modified: shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/resources/org/apache/shale/usecases/rolodex/address.html
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/resources/org/apache/shale/usecases/rolodex/address.html?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/resources/org/apache/shale/usecases/rolodex/address.html (original)
+++ shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/resources/org/apache/shale/usecases/rolodex/address.html Thu Jan 11 13:31:37 2007
@@ -1,4 +1,24 @@
 <table border=0>
+<!-- ### clay:remove ### -->
+<!--
+
+ 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.
+
+-->
+<!-- ### /clay:remove ### -->
    <tr class="contactsHeader">
       <td rowspan="6">H<br>T<br>M<br>L<BR></td>
    </tr>

Modified: shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/resources/org/apache/shale/usecases/symbols/inputTextWidget.html
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/resources/org/apache/shale/usecases/symbols/inputTextWidget.html?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/resources/org/apache/shale/usecases/symbols/inputTextWidget.html (original)
+++ shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/resources/org/apache/shale/usecases/symbols/inputTextWidget.html Thu Jan 11 13:31:37 2007
@@ -1,4 +1,24 @@
 <tr>
+<!-- ### clay:remove ### -->
+<!--
+
+ 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.
+
+-->
+<!-- ### /clay:remove ### -->
    <td><label jsfid="widgetsLabel">Mock Label:</label></td>
    <td><input jsfid="widgetsText" type="text"/></td>
    <td><span jsfid="widgetsMessage">Mock Message</span><td>

Modified: shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/hrolodex.html
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/hrolodex.html?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/hrolodex.html (original)
+++ shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/hrolodex.html Thu Jan 11 13:31:37 2007
@@ -1,4 +1,24 @@
 <html>
+<!-- ### clay:remove ### -->
+<!--
+
+ 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.
+
+-->
+<!-- ### /clay:remove ### -->
 <head>
 <span jsfid="loadBundle"
 	basename="org.apache.shale.usecases.view.Bundle" var="messages" />

Modified: shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jrolodex.html
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jrolodex.html?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jrolodex.html (original)
+++ shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jrolodex.html Thu Jan 11 13:31:37 2007
@@ -4,6 +4,24 @@
 	xmlns:clay="http://shale.apache.org/clay"
 	xmlns:s="http://shale.apache.org/core"
 	xmlns:val="http://shale.apache.org/validator">
+<!--
+
+ 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.
+
+-->
 <head>
 <clay:loadBundle basename="org.apache.shale.usecases.view.Bundle"
 	var="messages" />

Modified: shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jsprolodex.jsp
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jsprolodex.jsp?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jsprolodex.jsp (original)
+++ shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/jsprolodex.jsp Thu Jan 11 13:31:37 2007
@@ -1,4 +1,22 @@
 <%@page contentType="text/html;charset=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.
+
+--%>
 <%@ taglib prefix="f" uri="http://java.sun.com/jsf/core"%>
 <%@ taglib prefix="h" uri="http://java.sun.com/jsf/html"%>
 <%@ taglib prefix="s" uri="http://shale.apache.org/core"%>

Modified: shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/viewsource.html
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/viewsource.html?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/viewsource.html (original)
+++ shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/viewsource.html Thu Jan 11 13:31:37 2007
@@ -1,4 +1,24 @@
 <html>
+<!-- ### clay:remove ### -->
+<!--
+
+ 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.
+
+-->
+<!-- ### /clay:remove ### -->
 <head>
 <title>View Rolodex Example Source ("#{param['url']})</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />

Modified: shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/xhrolodex.html
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/xhrolodex.html?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/xhrolodex.html (original)
+++ shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/rolodex/xhrolodex.html Thu Jan 11 13:31:37 2007
@@ -1,4 +1,24 @@
 <html>
+<!-- ### clay:remove ### -->
+<!--
+
+ 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.
+
+-->
+<!-- ### /clay:remove ### -->
 <head>
 <span jsfid="loadBundle"
 	basename="org.apache.shale.usecases.view.Bundle" var="messages" />

Modified: shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/businessPerson.html
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/businessPerson.html?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/businessPerson.html (original)
+++ shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/businessPerson.html Thu Jan 11 13:31:37 2007
@@ -1,3 +1,23 @@
+<!-- ### clay:remove ### -->
+<!--
+
+ 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.
+
+-->
+<!-- ### /clay:remove ### -->
 <span jsfid="page3Panel">
 <table>
 	<tr>

Modified: shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/businessPerson1.html
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/businessPerson1.html?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/businessPerson1.html (original)
+++ shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/businessPerson1.html Thu Jan 11 13:31:37 2007
@@ -1,3 +1,23 @@
+<!-- ### clay:remove ### -->
+<!--
+
+ 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.
+
+-->
+<!-- ### /clay:remove ### -->
 <table xmlns:clay="http://shale.apache.org/xml/clay">
 	<tr>
 		<td colspan="3">

Modified: shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/fullperson.html
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/fullperson.html?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/fullperson.html (original)
+++ shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/fullperson.html Thu Jan 11 13:31:37 2007
@@ -1,4 +1,22 @@
 <!-- ### clay:remove ### -->
+<!--
+
+ 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.
+
+-->
 <html>
 <head>
 <title>Mock Title</title>

Modified: shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/header.html
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/header.html?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/header.html (original)
+++ shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/header.html Thu Jan 11 13:31:37 2007
@@ -1 +1,21 @@
+<!-- ### clay:remove ### -->
+<!--
+
+ 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.
+
+-->
+<!-- ### /clay:remove ### -->
 <img src="@logo">

Modified: shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/layout.html
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/layout.html?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/layout.html (original)
+++ shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/layout.html Thu Jan 11 13:31:37 2007
@@ -1,4 +1,24 @@
 <html>
+<!-- ### clay:remove ### -->
+<!--
+
+ 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.
+
+-->
+<!-- ### /clay:remove ### -->
    <head><title>@title</title></head>
    <body>
       <form>

Modified: shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/page3.html
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/page3.html?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/page3.html (original)
+++ shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/page3.html Thu Jan 11 13:31:37 2007
@@ -1,6 +1,25 @@
 <html jsfid="basePage" bodycontent="/symbols/businessPerson.html"
 	allowBody="false">
+<!-- ### clay:remove ### -->
+<!--
 
+ 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.
+
+-->
+<!-- ### /clay:remove ### -->
 <head>
 <title>Mock Header</title>
 </head>

Modified: shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/viewsource.html
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/viewsource.html?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/viewsource.html (original)
+++ shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/symbols/viewsource.html Thu Jan 11 13:31:37 2007
@@ -1,4 +1,24 @@
 <html>
+<!-- ### clay:remove ### -->
+<!--
+
+ 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.
+
+-->
+<!-- ### /clay:remove ### -->
 <head>
 <title>View Symbols Example Source ("#{param['url']})</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />

Modified: shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/welcome.jsp
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/welcome.jsp?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/welcome.jsp (original)
+++ shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/welcome.jsp Thu Jan 11 13:31:37 2007
@@ -1 +1,19 @@
+<%--
+
+ 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.
+
+--%>
 <jsp:forward page="/usecases.faces"/>

Modified: shale/framework/trunk/shale-apps/shale-clay-usecases/src/site/site.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/src/site/site.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-clay-usecases/src/site/site.xml (original)
+++ shale/framework/trunk/shale-apps/shale-clay-usecases/src/site/site.xml Thu Jan 11 13:31:37 2007
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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 name="Apache Shale Framework - Clay Use Cases Sample App">
 
   <bannerLeft>

Modified: shale/framework/trunk/shale-apps/shale-clay-usecases/src/test/java/org/apache/shale/usecases/rolodex/RolodexTestCase.java
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/src/test/java/org/apache/shale/usecases/rolodex/RolodexTestCase.java?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-clay-usecases/src/test/java/org/apache/shale/usecases/rolodex/RolodexTestCase.java (original)
+++ shale/framework/trunk/shale-apps/shale-clay-usecases/src/test/java/org/apache/shale/usecases/rolodex/RolodexTestCase.java Thu Jan 11 13:31:37 2007
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.shale.usecases.rolodex;
 
 import java.io.UnsupportedEncodingException;

Modified: shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/assembly/dep.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/assembly/dep.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/assembly/dep.xml (original)
+++ shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/assembly/dep.xml Thu Jan 11 13:31:37 2007
@@ -20,7 +20,6 @@
 
     <id></id>
     <formats>
-        <format>tar.gz</format>
         <format>zip</format>
     </formats>
     <includeBaseDirectory>true</includeBaseDirectory>

Modified: shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/resources/org/apache/shale/examples/mailreaderjpa/Bundle.properties
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/resources/org/apache/shale/examples/mailreaderjpa/Bundle.properties?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/resources/org/apache/shale/examples/mailreaderjpa/Bundle.properties (original)
+++ shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/resources/org/apache/shale/examples/mailreaderjpa/Bundle.properties Thu Jan 11 13:31:37 2007
@@ -1,4 +1,21 @@
 # Localized messages for this application
+#
+# 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.
+#
+# $Id$
 
 button.add=Add New
 button.back=Back

Modified: shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/webapp/META-INF/context.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/webapp/META-INF/context.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/webapp/META-INF/context.xml (original)
+++ shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/main/webapp/META-INF/context.xml Thu Jan 11 13:31:37 2007
@@ -1,2 +1,20 @@
 <?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.
+
+-->
 <Context path="/shale-mailreader-jpa"/>

Added: shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/site/site.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/site/site.xml?view=auto&rev=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/site/site.xml (added)
+++ shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/site/site.xml Thu Jan 11 13:31:37 2007
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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 name="Apache Shale Framework - Shale Mailreader JPA Sample App">
+
+  <bannerLeft>
+        <name>Apache Software Foundation</name>
+        <src>http://www.apache.org/images/asf-logo.gif</src>
+        <href>http://www.apache.org</href>
+  </bannerLeft>
+  <bannerRight>
+        <name>Apache Shale</name>
+        <src>../../images/shale-logo.jpg</src>
+        <href>http://shale.apache.org</href>
+  </bannerRight>
+
+  <body>
+
+    <menu name="Sub-Project Documentation">
+        <item name="Application Controller"
+                                        href="../../shale-application/index.html"/>
+        <item name="Clay"               href="../../shale-clay/index.html"/>
+        <item name="Core Library"       href="../../shale-core/index.html"/>
+        <item name="Dialog Manager"     href="../../shale-dialog/index.html"/>
+        <item name="Dialog Manager (Basic Implementation)"
+                                        href="../../shale-dialog-basic/index.html"/>
+        <item name="Dialog Manager (SCXML Implementation)"
+                                        href="../../shale-dialog-scxml/index.html"/>
+        <item name="Remoting"           href="../../shale-remoting/index.html"/>
+        <item name="Spring Integration" href="../../shale-spring/index.html"/>
+        <item name="Test Framework"     href="../../shale-test/index.html"/>
+        <item name="Tiger Extensions"   href="../../shale-tiger/index.html"/>
+        <item name="Tiles Integration"  href="../../shale-tiles/index.html"/>
+        <item name="Validator Support"  href="../../shale-validator/index.html"/>
+        <item name="View Controller"    href="../../shale-view/index.html"/>
+    </menu>
+
+    <menu name="Sample Apps Documentation">
+        <item name="Blank Starter"      href="../shale-blank/index.html"/>
+        <item name="Clay Use Cases"     href="../shale-clay-usecases/index.html"/>
+        <item name="Mail Reader"        href="../shale-mailreader/index.html"/>
+        <item name="SQL Browser"        href="../shale-sql-browser/index.html"/>
+        <item name="Use Cases"          href="../shale-usecases/index.html"/>
+    </menu>
+
+    <menu name="Quick Links">
+        <item name="JavaServer Faces"
+              href="http://java.sun.com/javaee/javaserverfaces/"/>
+        <item name="MyFaces"
+              href="http://myfaces.apache.org"/>
+        <item name="Shale"
+              href="http://shale.apache.org"/>
+        <item name="Shale Sandbox"
+              href="http://shale.apache.org/sandbox"/>
+        <item name="Struts"
+              href="http://struts.apache.org"/>
+        <item name="Struts-Faces Integration Library"
+              href="http://struts.apache.org/1.x/struts-faces"/>
+    </menu>
+
+    ${reports}
+    
+  </body>
+
+</project>

Propchange: shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shale/framework/trunk/shale-apps/shale-mailreader-jpa/src/site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: shale/framework/trunk/shale-apps/shale-mailreader/src/main/assembly/dep.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-mailreader/src/main/assembly/dep.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-mailreader/src/main/assembly/dep.xml (original)
+++ shale/framework/trunk/shale-apps/shale-mailreader/src/main/assembly/dep.xml Thu Jan 11 13:31:37 2007
@@ -22,7 +22,6 @@
 
     <id></id>
     <formats>
-        <format>tar.gz</format>
         <format>zip</format>
     </formats>
     <includeBaseDirectory>true</includeBaseDirectory>

Modified: shale/framework/trunk/shale-apps/shale-mailreader/src/main/webapp/welcome.jsp
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-mailreader/src/main/webapp/welcome.jsp?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-mailreader/src/main/webapp/welcome.jsp (original)
+++ shale/framework/trunk/shale-apps/shale-mailreader/src/main/webapp/welcome.jsp Thu Jan 11 13:31:37 2007
@@ -1 +1,19 @@
-<jsp:forward page="/index.faces"/>
+<%--
+
+ 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.
+
+--%>
+<jsp:forward page="/index.faces"/>

Modified: shale/framework/trunk/shale-apps/shale-mailreader/src/site/site.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-mailreader/src/site/site.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-mailreader/src/site/site.xml (original)
+++ shale/framework/trunk/shale-apps/shale-mailreader/src/site/site.xml Thu Jan 11 13:31:37 2007
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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 name="Apache Shale Framework - Mailreader Example App">
 
   <bannerLeft>

Modified: shale/framework/trunk/shale-apps/shale-mailreader/src/test/selenium/TestCreateNew.html
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-mailreader/src/test/selenium/TestCreateNew.html?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-mailreader/src/test/selenium/TestCreateNew.html (original)
+++ shale/framework/trunk/shale-apps/shale-mailreader/src/test/selenium/TestCreateNew.html Thu Jan 11 13:31:37 2007
@@ -1,4 +1,20 @@
 <html>
+<!--
+ 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.
+-->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Create New Subscription Test</title>

Modified: shale/framework/trunk/shale-apps/shale-mailreader/src/test/selenium/TestRegistration.html
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-mailreader/src/test/selenium/TestRegistration.html?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-mailreader/src/test/selenium/TestRegistration.html (original)
+++ shale/framework/trunk/shale-apps/shale-mailreader/src/test/selenium/TestRegistration.html Thu Jan 11 13:31:37 2007
@@ -1,4 +1,20 @@
 <html>
+<!--
+ 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.
+-->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Registration Test</title>

Modified: shale/framework/trunk/shale-apps/shale-mailreader/src/test/selenium/TestSuite.html
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-mailreader/src/test/selenium/TestSuite.html?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-mailreader/src/test/selenium/TestSuite.html (original)
+++ shale/framework/trunk/shale-apps/shale-mailreader/src/test/selenium/TestSuite.html Thu Jan 11 13:31:37 2007
@@ -1,4 +1,20 @@
 <html>
+<!--
+ 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.
+-->
 <body>
 
 <table>

Modified: shale/framework/trunk/shale-apps/shale-sql-browser/src/main/assembly/dep.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-sql-browser/src/main/assembly/dep.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-sql-browser/src/main/assembly/dep.xml (original)
+++ shale/framework/trunk/shale-apps/shale-sql-browser/src/main/assembly/dep.xml Thu Jan 11 13:31:37 2007
@@ -22,7 +22,6 @@
 
     <id></id>
     <formats>
-        <format>tar.gz</format>
         <format>zip</format>
     </formats>
     <includeBaseDirectory>true</includeBaseDirectory>

Added: shale/framework/trunk/shale-apps/shale-sql-browser/src/site/site.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-sql-browser/src/site/site.xml?view=auto&rev=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-sql-browser/src/site/site.xml (added)
+++ shale/framework/trunk/shale-apps/shale-sql-browser/src/site/site.xml Thu Jan 11 13:31:37 2007
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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 name="Apache Shale Framework - Shale SQL Browser Sample App">
+
+  <bannerLeft>
+        <name>Apache Software Foundation</name>
+        <src>http://www.apache.org/images/asf-logo.gif</src>
+        <href>http://www.apache.org</href>
+  </bannerLeft>
+  <bannerRight>
+        <name>Apache Shale</name>
+        <src>../../images/shale-logo.jpg</src>
+        <href>http://shale.apache.org</href>
+  </bannerRight>
+
+  <body>
+
+    <menu name="Sub-Project Documentation">
+        <item name="Application Controller"
+                                        href="../../shale-application/index.html"/>
+        <item name="Clay"               href="../../shale-clay/index.html"/>
+        <item name="Core Library"       href="../../shale-core/index.html"/>
+        <item name="Dialog Manager"     href="../../shale-dialog/index.html"/>
+        <item name="Dialog Manager (Basic Implementation)"
+                                        href="../../shale-dialog-basic/index.html"/>
+        <item name="Dialog Manager (SCXML Implementation)"
+                                        href="../../shale-dialog-scxml/index.html"/>
+        <item name="Remoting"           href="../../shale-remoting/index.html"/>
+        <item name="Spring Integration" href="../../shale-spring/index.html"/>
+        <item name="Test Framework"     href="../../shale-test/index.html"/>
+        <item name="Tiger Extensions"   href="../../shale-tiger/index.html"/>
+        <item name="Tiles Integration"  href="../../shale-tiles/index.html"/>
+        <item name="Validator Support"  href="../../shale-validator/index.html"/>
+        <item name="View Controller"    href="../../shale-view/index.html"/>
+    </menu>
+
+    <menu name="Sample Apps Documentation">
+        <item name="Blank Starter"      href="../shale-blank/index.html"/>
+        <item name="Clay Use Cases"     href="../shale-clay-usecases/index.html"/>
+        <item name="Mail Reader"        href="../shale-mailreader/index.html"/>
+        <item name="SQL Browser"        href="../shale-sql-browser/index.html"/>
+        <item name="Use Cases"          href="../shale-usecases/index.html"/>
+    </menu>
+
+    <menu name="Quick Links">
+        <item name="JavaServer Faces"
+              href="http://java.sun.com/javaee/javaserverfaces/"/>
+        <item name="MyFaces"
+              href="http://myfaces.apache.org"/>
+        <item name="Shale"
+              href="http://shale.apache.org"/>
+        <item name="Shale Sandbox"
+              href="http://shale.apache.org/sandbox"/>
+        <item name="Struts"
+              href="http://struts.apache.org"/>
+        <item name="Struts-Faces Integration Library"
+              href="http://struts.apache.org/1.x/struts-faces"/>
+    </menu>
+
+    ${reports}
+    
+  </body>
+
+</project>

Propchange: shale/framework/trunk/shale-apps/shale-sql-browser/src/site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: shale/framework/trunk/shale-apps/shale-sql-browser/src/site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: shale/framework/trunk/shale-apps/shale-test-core/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-core/pom.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-core/pom.xml (original)
+++ shale/framework/trunk/shale-apps/shale-test-core/pom.xml Thu Jan 11 13:31:37 2007
@@ -42,6 +42,29 @@
         </dependency>
 
         <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>avalon-framework</groupId>
+                    <artifactId>avalon-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>logkit</groupId>
+                    <artifactId>logkit</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
             <groupId>htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
             <version>1.8</version>

Modified: shale/framework/trunk/shale-apps/shale-test-core/src/site/site.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-core/src/site/site.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-core/src/site/site.xml (original)
+++ shale/framework/trunk/shale-apps/shale-test-core/src/site/site.xml Thu Jan 11 13:31:37 2007
@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Apache Shale Framework - Blank Starter App">
+<!--
+ 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 name="Apache Shale Framework - Shale Core Test Application">
 
   <bannerLeft>
         <name>Apache Software Foundation</name>

Modified: shale/framework/trunk/shale-apps/shale-test-dialog-basic/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-basic/pom.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-dialog-basic/pom.xml (original)
+++ shale/framework/trunk/shale-apps/shale-test-dialog-basic/pom.xml Thu Jan 11 13:31:37 2007
@@ -44,6 +44,29 @@
         </dependency>
 
         <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>avalon-framework</groupId>
+                    <artifactId>avalon-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>logkit</groupId>
+                    <artifactId>logkit</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
             <groupId>htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
             <version>1.8</version>

Modified: shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/site/site.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/site/site.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/site/site.xml (original)
+++ shale/framework/trunk/shale-apps/shale-test-dialog-basic/src/site/site.xml Thu Jan 11 13:31:37 2007
@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Apache Shale Framework - Blank Starter App">
+<!--
+ 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 name="Apache Shale Framework - Shale Dialogs Basic Impl Test App">
 
   <bannerLeft>
         <name>Apache Software Foundation</name>

Modified: shale/framework/trunk/shale-apps/shale-test-dialog-scxml/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-scxml/pom.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-dialog-scxml/pom.xml (original)
+++ shale/framework/trunk/shale-apps/shale-test-dialog-scxml/pom.xml Thu Jan 11 13:31:37 2007
@@ -43,6 +43,29 @@
         </dependency>
 
         <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>avalon-framework</groupId>
+                    <artifactId>avalon-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>logkit</groupId>
+                    <artifactId>logkit</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
             <groupId>htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
             <version>1.8</version>

Modified: shale/framework/trunk/shale-apps/shale-test-dialog-scxml/src/site/site.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-dialog-scxml/src/site/site.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-dialog-scxml/src/site/site.xml (original)
+++ shale/framework/trunk/shale-apps/shale-test-dialog-scxml/src/site/site.xml Thu Jan 11 13:31:37 2007
@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Apache Shale Framework - Blank Starter App">
+<!--
+ 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 name="Apache Shale Framework - Shale Dialogs SCXML Impl Test App">
 
   <bannerLeft>
         <name>Apache Software Foundation</name>

Modified: shale/framework/trunk/shale-apps/shale-test-tiger/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-tiger/pom.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-tiger/pom.xml (original)
+++ shale/framework/trunk/shale-apps/shale-test-tiger/pom.xml Thu Jan 11 13:31:37 2007
@@ -42,6 +42,29 @@
         </dependency>
 
         <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>avalon-framework</groupId>
+                    <artifactId>avalon-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>logkit</groupId>
+                    <artifactId>logkit</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
             <groupId>htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
             <version>1.8</version>

Modified: shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/ApplicationBean.java
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/ApplicationBean.java?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/ApplicationBean.java (original)
+++ shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/ApplicationBean.java Thu Jan 11 13:31:37 2007
@@ -1,10 +1,20 @@
 /*
- * ApplicationBean.java
+ * 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
  *
- * Created on August 13, 2006, 10:04 AM
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
+ * 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.
+ *
+ * $Id$
  */
 
 package org.apache.shale.examples.test.tiger;

Modified: shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/Managed.java
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/Managed.java?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/Managed.java (original)
+++ shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/Managed.java Thu Jan 11 13:31:37 2007
@@ -1,10 +1,20 @@
 /*
- * ApplicationBean.java
+ * 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
  *
- * Created on August 13, 2006, 10:04 AM
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
+ * 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.
+ *
+ * $Id$
  */
 
 package org.apache.shale.examples.test.tiger;

Modified: shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/RequestBean.java
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/RequestBean.java?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/RequestBean.java (original)
+++ shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/RequestBean.java Thu Jan 11 13:31:37 2007
@@ -1,10 +1,20 @@
 /*
- * ApplicationBean.java
+ * 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
  *
- * Created on August 13, 2006, 10:04 AM
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
+ * 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.
+ *
+ * $Id$
  */
 
 package org.apache.shale.examples.test.tiger;

Modified: shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/SessionBean.java
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/SessionBean.java?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/SessionBean.java (original)
+++ shale/framework/trunk/shale-apps/shale-test-tiger/src/main/java/org/apache/shale/examples/test/tiger/SessionBean.java Thu Jan 11 13:31:37 2007
@@ -1,10 +1,20 @@
 /*
- * ApplicationBean.java
+ * 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
  *
- * Created on August 13, 2006, 10:04 AM
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
+ * 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.
+ *
+ * $Id$
  */
 
 package org.apache.shale.examples.test.tiger;

Modified: shale/framework/trunk/shale-apps/shale-test-tiger/src/main/webapp/META-INF/context.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-tiger/src/main/webapp/META-INF/context.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-tiger/src/main/webapp/META-INF/context.xml (original)
+++ shale/framework/trunk/shale-apps/shale-test-tiger/src/main/webapp/META-INF/context.xml Thu Jan 11 13:31:37 2007
@@ -1,2 +1,20 @@
 <?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.
+
+-->
 <Context path="/shale-test-tiger"/>

Modified: shale/framework/trunk/shale-apps/shale-test-tiger/src/site/site.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-tiger/src/site/site.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-tiger/src/site/site.xml (original)
+++ shale/framework/trunk/shale-apps/shale-test-tiger/src/site/site.xml Thu Jan 11 13:31:37 2007
@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Apache Shale Framework - Blank Starter App">
+<!--
+ 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 name="Apache Shale Framework - Shale Tiger Test Application">
 
   <bannerLeft>
         <name>Apache Software Foundation</name>

Modified: shale/framework/trunk/shale-apps/shale-test-view/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-test-view/pom.xml?view=diff&rev=495383&r1=495382&r2=495383
==============================================================================
--- shale/framework/trunk/shale-apps/shale-test-view/pom.xml (original)
+++ shale/framework/trunk/shale-apps/shale-test-view/pom.xml Thu Jan 11 13:31:37 2007
@@ -42,6 +42,29 @@
         </dependency>
 
         <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>avalon-framework</groupId>
+                    <artifactId>avalon-framework</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>logkit</groupId>
+                    <artifactId>logkit</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
             <groupId>htmlunit</groupId>
             <artifactId>htmlunit</artifactId>
             <version>1.8</version>