You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2008/05/28 12:14:12 UTC
svn commit: r660892 - in /myfaces/tobago/trunk:
core/src/test/java/org/apache/myfaces/tobago/taglib/component/ sandbox/
sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/
sandbox/src/test/java/org/apache/myfaces/tobago/taglib/ sandbox/src/...
Author: lofwyr
Date: Wed May 28 03:14:11 2008
New Revision: 660892
URL: http://svn.apache.org/viewvc?rev=660892&view=rev
Log:
TOBAGO-671:
Renamed declaration class.
Also added a UnitTest for Sandbox Tags to check the "setter" methods.
Added:
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardControllerTagDeclaration.java (contents, props changed)
- copied, changed from r660811, myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTagDeclaration.java
myfaces/tobago/trunk/sandbox/src/test/java/org/apache/myfaces/tobago/taglib/
myfaces/tobago/trunk/sandbox/src/test/java/org/apache/myfaces/tobago/taglib/sandbox/
myfaces/tobago/trunk/sandbox/src/test/java/org/apache/myfaces/tobago/taglib/sandbox/SandboxGenericTagUnitTest.java (contents, props changed)
- copied, changed from r660811, myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTagUnitTest.java
myfaces/tobago/trunk/tobago-jsf-compat/src/test/java/org/apache/myfaces/tobago/taglib/
myfaces/tobago/trunk/tobago-jsf-compat/src/test/java/org/apache/myfaces/tobago/taglib/component/
myfaces/tobago/trunk/tobago-jsf-compat/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java (contents, props changed)
- copied, changed from r660811, myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java
Removed:
myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTagDeclaration.java
Modified:
myfaces/tobago/trunk/sandbox/pom.xml
myfaces/tobago/trunk/tobago-jsf-compat/pom.xml
Modified: myfaces/tobago/trunk/sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/pom.xml?rev=660892&r1=660891&r2=660892&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/sandbox/pom.xml Wed May 28 03:14:11 2008
@@ -236,6 +236,13 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>tobago-jsf-compat</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<scope>provided</scope>
@@ -281,7 +288,12 @@
<artifactId>jsf-facelets</artifactId>
<version>${facelets.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardControllerTagDeclaration.java (from r660811, myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTagDeclaration.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardControllerTagDeclaration.java?p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardControllerTagDeclaration.java&p1=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTagDeclaration.java&r1=660811&r2=660892&rev=660892&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardTagDeclaration.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardControllerTagDeclaration.java Wed May 28 03:14:11 2008
@@ -18,11 +18,11 @@
*/
import org.apache.myfaces.tobago.apt.annotation.BodyContentDescription;
+import org.apache.myfaces.tobago.apt.annotation.DynamicExpression;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-import org.apache.myfaces.tobago.apt.annotation.DynamicExpression;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
/**
@@ -35,8 +35,7 @@
uiComponentBaseClass = "org.apache.myfaces.tobago.component.UIPanel",
generate = false,
rendererType = "Wizard")
-public interface WizardTagDeclaration
- extends HasIdBindingAndRendered {
+public interface WizardControllerTagDeclaration extends HasIdBindingAndRendered {
@TagAttribute(required = true)
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.model.Wizard",
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardControllerTagDeclaration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/WizardControllerTagDeclaration.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/sandbox/src/test/java/org/apache/myfaces/tobago/taglib/sandbox/SandboxGenericTagUnitTest.java (from r660811, myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTagUnitTest.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/test/java/org/apache/myfaces/tobago/taglib/sandbox/SandboxGenericTagUnitTest.java?p2=myfaces/tobago/trunk/sandbox/src/test/java/org/apache/myfaces/tobago/taglib/sandbox/SandboxGenericTagUnitTest.java&p1=myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTagUnitTest.java&r1=660811&r2=660892&rev=660892&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTagUnitTest.java (original)
+++ myfaces/tobago/trunk/sandbox/src/test/java/org/apache/myfaces/tobago/taglib/sandbox/SandboxGenericTagUnitTest.java Wed May 28 03:14:11 2008
@@ -1,4 +1,6 @@
-package org.apache.myfaces.tobago.taglib.component;
+package org.apache.myfaces.tobago.taglib.sandbox;
+
+import org.apache.myfaces.tobago.taglib.component.GenericTestBase;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,20 +20,15 @@
*/
-public class GenericTagUnitTest extends GenericTestBase {
+public class SandboxGenericTagUnitTest extends GenericTestBase {
- public GenericTagUnitTest(String name) {
+ public SandboxGenericTagUnitTest(String name) {
super(name);
-
}
protected void setUp() throws Exception {
tldPaths = new String[1];
- tldPaths[0] = "META-INF/org/apache/myfaces/tobago/taglib/component/tobago.tld";
- //TODO move to tobago-taglib-extension
- //tldPaths[1] = "META-INF/org/apache/myfaces/tobago/taglib/extension/tobago-extension.tld";
+ tldPaths[0] = "META-INF/org/apache/myfaces/tobago/taglib/sandbox/tobago-sandbox.tld";
super.setUp();
}
-
}
-
Propchange: myfaces/tobago/trunk/sandbox/src/test/java/org/apache/myfaces/tobago/taglib/sandbox/SandboxGenericTagUnitTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/sandbox/src/test/java/org/apache/myfaces/tobago/taglib/sandbox/SandboxGenericTagUnitTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/trunk/tobago-jsf-compat/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/pom.xml?rev=660892&r1=660891&r2=660892&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/pom.xml Wed May 28 03:14:11 2008
@@ -95,6 +95,12 @@
<version>2.5</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
<profile>
Copied: myfaces/tobago/trunk/tobago-jsf-compat/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java (from r660811, myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java?p2=myfaces/tobago/trunk/tobago-jsf-compat/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java&p1=myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java&r1=660811&r2=660892&rev=660892&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java Wed May 28 03:14:11 2008
@@ -18,41 +18,38 @@
*/
import junit.framework.TestCase;
-
-import javax.servlet.jsp.tagext.Tag;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.DocumentBuilder;
-import javax.faces.context.ExternalContext;
-import javax.faces.lifecycle.Lifecycle;
-import javax.faces.FactoryFinder;
-import javax.faces.component.UIViewRoot;
-import javax.faces.application.ApplicationFactory;
-import javax.faces.application.Application;
-
+import net.sf.maventaglib.checker.TagAttribute;
import net.sf.maventaglib.checker.Tld;
import net.sf.maventaglib.checker.TldParser;
-import net.sf.maventaglib.checker.TagAttribute;
-
-import java.io.InputStream;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.beans.PropertyDescriptor;
-import java.util.HashMap;
-
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.mock.servlet.MockServletContext;
-import org.apache.myfaces.tobago.mock.servlet.MockHttpServletRequest;
-import org.apache.myfaces.tobago.mock.servlet.MockHttpServletResponse;
import org.apache.myfaces.tobago.mock.faces.MockExternalContext;
import org.apache.myfaces.tobago.mock.faces.MockFacesContext;
+import org.apache.myfaces.tobago.mock.servlet.MockHttpServletRequest;
+import org.apache.myfaces.tobago.mock.servlet.MockHttpServletResponse;
+import org.apache.myfaces.tobago.mock.servlet.MockServletContext;
+import org.w3c.dom.Document;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import javax.faces.FactoryFinder;
+import javax.faces.application.Application;
+import javax.faces.application.ApplicationFactory;
+import javax.faces.component.UIViewRoot;
+import javax.faces.context.ExternalContext;
+import javax.faces.lifecycle.Lifecycle;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.tagext.Tag;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.beans.PropertyDescriptor;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
//import org.apache.myfaces.tobago.mock.servlet.MockPageContext;
public abstract class GenericTestBase extends TestCase {
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-jsf-compat/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL