You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mb...@apache.org on 2007/03/12 22:16:33 UTC
svn commit: r517401 - in /myfaces/shared/branches/3_0_0/core/src:
main/java/org/apache/myfaces/shared/webapp/webxml/
test/java/org/apache/myfaces/shared/webapp/
test/java/org/apache/myfaces/shared/webapp/webxml/
Author: mbr
Date: Mon Mar 12 14:16:32 2007
New Revision: 517401
URL: http://svn.apache.org/viewvc?view=rev&rev=517401
Log:
ServletMapping now provide extension and prefix value
+Tests
Added:
myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/webapp/
myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/webapp/webxml/
myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/webapp/webxml/ServletMappingTest.java (with props)
Modified:
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/ServletMapping.java
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/ServletMapping.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/ServletMapping.java?view=diff&rev=517401&r1=517400&r2=517401
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/ServletMapping.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/ServletMapping.java Mon Mar 12 14:16:32 2007
@@ -21,30 +21,50 @@
*/
public class ServletMapping
{
- private String _servletName;
- private Class _servletClass;
- private String _urlPattern;
- private boolean _isExtensionMapping = false;
+ private final String _servletName;
+ private final Class _servletClass;
+ private final String _urlPattern;
+ private final String _extension;
+ private final String _prefix;
- public ServletMapping(String servletName,
- Class servletClass,
- String urlPattern)
+ public ServletMapping(String servletName, Class servletClass, String urlPattern)
{
_servletName = servletName;
_servletClass = servletClass;
_urlPattern = urlPattern;
- if (_urlPattern != null)
+ _extension = _urlPattern != null && _urlPattern.startsWith("*.") ? _urlPattern.substring(_urlPattern
+ .indexOf('.')) : null;
+ if (_extension == null)
{
- if (_urlPattern.startsWith("*."))
+ int index = _urlPattern.indexOf("/*");
+ if (index != -1)
{
- _isExtensionMapping = true;
+ _prefix = _urlPattern.substring(0, _urlPattern.indexOf("/*"));
+ }
+ else
+ {
+ _prefix = _urlPattern;
}
}
+ else
+ {
+ _prefix = null;
+ }
}
public boolean isExtensionMapping()
{
- return _isExtensionMapping;
+ return _extension != null;
+ }
+
+ public String getExtension()
+ {
+ return _extension;
+ }
+
+ public String getPrefix()
+ {
+ return _prefix;
}
public String getServletName()
Added: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/webapp/webxml/ServletMappingTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/webapp/webxml/ServletMappingTest.java?view=auto&rev=517401
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/webapp/webxml/ServletMappingTest.java (added)
+++ myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/webapp/webxml/ServletMappingTest.java Mon Mar 12 14:16:32 2007
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+package org.apache.myfaces.shared.webapp.webxml;
+
+import junit.framework.TestCase;
+
+/**
+ * @author Mathias Broekelmann (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+public class ServletMappingTest extends TestCase
+{
+
+ /**
+ * Test method for
+ * {@link org.apache.myfaces.shared.webapp.webxml.ServletMapping#ServletMapping(java.lang.String, java.lang.Class, java.lang.String)}.
+ */
+ public void testExtensionServletMapping()
+ {
+ ServletMapping mapping = new ServletMapping("xxx", Object.class, "*.faces");
+ assertTrue(mapping.isExtensionMapping());
+ assertEquals(".faces", mapping.getExtension());
+ assertEquals("*.faces", mapping.getUrlPattern());
+ }
+
+ /**
+ * Test method for
+ * {@link org.apache.myfaces.shared.webapp.webxml.ServletMapping#ServletMapping(java.lang.String, java.lang.Class, java.lang.String)}.
+ */
+ public void testPrefixServletMapping()
+ {
+ ServletMapping mapping = new ServletMapping("xxx", Object.class, "/faces/*");
+ assertFalse(mapping.isExtensionMapping());
+ assertEquals("/faces/*", mapping.getUrlPattern());
+ assertEquals("/faces", mapping.getPrefix());
+ }
+}
Propchange: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/webapp/webxml/ServletMappingTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/shared/branches/3_0_0/core/src/test/java/org/apache/myfaces/shared/webapp/webxml/ServletMappingTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL