[prev in list] [next in list] [prev in thread] [next in thread]
List: wink-commits
Subject: svn commit: r918698 [1/7] - in /incubator/wink/trunk: ibm-jaxrs-server/
From: jramos () apache ! org
Date: 2010-03-03 21:21:55
Message-ID: 20100303212157.ED37323889E9 () eris ! apache ! org
[Download RAW message or body]
Author: jramos
Date: Wed Mar 3 21:21:51 2010
New Revision: 918698
URL: http://svn.apache.org/viewvc?rev=918698&view=rev
Log:
Add NON-NLS comments to lines of code that contain Strings that do not need to be NLS \
translated
Added:
incubator/wink/trunk/ibm-jaxrs-server/
incubator/wink/trunk/ibm-jaxrs-server/src/
incubator/wink/trunk/ibm-jaxrs-server/src/main/
incubator/wink/trunk/ibm-jaxrs-server/src/main/java/
incubator/wink/trunk/ibm-jaxrs-server/src/main/java/com/
incubator/wink/trunk/ibm-jaxrs-server/src/main/java/com/ibm/
incubator/wink/trunk/ibm-jaxrs-server/src/main/java/com/ibm/websphere/
incubator/wink/trunk/ibm-jaxrs-server/src/main/java/com/ibm/websphere/jaxrs/
incubator/wink/trunk/ibm-jaxrs-server/src/main/java/com/ibm/websphere/jaxrs/server/
Modified:
incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/ClientConfig.java
incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/EntityType.java
incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java
incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/handlers/BasicAuthSecurityHandler.java
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/AcceptHeaderHandler.java
incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/ClientRequestImpl.java
incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/GzipHandler.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/RestConstants.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/http/HttpHeadersEx.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/http/HttpMethodEx.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/http/HttpStatus.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/CaseInsensitiveMultivaluedMap.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/MultivaluedMapImpl.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/PathSegmentImpl.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/ResponseImpl.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationValidator.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleWinkApplication.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/http/Accept.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/http/AcceptCharset.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/http/ContentDispositionHeader.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/http/EntityTagMatchHeader.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/i18n/MessageBundle.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/i18n/Messages.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/DefaultLifecycleManager.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagerUtils.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/PrototypeObjectFactory.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/SingletonObjectFactory.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/AnyContentHandler.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/ModelUtils.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/admin/MandatoryYesNo.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FileProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FormMultivaluedMapProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FormatedExceptionProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/ReaderProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/StringProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/csv/CsvSerializerProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/csv/CsvSyndFeedSerializerProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/csv/CsvWriter.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/json/JAXBArrayJSONProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBCollectionProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/AcceptCharsetHeaderDelegate.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/AcceptEncodingHeaderDelegate.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/AcceptHeaderDelegate.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/AcceptLanguageHeaderDelegate.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/CacheControlHeaderDelegate.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/ContentDispositionHeaderDelegate.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/EntityTagMatchHeaderDelegate.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/MediaTypeHeaderDelegate.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/NewCookieHeaderDelegate.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/multipart/InMultiPartProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/multipart/MultiPartParser.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/multipart/OutMultiPartProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ValueConvertor.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/AbstractMetadata.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ClassMetadata.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/MethodMetadata.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uri/UriEncoder.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uri/UriPathNormalizer.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/BitWorkingUriTemplateProcessor.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/JaxRsUriTemplateProcessor.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/UriTemplateMatcher.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/UriTemplateProcessor.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/AnnotationUtils.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/ClassUtils.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/DomHelper.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/ExceptionHelper.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/FileLoader.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/HeaderUtils.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/HttpDateParser.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/MediaTypeUtils.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/OpenSearchUtils.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/StringUtils.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/UriHelper.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/app/AppYesNo.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/app/ObjectFactory.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomConstants.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomEntry.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/ObjectFactory.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/multipart/InMultiPart.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/multipart/OutMultiPart.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/multipart/OutPart.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/ObjectFactory.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/OpenSearchParameter.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/OpenSearchQuery.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/OpenSearchUrl.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/ObjectFactory.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/utils/ProviderUtils.java
incubator/wink/trunk/wink-common/src/main/resources/org/apache/wink/common/internal/i18n/resource.properties
incubator/wink/trunk/wink-providers/wink-abdera-provider/src/main/java/org/apache/wink/providers/abdera/AbderaAtomEntryProvider.java
incubator/wink/trunk/wink-providers/wink-abdera-provider/src/main/java/org/apache/wink/providers/abdera/AbderaAtomFeedProvider.java
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/providers/jettison/JettisonJAXBElementProvider.java
incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/providers/jettison/JettisonJAXBProvider.java
incubator/wink/trunk/wink-providers/wink-json-provider/src/main/java/org/apache/wink/providers/json/JsonProvider.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/handlers/AbstractHandlersChain.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/MediaTypeMapper.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/RequestProcessor.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ApplicationProcessor.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ServletApplicationFileLoader.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/HttpHeadersImpl.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/RequestImpl.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/UriInfoImpl.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/CheckLocationHeaderHandler.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/CreateInvocationParametersHandler.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FindResourceMethodHandler.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FindRootResourceHandler.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FlushResultHandler.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/HeadMethodHandler.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/InvokeMethodHandler.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/OptionsMethodHandler.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateErrorResponseHandler.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateResponseMediaTypeHandler.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/PopulateResponseStatusHandler.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/SearchResult.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/ServerMessageContext.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/properties/WinkSystemProperties.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/ExpandableSectionHelper.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/HtmlConstants.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/HtmlSyndEntryAdapter.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/HtmlSyndFeedAdapter.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/providers/entity/html/OutputStreamHttpServletResponseWrapper.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceInstance.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecord.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRecordFactory.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ServerInjectableFactory.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/resources/HtmlServiceDocumentResource.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/resources/RootResource.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AbstractRestServlet.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/AdminServlet.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestFilter.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/WebSphereParametersFilter.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/AbstractLinksBuilderImpl.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/utils/SystemLinksBuilderImpl.java
incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/DependenciesInjectionPostProcessor.java
incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringLifecycleManager.java
incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/WebDAVConstants.java
incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/WebDAVHeaders.java
incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Multistatus.java
incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/ObjectFactory.java
incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Prop.java
incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Propertyupdate.java
incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Propfind.java
incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/Response.java
incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/WebDAVModelHelper.java
incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/server/WebDAVResponseBuilder.java
incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/server/WebDAVRootResource.java
incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/server/WebDAVUtils.java
Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/ClientConfig.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/ClientConfig.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/ClientConfig.java \
(original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/ClientConfig.java \
Wed Mar 3 21:21:51 2010 @@ -120,7 +120,7 @@
*/
public final ClientConfig proxyHost(String proxyHost) {
if (!modifiable) {
- throw new \
ClientConfigException(Messages.getMessage("clientConfigurationUnmodifiable")); + \
throw new ClientConfigException(Messages.getMessage("clientConfigurationUnmodifiable")); \
//$NON-NLS-1$ }
this.proxyHost = proxyHost;
return this;
@@ -144,7 +144,7 @@
*/
public final ClientConfig proxyPort(int proxyPort) {
if (!modifiable) {
- throw new \
ClientConfigException(Messages.getMessage("clientConfigurationUnmodifiable")); + \
throw new ClientConfigException(Messages.getMessage("clientConfigurationUnmodifiable")); \
//$NON-NLS-1$ }
if (proxyPort <= 0) {
proxyPort = 80;
@@ -171,7 +171,7 @@
*/
public final ClientConfig connectTimeout(int connectTimeout) {
if (!modifiable) {
- throw new \
ClientConfigException(Messages.getMessage("clientConfigurationUnmodifiable")); + \
throw new ClientConfigException(Messages.getMessage("clientConfigurationUnmodifiable")); \
//$NON-NLS-1$ }
this.connectTimeout = connectTimeout;
return this;
@@ -195,7 +195,7 @@
*/
public final ClientConfig readTimeout(int readTimeout) {
if (!modifiable) {
- throw new \
ClientConfigException(Messages.getMessage("clientConfigurationUnmodifiable")); + \
throw new ClientConfigException(Messages.getMessage("clientConfigurationUnmodifiable")); \
//$NON-NLS-1$ }
this.readTimeout = readTimeout;
return this;
@@ -221,7 +221,7 @@
*/
public final ClientConfig followRedirects(boolean followRedirects) {
if (!modifiable) {
- throw new \
ClientConfigException(Messages.getMessage("clientConfigurationUnmodifiable")); + \
throw new ClientConfigException(Messages.getMessage("clientConfigurationUnmodifiable")); \
//$NON-NLS-1$ }
this.followRedirects = followRedirects;
return this;
@@ -248,7 +248,7 @@
*/
public final ClientConfig acceptHeaderAutoSet(boolean isAcceptHeaderAutoSet) {
if (!modifiable) {
- throw new \
ClientConfigException(Messages.getMessage("clientConfigurationUnmodifiable")); + \
throw new ClientConfigException(Messages.getMessage("clientConfigurationUnmodifiable")); \
//$NON-NLS-1$ }
this.isAcceptHeaderAutoSet = isAcceptHeaderAutoSet;
return this;
@@ -272,7 +272,7 @@
*/
public final ClientConfig handlers(ClientHandler... handlers) {
if (!modifiable) {
- throw new \
ClientConfigException(Messages.getMessage("clientConfigurationUnmodifiable")); + \
throw new ClientConfigException(Messages.getMessage("clientConfigurationUnmodifiable")); \
//$NON-NLS-1$ }
for (ClientHandler handler : handlers) {
this.handlers.add(handler);
@@ -324,7 +324,7 @@
*/
public final ClientConfig applications(Application... applications) {
if (!modifiable) {
- throw new \
ClientConfigException(Messages.getMessage("clientConfigurationUnmodifiable")); + \
throw new ClientConfigException(Messages.getMessage("clientConfigurationUnmodifiable")); \
//$NON-NLS-1$ }
if (this.applications == null) {
initDefaultApplication();
Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/EntityType.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/EntityType.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/EntityType.java \
(original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/EntityType.java \
Wed Mar 3 21:21:51 2010 @@ -58,7 +58,7 @@
protected EntityType() {
Type superclass = this.getClass().getGenericSuperclass();
if (!(superclass instanceof ParameterizedType)) {
- throw new \
ClientRuntimeException(Messages.getMessage("entityTypeMustBeParameterized")); + \
throw new ClientRuntimeException(Messages.getMessage("entityTypeMustBeParameterized")); \
//$NON-NLS-1$ }
this.type = ((ParameterizedType)superclass).getActualTypeArguments()[0];
this.cls = (Class<T>)GenericsUtils.getClassType(type);
Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java \
(original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java \
Wed Mar 3 21:21:51 2010 @@ -170,16 +170,16 @@
try {
providersRegistry.addProvider(obj);
} catch (Exception e) {
- \
logger.warn(Messages.getMessage("exceptionOccurredDuringSingletonProcessing", + \
logger.warn(Messages.getMessage("exceptionOccurredDuringSingletonProcessing", \
//$NON-NLS-1$
\
obj.getClass().getCanonicalName()));
- \
logger.warn(Messages.getMessage("listExceptionDuringSingletonProcessing"), e); + \
logger.warn(Messages.getMessage("listExceptionDuringSingletonProcessing"), e); \
//$NON-NLS-1$ } catch (NoClassDefFoundError e) {
- \
logger.warn(Messages.getMessage("exceptionOccurredDuringSingletonProcessing", + \
logger.warn(Messages.getMessage("exceptionOccurredDuringSingletonProcessing", \
//$NON-NLS-1$
\
obj.getClass().getCanonicalName()));
- \
logger.warn(Messages.getMessage("listExceptionDuringSingletonProcessing"), e); + \
logger.warn(Messages.getMessage("listExceptionDuringSingletonProcessing"), e); \
//$NON-NLS-1$ }
} else {
- logger.warn(Messages.getMessage("classNotAProvider", obj));
+ logger.warn(Messages.getMessage("classNotAProvider", obj)); \
//$NON-NLS-1$ }
}
}
Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/handlers/BasicAuthSecurityHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/a \
pache/wink/client/handlers/BasicAuthSecurityHandler.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/handlers/BasicAuthSecurityHandler.java \
(original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/handlers/BasicAuthSecurityHandler.java \
Wed Mar 3 21:21:51 2010 @@ -47,7 +47,7 @@
private static Logger logger = \
LoggerFactory.getLogger(BasicAuthSecurityHandler.class);
- final static String PROPS_FILE_NAME = "wink.client.props";
+ final static String PROPS_FILE_NAME = "wink.client.props"; //$NON-NLS-1$
private Properties clientProps = null;
private volatile boolean propsLoaded = false;
private volatile String handlerUsername = null;
@@ -59,7 +59,7 @@
* @param aUserName the user name
*/
public void setUserName(String aUserName) {
- logger.debug("Setting the username to {}", aUserName);
+ logger.debug("Setting the username to {}", aUserName); //$NON-NLS-1$
this.handlerUsername = aUserName;
}
@@ -69,7 +69,7 @@
* @param aPassword the password to use
*/
public void setPassword(String aPassword) {
- logger.debug("Setting the password");
+ logger.debug("Setting the password"); //$NON-NLS-1$
this.handlerPassword = aPassword;
}
@@ -82,65 +82,65 @@
* header
*/
public ClientResponse handle(ClientRequest request, HandlerContext context) \
throws Exception {
- logger.debug("Entering BasicAuthSecurityHandler.doChain()");
+ logger.debug("Entering BasicAuthSecurityHandler.doChain()"); //$NON-NLS-1$
ClientResponse response = context.doChain(request);
int statusCode = response.getStatusCode();
- logger.debug("Response status code was {}", statusCode);
+ logger.debug("Response status code was {}", statusCode); //$NON-NLS-1$
if (statusCode != 401) {
- logger.debug("Status code was not 401 so no need to re-issue request.");
+ logger.debug("Status code was not 401 so no need to re-issue request."); \
//$NON-NLS-1$ return response;
} else {
// read user id and password from a property
// as a start we use java a command line property
- String userid = System.getProperty("user");
- String password = System.getProperty("password");
+ String userid = System.getProperty("user"); //$NON-NLS-1$
+ String password = System.getProperty("password"); //$NON-NLS-1$
if(logger.isDebugEnabled()) {
- logger.debug("The 'user' system property was set to: {}", userid);
- logger.debug("The 'password' system property was set: {}", password \
!= null); + logger.debug("The 'user' system property was set to: {}", \
userid); //$NON-NLS-1$ + logger.debug("The 'password' system property \
was set: {}", password != null); //$NON-NLS-1$ }
- if (userid == null || userid.equals("") || password == null || \
password.equals("")) { + if (userid == null || userid.equals("") || \
password == null || password.equals("")) { //$NON-NLS-1$ //$NON-NLS-2$ // see if we \
can load credentials from a properties file
- String propsFileDir = System.getProperty("wink.client.props.dir");
- logger.debug("Could NOT get userid and password from system \
properties so attempting to look at properties file in {}", \
propsFileDir);
- if (propsFileDir != null && !propsFileDir.equals("")) {
+ String propsFileDir = System.getProperty("wink.client.props.dir"); \
//$NON-NLS-1$ + logger.debug("Could NOT get userid and password from \
system properties so attempting to look at properties file in {}", propsFileDir); \
//$NON-NLS-1$ + if (propsFileDir != null && !propsFileDir.equals("")) \
{ //$NON-NLS-1$ if (!propsLoaded) {
clientProps = loadProps(propsFileDir + File.separator + \
PROPS_FILE_NAME); }
- userid = clientProps.getProperty("user");
- password = clientProps.getProperty("password");
+ userid = clientProps.getProperty("user"); //$NON-NLS-1$
+ password = clientProps.getProperty("password"); //$NON-NLS-1$
} else {
- logger.debug("Could NOT find properties file so checking \
variables assigned to handler itself", propsFileDir); + \
logger.debug("Could NOT find properties file so checking variables assigned to \
handler itself", propsFileDir); //$NON-NLS-1$ userid = handlerUsername;
password = handlerPassword;
}
}
- if (!(userid == null || userid.equals("") || password == null || \
password.equals(""))) {
- logger.debug("userid and password set so setting Authorization \
header"); + if (!(userid == null || userid.equals("") || password == null \
|| password.equals(""))) { //$NON-NLS-1$ //$NON-NLS-2$ + \
logger.debug("userid and password set so setting Authorization header"); \
//$NON-NLS-1$ // we have a user credential
- String credential = userid + ":" + password;
+ String credential = userid + ":" + password; //$NON-NLS-1$
byte[] credBytes = credential.getBytes();
byte[] encodedCredBytes =
org.apache.commons.codec.binary.Base64.encodeBase64(credBytes, \
false); // id and password needs to be base64 encoded
- String credEncodedString = "Basic " + new String(encodedCredBytes);
- request.getHeaders().putSingle("Authorization", credEncodedString);
- logger.debug("Issuing request again with Authorization header");
+ String credEncodedString = "Basic " + new String(encodedCredBytes); \
//$NON-NLS-1$ + request.getHeaders().putSingle("Authorization", \
credEncodedString); //$NON-NLS-1$ + logger.debug("Issuing request \
again with Authorization header"); //$NON-NLS-1$ response = \
context.doChain(request); if (response.getStatusCode() == 401) {
- logger.debug("After sending request with Authorization header, \
still got 401 response");
- throw new ClientAuthenticationException("Service failed to \
authenticate user: " + userid); + logger.debug("After sending \
request with Authorization header, still got 401 response"); //$NON-NLS-1$ + \
throw new ClientAuthenticationException("Service failed to authenticate user: " + \
userid); //$NON-NLS-1$ } else {
- logger.debug("Got a non-401 response, so returning response");
+ logger.debug("Got a non-401 response, so returning response"); \
//$NON-NLS-1$ return response;
}
} else {
- logger.debug("userid and/or password were not set so throwing \
exception"); + logger.debug("userid and/or password were not set so \
throwing exception"); //$NON-NLS-1$ // no user credential available
throw new ClientAuthenticationException(
- "Missing client authentication \
credential for user: " + userid); + \
"Missing client authentication credential for user: " + userid); //$NON-NLS-1$ }
} // end if block
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/a \
pache/wink/client/internal/ResourceImpl.java?rev=918698&r1=918697&r2=918698&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 Mar 3 21:21:51 2010 @@ -55,7 +55,7 @@
public class ResourceImpl implements Resource {
- private static final String USER_AGENT = "Wink Client v1.0";
+ private static final String USER_AGENT = "Wink Client v1.0"; \
//$NON-NLS-1$
private ProvidersRegistry providersRegistry;
private ClientConfig config;
@@ -243,7 +243,7 @@
request.getHeaders().putAll(headers);
if (logger.isDebugEnabled()) {
Integer requestEntityInfo = (requestEntity == null) ? null : \
System.identityHashCode(requestEntity);
- logger.debug(Messages.getMessage("clientIssueRequest", new Object[] \
{method, + logger.debug(Messages.getMessage("clientIssueRequest", new \
Object[] {method, //$NON-NLS-1$ requestURI, requestEntityInfo, headers.keySet()}));
}
if (headers.getFirst(HttpHeaders.USER_AGENT) == null) {
@@ -321,19 +321,19 @@
}
private <T> String toHeaderString(T[] objects) {
- String delim = "";
+ String delim = ""; //$NON-NLS-1$
StringBuilder sb = new StringBuilder();
for (T t : objects) {
sb.append(delim);
sb.append(t.toString());
- delim = ", ";
+ delim = ", "; //$NON-NLS-1$
}
return sb.toString();
}
private <T> String appendHeaderValues(String value, T[] objects) {
- StringBuilder builder = new StringBuilder(value != null ? value : "");
- builder.append(value != null ? ", " : "");
+ StringBuilder builder = new StringBuilder(value != null ? value : ""); \
//$NON-NLS-1$ + builder.append(value != null ? ", " : ""); //$NON-NLS-1$ \
//$NON-NLS-2$ builder.append(toHeaderString(objects));
return builder.toString();
}
Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/AcceptHeaderHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/a \
pache/wink/client/internal/handlers/AcceptHeaderHandler.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/AcceptHeaderHandler.java \
(original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/AcceptHeaderHandler.java \
Wed Mar 3 21:21:51 2010 @@ -49,18 +49,18 @@
request.getAttributes().get(ClientRequestImpl.RESPONSE_ENTITY_CLASS_TYPE);
if (responseEntityClassType != null) {
Class<?> classType = (Class<?>)responseEntityClassType;
- logger.debug("Response entity class is: {}", classType);
+ logger.debug("Response entity class is: {}", classType); \
//$NON-NLS-1$ Set<MediaType> mediaTypes =
request.getAttribute(ProvidersRegistry.class)
.getMessageBodyReaderMediaTypesLimitByIsReadable(classType,
\
RuntimeContextTLS
\
.getRuntimeContext());
- logger.debug("Found media types: {}", mediaTypes);
+ logger.debug("Found media types: {}", mediaTypes); //$NON-NLS-1$
StringBuffer acceptHeader = new StringBuffer();
boolean isFirst = true;
for (MediaType mt : mediaTypes) {
if (!isFirst) {
- acceptHeader.append(",");
+ acceptHeader.append(","); //$NON-NLS-1$
}
acceptHeader.append(mt.toString());
isFirst = false;
@@ -68,7 +68,7 @@
if (acceptHeader.length() > 0) {
String acceptValue = acceptHeader.toString();
requestHeaders.add(HttpHeaders.ACCEPT, acceptValue);
- \
logger.info(Messages.getMessage("clientAcceptHeaderHandlerSetAccept", + \
logger.info(Messages.getMessage("clientAcceptHeaderHandlerSetAccept", //$NON-NLS-1$ \
acceptValue)); }
}
Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/ClientRequestImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/a \
pache/wink/client/internal/handlers/ClientRequestImpl.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/ClientRequestImpl.java \
(original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/ClientRequestImpl.java \
Wed Mar 3 21:21:51 2010 @@ -26,8 +26,8 @@
public class ClientRequestImpl extends BaseRequestResponseImpl implements \
ClientRequest {
- public static final String RESPONSE_ENTITY_GENERIC_TYPE = \
"response.entity.generic.type";
- public static final String RESPONSE_ENTITY_CLASS_TYPE = \
"response.entity.class.type"; + public static final String \
RESPONSE_ENTITY_GENERIC_TYPE = "response.entity.generic.type"; //$NON-NLS-1$ + \
public static final String RESPONSE_ENTITY_CLASS_TYPE = \
"response.entity.class.type"; //$NON-NLS-1$
private Object entity;
private String method;
Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/GzipHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/a \
pache/wink/client/internal/handlers/GzipHandler.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/GzipHandler.java \
(original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/GzipHandler.java \
Wed Mar 3 21:21:51 2010 @@ -39,7 +39,7 @@
public class GzipHandler implements ClientHandler {
public ClientResponse handle(ClientRequest request, HandlerContext context) \
throws Exception {
- request.getHeaders().add("Accept-Encoding", "gzip");
+ request.getHeaders().add("Accept-Encoding", "gzip"); //$NON-NLS-1$ \
//$NON-NLS-2$ context.addInputStreamAdapter(new GzipAdapter());
context.addOutputStreamAdapter(new GzipAdapter());
return context.doChain(request);
@@ -48,13 +48,13 @@
private static class GzipAdapter implements InputStreamAdapter, \
OutputStreamAdapter {
public OutputStream adapt(OutputStream os, ClientRequest request) throws \
IOException {
- request.getHeaders().add("Content-Encoding", "gzip");
+ request.getHeaders().add("Content-Encoding", "gzip"); //$NON-NLS-1$ \
//$NON-NLS-2$ return new GZIPOutputStream(os);
}
public InputStream adapt(InputStream is, ClientResponse response) throws \
IOException {
- String header = response.getHeaders().getFirst("Content-Encoding");
- if (header != null && header.equalsIgnoreCase("gzip")) {
+ String header = response.getHeaders().getFirst("Content-Encoding"); \
//$NON-NLS-1$ + if (header != null && header.equalsIgnoreCase("gzip")) { \
//$NON-NLS-1$ return new GZIPInputStream(is);
}
return is;
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/RestConstants.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/RestConstants.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/RestConstants.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/RestConstants.java \
Wed Mar 3 21:21:51 2010 @@ -31,93 +31,93 @@
// --- namespaces ---
public static final String NAMESPACE_XML =
- \
"http://www.w3.org/XML/1998/namespace"; + \
"http://www.w3.org/XML/1998/namespace"; //$NON-NLS-1$
- public static final String NAMESPACE_XHTML = \
"http://www.w3.org/1999/xhtml";
- public static final String XHTML_PREFIX = "xhtml";
+ public static final String NAMESPACE_XHTML = \
"http://www.w3.org/1999/xhtml"; //$NON-NLS-1$ + public static final String \
XHTML_PREFIX = "xhtml"; //$NON-NLS-1$
- public static final String NAMESPACE_ATOM = \
"http://www.w3.org/2005/Atom";
- public static final String ATOM_PREFIX = "atom";
+ public static final String NAMESPACE_ATOM = \
"http://www.w3.org/2005/Atom"; //$NON-NLS-1$ + public static final String \
ATOM_PREFIX = "atom"; //$NON-NLS-1$
- public static final String NAMESPACE_APP = \
"http://www.w3.org/2007/app";
- public static final String APP_PREFIX = "app";
+ public static final String NAMESPACE_APP = \
"http://www.w3.org/2007/app"; //$NON-NLS-1$ + public static final String \
APP_PREFIX = "app"; //$NON-NLS-1$
// OpenSearch
public static final String NAMESPACE_OPENSEARCH =
- \
"http://a9.com/-/spec/opensearch/1.1/";
- public static final String OPENSEARCH_PREFIX = "opensearch";
+ \
"http://a9.com/-/spec/opensearch/1.1/"; //$NON-NLS-1$ + public static final String \
OPENSEARCH_PREFIX = "opensearch"; //$NON-NLS-1$
// --- charset ---
- public static final String CHARSET_PARAM = "charset";
+ public static final String CHARSET_PARAM = "charset"; \
//$NON-NLS-1$
// charset encodings
- public static final String CHARACTER_ENCODING_UTF_8 = "UTF-8";
+ public static final String CHARACTER_ENCODING_UTF_8 = "UTF-8"; \
//$NON-NLS-1$
// --- REST query parameters ---
/**
* Overrides Accept-Header with one type.
*/
- public static final String REST_PARAM_MEDIA_TYPE = "alt";
+ public static final String REST_PARAM_MEDIA_TYPE = "alt"; \
//$NON-NLS-1$
/**
* JSON will be encloses as parameter to the value - method name.
*/
- public static final String REST_PARAM_JSON_CALLBACK = "callback";
+ public static final String REST_PARAM_JSON_CALLBACK = "callback"; \
//$NON-NLS-1$
// paging
/**
* The first item to include in the result page.
*/
- public static final String REST_PARAM_PAGING_START = "start-index";
+ public static final String REST_PARAM_PAGING_START = "start-index"; \
//$NON-NLS-1$
/**
* Number of elements per page.
*/
- public static final String REST_PARAM_PAGING_SIZE = "page-size";
+ public static final String REST_PARAM_PAGING_SIZE = "page-size"; \
//$NON-NLS-1$
/**
* Special value of page-size.
*/
- public static final String REST_PARAM_PAGING_SIZE_UNLIMITED = "unlimited";
+ public static final String REST_PARAM_PAGING_SIZE_UNLIMITED = "unlimited"; \
//$NON-NLS-1$
/**
* Specify filtering by category.
*/
- public static final String REST_PARAM_CATEGORY = "category";
+ public static final String REST_PARAM_CATEGORY = "category"; \
//$NON-NLS-1$
/**
* Specified collection ordering.
*/
- public static final String REST_PARAM_ORDER_BY = "order-by";
+ public static final String REST_PARAM_ORDER_BY = "order-by"; \
//$NON-NLS-1$
/**
* Filter by author parameter.
*/
- public static final String REST_PARAM_AUTHOR = "author";
+ public static final String REST_PARAM_AUTHOR = "author"; \
//$NON-NLS-1$
/**
* Filter by entry-id.
*/
- public static final String REST_PARAM_ENTRY_ID = "entry-id";
+ public static final String REST_PARAM_ENTRY_ID = "entry-id"; \
//$NON-NLS-1$
/**
* Filter by custom query.
*/
- public static final String REST_PARAM_QUERY = "query";
+ public static final String REST_PARAM_QUERY = "query"; \
//$NON-NLS-1$
// relative / absolute URLs
/**
* Links in response should be relative.
*/
- public static final String REST_PARAM_RELATIVE_URLS = "relative-urls";
+ public static final String REST_PARAM_RELATIVE_URLS = "relative-urls"; \
//$NON-NLS-1$
/**
* Links in response should be absolute.
*/
- public static final String REST_PARAM_ABSOLUTE_URLS = "absolute-urls";
+ public static final String REST_PARAM_ABSOLUTE_URLS = "absolute-urls"; \
//$NON-NLS-1$
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/http/HttpHeadersEx.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/http/HttpHeadersEx.java?rev=918698&r1=918697&r2=918698&view=diff \
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/http/HttpHeadersEx.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/http/HttpHeadersEx.java \
Wed Mar 3 21:21:51 2010 @@ -29,13 +29,13 @@
// no instances
}
- public static final String ALLOW = "Allow";
+ public static final String ALLOW = "Allow"; //$NON-NLS-1$
// public static final String ACCEPT = "Accept";
// public static final String ACCEPT_LANGUAGE = "Accept-Language";
// public static final String ACCEPT_ENCODING = "Accept-Encoding";
- public static final String ACCEPT_RANGES = "Accept-Ranges";
- public static final String CONTENT_DISPOSITION = "Content-Disposition";
+ public static final String ACCEPT_RANGES = "Accept-Ranges"; \
//$NON-NLS-1$ + public static final String CONTENT_DISPOSITION = \
"Content-Disposition"; //$NON-NLS-1$ // public static final String CONTENT_LANG = \
"Content-Language"; // public static final String CONTENT_TYPE = "Content-Type";
// public static final String ETAG = "ETag";
@@ -54,16 +54,16 @@
/**
* Non RFC 2616 - Atom Publishing Protocol
*/
- public static final String SLUG = "Slug";
+ public static final String SLUG = "Slug"; //$NON-NLS-1$
/**
* Non RFC 2616 - Google Doc convention
*/
- public static final String X_HTTP_METHOD_OVERRIDE = "X-HTTP-Method-Override";
+ public static final String X_HTTP_METHOD_OVERRIDE = "X-HTTP-Method-Override"; \
//$NON-NLS-1$
/**
* Non RFC 2616 - Some client implementing Google Doc
*/
- public static final String X_METHOD_OVERRIDE = "X-Method-Override";
+ public static final String X_METHOD_OVERRIDE = "X-Method-Override"; \
//$NON-NLS-1$
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/http/HttpMethodEx.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/http/HttpMethodEx.java?rev=918698&r1=918697&r2=918698&view=diff \
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/http/HttpMethodEx.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/http/HttpMethodEx.java \
Wed Mar 3 21:21:51 2010 @@ -21,8 +21,8 @@
public class HttpMethodEx {
- public static final String OPTIONS = "OPTIONS";
- public static final String TRACE = "TRACE";
- public static final String CONNECT = "CONNECT";
+ public static final String OPTIONS = "OPTIONS"; //$NON-NLS-1$
+ public static final String TRACE = "TRACE"; //$NON-NLS-1$
+ public static final String CONNECT = "CONNECT"; //$NON-NLS-1$
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/http/HttpStatus.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/http/HttpStatus.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/http/HttpStatus.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/http/HttpStatus.java \
Wed Mar 3 21:21:51 2010 @@ -31,251 +31,251 @@
private static Map<Integer, HttpStatus> valuesByInt =
new \
HashMap<Integer, HttpStatus>();
- private static final String SL_11_START = \
"HTTP/1.1 "; + private static final String SL_11_START \
= "HTTP/1.1 "; //$NON-NLS-1$
public static final HttpStatus CONTINUE =
new \
HttpStatus(
\
100,
- \
"Continue", + \
"Continue", //$NON-NLS-1$
\
true);
public static final HttpStatus SWITCHING_PROTOCOLS =
new \
HttpStatus(
\
101,
- \
"Switching Protocols", + \
"Switching Protocols", //$NON-NLS-1$
\
true);
public static final HttpStatus PROCESSING =
new \
HttpStatus(
\
102,
- \
"Processing", + \
"Processing", //$NON-NLS-1$
\
true);
public static final HttpStatus OK =
new \
HttpStatus(
\
200,
- \
"OK", + \
"OK", //$NON-NLS-1$
\
true);
public static final HttpStatus CREATED =
new \
HttpStatus(
\
201,
- \
"Created", + \
"Created", //$NON-NLS-1$
\
true);
public static final HttpStatus ACCEPTED =
new \
HttpStatus(
\
202,
- \
"Accepted", + \
"Accepted", //$NON-NLS-1$
\
true);
public static final HttpStatus NON_AUTHORITATIVE_INFORMATION =
new \
HttpStatus(
\
203,
- \
"Non Authoritative Information", + \
"Non Authoritative Information", //$NON-NLS-1$
\
true);
public static final HttpStatus NO_CONTENT =
new \
HttpStatus(
\
204,
- \
"No Content", + \
"No Content", //$NON-NLS-1$
\
true);
public static final HttpStatus RESET_CONTENT =
new \
HttpStatus(
\
205,
- \
"Reset Content", + \
"Reset Content", //$NON-NLS-1$
\
true);
public static final HttpStatus PARTIAL_CONTENT =
new \
HttpStatus(
\
206,
- \
"Partial Content", + \
"Partial Content", //$NON-NLS-1$
\
true);
public static final HttpStatus MULTI_STATUS =
new \
HttpStatus(
\
207,
- \
"Multi-Status", + \
"Multi-Status", //$NON-NLS-1$
\
true);
public static final HttpStatus MULTIPLE_CHOICES =
new \
HttpStatus(
\
300,
- \
"Multiple Choices", + \
"Multiple Choices", //$NON-NLS-1$
\
true);
public static final HttpStatus MOVED_PERMANENTLY =
new \
HttpStatus(
\
301,
- \
"Moved Permanently", + \
"Moved Permanently", //$NON-NLS-1$
\
true);
public static final HttpStatus FOUND =
new \
HttpStatus(
\
302,
- \
"Found", + \
"Found", //$NON-NLS-1$
\
true);
public static final HttpStatus SEE_OTHER =
new \
HttpStatus(
\
303,
- \
"See Other", + \
"See Other", //$NON-NLS-1$
\
true);
public static final HttpStatus NOT_MODIFIED =
new \
HttpStatus(
\
304,
- \
"Not Modified", + \
"Not Modified", //$NON-NLS-1$
\
true);
public static final HttpStatus USE_PROXY =
new \
HttpStatus(
\
305,
- \
"Use Proxy", + \
"Use Proxy", //$NON-NLS-1$
\
true);
public static final HttpStatus TEMPORARY_REDIRECT =
new \
HttpStatus(
\
307,
- \
"Temporary Redirect", + \
"Temporary Redirect", //$NON-NLS-1$
\
true);
public static final HttpStatus BAD_REQUEST =
new \
HttpStatus(
\
400,
- \
"Bad Request", + \
"Bad Request", //$NON-NLS-1$
\
true);
public static final HttpStatus UNAUTHORIZED =
new \
HttpStatus(
\
401,
- \
"Unauthorized", + \
"Unauthorized", //$NON-NLS-1$
\
true);
public static final HttpStatus PAYMENT_REQUIRED =
new \
HttpStatus(
\
402,
- \
"Payment Required", + \
"Payment Required", //$NON-NLS-1$
\
true);
public static final HttpStatus FORBIDDEN =
new \
HttpStatus(
\
403,
- \
"Forbidden", + \
"Forbidden", //$NON-NLS-1$
\
true);
public static final HttpStatus NOT_FOUND =
new \
HttpStatus(
\
404,
- \
"Not Found", + \
"Not Found", //$NON-NLS-1$
\
true);
public static final HttpStatus METHOD_NOT_ALLOWED =
new \
HttpStatus(
\
405,
- \
"Method Not Allowed", + \
"Method Not Allowed", //$NON-NLS-1$
\
true);
public static final HttpStatus NOT_ACCEPTABLE =
new \
HttpStatus(
\
406,
- \
"Not Acceptable", + \
"Not Acceptable", //$NON-NLS-1$
\
true);
public static final HttpStatus PROXY_AUTHENTICATION_REQUIRED =
new \
HttpStatus(
\
407,
- \
"Proxy Authentication Required", + \
"Proxy Authentication Required", //$NON-NLS-1$
\
true);
public static final HttpStatus REQUEST_TIMEOUT =
new \
HttpStatus(
\
408,
- \
"Request Timeout", + \
"Request Timeout", //$NON-NLS-1$
\
true);
public static final HttpStatus CONFLICT =
new \
HttpStatus(
\
409,
- \
"Conflict", + \
"Conflict", //$NON-NLS-1$
\
true);
public static final HttpStatus GONE =
new \
HttpStatus(
\
410,
- \
"Gone", + \
"Gone", //$NON-NLS-1$
\
true);
public static final HttpStatus LENGTH_REQUIRED =
new \
HttpStatus(
\
411,
- \
"Length Required", + \
"Length Required", //$NON-NLS-1$
\
true);
public static final HttpStatus PRECONDITION_FAILED =
new \
HttpStatus(
\
412,
- \
"Precondition Failed", + \
"Precondition Failed", //$NON-NLS-1$
\
true);
public static final HttpStatus REQUEST_TOO_LONG =
new \
HttpStatus(
\
413,
- \
"Request Too Long", + \
"Request Too Long", //$NON-NLS-1$
\
true);
public static final HttpStatus REQUEST_URI_TOO_LONG =
new \
HttpStatus(
\
414,
- \
"Request-URI Too Long", + \
"Request-URI Too Long", //$NON-NLS-1$
\
true);
public static final HttpStatus UNSUPPORTED_MEDIA_TYPE =
new \
HttpStatus(
\
415,
- \
"Unsupported Media Type", + \
"Unsupported Media Type", //$NON-NLS-1$
\
true);
public static final HttpStatus REQUESTED_RANGE_NOT_SATISFIABLE =
new \
HttpStatus(
\
416,
- \
"Requested Range Not Satisfiable", + \
"Requested Range Not Satisfiable", //$NON-NLS-1$
\
true);
public static final HttpStatus EXPECTATION_FAILED =
new \
HttpStatus(
\
417,
- \
"Expectation Failed", + \
"Expectation Failed", //$NON-NLS-1$
\
true);
public static final HttpStatus INSUFFICIENT_SPACE_ON_RESOURCE =
new \
HttpStatus(
\
419,
- \
"Insufficient Space On Resource", + \
"Insufficient Space On Resource", //$NON-NLS-1$
\
true);
public static final HttpStatus METHOD_FAILURE =
new \
HttpStatus(
\
420,
- \
"Method Failure", + \
"Method Failure", //$NON-NLS-1$
\
true);
public static final HttpStatus UNPROCESSABLE_ENTITY =
new \
HttpStatus(
\
422,
- \
"Unprocessable Entity", + \
"Unprocessable Entity", //$NON-NLS-1$
\
true);
public static final HttpStatus LOCKED =
new \
HttpStatus(
\
423,
- \
"Locked", + \
"Locked", //$NON-NLS-1$
\
true);
public static final HttpStatus FAILED_DEPENDENCY =
new \
HttpStatus(
\
424,
- \
"Failed Dependency", + \
"Failed Dependency", //$NON-NLS-1$
\
true);
public static final HttpStatus INTERNAL_SERVER_ERROR =
new \
HttpStatus(
\
500,
- \
"Internal Server Error", + \
"Internal Server Error", //$NON-NLS-1$
\
true);
public static final HttpStatus NOT_IMPLEMENTED =
new \
HttpStatus(
\
501,
- \
"Not Implemented", + \
"Not Implemented", //$NON-NLS-1$
\
true);
public static final HttpStatus BAD_GATEWAY =
new \
HttpStatus(
\
502,
- \
"Bad Gateway", + \
"Bad Gateway", //$NON-NLS-1$
\
true);
public static final HttpStatus SERVICE_UNAVAILABLE =
new \
HttpStatus(
\
503,
- \
"Service Unavailable", + \
"Service Unavailable", //$NON-NLS-1$
\
true);
public static final HttpStatus GATEWAY_TIMEOUT =
new \
HttpStatus(
\
504,
- \
"Gateway Timeout", + \
"Gateway Timeout", //$NON-NLS-1$
\
true);
public static final HttpStatus HTTP_VERSION_NOT_SUPPORTED =
new \
HttpStatus(
\
505,
- \
"Http Version Not Supported", + \
"Http Version Not Supported", //$NON-NLS-1$
\
true);
public static final HttpStatus INSUFFICIENT_STORAGE =
new \
HttpStatus(
\
507,
- \
"Insufficient Storage", + \
"Insufficient Storage", //$NON-NLS-1$
\
true);
private int code;
@@ -387,7 +387,7 @@
@Override
public String toString() {
- return code + " " + message;
+ return code + " " + message; //$NON-NLS-1$
}
@Override
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/CaseInsensitiveMultivaluedMap.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/CaseInsensitiveMultivaluedMap.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/CaseInsensitiveMultivaluedMap.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/CaseInsensitiveMultivaluedMap.java \
Wed Mar 3 21:21:51 2010 @@ -120,7 +120,7 @@
@Override
public String toString() {
- return "CaseInsensitiveMultivaluedMap [map=" + map + "]";
+ return "CaseInsensitiveMultivaluedMap [map=" + map + "]"; //$NON-NLS-1$ \
//$NON-NLS-2$ }
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/MultivaluedMapImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/MultivaluedMapImpl.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/MultivaluedMapImpl.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/MultivaluedMapImpl.java \
Wed Mar 3 21:21:51 2010 @@ -122,18 +122,18 @@
@Override
public String toString() {
- return "[" + toString(this, ",") + "]";
+ return "[" + toString(this, ",") + "]"; //$NON-NLS-1$ //$NON-NLS-2$ \
//$NON-NLS-3$ }
public static String toString(MultivaluedMap<?, ?> map, String delimiter) {
StringBuilder result = new StringBuilder();
MultivaluedMap<?, ?> params = map;
- String delim = "";
+ String delim = ""; //$NON-NLS-1$
for (Object name : params.keySet()) {
for (Object value : params.get(name)) {
result.append(delim);
if(name == null) {
- result.append("null");
+ result.append("null"); //$NON-NLS-1$
} else {
result.append(name.toString());
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/PathSegmentImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/PathSegmentImpl.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/PathSegmentImpl.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/PathSegmentImpl.java \
Wed Mar 3 21:21:51 2010 @@ -31,7 +31,7 @@
public class PathSegmentImpl implements PathSegment, Cloneable, \
Comparable<PathSegment> {
- private static final String MATRIX_DELIMITER = ";";
+ private static final String MATRIX_DELIMITER = ";"; //$NON-NLS-1$
private String path;
private MultivaluedMap<String, String> matrixParams;
@@ -42,14 +42,14 @@
public PathSegmentImpl(String path) {
if (path == null) {
- throw new NullPointerException("path");
+ throw new NullPointerException("path"); //$NON-NLS-1$
}
constructParts(path);
}
public PathSegmentImpl(String path, String matrix) {
if (path == null) {
- throw new NullPointerException("path");
+ throw new NullPointerException("path"); //$NON-NLS-1$
}
this.path = path;
constructMatrixParams(extractMatrixParams(matrix));
@@ -57,7 +57,7 @@
public PathSegmentImpl(String path, MultivaluedMap<String, String> matrixParams) \
{ if (path == null) {
- throw new NullPointerException("path");
+ throw new NullPointerException("path"); //$NON-NLS-1$
}
this.path = path;
this.matrixParams = matrixParams;
@@ -143,19 +143,19 @@
@Override
public String toString() {
MultivaluedMap<String, String> matrixParameters = getMatrixParameters();
- String parameters = MultivaluedMapImpl.toString(matrixParameters, ";");
- String delim = (matrixParameters.isEmpty() ? "" : ";");
+ String parameters = MultivaluedMapImpl.toString(matrixParameters, ";"); \
//$NON-NLS-1$ + String delim = (matrixParameters.isEmpty() ? "" : ";"); \
//$NON-NLS-1$ //$NON-NLS-2$ String result = getPath() + delim + parameters;
return result;
}
public static String toString(List<PathSegment> segments) {
StringBuilder builder = new StringBuilder();
- String delim = "";
+ String delim = ""; //$NON-NLS-1$
for (PathSegment segment : segments) {
builder.append(delim);
builder.append(segment.toString());
- delim = "/";
+ delim = "/"; //$NON-NLS-1$
}
return builder.toString();
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/ResponseImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/a \
pache/wink/common/internal/ResponseImpl.java?rev=918698&r1=918697&r2=918698&view=diff \
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/ResponseImpl.java \
(original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/ResponseImpl.java \
Wed Mar 3 21:21:51 2010 @@ -263,7 +263,7 @@
private void conditionalAppend(StringBuilder sb, boolean b, String s) {
if (b) {
if (sb.length() > 0)
- sb.append(",");
+ sb.append(","); //$NON-NLS-1$
sb.append(s);
}
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic