You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2010/11/06 01:46:39 UTC
svn commit: r1031895 - in /myfaces/commons/branches/jsf_20: ./ examples/
myfaces-commons-components/ myfaces-commons-converters/
myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/converter/
myfaces-commons-validators/ myfaces-commons-...
Author: lu4242
Date: Sat Nov 6 00:46:39 2010
New Revision: 1031895
URL: http://svn.apache.org/viewvc?rev=1031895&view=rev
Log:
MFCOMMONS-21 update shale-test with myfaces-test
Modified:
myfaces/commons/branches/jsf_20/examples/ (props changed)
myfaces/commons/branches/jsf_20/myfaces-commons-components/pom.xml
myfaces/commons/branches/jsf_20/myfaces-commons-converters/pom.xml
myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/converter/BooleanConverterTest.java
myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/converter/EnumConverterTest.java
myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/converter/TypedNumberConverterTest.java
myfaces/commons/branches/jsf_20/myfaces-commons-validators/pom.xml
myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/test/java/org/apache/myfaces/commons/validator/AbstractValidatorTestCase.java
myfaces/commons/branches/jsf_20/pom.xml
Propchange: myfaces/commons/branches/jsf_20/examples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Nov 6 00:46:39 2010
@@ -0,0 +1,12 @@
+*.iml
+*.ipr
+*.iws
+*.jdbc
+.classpath
+.externalToolBuilders
+.project
+.settings
+derby.log
+maven-eclipse.xml
+myfacesOrchestraDB
+target
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-components/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-components/pom.xml?rev=1031895&r1=1031894&r2=1031895&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-components/pom.xml (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-components/pom.xml Sat Nov 6 00:46:39 2010
@@ -166,28 +166,11 @@
</dependency>
<dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-test</artifactId>
+ <groupId>org.apache.myfaces.test</groupId>
+ <artifactId>myfaces-test12</artifactId>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-impl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
+
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-converters/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-converters/pom.xml?rev=1031895&r1=1031894&r2=1031895&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-converters/pom.xml (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-converters/pom.xml Sat Nov 6 00:46:39 2010
@@ -173,28 +173,11 @@
</dependency>
<dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-test</artifactId>
+ <groupId>org.apache.myfaces.test</groupId>
+ <artifactId>myfaces-test12</artifactId>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-impl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
+
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
@@ -357,4 +340,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/converter/BooleanConverterTest.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/converter/BooleanConverterTest.java?rev=1031895&r1=1031894&r2=1031895&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/converter/BooleanConverterTest.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/converter/BooleanConverterTest.java Sat Nov 6 00:46:39 2010
@@ -18,14 +18,13 @@
*/
package org.apache.myfaces.commons.converter;
-import javax.faces.application.FacesMessage;
import javax.faces.component.UIInput;
import javax.faces.convert.ConverterException;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.shale.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.AbstractJsfTestCase;
/**
* @author lu4242 (latest modification by $Author$)
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/converter/EnumConverterTest.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/converter/EnumConverterTest.java?rev=1031895&r1=1031894&r2=1031895&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/converter/EnumConverterTest.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/converter/EnumConverterTest.java Sat Nov 6 00:46:39 2010
@@ -25,7 +25,7 @@ import javax.faces.convert.ConverterExce
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.shale.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.AbstractJsfTestCase;
/**
* @author lu4242 (latest modification by $Author$)
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/converter/TypedNumberConverterTest.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/converter/TypedNumberConverterTest.java?rev=1031895&r1=1031894&r2=1031895&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/converter/TypedNumberConverterTest.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-converters/src/test/java/org/apache/myfaces/commons/converter/TypedNumberConverterTest.java Sat Nov 6 00:46:39 2010
@@ -25,7 +25,7 @@ import javax.faces.convert.ConverterExce
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.shale.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.AbstractJsfTestCase;
/**
* @author cagatay (latest modification by $Author$)
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-validators/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-validators/pom.xml?rev=1031895&r1=1031894&r2=1031895&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-validators/pom.xml (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-validators/pom.xml Sat Nov 6 00:46:39 2010
@@ -175,27 +175,9 @@
</dependency>
<dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-test</artifactId>
+ <groupId>org.apache.myfaces.test</groupId>
+ <artifactId>myfaces-test12</artifactId>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-impl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>joda-time</groupId>
@@ -372,4 +354,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/test/java/org/apache/myfaces/commons/validator/AbstractValidatorTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/test/java/org/apache/myfaces/commons/validator/AbstractValidatorTestCase.java?rev=1031895&r1=1031894&r2=1031895&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/test/java/org/apache/myfaces/commons/validator/AbstractValidatorTestCase.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/test/java/org/apache/myfaces/commons/validator/AbstractValidatorTestCase.java Sat Nov 6 00:46:39 2010
@@ -21,7 +21,7 @@ package org.apache.myfaces.commons.valid
import javax.faces.component.UIComponent;
import javax.faces.validator.Validator;
-import org.apache.shale.test.jmock.AbstractJmockJsfTestCase;
+import org.apache.myfaces.test.jmock.AbstractJmockJsfTestCase;
import org.jmock.Mock;
public abstract class AbstractValidatorTestCase extends AbstractJmockJsfTestCase
@@ -65,4 +65,4 @@ public abstract class AbstractValidatorT
// this is expected
}
}
-}
\ No newline at end of file
+}
Modified: myfaces/commons/branches/jsf_20/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/pom.xml?rev=1031895&r1=1031894&r2=1031895&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/pom.xml (original)
+++ myfaces/commons/branches/jsf_20/pom.xml Sat Nov 6 00:46:39 2010
@@ -170,30 +170,14 @@
<version>1.1.14</version>
<scope>provided</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-test</artifactId>
- <version>1.0.5</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-impl</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.myfaces.test</groupId>
+ <artifactId>myfaces-test12</artifactId>
+ <version>1.0.0</version>
+ <scope>test</scope>
</dependency>
+
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>