You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/06/08 14:53:36 UTC
svn commit: r952641 - in /shindig/trunk/java:
common/src/main/java/org/apache/shindig/auth/
common/src/main/java/org/apache/shindig/common/crypto/
common/src/main/java/org/apache/shindig/config/
common/src/main/java/org/apache/shindig/protocol/ common/...
Author: lindner
Date: Tue Jun 8 12:53:35 2010
New Revision: 952641
URL: http://svn.apache.org/viewvc?rev=952641&view=rev
Log:
Stylistic fix - use UPPER for private static final
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/config/DynamicConfigProperty.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ApiServlet.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanAtomConverter.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXmlConverter.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceClassMapper.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractSpecFactory.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResourceLoader.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseMetadataHelper.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthModule.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/old/CajaCssSanitizer.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelineExecutor.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/old/SanitizingRequestRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/old/CssRequestRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyBase.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/ContainerTagLibraryFactory.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessor.java
shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java Tue Jun 8 12:53:35 2010
@@ -58,7 +58,7 @@ public class AuthenticationServletFilter
private List<AuthenticationHandler> handlers;
- private static final Logger logger = Logger.getLogger(
+ private static final Logger LOG = Logger.getLogger(
AuthenticationServletFilter.class.getName());
@Inject
@@ -97,7 +97,7 @@ public class AuthenticationServletFilter
callChain(chain, req, resp);
} catch (AuthenticationHandler.InvalidAuthenticationException iae) {
Throwable cause = iae.getCause();
- logger.log(Level.INFO, iae.getMessage(), cause);
+ LOG.log(Level.INFO, iae.getMessage(), cause);
if (iae.getAdditionalHeaders() != null) {
for (Map.Entry<String,String> entry : iae.getAdditionalHeaders().entrySet()) {
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java Tue Jun 8 12:53:35 2010
@@ -38,7 +38,7 @@ public final class Crypto {
* Use this random number generator instead of creating your own. This is
* thread-safe.
*/
- public static final SecureRandom rand = new SecureRandom();
+ public static final SecureRandom RAND = new SecureRandom();
/**
* HMAC algorithm to use
@@ -104,7 +104,7 @@ public final class Crypto {
*/
public static byte[] getRandomBytes(int numBytes) {
byte[] out = new byte[numBytes];
- rand.nextBytes(out);
+ RAND.nextBytes(out);
return out;
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/config/DynamicConfigProperty.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/DynamicConfigProperty.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/config/DynamicConfigProperty.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/config/DynamicConfigProperty.java Tue Jun 8 12:53:35 2010
@@ -34,7 +34,7 @@ import javax.el.ValueExpression;
* Implements CharSequence strictly as a marker. Only toString is supported.
*/
public class DynamicConfigProperty implements CharSequence {
- private static final Logger logger = Logger.getLogger(DynamicConfigProperty.class.getName());
+ private static final Logger LOG = Logger.getLogger(DynamicConfigProperty.class.getName());
private final ELContext context;
private final ValueExpression expression;
@@ -48,7 +48,7 @@ public class DynamicConfigProperty imple
try {
return (String) expression.getValue(context);
} catch (ELException e) {
- logger.log(Level.WARNING, "Evaluation of " + expression.getExpressionString() + " failed", e);
+ LOG.log(Level.WARNING, "Evaluation of " + expression.getExpressionString() + " failed", e);
return "";
}
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ApiServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ApiServlet.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ApiServlet.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ApiServlet.java Tue Jun 8 12:53:35 2010
@@ -48,7 +48,7 @@ import com.google.inject.name.Names;
*/
public abstract class ApiServlet extends InjectedServlet {
- private static final Logger logger = Logger.getLogger(ApiServlet.class.getName());
+ private static final Logger LOG = Logger.getLogger(ApiServlet.class.getName());
protected static final String FORMAT_PARAM = "format";
protected static final String JSON_FORMAT = "json";
@@ -140,10 +140,10 @@ public abstract class ApiServlet extends
protected ResponseItem responseItemFromException(Throwable t) {
if (t instanceof ProtocolException) {
ProtocolException pe = (ProtocolException) t;
- logger.log(Level.INFO, "Returning a response error as result of a protocol exception", pe);
+ LOG.log(Level.INFO, "Returning a response error as result of a protocol exception", pe);
return new ResponseItem(pe.getCode(), pe.getMessage(), pe.getResponse());
}
- logger.log(Level.WARNING, "Returning a response error as result of an exception", t);
+ LOG.log(Level.WARNING, "Returning a response error as result of an exception", t);
return new ResponseItem(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, t.getMessage());
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java Tue Jun 8 12:53:35 2010
@@ -30,7 +30,6 @@ import java.util.logging.Logger;
*/
public final class ContentTypes {
private ContentTypes() {}
- private static final Logger logger = Logger.getLogger(ContentTypes.class.getName());
/**
* Allowed alternatives to application/json, including types listed
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java Tue Jun 8 12:53:35 2010
@@ -38,7 +38,7 @@ import java.util.logging.Logger;
public class DataServiceServlet extends ApiServlet {
- private static final Logger logger = Logger.getLogger(DataServiceServlet.class.getName());
+ private static final Logger LOG = Logger.getLogger(DataServiceServlet.class.getName());
public static final Set<String> ALLOWED_CONTENT_TYPES =
new ImmutableSet.Builder<String>().addAll(ContentTypes.ALLOWED_JSON_CONTENT_TYPES)
@@ -92,8 +92,8 @@ public class DataServiceServlet extends
*/
void executeRequest(HttpServletRequest servletRequest, HttpServletResponse servletResponse)
throws IOException {
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("Handling restful request for " + servletRequest.getPathInfo());
+ if (LOG.isLoggable(Level.FINEST)) {
+ LOG.finest("Handling restful request for " + servletRequest.getPathInfo());
}
setCharacterEncodings(servletRequest, servletResponse);
@@ -207,16 +207,16 @@ public class DataServiceServlet extends
formatString = servletRequest.getParameter(FORMAT_PARAM);
} catch (Throwable t) {
// this happens while testing
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Unexpected error : format param is null " + t.toString());
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.fine("Unexpected error : format param is null " + t.toString());
}
}
try {
contentType = servletRequest.getContentType();
} catch (Throwable t) {
//this happens while testing
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Unexpected error : content type is null " + t.toString());
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.fine("Unexpected error : content type is null " + t.toString());
}
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java Tue Jun 8 12:53:35 2010
@@ -57,7 +57,7 @@ import javax.servlet.http.HttpServletRes
*/
public class DefaultHandlerRegistry implements HandlerRegistry {
- private static final Logger logger = Logger.getLogger(DefaultHandlerRegistry.class.getName());
+ private static final Logger LOG = Logger.getLogger(DefaultHandlerRegistry.class.getName());
// Map service - > method -> { handler, ...}
private final Map<String, Map<String, SortedSet<RestPath>>> serviceMethodPathMap =
@@ -215,7 +215,7 @@ public class DefaultHandlerRegistry impl
}
}
} catch (NoSuchMethodException nme) {
- logger.log(Level.INFO, "No REST binding for " + service.name() + '.' + m.getName());
+ LOG.log(Level.INFO, "No REST binding for " + service.name() + '.' + m.getName());
}
}
@@ -235,7 +235,7 @@ public class DefaultHandlerRegistry impl
new ExecutionListenerWrapper(service.name(), opName, executionListener));
rpcOperations.put(service.name() + '.' + opName, rpcHandler);
} catch (NoSuchMethodException nme) {
- logger.log(Level.INFO, "No RPC binding for " + service.name() + '.' + m.getName());
+ LOG.log(Level.INFO, "No RPC binding for " + service.name() + '.' + m.getName());
}
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanAtomConverter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanAtomConverter.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanAtomConverter.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanAtomConverter.java Tue Jun 8 12:53:35 2010
@@ -33,7 +33,7 @@ import java.util.logging.Logger;
// TODO: This does not produce valid atom sytnax yet
public class BeanAtomConverter implements BeanConverter {
- private static final Logger logger =
+ private static final Logger LOG =
Logger.getLogger(BeanAtomConverter.class.getName());
@@ -72,19 +72,19 @@ public class BeanAtomConverter implement
try {
writer.write("response", obj);
toReturn =toReturn+ outputWriter.toString();
- if (logger.isLoggable(Level.FINEST)) logger.finest("XML is: " + toReturn + "\n **** \n\n");
+ if (LOG.isLoggable(Level.FINEST)) LOG.finest("XML is: " + toReturn + "\n **** \n\n");
} catch (SAXException e) {
- logger.log(Level.SEVERE, e.getMessage(), e);
+ LOG.log(Level.SEVERE, e.getMessage(), e);
} catch (IOException e) {
- logger.log(Level.SEVERE, e.getMessage(), e);
+ LOG.log(Level.SEVERE, e.getMessage(), e);
} catch (IntrospectionException e) {
- logger.log(Level.SEVERE, e.getMessage(), e);
+ LOG.log(Level.SEVERE, e.getMessage(), e);
} finally {
try {
writer.close();
} catch (IOException e) {
- if (logger.isLoggable(Level.FINEST)) logger.log(Level.FINEST, e.getMessage(), e);
+ if (LOG.isLoggable(Level.FINEST)) LOG.log(Level.FINEST, e.getMessage(), e);
}
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXmlConverter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXmlConverter.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXmlConverter.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXmlConverter.java Tue Jun 8 12:53:35 2010
@@ -32,7 +32,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
public class BeanXmlConverter implements BeanConverter {
- private static final Logger logger =
+ private static final Logger LOG =
Logger.getLogger(BeanXmlConverter.class.getName());
public String getContentType() {
@@ -69,19 +69,19 @@ public class BeanXmlConverter implements
try {
writer.write("response", obj);
toReturn = outputWriter.toString();
- if (logger.isLoggable(Level.FINEST)) logger.finest("XML is: " + toReturn + "\n **** \n\n");
+ if (LOG.isLoggable(Level.FINEST)) LOG.finest("XML is: " + toReturn + "\n **** \n\n");
} catch (SAXException e) {
- logger.log(Level.SEVERE, e.getMessage(), e);
+ LOG.log(Level.SEVERE, e.getMessage(), e);
} catch (IOException e) {
- logger.log(Level.SEVERE, e.getMessage(), e);
+ LOG.log(Level.SEVERE, e.getMessage(), e);
} catch (IntrospectionException e) {
- logger.log(Level.SEVERE, e.getMessage(), e);
+ LOG.log(Level.SEVERE, e.getMessage(), e);
} finally {
try {
writer.close();
} catch (IOException e) {
- if (logger.isLoggable(Level.FINEST)) logger.log(Level.FINEST, e.getMessage(), e);
+ if (LOG.isLoggable(Level.FINEST)) LOG.log(Level.FINEST, e.getMessage(), e);
}
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceClassMapper.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceClassMapper.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceClassMapper.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceClassMapper.java Tue Jun 8 12:53:35 2010
@@ -43,7 +43,7 @@ public class InterfaceClassMapper extend
/**
* A logger.
*/
- private static final Logger log = Logger.getLogger(InterfaceClassMapper.class.getName());
+ private static final Logger LOG = Logger.getLogger(InterfaceClassMapper.class.getName());
/**
* A map of element names to classes.
*/
@@ -149,8 +149,8 @@ public class InterfaceClassMapper extend
}
}
firstChild.set(clazz);
- if (log.isLoggable(Level.FINE)) {
- log.fine("First Child set to " + clazz);
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.fine("First Child set to " + clazz);
}
}
}
@@ -187,13 +187,13 @@ public class InterfaceClassMapper extend
if (Collection.class.isAssignableFrom(type) && firstChild.get() != null) {
// empty list, if this is the first one, then we need to look at the
// first child setup on startup.
- if (log.isLoggable(Level.FINE)) {
- log.fine("Converting Child to " + firstChild.get());
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.fine("Converting Child to " + firstChild.get());
}
type = firstChild.get();
firstChild.set(null);
- if (log.isLoggable(Level.FINE)) {
- log.fine("serializedClass(" + type + ") is a collection member "
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.fine("serializedClass(" + type + ") is a collection member "
+ Collection.class.isAssignableFrom(type));
}
for (ClassFieldMapping cfm : listElementMappingList) {
@@ -205,13 +205,13 @@ public class InterfaceClassMapper extend
} else {
// but after we have been asked once, then clear
firstChild.set(null);
- if (log.isLoggable(Level.FINE)) {
- log.fine("serializedClass(" + type + ')');
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.fine("serializedClass(" + type + ')');
}
for (ClassFieldMapping cfm : elementMappingList) {
if (cfm.matches(parentElementName, type)) {
- if (log.isLoggable(Level.FINE)) {
- log.fine("From MAP serializedClass(" + type + ") =="
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.fine("From MAP serializedClass(" + type + ") =="
+ cfm.getElementName());
}
return cfm.getElementName();
@@ -221,8 +221,8 @@ public class InterfaceClassMapper extend
}
String fieldName = super.serializedClass(type);
- if (log.isLoggable(Level.FINE)) {
- log.fine("--- From Super serializedClass(" + type + ") ==" + fieldName);
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.fine("--- From Super serializedClass(" + type + ") ==" + fieldName);
}
return fieldName;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractSpecFactory.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractSpecFactory.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractSpecFactory.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/AbstractSpecFactory.java Tue Jun 8 12:53:35 2010
@@ -38,7 +38,7 @@ import java.util.logging.Logger;
* Automatically updates objects as needed asynchronously to provide optimal throughput.
*/
public abstract class AbstractSpecFactory<T> {
- private static final Logger logger = Logger.getLogger(AbstractSpecFactory.class.getName());
+ private static final Logger LOG = Logger.getLogger(AbstractSpecFactory.class.getName());
private final Class<T> clazz;
private final ExecutorService executor;
private final RequestPipeline pipeline;
@@ -216,10 +216,10 @@ public abstract class AbstractSpecFactor
cache.addElement(query.specUri, newSpec, refresh);
} catch (GadgetException e) {
if (old != null) {
- logger.log(Level.INFO, "Failed to update {0}. Using cached version.", query.specUri);
+ LOG.log(Level.INFO, "Failed to update {0}. Using cached version.", query.specUri);
cache.addElement(query.specUri, old, refresh);
} else {
- logger.log(Level.INFO, "Failed to update {0}. Applying negative cache.", query.specUri);
+ LOG.log(Level.INFO, "Failed to update {0}. Applying negative cache.", query.specUri);
cache.addElement(query.specUri, e, refresh);
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java Tue Jun 8 12:53:35 2010
@@ -61,7 +61,7 @@ public class FeatureRegistry {
public static final String RESOURCE_SCHEME = "res";
public static final String FILE_SCHEME = "file";
- private static final Logger logger
+ private static final Logger LOG
= Logger.getLogger("org.apache.shindig.gadgets");
// Map keyed by FeatureNode object created as a lookup for transitive feature deps.
@@ -131,7 +131,7 @@ public class FeatureRegistry {
// Accommodate res:// URIs.
location = location.substring(1);
}
- logger.info("Loading resources from: " + uriLoc.toString());
+ LOG.info("Loading resources from: " + uriLoc.toString());
if (location.endsWith(".txt")) {
// Text file contains a list of other resource files to load
@@ -150,7 +150,7 @@ public class FeatureRegistry {
loadResources(resources, featureMapBuilder);
} else {
// Load files in directory structure.
- logger.info("Loading files from: " + location);
+ LOG.info("Loading files from: " + location);
loadFile(new File(uriLoc.getPath()), featureMapBuilder);
}
@@ -394,8 +394,8 @@ public class FeatureRegistry {
private void loadResources(List<String> resources, Map<String,FeatureNode> featureMapBuilder) throws GadgetException {
try {
for (String resource : resources) {
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Processing resource: " + resource);
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.fine("Processing resource: " + resource);
}
String content = getResourceContent(resource);
@@ -424,8 +424,8 @@ public class FeatureRegistry {
Uri parent = Uri.fromJavaUri(featureFile.toURI());
loadFeature(parent, content, featureMapBuilder);
} else {
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest(featureFile.getAbsolutePath() + " doesn't seem to be an XML file.");
+ if (LOG.isLoggable(Level.FINEST)) {
+ LOG.finest(featureFile.getAbsolutePath() + " doesn't seem to be an XML file.");
}
}
}
@@ -443,8 +443,8 @@ public class FeatureRegistry {
FeatureParser.ParsedFeature parsed = parser.parse(parent, xml);
// Duplicate feature = OK, just indicate it's being overridden.
if (featureMapBuilder.containsKey(parsed.getName())) {
- if (logger.isLoggable(Level.WARNING)) {
- logger.warning("Overriding feature: " + parsed.getName() + " with def at: " + parent);
+ if (LOG.isLoggable(Level.WARNING)) {
+ LOG.warning("Overriding feature: " + parsed.getName() + " with def at: " + parent);
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResourceLoader.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResourceLoader.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResourceLoader.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResourceLoader.java Tue Jun 8 12:53:35 2010
@@ -35,7 +35,7 @@ import java.util.logging.Logger;
* Class that loads FeatureResource objects used to populate JS feature code.
*/
public class FeatureResourceLoader {
- private static final Logger logger
+ private static final Logger LOG
= Logger.getLogger("org.apache.shindig.gadgets");
private HttpFetcher fetcher;
@@ -172,10 +172,10 @@ public class FeatureResourceLoader {
if (response.getHttpStatusCode() == HttpResponse.SC_OK) {
content = response.getResponseAsString();
} else {
- logger.warning("Unable to retrieve remote library from " + uri);
+ LOG.warning("Unable to retrieve remote library from " + uri);
}
} catch (GadgetException e) {
- logger.warning("Unable to retrieve remote library from " + uri);
+ LOG.warning("Unable to retrieve remote library from " + uri);
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseMetadataHelper.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseMetadataHelper.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseMetadataHelper.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseMetadataHelper.java Tue Jun 8 12:53:35 2010
@@ -36,7 +36,7 @@ public class HttpResponseMetadataHelper
public static final String IMAGE_HEIGHT = "ImageHeight";
public static final String IMAGE_WIDTH = "ImageWidth";
- private static final Logger log =
+ private static final Logger LOG =
Logger.getLogger(HttpResponseMetadataHelper.class.getName());
/**
@@ -66,10 +66,10 @@ public class HttpResponseMetadataHelper
return new String(Base32.encodeBase32(md5val), "UTF-8");
} catch (NoSuchAlgorithmException e) {
// Should not happen
- log.info("Error getting MD5 digest, ignored");
+ LOG.info("Error getting MD5 digest, ignored");
} catch (UnsupportedEncodingException e) {
// Should not happen
- log.info("Error parsing MD5 string as UTF8");
+ LOG.info("Error parsing MD5 string as UTF8");
}
return null;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthModule.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthModule.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthModule.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthModule.java Tue Jun 8 12:53:35 2010
@@ -44,7 +44,7 @@ import java.util.logging.Logger;
*/
public class OAuthModule extends AbstractModule {
- private static final Logger logger = Logger.getLogger(OAuthModule.class.getName());
+ private static final Logger LOG = Logger.getLogger(OAuthModule.class.getName());
private static final String OAUTH_CONFIG = "config/oauth.json";
private static final String OAUTH_SIGNING_KEY_FILE = "shindig.signing.key-file";
@@ -72,10 +72,10 @@ public class OAuthModule extends Abstrac
public OAuthCrypterProvider(@Named("shindig.signing.state-key") String stateCrypterPath)
throws IOException {
if (StringUtils.isBlank(stateCrypterPath)) {
- logger.info("Using random key for OAuth client-side state encryption");
+ LOG.info("Using random key for OAuth client-side state encryption");
crypter = new BasicBlobCrypter(Crypto.getRandomBytes(BasicBlobCrypter.MASTER_KEY_MIN_LEN));
} else {
- logger.info("Using file " + stateCrypterPath + " for OAuth client-side state encryption");
+ LOG.info("Using file " + stateCrypterPath + " for OAuth client-side state encryption");
crypter = new BasicBlobCrypter(new File(stateCrypterPath));
}
}
@@ -120,19 +120,19 @@ public class OAuthModule extends Abstrac
BasicOAuthStoreConsumerKeyAndSecret key = null;
if (!StringUtils.isBlank(signingKeyFile)) {
try {
- logger.info("Loading OAuth signing key from " + signingKeyFile);
+ LOG.info("Loading OAuth signing key from " + signingKeyFile);
String privateKey = IOUtils.toString(ResourceLoader.open(signingKeyFile), "UTF-8");
privateKey = BasicOAuthStore.convertFromOpenSsl(privateKey);
key = new BasicOAuthStoreConsumerKeyAndSecret(null, privateKey, KeyType.RSA_PRIVATE,
signingKeyName, null);
} catch (Throwable t) {
- logger.log(Level.WARNING, "Couldn't load key file " + signingKeyFile, t);
+ LOG.log(Level.WARNING, "Couldn't load key file " + signingKeyFile, t);
}
}
if (key != null) {
store.setDefaultKey(key);
} else {
- logger.log(Level.WARNING, "Couldn't load OAuth signing key. To create a key, run:\n" +
+ LOG.log(Level.WARNING, "Couldn't load OAuth signing key. To create a key, run:\n" +
" openssl req -newkey rsa:1024 -days 365 -nodes -x509 -keyout testkey.pem \\\n" +
" -out testkey.pem -subj '/CN=mytestkey'\n" +
" openssl pkcs8 -in testkey.pem -out oauthkey.pem -topk8 -nocrypt -outform PEM\n" +
@@ -148,7 +148,7 @@ public class OAuthModule extends Abstrac
String oauthConfigString = ResourceLoader.getContent(OAUTH_CONFIG);
store.initFromConfigString(oauthConfigString);
} catch (Throwable t) {
- logger.log(Level.WARNING, "Failed to initialize OAuth consumers from " + OAUTH_CONFIG, t);
+ LOG.log(Level.WARNING, "Failed to initialize OAuth consumers from " + OAUTH_CONFIG, t);
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java Tue Jun 8 12:53:35 2010
@@ -40,7 +40,7 @@ import java.util.regex.Pattern;
* Container for OAuth specific data to include in the response to the client.
*/
public class OAuthResponseParams {
- private static final Logger logger = Logger.getLogger(OAuthResponseParams.class.getName());
+ private static final Logger LOG = Logger.getLogger(OAuthResponseParams.class.getName());
// Finds the values of sensitive response params: oauth_token_secret and oauth_session_handle
private static final Pattern REMOVE_SECRETS =
@@ -99,8 +99,8 @@ public class OAuthResponseParams {
* Log a warning message that includes the details of the request.
*/
public void logDetailedWarning(String note) {
- if (logger.isLoggable(Level.WARNING)) {
- logger.log(Level.WARNING, note + '\n' + getDetails(null));
+ if (LOG.isLoggable(Level.WARNING)) {
+ LOG.log(Level.WARNING, note + '\n' + getDetails(null));
}
}
@@ -108,14 +108,14 @@ public class OAuthResponseParams {
* Log a warning message that includes the details of the request and the thrown exception.
*/
public void logDetailedWarning(String note, Throwable e) {
- if (logger.isLoggable(Level.WARNING)) {
- logger.log(Level.WARNING, note + '\n' + getDetails(e), e);
+ if (LOG.isLoggable(Level.WARNING)) {
+ LOG.log(Level.WARNING, note + '\n' + getDetails(e), e);
}
}
public void logDetailedInfo(String note, Throwable e) {
- if (logger.isLoggable(Level.INFO)) {
- logger.log(Level.INFO, note + '\n' + getDetails(e), e);
+ if (LOG.isLoggable(Level.INFO)) {
+ LOG.log(Level.INFO, note + '\n' + getDetails(e), e);
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java Tue Jun 8 12:53:35 2010
@@ -51,7 +51,7 @@ import java.util.logging.Logger;
*/
public class CajaCssSanitizer {
- private static final Logger logger = Logger.getLogger(CajaCssSanitizer.class.getName());
+ private static final Logger LOG = Logger.getLogger(CajaCssSanitizer.class.getName());
private static final Set<String> ALLOWED_URI_SCHEMES = ImmutableSet.of("http", "https");
@@ -81,7 +81,7 @@ public class CajaCssSanitizer {
return parser.serialize(stylesheet);
} catch (GadgetException ge) {
// Failed to parse stylesheet so log and continue
- logger.log(Level.INFO, "Failed to parse stylesheet", ge);
+ LOG.log(Level.INFO, "Failed to parse stylesheet", ge);
return "";
}
}
@@ -103,7 +103,7 @@ public class CajaCssSanitizer {
content = parser.serialize(stylesheet);
} catch (GadgetException ge) {
// Failed to parse stylesheet so log and continue
- logger.log(Level.INFO, "Failed to parse stylesheet", ge);
+ LOG.log(Level.INFO, "Failed to parse stylesheet", ge);
}
if (StringUtils.isEmpty(content)) {
// Remove the owning node
@@ -128,8 +128,8 @@ public class CajaCssSanitizer {
if (!schema.isPropertyAllowed(((CssTree.Property) ancestorChain.node).
getPropertyName())) {
// Remove offending property
- if (logger.isLoggable(Level.FINE)) {
- logger.log(Level.FINE, "Removing property "
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.log(Level.FINE, "Removing property "
+ ((CssTree.Property) ancestorChain.node).getPropertyName());
}
clean(ancestorChain);
@@ -137,8 +137,8 @@ public class CajaCssSanitizer {
} else if (ancestorChain.node instanceof CssTree.FunctionCall) {
if (!schema.isFunctionAllowed(((CssTree.FunctionCall)ancestorChain.node).getName())) {
// Remove offending node
- if (logger.isLoggable(Level.FINE)) {
- logger.log(Level.FINE, "Removing function "
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.log(Level.FINE, "Removing function "
+ ((CssTree.FunctionCall) ancestorChain.node).getName());
}
clean(ancestorChain);
@@ -152,8 +152,8 @@ public class CajaCssSanitizer {
rewriteUri(imageRewriter, uri, linkContext));
} else {
// Remove offending node
- if (logger.isLoggable(Level.FINE)) {
- logger.log(Level.FINE, "Removing invalid URI " + uri);
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.log(Level.FINE, "Removing invalid URI " + uri);
}
clean(ancestorChain);
}
@@ -163,8 +163,8 @@ public class CajaCssSanitizer {
if (isValidUri(uri)) {
importDecl.getUri().setValue(rewriteUri(importRewriter, uri, linkContext));
} else {
- if (logger.isLoggable(Level.FINE)) {
- logger.log(Level.FINE, "Removing invalid URI " + uri);
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.log(Level.FINE, "Removing invalid URI " + uri);
}
clean(ancestorChain);
}
@@ -197,8 +197,8 @@ public class CajaCssSanitizer {
return StringUtils.isEmpty(scheme) ||
ALLOWED_URI_SCHEMES.contains(scheme.toLowerCase());
} catch (RuntimeException re) {
- if (logger.isLoggable(Level.FINE)) {
- logger.log(Level.FINE, "Failed to parse URI in CSS " + uri, re);
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.log(Level.FINE, "Failed to parse URI in CSS " + uri, re);
}
}
return false;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/old/CajaCssSanitizer.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/old/CajaCssSanitizer.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/old/CajaCssSanitizer.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/old/CajaCssSanitizer.java Tue Jun 8 12:53:35 2010
@@ -49,7 +49,7 @@ import java.util.logging.Logger;
*/
public class CajaCssSanitizer {
- private static final Logger logger = Logger.getLogger(CajaCssSanitizer.class.getName());
+ private static final Logger LOG = Logger.getLogger(CajaCssSanitizer.class.getName());
private static final Set<String> ALLOWED_URI_SCHEMES = ImmutableSet.of("http", "https");
@@ -79,7 +79,7 @@ public class CajaCssSanitizer {
return parser.serialize(stylesheet);
} catch (GadgetException ge) {
// Failed to parse stylesheet so log and continue
- logger.log(Level.INFO, "Failed to parse stylesheet", ge);
+ LOG.log(Level.INFO, "Failed to parse stylesheet", ge);
return "";
}
}
@@ -101,7 +101,7 @@ public class CajaCssSanitizer {
content = parser.serialize(stylesheet);
} catch (GadgetException ge) {
// Failed to parse stylesheet so log and continue
- logger.log(Level.INFO, "Failed to parse stylesheet", ge);
+ LOG.log(Level.INFO, "Failed to parse stylesheet", ge);
}
if (StringUtils.isEmpty(content)) {
// Remove the owning node
@@ -126,8 +126,8 @@ public class CajaCssSanitizer {
if (!schema.isPropertyAllowed(((CssTree.Property) ancestorChain.node).
getPropertyName())) {
// Remove offending property
- if (logger.isLoggable(Level.FINE)) {
- logger.log(Level.FINE, "Removing property "
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.log(Level.FINE, "Removing property "
+ ((CssTree.Property) ancestorChain.node).getPropertyName());
}
clean(ancestorChain);
@@ -135,8 +135,8 @@ public class CajaCssSanitizer {
} else if (ancestorChain.node instanceof CssTree.FunctionCall) {
if (!schema.isFunctionAllowed(((CssTree.FunctionCall)ancestorChain.node).getName())) {
// Remove offending node
- if (logger.isLoggable(Level.FINE)) {
- logger.log(Level.FINE, "Removing function "
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.log(Level.FINE, "Removing function "
+ ((CssTree.FunctionCall) ancestorChain.node).getName());
}
clean(ancestorChain);
@@ -150,8 +150,8 @@ public class CajaCssSanitizer {
imageRewriter.rewrite(uri, linkContext));
} else {
// Remove offending node
- if (logger.isLoggable(Level.FINE)) {
- logger.log(Level.FINE, "Removing invalid URI " + uri);
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.log(Level.FINE, "Removing invalid URI " + uri);
}
clean(ancestorChain);
}
@@ -161,8 +161,8 @@ public class CajaCssSanitizer {
if (isValidUri(uri)) {
importDecl.getUri().setValue(importRewriter.rewrite(uri, linkContext));
} else {
- if (logger.isLoggable(Level.FINE)) {
- logger.log(Level.FINE, "Removing invalid URI " + uri);
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.log(Level.FINE, "Removing invalid URI " + uri);
}
clean(ancestorChain);
}
@@ -178,8 +178,8 @@ public class CajaCssSanitizer {
return StringUtils.isEmpty(scheme) ||
ALLOWED_URI_SCHEMES.contains(scheme.toLowerCase());
} catch (RuntimeException re) {
- if (logger.isLoggable(Level.FINE)) {
- logger.log(Level.FINE, "Failed to parse URI in CSS " + uri, re);
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.log(Level.FINE, "Failed to parse URI in CSS " + uri, re);
}
}
return false;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelineExecutor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelineExecutor.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelineExecutor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelineExecutor.java Tue Jun 8 12:53:35 2010
@@ -45,7 +45,7 @@ import com.google.inject.Inject;
public class PipelineExecutor {
// TODO: support configuration
private static final int MAX_BATCH_COUNT = 3;
- private static final Logger logger = Logger.getLogger(PipelineExecutor.class.getName());
+ private static final Logger LOG = Logger.getLogger(PipelineExecutor.class.getName());
private PipelinedDataPreloader preloader;
private PreloaderService preloaderService;
@@ -141,7 +141,7 @@ public class PipelineExecutor {
}
} catch (PreloadException pe) {
// This will be thrown in the event of some unexpected exception. We can move on.
- logger.log(Level.WARNING, "Unexpected error when preloading", pe);
+ LOG.log(Level.WARNING, "Unexpected error when preloading", pe);
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java Tue Jun 8 12:53:35 2010
@@ -40,7 +40,7 @@ import com.google.inject.Inject;
* Rewriter that sanitizes CSS and image content.
*/
public class SanitizingResponseRewriter implements ResponseRewriter {
- private static final Logger logger =
+ private static final Logger LOG =
Logger.getLogger(SanitizingResponseRewriter.class.getName());
private final ContentRewriterFeature.Factory featureConfigFactory;
@@ -61,7 +61,7 @@ public class SanitizingResponseRewriter
if (request.isSanitizationRequested() &&
featureConfigFactory.get(request).shouldRewriteURL(request.getUri().toString())) {
if (StringUtils.isEmpty(request.getRewriteMimeType())) {
- logger.log(Level.WARNING, "Request to sanitize without content type for "
+ LOG.log(Level.WARNING, "Request to sanitize without content type for "
+ request.getUri());
resp.setContent("");
} else if (request.getRewriteMimeType().equalsIgnoreCase("text/css")) {
@@ -69,7 +69,7 @@ public class SanitizingResponseRewriter
} else if (request.getRewriteMimeType().toLowerCase().startsWith("image/")) {
rewriteProxiedImage(request, resp);
} else {
- logger.log(Level.WARNING, "Request to sanitize unknown content type "
+ LOG.log(Level.WARNING, "Request to sanitize unknown content type "
+ request.getRewriteMimeType()
+ " for " + request.getUri());
resp.setContent("");
@@ -92,7 +92,7 @@ public class SanitizingResponseRewriter
.guessFormat(new ByteSourceInputStream(resp.getContentBytes(),
request.getUri().getPath()));
if (imageFormat == ImageFormat.IMAGE_FORMAT_UNKNOWN) {
- logger.log(Level.INFO, "Unable to sanitize unknown image type "
+ LOG.log(Level.INFO, "Unable to sanitize unknown image type "
+ request.getUri().toString());
return;
}
@@ -103,7 +103,7 @@ public class SanitizingResponseRewriter
throw new RuntimeException(ioe);
} catch (ImageReadException ire) {
// Unable to read the image so its not safe
- logger.log(Level.INFO, "Unable to detect image type for " +request.getUri().toString() +
+ LOG.log(Level.INFO, "Unable to detect image type for " +request.getUri().toString() +
" for sanitized content", ire);
return;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/old/SanitizingRequestRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/old/SanitizingRequestRewriter.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/old/SanitizingRequestRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/old/SanitizingRequestRewriter.java Tue Jun 8 12:53:35 2010
@@ -39,7 +39,7 @@ import com.google.inject.Inject;
* Rewriter that sanitizes CSS and image content.
*/
public class SanitizingRequestRewriter implements ResponseRewriter {
- private static final Logger logger =
+ private static final Logger LOG =
Logger.getLogger(SanitizingRequestRewriter.class.getName());
private final CajaCssSanitizer cssSanitizer;
@@ -62,7 +62,7 @@ public class SanitizingRequestRewriter i
ContentRewriterFeature.Config rewriterFeature =
rewriterFeatureFactory.createRewriteAllFeature(request.getCacheTtl());
if (StringUtils.isEmpty(request.getRewriteMimeType())) {
- logger.log(Level.WARNING, "Request to sanitize without content type for "
+ LOG.log(Level.WARNING, "Request to sanitize without content type for "
+ request.getUri());
resp.setContent("");
} else if (request.getRewriteMimeType().equalsIgnoreCase("text/css")) {
@@ -70,7 +70,7 @@ public class SanitizingRequestRewriter i
} else if (request.getRewriteMimeType().toLowerCase().startsWith("image/")) {
rewriteProxiedImage(request, resp);
} else {
- logger.log(Level.WARNING, "Request to sanitize unknown content type "
+ LOG.log(Level.WARNING, "Request to sanitize unknown content type "
+ request.getRewriteMimeType()
+ " for " + request.getUri());
resp.setContent("");
@@ -93,7 +93,7 @@ public class SanitizingRequestRewriter i
.guessFormat(new ByteSourceInputStream(resp.getContentBytes(),
request.getUri().getPath()));
if (imageFormat == ImageFormat.IMAGE_FORMAT_UNKNOWN) {
- logger.log(Level.INFO, "Unable to sanitize unknown image type "
+ LOG.log(Level.INFO, "Unable to sanitize unknown image type "
+ request.getUri().toString());
return;
}
@@ -104,7 +104,7 @@ public class SanitizingRequestRewriter i
throw new RuntimeException(ioe);
} catch (ImageReadException ire) {
// Unable to read the image so its not safe
- logger.log(Level.INFO, "Unable to detect image type for " +request.getUri().toString() +
+ LOG.log(Level.INFO, "Unable to detect image type for " +request.getUri().toString() +
" for sanitized content", ire);
return;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java Tue Jun 8 12:53:35 2010
@@ -47,7 +47,7 @@ import com.google.inject.Inject;
*/
public class CssResponseRewriter implements ResponseRewriter {
- private static final Logger logger = Logger.getLogger(CssResponseRewriter.class.getName());
+ private static final Logger LOG = Logger.getLogger(CssResponseRewriter.class.getName());
private final CajaCssLexerParser cssParser;
private final ProxyUriManager proxyUriManager;
@@ -96,7 +96,7 @@ public class CssResponseRewriter impleme
return stringList;
} catch (GadgetException ge) {
if (ge.getCause() instanceof ParseException) {
- logger.log(Level.WARNING,
+ LOG.log(Level.WARNING,
"Caja CSS parse failure: " + ge.getCause().getMessage() + " for " + source);
writer.write(original);
return Collections.emptyList();
@@ -134,7 +134,7 @@ public class CssResponseRewriter impleme
return imports;
} catch (GadgetException ge) {
if (ge.getCause() instanceof ParseException) {
- logger.log(Level.WARNING,
+ LOG.log(Level.WARNING,
"Caja CSS parse failure: " + ge.getCause().getMessage() + " for " + source);
return Collections.emptyList();
} else {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriter.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriter.java Tue Jun 8 12:53:35 2010
@@ -44,7 +44,7 @@ import java.util.logging.Logger;
*/
public class PipelineDataGadgetRewriter implements GadgetRewriter {
- private static final Logger logger = Logger.getLogger(
+ private static final Logger LOG = Logger.getLogger(
PipelineDataGadgetRewriter.class.getName());
private final PipelineExecutor executor;
@@ -123,7 +123,7 @@ public class PipelineDataGadgetRewriter
pipelineNodes.put(pipelineData, n);
} catch (SpecParserException e) {
// Leave the element to the client
- logger.log(Level.INFO, "Failed to parse preload in " + gadget.getSpec().getUrl(), e);
+ LOG.log(Level.INFO, "Failed to parse preload in " + gadget.getSpec().getUrl(), e);
}
}
return pipelineNodes;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java Tue Jun 8 12:53:35 2010
@@ -85,7 +85,7 @@ public class TemplateRewriter implements
/** Enable client support? **/
static final String CLIENT_SUPPORT_PARAM = "client";
- private static final Logger logger = Logger.getLogger(TemplateRewriter.class.getName());
+ private static final Logger LOG = Logger.getLogger(TemplateRewriter.class.getName());
/**
* Provider of the processor. TemplateRewriters are stateless and multithreaded,
@@ -243,7 +243,7 @@ public class TemplateRewriter implements
libraries.add(library);
} catch (TemplateParserException te) {
// Suppress exceptions due to malformed template libraries
- logger.log(Level.WARNING, null, te);
+ LOG.log(Level.WARNING, null, te);
}
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java Tue Jun 8 12:53:35 2010
@@ -45,7 +45,7 @@ import javax.imageio.metadata.IIOMetadat
*/
abstract class BaseOptimizer {
- static final Map<String, ImageFormat> formatNameToImageFormat = ImmutableMap.of(
+ static final Map<String, ImageFormat> FORMAT_NAME_TO_IMAGE_FORMAT = ImmutableMap.of(
"png", ImageFormat.IMAGE_FORMAT_PNG,
"gif", ImageFormat.IMAGE_FORMAT_GIF,
"jpeg", ImageFormat.IMAGE_FORMAT_JPEG);
@@ -77,7 +77,7 @@ abstract class BaseOptimizer {
}
return new ImageIOOutputter(writer, param);
}
- return new SanselanOutputter(formatNameToImageFormat.get(getOriginalFormatName()));
+ return new SanselanOutputter(FORMAT_NAME_TO_IMAGE_FORMAT.get(getOriginalFormatName()));
}
/**
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java Tue Jun 8 12:53:35 2010
@@ -89,7 +89,7 @@ public class BasicImageRewriter implemen
private static final int BITS_PER_BYTE = 8;
private static final Color COLOR_TRANSPARENT = new Color(255, 255, 255, 0);
private static final String CONTENT_TYPE = "Content-Type";
- private static final Logger log = Logger.getLogger(BasicImageRewriter.class.getName());
+ private static final Logger LOG = Logger.getLogger(BasicImageRewriter.class.getName());
private static final Set<String> SUPPORTED_MIME_TYPES = ImmutableSet.of(
"image/gif", CONTENT_TYPE_IMAGE_PNG, "image/jpeg", "image/bmp");
@@ -218,13 +218,13 @@ public class BasicImageRewriter implemen
}
applyOptimizer(response, imageFormat, image);
} catch (IOException ioe) {
- log.log(Level.WARNING, "IO Error rewriting image " + request.toString() + " - " + ioe.getMessage());
+ LOG.log(Level.WARNING, "IO Error rewriting image " + request.toString() + " - " + ioe.getMessage());
} catch (RuntimeException re) {
// This is safe to recover from and necessary because the ImageIO/Sanselan calls can
// throw a very wide variety of exceptions
- log.log(Level.INFO, "Unknown error rewriting image " + request.toString(), re);
+ LOG.log(Level.INFO, "Unknown error rewriting image " + request.toString(), re);
} catch (ImageReadException ire) {
- log.log(Level.INFO, "Failed to read image. Skipping " + request.toString(), ire.getMessage());
+ LOG.log(Level.INFO, "Failed to read image. Skipping " + request.toString(), ire.getMessage());
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/old/CssRequestRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/old/CssRequestRewriter.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/old/CssRequestRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/old/CssRequestRewriter.java Tue Jun 8 12:53:35 2010
@@ -52,7 +52,7 @@ import com.google.inject.Inject;
*/
public class CssRequestRewriter implements ResponseRewriter {
- private static final Logger logger = Logger.getLogger(CssRequestRewriter.class.getName());
+ private static final Logger LOG = Logger.getLogger(CssRequestRewriter.class.getName());
private final ContentRewriterFeature.Factory rewriterFeatureFactory;
private final CajaCssLexerParser cssParser;
@@ -103,7 +103,7 @@ public class CssRequestRewriter implemen
return stringList;
} catch (GadgetException ge) {
if (ge.getCause() instanceof ParseException) {
- logger.log(Level.WARNING,
+ LOG.log(Level.WARNING,
"Caja CSS parse failure: " + ge.getCause().getMessage() + " for " + source);
writer.write(original);
return Collections.emptyList();
@@ -141,7 +141,7 @@ public class CssRequestRewriter implemen
return imports;
} catch (GadgetException ge) {
if (ge.getCause() instanceof ParseException) {
- logger.log(Level.WARNING,
+ LOG.log(Level.WARNING,
"Caja CSS parse failure: " + ge.getCause().getMessage() + " for " + source);
return Collections.emptyList();
} else {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java Tue Jun 8 12:53:35 2010
@@ -60,7 +60,7 @@ import java.util.logging.Logger;
public class CajaContentRewriter implements GadgetRewriter {
public static final String CAJOLED_DOCUMENTS = "cajoledDocuments";
- private static final Logger logger = Logger.getLogger(CajaContentRewriter.class.getName());
+ private static final Logger LOG = Logger.getLogger(CajaContentRewriter.class.getName());
private final Cache<String, Element> cajoledCache;
private final RequestPipeline requestPipeline;
@@ -70,7 +70,7 @@ public class CajaContentRewriter impleme
public CajaContentRewriter(CacheProvider cacheProvider, RequestPipeline requestPipeline,
HtmlSerializer htmlSerializer) {
this.cajoledCache = cacheProvider.createCache(CAJOLED_DOCUMENTS);
- logger.info("Cajoled cache created" + cajoledCache);
+ LOG.info("Cajoled cache created" + cajoledCache);
this.requestPipeline = requestPipeline;
this.htmlSerializer = htmlSerializer;
}
@@ -160,7 +160,7 @@ public class CajaContentRewriter impleme
return new PluginEnvironment() {
public CharProducer loadExternalResource(
ExternalReference externalReference, String string) {
- logger.info("Retrieving " + externalReference.toString());
+ LOG.info("Retrieving " + externalReference.toString());
Uri resourceUri = gadgetUri.resolve(Uri.fromJavaUri(externalReference.getUri()));
HttpRequest request =
new HttpRequest(resourceUri).setContainer(container).setGadget(gadgetUri);
@@ -168,7 +168,7 @@ public class CajaContentRewriter impleme
HttpResponse response = requestPipeline.execute(request);
return CharProducer.Factory.fromString(response.getResponseAsString(), externalReference.getReferencePosition());
} catch (GadgetException e) {
- logger.info("Failed to retrieve: " + externalReference.toString());
+ LOG.info("Failed to retrieve: " + externalReference.toString());
return null;
}
}
@@ -244,6 +244,6 @@ public class CajaContentRewriter impleme
for (Message m : mq.getMessages()) {
errbuilder.append(m.format(mc)).append('\n');
}
- logger.info("Unable to cajole gadget: " + errbuilder);
+ LOG.info("Unable to cajole gadget: " + errbuilder);
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java Tue Jun 8 12:53:35 2010
@@ -58,7 +58,7 @@ public class ConcatProxyServlet extends
static final Integer LONG_LIVED_REFRESH = (365 * 24 * 60 * 60); // 1 year
static final Integer DEFAULT_REFRESH = (60 * 60); // 1 hour
- private static final Logger logger
+ private static final Logger LOG
= Logger.getLogger(ConcatProxyServlet.class.getName());
private RequestPipeline requestPipeline;
@@ -183,7 +183,7 @@ public class ConcatProxyServlet extends
// Log the errors here for now. We might want different severity levels
// for different error codes.
- logger.log(Level.INFO, "Concat proxy request failed", err);
+ LOG.log(Level.INFO, "Concat proxy request failed", err);
return err.toString();
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyBase.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyBase.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyBase.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyBase.java Tue Jun 8 12:53:35 2010
@@ -60,7 +60,7 @@ public abstract class ProxyBase {
"vary", "expires", "date", "pragma", "cache-control", "transfer-encoding", "www-authenticate"
);
- private static final Logger logger = Logger.getLogger(ProxyBase.class.getName());
+ private static final Logger LOG = Logger.getLogger(ProxyBase.class.getName());
/**
* Validates the given url.
@@ -191,7 +191,7 @@ public abstract class ProxyBase {
break;
}
- logger.log(level, "Request failed", e);
+ LOG.log(level, "Request failed", e);
resp.sendError(responseCode, e.getMessage());
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyHandler.java Tue Jun 8 12:53:35 2010
@@ -47,7 +47,7 @@ import javax.servlet.http.HttpServletRes
*/
@Singleton
public class ProxyHandler extends ProxyBase {
- private static final Logger logger = Logger.getLogger(ProxyHandler.class.getName());
+ private static final Logger LOG = Logger.getLogger(ProxyHandler.class.getName());
// TODO: parameterize these.
static final Integer LONG_LIVED_REFRESH = (365 * 24 * 60 * 60); // 1 year
@@ -95,7 +95,7 @@ public class ProxyHandler extends ProxyB
// in gadget domains.
String msg = "Embed request for url " + getParameter(request, URL_PARAM, "") +
" made to wrong domain " + host;
- logger.info(msg);
+ LOG.info(msg);
throw new GadgetException(GadgetException.Code.INVALID_PARAMETER, msg,
HttpResponse.SC_BAD_REQUEST);
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java Tue Jun 8 12:53:35 2010
@@ -42,7 +42,7 @@ public class RpcServlet extends Injected
static final String GET_REQUEST_REQ_PARAM = "req";
static final String GET_REQUEST_CALLBACK_PARAM = "callback";
- private static final Logger logger = Logger.getLogger("org.apache.shindig.gadgets");
+ private static final Logger LOG = Logger.getLogger("org.apache.shindig.gadgets");
private JsonRpcHandler jsonHandler;
@@ -63,7 +63,7 @@ public class RpcServlet extends Injected
callbackValue = validateParameterValue(request, GET_REQUEST_CALLBACK_PARAM);
} catch (IllegalArgumentException e) {
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
- logger.log(Level.INFO, e.getMessage(), e);
+ LOG.log(Level.INFO, e.getMessage(), e);
return;
}
@@ -84,7 +84,7 @@ public class RpcServlet extends Injected
response.getWriter().write(result.getOutput());
} catch (UnsupportedEncodingException e) {
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
- logger.log(Level.INFO, e.getMessage(), e);
+ LOG.log(Level.INFO, e.getMessage(), e);
response.getWriter().write("Unsupported input character set");
}
}
@@ -111,7 +111,7 @@ public class RpcServlet extends Injected
return new Result("Malformed JSON request.", false);
} catch (RpcException e) {
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
- logger.log(Level.INFO, e.getMessage(), e);
+ LOG.log(Level.INFO, e.getMessage(), e);
return new Result(e.getMessage(), false);
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java Tue Jun 8 12:53:35 2010
@@ -655,14 +655,14 @@ public class ModulePrefs {
private final MutableBoolean oauthMarker;
private boolean coreIncluded = false;
- private static final Set<String> tags = ImmutableSet.of("Require", "Optional");
+ private static final Set<String> TAGS = ImmutableSet.of("Require", "Optional");
private FeatureVisitor(MutableBoolean oauthMarker) {
this.oauthMarker = oauthMarker;
}
public boolean visit (String tag, Element element) throws SpecParserException {
- if (!tags.contains(tag)) return false;
+ if (!TAGS.contains(tag)) return false;
Feature feature = new Feature(element);
coreIncluded = coreIncluded || feature.getName().startsWith("core");
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/ContainerTagLibraryFactory.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/ContainerTagLibraryFactory.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/ContainerTagLibraryFactory.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/ContainerTagLibraryFactory.java Tue Jun 8 12:53:35 2010
@@ -41,7 +41,7 @@ import com.google.inject.Singleton;
*/
@Singleton
public class ContainerTagLibraryFactory {
- private static final Logger logger = Logger.getLogger(
+ private static final Logger LOG = Logger.getLogger(
ContainerTagLibraryFactory.class.getName());
private final ContainerConfig config;
@@ -81,11 +81,11 @@ public class ContainerTagLibraryFactory
return new XmlTemplateLibrary(Uri.parse("#OSML"), XmlUtil.parse(content),
content, true);
} catch (IOException ioe) {
- logger.log(Level.WARNING, null, ioe);
+ LOG.log(Level.WARNING, null, ioe);
} catch (XmlException xe) {
- logger.log(Level.WARNING, null, xe);
+ LOG.log(Level.WARNING, null, xe);
} catch (GadgetException tpe) {
- logger.log(Level.WARNING, null, tpe);
+ LOG.log(Level.WARNING, null, tpe);
}
return NullTemplateLibrary.INSTANCE;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessor.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessor.java Tue Jun 8 12:53:35 2010
@@ -60,7 +60,7 @@ import com.google.inject.Inject;
*/
public class DefaultTemplateProcessor implements TemplateProcessor {
- private static final Logger logger = Logger.getLogger(DefaultTemplateProcessor.class.getName());
+ private static final Logger LOG = Logger.getLogger(DefaultTemplateProcessor.class.getName());
public static final String PROPERTY_INDEX = "Index";
public static final String PROPERTY_COUNT = "Count";
@@ -482,7 +482,7 @@ public class DefaultTemplateProcessor im
Object result = expr.getValue(elContext);
return type.cast(result);
} catch (ELException e) {
- logger.log(Level.WARNING, "EL failure for gadget {0}: {1}",
+ LOG.log(Level.WARNING, "EL failure for gadget {0}: {1}",
new Object[]{getTemplateContext().getGadget().getContext().getUrl(),
e.getMessage()});
return defaultValue;
Modified: shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java (original)
+++ shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java Tue Jun 8 12:53:35 2010
@@ -68,7 +68,7 @@ public class PersonPopulate {
// TODO Auto-generated constructor stub
}
- private static final Logger log = Logger.getLogger("shindig-db-test");
+ private static final Logger LOG = Logger.getLogger("shindig-db-test");
public Person createPerson(int i, long key, Random random) {
@@ -174,7 +174,7 @@ public class PersonPopulate {
// TODO: person.setActivities(activities);
// TODO: person.setAddresses(addresses);
- log.info("Created user ++++++ " + personId);
+ LOG.info("Created user ++++++ " + personId);
return person;
}
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java Tue Jun 8 12:53:35 2010
@@ -63,7 +63,7 @@ public interface Address {
/** the field name for primary. */
PRIMARY("primary");
- private static final Map<String, Field> lookup = Maps.uniqueIndex(EnumSet.allOf(Field.class),
+ private static final Map<String, Field> LOOKUP = Maps.uniqueIndex(EnumSet.allOf(Field.class),
Functions.toStringFunction());
/**
@@ -91,7 +91,7 @@ public interface Address {
}
public static Field getField(String jsonString) {
- return lookup.get(jsonString);
+ return LOOKUP.get(jsonString);
}
}
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java?rev=952641&r1=952640&r2=952641&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java Tue Jun 8 12:53:35 2010
@@ -209,7 +209,7 @@ public interface Person {
* a Map to convert json string to Field representations.
*/
- private static final Map<String,Field> lookup = Maps.uniqueIndex(EnumSet.allOf(Field.class),
+ private static final Map<String,Field> LOOKUP = Maps.uniqueIndex(EnumSet.allOf(Field.class),
Functions.toStringFunction());
/**
@@ -220,7 +220,7 @@ public interface Person {
/**
* The set of all fields.
*/
- public static final Set<String> ALL_FIELDS = lookup.keySet();
+ public static final Set<String> ALL_FIELDS = LOOKUP.keySet();
/**
* The set of default fields returned fields.
@@ -250,7 +250,7 @@ public interface Person {
}
public static Field getField(String jsonString) {
- return lookup.get(jsonString);
+ return LOOKUP.get(jsonString);
}
/**
@@ -260,7 +260,7 @@ public interface Person {
* @return The corresponding person field.
*/
public static Person.Field fromUrlString(String urlString) {
- return lookup.get(urlString);
+ return LOOKUP.get(urlString);
}
}