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 2012/03/07 20:53:13 UTC
svn commit: r1298073 - in
/myfaces/tobago/trunk/tobago-example/tobago-example-test/src:
main/java/org/apache/myfaces/tobago/example/test/
test/java/org/apache/myfaces/tobago/example/test/
Author: lofwyr
Date: Wed Mar 7 19:53:13 2012
New Revision: 1298073
URL: http://svn.apache.org/viewvc?rev=1298073&view=rev
Log:
rename class, so it doesn't conflict with a javax.servlet.Filter
Added:
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/TestPageFilter.java (contents, props changed)
- copied, changed from r1295000, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/TestPageFilterUnitTest.java (contents, props changed)
- copied, changed from r1295000, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/FilterUnitTest.java
Removed:
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/FilterUnitTest.java
Modified:
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/DirectoryBrowser.java
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/AutomaticSeleniumTest.java
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/DirectoryBrowser.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/DirectoryBrowser.java?rev=1298073&r1=1298072&r2=1298073&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/DirectoryBrowser.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/DirectoryBrowser.java Wed Mar 7 19:53:13 2012
@@ -65,17 +65,17 @@ public class DirectoryBrowser {
if (childPath.endsWith("/")) {
// ignore, because weblogic puts the path directory itself in the Set
if (!childPath.equals(path)) {
- if (Filter.isValid(childPath)) {
+ if (TestPageFilter.isValid(childPath)) {
if (LOG.isDebugEnabled()) {
LOG.debug("childPath dir " + childPath);
}
- list.add(new PageItem(childPath, Filter.isDisabled(childPath), Filter.isTodo(childPath)));
+ list.add(new PageItem(childPath, TestPageFilter.isDisabled(childPath), TestPageFilter.isTodo(childPath)));
}
}
} else {
- if (Filter.isValid(childPath)) {
+ if (TestPageFilter.isValid(childPath)) {
LOG.info("add resc " + childPath);
- list.add(new PageItem(childPath, Filter.isDisabled(childPath), Filter.isTodo(childPath)));
+ list.add(new PageItem(childPath, TestPageFilter.isDisabled(childPath), TestPageFilter.isTodo(childPath)));
}
}
}
Copied: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/TestPageFilter.java (from r1295000, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/TestPageFilter.java?p2=myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/TestPageFilter.java&p1=myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java&r1=1295000&r2=1298073&rev=1298073&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Filter.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/TestPageFilter.java Wed Mar 7 19:53:13 2012
@@ -17,17 +17,12 @@ package org.apache.myfaces.tobago.exampl
* limitations under the License.
*/
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-public class Filter {
-
- private static final Logger LOG = LoggerFactory.getLogger(Filter.class);
+public class TestPageFilter {
public static final List<String> ALLOWED = Arrays.asList(
".*\\/",
Propchange: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/TestPageFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/TestPageFilter.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/TestPageFilter.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/AutomaticSeleniumTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/AutomaticSeleniumTest.java?rev=1298073&r1=1298072&r2=1298073&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/AutomaticSeleniumTest.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/AutomaticSeleniumTest.java Wed Mar 7 19:53:13 2012
@@ -95,7 +95,7 @@ public class AutomaticSeleniumTest exten
continue;
}
- if (Filter.isValid(path) && !Filter.isDisabled(path) && !Filter.isTodo(path)) {
+ if (TestPageFilter.isValid(path) && !TestPageFilter.isDisabled(path) && !TestPageFilter.isTodo(path)) {
result.add(path);
}
}
Copied: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/TestPageFilterUnitTest.java (from r1295000, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/FilterUnitTest.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/TestPageFilterUnitTest.java?p2=myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/TestPageFilterUnitTest.java&p1=myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/FilterUnitTest.java&r1=1295000&r2=1298073&rev=1298073&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/FilterUnitTest.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/TestPageFilterUnitTest.java Wed Mar 7 19:53:13 2012
@@ -20,24 +20,24 @@ package org.apache.myfaces.tobago.exampl
import org.junit.Assert;
import org.junit.Test;
-public class FilterUnitTest {
+public class TestPageFilterUnitTest {
@Test
public void testIsValid() {
- Assert.assertFalse(Filter.isValid("test.html"));
- Assert.assertTrue(Filter.isValid("/test.html"));
+ Assert.assertFalse(TestPageFilter.isValid("test.html"));
+ Assert.assertTrue(TestPageFilter.isValid("/test.html"));
- Assert.assertFalse(Filter.isValid("/WEB-INF"));
- Assert.assertFalse(Filter.isValid("/WEB-INF/"));
- Assert.assertFalse(Filter.isValid("/WEB-INF/web.xml"));
- Assert.assertFalse(Filter.isValid("/WEB-INF/test.xhtml"));
+ Assert.assertFalse(TestPageFilter.isValid("/WEB-INF"));
+ Assert.assertFalse(TestPageFilter.isValid("/WEB-INF/"));
+ Assert.assertFalse(TestPageFilter.isValid("/WEB-INF/web.xml"));
+ Assert.assertFalse(TestPageFilter.isValid("/WEB-INF/test.xhtml"));
- Assert.assertFalse(Filter.isValid("/NETA-INF"));
- Assert.assertFalse(Filter.isValid("/META-INF/"));
+ Assert.assertFalse(TestPageFilter.isValid("/NETA-INF"));
+ Assert.assertFalse(TestPageFilter.isValid("/META-INF/"));
- Assert.assertTrue(Filter.isValid("/navigation.xhtml"));
- Assert.assertTrue(Filter.isValid("/nav.xhtml"));
+ Assert.assertTrue(TestPageFilter.isValid("/navigation.xhtml"));
+ Assert.assertTrue(TestPageFilter.isValid("/nav.xhtml"));
- Assert.assertTrue(Filter.isDisabled("/navigation.xhtml"));
+ Assert.assertTrue(TestPageFilter.isDisabled("/navigation.xhtml"));
}
}
Propchange: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/TestPageFilterUnitTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/TestPageFilterUnitTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/TestPageFilterUnitTest.java
------------------------------------------------------------------------------
svn:mergeinfo =