You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by dj...@apache.org on 2009/04/23 00:39:48 UTC
svn commit: r767697 - in /portals/pluto/branches/pluto-1.1.x:
pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/
pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/
Author: djencks
Date: Wed Apr 22 22:39:47 2009
New Revision: 767697
URL: http://svn.apache.org/viewvc?rev=767697&view=rev
Log:
PLUTO-555 a couple of changes to reduce assumptions about classloader structure.
Modified:
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImpl.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/WebAppDescriptorServiceImpl.java
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/ToolTips.java
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImpl.java?rev=767697&r1=767696&r2=767697&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImpl.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImpl.java Wed Apr 22 22:39:47 2009
@@ -98,7 +98,7 @@
"Configuration Error. Resource: "+PORTLET_XML_MAPPING+" not found."
);
}
- Mapping mapping = new Mapping();
+ Mapping mapping = new Mapping(getClass().getClassLoader());
mapping.loadMapping(url);
return mapping;
}
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/WebAppDescriptorServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/WebAppDescriptorServiceImpl.java?rev=767697&r1=767696&r2=767697&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/WebAppDescriptorServiceImpl.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/WebAppDescriptorServiceImpl.java Wed Apr 22 22:39:47 2009
@@ -104,7 +104,7 @@
throw new NullPointerException(
"Configuration Error. Resource: "+WEB_XML_MAPPING+" not found."
);
- Mapping mapping = new Mapping();
+ Mapping mapping = new Mapping(getClass().getClassLoader());
mapping.loadMapping(url);
return mapping;
}
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/ToolTips.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/ToolTips.java?rev=767697&r1=767696&r2=767697&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/ToolTips.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/ToolTips.java Wed Apr 22 22:39:47 2009
@@ -18,6 +18,7 @@
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+import java.util.Locale;
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
@@ -33,7 +34,7 @@
*/
class ToolTips
{
- private static final ResourceBundle BUNDLE = ResourceBundle.getBundle("ToolTips");
+ private static final ResourceBundle BUNDLE = ResourceBundle.getBundle("ToolTips", Locale.US, Thread.currentThread().getContextClassLoader());
private static final Log LOG = LogFactory.getLog(ToolTips.class);
static final ToolTips MAXIMIZE = new ToolTips(BUNDLE.getString("tooltip.windowstate.maximized"));