[rhq] Branch 'rhq-on-as7' - 3 commits - modules/core modules/enterprise

mazz mazz at fedoraproject.org
Tue Aug 21 19:05:36 UTC 2012


 modules/core/domain/src/main/resources/META-INF/persistence.xml                         |    6 +++---
 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/display.tld               |    2 ++
 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/hq.tld                    |    2 ++
 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/struts-template.tld       |    6 ++++++
 modules/enterprise/server/ear/pom.xml                                                   |    4 +++-
 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/RHQConstants.java |    2 +-
 6 files changed, 17 insertions(+), 5 deletions(-)

New commits:
commit c4275e4a436ea6bed3fe0d04ff0536e8edc459cc
Author: John Mazzitelli <mazz at redhat.com>
Date:   Tue Aug 21 15:05:33 2012 -0400

    we use internal arjuna classes, so we need a dep on it

diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index dc64e36..ae8d25e 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -226,7 +226,9 @@
                     <unpackTypes>war,ejb</unpackTypes>
                     <archive>
                         <manifestEntries>
-                            <Dependencies>org.jboss.common-core export</Dependencies> <!-- needed to fix https://issues.jboss.org/browse/AS7-5336 -->
+                            <!-- org.jboss.common-core - needed to fix https://issues.jboss.org/browse/AS7-5336 -->
+                            <!-- org.jboss.jta - needed for Arjuna CheckedAction related classes and our custom tx interceptor -->
+                            <Dependencies>org.jboss.common-core export,org.jboss.jts</Dependencies>
                         </manifestEntries>
                     </archive>
                     <modules>


commit daa5fa241a1486066c740f23d5690d973cce5ab6
Author: John Mazzitelli <mazz at redhat.com>
Date:   Tue Aug 21 15:05:12 2012 -0400

    JNDI changes for AS7

diff --git a/modules/core/domain/src/main/resources/META-INF/persistence.xml b/modules/core/domain/src/main/resources/META-INF/persistence.xml
index 451c82a..8e28c68 100644
--- a/modules/core/domain/src/main/resources/META-INF/persistence.xml
+++ b/modules/core/domain/src/main/resources/META-INF/persistence.xml
@@ -3,11 +3,11 @@
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
 
    <persistence-unit name="rhqpu">
-      <jta-data-source>java:/RHQDS</jta-data-source>
+      <jta-data-source>java:jboss/datasources/RHQDS</jta-data-source>
 
       <properties>
-         <property name="jboss.entity.manager.jndi.name" value="java:/RHQEntityManager" />
-         <property name="jboss.entity.manager.factory.jndi.name" value="java:/RHQEntityManagerFactory" />
+         <property name="jboss.entity.manager.jndi.name" value="java:jboss/RHQEntityManager" />
+         <property name="jboss.entity.manager.factory.jndi.name" value="java:jboss/RHQEntityManagerFactory" />
 
          <!--
          <property name="hibernate.show_sql" value="true" />
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/RHQConstants.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/RHQConstants.java
index 63de793..ca8dda4 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/RHQConstants.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/RHQConstants.java
@@ -29,7 +29,7 @@ public class RHQConstants {
     public static final String PRODUCT_NAME = "RHQ";
     public static final String EAR_NAME = "rhq";
     public static final String EAR_FILE_NAME = EAR_NAME + ".ear";
-    public static final String ENTITY_MANAGER_JNDI_NAME = "java:/RHQEntityManagerFactory";
+    public static final String ENTITY_MANAGER_JNDI_NAME = "java:jboss/RHQEntityManagerFactory";
     public static final String DATASOURCE_JNDI_NAME = "java:jboss/datasources/RHQDS";
     public static final String PERSISTENCE_UNIT_NAME = "rhqpu";
     public static final String TRANSACTION_MANAGER_JNDI_NAME = "java:jboss/TransactionManager";


commit ad644cd9a40818a968faa96f4fab885075ded259
Author: John Mazzitelli <mazz at redhat.com>
Date:   Tue Aug 21 15:04:46 2012 -0400

    comment out obsolete tags

diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/display.tld b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/display.tld
index fe071cd..fc8be77 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/display.tld
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/display.tld
@@ -614,6 +614,7 @@
     <tag-class>org.rhq.enterprise.gui.legacy.taglib.display.AvailabilityDecorator</tag-class>
     <body-content>empty</body-content>
   </tag>
+<!--
   <tag>
     <name>resourcedecorator</name>
     <tag-class>org.rhq.enterprise.gui.legacy.taglib.display.ResourceDecorator</tag-class>
@@ -660,6 +661,7 @@
       <type>String</type>
     </attribute>
   </tag>
+-->
   <tag>
     <name>booleandecorator</name>
     <tag-class>org.rhq.enterprise.gui.legacy.taglib.display.BooleanDecorator</tag-class>
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/hq.tld b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/hq.tld
index 8ba5afe..421f170 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/hq.tld
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/hq.tld
@@ -443,6 +443,7 @@
       </attribute>
    </tag>
 
+<!--
    <tag>
       <name>navMap</name>
       <tag-class>org.rhq.enterprise.gui.legacy.taglib.NavMapTag</tag-class>
@@ -463,6 +464,7 @@
          <rtexprvalue>true</rtexprvalue>
       </attribute>
    </tag>
+-->
 
    <tag>
       <name>navMapSupported</name>
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/struts-template.tld b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/struts-template.tld
index f8fbe99..7b51490 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/struts-template.tld
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tld/struts-template.tld
@@ -12,6 +12,7 @@
 <jspversion>1.1</jspversion>
 <shortname>template</shortname>
 <uri>http://jakarta.apache.org/struts/tags-template</uri>
+<!--
 <tag>
 <name>insert</name>
 <tagclass>org.apache.struts.taglib.template.InsertTag</tagclass>
@@ -22,6 +23,8 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 </tag>
+-->
+<!--
 <tag>
 <name>put</name>
 <tagclass>org.apache.struts.taglib.template.PutTag</tagclass>
@@ -47,6 +50,8 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 </tag>
+-->
+<!--
 <tag>
 <name>get</name>
 <tagclass>org.apache.struts.taglib.template.GetTag</tagclass>
@@ -67,6 +72,7 @@
 <rtexprvalue>true</rtexprvalue>
 </attribute>
 </tag>
+-->
 </taglib>
 
 




More information about the rhq-commits mailing list