You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ba...@apache.org on 2007/08/30 21:42:39 UTC
svn commit: r571282 - in /myfaces/tomahawk/branches/tomahawk_next_20070827:
./ assembly/ core/ core/src/main/java/org/apache/myfaces/component/
core/src/main/java/org/apache/myfaces/component/html/ext/
core/src/main/java/org/apache/myfaces/custom/input...
Author: baranda
Date: Thu Aug 30 12:42:37 2007
New Revision: 571282
URL: http://svn.apache.org/viewvc?rev=571282&view=rev
Log:
Tomahawk correctly building with Myfaces 1.2 - all tests pass.
Some of the examples failing.
Added:
myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/main/java/org/apache/myfaces/component/ExecuteOnCallback.java
Modified:
myfaces/tomahawk/branches/tomahawk_next_20070827/assembly/pom.xml
myfaces/tomahawk/branches/tomahawk_next_20070827/core/pom.xml
myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java
myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/main/java/org/apache/myfaces/component/html/ext/UIComponentPerspective.java
myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/main/java/org/apache/myfaces/custom/inputHtml/InputHtmlRenderer.java
myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/test/java/org/apache/myfaces/renderkit/html/util/AddResourceTest.java
myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/test/java/org/apache/myfaces/test/AbstractTagLibTestCase.java
myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/test/java/org/apache/myfaces/test/MyFacesTagLibTestCase.java
myfaces/tomahawk/branches/tomahawk_next_20070827/examples/assembly/pom.xml
myfaces/tomahawk/branches/tomahawk_next_20070827/examples/blank/pom.xml
myfaces/tomahawk/branches/tomahawk_next_20070827/examples/pom.xml
myfaces/tomahawk/branches/tomahawk_next_20070827/examples/simple/pom.xml
myfaces/tomahawk/branches/tomahawk_next_20070827/examples/tiles/pom.xml
myfaces/tomahawk/branches/tomahawk_next_20070827/examples/tiles/src/main/webapp/WEB-INF/examples-config.xml
myfaces/tomahawk/branches/tomahawk_next_20070827/examples/wap/pom.xml
myfaces/tomahawk/branches/tomahawk_next_20070827/pom.xml
myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/assembly/pom.xml
myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/core/pom.xml
myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/core/src/main/java/org/apache/myfaces/custom/ajax/api/AjaxDecodePhaseListener.java
myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/core/src/main/java/org/apache/myfaces/custom/requestParameterProvider/RequestParameterResponseWrapper.java
myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/core/src/main/java/org/apache/myfaces/custom/suggestajax/tablesuggestajax/TableSuggestAjaxRenderer.java
myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/examples/assembly/pom.xml
myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/examples/pom.xml
myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/pom.xml
myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox15/core/pom.xml
myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox15/examples/pom.xml
myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox15/pom.xml
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/assembly/pom.xml?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/assembly/pom.xml (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/assembly/pom.xml Thu Aug 30 12:42:37 2007
@@ -12,7 +12,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<scm>
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/core/pom.xml?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/core/pom.xml (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/core/pom.xml Thu Aug 30 12:42:37 2007
@@ -9,13 +9,13 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tomahawk/trunk/core</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tomahawk/trunk/core</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/myfaces/tomahawk/trunk/core</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tomahawk/branches/tomahawk_next_20070827</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tomahawk/branches/tomahawk_next_20070827</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/myfaces/tomahawk/branches/tomahawk_next_20070827</url>
</scm>
<dependencies>
@@ -109,16 +109,16 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
<scope>provided</scope>
</dependency>
@@ -173,7 +173,7 @@
<dependency>
<groupId>org.apache.shale</groupId>
<artifactId>shale-test</artifactId>
- <version>1.0.3</version>
+ <version>1.0.4</version>
<scope>test</scope>
<exclusions>
<exclusion>
Added: myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/main/java/org/apache/myfaces/component/ExecuteOnCallback.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/main/java/org/apache/myfaces/component/ExecuteOnCallback.java?rev=571282&view=auto
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/main/java/org/apache/myfaces/component/ExecuteOnCallback.java (added)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/main/java/org/apache/myfaces/component/ExecuteOnCallback.java Thu Aug 30 12:42:37 2007
@@ -0,0 +1,18 @@
+package org.apache.myfaces.component;
+
+import javax.faces.context.FacesContext;
+import javax.faces.component.UIComponent;
+
+/**
+ * With findComponent - you get a component, but this component might
+ * not be prepared to actually have the correct context information. This
+ * is important for e.g. DataTables. They'll need to prepare the component
+ * with the current row-state to make sure that the method is executed
+ * correctly.
+ *
+ * @author Martin Marinschek (latest modification by $Author: grantsmith $)
+ */
+public interface ExecuteOnCallback
+{
+ Object execute(FacesContext context, UIComponent component);
+}
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java Thu Aug 30 12:42:37 2007
@@ -292,7 +292,7 @@
// We must remove and then replace the facet so that
// it is not processed by default facet handling code
//
- Object facet = getFacets().remove(HtmlTableRenderer.DETAIL_STAMP_FACET_NAME);
+ UIComponent facet = getFacets().remove(HtmlTableRenderer.DETAIL_STAMP_FACET_NAME);
super.processDecodes(context);
if ( facet != null ) getFacets().put(HtmlTableRenderer.DETAIL_STAMP_FACET_NAME, facet);
@@ -428,7 +428,7 @@
// We must remove and then replace the facet so that
// it is not processed by default facet handling code
//
- Object facet = getFacets().remove(HtmlTableRenderer.DETAIL_STAMP_FACET_NAME);
+ UIComponent facet = getFacets().remove(HtmlTableRenderer.DETAIL_STAMP_FACET_NAME);
super.processValidators(context);
if ( facet != null ) getFacets().put(HtmlTableRenderer.DETAIL_STAMP_FACET_NAME, facet);
@@ -453,7 +453,7 @@
// We must remove and then replace the facet so that
// it is not processed by default facet handling code
//
- Object facet = getFacets().remove(HtmlTableRenderer.DETAIL_STAMP_FACET_NAME);
+ UIComponent facet = getFacets().remove(HtmlTableRenderer.DETAIL_STAMP_FACET_NAME);
super.processUpdates(context);
if ( facet != null ) getFacets().put(HtmlTableRenderer.DETAIL_STAMP_FACET_NAME, facet);
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/main/java/org/apache/myfaces/component/html/ext/UIComponentPerspective.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/main/java/org/apache/myfaces/component/html/ext/UIComponentPerspective.java?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/main/java/org/apache/myfaces/component/html/ext/UIComponentPerspective.java (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/main/java/org/apache/myfaces/component/html/ext/UIComponentPerspective.java Thu Aug 30 12:42:37 2007
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.component.html.ext;
-import org.apache.myfaces.shared_tomahawk.component.ExecuteOnCallback;
+import org.apache.myfaces.component.ExecuteOnCallback;
import javax.faces.component.UIComponent;
import javax.faces.component.UIData;
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/main/java/org/apache/myfaces/custom/inputHtml/InputHtmlRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/main/java/org/apache/myfaces/custom/inputHtml/InputHtmlRenderer.java?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/main/java/org/apache/myfaces/custom/inputHtml/InputHtmlRenderer.java (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/main/java/org/apache/myfaces/custom/inputHtml/InputHtmlRenderer.java Thu Aug 30 12:42:37 2007
@@ -104,7 +104,7 @@
}
static private void setThisPageAlreadyRenderedAnInputHtml(FacesContext context){
- context.getExternalContext().getRequestMap().put(InputHtmlRenderer.class, Boolean.TRUE);
+ context.getExternalContext().getRequestMap().put(InputHtmlRenderer.class.getName(), Boolean.TRUE);
}
/**
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/test/java/org/apache/myfaces/renderkit/html/util/AddResourceTest.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/test/java/org/apache/myfaces/renderkit/html/util/AddResourceTest.java?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/test/java/org/apache/myfaces/renderkit/html/util/AddResourceTest.java (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/test/java/org/apache/myfaces/renderkit/html/util/AddResourceTest.java Thu Aug 30 12:42:37 2007
@@ -20,12 +20,15 @@
import junit.framework.TestCase;
import org.apache.myfaces.application.ApplicationFactoryImpl;
-import org.apache.myfaces.context.servlet.ServletFacesContextImpl;
+import org.apache.myfaces.application.ApplicationImpl;
+import org.apache.myfaces.context.servlet.FacesContextImpl;
import org.apache.myfaces.renderkit.RenderKitFactoryImpl;
import org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlResponseWriterImpl;
+import org.apache.myfaces.config.RuntimeConfig;
import org.easymock.MockControl;
import javax.faces.FactoryFinder;
+import javax.faces.application.ApplicationFactory;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import javax.servlet.http.HttpServletRequest;
@@ -34,8 +37,8 @@
import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.Writer;
-import java.util.Map;
import java.util.LinkedHashMap;
+import java.util.Map;
/**
* Unit test for the AddResource class which can output script, style and inline
@@ -160,8 +163,10 @@
FactoryFinder.setFactory(FactoryFinder.APPLICATION_FACTORY, ApplicationFactoryImpl.class.getName());
FactoryFinder.setFactory(FactoryFinder.RENDER_KIT_FACTORY, RenderKitFactoryImpl.class.getName());
+ ApplicationImpl.setInitializingRuntimeConfig(new RuntimeConfig());
+
// Now create a FacesContext....
- _facesContext = new ServletFacesContextImpl(null,
+ _facesContext = new FacesContextImpl(null,
_servletRequest, _servletResponse);
_facesContext.setResponseWriter(_htmlResponseWriter);
}
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/test/java/org/apache/myfaces/test/AbstractTagLibTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/test/java/org/apache/myfaces/test/AbstractTagLibTestCase.java?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/test/java/org/apache/myfaces/test/AbstractTagLibTestCase.java (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/test/java/org/apache/myfaces/test/AbstractTagLibTestCase.java Thu Aug 30 12:42:37 2007
@@ -19,24 +19,29 @@
package org.apache.myfaces.test;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
import junit.framework.TestCase;
import net.sf.maventaglib.checker.Tag;
import net.sf.maventaglib.checker.TagAttribute;
import net.sf.maventaglib.checker.Tld;
import net.sf.maventaglib.checker.TldParser;
-
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.commons.lang.StringUtils;
+import org.apache.myfaces.application.ApplicationImpl;
+import org.apache.myfaces.config.RuntimeConfig;
+import org.apache.shale.test.el.MockExpressionFactory;
+import org.apache.shale.test.mock.MockFacesContext12;
import org.w3c.dom.Document;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.el.ValueExpression;
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Insures the following ...
* <ul>
@@ -153,7 +158,17 @@
public void testSetters() throws Exception {
- for (int t = 0; t < tlds.length; t++) {
+ MockFacesContext12 context = new MockFacesContext12();
+
+ MockExpressionFactory expressionFactory = new MockExpressionFactory();
+ RuntimeConfig runtimeConfig = new RuntimeConfig();
+ runtimeConfig.setExpressionFactory(expressionFactory);
+
+ ApplicationImpl.setInitializingRuntimeConfig(runtimeConfig);
+ ApplicationImpl application = new ApplicationImpl();
+ context.setApplication(application);
+
+ for (int t = 0; t < tlds.length; t++) {
Tld tld = tlds[t];
Tag[] tags = tld.getTags();
@@ -180,8 +195,9 @@
for (int a = 0; a < attributes.length; a++) {
TagAttribute attribute = attributes[a];
String name = attribute.getAttributeName();
+ name = name.trim();
- if (name == null || "".equals(name.trim()))
+ if (name == null || "".equals(name.trim()))
throw new IllegalStateException(path + ":" + tagName
+ " has a nameless attribute ");
@@ -194,7 +210,7 @@
}
- private static class TldTestUtils {
+ private static class TldTestUtils {
private static Log log = LogFactory.getLog(TldTestUtils.class);
private static DocumentBuilderFactory dbf = DocumentBuilderFactory
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/test/java/org/apache/myfaces/test/MyFacesTagLibTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/test/java/org/apache/myfaces/test/MyFacesTagLibTestCase.java?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/test/java/org/apache/myfaces/test/MyFacesTagLibTestCase.java (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/core/src/test/java/org/apache/myfaces/test/MyFacesTagLibTestCase.java Thu Aug 30 12:42:37 2007
@@ -32,7 +32,7 @@
// TODO get the sandbox in here
tldPaths = new String[3];
- tldPaths[0] = META_INF + "myfaces_html.tld";
+ tldPaths[0] = META_INF + "h.tld";
tldPaths[1] = META_INF + "myfaces_core.tld";
tldPaths[2] = META_INF + "tomahawk.tld";
// tldPaths[3] = META_INF + "myfaces_sandbox.tld";
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/examples/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/examples/assembly/pom.xml?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/examples/assembly/pom.xml (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/examples/assembly/pom.xml Thu Aug 30 12:42:37 2007
@@ -10,7 +10,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk-examples-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<scm>
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/examples/blank/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/examples/blank/pom.xml?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/examples/blank/pom.xml (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/examples/blank/pom.xml Thu Aug 30 12:42:37 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk-examples-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tomahawk/trunk/examples/blank</connection>
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/examples/pom.xml?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/examples/pom.xml (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/examples/pom.xml Thu Aug 30 12:42:37 2007
@@ -9,7 +9,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<scm>
@@ -25,6 +25,22 @@
<module>wap</module>
</modules>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<profiles>
<!-- By default, use the current snapshot of Tomahawk -->
<profile>
@@ -73,13 +89,13 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1-SNAPSHOT</version>
<!-- Tomahawk examples must only have runtime dependency to myfaces-impl
so that it will be automatically added to war. But there must not be
any compile dependency on impl so that is is always possible to use
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/examples/simple/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/examples/simple/pom.xml?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/examples/simple/pom.xml (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/examples/simple/pom.xml Thu Aug 30 12:42:37 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk-examples-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tomahawk/trunk/examples/simple</connection>
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/examples/tiles/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/examples/tiles/pom.xml?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/examples/tiles/pom.xml (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/examples/tiles/pom.xml Thu Aug 30 12:42:37 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk-examples-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tomahawk/trunk/examples/tiles</connection>
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/examples/tiles/src/main/webapp/WEB-INF/examples-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/examples/tiles/src/main/webapp/WEB-INF/examples-config.xml?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/examples/tiles/src/main/webapp/WEB-INF/examples-config.xml (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/examples/tiles/src/main/webapp/WEB-INF/examples-config.xml Thu Aug 30 12:42:37 2007
@@ -31,10 +31,6 @@
<from-outcome>nav_page3</from-outcome>
<to-view-id>/non-tile.jsp</to-view-id>
</navigation-case>
- <navigation-case>
- <from-outcome>nav_page4</from-outcome>
- <to-view-id>/page4.jsp</to-view-id>
- </navigation-case>
</navigation-rule>
<navigation-rule>
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/examples/wap/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/examples/wap/pom.xml?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/examples/wap/pom.xml (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/examples/wap/pom.xml Thu Aug 30 12:42:37 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk-examples-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tomahawk/trunk/examples/wap</connection>
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/pom.xml?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/pom.xml (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/pom.xml Thu Aug 30 12:42:37 2007
@@ -1,10 +1,10 @@
<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.myfaces.maven</groupId>
<artifactId>myfaces-master</artifactId>
- <version>1.0.6-SNAPSHOT</version>
+ <version>1.0.6-SNAPSHOT</version>
</parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
@@ -12,18 +12,18 @@
<packaging>pom</packaging>
<name>Tomahawk Project</name>
<url>http://myfaces.apache.org/tomahawk</url>
- <version>1.1.7-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<description>
Apache MyFaces Tomahawk is a sub-project of Apache MyFaces which provides an extensive sets
of custom components for use in your JSF-projects. Additionally, Tomahawk includes many custom
features helping you to implement JSF-projects more easily.
</description>
-
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tomahawk/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/tomahawk/trunk</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/myfaces/tomahawk/trunk</url>
- </scm>
+ </scm>
<issueManagement>
<system>jira</system>
@@ -37,13 +37,13 @@
<artifactId>myfaces-api</artifactId>
<version>${myfaces.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
<version>${myfaces.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.myfaces.shared</groupId>
<artifactId>myfaces-shared-tomahawk</artifactId>
@@ -85,7 +85,7 @@
<module>sandbox15</module>
</modules>
</profile>
-
+
<!-- By default the war examples use myfaces! :) -->
<profile>
<id>myfaces</id>
@@ -126,14 +126,14 @@
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>1.1_02</version>
+ <version>1.2_04</version>
<exclusions>
<exclusion>
<groupId>java.servlet.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.servlet</groupId>
+ <groupId>javax.servlet.jsp</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
@@ -149,7 +149,7 @@
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>1.1_02</version>
+ <version>1.2_04</version>
<scope>${jsf-impl.scope}</scope>
<exclusions>
<exclusion>
@@ -157,7 +157,7 @@
<artifactId>jsp-api</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.servlet</groupId>
+ <groupId>javax.servlet.jsp</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
@@ -201,6 +201,16 @@
</modules>
<build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
<pluginManagement>
<plugins>
<plugin>
@@ -213,8 +223,8 @@
</build>
<properties>
- <myfaces.version>1.1.6-SNAPSHOT</myfaces.version>
- <myfaces-shared.version>2.0.7-SNAPSHOT</myfaces-shared.version>
+ <myfaces.version>1.2.1-SNAPSHOT</myfaces.version>
+ <myfaces-shared.version>3.0.1-SNAPSHOT</myfaces-shared.version>
<jsf-impl.scope>test</jsf-impl.scope>
</properties>
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/assembly/pom.xml?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/assembly/pom.xml (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/assembly/pom.xml Thu Aug 30 12:42:37 2007
@@ -10,7 +10,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>sandbox-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<scm>
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/core/pom.xml?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/core/pom.xml (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/core/pom.xml Thu Aug 30 12:42:37 2007
@@ -11,7 +11,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>sandbox-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<scm>
@@ -96,16 +96,16 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
<scope>provided</scope>
</dependency>
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/core/src/main/java/org/apache/myfaces/custom/ajax/api/AjaxDecodePhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/core/src/main/java/org/apache/myfaces/custom/ajax/api/AjaxDecodePhaseListener.java?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/core/src/main/java/org/apache/myfaces/custom/ajax/api/AjaxDecodePhaseListener.java (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/core/src/main/java/org/apache/myfaces/custom/ajax/api/AjaxDecodePhaseListener.java Thu Aug 30 12:42:37 2007
@@ -21,11 +21,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.component.ExecuteOnCallback;
import org.apache.myfaces.component.html.ext.UIComponentPerspective;
import org.apache.myfaces.custom.ajax.util.AjaxRendererUtils;
import org.apache.myfaces.custom.inputAjax.HtmlCommandButtonAjax;
import org.apache.myfaces.custom.util.URIComponentUtils;
-import org.apache.myfaces.shared_tomahawk.component.ExecuteOnCallback;
import org.apache.myfaces.shared_tomahawk.renderkit.RendererUtils;
import org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlResponseWriterImpl;
import org.apache.myfaces.shared_tomahawk.renderkit.html.util.FormInfo;
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/core/src/main/java/org/apache/myfaces/custom/requestParameterProvider/RequestParameterResponseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/core/src/main/java/org/apache/myfaces/custom/requestParameterProvider/RequestParameterResponseWrapper.java?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/core/src/main/java/org/apache/myfaces/custom/requestParameterProvider/RequestParameterResponseWrapper.java (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/core/src/main/java/org/apache/myfaces/custom/requestParameterProvider/RequestParameterResponseWrapper.java Thu Aug 30 12:42:37 2007
@@ -178,6 +178,10 @@
return this.original.getWriter();
}
+ public void setCharacterEncoding(String charset) {
+ this.original.setCharacterEncoding(charset);
+ }
+
public void setContentLength(int i)
{
this.original.setContentLength(i);
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/core/src/main/java/org/apache/myfaces/custom/suggestajax/tablesuggestajax/TableSuggestAjaxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/core/src/main/java/org/apache/myfaces/custom/suggestajax/tablesuggestajax/TableSuggestAjaxRenderer.java?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/core/src/main/java/org/apache/myfaces/custom/suggestajax/tablesuggestajax/TableSuggestAjaxRenderer.java (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/core/src/main/java/org/apache/myfaces/custom/suggestajax/tablesuggestajax/TableSuggestAjaxRenderer.java Thu Aug 30 12:42:37 2007
@@ -19,12 +19,12 @@
package org.apache.myfaces.custom.suggestajax.tablesuggestajax;
import org.apache.commons.collections.map.HashedMap;
+import org.apache.myfaces.component.ExecuteOnCallback;
import org.apache.myfaces.component.html.ext.UIComponentPerspective;
import org.apache.myfaces.custom.ajax.api.AjaxRenderer;
import org.apache.myfaces.custom.dojo.DojoConfig;
import org.apache.myfaces.custom.dojo.DojoUtils;
import org.apache.myfaces.custom.suggestajax.SuggestAjaxRenderer;
-import org.apache.myfaces.shared_tomahawk.component.ExecuteOnCallback;
import org.apache.myfaces.shared_tomahawk.renderkit.JSFAttr;
import org.apache.myfaces.shared_tomahawk.renderkit.RendererUtils;
import org.apache.myfaces.shared_tomahawk.renderkit.html.HTML;
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/examples/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/examples/assembly/pom.xml?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/examples/assembly/pom.xml (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/examples/assembly/pom.xml Thu Aug 30 12:42:37 2007
@@ -11,7 +11,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>sandbox-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<scm>
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/examples/pom.xml?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/examples/pom.xml (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/examples/pom.xml Thu Aug 30 12:42:37 2007
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>sandbox-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<scm>
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/pom.xml?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/pom.xml (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox/pom.xml Thu Aug 30 12:42:37 2007
@@ -12,7 +12,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tomahawk/trunk/sandbox</connection>
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox15/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox15/core/pom.xml?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox15/core/pom.xml (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox15/core/pom.xml Thu Aug 30 12:42:37 2007
@@ -11,7 +11,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>sandbox15-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<scm>
@@ -96,16 +96,16 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
+ <groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.3</version>
+ <version>2.5</version>
<scope>provided</scope>
</dependency>
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox15/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox15/examples/pom.xml?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox15/examples/pom.xml (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox15/examples/pom.xml Thu Aug 30 12:42:37 2007
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>sandbox15-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<scm>
Modified: myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox15/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox15/pom.xml?rev=571282&r1=571281&r2=571282&view=diff
==============================================================================
--- myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox15/pom.xml (original)
+++ myfaces/tomahawk/branches/tomahawk_next_20070827/sandbox15/pom.xml Thu Aug 30 12:42:37 2007
@@ -12,7 +12,7 @@
<parent>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk-project</artifactId>
- <version>1.1.7-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/tomahawk/trunk/sandbox15</connection>