modules/enterprise/gui/portal-war/src/main/webapp/admin/test/browser.jsp
| 9 +-
modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp
| 8 +-
modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp
| 27 ++++----
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/ResourceGroupTestBean.java
| 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/ResourceGroupTestBeanLocal.java
| 28 --------
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/ResourceGroupTestLocal.java
| 28 ++++++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/SubjectRoleTestBean.java
| 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/SubjectRoleTestBeanLocal.java
| 32 ----------
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/SubjectRoleTestLocal.java
| 32 ++++++++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java
| 8 +-
10 files changed, 89 insertions(+), 87 deletions(-)
New commits:
commit 943e4b42715c43b6bcadeb08de136a5185baaed8
Author: Jay Shaughnessy <jshaughn(a)jshaughn.csb>
Date: Tue Sep 25 10:24:03 2012 -0400
- Get Hibernate Test Page to render.
- translation is not yet working.
- Get Entity browser working
- Get Admin Control page rendering
- Rename *TestBeanLocal interfaces to *TestLocal to conform to our naming
conventions
such that JNDI lookups work as expected
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/browser.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/browser.jsp
index e379377..fb0fd93 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/browser.jsp
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/browser.jsp
@@ -1,6 +1,7 @@
<%@page contentType="text/html"%>
<%@page pageEncoding="UTF-8"%>
-<%@ page import="org.hibernate.engine.SessionFactoryImplementor" %>
+<%@ page import="org.hibernate.engine.spi.SessionFactoryImplementor" %>
+<%@ page import="org.hibernate.metadata.ClassMetadata" %>
<%@ page import="org.rhq.core.domain.server.PersistenceUtility" %>
<%@ page import="org.rhq.enterprise.gui.legacy.util.SessionUtils" %>
<%@ page import="org.rhq.enterprise.server.util.LookupUtil" %>
@@ -46,8 +47,8 @@
<%
InitialContext ic = new InitialContext();
- EntityManagerFactory emf = (EntityManagerFactory)
ic.lookup("java:/RHQEntityManagerFactory");
- EntityManager em = ((EntityManagerFactory)
ic.lookup("java:/RHQEntityManagerFactory"))
+ EntityManagerFactory emf = (EntityManagerFactory)
ic.lookup("java:jboss/RHQEntityManagerFactory");
+ EntityManager em = ((EntityManagerFactory)
ic.lookup("java:jboss/RHQEntityManagerFactory"))
.createEntityManager();
@@ -62,7 +63,7 @@
<%
- Map<String, Object> metadata = sfi.getAllClassMetadata();
+ Map<String, ClassMetadata> metadata = sfi.getAllClassMetadata();
SortedSet<String> classes = new
TreeSet<String>(metadata.keySet());
%>
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp
index 1015894..f9bb541 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp
@@ -14,8 +14,8 @@
<%@ page import="org.rhq.enterprise.server.test.CoreTestLocal" %>
<%@ page import="org.rhq.enterprise.server.test.DiscoveryTestLocal" %>
<%@ page import="org.rhq.enterprise.server.test.MeasurementTestLocal" %>
-<%@ page import="org.rhq.enterprise.server.test.ResourceGroupTestBeanLocal"
%>
-<%@ page import="org.rhq.enterprise.server.test.SubjectRoleTestBeanLocal"
%>
+<%@ page import="org.rhq.enterprise.server.test.ResourceGroupTestLocal"
%>
+<%@ page import="org.rhq.enterprise.server.test.SubjectRoleTestLocal" %>
<%@ page import="org.rhq.enterprise.server.test.AlertTemplateTestLocal"
%>
<%@ page
import="org.rhq.enterprise.server.cloud.instance.ServerManagerLocal" %>
<%@ page
import="org.rhq.enterprise.server.measurement.MeasurementBaselineManagerLocal"
%>
@@ -50,8 +50,8 @@
CoreTestLocal coreTestBean;
DiscoveryTestLocal discoveryTestBean;
MeasurementTestLocal measurementTestBean;
- ResourceGroupTestBeanLocal resourceGroupTestBean;
- SubjectRoleTestBeanLocal subjectRoleTestBean;
+ ResourceGroupTestLocal resourceGroupTestBean;
+ SubjectRoleTestLocal subjectRoleTestBean;
ServerManagerLocal serverManager;
AlertTemplateTestLocal alertTemplateTestBean;
MeasurementBaselineManagerLocal measurementBaselineManager;
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp
b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp
index ce3f671..c81d8bd 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp
@@ -1,9 +1,9 @@
<%@ page import="org.hibernate.EmptyInterceptor" %>
-<%@ page import="org.hibernate.engine.NamedQueryDefinition" %>
-<%@ page import="org.hibernate.engine.SessionFactoryImplementor" %>
-<%@ page import="org.hibernate.hql.ParameterTranslations" %>
-<%@ page import="org.hibernate.hql.QueryTranslator" %>
-<%@ page import="org.hibernate.hql.ast.ASTQueryTranslatorFactory" %>
+<%@ page import="org.hibernate.engine.spi.NamedQueryDefinition" %>
+<%@ page import="org.hibernate.engine.spi.SessionFactoryImplementor" %>
+<%@ page import="org.hibernate.hql.spi.ParameterTranslations" %>
+<%@ page import="org.hibernate.hql.spi.QueryTranslator" %>
+<%@ page import="org.hibernate.hql.internal.ast.ASTQueryTranslatorFactory"
%>
<%@ page import="org.hibernate.type.IntegerType" %>
<%@ page import="org.hibernate.type.LongType" %>
<%@ page import="org.hibernate.type.Type" %>
@@ -34,7 +34,7 @@
<jsp:include page="/admin/include/adminTestLinks.html"
flush="true" />
<%!
- public static final String ENTITY_MANAGER_FACTORY_JNDI =
"java:/RHQEntityManagerFactory";
+ public static final String ENTITY_MANAGER_FACTORY_JNDI =
"java:jboss/RHQEntityManagerFactory";
public static final int MAX_ROWS = 100;
%>
@@ -61,13 +61,14 @@
org.hibernate.Session s = getHibernateSession(em);
SessionFactoryImplementor sfi = (SessionFactoryImplementor) s.getSessionFactory();
-
- s = sfi.openSession(new EmptyInterceptor() {
- public String onPrepareStatement(String s) {
- executedSQL.add(s);
- return super.onPrepareStatement(s);
- }
- });
+
+ s = sfi.withOptions().interceptor(
+ new EmptyInterceptor() {
+ public String onPrepareStatement(String s) {
+ executedSQL.add(s);
+ return super.onPrepareStatement(s);
+ }
+ }).openSession();
if (namedQuery != null) {
NamedQueryDefinition queryDef = sfi.getNamedQuery(namedQuery);
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/ResourceGroupTestBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/ResourceGroupTestBean.java
index 731a74d..89f9d0b 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/ResourceGroupTestBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/ResourceGroupTestBean.java
@@ -29,7 +29,7 @@ import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.enterprise.server.RHQConstants;
@Stateless
-public class ResourceGroupTestBean implements ResourceGroupTestBeanLocal {
+public class ResourceGroupTestBean implements ResourceGroupTestLocal {
private static int compatCounter = 0;
private int getNextCompat() {
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/ResourceGroupTestBeanLocal.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/ResourceGroupTestBeanLocal.java
deleted file mode 100644
index 7e6143d..0000000
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/ResourceGroupTestBeanLocal.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.server.test;
-
-import javax.ejb.Local;
-
-@Local
-public interface ResourceGroupTestBeanLocal {
- public void setupUberMixedGroup();
-
- public void setupCompatibleGroups();
-}
\ No newline at end of file
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/ResourceGroupTestLocal.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/ResourceGroupTestLocal.java
new file mode 100644
index 0000000..eb426dc
--- /dev/null
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/ResourceGroupTestLocal.java
@@ -0,0 +1,28 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.server.test;
+
+import javax.ejb.Local;
+
+@Local
+public interface ResourceGroupTestLocal {
+ public void setupUberMixedGroup();
+
+ public void setupCompatibleGroups();
+}
\ No newline at end of file
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/SubjectRoleTestBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/SubjectRoleTestBean.java
index 59a2238..dedfc75 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/SubjectRoleTestBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/SubjectRoleTestBean.java
@@ -26,7 +26,7 @@ import org.rhq.core.domain.authz.Role;
import org.rhq.enterprise.server.RHQConstants;
@Stateless
-public class SubjectRoleTestBean implements SubjectRoleTestBeanLocal {
+public class SubjectRoleTestBean implements SubjectRoleTestLocal {
@PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME)
private EntityManager entityManager;
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/SubjectRoleTestBeanLocal.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/SubjectRoleTestBeanLocal.java
deleted file mode 100644
index 2908dd7..0000000
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/SubjectRoleTestBeanLocal.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.server.test;
-
-import javax.ejb.Local;
-
-@Local
-public interface SubjectRoleTestBeanLocal {
- /**
- * creates roleCount*usersInRoleCount number of objects in the system
- *
- * @param roleCount the number of roles to create
- * @param usersInRoleCount the number of users to create and attach to each role
- */
- public void createRolesAndUsers(int roleCount, int usersInRoleCount);
-}
\ No newline at end of file
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/SubjectRoleTestLocal.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/SubjectRoleTestLocal.java
new file mode 100644
index 0000000..7a31234
--- /dev/null
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/SubjectRoleTestLocal.java
@@ -0,0 +1,32 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.server.test;
+
+import javax.ejb.Local;
+
+@Local
+public interface SubjectRoleTestLocal {
+ /**
+ * creates roleCount*usersInRoleCount number of objects in the system
+ *
+ * @param roleCount the number of roles to create
+ * @param usersInRoleCount the number of users to create and attach to each role
+ */
+ public void createRolesAndUsers(int roleCount, int usersInRoleCount);
+}
\ No newline at end of file
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java
index 6fb47ea..5bc49dc 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java
@@ -206,9 +206,9 @@ import org.rhq.enterprise.server.test.DiscoveryTestLocal;
import org.rhq.enterprise.server.test.MeasurementTestBean;
import org.rhq.enterprise.server.test.MeasurementTestLocal;
import org.rhq.enterprise.server.test.ResourceGroupTestBean;
-import org.rhq.enterprise.server.test.ResourceGroupTestBeanLocal;
+import org.rhq.enterprise.server.test.ResourceGroupTestLocal;
import org.rhq.enterprise.server.test.SubjectRoleTestBean;
-import org.rhq.enterprise.server.test.SubjectRoleTestBeanLocal;
+import org.rhq.enterprise.server.test.SubjectRoleTestLocal;
/**
* Methods that allow POJO objects to obtain references to EJB/JPA objects. These
convenience methods attempt to
@@ -559,7 +559,7 @@ public final class LookupUtil {
return lookupLocal(SubjectManagerBean.class);
}
- public static SubjectRoleTestBeanLocal getSubjectRoleTestBean() {
+ public static SubjectRoleTestLocal getSubjectRoleTestBean() {
return lookupLocal(SubjectRoleTestBean.class);
}
@@ -662,7 +662,7 @@ public final class LookupUtil {
return lookupLocal(MeasurementTestBean.class);
}
- public static ResourceGroupTestBeanLocal getResourceGroupTestBean() {
+ public static ResourceGroupTestLocal getResourceGroupTestBean() {
return lookupLocal(ResourceGroupTestBean.class);
}