You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shale.apache.org by cr...@apache.org on 2006/10/12 02:59:34 UTC
svn commit: r463092 - in /shale/framework/trunk: shale-application/
shale-application/src/ shale-application/src/main/
shale-application/src/main/java/ shale-application/src/main/java/org/
shale-application/src/main/java/org/apache/ shale-application/s...
Author: craigmcc
Date: Wed Oct 11 17:59:32 2006
New Revision: 463092
URL: http://svn.apache.org/viewvc?view=rev&rev=463092
Log:
Split out the application controller functionality into a new
shale-application module.
SHALE-304
Added:
shale/framework/trunk/shale-application/
shale/framework/trunk/shale-application/pom.xml (with props)
shale/framework/trunk/shale-application/src/
shale/framework/trunk/shale-application/src/main/
shale/framework/trunk/shale-application/src/main/java/
shale/framework/trunk/shale-application/src/main/java/org/
shale/framework/trunk/shale-application/src/main/java/org/apache/
shale/framework/trunk/shale-application/src/main/java/org/apache/shale/
shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/
shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/AbstractRegExpFilter.java
- copied, changed from r462943, shale/framework/trunk/shale-core/src/main/java/org/apache/shale/application/AbstractRegExpFilter.java
shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/ContextRelativePathFilter.java
- copied, changed from r462943, shale/framework/trunk/shale-core/src/main/java/org/apache/shale/application/ContextRelativePathFilter.java
shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/RemoteAddrFilter.java
- copied, changed from r462943, shale/framework/trunk/shale-core/src/main/java/org/apache/shale/application/RemoteAddrFilter.java
shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/RemoteHostFilter.java
- copied, changed from r462943, shale/framework/trunk/shale-core/src/main/java/org/apache/shale/application/RemoteHostFilter.java
shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/faces/
shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/faces/ShaleApplicationFilter.java
- copied, changed from r462943, shale/framework/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleApplicationFilter.java
shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/faces/ShaleWebContext.java
- copied, changed from r462943, shale/framework/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleWebContext.java
shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/package.html
- copied unchanged from r462943, shale/framework/trunk/shale-core/src/main/java/org/apache/shale/application/package.html
shale/framework/trunk/shale-application/src/main/resources/
shale/framework/trunk/shale-application/src/test/
shale/framework/trunk/shale-application/src/test/java/
shale/framework/trunk/shale-application/src/test/java/org/
shale/framework/trunk/shale-application/src/test/java/org/apache/
shale/framework/trunk/shale-application/src/test/java/org/apache/shale/
shale/framework/trunk/shale-application/src/test/java/org/apache/shale/application/
shale/framework/trunk/shale-application/src/test/java/org/apache/shale/application/faces/
shale/framework/trunk/shale-application/src/test/resources/
Removed:
shale/framework/trunk/shale-core/src/main/java/org/apache/shale/application/AbstractRegExpFilter.java
shale/framework/trunk/shale-core/src/main/java/org/apache/shale/application/ContextRelativePathFilter.java
shale/framework/trunk/shale-core/src/main/java/org/apache/shale/application/RemoteAddrFilter.java
shale/framework/trunk/shale-core/src/main/java/org/apache/shale/application/RemoteHostFilter.java
shale/framework/trunk/shale-core/src/main/java/org/apache/shale/application/package.html
shale/framework/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleApplicationFilter.java
shale/framework/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleWebContext.java
Modified:
shale/framework/trunk/shale-apps/shale-blank/pom.xml
shale/framework/trunk/shale-apps/shale-blank/src/main/webapp/WEB-INF/web.xml
shale/framework/trunk/shale-apps/shale-clay-usecases/pom.xml
shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/WEB-INF/web.xml
shale/framework/trunk/shale-apps/shale-mailreader/pom.xml
shale/framework/trunk/shale-apps/shale-mailreader/src/main/webapp/WEB-INF/web.xml
shale/framework/trunk/shale-apps/shale-sql-browser/pom.xml
shale/framework/trunk/shale-apps/shale-sql-browser/src/main/webapp/WEB-INF/web.xml
shale/framework/trunk/shale-apps/shale-usecases/pom.xml
shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/WEB-INF/web.xml
shale/framework/trunk/shale-core/pom.xml
Added: shale/framework/trunk/shale-application/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-application/pom.xml?view=auto&rev=463092
==============================================================================
--- shale/framework/trunk/shale-application/pom.xml (added)
+++ shale/framework/trunk/shale-application/pom.xml Wed Oct 11 17:59:32 2006
@@ -0,0 +1,126 @@
+<!--
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed 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$
+ */
+-->
+<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>org.apache.shale</groupId>
+ <artifactId>shale-parent</artifactId>
+ <version>1.0.4-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>shale-application</artifactId>
+ <packaging>jar</packaging>
+ <name>Shale Application Controller Support</name>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>commons-chain</groupId>
+ <artifactId>commons-chain</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
+ <artifactId>shale-test</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>documentRoot</name>
+ <value>${basedir}/target/test-classes</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>net.sourceforge.maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+
+</project>
Propchange: shale/framework/trunk/shale-application/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: shale/framework/trunk/shale-application/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/AbstractRegExpFilter.java (from r462943, shale/framework/trunk/shale-core/src/main/java/org/apache/shale/application/AbstractRegExpFilter.java)
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/AbstractRegExpFilter.java?view=diff&rev=463092&p1=shale/framework/trunk/shale-core/src/main/java/org/apache/shale/application/AbstractRegExpFilter.java&r1=462943&p2=shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/AbstractRegExpFilter.java&r2=463092
==============================================================================
--- shale/framework/trunk/shale-core/src/main/java/org/apache/shale/application/AbstractRegExpFilter.java (original)
+++ shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/AbstractRegExpFilter.java Wed Oct 11 17:59:32 2006
@@ -29,7 +29,7 @@
import org.apache.commons.chain.Context;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.shale.faces.ShaleWebContext;
+import org.apache.shale.application.faces.ShaleWebContext;
/**
* <p>Convenience base class for <code>Command</code> implementations that
Copied: shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/ContextRelativePathFilter.java (from r462943, shale/framework/trunk/shale-core/src/main/java/org/apache/shale/application/ContextRelativePathFilter.java)
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/ContextRelativePathFilter.java?view=diff&rev=463092&p1=shale/framework/trunk/shale-core/src/main/java/org/apache/shale/application/ContextRelativePathFilter.java&r1=462943&p2=shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/ContextRelativePathFilter.java&r2=463092
==============================================================================
--- shale/framework/trunk/shale-core/src/main/java/org/apache/shale/application/ContextRelativePathFilter.java (original)
+++ shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/ContextRelativePathFilter.java Wed Oct 11 17:59:32 2006
@@ -16,7 +16,7 @@
package org.apache.shale.application;
-import org.apache.shale.faces.ShaleWebContext;
+import org.apache.shale.application.faces.ShaleWebContext;
/**
* <p>Command that filters incoming requests based on matching the
Copied: shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/RemoteAddrFilter.java (from r462943, shale/framework/trunk/shale-core/src/main/java/org/apache/shale/application/RemoteAddrFilter.java)
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/RemoteAddrFilter.java?view=diff&rev=463092&p1=shale/framework/trunk/shale-core/src/main/java/org/apache/shale/application/RemoteAddrFilter.java&r1=462943&p2=shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/RemoteAddrFilter.java&r2=463092
==============================================================================
--- shale/framework/trunk/shale-core/src/main/java/org/apache/shale/application/RemoteAddrFilter.java (original)
+++ shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/RemoteAddrFilter.java Wed Oct 11 17:59:32 2006
@@ -16,7 +16,7 @@
package org.apache.shale.application;
-import org.apache.shale.faces.ShaleWebContext;
+import org.apache.shale.application.faces.ShaleWebContext;
/**
* <p>Command that filters incoming requests based on matching the remote
Copied: shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/RemoteHostFilter.java (from r462943, shale/framework/trunk/shale-core/src/main/java/org/apache/shale/application/RemoteHostFilter.java)
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/RemoteHostFilter.java?view=diff&rev=463092&p1=shale/framework/trunk/shale-core/src/main/java/org/apache/shale/application/RemoteHostFilter.java&r1=462943&p2=shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/RemoteHostFilter.java&r2=463092
==============================================================================
--- shale/framework/trunk/shale-core/src/main/java/org/apache/shale/application/RemoteHostFilter.java (original)
+++ shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/RemoteHostFilter.java Wed Oct 11 17:59:32 2006
@@ -16,7 +16,7 @@
package org.apache.shale.application;
-import org.apache.shale.faces.ShaleWebContext;
+import org.apache.shale.application.faces.ShaleWebContext;
/**
* <p>Command that filters incoming requests based on matching the remote
Copied: shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/faces/ShaleApplicationFilter.java (from r462943, shale/framework/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleApplicationFilter.java)
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/faces/ShaleApplicationFilter.java?view=diff&rev=463092&p1=shale/framework/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleApplicationFilter.java&r1=462943&p2=shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/faces/ShaleApplicationFilter.java&r2=463092
==============================================================================
--- shale/framework/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleApplicationFilter.java (original)
+++ shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/faces/ShaleApplicationFilter.java Wed Oct 11 17:59:32 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.faces;
+package org.apache.shale.application.faces;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
Copied: shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/faces/ShaleWebContext.java (from r462943, shale/framework/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleWebContext.java)
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/faces/ShaleWebContext.java?view=diff&rev=463092&p1=shale/framework/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleWebContext.java&r1=462943&p2=shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/faces/ShaleWebContext.java&r2=463092
==============================================================================
--- shale/framework/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleWebContext.java (original)
+++ shale/framework/trunk/shale-application/src/main/java/org/apache/shale/application/faces/ShaleWebContext.java Wed Oct 11 17:59:32 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.shale.faces;
+package org.apache.shale.application.faces;
import javax.faces.context.FacesContext;
import javax.servlet.ServletContext;
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=463092&r1=463091&r2=463092
==============================================================================
--- shale/framework/trunk/shale-apps/shale-blank/pom.xml (original)
+++ shale/framework/trunk/shale-apps/shale-blank/pom.xml Wed Oct 11 17:59:32 2006
@@ -77,6 +77,12 @@
<dependency>
<groupId>org.apache.shale</groupId>
+ <artifactId>shale-application</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
<artifactId>shale-core</artifactId>
<version>${version}</version>
</dependency>
Modified: shale/framework/trunk/shale-apps/shale-blank/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-blank/src/main/webapp/WEB-INF/web.xml?view=diff&rev=463092&r1=463091&r2=463092
==============================================================================
--- shale/framework/trunk/shale-apps/shale-blank/src/main/webapp/WEB-INF/web.xml (original)
+++ shale/framework/trunk/shale-apps/shale-blank/src/main/webapp/WEB-INF/web.xml Wed Oct 11 17:59:32 2006
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Copyright 2006 The Apache Software Foundation.
@@ -17,12 +16,7 @@
$Id$
-->
-
-<web-app 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"
- version="2.4">
+<web-app 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 for this application -->
<display-name>Shale Blank Starter App</display-name>
@@ -63,7 +57,7 @@
<filter>
<filter-name>shale</filter-name>
<filter-class>
- org.apache.shale.faces.ShaleApplicationFilter
+ org.apache.shale.application.faces.ShaleApplicationFilter
</filter-class>
</filter>
Modified: shale/framework/trunk/shale-apps/shale-clay-usecases/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/pom.xml?view=diff&rev=463092&r1=463091&r2=463092
==============================================================================
--- shale/framework/trunk/shale-apps/shale-clay-usecases/pom.xml (original)
+++ shale/framework/trunk/shale-apps/shale-clay-usecases/pom.xml Wed Oct 11 17:59:32 2006
@@ -41,6 +41,12 @@
<dependency>
<groupId>org.apache.shale</groupId>
+ <artifactId>shale-application</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
<artifactId>shale-clay</artifactId>
<version>${version}</version>
</dependency>
Modified: shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/WEB-INF/web.xml?view=diff&rev=463092&r1=463091&r2=463092
==============================================================================
--- shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/WEB-INF/web.xml (original)
+++ shale/framework/trunk/shale-apps/shale-clay-usecases/src/main/webapp/WEB-INF/web.xml Wed Oct 11 17:59:32 2006
@@ -71,7 +71,7 @@
<filter>
<filter-name>shale</filter-name>
<filter-class>
- org.apache.shale.faces.ShaleApplicationFilter
+ org.apache.shale.application.faces.ShaleApplicationFilter
</filter-class>
</filter>
Modified: shale/framework/trunk/shale-apps/shale-mailreader/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-mailreader/pom.xml?view=diff&rev=463092&r1=463091&r2=463092
==============================================================================
--- shale/framework/trunk/shale-apps/shale-mailreader/pom.xml (original)
+++ shale/framework/trunk/shale-apps/shale-mailreader/pom.xml Wed Oct 11 17:59:32 2006
@@ -35,6 +35,12 @@
<dependency>
<groupId>org.apache.shale</groupId>
+ <artifactId>shale-application</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
<artifactId>shale-core</artifactId>
<version>${version}</version>
</dependency>
Modified: shale/framework/trunk/shale-apps/shale-mailreader/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-mailreader/src/main/webapp/WEB-INF/web.xml?view=diff&rev=463092&r1=463091&r2=463092
==============================================================================
--- shale/framework/trunk/shale-apps/shale-mailreader/src/main/webapp/WEB-INF/web.xml (original)
+++ shale/framework/trunk/shale-apps/shale-mailreader/src/main/webapp/WEB-INF/web.xml Wed Oct 11 17:59:32 2006
@@ -38,7 +38,7 @@
<filter>
<filter-name>shale</filter-name>
<filter-class>
- org.apache.shale.faces.ShaleApplicationFilter
+ org.apache.shale.application.faces.ShaleApplicationFilter
</filter-class>
</filter>
Modified: shale/framework/trunk/shale-apps/shale-sql-browser/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-sql-browser/pom.xml?view=diff&rev=463092&r1=463091&r2=463092
==============================================================================
--- shale/framework/trunk/shale-apps/shale-sql-browser/pom.xml (original)
+++ shale/framework/trunk/shale-apps/shale-sql-browser/pom.xml Wed Oct 11 17:59:32 2006
@@ -85,6 +85,12 @@
<dependency>
<groupId>org.apache.shale</groupId>
+ <artifactId>shale-application</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
<artifactId>shale-core</artifactId>
<version>${version}</version>
</dependency>
Modified: shale/framework/trunk/shale-apps/shale-sql-browser/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-sql-browser/src/main/webapp/WEB-INF/web.xml?view=diff&rev=463092&r1=463091&r2=463092
==============================================================================
--- shale/framework/trunk/shale-apps/shale-sql-browser/src/main/webapp/WEB-INF/web.xml (original)
+++ shale/framework/trunk/shale-apps/shale-sql-browser/src/main/webapp/WEB-INF/web.xml Wed Oct 11 17:59:32 2006
@@ -57,7 +57,7 @@
<filter>
<filter-name>shale</filter-name>
<filter-class>
- org.apache.shale.faces.ShaleApplicationFilter
+ org.apache.shale.application.faces.ShaleApplicationFilter
</filter-class>
</filter>
Modified: shale/framework/trunk/shale-apps/shale-usecases/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-usecases/pom.xml?view=diff&rev=463092&r1=463091&r2=463092
==============================================================================
--- shale/framework/trunk/shale-apps/shale-usecases/pom.xml (original)
+++ shale/framework/trunk/shale-apps/shale-usecases/pom.xml Wed Oct 11 17:59:32 2006
@@ -64,6 +64,12 @@
<dependency>
<groupId>org.apache.shale</groupId>
+ <artifactId>shale-application</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shale</groupId>
<artifactId>shale-core</artifactId>
<version>${version}</version>
</dependency>
Modified: shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/WEB-INF/web.xml?view=diff&rev=463092&r1=463091&r2=463092
==============================================================================
--- shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/WEB-INF/web.xml (original)
+++ shale/framework/trunk/shale-apps/shale-usecases/src/main/webapp/WEB-INF/web.xml Wed Oct 11 17:59:32 2006
@@ -52,7 +52,7 @@
<filter>
<filter-name>shale</filter-name>
<filter-class>
- org.apache.shale.faces.ShaleApplicationFilter
+ org.apache.shale.application.faces.ShaleApplicationFilter
</filter-class>
</filter>
Modified: shale/framework/trunk/shale-core/pom.xml
URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-core/pom.xml?view=diff&rev=463092&r1=463091&r2=463092
==============================================================================
--- shale/framework/trunk/shale-core/pom.xml (original)
+++ shale/framework/trunk/shale-core/pom.xml Wed Oct 11 17:59:32 2006
@@ -33,6 +33,7 @@
<dependencies>
+ <!-- Remove when dialog implementation is split out -->
<dependency>
<groupId>commons-chain</groupId>
<artifactId>commons-chain</artifactId>
@@ -48,6 +49,7 @@
</exclusions>
</dependency>
+ <!-- Remove when dialog implementation is split out -->
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>