From do-not-reply at jboss.org Sun Aug 30 17:21:00 2009
Content-Type: multipart/mixed; boundary="===============1600219311049208089=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: gatein-commits at lists.jboss.org
Subject: [gatein-commits] gatein SVN: r134 - in components/pc/trunk:
 portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168 and 1 other
 directories.
Date: Sun, 30 Aug 2009 17:20:59 -0400
Message-ID: <200908302120.n7ULKxR4006904@svn01.web.mwc.hst.phx2.redhat.com>

--===============1600219311049208089==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien_viet
Date: 2009-08-30 17:20:59 -0400 (Sun, 30 Aug 2009)
New Revision: 134

Modified:
   components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplication=
Deployer.java
   components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr=
168/ContainerInfoBuilderContextImpl.java
   components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/met=
adata/PortletApplication10MetaData.java
Log:
GTNPC-6 : Add resource bundle factory plugin via portlet application metada=
ta mechanism

Modified: components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletAppl=
icationDeployer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicatio=
nDeployer.java	2009-08-30 12:32:29 UTC (rev 133)
+++ components/pc/trunk/mc/src/main/java/org/gatein/pc/mc/PortletApplicatio=
nDeployer.java	2009-08-30 21:20:59 UTC (rev 134)
@@ -268,7 +268,7 @@
       broadcaster =3D null;
    }
 =

-   private PortletApplication10MetaData buildPortletApplicationMetaData(We=
bApp webApp)
+   protected PortletApplication10MetaData buildPortletApplicationMetaData(=
WebApp webApp)
    {
       try
       {

Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/i=
mpl/jsr168/ContainerInfoBuilderContextImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/js=
r168/ContainerInfoBuilderContextImpl.java	2009-08-30 12:32:29 UTC (rev 133)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/js=
r168/ContainerInfoBuilderContextImpl.java	2009-08-30 21:20:59 UTC (rev 134)
@@ -33,6 +33,7 @@
 =

 import java.util.Map;
 import java.util.HashMap;
+import java.lang.reflect.Constructor;
 =

 /**
  * @author <a href=3D"mailto:julien(a)jboss.org">Julien Viet</a>
@@ -85,8 +86,33 @@
       ResourceBundleManager bundleMgr =3D portletBundleMgrs.get(portletMD.=
getPortletName());
       if (bundleMgr =3D=3D null)
       {
-         String baseName =3D portletMD.getResourceBundle();
-         ResourceBundleFactory rbf =3D new SimpleResourceBundleFactory(web=
App.getClassLoader(), baseName);
+         ResourceBundleFactory rbf =3D null;
+         String rbfName =3D metaData.getResourceBundleFactoryName();
+         if (rbfName !=3D null)
+         {
+            try
+            {
+               Class<?> tmpClass =3D webApp.getClassLoader().loadClass(rbf=
Name);
+               if (ResourceBundleFactory.class.isAssignableFrom(tmpClass))
+               {
+                  Class<? extends ResourceBundleFactory> rbfClass =3D tmpC=
lass.asSubclass(ResourceBundleFactory.class);
+                  Constructor<? extends ResourceBundleFactory> rbfCtor =3D=
 rbfClass.getConstructor(ClassLoader.class, String.class);
+                  rbf =3D rbfCtor.newInstance(webApp.getClassLoader(), por=
tletMD.getResourceBundle());
+               }
+            }
+            catch (Exception e)
+            {
+               // Need to log
+            }
+         }
+
+         //
+         if (rbf =3D=3D null)
+         {
+            rbf =3D new SimpleResourceBundleFactory(webApp.getClassLoader(=
), portletMD.getResourceBundle());
+         }
+
+         //
          bundleMgr =3D new ResourceBundleManager(null, rbf);
          portletBundleMgrs.put(portletMD.getPortletName(), bundleMgr);
       }

Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/i=
mpl/metadata/PortletApplication10MetaData.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/me=
tadata/PortletApplication10MetaData.java	2009-08-30 12:32:29 UTC (rev 133)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/me=
tadata/PortletApplication10MetaData.java	2009-08-30 21:20:59 UTC (rev 134)
@@ -75,6 +75,9 @@
    /** The security constraints */
    private List<SecurityConstraintMetaData> securityConstraints;
 =

+   /** The resource bundle factory class name. */
+   private String resourceBundleFactoryName;
+
    @XmlAttribute(name =3D "id")
    public String getId()
    {
@@ -217,4 +220,14 @@
       }
       this.securityConstraints.add(securityConstraint);
    }
+
+   public String getResourceBundleFactoryName()
+   {
+      return resourceBundleFactoryName;
+   }
+
+   public void setResourceBundleFactoryName(String resourceBundleFactoryNa=
me)
+   {
+      this.resourceBundleFactoryName =3D resourceBundleFactoryName;
+   }
 }


--===============1600219311049208089==--