DELTASPIKE-391 Add QueryBuilder beans to application scope - looks like they get recreated otherwise over an Instance<> lookup.
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/28c14e9a Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/28c14e9a Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/28c14e9a Branch: refs/heads/master Commit: 28c14e9a4c54a2ecddb9359d81a608075149bf67 Parents: 9612727 Author: Thomas Hug <[email protected]> Authored: Tue Jul 9 00:57:30 2013 +0200 Committer: Thomas Hug <[email protected]> Committed: Tue Jul 9 01:11:33 2013 +0200 ---------------------------------------------------------------------- deltaspike/modules/data/impl/pom.xml | 13 +++++++++++++ .../deltaspike/data/impl/builder/QueryBuilder.java | 2 ++ .../data/impl/src/test/resources/arquillian.xml | 1 - deltaspike/modules/data/pom.xml | 3 +++ 4 files changed, 18 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/28c14e9a/deltaspike/modules/data/impl/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/pom.xml b/deltaspike/modules/data/impl/pom.xml index 95a677a..f9c55de 100755 --- a/deltaspike/modules/data/impl/pom.xml +++ b/deltaspike/modules/data/impl/pom.xml @@ -186,6 +186,19 @@ </build> </profile> <profile> + <id>jbossas-remote-7</id> + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + </testResource> + <testResource> + <directory>src/test/resources-jbossas7</directory> + </testResource> + </testResources> + </build> + </profile> + <profile> <id>glassfish-remote-3.1</id> <build> <testResources> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/28c14e9a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/QueryBuilder.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/QueryBuilder.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/QueryBuilder.java index 6e06ba6..1b39dba 100644 --- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/QueryBuilder.java +++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/builder/QueryBuilder.java @@ -22,6 +22,7 @@ import java.lang.reflect.Method; import java.text.MessageFormat; import java.util.List; +import javax.enterprise.context.ApplicationScoped; import javax.persistence.LockModeType; import javax.persistence.Query; import javax.persistence.QueryHint; @@ -32,6 +33,7 @@ import org.apache.deltaspike.data.impl.param.Parameters; /** * Query builder factory. Delegates to concrete implementations. */ +@ApplicationScoped public abstract class QueryBuilder { http://git-wip-us.apache.org/repos/asf/deltaspike/blob/28c14e9a/deltaspike/modules/data/impl/src/test/resources/arquillian.xml ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/test/resources/arquillian.xml b/deltaspike/modules/data/impl/src/test/resources/arquillian.xml index 3d1fdc0..af1845a 100644 --- a/deltaspike/modules/data/impl/src/test/resources/arquillian.xml +++ b/deltaspike/modules/data/impl/src/test/resources/arquillian.xml @@ -82,7 +82,6 @@ <property name="httpPort">-1</property> <property name="ajpPort">-1</property> <property name="stopPort">-1</property> - <property name="dir">target/apache-tomee-remote</property> <property name="appWorkingDir">target/arquillian-test-working-dir</property> <property name="properties"> testDatabase = new://Resource?type=DataSource http://git-wip-us.apache.org/repos/asf/deltaspike/blob/28c14e9a/deltaspike/modules/data/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/pom.xml b/deltaspike/modules/data/pom.xml index d61b6f6..22ac5a7 100755 --- a/deltaspike/modules/data/pom.xml +++ b/deltaspike/modules/data/pom.xml @@ -159,6 +159,9 @@ <id>jbossas-build-managed-7</id> </profile> <profile> + <id>jbossas-remote-7</id> + </profile> + <profile> <id>glassfish-remote-3.1</id> </profile> <profile>
