[portal-commits] JBoss Portal SVN: r13006 - in branches/JBoss_Portal_AS5_Deployer/core/src: main/org/jboss/portal/core/servlet/jsp and 3 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Tue Mar 10 01:31:07 EDT 2009
Author: mwringe
Date: 2009-03-10 01:31:06 -0400 (Tue, 10 Mar 2009)
New Revision: 13006
Modified:
branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentImpl.java
branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/PortletDeploymentImpl.java
branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java
branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/test/core/OutELTestCase.java
branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml
branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/portal-aop.xml
Log:
Update PortalJSP to properly initialize the jsp.
Temporality remove second level cache from hibernate.
Enable transactions in the portal-aop.xml since they are no longer enable by default in AS5.
Modified: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentImpl.java
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentImpl.java 2009-03-09 22:47:19 UTC (rev 13005)
+++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentImpl.java 2009-03-10 05:31:06 UTC (rev 13006)
@@ -121,11 +121,9 @@
public void deployObjects(PortalObjectMetaData portalObjectMetaData, ClassLoader webappClassLoader)
throws DeploymentException
{
- System.out.println("OBJECTDEPLOYMENTIMPL DEPLOY : " + portalObjectMetaData);
try{
for (PortalObjectDeploymentMetaData objectDeploymentMetaData : portalObjectMetaData.getDeployments())
{
- System.out.println("GETCONTEXT : " + objectDeploymentMetaData.getContext());
if (objectDeploymentMetaData.getContext() != null)
{
createPortalObject(objectDeploymentMetaData, webappClassLoader);
@@ -167,8 +165,6 @@
public void createPortalObject(PortalObjectDeploymentMetaData portalObjectMetaData, ClassLoader webappClassLoader)
throws Exception
{
- System.out.println ("CREATEPORTALOBJECT");
-
ContextMetaData contextMetaData = portalObjectMetaData.getContext();
PortalMetaData portalMetaData = portalObjectMetaData.getPortal();
PageMetaData pageMetaData = portalObjectMetaData.getPage();
@@ -194,7 +190,6 @@
}
String parentRef = portalObjectMetaData.getParentRef();
- System.out.println("PARENTREF : \'" + parentRef + "\' : " + (parentRef == null) + " : " + portalObjectMetaData + " : " + contextMetaData + " : " + portalMetaData + " : " + pageMetaData + " : " + windowMetaData );
PortalObjectId parentId = (parentRef == null) ? null : PortalObjectId.parse(parentRef,
PortalObjectPath.LEGACY_FORMAT);
if (parentId != null)
@@ -243,8 +238,6 @@
IllegalCoordinationException
{
PortalObject portalObject;
-
- System.out.println("COMMONPORTALOBJECT " + commonPortalObject);
if (commonPortalObject instanceof ContextMetaData)
{
@@ -268,8 +261,6 @@
}
configure(commonPortalObject, portalObject, webappClassLoader);
-
- System.out.println("COMMON PORTAL OBJECT : " + commonPortalObject);
if (commonPortalObject.getChildren() != null)
{
@@ -322,7 +313,6 @@
public PortalObject createPortalObject(PortalMetaData portalMetaData, PortalObject parent)
throws IllegalArgumentException, DuplicatePortalObjectException
{
- System.out.println("PARENT IS " + parent);
if (!(parent instanceof PortalContainer))
{
throw new IllegalArgumentException("Not a context");
@@ -390,8 +380,6 @@
{
// Configure properties
- System.out.println("COMMONPORTALOBJECT : " + commonPortalObject.getName());
-
if (commonPortalObject.getProperties() != null && commonPortalObject.getProperties().getProperties() != null)
{
List<PropertyMetaData> propertyMetaData = commonPortalObject.getProperties().getProperties();
@@ -454,7 +442,6 @@
if (commonPortalObject.getSecurityConstraint() != null)
{
- System.out.println("GOT SECURITY CONSTRAINTS : " + commonPortalObject.getSecurityConstraint().getPolicyPermission().size());
for (int i = 0; i < commonPortalObject.getSecurityConstraint().getPolicyPermission().size(); i++)
{
PolicyPermissionMetaData policyPermissionMetaData = commonPortalObject.getSecurityConstraint()
@@ -505,15 +492,6 @@
+ "configuration but it is not taken in account, portlet instance configuration should be done rather");
}
}
-
- System.out.println("SECURITY BINDINGS : " + securityBindings);
- if (securityBindings != null)
- {
- for (RoleSecurityBinding rsb : securityBindings)
- {
- System.out.println("RSB : " + rsb.getRoleName() + " : " + rsb.getActionsAsString());
- }
- }
//
if (securityBindings != null)
Modified: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/PortletDeploymentImpl.java
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/PortletDeploymentImpl.java 2009-03-09 22:47:19 UTC (rev 13005)
+++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/PortletDeploymentImpl.java 2009-03-10 05:31:06 UTC (rev 13006)
@@ -91,22 +91,17 @@
JBossPortletAppMetaData jbossPortletAppMetaData, PortletApplication10MetaData portletAppMetaData)
throws DeploymentException
{
- System.out.println("DEPLOY PORTLETS");
PortalWebApplication portalWebApp = new PortalWebApplication(servletContext, url, classloader, contextPath);
deployPortlets(portalWebApp, jbossPortletAppMetaData, portletAppMetaData);
}
public void deployPortlets(PortalWebApp pwa, JBossPortletAppMetaData jbossAppMD, PortletApplication10MetaData portletAppMD)
{
- System.out.println("DEPLOY PORTLETS PWA");
InfoBuilder infoBuilder = coreInfoBuilderFactory.createInfoBuilder(pwa, jbossAppMD, portletAppMD);
infoBuilder.build();
- System.out.println("GETAPPLICATION : " + infoBuilder.getApplication().getId());
PortletApplicationObject portletApplicationObject = new PortletApplicationImpl(infoBuilder.getApplication());
PortletApplicationContext portletApplicationContext = new PortletApplicationContextImpl(pwa);
-
- System.out.println("INFOBUILDER : " + infoBuilder.getPortlets() + " : " + infoBuilder.getPortlets().size());
//
PortletApplicationLifeCycle portletApplicationLifeCycle = new PortletApplicationLifeCycle(bridgeToInvoker, portletApplicationContext,
@@ -122,13 +117,11 @@
//
portletApplicationLifeCycle.addPortletFilter(portletFilterContext, portletFilterObject);
- System.out.println("ADDING FILTERINFO : " + portletFilterContext + " : " + portletFilterObject);
}
//
for (PortletInfo portletInfo : infoBuilder.getPortlets())
{
- System.out.println("PORTLETINFO : " + portletInfo);
ContainerPortletInfo cpi = (ContainerPortletInfo) portletInfo;
PortletContainerObject portletContainerObject = new PortletContainerImpl(cpi);
PortletContainerContext portletContainerContext = new PortletContainerContextImpl();
Modified: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java 2009-03-09 22:47:19 UTC (rev 13005)
+++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java 2009-03-10 05:31:06 UTC (rev 13006)
@@ -71,6 +71,8 @@
abstract public void _jspService(HttpServletRequest arg0, HttpServletResponse arg1) throws ServletException,
IOException;
+ abstract public void _jspInit();
+
/**
* HttpJspPage implementation
*
@@ -98,6 +100,7 @@
{
this.config = config;
jspInit();
+ _jspInit();
}
/**
Modified: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/test/core/OutELTestCase.java
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/test/core/OutELTestCase.java 2009-03-09 22:47:19 UTC (rev 13005)
+++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/test/core/OutELTestCase.java 2009-03-10 05:31:06 UTC (rev 13006)
@@ -55,6 +55,12 @@
{
assertEquals("value", PortalLib.out("key"));
}
+
+ @Override
+ public void _jspInit()
+ {
+ //
+ }
};
Context ctx = new DelegateContext();
Modified: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml 2009-03-09 22:47:19 UTC (rev 13005)
+++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml 2009-03-10 05:31:06 UTC (rev 13006)
@@ -15,10 +15,10 @@
<property name="hibernate.use_sql_comments">true</property>
<!-- caching properties -->
- <!-- todo: renable second level cache
- <property name="cache.use_second_level_cache">true</property>
- <property name="cache.use_query_cache">true</property>
- <property name="cache.provider_configuration_file_resource_path">conf/hibernate/workflow/ehcache.xml</property>
+ <!-- todo: renable second level cache -->
+ <property name="cache.use_second_level_cache">false</property>
+ <property name="cache.use_query_cache">false</property>
+<!-- <property name="cache.provider_configuration_file_resource_path">conf/hibernate/workflow/ehcache.xml</property>
<property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property> -->
<!-- managed environment transaction configuration -->
Modified: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/portal-aop.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/portal-aop.xml 2009-03-09 22:47:19 UTC (rev 13005)
+++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/portal-aop.xml 2009-03-10 05:31:06 UTC (rev 13006)
@@ -122,4 +122,15 @@
<application-exceptions>org.jboss.portal.portlet.InvalidPortletIdException</application-exceptions>
</method>
</metadata>
+
+ <!-- enable aop transactions -->
+ <interceptor factory="org.jboss.aspects.tx.TxInterceptorFactory" scope="PER_CLASS_JOINPOINT"/>
+ <bind pointcut="all(@transaction)">
+ <interceptor-ref name="org.jboss.aspects.tx.TxInterceptorFactory"/>
+ </bind>
+ <bind pointcut="all(@org.jboss.aspects.tx.Tx)">
+ <interceptor-ref name="org.jboss.aspects.tx.TxInterceptorFactory"/>
+ </bind>
+ <!-- -->
+
</aop>
More information about the portal-commits
mailing list