You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by ro...@apache.org on 2010/03/31 19:42:00 UTC
svn commit: r929632 - in /incubator/wink/trunk/wink-server/src:
main/java/org/apache/wink/server/internal/servlet/RestServlet.java
test/java/org/apache/wink/server/internal/servlet/RestServletTest.java
Author: rott
Date: Wed Mar 31 17:41:59 2010
New Revision: 929632
URL: http://svn.apache.org/viewvc?rev=929632&view=rev
Log:
WINK-266: make some fields in RestServlet public
Modified:
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java
incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/servlet/RestServletTest.java
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java?rev=929632&r1=929631&r2=929632&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java Wed Mar 31 17:41:59 2010
@@ -69,11 +69,11 @@ public class RestServlet extends Abstrac
private static final Logger logger =
LoggerFactory
.getLogger(RestServlet.class);
- private static final String APPLICATION_INIT_PARAM = "javax.ws.rs.Application"; //$NON-NLS-1$
- private static final String PROPERTIES_DEFAULT_FILE = "META-INF/wink-default.properties"; //$NON-NLS-1$
- private static final String PROPERTIES_INIT_PARAM = "propertiesLocation"; //$NON-NLS-1$
- private static final String APP_LOCATION_PARAM = "applicationConfigLocation"; //$NON-NLS-1$
- private static final String DEPLYMENT_CONF_PARAM = "deploymentConfiguration"; //$NON-NLS-1$
+ public static final String APPLICATION_INIT_PARAM = "javax.ws.rs.Application"; //$NON-NLS-1$
+ public static final String PROPERTIES_DEFAULT_FILE = "META-INF/wink-default.properties"; //$NON-NLS-1$
+ public static final String PROPERTIES_INIT_PARAM = "propertiesLocation"; //$NON-NLS-1$
+ public static final String APP_LOCATION_PARAM = "applicationConfigLocation"; //$NON-NLS-1$
+ public static final String DEPLOYMENT_CONF_PARAM = "deploymentConfiguration"; //$NON-NLS-1$
@Override
public void init() throws ServletException {
@@ -117,7 +117,7 @@ public class RestServlet extends Abstrac
// order of next two lines is important to allow Application to have control over priority order of Providers
deploymentConfiguration.addApplication(getApplication(), false);
RequestProcessor requestProcessor = new RequestProcessor(deploymentConfiguration);
- logger.debug("Creating request processor {} for servlet {}", requestProcessor, this);
+ logger.debug("Creating request processor {} for servlet {}", requestProcessor, this); //$NON-NLS-1$
return requestProcessor;
}
@@ -157,11 +157,11 @@ public class RestServlet extends Abstrac
protected DeploymentConfiguration createDeploymentConfiguration()
throws ClassNotFoundException, InstantiationException, IllegalAccessException {
- String initParameter = getInitParameter(DEPLYMENT_CONF_PARAM);
+ String initParameter = getInitParameter(DEPLOYMENT_CONF_PARAM);
if (initParameter != null) {
logger.info(Messages.getMessage("restServletUseDeploymentConfigurationParam", //$NON-NLS-1$
- initParameter,
- DEPLYMENT_CONF_PARAM));
+ initParameter,
+ DEPLOYMENT_CONF_PARAM));
// use ClassUtils.loadClass instead of Class.forName so we have
// classloader visibility into the Web module in J2EE environments
Class<?> confClass = ClassUtils.loadClass(initParameter);
@@ -190,12 +190,11 @@ public class RestServlet extends Abstrac
}
String appLocationParameter = getInitParameter(APP_LOCATION_PARAM);
if (appLocationParameter == null) {
- logger.warn(Messages.getMessage("propertyNotDefined"), APP_LOCATION_PARAM);
- } else {
- logger.info(Messages.getMessage("restServletWinkApplicationInitParam"),
- appLocationParameter,
- APP_LOCATION_PARAM);
+ logger.warn(Messages.getMessage("propertyNotDefined", APP_LOCATION_PARAM)); //$NON-NLS-1$
}
+ logger.info(Messages.getMessage("restServletWinkApplicationInitParam", //$NON-NLS-1$
+ appLocationParameter,
+ APP_LOCATION_PARAM));
return new ServletWinkApplication(getServletContext(), appLocationParameter);
}
@@ -224,7 +223,7 @@ public class RestServlet extends Abstrac
is = ServletFileLoader.loadFileAsStream(getServletContext(), resourceName);
properties.load(is);
} catch (FileNotFoundException e) {
- logger.debug("FileNotFoundException for {}", resourceName);
+ logger.debug("FileNotFoundException for {}", resourceName); //$NON-NLS-1$
} finally {
try {
if (is != null) {
Modified: incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/servlet/RestServletTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/servlet/RestServletTest.java?rev=929632&r1=929631&r2=929632&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/servlet/RestServletTest.java (original)
+++ incubator/wink/trunk/wink-server/src/test/java/org/apache/wink/server/internal/servlet/RestServletTest.java Wed Mar 31 17:41:59 2010
@@ -52,9 +52,7 @@ public class RestServletTest extends Moc
@Override
protected void setUp() throws Exception {
- Field defaultFileField = RestServlet.class.getDeclaredField("PROPERTIES_DEFAULT_FILE");
- defaultFileField.setAccessible(true);
- String filePath = (String)defaultFileField.get(null);
+ String filePath = RestServlet.PROPERTIES_DEFAULT_FILE;
if (!filePath.startsWith("/")) {
filePath = "/" + filePath;
}
@@ -121,6 +119,15 @@ public class RestServletTest extends Moc
return propFileCustom.getPath();
}
+ public void testConfirmPublic() throws Exception {
+ // confirm these fields are public
+ String a = RestServlet.APPLICATION_INIT_PARAM;
+ String b = RestServlet.PROPERTIES_DEFAULT_FILE;
+ String c = RestServlet.PROPERTIES_INIT_PARAM;
+ String d = RestServlet.APP_LOCATION_PARAM;
+ String e = RestServlet.DEPLOYMENT_CONF_PARAM;
+ }
+
public void testProperties() throws Exception {
RestServlet restServlet = (RestServlet)this.getServlet();
Properties properties = restServlet.getProperties();