Author: rmannibucau Date: Fri Jan 29 08:07:05 2016 New Revision: 1727495 URL: http://svn.apache.org/viewvc?rev=1727495&view=rev Log: applying OPENJPA-2607
Modified: openjpa/sandboxes/21/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java openjpa/sandboxes/21/openjpa/pom.xml Modified: openjpa/sandboxes/21/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java URL: http://svn.apache.org/viewvc/openjpa/sandboxes/21/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java?rev=1727495&r1=1727494&r2=1727495&view=diff ============================================================================== --- openjpa/sandboxes/21/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java (original) +++ openjpa/sandboxes/21/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java Fri Jan 29 08:07:05 2016 @@ -2032,34 +2032,7 @@ public class EntityManagerImpl return newProcedure(procedureName, meta); } - /** - * Creates a query to execute a Stored Procedure. - * <br> - * Construction of a {@link StoredProcedureQuery} object is a three step process - * <LI> - * <LI>a {@link org.apache.openjpa.kernel.Query kernel query} {@code kQ} is created for - * {@link QueryLanguages#LANG_SQL SQL} language with the string {@code S} - * <LI>a {@link QueryImpl facade query} {@code fQ} is created that delegates to the kernel query {@code kQ} - * <LI>a {@link StoredProcedureQueryImpl stored procedure query} is created that delegates to the facade query - * {@code fQ}. - * <br> - * - * @param sql name of the database stored procedure. - * @param meta - * @param mappingName - * @return - */ - private StoredProcedureQuery newProcedure(String procedureName, MultiQueryMetaData meta) { - org.apache.openjpa.kernel.QueryImpl kernelQuery = (org.apache.openjpa.kernel.QueryImpl) - _broker.newQuery(QueryLanguages.LANG_STORED_PROC, procedureName); - kernelQuery.getStoreQuery().setQuery(meta); - if (meta != null) { - getConfiguration().getMetaDataRepositoryInstance().addQueryMetaData(meta); - kernelQuery.setResultMapping(null, meta.getResultSetMappingName()); - } - org.apache.openjpa.persistence.QueryImpl<?> facadeQuery = new QueryImpl(this, _ret, kernelQuery, meta, _log); - return new StoredProcedureQueryImpl(procedureName, facadeQuery); - } + @Override public boolean isJoinedToTransaction() { Modified: openjpa/sandboxes/21/openjpa/pom.xml URL: http://svn.apache.org/viewvc/openjpa/sandboxes/21/openjpa/pom.xml?rev=1727495&r1=1727494&r2=1727495&view=diff ============================================================================== --- openjpa/sandboxes/21/openjpa/pom.xml (original) +++ openjpa/sandboxes/21/openjpa/pom.xml Fri Jan 29 08:07:05 2016 @@ -120,7 +120,22 @@ <Bundle-Activator>org.apache.openjpa.persistence.osgi.PersistenceActivator</Bundle-Activator> <Private-Package /> <Export-Package>org.apache.openjpa.*;version=${project.version}</Export-Package> - <Import-Package>com.ibm.*;resolution:=optional,org.postgresql.*;resolution:=optional,org.apache.tools.ant.*;resolution:=optional,org.apache.log4j.*;resolution:=optional,org.slf4j.*;resolution:=optional,org.apache.commons.logging.*;resolution:=optional,javax.activation.xa*;resolution:=optional,javax.jms.*;version="[1.1.0,1.2)";resolution:=optional,javax.transaction.*;version="[1.1.0,1.2)";resolution:=optional,javax.validation.*;version="[1.0.0,1.1)";resolution:=optional,javax.xml.bind.*;resolution:=optional,serp.*;resolution:=optional,javax.persistence.*;version="[1.1.0,2.1)",*</Import-Package> + <Import-Package> + com.ibm.*;resolution:=optional, + org.postgresql.*;resolution:=optional, + org.apache.tools.ant.*;resolution:=optional, + org.apache.log4j.*;resolution:=optional, + org.slf4j.*;resolution:=optional, + org.apache.commons.logging.*;resolution:=optional, + javax.activation.xa*;resolution:=optional, + javax.jms.*;version="[1.1.0,1.2)";resolution:=optional, + javax.transaction.*;version="[1.1,1.3)";resolution:=optional, + javax.validation.*;version="[1.0.0,1.1)";resolution:=optional, + javax.xml.bind.*;resolution:=optional, + serp.*;resolution:=optional, + javax.persistence.*;version="[1.1.0,2.1)", + * + </Import-Package> </instructions> </configuration> </plugin>