modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java | 8 + modules/enterprise/server/ear/src/main/application/META-INF/jboss-deployment-structure.xml | 78 +++++----- 3 files changed, 52 insertions(+), 38 deletions(-)
New commits: commit bdcd5f13b9943fae99c35749bec4710c8c08f16a Author: Jay Shaughnessy jshaughn@redhat.com Date: Fri Feb 1 10:48:06 2013 -0500
[Bug 906500 - quartz throwing NoClassDefFoundError: oracle/sql/BLOB] I believe this is fixed. I added an optional module dependency on the Oracle driver, for the server jar. Our datasources had no problem, they are defined correctly to find/use the oracle driver, but since Quartz wants to perform a test directly against a driver class, we had to ensure the driver jar was accessible to the classloader.
diff --git a/modules/enterprise/server/ear/src/main/application/META-INF/jboss-deployment-structure.xml b/modules/enterprise/server/ear/src/main/application/META-INF/jboss-deployment-structure.xml index f3d48d1..2616e7f 100644 --- a/modules/enterprise/server/ear/src/main/application/META-INF/jboss-deployment-structure.xml +++ b/modules/enterprise/server/ear/src/main/application/META-INF/jboss-deployment-structure.xml @@ -1,46 +1,48 @@ <?xml version="1.0"?> <jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.1">
- <!-- Explicitly indicate that we do not want sub deployments isolated; subdeployments need to see each other's classes --> - <ear-subdeployments-isolated>false</ear-subdeployments-isolated> + <!-- Explicitly indicate that we do not want sub deployments isolated; subdeployments need to see each other's classes --> + <ear-subdeployments-isolated>false</ear-subdeployments-isolated>
- <!-- This corresponds to the top level deployment - which in this case in the EAR module --> - <deployment> - <dependencies> - <module name="org.jboss.common-core" export="true" /> <!-- needed to fix https://issues.jboss.org/browse/AS7-5336 --> - <module name="org.jboss.jts" export="true" /> <!-- needed for Arjuna CheckedAction related classes and our custom tx interceptor --> - <module name="org.apache.commons.logging" export="true" /> <!-- needed as per https://docs.jboss.org/author/display/AS71/How+do+I+migrate+my+application+from+AS5+or+AS6+to+AS7 --> - <module name="org.hibernate" export="true" /> <!-- because we need hibernate specific APIs, e.g. for the HibernateDetachUtility --> - <module name="org.infinispan" export="true" /> <!-- because we use an Infinispan cache for REST services --> - <module name="org.antlr" export="true" /> <!-- rhq ejb jar module wants this - i think for dynagroup syntax? --> - <module name="org.dom4j" export="true" /> <!-- rhq ejb jar module declares this with runtime/provided scope --> - <module name="javax.mail.api" export="true" /> <!-- for sending email notifications --> - <module name="org.picketbox" export="true" /> <!-- for obfuscating passwords --> - <module name="org.jboss.as.naming" export="true" /> - </dependencies> - </deployment> + <!-- This corresponds to the top level deployment - which in this case in the EAR module --> + <deployment> + <dependencies> + <module name="org.jboss.common-core" export="true" /> <!-- needed to fix https://issues.jboss.org/browse/AS7-5336 --> + <module name="org.jboss.jts" export="true" /> <!-- needed for Arjuna CheckedAction related classes and our custom tx interceptor --> + <module name="org.apache.commons.logging" export="true" /> <!-- needed as per https://docs.jboss.org/author/display/AS71/How+do+I+migrate+my+application+from+AS5+or+AS6+to+AS7 --> + <module name="org.hibernate" export="true" /> <!-- because we need hibernate specific APIs, e.g. for the HibernateDetachUtility --> + <module name="org.infinispan" export="true" /> <!-- because we use an Infinispan cache for REST services --> + <module name="org.antlr" export="true" /> <!-- rhq ejb jar module wants this - i think for dynagroup syntax? --> + <module name="org.dom4j" export="true" /> <!-- rhq ejb jar module declares this with runtime/provided scope --> + <module name="javax.mail.api" export="true" /> <!-- for sending email notifications --> + <module name="org.picketbox" export="true" /> <!-- for obfuscating passwords --> + <module name="org.jboss.as.naming" export="true" /> + </dependencies> + </deployment>
- <!-- This corresponds to the Portal WAR - it requires the older JSF version packaged with AS 4.2.3, not the AS7 default --> - <sub-deployment name="rhq-portal.war"> - <exclusions> - <module name="javax.faces.api" slot="main" /> - <module name="com.sun.jsf-impl" slot="main" /> - </exclusions> - <dependencies> - <module name="javax.faces.api" slot="1.2" /> - <module name="com.sun.jsf-impl" slot="1.2" /> - </dependencies> - </sub-deployment> + <!-- This corresponds to the Portal WAR - it requires the older JSF version packaged with AS 4.2.3, not the AS7 default --> + <sub-deployment name="rhq-portal.war"> + <exclusions> + <module name="javax.faces.api" slot="main" /> + <module name="com.sun.jsf-impl" slot="main" /> + </exclusions> + <dependencies> + <module name="javax.faces.api" slot="1.2" /> + <module name="com.sun.jsf-impl" slot="1.2" /> + </dependencies> + </sub-deployment>
- <!-- This corresponds to the Server EJB3 JAR --> - <sub-deployment name="rhq-enterprise-server-ejb3.jar"> - <dependencies> - <module name="org.jboss.msc" export="true" /> - <module name="org.jboss.as.controller" export="true" /> - <module name="org.jboss.as.server" export="true" /> - <module name="org.jboss.modules" export="true" /> - <module name="org.jboss.as.naming" export="true" /> - </dependencies> - </sub-deployment> + <!-- This corresponds to the Server EJB3 JAR --> + <sub-deployment name="rhq-enterprise-server-ejb3.jar"> + <dependencies> + <module name="org.jboss.msc" export="true" /> + <module name="org.jboss.as.controller" export="true" /> + <module name="org.jboss.as.server" export="true" /> + <module name="org.jboss.modules" export="true" /> + <module name="org.jboss.as.naming" export="true" /> + <!-- Currently Quartz actually does some direct manipulation with Oracle classes --> + <module name="org.rhq.oracle" export="true" optional="true" /> + </dependencies> + </sub-deployment>
</jboss-deployment-structure>
commit e56616b116afb4bac77d33e6a1e6a62265eceeb4 Author: Jay Shaughnessy jshaughn@redhat.com Date: Fri Feb 1 10:43:38 2013 -0500
Trivial - some jdoc improvements
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java index 55201d8..40a2092 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java @@ -96,6 +96,10 @@ public abstract class Criteria implements Serializable, BaseCriteria {
private String searchExpression;
+ /** + * This default constructor will set default paging to avoid unintended fetch of huge results. The default is: + * <pre>setPaging(0, 200);</pre> + */ public Criteria() { this.filterOverrides = new HashMap<String, String>(); this.sortOverrides = new HashMap<String, String>(); diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java index 066c84f..0be7b29 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java @@ -106,6 +106,14 @@ public class ResourceCriteria extends TaggedCriteria { private PageOrdering sortCurrentAvailability; // needs overrides private PageOrdering sortResourceAncestry; // needs overrides
+ /** + * Note: This constructor sets by default: + * <pre>filterInventoryStatus = InventoryStatus.COMMITTED</pre> + * + * <p>For other implicit defaults see {@link Criteria#Criteria()}</p> + * + * @see Criteria#Criteria() + */ public ResourceCriteria() { filterOverrides.put("resourceTypeId", "resourceType.id = ?"); filterOverrides.put("resourceTypeName", "resourceType.name like ?");
rhq-commits@lists.fedorahosted.org