Author: ppoddar
Date: Sun Nov 21 06:54:51 2010
New Revision: 1037390
URL: http://svn.apache.org/viewvc?rev=1037390&view=rev
Log:
OPENJPA-1851: Document, clean up
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/AbstractCommand.java
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/DojoFormatter.java
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/DomainCommand.java
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/FindCommand.java
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JESTContext.java
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JPAServletContext.java
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JSONObjectFormatter.java
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/ObjectFormatter.java
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/PropertiesCommand.java
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/PropertiesFormatter.java
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/QueryCommand.java
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/XMLFormatter.java
openjpa/sandboxes/jest/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/jest/localizer.properties
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/AbstractCommand.java
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/AbstractCommand.java?rev=1037390&r1=1037389&r2=1037390&view=diff
==============================================================================
---
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/AbstractCommand.java
(original)
+++
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/AbstractCommand.java
Sun Nov 21 06:54:51 2010
@@ -24,14 +24,21 @@ import static java.net.HttpURLConnection
import java.io.IOException;
import java.io.PrintWriter;
import java.net.URLDecoder;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import org.apache.openjpa.kernel.OpenJPAStateManager;
+import org.apache.openjpa.kernel.StoreContext;
+import org.apache.openjpa.persistence.JPAFacadeHelper;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
/**
* The abstract base class for all commands available to JEST.
*
@@ -206,6 +213,20 @@ abstract class AbstractCommand implement
return _formatter;
}
+ public OpenJPAStateManager toStateManager(OpenJPAEntityManager em, Object
obj) {
+ StoreContext broker = ((StoreContext)JPAFacadeHelper.toBroker(em));
+ return broker.getStateManager(obj);
+ }
+
+ public List<OpenJPAStateManager> toStateManager(OpenJPAEntityManager em,
Collection<?> objects) {
+ StoreContext broker = ((StoreContext)JPAFacadeHelper.toBroker(em));
+ List<OpenJPAStateManager> sms = new ArrayList<OpenJPAStateManager>();
+ for (Object o : objects) {
+ sms.add(broker.getStateManager(o));
+ }
+ return sms;
+ }
+
public void debug(HttpServletRequest request, HttpServletResponse
response, JPAServletContext ctx)
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/DojoFormatter.java
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/DojoFormatter.java?rev=1037390&r1=1037389&r2=1037390&view=diff
==============================================================================
---
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/DojoFormatter.java
(original)
+++
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/DojoFormatter.java
Sun Nov 21 06:54:51 2010
@@ -68,16 +68,6 @@ public class DojoFormatter extends XMLFo
}
@Override
- public void configure(String key, Object value) {
- }
-
- @Override
- public void encode(Object obj, JPAServletContext ctx) throws IOException {
- encode(Collections.singleton(obj), ctx);
- }
-
-
- @Override
public void encode(Collection<?> objs, JPAServletContext ctx) throws
IOException {
PrintWriter writer = null;
try {
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/DomainCommand.java
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/DomainCommand.java?rev=1037390&r1=1037389&r2=1037390&view=diff
==============================================================================
---
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/DomainCommand.java
(original)
+++
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/DomainCommand.java
Sun Nov 21 06:54:51 2010
@@ -22,7 +22,6 @@ package org.apache.openjpa.persistence.j
import java.util.List;
import javax.persistence.metamodel.Attribute;
-import javax.persistence.metamodel.Attribute.PersistentAttributeType;
import javax.persistence.metamodel.ManagedType;
import javax.persistence.metamodel.Metamodel;
import javax.persistence.metamodel.SingularAttribute;
@@ -34,7 +33,6 @@ import javax.xml.transform.TransformerFa
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/FindCommand.java
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/FindCommand.java?rev=1037390&r1=1037389&r2=1037390&view=diff
==============================================================================
---
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/FindCommand.java
(original)
+++
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/FindCommand.java
Sun Nov 21 06:54:51 2010
@@ -23,13 +23,11 @@ import java.io.IOException;
import java.net.HttpURLConnection;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import javax.persistence.EntityManager;
-import javax.servlet.http.HttpServletRequest;
import org.apache.openjpa.kernel.OpenJPAStateManager;
import org.apache.openjpa.meta.ClassMetaData;
@@ -76,7 +74,7 @@ public class FindCommand extends Abstrac
Object oid = ApplicationIds.fromPKValues(pks, meta);
Object pc = em.find(meta.getDescribedType(), oid);
if (pc != null) {
- OpenJPAStateManager sm = ctx.toStateManager(pc);
+ OpenJPAStateManager sm =
toStateManager(ctx.getPersistenceContext(), pc);
ObjectFormatter formatter = getObjectFormatter(ctx);
ctx.getResponse().setContentType(formatter.getMimeType());
try {
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JESTContext.java
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JESTContext.java?rev=1037390&r1=1037389&r2=1037390&view=diff
==============================================================================
---
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JESTContext.java
(original)
+++
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JESTContext.java
Sun Nov 21 06:54:51 2010
@@ -162,7 +162,6 @@ public class JESTContext implements JPAS
return;
}
String action = getAction(path);
- log("Action = [" + action + "]");
JESTCommand command = _cf.newInstance(action);
if (command == null) {
findResource(path.substring(1));
@@ -205,20 +204,6 @@ public class JESTContext implements JPAS
return _repos.getMetaData(alias, loader, true);
}
- public OpenJPAStateManager toStateManager(Object obj) {
- StoreContext broker =
((StoreContext)JPAFacadeHelper.toBroker(getPersistenceContext()));
- return broker.getStateManager(obj);
- }
-
- public List<OpenJPAStateManager> toStateManager(Collection<?> objects) {
- StoreContext broker =
((StoreContext)JPAFacadeHelper.toBroker(getPersistenceContext()));
- List<OpenJPAStateManager> sms = new ArrayList<OpenJPAStateManager>();
- for (Object o : objects) {
- sms.add(broker.getStateManager(o));
- }
- return sms;
- }
-
/**
* A resource is always looked up with respect to this class.
*
@@ -228,14 +213,11 @@ public class JESTContext implements JPAS
void findResource(String rsrc) throws ProcessingException {
_response.setHeader("Cache-Control", "public");
_response.setHeader("Expires", ONE_YEAR_FROM_NOW);
- log("findResource [" + rsrc + "]");
InputStream in = getClass().getResourceAsStream(rsrc);
if (in == null) { // try again as a relative path
if (rsrc.startsWith(CONTEXT_ROOT)) {
- log("findResource agian [" + rsrc.substring(1) + "]");
in = getClass().getResourceAsStream(rsrc.substring(1));
if (in == null) {
- log("findResource could not find [" + rsrc + "]");
throw new
ProcessingException(_loc.get("resource-not-found", rsrc), HTTP_NOT_FOUND);
}
}
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java?rev=1037390&r1=1037389&r2=1037390&view=diff
==============================================================================
---
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java
(original)
+++
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java
Sun Nov 21 06:54:51 2010
@@ -36,18 +36,25 @@ import org.apache.openjpa.persistence.Op
/**
* A specialized HTTP servlet to interpret HTTP requests as Java Persistent
API commands
* on a running persistence unit. The persistence unit is identified by the
name of the
- * unit and is supplied to this servlet during its initialization. The
persistent unit
- * must be visible by this servlet within its classloader scope i.e. the web
application
- * using OpenJPA as a persistence provider must specify this servlet in its
web application
- * descriptor <code>WEB-INF/web.xml</code>.
+ * unit and is supplied to this servlet during its initialization. The
component using
+ * the persistent unit and this servlet must be within the same module scope.
* <p>
- * The response carries the Java objects in a stringified format. The format
can be
- * <code>HTML</code>, <code>XML</code> or <code>JSON</code> and can be
controlled
- * both <em>globally</em> i.e. via the initialization parameters in
<code><init-param></code>
- * clause or <em>locally</em> per request basis via
<code>format=xml|html|json</code> encoded
- * in the path expression of the Request URI.
+ * The syntax of the request URL is described in
+ * <a href="https://cwiki.apache.org/openjpa/jest-syntax.html";>OpenJPA web
site</a>.
* <p>
- *
+ * The response to a resource request is represented in various format, namely
+ * XML, JSON or a JavaScript that will dynamically render in the browser. The
format
+ * can be controlled via the initialization parameter
<code>response.format</code> in
+ * <code><init-param></code> clause or per request basis via
<code>format=xml|dojo|json</code>
+ * encoded in the path expression of the Request URI.
+ * <p>
+ * Servlet initialization parameter
+ * <table cellspacing="20px">
+ * <tr><th>Parameter</th><th>Value</th></tr>
+ * <tr><td>persistence.unit</td><td>Name of the persistence unit.
Mandatory</td></tr>
+ * <tr><td>response.format</td><td>Default format used for representation.
Defaults to <code>xml</code>.</td></tr>
+ * </table>
+ * <br>
* @author Pinaki Poddar
*
*/
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JPAServletContext.java
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JPAServletContext.java?rev=1037390&r1=1037389&r2=1037390&view=diff
==============================================================================
---
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JPAServletContext.java
(original)
+++
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JPAServletContext.java
Sun Nov 21 06:54:51 2010
@@ -19,15 +19,10 @@
package org.apache.openjpa.persistence.jest;
-import java.util.Collection;
-
-import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.openjpa.kernel.OpenJPAStateManager;
import org.apache.openjpa.lib.log.Log;
-import org.apache.openjpa.lib.util.Localizer;
import org.apache.openjpa.meta.ClassMetaData;
import org.apache.openjpa.persistence.OpenJPAEntityManager;
@@ -41,11 +36,22 @@ import org.apache.openjpa.persistence.Op
public interface JPAServletContext {
/**
* Get the persistence context of the operational context.
- *
*/
- public String getPersistenceUnitName();
public OpenJPAEntityManager getPersistenceContext();
+
+ /**
+ * Get the persistence unit name.
+ */
+ public String getPersistenceUnitName();
+
+ /**
+ * Get the HTTP Request.
+ */
public HttpServletRequest getRequest();
+
+ /**
+ * Get the HTTP Response.
+ */
public HttpServletResponse getResponse();
/**
@@ -59,9 +65,10 @@ public interface JPAServletContext {
*/
public ClassMetaData resolve(String alias);
-// public ObjectFormatter getObjectFormatter(JESTCommand command);
-
- public OpenJPAStateManager toStateManager(Object obj);
- public Collection<OpenJPAStateManager> toStateManager(Collection<?> objs);
+ /**
+ * Logging message.
+ * @param level OpenJPA defined {...@link Log#INFO log levels}. Invalid
levels will print the message on console.
+ * @param message a printable message.
+ */
public void log(short level, String message);
}
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JSONObjectFormatter.java
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JSONObjectFormatter.java?rev=1037390&r1=1037389&r2=1037390&view=diff
==============================================================================
---
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JSONObjectFormatter.java
(original)
+++
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/JSONObjectFormatter.java
Sun Nov 21 06:54:51 2010
@@ -141,7 +141,6 @@ public class JSONObjectFormatter impleme
StoreContext ctx = (StoreContext)sm.getGenericContext();
List<Attribute<?, ?>> attrs =
MetamodelHelper.getAttributesInOrder(sm.getMetaData(), model);
- int n = 0;
for (int i = 0; i < attrs.size(); i++) {
FieldMetaData fmd = ((Members.Member<?, ?>) attrs.get(i)).fmd;
if (!loaded.get(fmd.getIndex()))
@@ -289,8 +288,4 @@ public class JSONObjectFormatter impleme
}
return writer.toString();
}
-
-
- public void configure(String key, Object value) {
- }
}
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/ObjectFormatter.java
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/ObjectFormatter.java?rev=1037390&r1=1037389&r2=1037390&view=diff
==============================================================================
---
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/ObjectFormatter.java
(original)
+++
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/ObjectFormatter.java
Sun Nov 21 06:54:51 2010
@@ -21,9 +21,6 @@ package org.apache.openjpa.persistence.j
import java.io.IOException;
import java.util.Collection;
-
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.openjpa.lib.util.Localizer;
/**
@@ -43,11 +40,6 @@ public interface ObjectFormatter {
public String getMimeType();
/**
- * Configures this formatter by a name-value pair.
- */
- public void configure(String key, Object value);
-
- /**
* Format the given object in the given context.
*
* @param obj the object to be formatted.
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/PropertiesCommand.java
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/PropertiesCommand.java?rev=1037390&r1=1037389&r2=1037390&view=diff
==============================================================================
---
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/PropertiesCommand.java
(original)
+++
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/PropertiesCommand.java
Sun Nov 21 06:54:51 2010
@@ -22,33 +22,36 @@ package org.apache.openjpa.persistence.j
import java.io.IOException;
import java.io.PrintWriter;
import java.net.HttpURLConnection;
-import java.util.Arrays;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import javax.servlet.http.HttpServletResponse;
+import org.apache.openjpa.lib.util.Localizer;
+
/**
* @author Pinaki Poddar
*
*/
public class PropertiesCommand extends AbstractCommand {
-
+ private static final String MIME_TYPE = "text/html";
+ private static final Localizer _loc =
Localizer.forPackage(PropertiesCommand.class);
+
@Override
public void process(JPAServletContext ctx) throws ProcessingException,
IOException {
HttpServletResponse response = ctx.getResponse();
- response.setContentType("text/html");
+ response.setContentType(MIME_TYPE);
PrintWriter writer = response.getWriter();
- response.setStatus(HttpURLConnection.HTTP_OK);
Map<String,Object> properties =
ctx.getPersistenceContext().getProperties();
removeBadEntries(properties);
PropertiesFormatter formatter = new PropertiesFormatter();
- String caption = "Configuration Properties for Persistent Unit [" +
ctx.getPersistenceUnitName() + "]";
- HTMLElement html = formatter.writeHTML(caption, "Property Key", "",
properties);
+ String caption = _loc.get("properties-caption",
ctx.getPersistenceUnitName()).toString();
+ HTMLElement html = formatter.writeHTML(caption, "", "", properties);
writer.println(html);
+ response.setStatus(HttpURLConnection.HTTP_OK);
}
private void removeBadEntries(Map<String,Object> map) {
@@ -58,7 +61,5 @@ public class PropertiesCommand extends A
if (key.indexOf('.') == -1) bad.add(key);
}
keys.removeAll(bad);
-
}
-
}
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/PropertiesFormatter.java
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/PropertiesFormatter.java?rev=1037390&r1=1037389&r2=1037390&view=diff
==============================================================================
---
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/PropertiesFormatter.java
(original)
+++
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/PropertiesFormatter.java
Sun Nov 21 06:54:51 2010
@@ -28,17 +28,12 @@ import java.util.Map;
* @author Pinaki Poddar
*
*/
-public class PropertiesFormatter {
- public HTMLElement writeHTML(String caption, String tkey, String tvalue,
Map<String,Object> properties) {
- return writeHTML(caption, tkey, tvalue, properties,
HTMLElement.CSS_JEST, new String[]{"even", "odd"});
- }
+class PropertiesFormatter {
+ private static final String[] ROW_STYLES = {"even", "odd"};
- public HTMLElement writeHTML(String caption, String tkey, String tvalue,
Map<String,Object> properties,
- HTMLElement styleSheet, String[] styles) {
+ public HTMLElement writeHTML(String caption, String tkey, String tvalue,
Map<String,Object> properties) {
HTMLElement html = new HTMLElement("html");
- if (styleSheet != null) {
- html.add(new HTMLElement("head").add(styleSheet));
- }
+ html.add(new HTMLElement("head").add(HTMLElement.CSS_JEST));
HTMLElement body = new HTMLElement("body");
html.add(body);
@@ -57,9 +52,8 @@ public class PropertiesFormatter {
v = value.getClass().isArray() ?
Arrays.toString((Object[])value) : value.toString();
}
HTMLElement row = new HTMLElement("tr");
- String style = getStyle(i, styles);
- if (style != null)
- row.set("class", style);
+ String style = i%2 == 0 ? ROW_STYLES[0] : ROW_STYLES[1];
+ row.set("class", style);
table.add(row.add(
new HTMLElement("td").setBody(entry.getKey()),
new HTMLElement("td").setBody(v)));
@@ -68,10 +62,4 @@ public class PropertiesFormatter {
return html;
}
-
- private String getStyle(int row, String[] styles) {
- if (styles == null || styles.length == 0) return null;
- return styles[row%styles.length];
- }
-
}
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/QueryCommand.java
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/QueryCommand.java?rev=1037390&r1=1037389&r2=1037390&view=diff
==============================================================================
---
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/QueryCommand.java
(original)
+++
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/QueryCommand.java
Sun Nov 21 06:54:51 2010
@@ -71,7 +71,7 @@ public class QueryCommand extends Abstra
query.setParameter(entry.getKey(), entry.getValue());
}
getObjectFormatter(ctx)
- .encode(ctx.toStateManager(isBooleanQualifier("single")
+ .encode(toStateManager(ctx.getPersistenceContext(),
isBooleanQualifier("single")
? Collections.singleton(query.getSingleResult()) :
query.getResultList()), ctx);
} catch (Exception e) {
throw new ProcessingException(e, _loc.get("query-execution-error",
spec));
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/XMLFormatter.java
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/XMLFormatter.java?rev=1037390&r1=1037389&r2=1037390&view=diff
==============================================================================
---
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/XMLFormatter.java
(original)
+++
openjpa/sandboxes/jest/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/jest/XMLFormatter.java
Sun Nov 21 06:54:51 2010
@@ -488,10 +488,6 @@ public class XMLFormatter implements Obj
validator.validate(new DOMSource(doc));
}
- public void configure(String key, Object value) {
- }
-
-
String ior(OpenJPAStateManager sm) {
return typeOf(sm) + "-" + sm.getObjectId();
}
Modified:
openjpa/sandboxes/jest/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/jest/localizer.properties
URL:
http://svn.apache.org/viewvc/openjpa/sandboxes/jest/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/jest/localizer.properties?rev=1037390&r1=1037389&r2=1037390&view=diff
==============================================================================
---
openjpa/sandboxes/jest/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/jest/localizer.properties
(original)
+++
openjpa/sandboxes/jest/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/jest/localizer.properties
Sun Nov 21 06:54:51 2010
@@ -45,3 +45,6 @@ parse-less-argument: {0} command must ha
format-xml-null-parent: A null XML parent element encountered during
serialization
format-xml-null-doc: Given parent element is not part of XML document
format-xml-null-closure: Set of visited instances can not be null for
serialization
+
+
+properties-caption: Configuration of {0} Persistence Unit
