Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 63707 invoked from network); 9 Feb 2007 19:25:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 9 Feb 2007 19:25:29 -0000 Received: (qmail 57329 invoked by uid 500); 9 Feb 2007 19:25:34 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 57307 invoked by uid 500); 9 Feb 2007 19:25:34 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 57290 invoked by uid 99); 9 Feb 2007 19:25:34 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Feb 2007 11:25:34 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Feb 2007 11:25:21 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 2522A1A981A; Fri, 9 Feb 2007 11:25:01 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r505432 [1/11] - in /geronimo/server/trunk: applications/magicGball/magicGball-ear/src/main/plan/ configs/client-corba-yoko/src/plan/ configs/j2ee-corba-yoko/src/plan/ configs/openejb-corba-deployer/src/plan/ modules/ modules/geronimo-corba... Date: Fri, 09 Feb 2007 19:24:39 -0000 To: scm@geronimo.apache.org From: dain@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070209192501.2522A1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dain Date: Fri Feb 9 11:24:30 2007 New Revision: 505432 URL: http://svn.apache.org/viewvc?view=rev&rev=505432 Log: Ported CORBA implementation from OpenEJB 2 Added: geronimo/server/trunk/modules/geronimo-corba/ - copied from r504981, incubator/openejb/trunk/openejb2/modules/openejb-corba/ geronimo/server/trunk/modules/geronimo-corba-builder/ - copied from r504981, incubator/openejb/trunk/openejb2/modules/openejb-corba-builder/ geronimo/server/trunk/modules/geronimo-corba-builder/LICENSE.txt - copied unchanged from r505429, incubator/openejb/trunk/openejb2/modules/openejb-corba-builder/LICENSE.txt geronimo/server/trunk/modules/geronimo-corba-builder/NOTICE.txt - copied unchanged from r505429, incubator/openejb/trunk/openejb2/modules/openejb-corba-builder/NOTICE.txt geronimo/server/trunk/modules/geronimo-corba-builder/pom.xml - copied, changed from r505429, incubator/openejb/trunk/openejb2/modules/openejb-corba-builder/pom.xml geronimo/server/trunk/modules/geronimo-corba-builder/src/ - copied from r505429, incubator/openejb/trunk/openejb2/modules/openejb-corba-builder/src/ geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/ geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/ geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/ geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaRefBuilder.java (with props) geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java (with props) geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/TSSLinkBuilder.java (with props) geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/security/ geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/security/config/ geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/security/config/css/ geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/security/config/css/CSSConfigEditor.java geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/security/config/tss/ geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSConfigEditor.java geronimo/server/trunk/modules/geronimo-corba-builder/src/main/schema/ geronimo/server/trunk/modules/geronimo-corba-builder/src/main/schema/corba-css-config-2.1.xsd geronimo/server/trunk/modules/geronimo-corba-builder/src/main/schema/corba-tss-config-2.1.xsd geronimo/server/trunk/modules/geronimo-corba-builder/src/main/schema/xmlconfig.xml geronimo/server/trunk/modules/geronimo-corba-builder/src/test/java/org/apache/geronimo/ geronimo/server/trunk/modules/geronimo-corba-builder/src/test/java/org/apache/geronimo/corba/ geronimo/server/trunk/modules/geronimo-corba-builder/src/test/java/org/apache/geronimo/corba/security/ geronimo/server/trunk/modules/geronimo-corba-builder/src/test/java/org/apache/geronimo/corba/security/config/ geronimo/server/trunk/modules/geronimo-corba-builder/src/test/java/org/apache/geronimo/corba/security/config/tss/ geronimo/server/trunk/modules/geronimo-corba-builder/src/test/java/org/apache/geronimo/corba/security/config/tss/TSSConfigEditorTest.java geronimo/server/trunk/modules/geronimo-corba/LICENSE.txt - copied unchanged from r505429, incubator/openejb/trunk/openejb2/modules/openejb-corba/LICENSE.txt geronimo/server/trunk/modules/geronimo-corba/NOTICE.txt - copied unchanged from r505429, incubator/openejb/trunk/openejb2/modules/openejb-corba/NOTICE.txt geronimo/server/trunk/modules/geronimo-corba/pom.xml - copied, changed from r505429, incubator/openejb/trunk/openejb2/modules/openejb-corba/pom.xml geronimo/server/trunk/modules/geronimo-corba/src/ - copied from r505429, incubator/openejb/trunk/openejb2/modules/openejb-corba/src/ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/Adapter.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterDelegate.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterEntity.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterProxyFactory.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterStateful.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterStateless.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterWrapper.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABean.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBABeanGBean.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEJBMemento.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEJBMetaData.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAException.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAHandle.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAHandleDelegate.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAHomeHandle.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CSSBean.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CSSBeanGBean.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaApplicationServer.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/NameService.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/NameServiceGBean.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/ORBConfiguration.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/ORBRef.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/RefGenerator.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/StandardServant.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/TSSBean.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/TSSBeanGBean.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/TSSLink.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/TSSLinkGBean.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/proxy/ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/proxy/CORBAProxyReference.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/ClientPolicy.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/ClientPolicyFactory.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/ClientSecurityInterceptor.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/FinalContextToken.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/IORSecurityInterceptor.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/SASConflictingEvidenceException.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/SASException.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/SASInvalidEvidenceException.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/SASInvalidMechanismException.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/SASNoContextException.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/SASReplyManager.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/SSLConnectionListener.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/SSLConnectionManager.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/SSLSessionManager.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/SecurityInitializer.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/ServerPolicy.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/ServerPolicyFactory.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/ServerSecurityInterceptor.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/SubjectManager.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/ConfigAdapter.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/ConfigAdapterGBean.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/ConfigException.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/ConfigUtil.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSASMechConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSCompoundSecMechConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSCompoundSecMechListConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSGSSUPMechConfigDynamic.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSGSSUPMechConfigStatic.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSNULLASMechConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSNULLTransportConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSSASITTAbsent.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSSASITTAnonymous.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSSASITTPrincipalNameDynamic.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSSASITTPrincipalNameStatic.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSSASIdentityToken.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSSASMechConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSSSLTransportConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSTransportMechConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/ssl/ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/ssl/SSLCipherSuiteDatabase.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/ssl/SSLConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/ssl/SSLConfigGBean.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSASMechConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSCompoundSecMechConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSCompoundSecMechListConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSEntity.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSGSSExportedNameConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSGSSUPMechConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSGeneralNameConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSITTAbsent.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSITTAnonymous.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSITTDistinguishedName.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSITTPrincipalNameGSSUP.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSITTX509CertChain.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSNULLASMechConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSNULLTransportConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSSASIdentityToken.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSSASMechConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSSECIOPTransportConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSSSLTransportConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSServiceConfigurationConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSTransportAddressConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSTransportMechConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSX509AttributeCertChain.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/jgss/ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/jgss/GSSUPAnonServerName.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/jgss/GSSUPAnonUserName.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/jgss/GSSUPContext.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/jgss/GSSUPCredential.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/jgss/GSSUPMechanismFactory.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/jgss/GSSUPProvider.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/jgss/GSSUPServerName.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/jgss/GSSUPUserName.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/jgss/SubjectComber.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/wrappers/ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/wrappers/EstablishContextWrapper.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/AbstractServerTransactionPolicyConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/ClientTransactionInterceptor.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/ClientTransactionPolicy.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/ClientTransactionPolicyConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/ClientTransactionPolicyFactory.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/IORTransactionInterceptor.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/MappedServerTransactionPolicyConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/OperationTxPolicy.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/ServerTransactionInterceptor.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/ServerTransactionPolicy.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/ServerTransactionPolicyConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/ServerTransactionPolicyFactory.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/TransactionInitializer.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/nodistributedtransactions/ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/nodistributedtransactions/Ignore.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/nodistributedtransactions/NoDTxClientTransactionPolicyConfig.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/nodistributedtransactions/NoDTxServerTransactionPolicies.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/nodistributedtransactions/NotRequired.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/nodistributedtransactions/Required.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/ClientContextHolderStub.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/DynamicStubClassLoader.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/DynamicStubClassLoaderGBean.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/OpenORBUtil.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/OpenORBUtilGBean.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/StubMethodInterceptor.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/TypeCode.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/Util.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/UtilDelegateImpl.java geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/UtilInitializer.java geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/ geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/ geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/GBeanInfosTest.java geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/compiler/ geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/compiler/All.java geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/compiler/BeanProperties.java geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/compiler/BooException.java geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/compiler/Foo.java geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/compiler/PortableStubCompilerTest.java geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/compiler/Simple.java geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/compiler/Special.java geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/compiler/other/ geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/compiler/other/BlahEx.java geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/compiler/other/CheeseIDLEntity.java geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/compiler/other/Donkey.java geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/compiler/other/DonkeyEx.java geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/compiler/other/Generic$Interface.java geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/compiler/other/_Something.java geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/compiler/other/inout.java geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/security/ geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/security/config/ geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/security/config/tss/ geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/security/config/tss/ToStringTest.java geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/util/ geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/util/DynamicStubClassLoaderTest.java geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/geronimo/corba/util/NameDescopingTest.java geronimo/server/trunk/modules/geronimo-yoko/ - copied from r504981, incubator/openejb/trunk/openejb2/modules/openejb-yoko/ geronimo/server/trunk/modules/geronimo-yoko/DISCLAIMER.txt - copied unchanged from r505429, incubator/openejb/trunk/openejb2/modules/openejb-yoko/DISCLAIMER.txt geronimo/server/trunk/modules/geronimo-yoko/LICENSE.txt - copied unchanged from r505429, incubator/openejb/trunk/openejb2/modules/openejb-yoko/LICENSE.txt geronimo/server/trunk/modules/geronimo-yoko/NOTICE.txt - copied unchanged from r505429, incubator/openejb/trunk/openejb2/modules/openejb-yoko/NOTICE.txt geronimo/server/trunk/modules/geronimo-yoko/pom.xml - copied, changed from r505429, incubator/openejb/trunk/openejb2/modules/openejb-yoko/pom.xml geronimo/server/trunk/modules/geronimo-yoko/src/ - copied from r505429, incubator/openejb/trunk/openejb2/modules/openejb-yoko/src/ geronimo/server/trunk/modules/geronimo-yoko/src/main/java/org/apache/geronimo/ geronimo/server/trunk/modules/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ geronimo/server/trunk/modules/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBConfigAdapter.java geronimo/server/trunk/modules/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBConfigAdapterGBean.java geronimo/server/trunk/modules/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ORBInitializer.java geronimo/server/trunk/modules/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/RMIStubHandler.java geronimo/server/trunk/modules/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/RMIStubHandlerFactory.java geronimo/server/trunk/modules/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/ServiceContextInterceptor.java geronimo/server/trunk/modules/geronimo-yoko/src/main/java/org/apache/geronimo/yoko/SocketFactory.java geronimo/server/trunk/modules/geronimo-yoko/src/test/java/org/apache/geronimo/ geronimo/server/trunk/modules/geronimo-yoko/src/test/java/org/apache/geronimo/corba/ geronimo/server/trunk/modules/geronimo-yoko/src/test/java/org/apache/geronimo/corba/security/ geronimo/server/trunk/modules/geronimo-yoko/src/test/java/org/apache/geronimo/corba/security/config/ geronimo/server/trunk/modules/geronimo-yoko/src/test/java/org/apache/geronimo/corba/security/config/tss/ geronimo/server/trunk/modules/geronimo-yoko/src/test/java/org/apache/geronimo/yoko/ geronimo/server/trunk/modules/geronimo-yoko/src/test/java/org/apache/geronimo/yoko/NameServiceTest.java geronimo/server/trunk/modules/geronimo-yoko/src/test/java/org/apache/geronimo/yoko/TSSConfigEditorTest.java (with props) Removed: geronimo/server/trunk/modules/geronimo-corba-builder/DISCLAIMER.txt geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/openejb/ geronimo/server/trunk/modules/geronimo-corba-builder/src/main/xsd/ geronimo/server/trunk/modules/geronimo-corba-builder/src/main/xsdconfig/ geronimo/server/trunk/modules/geronimo-corba-builder/src/test/java/org/apache/openejb/corba/ geronimo/server/trunk/modules/geronimo-corba/DISCLAIMER.txt geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/openejb/ geronimo/server/trunk/modules/geronimo-corba/src/test/java/org/apache/openejb/ geronimo/server/trunk/modules/geronimo-yoko/src/main/java/org/apache/openejb/ geronimo/server/trunk/modules/geronimo-yoko/src/test/java/org/apache/openejb/ Modified: geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-nosec-plan.xml geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-plan.xml geronimo/server/trunk/configs/client-corba-yoko/src/plan/plan.xml geronimo/server/trunk/configs/j2ee-corba-yoko/src/plan/plan.xml geronimo/server/trunk/configs/openejb-corba-deployer/src/plan/plan.xml geronimo/server/trunk/modules/geronimo-corba/src/test/resources/beanPropertiesNameMangler.properties geronimo/server/trunk/modules/geronimo-corba/src/test/resources/nameMangler.properties geronimo/server/trunk/modules/geronimo-corba/src/test/resources/specialNameMangler.properties geronimo/server/trunk/modules/pom.xml geronimo/server/trunk/testsuite/enterprise-testsuite/ejbcontainer-tests/src/test/resources/META-INF/openejb-jar.xml Modified: geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-nosec-plan.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-nosec-plan.xml?view=diff&rev=505432&r1=505431&r2=505432 ============================================================================== --- geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-nosec-plan.xml (original) +++ geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-nosec-plan.xml Fri Feb 9 11:24:30 2007 @@ -56,7 +56,7 @@ IdentityTokenNoSecurity - + IdentityTokenNoSecurity UnprotectedServer @@ -129,14 +129,14 @@ client-properties-realm org.acme.MagicGBallCallbackHandler - + DefaultThreadPool TransactionContextManager - org.apache.openejb.corba.sunorb.SunORBConfigAdapter + org.apache.geronimo.corba.sunorb.SunORBConfigAdapter NoSecurity Modified: geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-plan.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-plan.xml?view=diff&rev=505432&r1=505431&r2=505432 ============================================================================== --- geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-plan.xml (original) +++ geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-plan.xml Fri Feb 9 11:24:30 2007 @@ -57,7 +57,7 @@ SSLClientPassword - + SSLClientPassword Server @@ -131,14 +131,14 @@ client-properties-realm org.acme.MagicGBallCallbackHandler - + DefaultThreadPool TransactionContextManager - org.apache.openejb.corba.sunorb.SunORBConfigAdapter + org.apache.geronimo.corba.sunorb.SunORBConfigAdapter SSLClientPassword Modified: geronimo/server/trunk/configs/client-corba-yoko/src/plan/plan.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-corba-yoko/src/plan/plan.xml?view=diff&rev=505432&r1=505431&r2=505432 ============================================================================== --- geronimo/server/trunk/configs/client-corba-yoko/src/plan/plan.xml (original) +++ geronimo/server/trunk/configs/client-corba-yoko/src/plan/plan.xml Fri Feb 9 11:24:30 2007 @@ -19,11 +19,11 @@ - + - + - + ServerInfo @@ -36,7 +36,7 @@ - + geronimo-default geronimo geronimo-default @@ -48,7 +48,7 @@ - + ORBConfigAdapter @@ -59,7 +59,7 @@ - + ORBConfigAdapter - + - + ServerInfo @@ -40,7 +40,7 @@ ${PlanCOSNamingHost} - + geronimo-default geronimo geronimo-default @@ -52,7 +52,7 @@ - + ${PlanORBSSLHost} ${PlanORBSSLPort} @@ -88,7 +88,7 @@ - + ${PlanORBHost} ${PlanORBPort} @@ -121,7 +121,7 @@ org.apache.geronimo.modules geronimo-security-builder + ${version} - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.4 - 1.4 - - - org.codehaus.mojo xmlbeans-maven-plugin + + + + org.apache.maven.plugins + maven-antrun-plugin + generate-resources - xmlbeans + run + + + + + + + + + + - - Added: geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaRefBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaRefBuilder.java?view=auto&rev=505432 ============================================================================== --- geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaRefBuilder.java (added) +++ geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaRefBuilder.java Fri Feb 9 11:24:30 2007 @@ -0,0 +1,96 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.geronimo.corba.deployment; + +import java.util.Collection; +import java.util.Map; + +import org.apache.xmlbeans.XmlObject; +import org.apache.xmlbeans.QNameSet; +import org.apache.geronimo.kernel.config.Configuration; +import org.apache.geronimo.kernel.repository.Artifact; +import org.apache.geronimo.kernel.repository.Environment; +import org.apache.geronimo.j2ee.deployment.Module; +import org.apache.geronimo.j2ee.deployment.CorbaGBeanNameSource; +import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; +import org.apache.geronimo.naming.reference.ORBReference; +import org.apache.geronimo.naming.reference.HandleDelegateReference; +import org.apache.geronimo.naming.deployment.AbstractNamingBuilder; +import org.apache.geronimo.common.DeploymentException; +import org.apache.geronimo.gbean.GBeanInfo; +import org.apache.geronimo.gbean.GBeanInfoBuilder; +import org.apache.geronimo.gbean.AbstractNameQuery; +import org.apache.geronimo.gbean.SingleElementCollection; + +/** + * @version $Rev$ $Date$ + */ +public class CorbaRefBuilder extends AbstractNamingBuilder { + + private final SingleElementCollection corbaGBeanNameSourceCollection; + + public CorbaRefBuilder(Environment defaultEnvironment, Collection corbaGBeanNameSource) { + super(defaultEnvironment); + this.corbaGBeanNameSourceCollection = new SingleElementCollection(corbaGBeanNameSource); + } + + protected boolean willMergeEnvironment(XmlObject specDD, XmlObject plan) throws DeploymentException { +// if (OpenEjbCorbaRefBuilder.hasCssRefs(plan) || TSSLinkBuilder.hasTssLinks(plan)) { + return true; +// } +// return false; + } + + public void buildNaming(XmlObject specDD, XmlObject plan, Configuration localConfiguration, Configuration remoteConfiguration, Module module, Map componentContext) throws DeploymentException { + if (matchesDefaultEnvironment(localConfiguration.getEnvironment())) { + CorbaGBeanNameSource corbaGBeanNameSource = (CorbaGBeanNameSource) corbaGBeanNameSourceCollection.getElement(); + if (corbaGBeanNameSource != null) { + AbstractNameQuery corbaName = corbaGBeanNameSource.getCorbaGBeanName(); + if (corbaName != null) { + Artifact moduleId = localConfiguration.getId(); + Map context = getJndiContextMap(componentContext); + context.put("ORB", new ORBReference(moduleId, corbaName)); + context.put("HandleDelegate", new HandleDelegateReference(moduleId, corbaName)); + } + } + } + } + + public QNameSet getSpecQNameSet() { + return QNameSet.EMPTY; + } + + public QNameSet getPlanQNameSet() { + return QNameSet.EMPTY; + } + + public static final GBeanInfo GBEAN_INFO; + + static { + GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(CorbaRefBuilder.class, NameFactory.MODULE_BUILDER); + infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true); + infoBuilder.addReference("CorbaGBeanNameSource", CorbaGBeanNameSource.class); + infoBuilder.setConstructor(new String[]{"defaultEnvironment", "CorbaGBeanNameSource"}); + GBEAN_INFO = infoBuilder.getBeanInfo(); + } + + public static GBeanInfo getGBeanInfo() { + return GBEAN_INFO; + } + +} Propchange: geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaRefBuilder.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaRefBuilder.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaRefBuilder.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java?view=auto&rev=505432 ============================================================================== --- geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java (added) +++ geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java Fri Feb 9 11:24:30 2007 @@ -0,0 +1,191 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.geronimo.corba.deployment; + +import java.net.URI; +import java.net.URISyntaxException; +import java.util.HashMap; +import java.util.Map; +import javax.naming.Reference; +import javax.xml.namespace.QName; + +import org.apache.geronimo.common.DeploymentException; +import org.apache.geronimo.gbean.AbstractNameQuery; +import org.apache.geronimo.gbean.GBeanInfo; +import org.apache.geronimo.gbean.GBeanInfoBuilder; +import org.apache.geronimo.j2ee.deployment.Module; +import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; +import org.apache.geronimo.kernel.GBeanNotFoundException; +import org.apache.geronimo.kernel.config.Configuration; +import org.apache.geronimo.kernel.repository.Environment; +import org.apache.geronimo.openejb.deployment.EjbRefBuilder; +import org.apache.geronimo.schema.NamespaceElementConverter; +import org.apache.geronimo.xbeans.geronimo.naming.GerEjbRefDocument; +import org.apache.geronimo.xbeans.geronimo.naming.GerEjbRefType; +import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType; +import org.apache.geronimo.xbeans.javaee.EjbRefType; +import org.apache.geronimo.corba.proxy.CORBAProxyReference; +import org.apache.xmlbeans.QNameSet; +import org.apache.xmlbeans.XmlObject; + +/** + * Installs ejb refs that use corba transport into jndi context. + * Such ejb refs are determined by the nscorbaloc element in the openejb ejb plan. + * + * @version $Revision$ $Date$ + */ +public class OpenEjbCorbaRefBuilder extends EjbRefBuilder { + + private static final QName GER_EJB_REF_QNAME = GerEjbRefDocument.type.getDocumentElementName(); + private static final QNameSet GER_EJB_REF_QNAME_SET = QNameSet.singleton(GER_EJB_REF_QNAME); + private static final NamespaceElementConverter OPENEJB_CONVERTER = new NamespaceElementConverter(GER_EJB_REF_QNAME.getNamespaceURI()); + + private static final QName GER_NS_CORBA_LOC_QNAME = new QName(GER_EJB_REF_QNAME.getNamespaceURI(), "ns-corbaloc"); + private static final QNameSet GER_NS_CORBA_LOC_QNAME_SET = QNameSet.singleton(GER_NS_CORBA_LOC_QNAME); + + private final QNameSet ejbRefQNameSet; + + public OpenEjbCorbaRefBuilder(Environment defaultEnvironment, String[] eeNamespaces) throws URISyntaxException { + super(defaultEnvironment, new String[0], null, -1); + ejbRefQNameSet = buildQNameSet(eeNamespaces, "ejb-ref"); + } + + @Override + public QNameSet getSpecQNameSet() { + return ejbRefQNameSet; + } + + @Override + public QNameSet getPlanQNameSet() { + return GER_NS_CORBA_LOC_QNAME_SET; + } + + + protected boolean willMergeEnvironment(XmlObject specDD, XmlObject plan) { +// return hasCssRefs(plan); + return true; + } + +// static boolean hasCssRefs(XmlObject plan) throws DeploymentException { +// XmlObject[] refs = plan == null ? NO_REFS : convert(plan.selectChildren(GER_EJB_REF_QNAME_SET), OPENEJB_CONVERTER, GerEjbRefType.type); +// for (int i = 0; i < refs.length; i++) { +// GerEjbRefType ref = (GerEjbRefType) refs[i]; +// if (ref.isSetNsCorbaloc()) { +// return true; +// } +// } +// return false; +// } + + public void buildNaming(XmlObject specDD, XmlObject plan, Configuration localConfiguration, Configuration remoteConfiguration, Module module, Map componentContext) throws DeploymentException { + XmlObject[] ejbRefsUntyped = convert(specDD.selectChildren(ejbRefQNameSet), J2EE_CONVERTER, EjbRefType.type); + XmlObject[] gerEjbRefsUntyped = plan == null ? NO_REFS : convert(plan.selectChildren(GER_EJB_REF_QNAME_SET), OPENEJB_CONVERTER, GerEjbRefType.type); + Map ejbRefMap = mapEjbRefs(gerEjbRefsUntyped); + ClassLoader cl = module.getEarContext().getClassLoader(); + + for (int i = 0; i < ejbRefsUntyped.length; i++) { + EjbRefType ejbRef = (EjbRefType) ejbRefsUntyped[i]; + + String ejbRefName = getStringValue(ejbRef.getEjbRefName()); + GerEjbRefType remoteRef = (GerEjbRefType) ejbRefMap.get(ejbRefName); + + Reference ejbReference = addEJBRef(localConfiguration, module.getModuleURI(), ejbRef, remoteRef, cl); + if (ejbReference != null) { + getJndiContextMap(componentContext).put(ENV + ejbRefName, ejbReference); + } + } + } + + private Reference addEJBRef(Configuration earContext, URI moduleURI, EjbRefType ejbRef, GerEjbRefType remoteRef, ClassLoader cl) throws DeploymentException { + Reference ejbReference = null; + if (remoteRef != null && remoteRef.isSetNsCorbaloc()) { + String refName = getStringValue(ejbRef.getEjbRefName()); + String home = getStringValue(ejbRef.getHome()); + String remote = getStringValue(ejbRef.getRemote()); + + verifyInterfaces(refName, moduleURI, cl, remote, home); + + try { + // create the cssBean query + AbstractNameQuery cssBean; + if (remoteRef.isSetCssLink()) { + String cssLink = remoteRef.getCssLink().trim(); + cssBean = buildAbstractNameQuery(null, null, cssLink, NameFactory.CORBA_CSS, NameFactory.EJB_MODULE); + } else { + GerPatternType css = remoteRef.getCss(); + cssBean = buildAbstractNameQuery(css, NameFactory.CORBA_CSS, NameFactory.EJB_MODULE, null); + } + + // verify the cssBean query is valid + try { + earContext.findGBean(cssBean); + } catch (GBeanNotFoundException e) { + throw new DeploymentException("Could not find css bean matching " + cssBean + " from configuration " + earContext.getId()); + } + + // create ref + ejbReference = new CORBAProxyReference(earContext.getId(), cssBean, new URI(remoteRef.getNsCorbaloc().trim()), remoteRef.getName().trim(), home); + } catch (URISyntaxException e) { + throw new DeploymentException("Could not construct CORBA NameServer URI: " + remoteRef.getNsCorbaloc(), e); + } + } + return ejbReference; + } + + private void verifyInterfaces(String refName, URI moduleURI, ClassLoader cl, String remote, String home) throws DeploymentException { + try { + assureInterface(remote, "javax.ejb.EJBObject", "Remote", cl); + } catch (DeploymentException e) { + throw new DeploymentException("Error processing 'remote' element for EJB Reference '" + refName + "' for module '" + moduleURI + "': " + e.getMessage()); + } + try { + assureInterface(home, "javax.ejb.EJBHome", "Home", cl); + } catch (DeploymentException e) { + throw new DeploymentException("Error processing 'home' element for EJB Reference '" + refName + "' for module '" + moduleURI + "': " + e.getMessage()); + } + } + + private static Map mapEjbRefs(XmlObject[] refs) { + Map refMap = new HashMap(); + if (refs != null) { + for (int i = 0; i < refs.length; i++) { + GerEjbRefType ref = (GerEjbRefType) refs[i]; + refMap.put(ref.getRefName().trim(), ref); + } + } + return refMap; + } + + + public static final GBeanInfo GBEAN_INFO; + + static { + GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(OpenEjbCorbaRefBuilder.class, NameFactory.MODULE_BUILDER); //TODO decide what type this should be + infoBuilder.addAttribute("eeNamespaces", String[].class, true, true); + infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true); + + infoBuilder.setConstructor(new String[]{"defaultEnvironment", "eeNamespaces"}); + + GBEAN_INFO = infoBuilder.getBeanInfo(); + } + + public static GBeanInfo getGBeanInfo() { + return GBEAN_INFO; + } + +} Propchange: geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/OpenEjbCorbaRefBuilder.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/TSSLinkBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/TSSLinkBuilder.java?view=auto&rev=505432 ============================================================================== --- geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/TSSLinkBuilder.java (added) +++ geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/TSSLinkBuilder.java Fri Feb 9 11:24:30 2007 @@ -0,0 +1,163 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + +package org.apache.geronimo.corba.deployment; + +import java.net.URI; +import java.util.Map; + +import javax.xml.namespace.QName; + +import org.apache.geronimo.common.DeploymentException; +import org.apache.geronimo.gbean.AbstractName; +import org.apache.geronimo.gbean.AbstractNameQuery; +import org.apache.geronimo.gbean.GBeanData; +import org.apache.geronimo.gbean.GBeanInfo; +import org.apache.geronimo.gbean.GBeanInfoBuilder; +import org.apache.geronimo.j2ee.deployment.Module; +import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory; +import org.apache.geronimo.kernel.GBeanAlreadyExistsException; +import org.apache.geronimo.kernel.GBeanNotFoundException; +import org.apache.geronimo.kernel.config.Configuration; +import org.apache.geronimo.kernel.repository.Environment; +import org.apache.geronimo.naming.deployment.AbstractNamingBuilder; +import org.apache.geronimo.naming.deployment.ENCConfigBuilder; +import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType; +import org.apache.geronimo.corba.TSSLinkGBean; +import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSTssDocument; +import org.apache.xmlbeans.QNameSet; +import org.apache.xmlbeans.XmlObject; +import org.apache.xmlbeans.XmlString; + +/** + * @version $Rev$ $Date$ + */ +public class TSSLinkBuilder extends AbstractNamingBuilder { + private static final String TSS_NAMESPACE = TSSTssDocument.type.getDocumentElementName().getNamespaceURI(); + private static final QName TSS_LINK_QNAME = new QName(TSS_NAMESPACE, "tss-link"); + private static final QName TSS_QNAME = new QName(TSS_NAMESPACE, "tss"); + private static final QName JNDI_NAME_QNAME = new QName(TSS_NAMESPACE, "jndi-name"); + + public TSSLinkBuilder() { + } + + public TSSLinkBuilder(Environment defaultEnvironment) { + super(defaultEnvironment); + } + + protected boolean willMergeEnvironment(XmlObject specDD, XmlObject plan) { + return true; +// return hasTssLinks(plan); + } + +// static boolean hasTssLinks(XmlObject plan) { +// return plan != null && (plan.selectChildren(TSS_LINK_QNAME).length > 0 || +// plan.selectChildren(TSS_QNAME).length > 0); +// } + + public void buildNaming(XmlObject specDD, XmlObject plan, Configuration localConfiguration, Configuration remoteConfiguration, Module module, Map componentContext) throws DeploymentException { + if (plan == null) { + return; + } + + AbstractName ejbName = getGBeanName(componentContext); + + String[] tssLinks = toStringArray(plan.selectChildren(TSS_LINK_QNAME)); + XmlObject[] tsss = plan.selectChildren(TSS_QNAME); + String[] jndiNames = toStringArray(plan.selectChildren(JNDI_NAME_QNAME)); + for (int i = 0; i < tssLinks.length; i++) { + String tssLink = tssLinks[i]; + URI moduleURI = module.getModuleURI(); + String moduleString = moduleURI == null ? null : moduleURI.toString(); + AbstractNameQuery tssBeanName = ENCConfigBuilder.buildAbstractNameQuery(null, moduleString, tssLink, NameFactory.EJB_MODULE, NameFactory.EJB_MODULE); + try { + localConfiguration.findGBean(tssBeanName); + } catch (GBeanNotFoundException e) { + tssBeanName = ENCConfigBuilder.buildAbstractNameQuery(null, null, tssLink, null, NameFactory.EJB_MODULE); + try { + localConfiguration.findGBean(tssBeanName); + } catch (GBeanNotFoundException e1) { + throw new DeploymentException("No tss bean found", e); + } + } + AbstractName tssLinkName = module.getEarContext().getNaming().createChildName(ejbName, "tssLink" + i, "TSSLink"); + GBeanData tssLinkData = new GBeanData(tssLinkName, TSSLinkGBean.GBEAN_INFO); + tssLinkData.setAttribute("jndiNames", jndiNames); + tssLinkData.setReferencePattern("EJB", ejbName); + tssLinkData.setReferencePattern("TSSBean", tssBeanName); + try { + localConfiguration.addGBean(tssLinkData); + } catch (GBeanAlreadyExistsException e) { + throw new DeploymentException("tss link gbean already present", e); + } + } + for (int i = 0; i < tsss.length; i++) { + GerPatternType tss = (GerPatternType) tsss[i]; + AbstractNameQuery tssBeanName = ENCConfigBuilder.buildAbstractNameQuery(tss, NameFactory.CORBA_TSS, NameFactory.EJB_MODULE, null); + AbstractName tssLinkName = module.getEarContext().getNaming().createChildName(ejbName, "tssRef" + i, "TSSLink"); + GBeanData tssLinkData = new GBeanData(tssLinkName, TSSLinkGBean.GBEAN_INFO); + tssLinkData.setAttribute("jndiNames", jndiNames); + tssLinkData.setReferencePattern("EJB", ejbName); + tssLinkData.setReferencePattern("TSSBean", tssBeanName); + try { + localConfiguration.addGBean(tssLinkData); + } catch (GBeanAlreadyExistsException e) { + throw new DeploymentException("tss link gbean already present", e); + } + } + + } + + public QNameSet getSpecQNameSet() { + return QNameSet.EMPTY; + } + + public QNameSet getPlanQNameSet() { + return QNameSet.singleton(TSS_LINK_QNAME); + } + + private String[] toStringArray(XmlObject[] xmlObjects) { + String[] result = new String[xmlObjects.length]; + for (int i = 0; i < result.length; i++) { + // toString() and xmlText() insert tags around the value, which + // is most definitely NOT what we want. + result[i] = ((XmlString)xmlObjects[i]).getStringValue(); + } + return result; + } + + public static final GBeanInfo GBEAN_INFO; + + static { + GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(TSSLinkBuilder.class, NameFactory.MODULE_BUILDER); //TODO decide what type this should be + infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true); + + infoBuilder.setConstructor(new String[] {"defaultEnvironment"}); + + GBEAN_INFO = infoBuilder.getBeanInfo(); + } + + public static GBeanInfo getGBeanInfo() { + return GBEAN_INFO; + } + +} + + Propchange: geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/TSSLinkBuilder.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/TSSLinkBuilder.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/TSSLinkBuilder.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/security/config/css/CSSConfigEditor.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/security/config/css/CSSConfigEditor.java?view=auto&rev=505432 ============================================================================== --- geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/security/config/css/CSSConfigEditor.java (added) +++ geronimo/server/trunk/modules/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/security/config/css/CSSConfigEditor.java Fri Feb 9 11:24:30 2007 @@ -0,0 +1,210 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.geronimo.corba.security.config.css; + +import java.util.Iterator; +import java.util.List; + +import org.apache.xmlbeans.XmlException; +import org.apache.xmlbeans.XmlObject; +import org.omg.CSIIOP.CompositeDelegation; +import org.omg.CSIIOP.Confidentiality; +import org.omg.CSIIOP.DetectMisordering; +import org.omg.CSIIOP.DetectReplay; +import org.omg.CSIIOP.EstablishTrustInClient; +import org.omg.CSIIOP.EstablishTrustInTarget; +import org.omg.CSIIOP.Integrity; +import org.omg.CSIIOP.NoDelegation; +import org.omg.CSIIOP.NoProtection; +import org.omg.CSIIOP.SimpleDelegation; + +import org.apache.geronimo.common.DeploymentException; +import org.apache.geronimo.common.propertyeditor.PropertyEditorException; +import org.apache.geronimo.deployment.service.XmlAttributeBuilder; +import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil; +import org.apache.geronimo.gbean.GBeanInfo; +import org.apache.geronimo.gbean.GBeanInfoBuilder; +import org.apache.geronimo.kernel.ClassLoading; + +import org.apache.geronimo.corba.xbeans.csiv2.css.CSSCompoundSecMechType; +import org.apache.geronimo.corba.xbeans.csiv2.css.CSSCssType; +import org.apache.geronimo.corba.xbeans.csiv2.css.CSSGSSUPDynamicType; +import org.apache.geronimo.corba.xbeans.csiv2.css.CSSGSSUPStaticType; +import org.apache.geronimo.corba.xbeans.csiv2.css.CSSITTPrincipalNameDynamicType; +import org.apache.geronimo.corba.xbeans.csiv2.css.CSSITTPrincipalNameStaticType; +import org.apache.geronimo.corba.xbeans.csiv2.css.CSSSSLType; +import org.apache.geronimo.corba.xbeans.csiv2.css.CSSSasMechType; +import org.apache.geronimo.corba.xbeans.csiv2.css.CSSCssDocument; +import org.apache.geronimo.corba.xbeans.csiv2.tss.TSSAssociationOption; + + +/** + * @version $Revision: 451417 $ $Date: 2006-09-29 13:13:22 -0700 (Fri, 29 Sep 2006) $ + */ +public class CSSConfigEditor implements XmlAttributeBuilder { + private static final String NAMESPACE = CSSCssDocument.type.getDocumentElementName().getNamespaceURI(); + + public String getNamespace() { + return NAMESPACE; + } + + public Object getValue(XmlObject xmlObject, String type, ClassLoader cl) throws DeploymentException { + + CSSCssType css; + if (xmlObject instanceof CSSCssType) { + css = (CSSCssType) xmlObject; + } + css = (CSSCssType) xmlObject.copy().changeType(CSSCssType.type); + try { + XmlBeansUtil.validateDD(css); + } catch (XmlException e) { + throw new DeploymentException(e); + } + + CSSConfig cssConfig = new CSSConfig(); + + if (css.isSetCompoundSecMechTypeList()) { + CSSCompoundSecMechListConfig mechListConfig = cssConfig.getMechList(); + mechListConfig.setStateful(css.getCompoundSecMechTypeList().getStateful()); + + CSSCompoundSecMechType[] mechList = css.getCompoundSecMechTypeList().getCompoundSecMechArray(); + for (int i = 0; i < mechList.length; i++) { + mechListConfig.add(extractCompoundSecMech(mechList[i], cl)); + } + } + + return cssConfig; + } + + protected static CSSCompoundSecMechConfig extractCompoundSecMech(CSSCompoundSecMechType mechType, ClassLoader cl) throws DeploymentException { + + CSSCompoundSecMechConfig result = new CSSCompoundSecMechConfig(); + + if (mechType.isSetSSL()) { + result.setTransport_mech(extractSSLTransport(mechType.getSSL())); + } else if (mechType.isSetSECIOP()) { + throw new PropertyEditorException("SECIOP processing not implemented"); + } else { + result.setTransport_mech(new CSSNULLTransportConfig()); + } + + if (mechType.isSetGSSUPStatic()) { + result.setAs_mech(extractGSSUPStatic(mechType.getGSSUPStatic())); + } else if (mechType.isSetGSSUPDynamic()) { + result.setAs_mech(extractGSSUPDynamic(mechType.getGSSUPDynamic())); + } else { + result.setAs_mech(new CSSNULLASMechConfig()); + } + + result.setSas_mech(extractSASMech(mechType.getSasMech(), cl)); + + return result; + } + + protected static CSSTransportMechConfig extractSSLTransport(CSSSSLType sslType) { + CSSSSLTransportConfig result = new CSSSSLTransportConfig(); + + result.setSupports(extractAssociationOptions(sslType.getSupports())); + result.setRequires(extractAssociationOptions(sslType.getRequires())); + + return result; + } + + protected static CSSASMechConfig extractGSSUPStatic(CSSGSSUPStaticType gssupType) { + return new CSSGSSUPMechConfigStatic(gssupType.getUsername(), gssupType.getPassword(), gssupType.getDomain()); + } + + protected static CSSASMechConfig extractGSSUPDynamic(CSSGSSUPDynamicType gssupType) { + return new CSSGSSUPMechConfigDynamic(gssupType.getDomain()); + } + + protected static CSSSASMechConfig extractSASMech(CSSSasMechType sasMechType, ClassLoader cl) throws DeploymentException { + CSSSASMechConfig result = new CSSSASMechConfig(); + + if (sasMechType == null) { + result.setIdentityToken(new CSSSASITTAbsent()); + } else if (sasMechType.isSetITTAbsent()) { + result.setIdentityToken(new CSSSASITTAbsent()); + } else if (sasMechType.isSetITTAnonymous()) { + result.setIdentityToken(new CSSSASITTAnonymous()); + } else if (sasMechType.isSetITTPrincipalNameStatic()) { + CSSITTPrincipalNameStaticType principal = sasMechType.getITTPrincipalNameStatic(); + result.setIdentityToken(new CSSSASITTPrincipalNameStatic(principal.getOid(), principal.getName())); + } else if (sasMechType.isSetITTPrincipalNameDynamic()) { + CSSITTPrincipalNameDynamicType principal = sasMechType.getITTPrincipalNameDynamic(); + String principalClassName = principal.getPrincipalClass(); + Class principalClass = null; + try { + principalClass = ClassLoading.loadClass(principalClassName, cl); + } catch (ClassNotFoundException e) { + throw new DeploymentException("Could not load principal class"); + } + String domainName = principal.getDomain(); + String realmName = null; + if (domainName != null) { + realmName = principal.getRealm(); + } + result.setIdentityToken(new CSSSASITTPrincipalNameDynamic(principal.getOid(), principalClass, domainName, realmName)); + } + + return result; + } + + protected static short extractAssociationOptions(List list) { + short result = 0; + + for (Iterator iter = list.iterator(); iter.hasNext();) { + TSSAssociationOption.Enum obj = TSSAssociationOption.Enum.forString((String) iter.next()); + + if (TSSAssociationOption.NO_PROTECTION.equals(obj)) { + result |= NoProtection.value; + } else if (TSSAssociationOption.INTEGRITY.equals(obj)) { + result |= Integrity.value; + } else if (TSSAssociationOption.CONFIDENTIALITY.equals(obj)) { + result |= Confidentiality.value; + } else if (TSSAssociationOption.DETECT_REPLAY.equals(obj)) { + result |= DetectReplay.value; + } else if (TSSAssociationOption.DETECT_MISORDERING.equals(obj)) { + result |= DetectMisordering.value; + } else if (TSSAssociationOption.ESTABLISH_TRUST_IN_TARGET.equals(obj)) { + result |= EstablishTrustInTarget.value; + } else if (TSSAssociationOption.ESTABLISH_TRUST_IN_CLIENT.equals(obj)) { + result |= EstablishTrustInClient.value; + } else if (TSSAssociationOption.NO_DELEGATION.equals(obj)) { + result |= NoDelegation.value; + } else if (TSSAssociationOption.SIMPLE_DELEGATION.equals(obj)) { + result |= SimpleDelegation.value; + } else if (TSSAssociationOption.COMPOSITE_DELEGATION.equals(obj)) { + result |= CompositeDelegation.value; + } + } + return result; + } + + public static final GBeanInfo GBEAN_INFO; + + static { + GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(CSSConfigEditor.class, "XmlAttributeBuilder"); + infoBuilder.addInterface(XmlAttributeBuilder.class); + GBEAN_INFO = infoBuilder.getBeanInfo(); + } + + public static GBeanInfo getGBeanInfo() { + return GBEAN_INFO; + } + +}