modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBean.java
| 5 +----
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java
| 5 +----
2 files changed, 2 insertions(+), 8 deletions(-)
New commits:
commit 03caa3d61d59d2e041750b0581a31098acf61f10
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Apr 30 09:47:25 2013 -0400
these methods' @TranAttrib annotations are unused. Also, spoke to lukas, he said
these methods should be made private
diff --git
a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBean.java
b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBean.java
index bfe9f32..6689de5 100644
---
a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBean.java
+++
b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBean.java
@@ -21,8 +21,6 @@
package org.rhq.enterprise.server.test;
import javax.ejb.Singleton;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
import org.rhq.enterprise.server.core.StartupBean;
import org.rhq.enterprise.server.naming.NamingHack;
@@ -34,8 +32,7 @@ import org.rhq.enterprise.server.naming.NamingHack;
@Singleton
public class StrippedDownStartupBean {
- @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
- public void secureNaming() {
+ private void secureNaming() {
NamingHack.bruteForceInitialContextFactoryBuilder();
}
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java
index 5b5aa8c..90ffbaf 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java
@@ -146,11 +146,8 @@ public class StartupBean implements StartupLocal {
/**
* Modifies the naming subsystem to be able to check for Java security permissions on
JNDI lookup.
- * <p>
- * Made public so that this can be reused in tests.
*/
- @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
- public void secureNaming() {
+ private void secureNaming() {
NamingHack.bruteForceInitialContextFactoryBuilder();
}
Show replies by date