You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by jr...@apache.org on 2010/03/03 22:21:55 UTC
svn commit: r918698 [4/7] - in /incubator/wink/trunk: ibm-jaxrs-server/
ibm-jaxrs-server/src/ ibm-jaxrs-server/src/main/
ibm-jaxrs-server/src/main/java/ ibm-jaxrs-server/src/main/java/com/
ibm-jaxrs-server/src/main/java/com/ibm/ ibm-jaxrs-server/src/ma...
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/MediaTypeUtils.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/MediaTypeUtils.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/MediaTypeUtils.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/MediaTypeUtils.java Wed Mar 3 21:21:51 2010
@@ -30,120 +30,120 @@
public class MediaTypeUtils {
- public static final String ATOM_SERVICE_DOCUMENT = "application/atomsvc+xml";
+ public static final String ATOM_SERVICE_DOCUMENT = "application/atomsvc+xml"; //$NON-NLS-1$
public static final MediaType ATOM_SERVICE_DOCUMENT_TYPE =
new MediaType(
- "application",
- "atomsvc+xml");
- public static final String ATOM_CATEGORIES_DOCUMENT = "application/atomcat+xml";
+ "application", //$NON-NLS-1$
+ "atomsvc+xml"); //$NON-NLS-1$
+ public static final String ATOM_CATEGORIES_DOCUMENT = "application/atomcat+xml"; //$NON-NLS-1$
public static final MediaType ATOM_CATEGORIES_DOCUMENT_TYPE =
new MediaType(
- "application",
- "atomcat+xml");
+ "application", //$NON-NLS-1$
+ "atomcat+xml"); //$NON-NLS-1$
public static final String ATOM_ENTRY =
- "application/atom+xml;type=entry";
+ "application/atom+xml;type=entry"; //$NON-NLS-1$
public static final MediaType ATOM_ENTRY_TYPE =
new MediaType(
- "application",
- "atom+xml",
+ "application", //$NON-NLS-1$
+ "atom+xml", //$NON-NLS-1$
Collections
- .singletonMap("type",
- "entry"));
+ .singletonMap("type", //$NON-NLS-1$
+ "entry")); //$NON-NLS-1$
public static final String ATOM_FEED =
- "application/atom+xml;type=feed";
+ "application/atom+xml;type=feed"; //$NON-NLS-1$
public static final MediaType ATOM_FEED_TYPE =
new MediaType(
- "application",
- "atom+xml",
+ "application", //$NON-NLS-1$
+ "atom+xml", //$NON-NLS-1$
Collections
- .singletonMap("type",
- "feed"));
+ .singletonMap("type", //$NON-NLS-1$
+ "feed")); //$NON-NLS-1$
public static final MediaType IMAGE_X_ICON =
- new MediaType("image",
- "x-icon");
+ new MediaType("image", //$NON-NLS-1$
+ "x-icon"); //$NON-NLS-1$
public static final MediaType IMAGE_PNG =
- new MediaType("image",
- "png");
+ new MediaType("image", //$NON-NLS-1$
+ "png"); //$NON-NLS-1$
public static final MediaType IMAGE_VND =
- new MediaType("image",
- "vnd.microsoft.icon");
- public static final String IMAGE_JPEG = "image/jpeg";
+ new MediaType("image", //$NON-NLS-1$
+ "vnd.microsoft.icon"); //$NON-NLS-1$
+ public static final String IMAGE_JPEG = "image/jpeg"; //$NON-NLS-1$
public static final MediaType IMAGE_JPEG_TYPE =
- new MediaType("image",
- "jpeg");
+ new MediaType("image", //$NON-NLS-1$
+ "jpeg"); //$NON-NLS-1$
- public static final String UNKNOWN = "x-internal/unknown";
+ public static final String UNKNOWN = "x-internal/unknown"; //$NON-NLS-1$
public static final MediaType UNKNOWN_TYPE =
new MediaType(
- "x-internal",
- "unknown");
+ "x-internal", //$NON-NLS-1$
+ "unknown"); //$NON-NLS-1$
public static final String OPENSEARCH =
- "application/opensearchdescription+xml";
+ "application/opensearchdescription+xml"; //$NON-NLS-1$
public static final MediaType OPENSEARCH_TYPE =
new MediaType(
- "application",
- "opensearchdescription+xml");
+ "application", //$NON-NLS-1$
+ "opensearchdescription+xml"); //$NON-NLS-1$
- public static final String JAVASCRIPT = "application/javascript";
+ public static final String JAVASCRIPT = "application/javascript"; //$NON-NLS-1$
public static final MediaType JAVASCRIPT_TYPE =
new MediaType(
- "application",
- "javascript");
+ "application", //$NON-NLS-1$
+ "javascript"); //$NON-NLS-1$
- public static final String ECMASCRIPT = "application/ecmascript";
+ public static final String ECMASCRIPT = "application/ecmascript"; //$NON-NLS-1$
public static final MediaType ECMASCRIPT_TYPE =
new MediaType(
- "application",
- "ecmascript");
+ "application", //$NON-NLS-1$
+ "ecmascript"); //$NON-NLS-1$
- public static final String TEXT_ECMASCRIPT = "text/ecmascript";
+ public static final String TEXT_ECMASCRIPT = "text/ecmascript"; //$NON-NLS-1$
public static final MediaType TEXT_ECMASCRIPT_TYPE =
- new MediaType("text",
- "ecmascript");
- public static final String TEXT_JAVASCRIPT = "text/javascript";
+ new MediaType("text", //$NON-NLS-1$
+ "ecmascript"); //$NON-NLS-1$
+ public static final String TEXT_JAVASCRIPT = "text/javascript"; //$NON-NLS-1$
public static final MediaType TEXT_JAVASCRIPT_TYPE =
- new MediaType("text",
- "javascript");
+ new MediaType("text", //$NON-NLS-1$
+ "javascript"); //$NON-NLS-1$
- public static final MediaType CSV = new MediaType("text", "csv");
- public static final String PDF = "application/pdf";
+ public static final MediaType CSV = new MediaType("text", "csv"); //$NON-NLS-1$ //$NON-NLS-2$
+ public static final String PDF = "application/pdf"; //$NON-NLS-1$
public static final MediaType PDF_TYPE =
new MediaType(
- "application",
- "pdf");
- public static final String ZIP = "application/zip";
+ "application", //$NON-NLS-1$
+ "pdf"); //$NON-NLS-1$
+ public static final String ZIP = "application/zip"; //$NON-NLS-1$
public static final MediaType ZIP_TYPE =
new MediaType(
- "application",
- "zip");
+ "application", //$NON-NLS-1$
+ "zip"); //$NON-NLS-1$
public static final MediaType MS_WORD =
new MediaType(
- "application",
- "msword");
+ "application", //$NON-NLS-1$
+ "msword"); //$NON-NLS-1$
public static final MediaType MS_EXCEL =
new MediaType(
- "application",
- "vnd.ms-excel");
+ "application", //$NON-NLS-1$
+ "vnd.ms-excel"); //$NON-NLS-1$
public static final MediaType MS_PPT =
new MediaType(
- "application",
- "vnd.ms-powerpoint");
- public static final String MULTIPART_MIXED = "multipart/mixed";
+ "application", //$NON-NLS-1$
+ "vnd.ms-powerpoint"); //$NON-NLS-1$
+ public static final String MULTIPART_MIXED = "multipart/mixed"; //$NON-NLS-1$
public static final MediaType MULTIPART_MIXED_TYPE =
- new MediaType("multipart",
- "mixed");
+ new MediaType("multipart", //$NON-NLS-1$
+ "mixed"); //$NON-NLS-1$
- public static final String MULTIPART_FORM_DATA = "multipart/form-data";
+ public static final String MULTIPART_FORM_DATA = "multipart/form-data"; //$NON-NLS-1$
public static final MediaType MULTIPART_FORM_DATA_TYPE =
- new MediaType("multipart",
- "form-data");
+ new MediaType("multipart", //$NON-NLS-1$
+ "form-data"); //$NON-NLS-1$
public static final Set<MediaType> JSON_TYPES = createJsonTypes();
@@ -160,7 +160,7 @@
public static boolean isXmlType(MediaType mediaType) {
return (MediaTypeUtils.equalsIgnoreParameters(mediaType, MediaType.TEXT_XML_TYPE) || MediaTypeUtils
.equalsIgnoreParameters(mediaType, MediaType.APPLICATION_XML_TYPE) || (mediaType
- .getType().equals("application") && mediaType.getSubtype().endsWith("+xml")));
+ .getType().equals("application") && mediaType.getSubtype().endsWith("+xml"))); //$NON-NLS-1$ //$NON-NLS-2$
}
public static MediaType clone(MediaType mt) {
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/OpenSearchUtils.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/OpenSearchUtils.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/OpenSearchUtils.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/OpenSearchUtils.java Wed Mar 3 21:21:51 2010
@@ -24,6 +24,7 @@
import javax.ws.rs.core.MediaType;
+import org.apache.wink.common.internal.i18n.Messages;
import org.apache.wink.common.model.opensearch.OpenSearchImage;
public class OpenSearchUtils {
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/StringUtils.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/StringUtils.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/StringUtils.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/StringUtils.java Wed Mar 3 21:21:51 2010
@@ -32,7 +32,7 @@
*/
public class StringUtils {
- public final static String lineSeparator = System.getProperty("line.separator");
+ public final static String lineSeparator = System.getProperty("line.separator"); //$NON-NLS-1$
private StringUtils() {
// this class should never be created
@@ -40,35 +40,35 @@
public static String valueOf(Map<?, ?> map) {
if (map == null) {
- return "null";
+ return "null"; //$NON-NLS-1$
}
StringBuilder builder = new StringBuilder();
- builder.append("{");
+ builder.append("{"); //$NON-NLS-1$
builder.append(lineSeparator);
for (Iterator<?> iterator = map.entrySet().iterator(); iterator.hasNext();) {
Entry<?, ?> entry = (Entry<?, ?>)iterator.next();
builder.append(String.valueOf(entry.getKey()));
- builder.append("=");
+ builder.append("="); //$NON-NLS-1$
builder.append(String.valueOf(entry.getValue()));
builder.append(lineSeparator);
}
- builder.append("}");
+ builder.append("}"); //$NON-NLS-1$
return builder.toString();
}
public static String valueOf(List<?> list) {
if (list == null) {
- return "null";
+ return "null"; //$NON-NLS-1$
}
StringBuilder builder = new StringBuilder();
- builder.append("[");
+ builder.append("["); //$NON-NLS-1$
builder.append(lineSeparator);
for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) {
Object object = iterator.next();
builder.append(String.valueOf(object));
builder.append(lineSeparator);
}
- builder.append("]");
+ builder.append("]"); //$NON-NLS-1$
return builder.toString();
}
@@ -96,8 +96,8 @@
return new String[0];
}
- if (string.equals("")) {
- return new String[] {""};
+ if (string.equals("")) { //$NON-NLS-1$
+ return new String[] {""}; //$NON-NLS-1$
}
List<String> tmpResults = new ArrayList<String>();
@@ -113,7 +113,7 @@
// if the delimiter is at the end of the string
if (fromIndex >= string.length()) {
if (strict) {
- tmpResults.add("");
+ tmpResults.add(""); //$NON-NLS-1$
}
break;
}
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=918698&r1=918697&r2=918698&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 Mar 3 21:21:51 2010
@@ -196,17 +196,17 @@
*/
public static String relativize(String basePath, String pathToRelativize) {
String normalizeBasePath = removeStartSlash(UriPathNormalizer.normalize(basePath));
- String[] splitBase = StringUtils.fastSplit(normalizeBasePath, "/", false);
+ String[] splitBase = StringUtils.fastSplit(normalizeBasePath, "/", false); //$NON-NLS-1$
String normalizedPathToRelativize =
removeStartSlash(UriPathNormalizer.normalize(pathToRelativize));
- String[] splitPath = StringUtils.fastSplit(normalizedPathToRelativize, "/", false);
+ String[] splitPath = StringUtils.fastSplit(normalizedPathToRelativize, "/", false); //$NON-NLS-1$
int pos = 0;
while (pos < splitBase.length && pos < splitPath.length
&& splitBase[pos].equals(splitPath[pos])) {
pos++;
}
StringBuilder result = new StringBuilder();
- if (pos == splitBase.length && !normalizeBasePath.endsWith("/")) { // at
+ if (pos == splitBase.length && !normalizeBasePath.endsWith("/")) { // at //$NON-NLS-1$
// the
// end
// of
@@ -229,12 +229,12 @@
for (int posBase = pos; posBase < splitBase.length - 1; posBase++) {
if (result.length() != 0)
result.append('/');
- result.append("..");
+ result.append(".."); //$NON-NLS-1$
}
- if (normalizeBasePath.endsWith("/")) {
+ if (normalizeBasePath.endsWith("/")) { //$NON-NLS-1$
if (result.length() != 0)
result.append('/');
- result.append("..");
+ result.append(".."); //$NON-NLS-1$
}
for (; pos < splitPath.length; pos++) {
if (result.length() != 0)
@@ -253,7 +253,7 @@
* @return s value with optional first character '/' removed
*/
public static String removeStartSlash(String s) {
- if (s.startsWith("/")) {
+ if (s.startsWith("/")) { //$NON-NLS-1$
return s.substring(1);
} else {
return s;
@@ -273,7 +273,7 @@
throw new NullPointerException("baseUri"); //$NON-NLS-1$
if (path == null || path.length() == 0)
return baseUri;
- boolean endSlash = baseUri.endsWith("/");
+ boolean endSlash = baseUri.endsWith("/"); //$NON-NLS-1$
boolean startSlash = path.charAt(0) == '/';
if (startSlash && endSlash) {
return baseUri + path.substring(1);
@@ -336,28 +336,28 @@
StringBuilder buffer = new StringBuilder();
if (scheme != null) {
buffer.append(scheme);
- buffer.append("://");
+ buffer.append("://"); //$NON-NLS-1$
}
if (userInfo != null) {
buffer.append(userInfo);
- buffer.append("@");
+ buffer.append("@"); //$NON-NLS-1$
}
if (host != null) {
buffer.append(host);
}
if (port != -1) {
- buffer.append(":");
+ buffer.append(":"); //$NON-NLS-1$
buffer.append(port);
}
if (path != null) {
buffer.append(path);
}
if (query != null) {
- buffer.append("?");
+ buffer.append("?"); //$NON-NLS-1$
buffer.append(query);
}
if (fragment != null) {
- buffer.append("#");
+ buffer.append("#"); //$NON-NLS-1$
buffer.append(fragment);
}
return buffer.toString();
@@ -374,12 +374,12 @@
*/
public static String getQueryParamsStr(Map<String, String[]> queryParams, boolean escapeKeyParam) {
if (queryParams == null || queryParams.size() < 1) {
- return "";
+ return ""; //$NON-NLS-1$
}
StringBuilder queryParamsStr = new StringBuilder();
Set<String> queryParamsKey = queryParams.keySet();
String[] params;
- String appendStr = "";
+ String appendStr = ""; //$NON-NLS-1$
for (String key : queryParamsKey) {
params = queryParams.get(key);
if (params == null) {
@@ -388,9 +388,9 @@
for (String paramInArray : params) {
queryParamsStr.append(appendStr);
queryParamsStr.append(escapeKeyParam ? UriEncoder.encodeString(key) : key)
- .append("=").append(escapeKeyParam ? UriEncoder.encodeString(paramInArray)
+ .append("=").append(escapeKeyParam ? UriEncoder.encodeString(paramInArray) //$NON-NLS-1$
: paramInArray);
- appendStr = "&";
+ appendStr = "&"; //$NON-NLS-1$
}
}
@@ -434,7 +434,7 @@
* @return list of PathSegement instances
*/
public static List<PathSegment> parsePath(String path) {
- String[] segmentsArray = StringUtils.fastSplitTemplate(path, "/", true);
+ String[] segmentsArray = StringUtils.fastSplitTemplate(path, "/", true); //$NON-NLS-1$
List<PathSegment> pathSegments = new ArrayList<PathSegment>(segmentsArray.length);
// go over all the segments and add them
for (String segment : segmentsArray) {
@@ -455,7 +455,7 @@
if (queryStr == null || queryStr.length() == 0) {
return query;
}
- String[] paramsArray = StringUtils.fastSplit(queryStr, "&");
+ String[] paramsArray = StringUtils.fastSplit(queryStr, "&"); //$NON-NLS-1$
for (String param : paramsArray) {
int index = param.indexOf('=');
String name = param;
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/app/AppYesNo.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/app/AppYesNo.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/app/AppYesNo.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/app/AppYesNo.java Wed Mar 3 21:21:51 2010
@@ -39,8 +39,8 @@
public enum AppYesNo {
@XmlEnumValue("yes")
- YES("yes"), @XmlEnumValue("no")
- NO("no");
+ YES("yes"), @XmlEnumValue("no") //$NON-NLS-1$
+ NO("no"); //$NON-NLS-1$
private final String value;
AppYesNo(String v) {
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/app/ObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/app/ObjectFactory.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/app/ObjectFactory.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/app/ObjectFactory.java Wed Mar 3 21:21:51 2010
@@ -45,20 +45,20 @@
public class ObjectFactory {
private final static QName _Accept_QNAME =
- new QName("http://www.w3.org/2007/app",
- "accept");
+ new QName("http://www.w3.org/2007/app", //$NON-NLS-1$
+ "accept"); //$NON-NLS-1$
private final static QName _Workspace_QNAME =
- new QName("http://www.w3.org/2007/app",
- "workspace");
+ new QName("http://www.w3.org/2007/app", //$NON-NLS-1$
+ "workspace"); //$NON-NLS-1$
private final static QName _Categories_QNAME =
- new QName("http://www.w3.org/2007/app",
- "categories");
+ new QName("http://www.w3.org/2007/app", //$NON-NLS-1$
+ "categories"); //$NON-NLS-1$
private final static QName _Service_QNAME =
- new QName("http://www.w3.org/2007/app",
- "service");
+ new QName("http://www.w3.org/2007/app", //$NON-NLS-1$
+ "service"); //$NON-NLS-1$
private final static QName _Collection_QNAME =
- new QName("http://www.w3.org/2007/app",
- "collection");
+ new QName("http://www.w3.org/2007/app", //$NON-NLS-1$
+ "collection"); //$NON-NLS-1$
/**
* Create a new ObjectFactory that can be used to create new instances of
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomConstants.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomConstants.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomConstants.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomConstants.java Wed Mar 3 21:21:51 2010
@@ -28,24 +28,24 @@
private AtomConstants() {
} // no instances
- public static final String ATOM_REL_SELF = "self";
- public static final String ATOM_REL_ALT = "alternate";
- public static final String ATOM_REL_RELATED = "related";
- public static final String ATOM_REL_ENCLOSURE = "enclosure";
- public static final String ATOM_REL_VIA = "via";
- public static final String ATOM_REL_EDIT = "edit";
- public static final String ATOM_REL_EDIT_MEDIA = "edit-media";
- public static final String ATOM_REL_SEARCH = "search";
- public static final String ATOM_REL_HISTORY = "history";
+ public static final String ATOM_REL_SELF = "self"; //$NON-NLS-1$
+ public static final String ATOM_REL_ALT = "alternate"; //$NON-NLS-1$
+ public static final String ATOM_REL_RELATED = "related"; //$NON-NLS-1$
+ public static final String ATOM_REL_ENCLOSURE = "enclosure"; //$NON-NLS-1$
+ public static final String ATOM_REL_VIA = "via"; //$NON-NLS-1$
+ public static final String ATOM_REL_EDIT = "edit"; //$NON-NLS-1$
+ public static final String ATOM_REL_EDIT_MEDIA = "edit-media"; //$NON-NLS-1$
+ public static final String ATOM_REL_SEARCH = "search"; //$NON-NLS-1$
+ public static final String ATOM_REL_HISTORY = "history"; //$NON-NLS-1$
// type
- public static final String ATOM_XHTML = "xhtml";
- public static final String ATOM_HTML = "html";
- public static final String ATOM_TXT = "text";
+ public static final String ATOM_XHTML = "xhtml"; //$NON-NLS-1$
+ public static final String ATOM_HTML = "html"; //$NON-NLS-1$
+ public static final String ATOM_TXT = "text"; //$NON-NLS-1$
// paging
- public static final String ATOM_REL_FIRST = "first";
- public static final String ATOM_REL_LAST = "last";
- public static final String ATOM_REL_PREVIOUS = "previous";
- public static final String ATOM_REL_NEXT = "next";
+ public static final String ATOM_REL_FIRST = "first"; //$NON-NLS-1$
+ public static final String ATOM_REL_LAST = "last"; //$NON-NLS-1$
+ public static final String ATOM_REL_PREVIOUS = "previous"; //$NON-NLS-1$
+ public static final String ATOM_REL_NEXT = "next"; //$NON-NLS-1$
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomEntry.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomEntry.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomEntry.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomEntry.java Wed Mar 3 21:21:51 2010
@@ -49,6 +49,7 @@
import javax.xml.datatype.XMLGregorianCalendar;
import org.apache.wink.common.RestException;
+import org.apache.wink.common.internal.i18n.Messages;
import org.apache.wink.common.internal.model.ModelUtils;
import org.apache.wink.common.internal.utils.JAXBUtils;
import org.apache.wink.common.model.synd.SyndCategory;
@@ -138,7 +139,7 @@
"author", "contributor", "category", "any", "content"})
public class AtomEntry extends AtomCommonAttributes {
- private static final String MATCH_ANY_PATTERN = ".*";
+ private static final String MATCH_ANY_PATTERN = ".*"; //$NON-NLS-1$
@XmlElement(required = true)
protected String id;
@@ -163,7 +164,7 @@
try {
atomContext = JAXBContext.newInstance(AtomEntry.class.getPackage().getName());
} catch (JAXBException e) {
- throw new RestException("Failed to create JAXBContext for AtomEntry", e);
+ throw new RestException(Messages.getMessage("failedToCreateJAXBContextFor", "AtomEntry"), e); //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -449,7 +450,7 @@
*/
public List<AtomLink> getLinks(String relationPattern, String typePattern) {
if (relationPattern == null || typePattern == null) {
- throw new NullPointerException("pattern");
+ throw new NullPointerException(Messages.getMessage("variableIsNull", "pattern")); //$NON-NLS-1$ //$NON-NLS-2$
}
List<AtomLink> matchingLinks = new ArrayList<AtomLink>();
@@ -458,10 +459,10 @@
String rel = link.getRel();
String type = link.getType();
if (rel == null) {
- rel = "";
+ rel = ""; //$NON-NLS-1$
}
if (type == null) {
- type = "";
+ type = ""; //$NON-NLS-1$
}
if (rel.matches(relationPattern) && type.matches(typePattern)) {
matchingLinks.add(link);
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/ObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/ObjectFactory.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/ObjectFactory.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/ObjectFactory.java Wed Mar 3 21:21:51 2010
@@ -48,14 +48,14 @@
public class ObjectFactory {
private final static QName _Content_QNAME =
- new QName("http://www.w3.org/2005/Atom",
- "content");
- private final static QName _Title_QNAME = new QName("http://www.w3.org/2005/Atom", "title");
- private final static QName _Feed_QNAME = new QName("http://www.w3.org/2005/Atom", "feed");
+ new QName("http://www.w3.org/2005/Atom", //$NON-NLS-1$
+ "content"); //$NON-NLS-1$
+ private final static QName _Title_QNAME = new QName("http://www.w3.org/2005/Atom", "title"); //$NON-NLS-1$ //$NON-NLS-2$
+ private final static QName _Feed_QNAME = new QName("http://www.w3.org/2005/Atom", "feed"); //$NON-NLS-1$ //$NON-NLS-2$
private final static QName _Category_QNAME =
- new QName("http://www.w3.org/2005/Atom",
- "category");
- private final static QName _Entry_QNAME = new QName("http://www.w3.org/2005/Atom", "entry");
+ new QName("http://www.w3.org/2005/Atom", //$NON-NLS-1$
+ "category"); //$NON-NLS-1$
+ private final static QName _Entry_QNAME = new QName("http://www.w3.org/2005/Atom", "entry"); //$NON-NLS-1$ //$NON-NLS-2$
/**
* Create a new ObjectFactory that can be used to create new instances of
@@ -149,7 +149,7 @@
@XmlElementDecl(namespace = RestConstants.NAMESPACE_XHTML, name = "div")
public JAXBElement<AtomXhtml> createAtomXhtml(AtomXhtml value) {
- return new JAXBElement<AtomXhtml>(new QName(RestConstants.NAMESPACE_XHTML, "div"),
+ return new JAXBElement<AtomXhtml>(new QName(RestConstants.NAMESPACE_XHTML, "div"), //$NON-NLS-1$
AtomXhtml.class, null, value);
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/multipart/InMultiPart.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/multipart/InMultiPart.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/multipart/InMultiPart.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/multipart/InMultiPart.java Wed Mar 3 21:21:51 2010
@@ -48,7 +48,7 @@
* }<br>
*/
public class InMultiPart implements Iterator<InPart> {
- public final static String SEP = "\n";
+ public final static String SEP = "\n"; //$NON-NLS-1$
//private String boundary = "simple boundary";
private MultiPartParser MPParser;
int index = -1;
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/multipart/OutMultiPart.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/multipart/OutMultiPart.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/multipart/OutMultiPart.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/multipart/OutMultiPart.java Wed Mar 3 21:21:51 2010
@@ -35,8 +35,8 @@
*/
public abstract class OutMultiPart {
- private String boundary = "simple boundary";
- public final static String SEP = "\n";
+ private String boundary = "simple boundary"; //$NON-NLS-1$
+ public final static String SEP = "\n"; //$NON-NLS-1$
/**
* set the boundary to be used to separate between the different parts
@@ -72,10 +72,10 @@
Iterator<? extends OutPart> it = getIterator();
while (it.hasNext()) {
OutPart p = it.next();
- os.write((SEP + "--" + boundary + SEP).getBytes());
+ os.write((SEP + "--" + boundary + SEP).getBytes()); //$NON-NLS-1$
p.writePart(os, providers);
}
- os.write((SEP + "--" + boundary + "--" + SEP).getBytes());
+ os.write((SEP + "--" + boundary + "--" + SEP).getBytes()); //$NON-NLS-1$ //$NON-NLS-2$
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/multipart/OutPart.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/multipart/OutPart.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/multipart/OutPart.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/multipart/OutPart.java Wed Mar 3 21:21:51 2010
@@ -78,7 +78,7 @@
* @param location
*/
public void setLocationHeader(String location) {
- getHeaders().putSingle("location", location);
+ getHeaders().putSingle("location", location); //$NON-NLS-1$
}
/**
@@ -120,7 +120,7 @@
List<String> values = getHeaders().get(name);
for (String value : values) {
String header =
- new StringBuilder().append(name).append(": ").append(value)
+ new StringBuilder().append(name).append(": ").append(value) //$NON-NLS-1$
.append(OutMultiPart.SEP).toString();
os.write(header.getBytes());
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/ObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/ObjectFactory.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/ObjectFactory.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/ObjectFactory.java Wed Mar 3 21:21:51 2010
@@ -48,76 +48,76 @@
private final static QName _Image_QNAME =
new QName(
- "http://a9.com/-/spec/opensearch/1.1/",
- "Image");
+ "http://a9.com/-/spec/opensearch/1.1/", //$NON-NLS-1$
+ "Image"); //$NON-NLS-1$
private final static QName _ItemsPerPage_QNAME =
new QName(
- "http://a9.com/-/spec/opensearch/1.1/",
- "itemsPerPage");
+ "http://a9.com/-/spec/opensearch/1.1/", //$NON-NLS-1$
+ "itemsPerPage"); //$NON-NLS-1$
private final static QName _ShortName_QNAME =
new QName(
- "http://a9.com/-/spec/opensearch/1.1/",
- "ShortName");
+ "http://a9.com/-/spec/opensearch/1.1/", //$NON-NLS-1$
+ "ShortName"); //$NON-NLS-1$
private final static QName _TotalResults_QNAME =
new QName(
- "http://a9.com/-/spec/opensearch/1.1/",
- "totalResults");
+ "http://a9.com/-/spec/opensearch/1.1/", //$NON-NLS-1$
+ "totalResults"); //$NON-NLS-1$
private final static QName _Query_QNAME =
new QName(
- "http://a9.com/-/spec/opensearch/1.1/",
- "Query");
+ "http://a9.com/-/spec/opensearch/1.1/", //$NON-NLS-1$
+ "Query"); //$NON-NLS-1$
private final static QName _Developer_QNAME =
new QName(
- "http://a9.com/-/spec/opensearch/1.1/",
- "Developer");
+ "http://a9.com/-/spec/opensearch/1.1/", //$NON-NLS-1$
+ "Developer"); //$NON-NLS-1$
private final static QName _OpenSearchDescription_QNAME =
new QName(
- "http://a9.com/-/spec/opensearch/1.1/",
- "OpenSearchDescription");
+ "http://a9.com/-/spec/opensearch/1.1/", //$NON-NLS-1$
+ "OpenSearchDescription"); //$NON-NLS-1$
private final static QName _Contact_QNAME =
new QName(
- "http://a9.com/-/spec/opensearch/1.1/",
- "Contact");
+ "http://a9.com/-/spec/opensearch/1.1/", //$NON-NLS-1$
+ "Contact"); //$NON-NLS-1$
private final static QName _Attribution_QNAME =
new QName(
- "http://a9.com/-/spec/opensearch/1.1/",
- "Attribution");
+ "http://a9.com/-/spec/opensearch/1.1/", //$NON-NLS-1$
+ "Attribution"); //$NON-NLS-1$
private final static QName _SyndicationRight_QNAME =
new QName(
- "http://a9.com/-/spec/opensearch/1.1/",
- "SyndicationRight");
+ "http://a9.com/-/spec/opensearch/1.1/", //$NON-NLS-1$
+ "SyndicationRight"); //$NON-NLS-1$
private final static QName _Tags_QNAME =
new QName(
- "http://a9.com/-/spec/opensearch/1.1/",
- "Tags");
+ "http://a9.com/-/spec/opensearch/1.1/", //$NON-NLS-1$
+ "Tags"); //$NON-NLS-1$
private final static QName _Language_QNAME =
new QName(
- "http://a9.com/-/spec/opensearch/1.1/",
- "Language");
+ "http://a9.com/-/spec/opensearch/1.1/", //$NON-NLS-1$
+ "Language"); //$NON-NLS-1$
private final static QName _OutputEncoding_QNAME =
new QName(
- "http://a9.com/-/spec/opensearch/1.1/",
- "OutputEncoding");
+ "http://a9.com/-/spec/opensearch/1.1/", //$NON-NLS-1$
+ "OutputEncoding"); //$NON-NLS-1$
private final static QName _InputEncoding_QNAME =
new QName(
- "http://a9.com/-/spec/opensearch/1.1/",
- "InputEncoding");
+ "http://a9.com/-/spec/opensearch/1.1/", //$NON-NLS-1$
+ "InputEncoding"); //$NON-NLS-1$
private final static QName _Url_QNAME =
new QName(
- "http://a9.com/-/spec/opensearch/1.1/",
- "Url");
+ "http://a9.com/-/spec/opensearch/1.1/", //$NON-NLS-1$
+ "Url"); //$NON-NLS-1$
private final static QName _StartIndex_QNAME =
new QName(
- "http://a9.com/-/spec/opensearch/1.1/",
- "startIndex");
+ "http://a9.com/-/spec/opensearch/1.1/", //$NON-NLS-1$
+ "startIndex"); //$NON-NLS-1$
private final static QName _LongName_QNAME =
new QName(
- "http://a9.com/-/spec/opensearch/1.1/",
- "LongName");
+ "http://a9.com/-/spec/opensearch/1.1/", //$NON-NLS-1$
+ "LongName"); //$NON-NLS-1$
private final static QName _Description_QNAME =
new QName(
- "http://a9.com/-/spec/opensearch/1.1/",
- "Description");
+ "http://a9.com/-/spec/opensearch/1.1/", //$NON-NLS-1$
+ "Description"); //$NON-NLS-1$
/**
* Create a new ObjectFactory that can be used to create new instances of
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/OpenSearchParameter.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/OpenSearchParameter.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/OpenSearchParameter.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/OpenSearchParameter.java Wed Mar 3 21:21:51 2010
@@ -93,8 +93,8 @@
* Default constructor
*/
public OpenSearchParameter() {
- parameterKey = "key";
- parameter = "value";
+ parameterKey = "key"; //$NON-NLS-1$
+ parameter = "value"; //$NON-NLS-1$
mandatory = false;
}
@@ -129,7 +129,7 @@
}
public String getURLParameter() {
- return parameterKey + "={" + parameter + (mandatory ? "" : "?") + "}";
+ return parameterKey + "={" + parameter + (mandatory ? "" : "?") + "}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/OpenSearchQuery.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/OpenSearchQuery.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/OpenSearchQuery.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/OpenSearchQuery.java Wed Mar 3 21:21:51 2010
@@ -221,7 +221,7 @@
*/
public String getRole() {
if (role == null) {
- return "example";
+ return "example"; //$NON-NLS-1$
} else {
return role;
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/OpenSearchUrl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/OpenSearchUrl.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/OpenSearchUrl.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/OpenSearchUrl.java Wed Mar 3 21:21:51 2010
@@ -100,10 +100,10 @@
private List<OpenSearchParameter> openSearchParameters;
// Parameter delimiter
@XmlTransient
- private static final String paramDelimiter = "&";
+ private static final String paramDelimiter = "&"; //$NON-NLS-1$
// Search parameters delimiter
@XmlTransient
- private static final String searchDelimiter = "?";
+ private static final String searchDelimiter = "?"; //$NON-NLS-1$
// Base URI
@XmlTransient
private String baseUri;
@@ -190,14 +190,14 @@
String paramList = searchDelimiter;
if (openSearchParameters == null)
- return "";
+ return ""; //$NON-NLS-1$
// Use Iterator to avoid redundant & in the end of search parameters
// list
Iterator<OpenSearchParameter> itr = openSearchParameters.iterator();
if (!itr.hasNext())
- return "";
+ return ""; //$NON-NLS-1$
OpenSearchParameter openSearchParameter = itr.next();
paramList = paramList + openSearchParameter.getURLParameter();
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/ObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/ObjectFactory.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/ObjectFactory.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/ObjectFactory.java Wed Mar 3 21:21:51 2010
@@ -44,17 +44,17 @@
@XmlRegistry
public class ObjectFactory {
- private final static QName _SkipDays_QNAME = new QName("", "skipDays");
- private final static QName _SkipHours_QNAME = new QName("", "skipHours");
- private final static QName _Source_QNAME = new QName("", "source");
- private final static QName _Cloud_QNAME = new QName("", "cloud");
- private final static QName _Enclosure_QNAME = new QName("", "enclosure");
- private final static QName _Channel_QNAME = new QName("", "channel");
- private final static QName _Guid_QNAME = new QName("", "guid");
- private final static QName _TextInput_QNAME = new QName("", "textInput");
- private final static QName _Item_QNAME = new QName("", "item");
- private final static QName _Image_QNAME = new QName("", "image");
- private final static QName _Category_QNAME = new QName("", "category");
+ private final static QName _SkipDays_QNAME = new QName("", "skipDays"); //$NON-NLS-1$ //$NON-NLS-2$
+ private final static QName _SkipHours_QNAME = new QName("", "skipHours"); //$NON-NLS-1$ //$NON-NLS-2$
+ private final static QName _Source_QNAME = new QName("", "source"); //$NON-NLS-1$ //$NON-NLS-2$
+ private final static QName _Cloud_QNAME = new QName("", "cloud"); //$NON-NLS-1$ //$NON-NLS-2$
+ private final static QName _Enclosure_QNAME = new QName("", "enclosure"); //$NON-NLS-1$ //$NON-NLS-2$
+ private final static QName _Channel_QNAME = new QName("", "channel"); //$NON-NLS-1$ //$NON-NLS-2$
+ private final static QName _Guid_QNAME = new QName("", "guid"); //$NON-NLS-1$ //$NON-NLS-2$
+ private final static QName _TextInput_QNAME = new QName("", "textInput"); //$NON-NLS-1$ //$NON-NLS-2$
+ private final static QName _Item_QNAME = new QName("", "item"); //$NON-NLS-1$ //$NON-NLS-2$
+ private final static QName _Image_QNAME = new QName("", "image"); //$NON-NLS-1$ //$NON-NLS-2$
+ private final static QName _Category_QNAME = new QName("", "category"); //$NON-NLS-1$ //$NON-NLS-2$
/**
* Create a new ObjectFactory that can be used to create new instances of
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/utils/ProviderUtils.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/utils/ProviderUtils.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/utils/ProviderUtils.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/utils/ProviderUtils.java Wed Mar 3 21:21:51 2010
@@ -44,14 +44,14 @@
public class ProviderUtils {
public static String getCharsetOrNull(MediaType m) {
- String name = (m == null) ? null : m.getParameters().get("charset");
+ String name = (m == null) ? null : m.getParameters().get("charset"); //$NON-NLS-1$
return (name == null) ? null : name;
}
public static String getCharset(MediaType m) {
- String name = (m == null) ? null : m.getParameters().get("charset");
- return (name == null) ? "UTF-8" : name;
+ String name = (m == null) ? null : m.getParameters().get("charset"); //$NON-NLS-1$
+ return (name == null) ? "UTF-8" : name; //$NON-NLS-1$
}
public static Reader createReader(InputStream stream, MediaType mediaType) {
Modified: incubator/wink/trunk/wink-common/src/main/resources/org/apache/wink/common/internal/i18n/resource.properties
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/resources/org/apache/wink/common/internal/i18n/resource.properties?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/resources/org/apache/wink/common/internal/i18n/resource.properties (original)
+++ incubator/wink/trunk/wink-common/src/main/resources/org/apache/wink/common/internal/i18n/resource.properties Wed Mar 3 21:21:51 2010
@@ -214,6 +214,13 @@
matchedSuffixMustStartWith=The matched suffix must start with '{0}'
listOperatorMustHaveOnlyOneVariable=The list operator MUST only have one variable
suffixOperatorMustOnlyHaveOneVariable=The suffix operator MUST only have one variable
+prefixOperatorMustHaveOnlyOneVariable=The prefix operator MUST only have one variablemultiPartStreamAlreadyClosed=Stream already closed: The PartInputStream is not accessible after moving to the next part.
+lastMatchWasUnsuccessful=Last match was unsuccessful
+variableContainsMoreThanOneValueForJoinOperator=Variable '{0}' contains more than one value for join operator
+matchedSuffixMustEndWith=The matched suffix must end with '{0}'
+matchedSuffixMustStartWith=The matched suffix must start with '{0}'
+listOperatorMustHaveOnlyOneVariable=The list operator MUST only have one variable
+suffixOperatorMustOnlyHaveOneVariable=The suffix operator MUST only have one variable
prefixOperatorMustHaveOnlyOneVariable=The prefix operator MUST only have one variable
missingClientAuthenticationCredentialForUser=Missing client authentication credential for user: {0}
serviceFailedToAuthenticateUser=Service failed to authenticate user: {0}
Modified: incubator/wink/trunk/wink-providers/wink-abdera-provider/src/main/java/org/apache/wink/providers/abdera/AbderaAtomEntryProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-abdera-provider/src/main/java/org/apache/wink/providers/abdera/AbderaAtomEntryProvider.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-abdera-provider/src/main/java/org/apache/wink/providers/abdera/AbderaAtomEntryProvider.java (original)
+++ incubator/wink/trunk/wink-providers/wink-abdera-provider/src/main/java/org/apache/wink/providers/abdera/AbderaAtomEntryProvider.java Wed Mar 3 21:21:51 2010
@@ -68,7 +68,7 @@
MultivaluedMap<String, Object> httpHeaders,
OutputStream entityStream) throws IOException {
if (MediaType.APPLICATION_JSON_TYPE.isCompatible(mediaType)) {
- Writer w = ATOM_ENGINE.getWriterFactory().getWriter("json");
+ Writer w = ATOM_ENGINE.getWriterFactory().getWriter("json"); //$NON-NLS-1$
entry.writeTo(w, entityStream);
} else {
entry.writeTo(entityStream);
Modified: incubator/wink/trunk/wink-providers/wink-abdera-provider/src/main/java/org/apache/wink/providers/abdera/AbderaAtomFeedProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-abdera-provider/src/main/java/org/apache/wink/providers/abdera/AbderaAtomFeedProvider.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-abdera-provider/src/main/java/org/apache/wink/providers/abdera/AbderaAtomFeedProvider.java (original)
+++ incubator/wink/trunk/wink-providers/wink-abdera-provider/src/main/java/org/apache/wink/providers/abdera/AbderaAtomFeedProvider.java Wed Mar 3 21:21:51 2010
@@ -68,7 +68,7 @@
MultivaluedMap<String, Object> httpHeaders,
OutputStream entityStream) throws IOException {
if (MediaType.APPLICATION_JSON_TYPE.isCompatible(mediaType)) {
- Writer w = ATOM_ENGINE.getWriterFactory().getWriter("json");
+ Writer w = ATOM_ENGINE.getWriterFactory().getWriter("json"); //$NON-NLS-1$
feed.writeTo(w, entityStream);
} else {
feed.writeTo(entityStream);
Modified: incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/providers/jettison/JettisonJAXBElementProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/providers/jettison/JettisonJAXBElementProvider.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/providers/jettison/JettisonJAXBElementProvider.java (original)
+++ incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/providers/jettison/JettisonJAXBElementProvider.java Wed Mar 3 21:21:51 2010
@@ -148,10 +148,10 @@
unmarshaledResource = unmarshaller.unmarshal(xsr, classToFill);
} catch (JAXBException e) {
- logger.error(Messages.getMessage("jaxbFailToUnmarshal"), type.getName());
+ logger.error(Messages.getMessage("jaxbFailToUnmarshal"), type.getName()); //$NON-NLS-1$
throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
} catch (XMLStreamException e) {
- logger.error(Messages.getMessage("jaxbFailToUnmarshal"), type.getName());
+ logger.error(Messages.getMessage("jaxbFailToUnmarshal"), type.getName()); //$NON-NLS-1$
throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
}
return unmarshaledResource;
@@ -195,7 +195,7 @@
new MappedXMLOutputFactory(outputConfiguration)
.createXMLStreamWriter(writer);
} catch (XMLStreamException e) {
- logger.error(Messages.getMessage("jaxbFailToMarshal"), t.getName());
+ logger.error(Messages.getMessage("jaxbFailToMarshal"), t.getName()); //$NON-NLS-1$
throw new WebApplicationException(e, Response.Status.INTERNAL_SERVER_ERROR);
}
}
@@ -203,7 +203,7 @@
marshaller.marshal(t, xsw);
writer.flush();
} catch (JAXBException e) {
- logger.error(Messages.getMessage("jaxbFailToMarshal"), t.getName());
+ logger.error(Messages.getMessage("jaxbFailToMarshal"), t.getName()); //$NON-NLS-1$
throw new WebApplicationException(e, Response.Status.INTERNAL_SERVER_ERROR);
}
Modified: incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/providers/jettison/JettisonJAXBProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/providers/jettison/JettisonJAXBProvider.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/providers/jettison/JettisonJAXBProvider.java (original)
+++ incubator/wink/trunk/wink-providers/wink-jettison-provider/src/main/java/org/apache/wink/providers/jettison/JettisonJAXBProvider.java Wed Mar 3 21:21:51 2010
@@ -157,10 +157,10 @@
unmarshaledResource = unmarshaller.unmarshal(xsr, type).getValue();
}
} catch (JAXBException e) {
- logger.error(Messages.getMessage("jaxbFailToUnmarshal"), type.getName());
+ logger.error(Messages.getMessage("jaxbFailToUnmarshal"), type.getName()); //$NON-NLS-1$
throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
} catch (XMLStreamException e) {
- logger.error(Messages.getMessage("jaxbFailToUnmarshal"), type.getName());
+ logger.error(Messages.getMessage("jaxbFailToUnmarshal"), type.getName()); //$NON-NLS-1$
throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
}
return unmarshaledResource;
@@ -203,7 +203,7 @@
}
marshaller.marshal(entityToMarshal, xsw);
} catch (JAXBException e) {
- logger.error(Messages.getMessage("jaxbFailToMarshal"), type.getName());
+ logger.error(Messages.getMessage("jaxbFailToMarshal"), type.getName()); //$NON-NLS-1$
throw new WebApplicationException(e);
}
}
Modified: incubator/wink/trunk/wink-providers/wink-json-provider/src/main/java/org/apache/wink/providers/json/JsonProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-json-provider/src/main/java/org/apache/wink/providers/json/JsonProvider.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-json-provider/src/main/java/org/apache/wink/providers/json/JsonProvider.java (original)
+++ incubator/wink/trunk/wink-providers/wink-json-provider/src/main/java/org/apache/wink/providers/json/JsonProvider.java Wed Mar 3 21:21:51 2010
@@ -86,7 +86,7 @@
try {
jsonString = t.toString(2);
} catch (JSONException e) {
- logger.error(Messages.getMessage("jsonFailWriteJSONObject"));
+ logger.error(Messages.getMessage("jsonFailWriteJSONObject")); //$NON-NLS-1$
throw new WebApplicationException(e, Response.Status.INTERNAL_SERVER_ERROR);
}
@@ -95,17 +95,17 @@
callbackParam =
uriInfo.getQueryParameters().getFirst(RestConstants.REST_PARAM_JSON_CALLBACK);
} catch (Exception e) {
- logger.debug("Could not get the URI callback param", e);
+ logger.debug("Could not get the URI callback param", e); //$NON-NLS-1$
}
OutputStreamWriter writer =
new OutputStreamWriter(entityStream, ProviderUtils.getCharset(mediaType));
if (callbackParam != null) {
writer.write(callbackParam);
- writer.write("(");
+ writer.write("("); //$NON-NLS-1$
}
writer.write(jsonString);
if (callbackParam != null) {
- writer.write(")");
+ writer.write(")"); //$NON-NLS-1$
}
writer.flush();
}
@@ -128,7 +128,7 @@
return new JSONObject(new JSONTokener(ProviderUtils.createReader(entityStream,
mediaType)));
} catch (JSONException e) {
- logger.error(Messages.getMessage("jsonFailReadJSONObject"));
+ logger.error(Messages.getMessage("jsonFailReadJSONObject")); //$NON-NLS-1$
throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
}
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/handlers/AbstractHandlersChain.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/handlers/AbstractHandlersChain.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/handlers/AbstractHandlersChain.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/handlers/AbstractHandlersChain.java Wed Mar 3 21:21:51 2010
@@ -57,7 +57,7 @@
// get the next handler from the chain to handle
T handler = iterator.next();
// invoke the handler
- logger.debug("Invoking handler: {}", handler.getClass().getName());
+ logger.debug("Invoking handler: {}", handler.getClass().getName()); //$NON-NLS-1$
handle(handler, context);
} finally {
// set the iterator back one handler on the chain so the same
@@ -78,6 +78,6 @@
@Override
public String toString() {
- return String.format("Handlers chain is %1$s", list);
+ return String.format("Handlers chain is %1$s", list); //$NON-NLS-1$
}
}
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=918698&r1=918697&r2=918698&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 Mar 3 21:21:51 2010
@@ -83,15 +83,15 @@
LoggerFactory
.getLogger(DeploymentConfiguration.class);
private static final String ALTERNATIVE_SHORTCUTS =
- "META-INF/wink-alternate-shortcuts.properties";
+ "META-INF/wink-alternate-shortcuts.properties"; //$NON-NLS-1$
private static final String HTTP_METHOD_OVERRIDE_HEADERS_PROP =
- "wink.httpMethodOverrideHeaders";
+ "wink.httpMethodOverrideHeaders"; //$NON-NLS-1$
private static final String HANDLERS_FACTORY_CLASS_PROP =
- "wink.handlersFactoryClass";
+ "wink.handlersFactoryClass"; //$NON-NLS-1$
private static final String MEDIATYPE_MAPPER_FACTORY_CLASS_PROP =
- "wink.mediaTypeMapperFactoryClass";
+ "wink.mediaTypeMapperFactoryClass"; //$NON-NLS-1$
private static final String VALIDATE_LOCATION_HEADER =
- "wink.validateLocationHeader";
+ "wink.validateLocationHeader"; //$NON-NLS-1$
// handler chains
private RequestHandlersChain requestHandlersChain;
private ResponseHandlersChain responseHandlersChain;
@@ -132,7 +132,7 @@
properties = new Properties();
}
- logger.debug("Deployment configuration properties: {}", properties);
+ logger.debug("Deployment configuration properties: {}", properties); //$NON-NLS-1$
// check to see if an override property was specified. if so, then
// configure
@@ -141,7 +141,7 @@
properties.getProperty(HTTP_METHOD_OVERRIDE_HEADERS_PROP);
httpMethodOverrideHeaders =
(httpMethodOverrideHeadersProperty != null && httpMethodOverrideHeadersProperty
- .length() > 0) ? httpMethodOverrideHeadersProperty.split(",") : null;
+ .length() > 0) ? httpMethodOverrideHeadersProperty.split(",") : null; //$NON-NLS-1$
initRegistries();
initAlternateShortcutMap();
@@ -304,14 +304,14 @@
Properties lproperties = new Properties();
lproperties.load(is);
- logger.debug("Alternative shortcuts properties: {}", lproperties);
+ logger.debug("Alternative shortcuts properties: {}", lproperties); //$NON-NLS-1$
alternateShortcutMap = new HashMap<String, String>();
for (Entry<Object, Object> entry : lproperties.entrySet()) {
alternateShortcutMap.put((String)entry.getKey(), (String)entry.getValue());
}
- logger.debug("Alternative shortcuts map: {}", alternateShortcutMap);
+ logger.debug("Alternative shortcuts map: {}", alternateShortcutMap); //$NON-NLS-1$
} catch (IOException e) {
- logger.error(Messages.getMessage("alternateShortcutMapLoadFailure"), e);
+ logger.error(Messages.getMessage("alternateShortcutMapLoadFailure"), e); //$NON-NLS-1$
throw new WebApplicationException(e);
} finally {
try {
@@ -320,7 +320,7 @@
}
} catch (IOException e) {
logger
- .info(Messages.getMessage("alternateShortcutMapCloseFailure") + ALTERNATIVE_SHORTCUTS,
+ .info(Messages.getMessage("alternateShortcutMapCloseFailure") + ALTERNATIVE_SHORTCUTS, //$NON-NLS-1$
e);
}
}
@@ -340,7 +340,7 @@
properties.getProperty(MEDIATYPE_MAPPER_FACTORY_CLASS_PROP);
if (mediaTypeMapperFactoryClassName != null) {
try {
- logger.debug("MediaTypeMappingFactory Class is: {}",
+ logger.debug("MediaTypeMappingFactory Class is: {}", //$NON-NLS-1$
mediaTypeMapperFactoryClassName);
Class<MediaTypeMapperFactory> handlerFactoryClass =
(Class<MediaTypeMapperFactory>)Class
@@ -444,7 +444,7 @@
}
}
handlersChain.addHandler(createHandler(InvokeMethodHandler.class));
- logger.debug("Request handlers chain is: {}", handlersChain);
+ logger.debug("Request handlers chain is: {}", handlersChain); //$NON-NLS-1$
return handlersChain;
}
@@ -503,7 +503,7 @@
}
handlersChain.addHandler(createHandler(FlushResultHandler.class));
handlersChain.addHandler(createHandler(HeadMethodHandler.class));
- logger.debug("Response handlers chain is: {}", handlersChain);
+ logger.debug("Response handlers chain is: {}", handlersChain); //$NON-NLS-1$
return handlersChain;
}
@@ -527,14 +527,14 @@
}
}
handlersChain.addHandler(createHandler(FlushResultHandler.class));
- logger.debug("Error handlers chain is: {}", handlersChain);
+ logger.debug("Error handlers chain is: {}", handlersChain); //$NON-NLS-1$
return handlersChain;
}
private <T extends Handler> T createHandler(Class<T> cls) {
try {
T handler = cls.newInstance();
- logger.debug("Calling {}.init(Properties)", cls);
+ logger.debug("Calling {}.init(Properties)", cls); //$NON-NLS-1$
handler.init(getProperties());
return handler;
} catch (InstantiationException e) {
@@ -550,7 +550,7 @@
List<String> overrideHeaders =
(httpMethodOverrideHeaders == null) ? null : Arrays
.asList(httpMethodOverrideHeaders);
- logger.debug("Setting HTTP Method override headers: {}", overrideHeaders);
+ logger.debug("Setting HTTP Method override headers: {}", overrideHeaders); //$NON-NLS-1$
}
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/MediaTypeMapper.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/MediaTypeMapper.java?rev=918698&r1=918697&r2=918698&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/MediaTypeMapper.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/MediaTypeMapper.java Wed Mar 3 21:21:51 2010
@@ -42,10 +42,10 @@
public void addMappings(List<? extends MediaTypeMappingRecord> records) {
if (records == null) {
- logger.debug("No media type mapping records to add");
+ logger.debug("No media type mapping records to add"); //$NON-NLS-1$
return;
}
- logger.debug("Media type mapping records to add: {}", records);
+ logger.debug("Media type mapping records to add: {}", records); //$NON-NLS-1$
this.mappings.addAll(records);
}
@@ -59,16 +59,16 @@
*/
public MediaType mapOutputMediaType(MediaType responseMediaType, HttpHeaders requestHeaders) {
for (MediaTypeMappingRecord mappingRecord : mappings) {
- logger.debug("Attempting to map media type using mapping record: {}", mappingRecord);
+ logger.debug("Attempting to map media type using mapping record: {}", mappingRecord); //$NON-NLS-1$
MediaType replacement = mappingRecord.match(requestHeaders, responseMediaType);
if (replacement != null) {
- logger.debug("Mapped user media type to: {} using mapping record: {}",
+ logger.debug("Mapped user media type to: {} using mapping record: {}", //$NON-NLS-1$
replacement,
mappingRecord);
return replacement;
}
}
- logger.debug("Did not find a mapping record so returning original response media type: {}",
+ logger.debug("Did not find a mapping record so returning original response media type: {}", //$NON-NLS-1$
responseMediaType);
return responseMediaType; // returning the same
}