Author: lindner
Date: Wed Feb 25 14:35:49 2009
New Revision: 747798
URL: http://svn.apache.org/viewvc?rev=747798&view=rev
Log:
SHINDIG-940 | Remove commons-logging, standardize on j.u.l.
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonLibConverter.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXStreamConverter.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/jsonlib/JsonLibConverterUtils.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceClassMapper.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/jsonlib/ApiValidator.java
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/eclipselink/Bootstrap.java
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/hibernate/Bootstrap.java
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/openjpa/Bootstrap.java
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/XSDValidator.java
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonLibConverter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonLibConverter.java?rev=747798&r1=747797&r2=747798&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonLibConverter.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonLibConverter.java
Wed Feb 25 14:35:49 2009
@@ -17,8 +17,6 @@
*/
package org.apache.shindig.protocol.conversion;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.shindig.protocol.conversion.jsonlib.JsonLibConverterUtils;
import com.google.inject.Inject;
@@ -39,10 +37,6 @@
*/
public class BeanJsonLibConverter implements BeanConverter {
/**
- * The Logger.
- */
- protected static final Log LOG =
LogFactory.getLog(BeanJsonLibConverter.class);
- /**
* The Guice injector used to create beans.
*/
private Injector injector;
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXStreamConverter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXStreamConverter.java?rev=747798&r1=747797&r2=747798&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXStreamConverter.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXStreamConverter.java
Wed Feb 25 14:35:49 2009
@@ -17,8 +17,6 @@
*/
package org.apache.shindig.protocol.conversion;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.shindig.protocol.DataCollection;
import org.apache.shindig.protocol.RestfulCollection;
import org.apache.shindig.protocol.conversion.xstream.StackDriver;
@@ -37,6 +35,8 @@
import java.io.IOException;
import java.util.Map;
+import java.util.logging.Logger;
+import java.util.logging.Level;
public class BeanXStreamConverter implements BeanConverter {
public static final String XML_DECL = "<?xml version=\"1.0\"
encoding=\"UTF-8\"?>";
@@ -44,7 +44,8 @@
XStreamConfiguration.ConverterSet.MAP,
XStreamConfiguration.ConverterSet.COLLECTION,
XStreamConfiguration.ConverterSet.DEFAULT };
- private static final Log log = LogFactory.getLog(BeanXStreamConverter.class);
+ private static final Logger LOG =
Logger.getLogger(BeanXStreamConverter.class.getName());
+
private ReflectionProvider rp;
private HierarchicalStreamDriver driver;
protected WriterStack writerStack;
@@ -104,7 +105,10 @@
Object s = m.values().iterator().next();
cc.mapper.setBaseObject(s); // thread safe method
String result = cc.xstream.toXML(s);
- log.debug("Result is " + result);
+
+ if (LOG.isLoggable(Level.FINE))
+ LOG.fine("Result is " + result);
+
return XML_DECL + "<response
xmlns=\"http://ns.opensocial.org/2008/opensocial\";>" + result + "</response>";
}
} else if (obj instanceof RestfulCollection) {
@@ -112,14 +116,20 @@
.get(XStreamConfiguration.ConverterSet.COLLECTION);
cc.mapper.setBaseObject(obj); // thread safe method
String result = cc.xstream.toXML(obj);
- log.debug("Result is " + result);
+
+ if (LOG.isLoggable(Level.FINE))
+ LOG.fine("Result is " + result);
+
return XML_DECL + result;
} else if (obj instanceof DataCollection) {
XStreamConfiguration.ConverterConfig cc = converterMap
.get(XStreamConfiguration.ConverterSet.MAP);
cc.mapper.setBaseObject(obj); // thread safe method
String result = cc.xstream.toXML(obj);
- log.debug("Result is " + result);
+
+ if (LOG.isLoggable(Level.FINE))
+ LOG.fine("Result is " + result);
+
return XML_DECL + result;
}
XStreamConfiguration.ConverterConfig cc = converterMap
@@ -127,7 +137,9 @@
cc.mapper.setBaseObject(obj); // thread safe method
String result = cc.xstream.toXML(obj);
- log.debug("Result is " + result);
+
+ if (LOG.isLoggable(Level.FINE))
+ LOG.fine("Result is " + result);
return XML_DECL + "<response
xmlns=\"http://ns.opensocial.org/2008/opensocial\";>" + result + "</response>";
}
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/jsonlib/JsonLibConverterUtils.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/jsonlib/JsonLibConverterUtils.java?rev=747798&r1=747797&r2=747798&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/jsonlib/JsonLibConverterUtils.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/jsonlib/JsonLibConverterUtils.java
Wed Feb 25 14:35:49 2009
@@ -17,13 +17,11 @@
*/
package org.apache.shindig.protocol.conversion.jsonlib;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import java.util.Map.Entry;
+import java.util.logging.Logger;
/**
* Some utility functions to simpilfy handling SF json-lib objects.
@@ -33,7 +31,7 @@
/**
* The Logger.
*/
- protected static final Log LOG =
LogFactory.getLog(JsonLibConverterUtils.class);
+ protected static final Logger LOG =
Logger.getLogger(JsonLibConverterUtils.class.getName());
/**
* Dumps a JSON Object out to the log at info level.
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceClassMapper.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceClassMapper.java?rev=747798&r1=747797&r2=747798&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceClassMapper.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceClassMapper.java
Wed Feb 25 14:35:49 2009
@@ -17,9 +17,6 @@
*/
package org.apache.shindig.protocol.conversion.xstream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import com.thoughtworks.xstream.mapper.Mapper;
@@ -28,6 +25,8 @@
import java.util.Collection;
import java.util.List;
import java.util.Map;
+import java.util.logging.Logger;
+import java.util.logging.Level;
/**
* The InterfaceClassMapper provides the central mapping of the XStream bean
@@ -44,7 +43,7 @@
/**
* A logger.
*/
- private static final Log log = LogFactory.getLog(InterfaceClassMapper.class);
+ private static final Logger log =
Logger.getLogger(InterfaceClassMapper.class.getName());
/**
* A map of element names to classes.
*/
@@ -150,8 +149,8 @@
}
}
firstChild.set(clazz);
- if (log.isDebugEnabled()) {
- log.debug("First Child set to " + clazz);
+ if (log.isLoggable(Level.FINE)) {
+ log.fine("First Child set to " + clazz);
}
}
}
@@ -188,13 +187,13 @@
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.isDebugEnabled()) {
- log.debug("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.isDebugEnabled()) {
- log.debug("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) {
@@ -206,13 +205,13 @@
} else {
// but after we have been asked once, then clear
firstChild.set(null);
- if (log.isDebugEnabled()) {
- log.debug("serializedClass(" + type + ')');
+ if (log.isLoggable(Level.FINE)) {
+ log.fine("serializedClass(" + type + ')');
}
for (ClassFieldMapping cfm : elementMappingList) {
if (cfm.matches(parentElementName, type)) {
- if (log.isDebugEnabled()) {
- log.debug("From MAP serializedClass(" + type + ") =="
+ if (log.isLoggable(Level.FINE)) {
+ log.fine("From MAP serializedClass(" + type + ") =="
+ cfm.getElementName());
}
return cfm.getElementName();
@@ -222,8 +221,8 @@
}
String fieldName = super.serializedClass(type);
- if (log.isDebugEnabled()) {
- log.debug("--- From Super serializedClass(" + type + ") ==" +
fieldName);
+ if (log.isLoggable(Level.FINE)) {
+ log.fine("--- From Super serializedClass(" + type + ") ==" + fieldName);
}
return fieldName;
Modified:
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/jsonlib/ApiValidator.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/jsonlib/ApiValidator.java?rev=747798&r1=747797&r2=747798&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/jsonlib/ApiValidator.java
(original)
+++
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/jsonlib/ApiValidator.java
Wed Feb 25 14:35:49 2009
@@ -17,8 +17,6 @@
*/
package org.apache.shindig.protocol.conversion.jsonlib;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.EvaluatorException;
import org.mozilla.javascript.Script;
@@ -27,6 +25,8 @@
import java.io.IOException;
import java.util.Map;
+import java.util.logging.Logger;
+import java.util.logging.Level;
import java.util.Map.Entry;
import com.google.common.collect.Maps;
@@ -37,7 +37,7 @@
*/
public class ApiValidator {
- private static final Log log = LogFactory.getLog(ApiValidator.class);
+ private static final Logger log =
Logger.getLogger(ApiValidator.class.getName());
private Context ctx;
private ScriptableObject scope;
@@ -75,12 +75,14 @@
/*
* Object[] ids = ScriptableObject.getPropertyIds(scope); for (Object id :
* ids) { Object o = ScriptableObject.getProperty(scope,
- * String.valueOf(id)); log.debug("ID is " + id + " class " +
id.getClass() + "
+ * String.valueOf(id)); log.fine("ID is " + id + " class " + id.getClass()
+ "
* is " + o); if (o instanceof ScriptableObject) {
* listScriptable(String.valueOf(id), (ScriptableObject) o); } }
*/
- log.debug("Loading " + json);
+ if (log.isLoggable(Level.FINE)) {
+ log.fine("Loading " + json);
+ }
json = json.trim();
if (!json.endsWith("}")) {
json = json + '}';
@@ -94,12 +96,16 @@
try {
so = ctx.evaluateString(scope, json, "test json", 0, null);
} catch (EvaluatorException ex) {
- log.error("Non parseable JSON " + json);
+ log.severe("Non parseable JSON " + json);
+ }
+ if (log.isLoggable(Level.FINE)) {
+ log.fine("Loaded " + so);
}
- log.debug("Loaded " + so);
ScriptableObject specification = getScriptableObject(object);
- log.debug("Looking for " + object + " found " + specification);
+ if (log.isLoggable(Level.FINE)) {
+ log.fine("Looking for " + object + " found " + specification);
+ }
listScriptable(object, specification);
Object[] fields = specification.getIds();
String[] fieldNames = new String[fields.length];
@@ -133,7 +139,9 @@
throws ApiValidatorException {
- log.debug("Loading " + json);
+ if (log.isLoggable(Level.FINE)) {
+ log.fine("Loading " + json);
+ }
json = json.trim();
if (!json.endsWith("}")) {
json = json + '}';
@@ -147,9 +155,11 @@
try {
so = ctx.evaluateString(scope, json, "test json", 0, null);
} catch (EvaluatorException ex) {
- log.error("Non parseable JSON " + json);
+ log.severe("Non parseable JSON " + json);
+ }
+ if (log.isLoggable(Level.FINE)) {
+ log.fine("Loaded " + so);
}
- log.debug("Loaded " + so);
return validateObject(so, fieldNames, optionalFields, nullfields);
@@ -183,26 +193,30 @@
parsedJSONObject);
if (o == Scriptable.NOT_FOUND) {
if (optional.containsKey(fieldName)) {
- log.warn("Missing Optional Field " + fieldName);
+ log.warning("Missing Optional Field " + fieldName);
} else if (!nullf.containsKey(fieldName)) {
- log.error("Missing Field " + fieldName);
+ log.severe("Missing Field " + fieldName);
throw new ApiValidatorException("Missing Field " + fieldName);
}
} else {
if (nullf.containsKey(fieldName)) {
- log.error("Field should have been null and was not");
+ log.severe("Field should have been null and was not");
}
if (o == null) {
if (nullf.containsKey(fieldName)) {
- log.error("Null Fields has been serialized " + fieldName);
+ log.severe("Null Fields has been serialized " + fieldName);
+ }
+ if (log.isLoggable(Level.FINE)) {
+ log.fine("Got a Null object for Field " + fieldName
+ + " on json [[" + jsonObject + "]]");
}
- log.debug("Got a Null object for Field " + fieldName
- + " on json [[" + jsonObject + "]]");
} else {
- log.debug("Got JSON Field Field," + fieldName + " as "
- + o + ' ' + o.getClass());
+ if (log.isLoggable(Level.FINE)) {
+ log.fine("Got JSON Field Field," + fieldName + " as "
+ + o + ' ' + o.getClass());
+ }
}
resultFields.put(String.valueOf(fieldName), o);
}
@@ -226,13 +240,19 @@
*/
private ScriptableObject getScriptableObject(String object) {
String[] path = object.split("\\.");
- log.debug("Looking up " + object + " elements " + path.length);
+ if (log.isLoggable(Level.FINE)) {
+ log.fine("Looking up " + object + " elements " + path.length);
+ }
ScriptableObject s = scope;
for (String pe : path) {
- log.debug("Looking up " + pe + " in " + s);
+ if (log.isLoggable(Level.FINE)) {
+ log.fine("Looking up " + pe + " in " + s);
+ }
s = (ScriptableObject) s.get(pe, s);
- log.debug("Looking for " + pe + " in found " + s);
+ if (log.isLoggable(Level.FINE)) {
+ log.fine("Looking for " + pe + " in found " + s);
+ }
}
return s;
}
@@ -247,11 +267,15 @@
* the scriptable Object
*/
private void listScriptable(String id, ScriptableObject scriptableObject) {
- log.debug("ID is Scriptable " + id);
+ if (log.isLoggable(Level.FINE)) {
+ log.fine("ID is Scriptable " + id);
+ }
if (!id.endsWith("constructor")) {
Object[] allIDs = scriptableObject.getAllIds();
for (Object oid : allIDs) {
- log.debug(id + '.' + oid);
+ if (log.isLoggable(Level.FINE)) {
+ log.fine(id + '.' + oid);
+ }
Object o = scriptableObject.get(String.valueOf(oid), scriptableObject);
if (o instanceof ScriptableObject) {
listScriptable(id + '.' + oid, (ScriptableObject) o);
@@ -276,7 +300,7 @@
* @param nameJSON
*/
public static void dump(Map<?, ?> nameJSON) {
- if (log.isDebugEnabled()) {
+ if (log.isLoggable(Level.INFO)) {
for (Entry<?, ?> entry : nameJSON.entrySet()) {
Object k = entry.getKey();
Object o = entry.getValue();
Modified:
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/eclipselink/Bootstrap.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/eclipselink/Bootstrap.java?rev=747798&r1=747797&r2=747798&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/eclipselink/Bootstrap.java
(original)
+++
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/eclipselink/Bootstrap.java
Wed Feb 25 14:35:49 2009
@@ -35,13 +35,11 @@
import com.google.inject.Inject;
import com.google.inject.name.Named;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.eclipse.persistence.config.PersistenceUnitProperties;
import org.eclipse.persistence.config.TargetServer;
-import java.util.HashMap;
import java.util.Map;
+import java.util.logging.Logger;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
@@ -59,7 +57,7 @@
private static final String DB_PASSWORD = "db.password";
private static final String DB_MIN_WRITE = "db.write.min";
private static final String DB_MIN_NUM_READ = "db.read.min";
- private static final Log LOG = LogFactory.getLog(Boolean.class);
+ private static final Logger LOG = Logger.getLogger(Boolean.class.getName());
private String minWrite;
private String minRead;
private String dbPassword;
@@ -125,7 +123,8 @@
}
/**
- * @param string
+ * @param unitName
+ *
* @return
*/
public EntityManager getEntityManager(String unitName) {
Modified:
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/hibernate/Bootstrap.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/hibernate/Bootstrap.java?rev=747798&r1=747797&r2=747798&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/hibernate/Bootstrap.java
(original)
+++
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/hibernate/Bootstrap.java
Wed Feb 25 14:35:49 2009
@@ -22,10 +22,8 @@
import com.google.inject.Inject;
import com.google.inject.name.Named;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.util.Map;
+import java.util.logging.Logger;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
@@ -42,7 +40,7 @@
private static final String DB_PASSWORD = "db.password";
private static final String DB_MIN_WRITE = "db.write.min";
private static final String DB_MIN_NUM_READ = "db.read.min";
- private static final Log LOG = LogFactory.getLog(Boolean.class);
+ private static final Logger LOG = Logger.getLogger(Boolean.class.getName());
private String minWrite;
private String minRead;
private String dbPassword;
@@ -83,7 +81,7 @@
}
/**
- * @param string
+ * @param unitName
* @return
*/
public EntityManager getEntityManager(String unitName) {
Modified:
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/openjpa/Bootstrap.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/openjpa/Bootstrap.java?rev=747798&r1=747797&r2=747798&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/openjpa/Bootstrap.java
(original)
+++
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/openjpa/Bootstrap.java
Wed Feb 25 14:35:49 2009
@@ -17,34 +17,13 @@
*/
package org.apache.shindig.social.opensocial.jpa.openjpa;
-import static
org.eclipse.persistence.config.PersistenceUnitProperties.JDBC_DRIVER;
-import static
org.eclipse.persistence.config.PersistenceUnitProperties.JDBC_PASSWORD;
-import static
org.eclipse.persistence.config.PersistenceUnitProperties.JDBC_READ_CONNECTIONS_MIN;
-import static
org.eclipse.persistence.config.PersistenceUnitProperties.JDBC_URL;
-import static
org.eclipse.persistence.config.PersistenceUnitProperties.JDBC_USER;
-import static
org.eclipse.persistence.config.PersistenceUnitProperties.JDBC_WRITE_CONNECTIONS_MIN;
-import static
org.eclipse.persistence.config.PersistenceUnitProperties.LOGGING_LEVEL;
-import static
org.eclipse.persistence.config.PersistenceUnitProperties.LOGGING_SESSION;
-import static
org.eclipse.persistence.config.PersistenceUnitProperties.LOGGING_THREAD;
-import static
org.eclipse.persistence.config.PersistenceUnitProperties.LOGGING_TIMESTAMP;
-import static
org.eclipse.persistence.config.PersistenceUnitProperties.TARGET_SERVER;
-import static
org.eclipse.persistence.config.PersistenceUnitProperties.TRANSACTION_TYPE;
import com.google.inject.Inject;
import com.google.inject.name.Named;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.eclipse.persistence.config.PersistenceUnitProperties;
-import org.eclipse.persistence.config.TargetServer;
-
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
-import javax.persistence.spi.PersistenceUnitTransactionType;
-
-import java.util.HashMap;
-import java.util.Map;
/**
*
@@ -57,7 +36,6 @@
private static final String DB_PASSWORD = "db.password";
private static final String DB_MIN_WRITE = "db.write.min";
private static final String DB_MIN_NUM_READ = "db.read.min";
- private static final Log LOG = LogFactory.getLog(Boolean.class);
private String minWrite;
private String minRead;
private String dbPassword;
@@ -94,7 +72,7 @@
}
/**
- * @param string
+ * @param unitName
* @return
*/
public EntityManager getEntityManager(String unitName) {
Modified:
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java?rev=747798&r1=747797&r2=747798&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java
(original)
+++
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java
Wed Feb 25 14:35:49 2009
@@ -46,14 +46,12 @@
import org.apache.shindig.social.opensocial.model.Url;
import org.apache.shindig.social.opensocial.model.Person.Gender;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.List;
import java.util.Random;
+import java.util.logging.Logger;
import javax.persistence.EntityManager;
import javax.persistence.Query;
@@ -70,7 +68,7 @@
// TODO Auto-generated constructor stub
}
- private static final Log log = LogFactory.getLog("shindig-db-test");
+ private static final Logger log = Logger.getLogger("shindig-db-test");
public Person createPerson(int i, long key, Random random) {
@@ -182,14 +180,14 @@
}
public String getPersonId(int i, long key) {
- return "Person" + key + ":" + i;
+ return "Person" + key + ':' + i;
}
private Url getNewUrl(int i) {
String targetUrl = "http://sdfsdfsd.sdfdsf/"; + String.valueOf(i % 33);
List<?> l = find(UrlDb.FINDBY_URL,
new String[] { UrlDb.PARAM_URL }, new Object[] { targetUrl });
- if (l.size() == 0) {
+ if (l.isEmpty()) {
Url url = new UrlDb();
url.setValue(targetUrl);
url.setLinkText("LinkText");
@@ -300,7 +298,7 @@
private <T> T findOne(String query, String[] names, Object[] params) {
List<T> l = find(query, names, params);
- if (l.size() > 0) {
+ if (!l.isEmpty()) {
return (T) l.get(0);
}
return null;
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityTest.java?rev=747798&r1=747797&r2=747798&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityTest.java
Wed Feb 25 14:35:49 2009
@@ -30,9 +30,6 @@
import java.util.Map;
public class RestfulXmlActivityTest extends AbstractLargeRestfulTests {
- private static final String XMLSCHEMA = "
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"; \n"
- + " xsi:schemaLocation=\"http://ns.opensocial.org/2008/opensocial
classpath:opensocial.xsd\" ";
- private static final String XSDRESOURCE = "opensocial.xsd";
private Activity johnsActivity;
@Override
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java?rev=747798&r1=747797&r2=747798&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java
Wed Feb 25 14:35:49 2009
@@ -37,14 +37,13 @@
import com.google.inject.Guice;
import com.google.inject.Injector;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import junit.framework.TestCase;
+import java.util.logging.Logger;
+
public class JsonConverterPerformancePerf extends TestCase {
- private static final Log log =
LogFactory.getLog(JsonConverterPerformancePerf.class);
+ private static final Logger log =
Logger.getLogger(JsonConverterPerformancePerf.class.getName());
private static final int TEST_SIZE = 10000;
private Person johnDoe;
private Activity activity;
@@ -133,8 +132,7 @@
*
*/
- log
- .info("SF JSON Lib Output "
+ log.info("SF JSON Lib Output "
+ average(startOutput, endOutput, TEST_SIZE)
+ " ms/conversion, "
+ (average(memstart, memend, TEST_SIZE) - average(stringsizeStart,
stringsizeEnd,
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/XSDValidator.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/XSDValidator.java?rev=747798&r1=747797&r2=747798&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/XSDValidator.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/XSDValidator.java
Wed Feb 25 14:35:49 2009
@@ -17,8 +17,6 @@
*/
package org.apache.shindig.social.opensocial.util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.w3c.dom.ls.LSInput;
import org.w3c.dom.ls.LSResourceResolver;
import org.xml.sax.SAXException;
@@ -27,6 +25,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
+import java.util.logging.Logger;
+import java.util.logging.Level;
import javax.xml.parsers.SAXParserFactory;
import javax.xml.transform.stream.StreamSource;
@@ -48,7 +48,7 @@
*/
public static final String XMLDEC = "<?xml version=\"1.0\"
encoding=\"UTF-8\"?>\n";
- protected static final Log log = LogFactory.getLog(XSDValidator.class);
+ protected static final Logger log =
Logger.getLogger(XSDValidator.class.getName());
/**
* Validate a xml string against a supplied schema.
@@ -148,11 +148,13 @@
String schemaResource, boolean removeContainer) {
String xml = XSDValidator.insertSchema(xmlFragment, schemaStatement,
removeContainer);
- log.debug("Validating " + xml);
+ if (log.isLoggable(Level.FINE)) {
+ log.fine("Validating " + xml);
+ }
String errors = XSDValidator.validate(xml, XSDValidator.class
.getResourceAsStream(schemaResource));
if (!"".equals(errors)) {
- log.error("Failed to validate " + xml);
+ log.severe("Failed to validate " + xml);
}
if (!"".equals(errors)) {
throw new Error("XML document does not validate \n" + errors + '\n' +
xml);
@@ -165,11 +167,13 @@
+ " xsi:schemaLocation=\"http://ns.opensocial.org/2008/opensocial
classpath:opensocial.xsd\" ";
String xml = XSDValidator.insertSchema(xmlFragment, XMLSCHEMA, true);
- log.debug("Validating " + xml);
+ if (log.isLoggable(Level.FINE)) {
+ log.fine("Validating " + xml);
+ }
String errors = XSDValidator.validate(xml, XSDValidator.class
.getResourceAsStream("opensocial.xsd"));
if (!"".equals(errors)) {
- log.error("Failed to validate " + xml);
+ log.severe("Failed to validate " + xml);
}
if (!"".equals(errors)) {
throw new Error("XML document does not validate \n" + errors + '\n' +
xml);
