You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2006/05/13 08:08:10 UTC
svn commit: r406019 - in /geronimo/branches/1.1/modules:
connector/src/java/org/apache/geronimo/connector/outbound/
jetty/src/java/org/apache/geronimo/jetty/connector/
security/src/java/org/apache/geronimo/security/jaas/
tomcat/src/java/org/apache/gero...
Author: ammulder
Date: Fri May 12 23:08:10 2006
New Revision: 406019
URL: http://svn.apache.org/viewcvs?rev=406019&view=rev
Log:
Make sure we can save values editable in the console (GERONIMO-1889)
Modified:
geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java
geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java
geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleGBean.java
geronimo/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/ConnectorGBean.java
Modified: geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java?rev=406019&r1=406018&r2=406019&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java (original)
+++ geronimo/branches/1.1/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java Fri May 12 23:08:10 2006
@@ -16,6 +16,7 @@
*/
package org.apache.geronimo.connector.outbound;
+import javax.resource.spi.ConnectionManager;
import org.apache.geronimo.connector.outbound.connectionmanagerconfig.PoolingSupport;
import org.apache.geronimo.connector.outbound.connectionmanagerconfig.TransactionSupport;
import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTracker;
@@ -24,15 +25,18 @@
import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.transaction.context.TransactionContextManager;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.proxy.ProxyManager;
/**
* @version $Revision$
*/
public class GenericConnectionManagerGBean extends GenericConnectionManager implements GBeanLifecycle {
-
+ private final Kernel kernel;
public GenericConnectionManagerGBean() {
super();
+ kernel = null;
}
public GenericConnectionManagerGBean(TransactionSupport transactionSupport,
@@ -41,8 +45,20 @@
ConnectionTracker connectionTracker,
TransactionContextManager transactionContextManager,
String objectName,
- ClassLoader classLoader) {
+ ClassLoader classLoader,
+ Kernel kernel) {
super(transactionSupport, pooling, containerManagedSecurity, connectionTracker, transactionContextManager, objectName, classLoader);
+ this.kernel = kernel;
+ }
+
+ public ConnectionManager getConnectionManager() {
+ ConnectionManager unproxied = super.getConnectionManager();
+ ProxyManager pm = kernel.getProxyManager();
+ if(pm.isProxy(unproxied)) {
+ return unproxied;
+ } else {
+ return (ConnectionManager) pm.createProxy(kernel.getAbstractNameFor(unproxied), unproxied.getClass().getClassLoader());
+ }
}
public static final GBeanInfo GBEAN_INFO;
@@ -56,6 +72,7 @@
infoBuilder.addAttribute("objectName", String.class, false);
infoBuilder.addAttribute("classLoader", ClassLoader.class, false);
+ infoBuilder.addAttribute("kernel", Kernel.class, false);
infoBuilder.addReference("ConnectionTracker", ConnectionTracker.class, NameFactory.JCA_CONNECTION_TRACKER);
infoBuilder.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.TRANSACTION_CONTEXT_MANAGER);
@@ -68,7 +85,8 @@
"ConnectionTracker",
"TransactionContextManager",
"objectName",
- "classLoader"
+ "classLoader",
+ "kernel"
});
GBEAN_INFO = infoBuilder.getBeanInfo();
Modified: geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java?rev=406019&r1=406018&r2=406019&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java (original)
+++ geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java Fri May 12 23:08:10 2006
@@ -264,7 +264,7 @@
GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Jetty HTTP Connector", JettyConnector.class);
infoFactory.addReference(CONNECTOR_CONTAINER_REFERENCE, JettyContainer.class, NameFactory.GERONIMO_SERVICE);
infoFactory.addInterface(JettyWebConnector.class, new String[]{"host", "port", "minThreads","maxThreads","bufferSizeBytes","acceptQueueSize","lingerMillis","tcpNoDelay","redirectPort","connectUrl","maxIdleTimeMs","lowThreads","lowThreadsMaxIdleTimeMs",},
- new String[]{"host", "port", "redirectPort"});
+ new String[]{"host", "port", "redirectPort", "maxThreads", "minThreads"});
infoFactory.setConstructor(new String[] {"JettyContainer"});
GBEAN_INFO = infoFactory.getBeanInfo();
}
Modified: geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleGBean.java?rev=406019&r1=406018&r2=406019&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleGBean.java (original)
+++ geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/LoginModuleGBean.java Fri May 12 23:08:10 2006
@@ -102,7 +102,8 @@
static {
GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(LoginModuleGBean.class, NameFactory.LOGIN_MODULE);
infoFactory.addAttribute("classLoader", ClassLoader.class, false);
- infoFactory.addInterface(LoginModuleSettings.class, new String[] {"options", "loginModuleClass", "serverSide", "loginDomainName", "wrapPrincipals"});
+ infoFactory.addInterface(LoginModuleSettings.class, new String[] {"options", "loginModuleClass", "serverSide", "loginDomainName", "wrapPrincipals"},
+ new String[] {"options", "loginModuleClass", "serverSide", "wrapPrincipals"} );
infoFactory.setConstructor(new String[]{"loginModuleClass", "objectName", "serverSide", "wrapPrincipals", "classLoader"});
GBEAN_INFO = infoFactory.getBeanInfo();
Modified: geronimo/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/ConnectorGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/ConnectorGBean.java?rev=406019&r1=406018&r2=406019&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/ConnectorGBean.java (original)
+++ geronimo/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/ConnectorGBean.java Fri May 12 23:08:10 2006
@@ -466,7 +466,7 @@
infoFactory.addReference(CONNECTOR_CONTAINER_REFERENCE, TomcatContainer.class, NameFactory.GERONIMO_SERVICE);
infoFactory.addOperation("getInternalObject");
infoFactory.addInterface(TomcatWebConnector.class, new String[]{"host","port","bufferSizeBytes","maxThreads","acceptQueueSize","lingerMillis","tcpNoDelay","redirectPort","minSpareThreads","maxSpareThreads","maxHttpHeaderSizeBytes","hostLookupEnabled","connectionTimeoutMillis","uploadTimeoutEnabled","connectUrl","maxPostSize","maxSavePostSize","emptySessionPath", "maxKeepAliveRequests", "socketBuffer", "useBodyEncodingForURI"},
- new String[]{"host","port","redirectPort"});
+ new String[]{"host","port","redirectPort","maxThreads"});
infoFactory.setConstructor(new String[] { "name", "protocol", "host", "port", "TomcatContainer"});
GBEAN_INFO = infoFactory.getBeanInfo();
}