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/07/28 17:01:03 UTC
svn commit: r980083 - in /incubator/wink/trunk:
wink-client/src/main/java/org/apache/wink/client/internal/
wink-client/src/main/java/org/apache/wink/client/internal/handlers/
wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/
w...
Author: rott
Date: Wed Jul 28 15:01:03 2010
New Revision: 980083
URL: http://svn.apache.org/viewvc?rev=980083&view=rev
Log:
non-functional changes: add NON-NLS markers for eclipse message externalization, clean up code comment format, remove unused test
Modified:
incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/ResourceImpl.java
incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/HttpURLConnectionHandler.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/InputStreamProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/UriHelper.java
incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/ApplicationFileLoaderTest.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/ServerMessageContext.java
Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/ResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/ResourceImpl.java?rev=980083&r1=980082&r2=980083&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/ResourceImpl.java (original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/ResourceImpl.java Wed Jul 28 15:01:03 2010
@@ -256,10 +256,7 @@ public class ResourceImpl implements Res
request.getAttributes().putAll(attributes);
request.setAttribute(ProvidersRegistry.class, providersRegistry);
request.setAttribute(WinkConfiguration.class, config);
-
- // for legacy, if third-party code is calling getAttribute with ClientConfig.class as key
- request.setAttribute(ClientConfig.class, config);
-
+ request.setAttribute(ClientConfig.class, config); // legacy
request.getAttributes().put(ClientRequestImpl.RESPONSE_ENTITY_GENERIC_TYPE,
responseEntityType);
request.getAttributes().put(ClientRequestImpl.RESPONSE_ENTITY_CLASS_TYPE, responseEntity);
Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/HttpURLConnectionHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/HttpURLConnectionHandler.java?rev=980083&r1=980082&r2=980083&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/HttpURLConnectionHandler.java (original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/HttpURLConnectionHandler.java Wed Jul 28 15:01:03 2010
@@ -74,8 +74,8 @@ public class HttpURLConnectionHandler ex
hv = https.getHostnameVerifier();
https.setHostnameVerifier(new HostnameVerifier() {
public boolean verify(String urlHostName, SSLSession session) {
- logger.debug("Bypassing hostname verification: URL host is " + urlHostName
- + ", SSLSession host is "
+ logger.trace("Bypassing hostname verification: URL host is " + urlHostName //$NON-NLS-1$
+ + ", SSLSession host is " //$NON-NLS-1$
+ session.getPeerHost());
return true;
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/InputStreamProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/InputStreamProvider.java?rev=980083&r1=980082&r2=980083&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/InputStreamProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/InputStreamProvider.java Wed Jul 28 15:01:03 2010
@@ -84,6 +84,7 @@ public class InputStreamProvider impleme
try {
ProviderUtils.copyStream(t, entityStream);
} finally {
+ // be sure to close the input stream but not the entitystream
t.close();
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/UriHelper.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/UriHelper.java?rev=980083&r1=980082&r2=980083&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/UriHelper.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/UriHelper.java Wed Jul 28 15:01:03 2010
@@ -154,9 +154,7 @@ public class UriHelper {
return str;
}
- return str.substring(0, pidx) + str.substring(pidx + ui.length() + 1); // 1
- // for
- // @
+ return str.substring(0, pidx) + str.substring(pidx + ui.length() + 1); // 1 for @
}
/**
@@ -210,11 +208,7 @@ public class UriHelper {
pos++;
}
StringBuilder result = new StringBuilder();
- if (pos == splitBase.length && !normalizeBasePath.endsWith("/")) { // at //$NON-NLS-1$
- // the
- // end
- // of
- // base
+ if (pos == splitBase.length && !normalizeBasePath.endsWith("/")) { // at the end of base //$NON-NLS-1$
// .../baseEnd
String lastSegment = splitBase[pos - 1];
result.append(lastSegment);
Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/ApplicationFileLoaderTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/ApplicationFileLoaderTest.java?rev=980083&r1=980082&r2=980083&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/ApplicationFileLoaderTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/application/ApplicationFileLoaderTest.java Wed Jul 28 15:01:03 2010
@@ -43,16 +43,6 @@ public class ApplicationFileLoaderTest e
.contains(org.apache.wink.common.internal.providers.entity.ByteArrayProvider.class));
}
- public void testLogging() throws Exception {
- //WinkLogHandler.turnLoggingCaptureOn(); // WinkLogHandler imported from wink-component-test-support module
- ApplicationFileLoader applicationFileLoader =
- new ApplicationFileLoader("org//apache//wink//common//internal//application//custom.app");
- //WinkLogHandler.turnLoggingCaptureOff();
- //ArrayList<LogRecord> logRecords = WinkLogHandler.getRecords();
- //assertEquals(13, logRecords.size());
- //WinkLogHandler.clearRecords(); // recommend doing this so static ArrayList of LogRecords is clear for next test
- }
-
public void testFileNotFound() {
try {
new ApplicationFileLoader("noSuchFile");
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java?rev=980083&r1=980082&r2=980083&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java Wed Jul 28 15:01:03 2010
@@ -97,9 +97,9 @@ public class DeploymentConfiguration imp
private static final String VALIDATE_LOCATION_HEADER =
"wink.validateLocationHeader"; //$NON-NLS-1$
private static final String DEFAULT_RESPONSE_CHARSET =
- "wink.response.defaultCharset"; // $NON-NLS-1$ //$NON-NLS-1$
+ "wink.response.defaultCharset"; // $NON-NLS-1$
private static final String USE_ACCEPT_CHARSET =
- "wink.response.useAcceptCharset"; // $NON-NLS-1$ //$NON-NLS-1$
+ "wink.response.useAcceptCharset"; // $NON-NLS-1$
// handler chains
private RequestHandlersChain requestHandlersChain;
private ResponseHandlersChain responseHandlersChain;
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/ServerMessageContext.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/ServerMessageContext.java?rev=980083&r1=980082&r2=980083&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/ServerMessageContext.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/ServerMessageContext.java Wed Jul 28 15:01:03 2010
@@ -86,10 +86,7 @@ public class ServerMessageContext extend
setAttribute(ServletConfig.class, configuration.getServletConfig());
setAttribute(FilterConfig.class, configuration.getFilterConfig());
setAttribute(WinkConfiguration.class, configuration);
-
- // for legacy, if third-party code is calling getAttribute with DeploymentConfiguration.class as key
- setAttribute(DeploymentConfiguration.class, configuration);
-
+ setAttribute(DeploymentConfiguration.class, configuration); // legacy
setAttribute(ResourceRegistry.class, configuration.getResourceRegistry());
setAttribute(ProvidersRegistry.class, configuration.getProvidersRegistry());
setAttribute(MediaTypeCharsetAdjuster.class, ServerMediaTypeCharsetAdjuster.getInstance());