Author: fhanik Date: Tue Apr 21 17:03:12 2009 New Revision: 767223 URL: http://svn.apache.org/viewvc?rev=767223&view=rev Log: Allow the factory attribute on the ResourceLink element. Make sure that ResourceBase properties are transferred to the ResourceLinkRef
Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java tomcat/trunk/java/org/apache/catalina/deploy/ContextResourceLink.java Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=767223&r1=767222&r2=767223&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Tue Apr 21 17:03:12 2009 @@ -1063,7 +1063,16 @@ // Create a reference to the resource. Reference ref = new ResourceLinkRef - (resourceLink.getType(), resourceLink.getGlobal()); + (resourceLink.getType(), resourceLink.getGlobal(), resourceLink.getFactory(), null); + Iterator i = resourceLink.listProperties(); + while (i.hasNext()) { + String key = i.next().toString(); + Object val = resourceLink.getProperty(key); + if (val!=null) { + StringRefAddr refAddr = new StringRefAddr(key, val.toString()); + ref.add(refAddr); + } + } javax.naming.Context ctx = "UserTransaction".equals(resourceLink.getName()) ? compCtx : envCtx; Modified: tomcat/trunk/java/org/apache/catalina/deploy/ContextResourceLink.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ContextResourceLink.java?rev=767223&r1=767222&r2=767223&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/deploy/ContextResourceLink.java (original) +++ tomcat/trunk/java/org/apache/catalina/deploy/ContextResourceLink.java Tue Apr 21 17:03:12 2009 @@ -40,6 +40,10 @@ * The global name of this resource. */ private String global = null; + /** + * The factory to be used for creating the object + */ + private String factory = null; public String getGlobal() { return (this.global); @@ -49,7 +53,13 @@ this.global = global; } + public String getFactory() { + return factory; + } + public void setFactory(String factory) { + this.factory = factory; + } // --------------------------------------------------------- Public Methods --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org