You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2006/03/09 03:35:13 UTC
svn commit: r384406 - in /geronimo/branches/1.1/modules:
connector/src/test/org/apache/geronimo/connector/outbound/
j2ee/src/test/org/apache/geronimo/j2ee/management/
naming/src/test/org/apache/geronimo/naming/java/
security-builder/src/java/org/apache...
Author: djencks
Date: Wed Mar 8 18:35:05 2006
New Revision: 384406
URL: http://svn.apache.org/viewcvs?rev=384406&view=rev
Log:
Make some more modules compile
Modified:
geronimo/branches/1.1/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java
geronimo/branches/1.1/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/Abstract77Test.java
geronimo/branches/1.1/modules/naming/src/test/org/apache/geronimo/naming/java/ContextBuilderTest.java
geronimo/branches/1.1/modules/security-builder/src/java/org/apache/geronimo/security/deployment/LoginConfigBuilder.java
geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/AbstractTest.java
geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/LoginKerberosNonGeronimoTest.java
geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/LoginKerberosTest.java
geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java
geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java
geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java
geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java
geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationDump.java
Modified: geronimo/branches/1.1/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java?rev=384406&r1=384405&r2=384406&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java (original)
+++ geronimo/branches/1.1/modules/connector/src/test/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java Wed Mar 8 18:35:05 2006
@@ -17,17 +17,6 @@
package org.apache.geronimo.connector.outbound;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.util.Map;
-import java.util.HashMap;
-import javax.management.MalformedObjectNameException;
-import javax.resource.cci.Connection;
-import javax.resource.cci.ConnectionFactory;
-
import junit.framework.TestCase;
import org.apache.geronimo.connector.mock.ConnectionFactoryExtension;
import org.apache.geronimo.connector.mock.MockConnection;
@@ -36,11 +25,10 @@
import org.apache.geronimo.connector.outbound.connectionmanagerconfig.NoPool;
import org.apache.geronimo.connector.outbound.connectionmanagerconfig.NoTransactions;
import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTracker;
+import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
@@ -48,6 +36,17 @@
import org.apache.geronimo.kernel.KernelFactory;
import org.apache.geronimo.kernel.repository.Artifact;
+import javax.management.MalformedObjectNameException;
+import javax.resource.cci.Connection;
+import javax.resource.cci.ConnectionFactory;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* @version $Rev$ $Date$
*/
@@ -121,7 +120,7 @@
cmfName = cmf.getAbstractName();
cmf.setAttribute("transactionSupport", NoTransactions.INSTANCE);
cmf.setAttribute("pooling", new NoPool());
- cmf.setReferencePattern("ConnectionTracker", new AbstractNameQuery(ctcName));
+ cmf.setReferencePattern("ConnectionTracker", ctcName);
kernel.loadGBean(cmf, cl);
@@ -134,7 +133,7 @@
mcfw.setAttribute("connectionInterface", Connection.class.getName());
mcfw.setAttribute("connectionImplClass", MockConnection.class.getName());
//"ResourceAdapterWrapper",
- mcfw.setReferencePattern("ConnectionManagerContainer", new AbstractNameQuery(cmfName));
+ mcfw.setReferencePattern("ConnectionManagerContainer", cmfName);
//"ManagedConnectionFactoryListener",
kernel.loadGBean(mcfw, cl);
Modified: geronimo/branches/1.1/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/Abstract77Test.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/Abstract77Test.java?rev=384406&r1=384405&r2=384406&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/Abstract77Test.java (original)
+++ geronimo/branches/1.1/modules/j2ee/src/test/org/apache/geronimo/j2ee/management/Abstract77Test.java Wed Mar 8 18:35:05 2006
@@ -82,7 +82,7 @@
kernel.loadGBean(DOMAIN_DATA, classLoader);
- SERVER_DATA.setReferencePatterns("ServerInfo", Collections.singleton(new AbstractNameQuery(SERVER_INFO_DATA.getAbstractName())));
+ SERVER_DATA.setReferencePattern("ServerInfo", SERVER_INFO_DATA.getAbstractName());
kernel.loadGBean(SERVER_DATA, classLoader);
Modified: geronimo/branches/1.1/modules/naming/src/test/org/apache/geronimo/naming/java/ContextBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/naming/src/test/org/apache/geronimo/naming/java/ContextBuilderTest.java?rev=384406&r1=384405&r2=384406&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/naming/src/test/org/apache/geronimo/naming/java/ContextBuilderTest.java (original)
+++ geronimo/branches/1.1/modules/naming/src/test/org/apache/geronimo/naming/java/ContextBuilderTest.java Wed Mar 8 18:35:05 2006
@@ -97,7 +97,7 @@
try {
assertEquals(kernel, KernelRegistry.getKernel("test.kernel"));
ObjectName proxyFactoryName = null;//referenceFactory.createAdminObjectObjectName("testAdminObject");
- GBeanData gbean = new GBeanData(proxyFactoryName, getGbeanInfo());
+ GBeanData gbean = null;//new GBeanData(proxyFactoryName, getGbeanInfo());
gbean.setAttribute("Content", proxy);
kernel.loadGBean(gbean, Class.forName(gbean.getGBeanInfo().getClassName()).getClassLoader());
kernel.startGBean(proxyFactoryName);
Modified: geronimo/branches/1.1/modules/security-builder/src/java/org/apache/geronimo/security/deployment/LoginConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/security-builder/src/java/org/apache/geronimo/security/deployment/LoginConfigBuilder.java?rev=384406&r1=384405&r2=384406&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security-builder/src/java/org/apache/geronimo/security/deployment/LoginConfigBuilder.java (original)
+++ geronimo/branches/1.1/modules/security-builder/src/java/org/apache/geronimo/security/deployment/LoginConfigBuilder.java Wed Mar 8 18:35:05 2006
@@ -157,7 +157,7 @@
loginModuleGBeanData.setAttribute("loginDomainName", name);
loginModuleGBeanData.setAttribute("loginModuleClass", className);
loginModuleGBeanData.setAttribute("options", options);
- loginModuleGBeanData.setAttribute("serverSide", new Boolean(serverSide));
+ loginModuleGBeanData.setAttribute("serverSide", Boolean.valueOf(serverSide));
loginModuleGBeanData.setAttribute("wrapPrincipals", Boolean.valueOf(wrapPrincipals));
context.addGBean(loginModuleGBeanData);
Modified: geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/AbstractTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/AbstractTest.java?rev=384406&r1=384405&r2=384406&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/AbstractTest.java (original)
+++ geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/AbstractTest.java Wed Mar 8 18:35:05 2006
@@ -106,14 +106,14 @@
gbean = buildGBeanData("name", "TestLoginModuleUse", JaasLoginModuleUse.getGBeanInfo());
AbstractName testUseName = gbean.getAbstractName();
gbean.setAttribute("controlFlag", "REQUIRED");
- gbean.setReferencePattern("LoginModule", new AbstractNameQuery(testLoginModule));
+ gbean.setReferencePattern("LoginModule", testLoginModule);
kernel.loadGBean(gbean, JaasLoginModuleUse.class.getClassLoader());
gbean = buildGBeanData("name", "SecurityRealm" + REALM_NAME, GenericSecurityRealm.getGBeanInfo());
testRealm = gbean.getAbstractName();
gbean.setAttribute("realmName", REALM_NAME);
- gbean.setReferencePattern("LoginModuleConfiguration", new AbstractNameQuery(testUseName));
- gbean.setReferencePattern("LoginService", new AbstractNameQuery(loginService));
+ gbean.setReferencePattern("LoginModuleConfiguration", testUseName);
+ gbean.setReferencePattern("LoginService", loginService);
kernel.loadGBean(gbean, GenericSecurityRealm.class.getClassLoader());
gbean = buildGBeanData("name", "JaasLoginServiceRemotingServer", JaasLoginServiceRemotingServer.getGBeanInfo());
@@ -121,7 +121,7 @@
gbean.setAttribute("protocol", "tcp");
gbean.setAttribute("host", "0.0.0.0");
gbean.setAttribute("port", new Integer(4242));
- gbean.setReferencePattern("LoginService", new AbstractNameQuery(loginService));
+ gbean.setReferencePattern("LoginService", loginService);
kernel.loadGBean(gbean, JaasLoginServiceRemotingServer.class.getClassLoader());
kernel.startGBean(loginService);
Modified: geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java?rev=384406&r1=384405&r2=384406&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java (original)
+++ geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java Wed Mar 8 18:35:05 2006
@@ -164,7 +164,7 @@
clientCE = gbean.getAbstractName();
gbean.setAttribute("applicationConfigName", "properties-client");
gbean.setAttribute("realmName", "properties-realm");
- gbean.setReferencePattern("LoginService", new AbstractNameQuery(loginService));
+ gbean.setReferencePattern("LoginService", loginService);
kernel.loadGBean(gbean, ServerRealmConfigurationEntry.class.getClassLoader());
gbean = buildGBeanData("name", "PropertiesLoginModule", LoginModuleGBean.getGBeanInfo());
@@ -198,29 +198,29 @@
gbean = buildGBeanData("name", "UPCredLoginModuleUse", JaasLoginModuleUse.getGBeanInfo());
AbstractName testUseName3 = gbean.getAbstractName();
gbean.setAttribute("controlFlag", "REQUIRED");
- gbean.setReferencePattern("LoginModule", new AbstractNameQuery(testUPCred));
+ gbean.setReferencePattern("LoginModule", testUPCred);
kernel.loadGBean(gbean, JaasLoginModuleUse.class.getClassLoader());
gbean = buildGBeanData("name", "AuditLoginModuleUse", JaasLoginModuleUse.getGBeanInfo());
AbstractName testUseName2 = gbean.getAbstractName();
gbean.setAttribute("controlFlag", "REQUIRED");
- gbean.setReferencePattern("LoginModule", new AbstractNameQuery(testCE));
- gbean.setReferencePattern("Next", new AbstractNameQuery(testUseName3));
+ gbean.setReferencePattern("LoginModule", testCE);
+ gbean.setReferencePattern("Next", testUseName3);
kernel.loadGBean(gbean, JaasLoginModuleUse.class.getClassLoader());
gbean = buildGBeanData("name", "PropertiesLoginModuleUse", JaasLoginModuleUse.getGBeanInfo());
AbstractName testUseName1 = gbean.getAbstractName();
gbean.setAttribute("controlFlag", "REQUIRED");
- gbean.setReferencePattern("LoginModule", new AbstractNameQuery(testProperties));
- gbean.setReferencePattern("Next", new AbstractNameQuery(testUseName2));
+ gbean.setReferencePattern("LoginModule", testProperties);
+ gbean.setReferencePattern("Next", testUseName2);
kernel.loadGBean(gbean, JaasLoginModuleUse.class.getClassLoader());
gbean = buildGBeanData("name", "PropertiesSecurityRealm", GenericSecurityRealm.getGBeanInfo());
testRealm = gbean.getAbstractName();
gbean.setAttribute("realmName", "properties-realm");
- gbean.setReferencePattern("LoginModuleConfiguration", new AbstractNameQuery(testUseName1));
- gbean.setReferencePattern("ServerInfo", new AbstractNameQuery(serverInfo));
- gbean.setReferencePattern("LoginService", new AbstractNameQuery(loginService));
+ gbean.setReferencePattern("LoginModuleConfiguration", testUseName1);
+ gbean.setReferencePattern("ServerInfo", serverInfo);
+ gbean.setReferencePattern("LoginService", loginService);
kernel.loadGBean(gbean, GenericSecurityRealm.class.getClassLoader());
gbean = buildGBeanData("name", "JaasLoginServiceRemotingServer", JaasLoginServiceRemotingServer.getGBeanInfo());
@@ -228,7 +228,7 @@
gbean.setAttribute("protocol", "tcp");
gbean.setAttribute("host", "0.0.0.0");
gbean.setAttribute("port", new Integer(4242));
- gbean.setReferencePattern("LoginService", new AbstractNameQuery(loginService));
+ gbean.setReferencePattern("LoginService", loginService);
kernel.loadGBean(gbean, JaasLoginServiceRemotingServer.class.getClassLoader());
kernel.startGBean(loginConfiguration);
Modified: geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/LoginKerberosNonGeronimoTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/LoginKerberosNonGeronimoTest.java?rev=384406&r1=384405&r2=384406&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/LoginKerberosNonGeronimoTest.java (original)
+++ geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/LoginKerberosNonGeronimoTest.java Wed Mar 8 18:35:05 2006
@@ -59,7 +59,7 @@
gbean = buildGBeanData("name", "KerberosLoginModule", LoginModuleGBean.getGBeanInfo());
kerberosLM = gbean.getAbstractName();
gbean.setAttribute("loginModuleClass", "com.sun.security.auth.module.Krb5LoginModule");
- gbean.setAttribute("serverSide", new Boolean(true)); // normally not, but in this case, it's treated as server-side
+ gbean.setAttribute("serverSide", Boolean.TRUE); // normally not, but in this case, it's treated as server-side
Properties props = new Properties();
props.put("debug", "true");
props.put("useTicketCache", "true");
@@ -71,7 +71,7 @@
kerberosCE = gbean.getAbstractName();
gbean.setAttribute("applicationConfigName", "kerberos-foobar");
gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
- gbean.setReferencePattern("Module", new AbstractNameQuery(kerberosLM));
+ gbean.setReferencePattern("Module", kerberosLM);
kernel.loadGBean(gbean, DirectConfigurationEntry.class.getClassLoader());
kernel.startGBean(loginConfiguration);
Modified: geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/LoginKerberosTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/LoginKerberosTest.java?rev=384406&r1=384405&r2=384406&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/LoginKerberosTest.java (original)
+++ geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/LoginKerberosTest.java Wed Mar 8 18:35:05 2006
@@ -17,21 +17,20 @@
package org.apache.geronimo.security.jaas;
-import java.util.Properties;
-import javax.security.auth.Subject;
-import javax.security.auth.kerberos.KerberosPrincipal;
-import javax.security.auth.login.LoginContext;
-import javax.security.auth.login.LoginException;
-
-import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.security.AbstractTest;
import org.apache.geronimo.security.ContextManager;
import org.apache.geronimo.security.IdentificationPrincipal;
import org.apache.geronimo.security.RealmPrincipal;
import org.apache.geronimo.security.realm.GenericSecurityRealm;
+import javax.security.auth.Subject;
+import javax.security.auth.kerberos.KerberosPrincipal;
+import javax.security.auth.login.LoginContext;
+import javax.security.auth.login.LoginException;
+import java.util.Properties;
+
/**
* @version $Rev$ $Date$
@@ -47,7 +46,7 @@
GBeanData gbean = buildGBeanData("name", "KerberosLoginModule", LoginModuleGBean.getGBeanInfo());
kerberosLM = gbean.getAbstractName();
gbean.setAttribute("loginModuleClass", "com.sun.security.auth.module.Krb5LoginModule");
- gbean.setAttribute("serverSide", new Boolean(true)); // normally not, but in this case, it's treated as server-side
+ gbean.setAttribute("serverSide", Boolean.TRUE); // normally not, but in this case, it's treated as server-side
Properties props = new Properties();
props.put("debug", "true");
props.put("useTicketCache", "true");
@@ -58,13 +57,13 @@
gbean = buildGBeanData("name", "KerberosLoginModuleUse", JaasLoginModuleUse.getGBeanInfo());
AbstractName testUseName = gbean.getAbstractName();
gbean.setAttribute("controlFlag", "REQUIRED");
- gbean.setReferencePattern("LoginModule", new AbstractNameQuery(kerberosLM));
+ gbean.setReferencePattern("LoginModule", kerberosLM);
kernel.loadGBean(gbean, JaasLoginModuleUse.class.getClassLoader());
gbean = buildGBeanData("name", "KerberosSecurityRealm", GenericSecurityRealm.getGBeanInfo());
kerberosRealm = gbean.getAbstractName();
gbean.setAttribute("realmName", "TOOLAZYDOGS.COM");
- gbean.setReferencePattern("LoginModuleConfiguration", new AbstractNameQuery(testUseName));
+ gbean.setReferencePattern("LoginModuleConfiguration", testUseName);
kernel.loadGBean(gbean, GenericSecurityRealm.class.getClassLoader());
kernel.startGBean(kerberosLM);
kernel.startGBean(testUseName);
Modified: geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java?rev=384406&r1=384405&r2=384406&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java (original)
+++ geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java Wed Mar 8 18:35:05 2006
@@ -19,7 +19,6 @@
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.security.AbstractTest;
import org.apache.geronimo.security.ContextManager;
import org.apache.geronimo.security.DomainPrincipal;
@@ -67,7 +66,7 @@
gbean.setAttribute("applicationConfigName", "properties-client");
gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
gbean.setAttribute("wrapPrincipals", Boolean.TRUE);
- gbean.setReferencePattern("Module", new AbstractNameQuery(clientLM));
+ gbean.setReferencePattern("Module", clientLM);
kernel.loadGBean(gbean, DirectConfigurationEntry.class.getClassLoader());
gbean = buildGBeanData("name", "PropertiesLoginModule", LoginModuleGBean.getGBeanInfo());
@@ -85,15 +84,15 @@
gbean = buildGBeanData("name", "PropertiesLoginModuleUse", JaasLoginModuleUse.getGBeanInfo());
AbstractName testUseName = gbean.getAbstractName();
gbean.setAttribute("controlFlag", "REQUIRED");
- gbean.setReferencePattern("LoginModule", new AbstractNameQuery(testCE));
+ gbean.setReferencePattern("LoginModule", testCE);
kernel.loadGBean(gbean, JaasLoginModuleUse.class.getClassLoader());
gbean = buildGBeanData("name", "PropertiesSecurityRealm", GenericSecurityRealm.getGBeanInfo());
testRealm = gbean.getAbstractName();
gbean.setAttribute("realmName", "properties-realm");
- gbean.setReferencePattern("LoginModuleConfiguration", new AbstractNameQuery(testUseName));
- gbean.setReferencePattern("ServerInfo", new AbstractNameQuery(serverInfo));
- gbean.setReferencePattern("LoginService", new AbstractNameQuery(loginService));
+ gbean.setReferencePattern("LoginModuleConfiguration", testUseName);
+ gbean.setReferencePattern("ServerInfo", serverInfo);
+ gbean.setReferencePattern("LoginService", loginService);
kernel.loadGBean(gbean, GenericSecurityRealm.class.getClassLoader());
kernel.startGBean(loginConfiguration);
Modified: geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java?rev=384406&r1=384405&r2=384406&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java (original)
+++ geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java Wed Mar 8 18:35:05 2006
@@ -17,17 +17,8 @@
package org.apache.geronimo.security.jaas;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.util.Properties;
-import javax.security.auth.Subject;
-import javax.security.auth.login.LoginContext;
-import javax.security.auth.login.LoginException;
-
-import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.security.AbstractTest;
import org.apache.geronimo.security.ContextManager;
import org.apache.geronimo.security.DomainPrincipal;
@@ -35,6 +26,14 @@
import org.apache.geronimo.security.RealmPrincipal;
import org.apache.geronimo.security.realm.GenericSecurityRealm;
+import javax.security.auth.Subject;
+import javax.security.auth.login.LoginContext;
+import javax.security.auth.login.LoginException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Properties;
+
/**
* @version $Rev$ $Date$
@@ -102,15 +101,15 @@
gbean = buildGBeanData("name", "SQLLoginModuleUse", JaasLoginModuleUse.getGBeanInfo());
AbstractName testUseName = gbean.getAbstractName();
gbean.setAttribute("controlFlag", "REQUIRED");
- gbean.setReferencePattern("LoginModule", new AbstractNameQuery(sqlModule));
+ gbean.setReferencePattern("LoginModule", sqlModule);
kernel.loadGBean(gbean, JaasLoginModuleUse.class.getClassLoader());
kernel.startGBean(testUseName);
gbean = buildGBeanData("name", "SQLSecurityRealm", GenericSecurityRealm.getGBeanInfo());
sqlRealm = gbean.getAbstractName();
gbean.setAttribute("realmName", "sql-realm");
- gbean.setReferencePattern("LoginModuleConfiguration", new AbstractNameQuery(testUseName));
- gbean.setReferencePattern("LoginService", new AbstractNameQuery(loginService));
+ gbean.setReferencePattern("LoginModuleConfiguration", testUseName);
+ gbean.setReferencePattern("LoginService", loginService);
kernel.loadGBean(gbean, GenericSecurityRealm.class.getClassLoader());
kernel.startGBean(sqlRealm);
Modified: geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java?rev=384406&r1=384405&r2=384406&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java (original)
+++ geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java Wed Mar 8 18:35:05 2006
@@ -19,7 +19,6 @@
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.security.AbstractTest;
import org.apache.geronimo.security.ContextManager;
import org.apache.geronimo.security.DomainPrincipal;
@@ -69,15 +68,15 @@
gbean = buildGBeanData("name", "PropertiesLoginModuleUse", JaasLoginModuleUse.getGBeanInfo());
AbstractName testUseName = gbean.getAbstractName();
gbean.setAttribute("controlFlag", "REQUIRED");
- gbean.setReferencePattern("LoginModule", new AbstractNameQuery(testCE));
+ gbean.setReferencePattern("LoginModule", testCE);
kernel.loadGBean(gbean, JaasLoginModuleUse.class.getClassLoader());
gbean = buildGBeanData("name", "PropertiesSecurityRealm", GenericSecurityRealm.getGBeanInfo());
testRealm = gbean.getAbstractName();
gbean.setAttribute("realmName", "properties-realm");
- gbean.setReferencePattern("LoginModuleConfiguration", new AbstractNameQuery(testUseName));
- gbean.setReferencePattern("ServerInfo", new AbstractNameQuery(serverInfo));
- gbean.setReferencePattern("LoginService", new AbstractNameQuery(loginService));
+ gbean.setReferencePattern("LoginModuleConfiguration", testUseName);
+ gbean.setReferencePattern("ServerInfo", serverInfo);
+ gbean.setReferencePattern("LoginService", loginService);
kernel.loadGBean(gbean, GenericSecurityRealm.class.getClassLoader());
gbean = buildGBeanData("name", "ClientPropertiesLoginModule", LoginModuleGBean.getGBeanInfo());
@@ -95,7 +94,7 @@
clientCE = gbean.getAbstractName();
gbean.setAttribute("applicationConfigName", "properties-client");
gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
- gbean.setReferencePattern("Module", new AbstractNameQuery(clientLM));
+ gbean.setReferencePattern("Module", clientLM);
kernel.loadGBean(gbean, DirectConfigurationEntry.class.getClassLoader());
kernel.startGBean(loginConfiguration);
Modified: geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java?rev=384406&r1=384405&r2=384406&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java (original)
+++ geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java Wed Mar 8 18:35:05 2006
@@ -34,9 +34,8 @@
import org.activeio.packet.ByteArrayPacket;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.security.AbstractTest;
import org.apache.geronimo.security.jaas.JaasLoginModuleUse;
import org.apache.geronimo.security.jaas.LoginModuleGBean;
@@ -127,14 +126,14 @@
gbean = buildGBeanData("name", "PropertiesLoginModuleUse", JaasLoginModuleUse.getGBeanInfo());
AbstractName testUseName = gbean.getAbstractName();
gbean.setAttribute("controlFlag", "REQUIRED");
- gbean.setReferencePattern("LoginModule", new AbstractNameQuery(testCE));
+ gbean.setReferencePattern("LoginModule", testCE);
kernel.loadGBean(gbean, JaasLoginModuleUse.class.getClassLoader());
gbean = buildGBeanData("name", "PropertiesSecurityRealm", GenericSecurityRealm.getGBeanInfo());
testRealm = gbean.getAbstractName();
gbean.setAttribute("realmName", "properties-realm");
- gbean.setReferencePattern("LoginModuleConfiguration", new AbstractNameQuery(testUseName));
- gbean.setReferencePattern("ServerInfo", new AbstractNameQuery(serverInfo));
+ gbean.setReferencePattern("LoginModuleConfiguration", testUseName);
+ gbean.setReferencePattern("ServerInfo", serverInfo);
kernel.loadGBean(gbean, GenericSecurityRealm.class.getClassLoader());
kernel.startGBean(testCE);
Modified: geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java?rev=384406&r1=384405&r2=384406&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java (original)
+++ geronimo/branches/1.1/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java Wed Mar 8 18:35:05 2006
@@ -127,14 +127,14 @@
gbean = buildGBeanData("name", "PropertiesLoginModuleUse", JaasLoginModuleUse.getGBeanInfo());
AbstractName testUseName = gbean.getAbstractName();
gbean.setAttribute("controlFlag", "REQUIRED");
- gbean.setReferencePattern("LoginModule", new AbstractNameQuery(testCE));
+ gbean.setReferencePattern("LoginModule", testCE);
kernel.loadGBean(gbean, JaasLoginModuleUse.class.getClassLoader());
gbean = buildGBeanData("name", "PropertiesSecurityRealm", GenericSecurityRealm.getGBeanInfo());
testRealm = gbean.getAbstractName();
gbean.setAttribute("realmName", "properties-realm");
- gbean.setReferencePattern("LoginModuleConfiguration", new AbstractNameQuery(testUseName));
- gbean.setReferencePattern("ServerInfo", new AbstractNameQuery(serverInfo));
+ gbean.setReferencePattern("LoginModuleConfiguration", testUseName);
+ gbean.setReferencePattern("ServerInfo", serverInfo);
kernel.loadGBean(gbean, GenericSecurityRealm.class.getClassLoader());
@@ -143,7 +143,7 @@
gbean.setAttribute("protocol", "tcp");
gbean.setAttribute("host", "0.0.0.0");
gbean.setAttribute("port", new Integer(4242));
- gbean.setReferencePattern("LoginService", new AbstractNameQuery(loginService));
+ gbean.setReferencePattern("LoginService", loginService);
kernel.loadGBean(gbean, JaasLoginServiceRemotingServer.class.getClassLoader());
kernel.startGBean(loginService);
@@ -183,7 +183,7 @@
AbstractName dce = gbean.getAbstractName();
gbean.setAttribute("applicationConfigName", "FOO");
gbean.setAttribute("controlFlag", LoginModuleControlFlag.REQUIRED);
- gbean.setReferencePattern("Module", new AbstractNameQuery(jlc));
+ gbean.setReferencePattern("Module", jlc);
kernel.loadGBean(gbean, DirectConfigurationEntry.class.getClassLoader());
kernel.startGBean(dce);
Modified: geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java?rev=384406&r1=384405&r2=384406&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java (original)
+++ geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java Wed Mar 8 18:35:05 2006
@@ -27,11 +27,11 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GReferenceInfo;
import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.xmlbeans.XmlObject;
-import javax.management.ObjectName;
import java.beans.PropertyEditor;
import java.util.HashMap;
import java.util.HashSet;
@@ -51,12 +51,12 @@
private final Map xmlAttributeBuilderMap;
private final Map xmlReferenceBuilderMap;
- GBeanBuilder(ObjectName objectName, GBeanInfo gBeanInfo, ClassLoader classLoader, DeploymentContext context, J2eeContext j2eeContext, Map xmlAttributeBuilderMap, Map xmlReferenceBuilderMap) {
+ GBeanBuilder(AbstractName abstractName, GBeanInfo gBeanInfo, ClassLoader classLoader, DeploymentContext context, J2eeContext j2eeContext, Map xmlAttributeBuilderMap, Map xmlReferenceBuilderMap) {
this.classLoader = classLoader;
this.context = context;
this.j2eeContext = j2eeContext;
- this.gbean = new GBeanData(objectName, gBeanInfo);
+ this.gbean = new GBeanData(abstractName, gBeanInfo);
this.xmlAttributeBuilderMap = xmlAttributeBuilderMap;
this.xmlReferenceBuilderMap = xmlReferenceBuilderMap;
}
Modified: geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java?rev=384406&r1=384405&r2=384406&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java (original)
+++ geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java Wed Mar 8 18:35:05 2006
@@ -34,6 +34,7 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.ReferenceMap;
+import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.kernel.Kernel;
@@ -189,9 +190,11 @@
public static ObjectName addGBeanData(GbeanType gbean, J2eeContext j2eeContext, ClassLoader cl, DeploymentContext context) throws DeploymentException {
GBeanInfo gBeanInfo = GBeanInfo.getGBeanInfo(gbean.getClass1(), cl);
ObjectName objectName;
+ Map nameMap = new HashMap();
if (gbean.isSetGbeanName()) {
try {
objectName = ObjectName.getInstance(gbean.getGbeanName());
+ nameMap.putAll(objectName.getKeyPropertyList());
} catch (MalformedObjectNameException e) {
throw new DeploymentException("Invalid ObjectName: " + gbean.getName(), e);
}
@@ -201,11 +204,14 @@
String j2eeType = gBeanInfo.getJ2eeType();
//todo investigate using the module type from the j2eecontext.
objectName = NameFactory.getComponentName(null, null, null, null, namePart, j2eeType, j2eeContext);
+ nameMap.put("name", namePart);
+ nameMap.put("type", j2eeType);
} catch (MalformedObjectNameException e) {
throw new DeploymentException("Invalid ObjectName: " + namePart, e);
}
}
- GBeanBuilder builder = new GBeanBuilder(objectName, gBeanInfo, cl, context, j2eeContext, xmlAttributeBuilderMap, xmlReferenceBuilderMap);
+ AbstractName abstractName = new AbstractName(context.getConfigID(), nameMap, gBeanInfo.getInterfaces(), objectName);
+ GBeanBuilder builder = new GBeanBuilder(abstractName, gBeanInfo, cl, context, j2eeContext, xmlAttributeBuilderMap, xmlReferenceBuilderMap);
// set up attributes
AttributeType[] attributeArray = gbean.getAttributeArray();
Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationDump.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationDump.java?rev=384406&r1=384405&r2=384406&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationDump.java (original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationDump.java Wed Mar 8 18:35:05 2006
@@ -17,10 +17,9 @@
package org.apache.geronimo.system.configuration;
import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.KernelFactory;
import org.apache.geronimo.kernel.config.Configuration;
@@ -39,12 +38,12 @@
import java.io.PrintWriter;
import java.net.URI;
import java.util.Collection;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.HashMap;
/**
* @version $Rev$ $Date$
@@ -74,7 +73,7 @@
// add the repositories
GBeanData geronimoRepositoryData = buildGBeanData("name", "Repository", Maven2Repository.GBEAN_INFO);
geronimoRepositoryData.setAttribute("root", URI.create("repository"));
- geronimoRepositoryData.setReferencePattern("ServerInfo", new AbstractNameQuery(serverInfoData.getAbstractName()));
+ geronimoRepositoryData.setReferencePattern("ServerInfo", serverInfoData.getAbstractName());
startGBean(kernel, geronimoRepositoryData);
String mavenLocalRepo = System.getProperty("maven.repo.local");
@@ -91,9 +90,9 @@
if (mavenRepositoryDir.isDirectory()) {
GBeanData mavenRepositoryData = buildGBeanData("name", "MavenRepository", Maven2Repository.GBEAN_INFO);
mavenRepositoryData.setAttribute("root", mavenRepositoryDir.getAbsoluteFile().toURI());
- mavenRepositoryData.setReferencePattern("ServerInfo", new AbstractNameQuery(serverInfoData.getAbstractName()));
+ mavenRepositoryData.setReferencePattern("ServerInfo", serverInfoData.getAbstractName());
startGBean(kernel, mavenRepositoryData);
- configStoreData.setReferencePattern("Repository", new AbstractNameQuery(mavenRepositoryData.getAbstractName()));
+ configStoreData.setReferencePattern("Repository", mavenRepositoryData.getAbstractName());
}
startGBean(kernel, configStoreData);