You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ak...@apache.org on 2006/12/12 16:42:04 UTC
svn commit: r486195 - in /geronimo/server/trunk/modules:
geronimo-client/src/main/java/org/apache/geronimo/client/
geronimo-connector/src/main/java/org/apache/geronimo/connector/
geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ ...
Author: akulshreshtha
Date: Tue Dec 12 07:42:02 2006
New Revision: 486195
URL: http://svn.apache.org/viewvc?view=rev&rev=486195
Log:
GERONIMO-2607 reverted 485524
Modified:
geronimo/server/trunk/modules/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapperGBean.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/AdminObjectWrapperGBean.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterWrapperGBean.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperGBean.java
geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java
geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xml/LocalEntityResolver.java
geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xml/ParserFactoryImpl.java
geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyContainerImpl.java
geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/IMAPStoreGBean.java
geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/MailGBean.java
geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPStoreGBean.java
geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPTransportGBean.java
geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/POP3StoreGBean.java
geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/ProtocolGBean.java
geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPSTransportGBean.java
geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPTransportGBean.java
geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java
geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java
geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/server/JaasLoginService.java
geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java
geronimo/server/trunk/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/MockGBean.java
geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ConnectorGBean.java
geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/EngineGBean.java
geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/HostGBean.java
geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ManagerGBean.java
geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/RealmGBean.java
geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ValveGBean.java
geronimo/server/trunk/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/UpgradeGBean.java
geronimo/server/trunk/modules/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/jaxr/JAXRGBean.java
Modified: geronimo/server/trunk/modules/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java (original)
+++ geronimo/server/trunk/modules/geronimo-client/src/main/java/org/apache/geronimo/client/AppClientContainer.java Tue Dec 12 07:42:02 2006
@@ -174,7 +174,7 @@
static {
GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(AppClientContainer.class, NameFactory.APP_CLIENT);
- infoFactory.addOperation("main", new Class[]{String[].class}, "void");
+ infoFactory.addOperation("main", new Class[]{String[].class});
infoFactory.addAttribute("mainClassName", String.class, true);
infoFactory.addAttribute("appClientModuleName", AbstractName.class, true);
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapperGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapperGBean.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapperGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapperGBean.java Tue Dec 12 07:42:02 2006
@@ -92,8 +92,8 @@
infoBuilder.addReference("ResourceAdapterWrapper", ResourceAdapterWrapper.class, NameFactory.RESOURCE_ADAPTER);
- infoBuilder.addOperation("activate", new Class[]{MessageEndpointFactory.class}, "void");
- infoBuilder.addOperation("deactivate", new Class[]{MessageEndpointFactory.class}, "void");
+ infoBuilder.addOperation("activate", new Class[]{MessageEndpointFactory.class});
+ infoBuilder.addOperation("deactivate", new Class[]{MessageEndpointFactory.class});
infoBuilder.addInterface(ResourceManager.class);
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/AdminObjectWrapperGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/AdminObjectWrapperGBean.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/AdminObjectWrapperGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/AdminObjectWrapperGBean.java Tue Dec 12 07:42:02 2006
@@ -41,7 +41,7 @@
infoBuilder.addAttribute("objectName", String.class, false);
infoBuilder.addAttribute("classLoader", ClassLoader.class, false);
- infoBuilder.addOperation("$getResource", "java.lang.Object");
+ infoBuilder.addOperation("$getResource");
infoBuilder.addInterface(JCAAdminObject.class);
infoBuilder.setConstructor(new String[]{
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterWrapperGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterWrapperGBean.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterWrapperGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/ResourceAdapterWrapperGBean.java Tue Dec 12 07:42:02 2006
@@ -91,7 +91,7 @@
infoBuilder.addReference("WorkManager", WorkManager.class, NameFactory.JCA_WORK_MANAGER);
infoBuilder.addReference("XATerminator", XATerminator.class, NameFactory.JCA_WORK_MANAGER);
- infoBuilder.addOperation("registerResourceAdapterAssociation", new Class[]{ResourceAdapterAssociation.class}, "void");
+ infoBuilder.addOperation("registerResourceAdapterAssociation", new Class[]{ResourceAdapterAssociation.class});
infoBuilder.addInterface(ResourceAdapter.class);
infoBuilder.addInterface(JCAResourceAdapter.class);
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperGBean.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperGBean.java Tue Dec 12 07:42:02 2006
@@ -47,9 +47,9 @@
infoFactory.addAttribute("objectName", String.class, false);
infoFactory.addAttribute("classLoader", ClassLoader.class, false);
- infoFactory.addOperation("$getResource", "java.lang.Object");
- infoFactory.addOperation("$getConnectionFactory", "java.lang.Object");
- infoFactory.addOperation("$getManagedConnectionFactory", "ManagedConnectionFactory");
+ infoFactory.addOperation("$getResource");
+ infoFactory.addOperation("$getConnectionFactory");
+ infoFactory.addOperation("$getManagedConnectionFactory");
infoFactory.addInterface(ResourceManager.class);
infoFactory.addInterface(JCAManagedConnectionFactory.class);
Modified: geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java (original)
+++ geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/Deployer.java Tue Dec 12 07:42:02 2006
@@ -475,8 +475,8 @@
infoFactory.addAttribute("kernel", Kernel.class, false);
infoFactory.addAttribute("remoteDeployUploadURL", String.class, false);
infoFactory.addOperation("deploy", new Class[]{boolean.class, File.class, File.class});
- infoFactory.addOperation("deploy", new Class[]{boolean.class, File.class, File.class, String.class}, "java.util.List");
- infoFactory.addOperation("deploy", new Class[]{boolean.class, File.class, File.class, File.class, boolean.class, String.class, String.class, String.class, String.class, String.class, String.class, String.class, String.class}, "java.util.List");
+ infoFactory.addOperation("deploy", new Class[]{boolean.class, File.class, File.class, String.class});
+ infoFactory.addOperation("deploy", new Class[]{boolean.class, File.class, File.class, File.class, boolean.class, String.class, String.class, String.class, String.class, String.class, String.class, String.class, String.class});
infoFactory.addReference("Builders", ConfigurationBuilder.class, "ConfigBuilder");
infoFactory.addReference("Store", ConfigurationStore.class, "ConfigurationStore");
Modified: geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xml/LocalEntityResolver.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xml/LocalEntityResolver.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xml/LocalEntityResolver.java (original)
+++ geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xml/LocalEntityResolver.java Tue Dec 12 07:42:02 2006
@@ -402,9 +402,9 @@
infoFactory.addAttribute("localRepositoryURI", URI.class, true);
infoFactory.addAttribute("failOnUnresolvable", boolean.class, true);
- infoFactory.addOperation("resolveEntity", new Class[]{String.class, String.class}, "org.xml.sax.InputSource");
- infoFactory.addOperation("addPublicMapping", new Class[]{String.class, String.class}, "void");
- infoFactory.addOperation("addSystemMapping", new Class[]{String.class, String.class}, "void");
+ infoFactory.addOperation("resolveEntity", new Class[]{String.class, String.class});
+ infoFactory.addOperation("addPublicMapping", new Class[]{String.class, String.class});
+ infoFactory.addOperation("addSystemMapping", new Class[]{String.class, String.class});
infoFactory.setConstructor(new String[]{"catalogFileURI", "localRepositoryURI", "failOnUnresolvable"});
Modified: geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xml/ParserFactoryImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xml/ParserFactoryImpl.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xml/ParserFactoryImpl.java (original)
+++ geronimo/server/trunk/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xml/ParserFactoryImpl.java Tue Dec 12 07:42:02 2006
@@ -92,7 +92,7 @@
static {
GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Factory for constructing suitable configured xml parsers", ParserFactoryImpl.class);
- infoFactory.addOperation("getParser", "javax.xml.parsers.DocumentBuilder");
+ infoFactory.addOperation("getParser");
infoFactory.addReference("EntityResolver", EntityResolver.class, "GBean");
Modified: geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyContainerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyContainerImpl.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyContainerImpl.java (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyContainerImpl.java Tue Dec 12 07:42:02 2006
@@ -262,16 +262,16 @@
GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic("Jetty Web Container", JettyContainerImpl.class);
infoBuilder.addAttribute("collectStatistics", Boolean.TYPE, true);
infoBuilder.addAttribute("collectStatisticsStarted", Long.TYPE, false);
- infoBuilder.addOperation("resetStatistics", "void");
+ infoBuilder.addOperation("resetStatistics");
infoBuilder.addAttribute("requestLog", RequestLog.class, false, false);
- infoBuilder.addOperation("addListener", new Class[]{Connector.class}, "void");
- infoBuilder.addOperation("removeListener", new Class[]{Connector.class}, "void");
- infoBuilder.addOperation("addContext", new Class[]{ContextHandler.class}, "void");
- infoBuilder.addOperation("removeContext", new Class[]{ContextHandler.class}, "void");
- infoBuilder.addOperation("addRealm", new Class[]{String.class}, "void");
- infoBuilder.addOperation("removeRealm", new Class[]{String.class}, "void");
+ infoBuilder.addOperation("addListener", new Class[]{Connector.class});
+ infoBuilder.addOperation("removeListener", new Class[]{Connector.class});
+ infoBuilder.addOperation("addContext", new Class[]{ContextHandler.class});
+ infoBuilder.addOperation("removeContext", new Class[]{ContextHandler.class});
+ infoBuilder.addOperation("addRealm", new Class[]{String.class});
+ infoBuilder.addOperation("removeRealm", new Class[]{String.class});
infoBuilder.addAttribute("objectName", String.class, false);
infoBuilder.addReference("WebManager", WebManager.class);
Modified: geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/IMAPStoreGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/IMAPStoreGBean.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/IMAPStoreGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/IMAPStoreGBean.java Tue Dec 12 07:42:02 2006
@@ -835,7 +835,7 @@
infoFactory.addAttribute(GBEAN_PROPERTIES, Properties.class, true);
infoFactory.addAttribute(GBEAN_HOST, String.class, true);
infoFactory.addAttribute(GBEAN_USER, String.class, true);
- infoFactory.addOperation(GBEAN_ADD_OVERRIDES, new Class[]{Properties.class}, "void");
+ infoFactory.addOperation(GBEAN_ADD_OVERRIDES, new Class[]{Properties.class});
infoFactory.setConstructor(new String[]{GBEAN_OBJECTNAME, GBEAN_PROPERTIES, GBEAN_HOST, GBEAN_USER,
GBEAN_PORT,
Modified: geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/MailGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/MailGBean.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/MailGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/MailGBean.java Tue Dec 12 07:42:02 2006
@@ -374,8 +374,8 @@
infoFactory.addAttribute("host", String.class, true);
infoFactory.addAttribute("user", String.class, true);
infoFactory.addAttribute("debug", Boolean.class, true);
- infoFactory.addOperation("$getResource", "java.lang.Object");
- infoFactory.addOperation("getProtocols", "java.util.Collection");
+ infoFactory.addOperation("$getResource");
+ infoFactory.addOperation("getProtocols");
infoFactory.addInterface(JavaMailResource.class);
infoFactory.setConstructor(new String[]{"objectName",
Modified: geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPStoreGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPStoreGBean.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPStoreGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPStoreGBean.java Tue Dec 12 07:42:02 2006
@@ -362,7 +362,7 @@
infoFactory.addAttribute(GBEAN_PROPERTIES, Properties.class, true);
infoFactory.addAttribute(GBEAN_HOST, String.class, true);
infoFactory.addAttribute(GBEAN_USER, String.class, true);
- infoFactory.addOperation(GBEAN_ADD_OVERRIDES, new Class[]{Properties.class}, "void");
+ infoFactory.addOperation(GBEAN_ADD_OVERRIDES, new Class[]{Properties.class});
infoFactory.setConstructor(new String[]{GBEAN_OBJECTNAME, GBEAN_PROPERTIES, GBEAN_HOST, GBEAN_USER,
GBEAN_PORT,
Modified: geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPTransportGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPTransportGBean.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPTransportGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/NNTPTransportGBean.java Tue Dec 12 07:42:02 2006
@@ -389,7 +389,7 @@
infoFactory.addAttribute(GBEAN_PROPERTIES, Properties.class, true);
infoFactory.addAttribute(GBEAN_HOST, String.class, true);
infoFactory.addAttribute(GBEAN_USER, String.class, true);
- infoFactory.addOperation(GBEAN_ADD_OVERRIDES, new Class[]{Properties.class}, "void");
+ infoFactory.addOperation(GBEAN_ADD_OVERRIDES, new Class[]{Properties.class});
infoFactory.setConstructor(new String[]{GBEAN_OBJECTNAME, GBEAN_PROPERTIES, GBEAN_HOST, GBEAN_USER,
GBEAN_PORT,
Modified: geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/POP3StoreGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/POP3StoreGBean.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/POP3StoreGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/POP3StoreGBean.java Tue Dec 12 07:42:02 2006
@@ -463,7 +463,7 @@
infoFactory.addAttribute(GBEAN_PROPERTIES, Properties.class, true);
infoFactory.addAttribute(GBEAN_HOST, String.class, true);
infoFactory.addAttribute(GBEAN_USER, String.class, true);
- infoFactory.addOperation(GBEAN_ADD_OVERRIDES, new Class[]{Properties.class}, "void");
+ infoFactory.addOperation(GBEAN_ADD_OVERRIDES, new Class[]{Properties.class});
infoFactory.setConstructor(new String[]{GBEAN_OBJECTNAME, GBEAN_PROPERTIES, GBEAN_HOST, GBEAN_USER,
GBEAN_PORT,
Modified: geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/ProtocolGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/ProtocolGBean.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/ProtocolGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/ProtocolGBean.java Tue Dec 12 07:42:02 2006
@@ -205,7 +205,7 @@
infoFactory.addAttribute(GBEAN_PROPERTIES, Properties.class, true);
infoFactory.addAttribute(GBEAN_HOST, String.class, true);
infoFactory.addAttribute(GBEAN_USER, String.class, true);
- infoFactory.addOperation(GBEAN_ADD_OVERRIDES, new Class[]{Properties.class}, "void");
+ infoFactory.addOperation(GBEAN_ADD_OVERRIDES, new Class[]{Properties.class});
infoFactory.setConstructor(new String[]{GBEAN_OBJECTNAME, GBEAN_PROTOCOL, GBEAN_PROPERTIES, GBEAN_HOST, GBEAN_USER});
Modified: geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPSTransportGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPSTransportGBean.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPSTransportGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPSTransportGBean.java Tue Dec 12 07:42:02 2006
@@ -837,7 +837,7 @@
infoFactory.addAttribute(GBEAN_PROPERTIES, Properties.class, true);
infoFactory.addAttribute(GBEAN_HOST, String.class, true);
infoFactory.addAttribute(GBEAN_USER, String.class, true);
- infoFactory.addOperation(GBEAN_ADD_OVERRIDES, new Class[]{Properties.class}, "void");
+ infoFactory.addOperation(GBEAN_ADD_OVERRIDES, new Class[]{Properties.class});
infoFactory.setConstructor(new String[]{GBEAN_OBJECTNAME, GBEAN_PROPERTIES, GBEAN_HOST, GBEAN_USER,
GBEAN_PORT,
Modified: geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPTransportGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPTransportGBean.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPTransportGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPTransportGBean.java Tue Dec 12 07:42:02 2006
@@ -838,7 +838,7 @@
infoFactory.addAttribute(GBEAN_PROPERTIES, Properties.class, true);
infoFactory.addAttribute(GBEAN_HOST, String.class, true);
infoFactory.addAttribute(GBEAN_USER, String.class, true);
- infoFactory.addOperation(GBEAN_ADD_OVERRIDES, new Class[]{Properties.class}, "void");
+ infoFactory.addOperation(GBEAN_ADD_OVERRIDES, new Class[]{Properties.class});
infoFactory.setConstructor(new String[]{GBEAN_OBJECTNAME, GBEAN_PROPERTIES, GBEAN_HOST, GBEAN_USER,
GBEAN_PORT,
Modified: geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/PersistenceUnitGBean.java Tue Dec 12 07:42:02 2006
@@ -287,8 +287,8 @@
infoBuilder.addReference("TransactionManager", TransactionManagerImpl.class, NameFactory.TRANSACTION_MANAGER);
infoBuilder.addReference("JtaDataSourceWrapper", ConnectionFactorySource.class, NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
infoBuilder.addReference("NonJtaDataSourceWrapper", ConnectionFactorySource.class, NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
- infoBuilder.addOperation("getEntityManagerFactory", "javax.persistence.EntityManagerFactory");
- infoBuilder.addOperation("getEntityManager", new Class[] {boolean.class, Map.class}, "javax.persistence.EntityManager");
+ infoBuilder.addOperation("getEntityManagerFactory");
+ infoBuilder.addOperation("getEntityManager", new Class[] {boolean.class, Map.class});
infoBuilder.setConstructor(new String[] {
"persistenceUnitName",
Modified: geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java (original)
+++ geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java Tue Dec 12 07:42:02 2006
@@ -136,7 +136,7 @@
infoBuilder.addReference("LoginModule", LoginModuleSettings.class, NameFactory.LOGIN_MODULE);
infoBuilder.addReference("Next", JaasLoginModuleUse.class);
- infoBuilder.addOperation("configure", new Class[]{Set.class, List.class, Kernel.class, ServerInfo.class, ClassLoader.class}, "void");
+ infoBuilder.addOperation("configure", new Class[]{Set.class, List.class, Kernel.class, ServerInfo.class, ClassLoader.class});
infoBuilder.addInterface(JaasLoginModuleChain.class);
infoBuilder.setConstructor(new String[]{"LoginModule", "Next", "controlFlag", "kernel"});
GBEAN_INFO = infoBuilder.getBeanInfo();
Modified: geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/server/JaasLoginService.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/server/JaasLoginService.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/server/JaasLoginService.java (original)
+++ geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/server/JaasLoginService.java Tue Dec 12 07:42:02 2006
@@ -445,16 +445,16 @@
infoFactory.addAttribute("expiredLoginScanIntervalMillis", int.class, true);
infoFactory.addAttribute("objectName", String.class, false);
- infoFactory.addOperation("connectToRealm", new Class[]{String.class}, "JaasSessionId");
- infoFactory.addOperation("getLoginConfiguration", new Class[]{JaasSessionId.class}, "[LJaasLoginModuleConfiguration");
- infoFactory.addOperation("getServerLoginCallbacks", new Class[]{JaasSessionId.class, int.class}, "[LCallbacks");
- infoFactory.addOperation("performLogin", new Class[]{JaasSessionId.class, int.class, Callback[].class}, "boolean");
- infoFactory.addOperation("performCommit", new Class[]{JaasSessionId.class, int.class}, "boolean");
- infoFactory.addOperation("loginSucceeded", new Class[]{JaasSessionId.class}, "Principal");
- infoFactory.addOperation("loginFailed", new Class[]{JaasSessionId.class}, "void");
- infoFactory.addOperation("logout", new Class[]{JaasSessionId.class}, "void");
- infoFactory.addOperation("syncShareState", new Class[]{JaasSessionId.class, Map.class}, "Map");
- infoFactory.addOperation("syncPrincipals", new Class[]{JaasSessionId.class, Set.class}, "Set");
+ infoFactory.addOperation("connectToRealm", new Class[]{String.class});
+ infoFactory.addOperation("getLoginConfiguration", new Class[]{JaasSessionId.class});
+ infoFactory.addOperation("getServerLoginCallbacks", new Class[]{JaasSessionId.class, int.class});
+ infoFactory.addOperation("performLogin", new Class[]{JaasSessionId.class, int.class, Callback[].class});
+ infoFactory.addOperation("performCommit", new Class[]{JaasSessionId.class, int.class});
+ infoFactory.addOperation("loginSucceeded", new Class[]{JaasSessionId.class});
+ infoFactory.addOperation("loginFailed", new Class[]{JaasSessionId.class});
+ infoFactory.addOperation("logout", new Class[]{JaasSessionId.class});
+ infoFactory.addOperation("syncShareState", new Class[]{JaasSessionId.class, Map.class});
+ infoFactory.addOperation("syncPrincipals", new Class[]{JaasSessionId.class, Set.class});
infoFactory.addReference("Realms", SecurityRealm.class, NameFactory.SECURITY_REALM);
infoFactory.addInterface(JaasLoginServiceMBean.class);
Modified: geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java (original)
+++ geronimo/server/trunk/modules/geronimo-security/src/main/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java Tue Dec 12 07:42:02 2006
@@ -194,7 +194,7 @@
infoFactory.addReference("ServerInfo", ServerInfo.class, NameFactory.GERONIMO_SERVICE);
infoFactory.addReference("LoginService", JaasLoginServiceMBean.class, "JaasLoginService");
- infoFactory.addOperation("getAppConfigurationEntries", new Class[0], "[LJaasLoginModuleConfiguration");
+ infoFactory.addOperation("getAppConfigurationEntries", new Class[0]);
infoFactory.setConstructor(new String[]{"realmName",
"LoginModuleConfiguration",
Modified: geronimo/server/trunk/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/MockGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/MockGBean.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/MockGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/MockGBean.java Tue Dec 12 07:42:02 2006
@@ -95,8 +95,8 @@
infoFactory.addAttribute("intValue", int.class, true);
infoFactory.addAttribute("fooBarBean", FooBarBean.class, true);
- infoFactory.addOperation("checkEndpoint", "java.lang.String");
- infoFactory.addOperation("doSomething", new Class[]{String.class}, "java.lang.String");
+ infoFactory.addOperation("checkEndpoint");
+ infoFactory.addOperation("doSomething", new Class[]{String.class});
infoFactory.addReference("MockEndpoint", MockEndpoint.class, null);
Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ConnectorGBean.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ConnectorGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ConnectorGBean.java Tue Dec 12 07:42:02 2006
@@ -571,7 +571,7 @@
infoFactory.addAttribute("name", String.class, true);
infoFactory.addAttribute("protocol", String.class, true);
infoFactory.addReference(CONNECTOR_CONTAINER_REFERENCE, TomcatContainer.class, NameFactory.GERONIMO_SERVICE);
- infoFactory.addOperation("getInternalObject", "java.lang.Object");
+ infoFactory.addOperation("getInternalObject");
infoFactory.addInterface(TomcatWebConnector.class,
new String[]{
"host",
Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/EngineGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/EngineGBean.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/EngineGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/EngineGBean.java Tue Dec 12 07:42:02 2006
@@ -190,7 +190,7 @@
infoFactory.addReference("TomcatValveChain", ValveGBean.class, ValveGBean.J2EE_TYPE);
// infoFactory.addReference("CatalinaCluster", CatalinaClusterGBean.class, CatalinaClusterGBean.J2EE_TYPE);
infoFactory.addReference("Manager", ManagerGBean.class, ManagerGBean.J2EE_TYPE);
- infoFactory.addOperation("getInternalObject", "java.lang.Object");
+ infoFactory.addOperation("getInternalObject");
infoFactory.setConstructor(new String[] {
"className",
"initParams",
Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/HostGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/HostGBean.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/HostGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/HostGBean.java Tue Dec 12 07:42:02 2006
@@ -141,7 +141,7 @@
infoFactory.addReference("TomcatValveChain", ValveGBean.class, ValveGBean.J2EE_TYPE);
// infoFactory.addReference("CatalinaCluster", CatalinaClusterGBean.class, CatalinaClusterGBean.J2EE_TYPE);
infoFactory.addReference("Manager", ManagerGBean.class, ManagerGBean.J2EE_TYPE);
- infoFactory.addOperation("getInternalObject", "java.lang.Object");
+ infoFactory.addOperation("getInternalObject");
infoFactory.setConstructor(new String[] {
"className",
"initParams",
Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ManagerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ManagerGBean.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ManagerGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ManagerGBean.java Tue Dec 12 07:42:02 2006
@@ -74,7 +74,7 @@
GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("TomcatManager", ManagerGBean.class, J2EE_TYPE);
infoFactory.addAttribute("className", String.class, true);
infoFactory.addAttribute("initParams", Map.class, true);
- infoFactory.addOperation("getInternalObject", "java.lang.Object");
+ infoFactory.addOperation("getInternalObject");
infoFactory.setConstructor(new String[] {
"className",
"initParams"});
Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/RealmGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/RealmGBean.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/RealmGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/RealmGBean.java Tue Dec 12 07:42:02 2006
@@ -58,7 +58,7 @@
infoFactory.addAttribute("className", String.class, true);
infoFactory.addAttribute("initParams", Map.class, true);
- infoFactory.addOperation("getInternalObject", "java.lang.Object");
+ infoFactory.addOperation("getInternalObject");
infoFactory.setConstructor(new String[] { "className", "initParams" });
GBEAN_INFO = infoFactory.getBeanInfo();
}
Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java Tue Dec 12 07:42:02 2006
@@ -402,11 +402,11 @@
infoFactory.addReference("ServerInfo", ServerInfo.class, "GBean");
infoFactory.addReference("WebManager", WebManager.class);
- infoFactory.addOperation("addContext", new Class[]{TomcatContext.class}, "void");
- infoFactory.addOperation("removeContext", new Class[]{TomcatContext.class}, "void");
+ infoFactory.addOperation("addContext", new Class[]{TomcatContext.class});
+ infoFactory.addOperation("removeContext", new Class[]{TomcatContext.class});
- infoFactory.addOperation("addConnector", new Class[]{Connector.class}, "void");
- infoFactory.addOperation("removeConnector", new Class[]{Connector.class}, "void");
+ infoFactory.addOperation("addConnector", new Class[]{Connector.class});
+ infoFactory.addOperation("removeConnector", new Class[]{Connector.class});
infoFactory.addInterface(SoapHandler.class);
infoFactory.addInterface(TomcatWebContainer.class);
Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ValveGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ValveGBean.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ValveGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ValveGBean.java Tue Dec 12 07:42:02 2006
@@ -99,7 +99,7 @@
infoFactory.addAttribute("initParams", Map.class, true);
infoFactory.addReference("NextValve", ValveGBean.class, J2EE_TYPE);
infoFactory.addOperation("getInternalObject");
- infoFactory.addOperation("getNextValve", "java.lang.Object");
+ infoFactory.addOperation("getNextValve");
infoFactory.setConstructor(new String[] { "className", "initParams", "NextValve" });
GBEAN_INFO = infoFactory.getBeanInfo();
}
Modified: geronimo/server/trunk/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/UpgradeGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/UpgradeGBean.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/UpgradeGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-upgrade/src/main/java/org/apache/geronimo/upgrade/UpgradeGBean.java Tue Dec 12 07:42:02 2006
@@ -71,8 +71,8 @@
static {
GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(UpgradeGBean.class);
- infoBuilder.addOperation("execute", new Class[] {String[].class}, "void");
- infoBuilder.addOperation("execute", new Class[] {String.class, String.class}, "void");
+ infoBuilder.addOperation("execute", new Class[] {String[].class});
+ infoBuilder.addOperation("execute", new Class[] {String.class, String.class});
GBEAN_INFO = infoBuilder.getBeanInfo();
}
Modified: geronimo/server/trunk/modules/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/jaxr/JAXRGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/jaxr/JAXRGBean.java?view=diff&rev=486195&r1=486194&r2=486195
==============================================================================
--- geronimo/server/trunk/modules/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/jaxr/JAXRGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/jaxr/JAXRGBean.java Tue Dec 12 07:42:02 2006
@@ -75,7 +75,7 @@
infoFactory.addAttribute("connectionFactoryClass", String.class, true, true);
infoFactory.addAttribute("classLoader", ClassLoader.class, false);
- infoFactory.addOperation("$getResource", "java.lang.Object");
+ infoFactory.addOperation("$getResource");
infoFactory.setConstructor(new String[] {"connectionFactoryClass", "classLoader"});