Revision: 1089
http://stripes.svn.sourceforge.net/stripes/?rev=1089&view=rev
Author: fdaoud
Date: 2009-03-03 02:20:59 +0000 (Tue, 03 Mar 2009)
Log Message:
-----------
Fix for STS-658
Modified Paths:
--------------
trunk/stripes/src/net/sourceforge/stripes/action/OnwardResolution.java
trunk/stripes/src/net/sourceforge/stripes/controller/AnnotatedClassActionResolver.java
trunk/stripes/src/net/sourceforge/stripes/controller/DynamicMappingFilter.java
trunk/stripes/src/net/sourceforge/stripes/controller/FlashScope.java
trunk/stripes/src/net/sourceforge/stripes/controller/UrlBindingFactory.java
trunk/stripes/src/net/sourceforge/stripes/exception/DelegatingExceptionHandler.java
trunk/stripes/src/net/sourceforge/stripes/localization/LocalizationUtility.java
trunk/stripes/src/net/sourceforge/stripes/util/CryptoUtil.java
trunk/stripes/src/net/sourceforge/stripes/util/ReflectUtil.java
trunk/stripes/src/net/sourceforge/stripes/util/UrlBuilder.java
trunk/stripes/src/net/sourceforge/stripes/validation/ScopedLocalizableError.java
Removed Paths:
-------------
trunk/stripes/src/net/sourceforge/stripes/integration/spring/SpringInterceptor.java
trunk/stripes/src/net/sourceforge/stripes/integration/spring/SpringInterceptorSupport.java
Modified: trunk/stripes/src/net/sourceforge/stripes/action/OnwardResolution.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/action/OnwardResolution.java
2009-03-03 01:46:43 UTC (rev 1088)
+++ trunk/stripes/src/net/sourceforge/stripes/action/OnwardResolution.java
2009-03-03 02:20:59 UTC (rev 1089)
@@ -171,18 +171,6 @@
}
/**
- * Constructs the URL for the resolution by taking the path and
appending
- * any parameters supplied.
- *
- * @deprecated As of Stripes 1.5, this method has been replaced by
- * {...@link #getUrl(Locale)}.
- */
- @Deprecated
- public String getUrl() {
- return getUrl(Locale.getDefault());
- }
-
- /**
* Constructs the URL for the resolution by taking the path and appending
any parameters
* supplied.
*
Modified:
trunk/stripes/src/net/sourceforge/stripes/controller/AnnotatedClassActionResolver.java
===================================================================
---
trunk/stripes/src/net/sourceforge/stripes/controller/AnnotatedClassActionResolver.java
2009-03-03 01:46:43 UTC (rev 1088)
+++
trunk/stripes/src/net/sourceforge/stripes/controller/AnnotatedClassActionResolver.java
2009-03-03 02:20:59 UTC (rev 1089)
@@ -56,18 +56,6 @@
*/
public class AnnotatedClassActionResolver implements ActionResolver {
/**
- * Configuration key used to lookup a comma-separated list of patterns
that are used to
- * restrict the set of URLs in the classpath that are searched for
ActionBean classes.
- */
- @Deprecated private static final String URL_FILTERS =
"ActionResolver.UrlFilters";
-
- /**
- * Configuration key used to lookup a comma-separated list of patterns
that are used to
- * restrict the packages that will be scanned for ActionBean classes.
- */
- @Deprecated private static final String PACKAGE_FILTERS =
"ActionResolver.PackageFilters";
-
- /**
* Configuration key used to lookup a comma-separated list of package
names. The
* packages (and their sub-packages) will be scanned for implementations of
* ActionBean.
@@ -304,32 +292,6 @@
}
/**
- * Simple helper method that extracts the servlet path and any extra path
info
- * and puts them back together handling nulls correctly.
- *
- * @param request the current HttpServletRequest
- * @return the servlet-context relative path that is being requested
- * @deprecated Use {...@link
HttpUtil#getRequestedPath(HttpServletRequest)} instead.
- */
- @Deprecated
- protected String getRequestedPath(HttpServletRequest request) {
- String servletPath = null, pathInfo = null;
-
- // Check to see if the request is processing an include, and pull the
path
- // information from the appropriate source.
- if (request.getAttribute(StripesConstants.REQ_ATTR_INCLUDE_PATH) !=
null) {
- servletPath = (String)
request.getAttribute(StripesConstants.REQ_ATTR_INCLUDE_PATH);
- pathInfo = (String)
request.getAttribute(StripesConstants.REQ_ATTR_INCLUDE_PATH_INFO);
- }
- else {
- servletPath = request.getServletPath();
- pathInfo = request.getPathInfo();
- }
-
- return (servletPath == null ? "" : servletPath) + (pathInfo == null ?
"" : pathInfo);
- }
-
- /**
* Returns the ActionBean class that is bound to the UrlBinding supplied.
If the action
* bean already exists in the appropriate scope (request or session) then
the existing
* instance will be supplied. If not, then a new instance will be
manufactured and have
@@ -656,15 +618,6 @@
*/
protected Set<Class<? extends ActionBean>> findClasses() {
BootstrapPropertyResolver bootstrap =
getConfiguration().getBootstrapPropertyResolver();
- if (bootstrap.getProperty(URL_FILTERS) != null ||
bootstrap.getProperty(PACKAGE_FILTERS) != null) {
- log.error("The configuration properties '", URL_FILTERS, "' and
'", PACKAGE_FILTERS,
- "' are deprecated, and NO LONGER SUPPORTED. Please read
the upgrade ",
- "documentation for Stripes 1.5 for how to resolve this
situation. In short ",
- "you should specify neither ", URL_FILTERS, " or ",
PACKAGE_FILTERS,
- ". Instead you should specify a comma separated list of
package roots ",
- "(e.g. com.myco.web) that should be scanned for
implementations of ",
- "ActionBean, using the configuration parameter '",
PACKAGES, "'.");
- }
String packages = bootstrap.getProperty(PACKAGES);
if (packages == null) {
Modified:
trunk/stripes/src/net/sourceforge/stripes/controller/DynamicMappingFilter.java
===================================================================
---
trunk/stripes/src/net/sourceforge/stripes/controller/DynamicMappingFilter.java
2009-03-03 01:46:43 UTC (rev 1088)
+++
trunk/stripes/src/net/sourceforge/stripes/controller/DynamicMappingFilter.java
2009-03-03 02:20:59 UTC (rev 1089)
@@ -384,26 +384,4 @@
}
initialized = true;
}
-
- /**
- * Get the context-relative URI of the current include, forward or request.
- *
- * @deprecated Use {...@link
HttpUtil#getRequestedPath(HttpServletRequest)} instead.
- */
- @Deprecated
- protected String getRequestURI(HttpServletRequest request) {
- // Check for an include
- String uri = (String)
request.getAttribute("javax.servlet.include.request_uri");
-
- // If not an include, then use the request methods
- if (uri == null)
- uri = request.getRequestURI();
-
- // Trim the context path from the front
- String contextPath = request.getContextPath();
- if (contextPath.length() > 1)
- uri = uri.substring(contextPath.length());
-
- return uri;
- }
-}
\ No newline at end of file
+}
Modified: trunk/stripes/src/net/sourceforge/stripes/controller/FlashScope.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/controller/FlashScope.java
2009-03-03 01:46:43 UTC (rev 1088)
+++ trunk/stripes/src/net/sourceforge/stripes/controller/FlashScope.java
2009-03-03 02:20:59 UTC (rev 1089)
@@ -132,14 +132,6 @@
}
/**
- * Renamed to {...@link #completeRequest()}.
- */
- @Deprecated
- public void requestComplete() {
- completeRequest();
- }
-
- /**
* <p>Used by the StripesFilter to notify the flash scope that the request
for which
* it is used has been completed. The FlashScope uses this notification to
start a
* timer, and also to null out it's reference to the request so that it
can be
Modified:
trunk/stripes/src/net/sourceforge/stripes/controller/UrlBindingFactory.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/controller/UrlBindingFactory.java
2009-03-03 01:46:43 UTC (rev 1088)
+++ trunk/stripes/src/net/sourceforge/stripes/controller/UrlBindingFactory.java
2009-03-03 02:20:59 UTC (rev 1089)
@@ -14,8 +14,6 @@
*/
package net.sourceforge.stripes.controller;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -33,7 +31,6 @@
import javax.servlet.http.HttpServletRequest;
import net.sourceforge.stripes.action.ActionBean;
-import net.sourceforge.stripes.exception.StripesRuntimeException;
import net.sourceforge.stripes.exception.UrlBindingConflictException;
import net.sourceforge.stripes.util.HttpUtil;
import net.sourceforge.stripes.util.Log;
@@ -712,34 +709,6 @@
};
}
- /**
- * Returns the URI of the given {...@code request} with the context path
trimmed from the
- * beginning. I.e., the request URI relative to the context.
- *
- * @param request a servlet request
- * @return the context-relative request URI
- * @deprecated Use {...@link
HttpUtil#getRequestedPath(HttpServletRequest)} instead.
- */
- @Deprecated
- protected String trimContextPath(HttpServletRequest request) {
- // Trim context path from beginning of URI
- String uri = request.getRequestURI();
- String contextPath = request.getContextPath();
- if (contextPath.length() > 1)
- uri = uri.substring(contextPath.length());
-
- // URL decode
- try {
- String encoding = request.getCharacterEncoding();
- uri = URLDecoder.decode(uri, encoding != null ? encoding :
"UTF-8");
- }
- catch (UnsupportedEncodingException e) {
- throw new StripesRuntimeException(e);
- }
-
- return uri;
- }
-
@Override
public String toString() {
return String.valueOf(classCache);
Modified:
trunk/stripes/src/net/sourceforge/stripes/exception/DelegatingExceptionHandler.java
===================================================================
---
trunk/stripes/src/net/sourceforge/stripes/exception/DelegatingExceptionHandler.java
2009-03-03 01:46:43 UTC (rev 1088)
+++
trunk/stripes/src/net/sourceforge/stripes/exception/DelegatingExceptionHandler.java
2009-03-03 02:20:59 UTC (rev 1089)
@@ -70,12 +70,6 @@
/** Log instance for use within in this class. */
private static final Log log =
Log.getInstance(DelegatingExceptionHandler.class);
- /** Configuration key used to lookup the URL filters used when scanning
for handlers. */
- @Deprecated public static final String URL_FILTERS =
"DelegatingExceptionHandler.UrlFilters";
-
- /** Configuration key used to lookup the package filters used when
scanning for handlers. */
- @Deprecated public static final String PACKAGE_FILTERS =
"DelegatingExceptionHandler.PackageFilters";
-
/**
* Configuration key used to lookup the list of packages to scan for auto
handlers.
* @since Stripes 1.5
@@ -114,17 +108,6 @@
*/
protected Set<Class<? extends AutoExceptionHandler>> findClasses() {
BootstrapPropertyResolver bootstrap =
getConfiguration().getBootstrapPropertyResolver();
- if (bootstrap.getProperty(URL_FILTERS) != null ||
bootstrap.getProperty(PACKAGE_FILTERS) != null) {
- log.error("The configuration properties '", URL_FILTERS, "' and
'", PACKAGE_FILTERS,
- "' are deprecated, and NO LONGER SUPPORTED. Please read
the upgrade ",
- "documentation for Stripes 1.5 for how to resolve this
situation. In short ",
- "you should specify neither ", URL_FILTERS, " nor ",
PACKAGE_FILTERS,
- ". Instead you should specify a comma separated list of
package roots ",
- "(e.g. com.myco.web) that should be scanned for
implementations of ",
- "AutoExceptionHandler, using the configuration parameter
'", PACKAGES,
- "', or include the packages along with other extension
packages using the ",
- "configuration parameter '",
BootstrapPropertyResolver.PACKAGES, "'.");
- }
// Try the config param that is specific to this class
String[] packages =
StringUtil.standardSplit(bootstrap.getProperty(PACKAGES));
Deleted:
trunk/stripes/src/net/sourceforge/stripes/integration/spring/SpringInterceptor.java
===================================================================
---
trunk/stripes/src/net/sourceforge/stripes/integration/spring/SpringInterceptor.java
2009-03-03 01:46:43 UTC (rev 1088)
+++
trunk/stripes/src/net/sourceforge/stripes/integration/spring/SpringInterceptor.java
2009-03-03 02:20:59 UTC (rev 1089)
@@ -1,74 +0,0 @@
-/* Copyright 2005-2006 Tim Fennell
- *
- * Licensed 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 net.sourceforge.stripes.integration.spring;
-
-import net.sourceforge.stripes.config.DontAutoLoad;
-import net.sourceforge.stripes.controller.Interceptor;
-import net.sourceforge.stripes.controller.ExecutionContext;
-import net.sourceforge.stripes.controller.Intercepts;
-import net.sourceforge.stripes.controller.LifecycleStage;
-import net.sourceforge.stripes.action.Resolution;
-import net.sourceforge.stripes.util.Log;
-
-
-/**
- * <p>An {...@link Interceptor} that uses a Spring context to inject Spring
beans into newly created
- * ActionBeans immediately following ActionBeanResolution. For more
information on how the injection
- * is performed see {...@link SpringHelper#injectBeans(Object,
- * net.sourceforge.stripes.action.ActionBeanContext)}.</p>
- *
- * <p>To configure the SpringInterceptor for use you will need to add the
following to your
- * web.xml (assuming no other interceptors are yet configured):</p>
- *
- * <pre>
- * <init-param>
- * <param-name>Interceptor.Classes</param-name>
- * <param-value>
- * net.sourceforge.stripes.integration.spring.SpringInterceptor,
- * net.sourceforge.stripes.controller.BeforeAfterMethodInterceptor
- * </param-value>
- * </init-param>
- * </pre>
- *
- * <p>If one or more interceptors are already configured in your web.xml
simply separate the
- * fully qualified names of the interceptors with commas (additional
whitespace is ok).</p>
- *
- * @see SpringBean
- * @author Tim Fennell
- * @since Stripes 1.3
- * @deprecated As of Stripes 1.5.1, replaced by {...@link
SpringInjectionPostProcessor}.
- */
-...@deprecated
-...@intercepts(LifecycleStage.ActionBeanResolution)
-...@dontautoload
-public class SpringInterceptor implements Interceptor {
- private static final Log log = Log.getInstance(SpringInterceptor.class);
-
- /**
- * Allows ActionBean resolution to proceed and then once the ActionBean
has been
- * located invokes the {...@link SpringHelper} to perform Spring based
dependency injection.
- *
- * @param context the current execution context
- * @return the Resolution produced by calling context.proceed()
- * @throws Exception if the Spring binding process produced unrecoverable
errors
- */
- public Resolution intercept(ExecutionContext context) throws Exception {
- Resolution resolution = context.proceed();
- log.debug("Running Spring dependency injection for instance of ",
- context.getActionBean().getClass().getSimpleName());
- SpringHelper.injectBeans(context.getActionBean(),
context.getActionBeanContext());
- return resolution;
- }
-}
Deleted:
trunk/stripes/src/net/sourceforge/stripes/integration/spring/SpringInterceptorSupport.java
===================================================================
---
trunk/stripes/src/net/sourceforge/stripes/integration/spring/SpringInterceptorSupport.java
2009-03-03 01:46:43 UTC (rev 1088)
+++
trunk/stripes/src/net/sourceforge/stripes/integration/spring/SpringInterceptorSupport.java
2009-03-03 02:20:59 UTC (rev 1089)
@@ -1,54 +0,0 @@
-/* Copyright 2005-2006 Tim Fennell
- *
- * Licensed 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 net.sourceforge.stripes.integration.spring;
-
-import net.sourceforge.stripes.config.ConfigurableComponent;
-import net.sourceforge.stripes.config.Configuration;
-import net.sourceforge.stripes.controller.Interceptor;
-
-import javax.servlet.ServletContext;
-
-/**
- * <p>Base class for developing Interceptors with dependencies on Spring
managed beans. <b>Not</b>
- * to be confused with {...@link SpringInterceptor} which injects Spring
managed beans into
- * ActionBeans. For example, you may wish to subclass this class in order to
write an
- * interceptor with access to Spring managed DAOs or security information.</p>
- *
- * <p>Since Interceptors are long-lived objects that are instantiated at
application startup
- * time, and not per-request, the spring wiring takes place in the init()
method and happens
- * only once when the interceptor is first created and initialized.</p>
- *
- * @author Tim Fennell
- * @since Stripes 1.4
- * @deprecated As of Stripes 1.5.1, replaced by {...@link
SpringInjectionPostProcessor} which already
- * injects Spring dependencies into Interceptors.
- */
-...@deprecated
-public abstract class SpringInterceptorSupport implements Interceptor,
ConfigurableComponent {
-
- /**
- * Fetches the ServletContext and invokes SpringHelper.injectBeans() to
auto-wire any
- * Spring dependencies prior to being placed into service.
- *
- * @param configuration the Stripes Configuration
- * @throws Exception if there are problems with the Spring
configuration/wiring
- */
- public void init(Configuration configuration) throws Exception {
- ServletContext ctx = configuration.getBootstrapPropertyResolver()
- .getFilterConfig().getServletContext();
-
- SpringHelper.injectBeans(this, ctx);
- }
-}
Modified:
trunk/stripes/src/net/sourceforge/stripes/localization/LocalizationUtility.java
===================================================================
---
trunk/stripes/src/net/sourceforge/stripes/localization/LocalizationUtility.java
2009-03-03 01:46:43 UTC (rev 1088)
+++
trunk/stripes/src/net/sourceforge/stripes/localization/LocalizationUtility.java
2009-03-03 02:20:59 UTC (rev 1089)
@@ -77,12 +77,6 @@
catch (MissingResourceException mre) { /* do nothing */ }
}
- // Then the action path (THIS IS DEPRECATED)
- if (localizedValue == null) {
- try { localizedValue = bundle.getString(actionPath + "." +
strippedName); }
- catch (MissingResourceException mre) { /* do nothing */ }
- }
-
// Then all by itself
if (localizedValue == null) {
try { localizedValue = bundle.getString(strippedName); }
Modified: trunk/stripes/src/net/sourceforge/stripes/util/CryptoUtil.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/util/CryptoUtil.java
2009-03-03 01:46:43 UTC (rev 1088)
+++ trunk/stripes/src/net/sourceforge/stripes/util/CryptoUtil.java
2009-03-03 02:20:59 UTC (rev 1089)
@@ -23,7 +23,6 @@
import javax.crypto.SecretKey;
import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.DESedeKeySpec;
-import javax.servlet.http.HttpServletRequest;
import net.sourceforge.stripes.config.Configuration;
import net.sourceforge.stripes.controller.StripesFilter;
@@ -93,20 +92,6 @@
private static SecretKey secretKey;
/**
- * Takes in a String, encrypts it and then base64 encodes the resulting
byte[] so that
- * it can be transmitted and stored as a String. Can be decrypted by a
subsequent call
- * to {...@link #decrypt(String, HttpServletRequest)} in the same session.
- *
- * @param input the String to encrypt and encode
- * @param request NO LONGER USED
- * @return the encrypted, base64 encoded String
- * @deprecated use {...@link #encrypt(String)} instead
- */
- @Deprecated public static String encrypt(String input, HttpServletRequest
request) {
- return encrypt(input);
- }
-
- /**
* Takes in a String, encrypts it and then base64 encodes the resulting
byte[] so that it can be
* transmitted and stored as a String. Can be decrypted by a subsequent
call to
* {...@link #decrypt(String)}. Because, null and "" are equivalent to the
Stripes binding engine,
@@ -153,19 +138,6 @@
}
/**
- * Takes in a base64 encoded and encrypted String that was generated by a
call
- * to {...@link #encrypt(String, HttpServletRequest)} and decrypts it.
- *
- * @param input the base64 String to decode and decrypt
- * @param request NO LONGER USED
- * @return the decrypted String
- * @deprecated use {...@link #decrypt(String)} instead
- */
- @Deprecated public static String decrypt(String input, HttpServletRequest
request) {
- return decrypt(input);
- }
-
- /**
* Takes in a base64 encoded and encrypted String that was generated by a
call to
* {...@link #encrypt(String)} and decrypts it. If {...@code input} is
null, then null will be
* returned.
Modified: trunk/stripes/src/net/sourceforge/stripes/util/ReflectUtil.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/util/ReflectUtil.java
2009-03-03 01:46:43 UTC (rev 1088)
+++ trunk/stripes/src/net/sourceforge/stripes/util/ReflectUtil.java
2009-03-03 02:20:59 UTC (rev 1089)
@@ -14,8 +14,6 @@
*/
package net.sourceforge.stripes.util;
-import net.sourceforge.stripes.controller.ObjectFactory;
-import net.sourceforge.stripes.controller.StripesFilter;
import net.sourceforge.stripes.exception.StripesRuntimeException;
import java.util.Map;
@@ -99,53 +97,6 @@
Literal.set("toString", "equals", "hashCode", "annotationType");
/**
- * Looks up the default implementing type for the supplied interface. This
is done
- * based on a static map of known common interface types and implementing
classes.
- *
- * @param iface an interface for which an implementing class is needed
- * @return a Class object representing the implementing type, or null if
one is
- * not found
- * @deprecated Use {...@link ObjectFactory#newInstance(Class)} instead.
- */
- @Deprecated
- public static Class<?> getImplementingClass(Class<?> iface) {
- return interfaceImplementations.get(iface);
- }
-
- /**
- * Attempts to determine an implementing class for the interface provided
and instantiate
- * it using a default constructor.
- *
- * @param interfaceType an interface (or abstract class) to make an
instance of
- * @return an instance of the interface type supplied
- * @throws InstantiationException if no implementation type has been
configured
- * @throws IllegalAccessException if thrown by the JVM during class
instantiation
- * @deprecated Use {...@link ObjectFactory#newInstance(Class)} instead.
- */
- @Deprecated
- @SuppressWarnings("unchecked")
- public static <T> T getInterfaceInstance(Class<T> interfaceType)
- throws InstantiationException, IllegalAccessException {
- Class impl = getImplementingClass(interfaceType);
- if (impl == null) {
- throw new InstantiationException(
- "Stripes needed to instantiate a property who's declared
type as an " +
- "interface (which obviously cannot be instantiated. The
interface is not " +
- "one that Stripes is aware of, so no implementing class
was known. The " +
- "interface type was: '" + interfaceType.getName() + "'. To
fix this " +
- "you'll need to do one of three things. 1) Change the
getter/setter methods " +
- "to use a concrete type so that Stripes can instantiate
it. 2) in the bean's " +
- "setContext() method pre-instantiate the property so
Stripes doesn't have to. " +
- "3) Bug the Stripes author ;) If the interface is a JDK
type it can easily be " +
- "fixed. If not, if enough people ask, a generic way to
handle the problem " +
- "might get implemented.");
- }
- else {
- return
StripesFilter.getConfiguration().getObjectFactory().newInstance((Class<T>)
impl);
- }
- }
-
- /**
* Utility method used to load a class. Any time that Stripes needs to
load of find a
* class by name it uses this method. As a result any time the
classloading strategy
* needs to change it can be done in one place! Currently uses
Modified: trunk/stripes/src/net/sourceforge/stripes/util/UrlBuilder.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/util/UrlBuilder.java
2009-03-03 01:46:43 UTC (rev 1088)
+++ trunk/stripes/src/net/sourceforge/stripes/util/UrlBuilder.java
2009-03-03 02:20:59 UTC (rev 1089)
@@ -88,23 +88,6 @@
* character usually used to separate parameters will be escaped using the
XML entity
* for ampersand.
*
- * @param url the path part of the URL
- * @param isForPage true if the URL is to be embedded in a page (e.g. in
an anchor of img
- * tag), false if for some other purpose.
- * @deprecated As of Stripes 1.5, this constructor has been replaced by
- * {...@link #UrlBuilder(Locale, String, boolean)}.
- */
- @Deprecated
- public UrlBuilder(String url, boolean isForPage) {
- this(Locale.getDefault(), url, isForPage);
- }
-
- /**
- * Constructs a UrlBuilder with the path to a resource. Parameters can be
added
- * later using addParameter(). If the link is to be used in a page then
the ampersand
- * character usually used to separate parameters will be escaped using the
XML entity
- * for ampersand.
- *
* @param locale the locale to use when formatting parameters with a
{...@link Formatter}
* @param url the path part of the URL
* @param isForPage true if the URL is to be embedded in a page (e.g. in
an anchor of img
Modified:
trunk/stripes/src/net/sourceforge/stripes/validation/ScopedLocalizableError.java
===================================================================
---
trunk/stripes/src/net/sourceforge/stripes/validation/ScopedLocalizableError.java
2009-03-03 01:46:43 UTC (rev 1088)
+++
trunk/stripes/src/net/sourceforge/stripes/validation/ScopedLocalizableError.java
2009-03-03 02:20:59 UTC (rev 1089)
@@ -33,14 +33,10 @@
* <ul>
* <li>com.myco.KittenDetailActionBean.age.outOfRange</li>
* <li>com.myco.KittenDetailActionBean.age.errorMessage</li>
- * <li>/cats/KittenDetail.action.age.outOfRange (deprecated)</li>
- * <li>/cats/KittenDetail.action.age.errorMessage (deprecated)</li>
* <li>age.outOfRange</li>
* <li>age.errorMessage</li>
* <li>com.myco.KittenDetailActionBean.outOfRange</li>
* <li>com.myco.KittenDetailActionBean.errorMessage</li>
- * <li>/cats/KittenDetail.action.outOfRange (deprecated)</li>
- * <li>/cats/KittenDetail.action.errorMessage (deprecated)</li>
* <li>converter.integer.outOfRange</li>
* </ul>
*
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
