[portal-commits] JBoss Portal SVN: r13013 - in branches/JBoss_Portal_AS5_Deployer/wsrp: src and 5 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Tue Mar 10 17:15:36 EDT 2009
Author: mwringe
Date: 2009-03-10 17:15:36 -0400 (Tue, 10 Mar 2009)
New Revision: 13013
Added:
branches/JBoss_Portal_AS5_Deployer/wsrp/src/etc/
branches/JBoss_Portal_AS5_Deployer/wsrp/src/etc/jboss-aop/
branches/JBoss_Portal_AS5_Deployer/wsrp/src/etc/jboss-aop/base-aop.xml
branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-dependency.xml
Modified:
branches/JBoss_Portal_AS5_Deployer/wsrp/build.xml
branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar/conf/hibernate/consumer/hibernate.cfg.xml
branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar/wsrp-aop.xml
Log:
Remove the transaction definitions from the wsrp-aop.xml, these are now defined in the portal-aop.xml in the portal sar.
Add dependency on jboss-portal-sar since it now defines the aop transactions.
Temporarily remove second level cache from hibernate.
Modified: branches/JBoss_Portal_AS5_Deployer/wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/wsrp/build.xml 2009-03-10 21:08:55 UTC (rev 13012)
+++ branches/JBoss_Portal_AS5_Deployer/wsrp/build.xml 2009-03-10 21:15:36 UTC (rev 13013)
@@ -258,7 +258,10 @@
<aopc compilerclasspathref="aop.classpath" verbose="true">
<classpath refid="aopc.classpath"/>
<src path="${build.classes}"/>
- <aoppath path="${build.resources}/portal-wsrp-sar/wsrp-aop.xml"/>
+ <aoppath>
+ <pathelement path="${build.resources}/portal-wsrp-sar/wsrp-aop.xml"/>
+ <pathelement path="${source.etc}/jboss-aop/base-aop.xml"/>
+ </aoppath>
<include name="org/jboss/portal/wsrp/consumer/ConsumerRegistryService.class"/>
</aopc>
Added: branches/JBoss_Portal_AS5_Deployer/wsrp/src/etc/jboss-aop/base-aop.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/wsrp/src/etc/jboss-aop/base-aop.xml (rev 0)
+++ branches/JBoss_Portal_AS5_Deployer/wsrp/src/etc/jboss-aop/base-aop.xml 2009-03-10 21:15:36 UTC (rev 13013)
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software 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 ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE aop PUBLIC
+ "-//JBoss//DTD JBOSS AOP 1.0//EN"
+ "http://www.jboss.org/aop/dtd/jboss-aop_1_0.dtd">
+
+<aop>
+ <!-- custom configuration for AOP Security -->
+ <metadata-loader tag="security" class="org.jboss.aspects.security.SecurityClassMetaDataLoader"/>
+
+ <stack name="J2EESecurityStack">
+ <interceptor factory="org.jboss.aspects.security.AuthenticationInterceptorFactory" scope="PER_CLASS"/>
+ <interceptor factory="org.jboss.aspects.security.RoleBasedAuthorizationInterceptorFactory" scope="PER_CLASS"/>
+ <interceptor factory="org.jboss.aspects.security.RunAsSecurityInterceptorFactory" scope="PER_CLASS"/>
+ </stack>
+
+ <bind pointcut="all(@security)">
+ <stack-ref name="J2EESecurityStack"/>
+ </bind>
+
+ <bind pointcut="all(@org.jboss.aspects.security.Permissions)">
+ <stack-ref name="J2EESecurityStack"/>
+ </bind>
+
+ <bind pointcut="all(@org.jboss.aspects.security.Unchecked)">
+ <stack-ref name="J2EESecurityStack"/>
+ </bind>
+
+ <bind pointcut="all(@org.jboss.aspects.security.Exclude)">
+ <stack-ref name="J2EESecurityStack"/>
+ </bind>
+
+ <introduction expr="class(@org.jboss.aspects.jmx.MBean)">
+ <mixin>
+ <interfaces>javax.management.DynamicMBean</interfaces>
+ <class>org.jboss.aspects.jmx.JmxIntrospectingMixin</class>
+ <construction>new org.jboss.aspects.jmx.JmxIntrospectingMixin(this)</construction>
+ </mixin>
+ </introduction>
+
+ <!-- asynchronous aspect -->
+ <aspect class="org.jboss.aspects.asynch.AsynchAspect" scope="PER_INSTANCE">
+ <advisor-attribute name="Advisor"/>
+ </aspect>
+
+ <bind pointcut="execution(!static * *->@org.jboss.aspects.asynch.Asynchronous(..))">
+ <advice name="execute" aspect="org.jboss.aspects.asynch.AsynchAspect"/>
+ </bind>
+
+ <introduction expr="has(!static * *->@org.jboss.aspects.asynch.Asynchronous(..))">
+ <mixin>
+ <interfaces>org.jboss.aspects.asynch.AsynchProvider,org.jboss.aspects.asynch.FutureHolder</interfaces>
+ <class>org.jboss.aspects.asynch.AsynchMixin</class>
+ </mixin>
+ </introduction>
+
+ <!-- old asynch aspect from Claude -->
+
+ <aspect class="org.jboss.aspects.asynchronous.aspects.jboss.AsynchronousAspect" scope="PER_VM"/>
+
+ <bind pointcut="execution(* *->@org.jboss.aspects.asynchronous.aspects.jboss.Asynchronous(..))">
+ <advice name="execute" aspect="org.jboss.aspects.asynchronous.aspects.jboss.AsynchronousAspect"/>
+ </bind>
+
+ <introduction
+ expr="has(* *->@org.jboss.aspects.asynchronous.aspects.jboss.Asynchronous(..)) OR class(@org.jboss.aspects.asynchronous.aspects.jboss.Asynchronous)">
+
+ <mixin>
+ <interfaces>
+ org.jboss.aspects.asynchronous.aspects.AsynchronousFacade
+ </interfaces>
+ <class>org.jboss.aspects.asynchronous.aspects.AsynchronousFacadeImpl</class>
+ <construction>new org.jboss.aspects.asynchronous.aspects.AsynchronousFacadeImpl()</construction>
+ </mixin>
+ </introduction>
+
+ <!-- TRANSACTIONS -->
+ <interceptor class="org.jboss.aspects.tx.TxPropagationInterceptor" scope="PER_VM"/>
+ <interceptor factory="org.jboss.aspects.tx.TxInterceptorFactory" scope="PER_CLASS_JOINPOINT"/>
+
+ <bind pointcut="all(@transaction)">
+ <interceptor-ref name="org.jboss.aspects.tx.TxInterceptorFactory"/>
+ </bind>
+
+ <interceptor name="class-txsynchronized" factory="org.jboss.aspects.txlock.TxLockInterceptorFactory"
+ scope="PER_CLASS"/>
+ <interceptor name="instance-txsynchronized" factory="org.jboss.aspects.txlock.TxLockInterceptorFactory"
+ scope="PER_INSTANCE"/>
+
+ <bind pointcut="execution(static * *->@TxSynchronized(..)) OR execution(*->@TxSynchronized(..))">
+ <interceptor-ref name="class-txsynchronized"/>
+ </bind>
+
+ <bind pointcut="execution(!static * *->@TxSynchronized(..))">
+ <interceptor-ref name="instance-txsynchronized"/>
+ </bind>
+
+ <bind pointcut="all(@org.jboss.aspects.tx.Tx)">
+ <interceptor-ref name="org.jboss.aspects.tx.TxInterceptorFactory"/>
+ </bind>
+
+ <bind
+ pointcut="execution(static * *->@org.jboss.aspects.txlock.TxSynchronized(..)) OR execution(*->@org.jboss.aspects.txlock.TxSynchronized(..))">
+ <interceptor-ref name="class-txsynchronized"/>
+ </bind>
+
+ <bind pointcut="execution(!static * *->@org.jboss.aspects.txlock.TxSynchronized(..))">
+ <interceptor-ref name="instance-txsynchronized"/>
+ </bind>
+
+ <!-- injection -->
+ <aspect class="org.jboss.aspects.tx.TransactionInjector"/>
+ <aspect class="org.jboss.aspects.tx.TransactionManagerInjector"/>
+
+ <bind pointcut="field(javax.transaction.Transaction *->@org.jboss.aspects.Current)">
+ <advice name="access" aspect="org.jboss.aspects.tx.TransactionInjector"/>
+ </bind>
+
+ <bind pointcut="field(javax.transaction.TransactionManager *->@org.jboss.aspects.Injected)">
+ <advice name="access" aspect="org.jboss.aspects.tx.TransactionManagerInjector"/>
+ </bind>
+
+ <bind
+ pointcut="execution(*->new(..)) AND hasfield(javax.transaction.TransactionManager *->@org.jboss.aspects.Injected)">
+ <advice name="allocation" aspect="org.jboss.aspects.tx.TransactionManagerInjector"/>
+ </bind>
+
+ <!-- special types -->
+ <aspect class="org.jboss.aspects.ThreadbasedAspect" scope="PER_JOINPOINT"/>
+ <bind pointcut="field(* *->@org.jboss.aspects.Threadbased)">
+ <advice name="access" aspect="org.jboss.aspects.ThreadbasedAspect"/>
+ </bind>
+
+ <aspect class="org.jboss.aspects.tx.TransactionLocalAspect" scope="PER_JOINPOINT"/>
+ <bind pointcut="field(* *->@org.jboss.aspects.tx.TxLocal)">
+ <advice name="access" aspect="org.jboss.aspects.tx.TransactionLocalAspect"/>
+ </bind>
+
+</aop>
Property changes on: branches/JBoss_Portal_AS5_Deployer/wsrp/src/etc/jboss-aop/base-aop.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-dependency.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-dependency.xml (rev 0)
+++ branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-dependency.xml 2009-03-10 21:15:36 UTC (rev 13013)
@@ -0,0 +1,6 @@
+<!-- this should be removed when the jboss-service.xml is updated to a -beans.xml file -->
+<!-- this file only exists right now because the jboss-service.xml dependency management is lacking -->
+<dependency xmlns="urn:jboss:dependency:1.0">
+ <item whenRequired="Real" dependentState="Create">jboss-portal-sar</item>
+</dependency>
+
Modified: branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar/conf/hibernate/consumer/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar/conf/hibernate/consumer/hibernate.cfg.xml 2009-03-10 21:08:55 UTC (rev 13012)
+++ branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar/conf/hibernate/consumer/hibernate.cfg.xml 2009-03-10 21:15:36 UTC (rev 13013)
@@ -28,8 +28,8 @@
<session-factory>
<property name="connection.datasource">java:@portal.datasource.name@</property>
<property name="show_sql">@portal.sql.show@</property>
- <property name="cache.use_second_level_cache">true</property>
- <property name="cache.use_query_cache">true</property>
+ <property name="cache.use_second_level_cache">false</property>
+ <property name="cache.use_query_cache">false</property>
<!--
| Uncomment in clustered mode : use transactional replicated cache
@@ -55,4 +55,4 @@
<!-- Mapping files -->
<mapping resource="conf/hibernate/consumer/domain.hbm.xml"/>
</session-factory>
-</hibernate-configuration>
\ No newline at end of file
+</hibernate-configuration>
Modified: branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar/wsrp-aop.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar/wsrp-aop.xml 2009-03-10 21:08:55 UTC (rev 13012)
+++ branches/JBoss_Portal_AS5_Deployer/wsrp/src/resources/portal-wsrp-sar/wsrp-aop.xml 2009-03-10 21:15:36 UTC (rev 13013)
@@ -42,38 +42,4 @@
<trans-attribute>Required</trans-attribute>
</method>
</metadata>
-
- <!-- TRANSACTIONS -->
- <interceptor class="org.jboss.aspects.tx.TxPropagationInterceptor" scope="PER_VM"/>
- <interceptor factory="org.jboss.aspects.tx.TxInterceptorFactory" scope="PER_CLASS_JOINPOINT"/>
-
- <bind pointcut="all(@transaction)">
- <interceptor-ref name="org.jboss.aspects.tx.TxInterceptorFactory"/>
- </bind>
-
- <interceptor name="class-txsynchronized" factory="org.jboss.aspects.txlock.TxLockInterceptorFactory"
- scope="PER_CLASS"/>
- <interceptor name="instance-txsynchronized" factory="org.jboss.aspects.txlock.TxLockInterceptorFactory"
- scope="PER_INSTANCE"/>
-
- <bind pointcut="execution(static * *->@TxSynchronized(..)) OR execution(*->@TxSynchronized(..))">
- <interceptor-ref name="class-txsynchronized"/>
- </bind>
-
- <bind pointcut="execution(!static * *->@TxSynchronized(..))">
- <interceptor-ref name="instance-txsynchronized"/>
- </bind>
-
- <bind pointcut="all(@org.jboss.aspects.tx.Tx)">
- <interceptor-ref name="org.jboss.aspects.tx.TxInterceptorFactory"/>
- </bind>
-
- <bind
- pointcut="execution(static * *->@org.jboss.aspects.txlock.TxSynchronized(..)) OR execution(*->@org.jboss.aspects.txlock.TxSynchronized(..))">
- <interceptor-ref name="class-txsynchronized"/>
- </bind>
-
- <bind pointcut="execution(!static * *->@org.jboss.aspects.txlock.TxSynchronized(..))">
- <interceptor-ref name="instance-txsynchronized"/>
- </bind>
</aop>
More information about the portal-commits
mailing list