You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomee.apache.org by David Blevins <da...@visi.com> on 2010/06/09 01:53:20 UTC
Re: svn commit: r951774 - in /openejb/trunk/openejb3/container/openejb-core/src: main/java/org/apache/openejb/assembler/classic/ main/java/org/apache/openejb/config/ main/java/org/apache/openejb/core/ test/java/org/apache/openejb/config/
On Jun 7, 2010, at 7:29 AM, Ivan wrote:
> JndiNameTest unit test seems to fail, the configured
> SystemInstance.get().setProperty("openejb.geronimo","true"); prevents the
> JaccPermission building work.
Thanks! Not sure why this property didn't prevent the test from passing before. Went a head and yanked it.
-David
> 2010/6/6 <db...@apache.org>
>
>> Author: dblevins
>> Date: Sat Jun 5 21:41:33 2010
>> New Revision: 951774
>>
>> URL: http://svn.apache.org/viewvc?rev=951774&view=rev
>> Log:
>> Yank "duct tape" property in favor of a "openejb.geronimo" property
>>
>> Modified:
>>
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
>>
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java
>>
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
>>
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceBuilder.java
>>
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
>>
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
>>
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
>>
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
>>
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
>>
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java
>>
>> openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameTest.java
>>
>> Modified:
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
>> URL:
>> http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=951774&r1=951773&r2=951774&view=diff
>>
>> ==============================================================================
>> ---
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
>> (original)
>> +++
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
>> Sat Jun 5 21:41:33 2010
>> @@ -119,8 +119,6 @@ public class Assembler extends Assembler
>>
>> private static final String OPENEJB_URL_PKG_PREFIX =
>> "org.apache.openejb.core.ivm.naming";
>>
>> - public static final String DUCT_TAPE_PROPERTY = "duct tape";
>> -
>> public static final Logger logger =
>> Logger.getInstance(LogCategory.OPENEJB_STARTUP, Assembler.class);
>> Messages messages = new
>> Messages(Assembler.class.getPackage().getName());
>>
>> @@ -241,7 +239,7 @@ public class Assembler extends Assembler
>> }
>>
>> public static void installNaming() {
>> - if (System.getProperty(DUCT_TAPE_PROPERTY) != null) return;
>> + if (SystemInstance.get().hasProperty("openejb.geronimo")) return;
>>
>> /* Add IntraVM JNDI service /////////////////////*/
>> Properties systemProperties = System.getProperties();
>> @@ -528,9 +526,7 @@ public class Assembler extends Assembler
>>
>> JaccPermissionsBuilder jaccPermissionsBuilder = new
>> JaccPermissionsBuilder();
>> PolicyContext policyContext =
>> jaccPermissionsBuilder.build(ejbJar, deployments);
>> - if (System.getProperty(DUCT_TAPE_PROPERTY) == null) {
>> - jaccPermissionsBuilder.install(policyContext);
>> - }
>> + jaccPermissionsBuilder.install(policyContext);
>>
>> MethodScheduleBuilder methodScheduleBuilder = new
>> MethodScheduleBuilder(classLoader, ejbJar);
>> TransactionPolicyFactory transactionPolicyFactory =
>> createTransactionPolicyFactory(ejbJar, classLoader);
>>
>> Modified:
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java
>> URL:
>> http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java?rev=951774&r1=951773&r2=951774&view=diff
>>
>> ==============================================================================
>> ---
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java
>> (original)
>> +++
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JaccPermissionsBuilder.java
>> Sat Jun 5 21:41:33 2010
>> @@ -19,6 +19,7 @@ package org.apache.openejb.assembler.cla
>> import org.apache.openejb.DeploymentInfo;
>> import org.apache.openejb.InterfaceType;
>> import org.apache.openejb.OpenEJBException;
>> +import org.apache.openejb.loader.SystemInstance;
>> import org.apache.openejb.util.Logger;
>> import org.apache.openejb.util.LogCategory;
>> import static
>> org.apache.openejb.assembler.classic.MethodInfoUtil.resolveAttributes;
>> @@ -49,6 +50,8 @@ public class JaccPermissionsBuilder {
>> }
>>
>> public void install(PolicyContext policyContext) throws
>> OpenEJBException {
>> + if (SystemInstance.get().hasProperty("openejb.geronimo")) return;
>> +
>> try {
>> PolicyConfigurationFactory factory =
>> PolicyConfigurationFactory.getPolicyConfigurationFactory();
>>
>>
>> Modified:
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
>> URL:
>> http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java?rev=951774&r1=951773&r2=951774&view=diff
>>
>> ==============================================================================
>> ---
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
>> (original)
>> +++
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
>> Sat Jun 5 21:41:33 2010
>> @@ -66,6 +66,7 @@ import java.util.Iterator;
>> import java.util.List;
>> import java.util.Map;
>> import java.util.ArrayList;
>> +import java.util.Collections;
>> import java.io.Serializable;
>>
>> /**
>> @@ -121,12 +122,13 @@ public class JndiEncBuilder {
>> }
>>
>> public Context build() throws OpenEJBException {
>> - Map<String, Object> bindings = null;
>> - if (System.getProperty("duct tape") == null) {
>> - bindings = buildMap();
>> - }
>> JndiFactory jndiFactory =
>> SystemInstance.get().getComponent(JndiFactory.class);
>> - return jndiFactory.createComponentContext(bindings);
>> +
>> + if (SystemInstance.get().hasProperty("openejb.geronimo")){
>> + return jndiFactory.createComponentContext(new HashMap());
>> + }
>> +
>> + return jndiFactory.createComponentContext(buildMap());
>> }
>>
>> public Map<String, Object> buildMap() throws OpenEJBException {
>>
>> Modified:
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceBuilder.java
>> URL:
>> http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceBuilder.java?rev=951774&r1=951773&r2=951774&view=diff
>>
>> ==============================================================================
>> ---
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceBuilder.java
>> (original)
>> +++
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceBuilder.java
>> Sat Jun 5 21:41:33 2010
>> @@ -111,7 +111,7 @@ public class PersistenceBuilder {
>> String jtaDataSourceId = info.jtaDataSource;
>> if (jtaDataSourceEnv != null) jtaDataSourceId = jtaDataSourceEnv;
>> if (jtaDataSourceId != null) {
>> - if (System.getProperty("duct tape") == null){
>> + if (!SystemInstance.get().hasProperty("openejb.geronimo")) {
>>
>> try {
>> if
>> (!jtaDataSourceId.startsWith("java:openejb/Resource/")
>> @@ -164,7 +164,7 @@ public class PersistenceBuilder {
>> String nonJtaDataSourceId = info.nonJtaDataSource;
>> if (nonJtaDataSourceEnv != null) nonJtaDataSourceId =
>> nonJtaDataSourceEnv;
>> if (nonJtaDataSourceId != null) {
>> - if (System.getProperty("duct tape") == null){
>> + if (!SystemInstance.get().hasProperty("openejb.geronimo")) {
>> try {
>> if
>> (!nonJtaDataSourceId.startsWith("java:openejb/Resource/"))
>> nonJtaDataSourceId = "java:openejb/Resource/"+nonJtaDataSourceId;
>>
>>
>> Modified:
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
>> URL:
>> http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=951774&r1=951773&r2=951774&view=diff
>>
>> ==============================================================================
>> ---
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
>> (original)
>> +++
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
>> Sat Jun 5 21:41:33 2010
>> @@ -2865,7 +2865,7 @@ public class AnnotationDeployer implemen
>> }
>> }
>>
>> - if (System.getProperty("duct tape") != null) return;
>> + if (SystemInstance.get().hasProperty("openejb.geronimo"))
>> return;
>>
>> if (serviceRef.getWsdlFile() == null && refType != null) {
>>
>> serviceRef.setWsdlFile(JaxWsUtils.getServiceWsdlLocation(refType,
>> classLoader));
>> @@ -2902,7 +2902,8 @@ public class AnnotationDeployer implemen
>> * @throws OpenEJBException
>> */
>> private void processWebServiceClientHandlers(JndiConsumer consumer,
>> ClassLoader classLoader) throws OpenEJBException {
>> - if (System.getProperty("duct tape") != null) return;
>> + if (SystemInstance.get().hasProperty("openejb.geronimo"))
>> return;
>> +
>> Set<Class<?>> processedClasses = new HashSet<Class<?>>();
>> Set<Class<?>> handlerClasses = new HashSet<Class<?>>();
>> do {
>>
>> Modified:
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
>> URL:
>> http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java?rev=951774&r1=951773&r2=951774&view=diff
>>
>> ==============================================================================
>> ---
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
>> (original)
>> +++
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
>> Sat Jun 5 21:41:33 2010
>> @@ -32,6 +32,7 @@ import org.apache.openejb.assembler.clas
>> import org.apache.openejb.assembler.classic.HandlerChainInfo;
>> import org.apache.openejb.assembler.classic.MessageDrivenBeanInfo;
>> import org.apache.openejb.OpenEJBException;
>> +import org.apache.openejb.loader.SystemInstance;
>> import org.apache.openejb.config.sys.Resource;
>> import org.apache.openejb.config.sys.ServiceProvider;
>> import org.apache.openejb.config.sys.Container;
>> @@ -671,7 +672,7 @@ class AppInfoBuilder {
>> }
>>
>> private static boolean skipMdb(EnterpriseBeanInfo bean) {
>> - return bean instanceof MessageDrivenBeanInfo &&
>> System.getProperty("duct tape") != null;
>> + return bean instanceof MessageDrivenBeanInfo &&
>> SystemInstance.get().hasProperty("openejb.geronimo");
>> }
>>
>> }
>>
>> Modified:
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
>> URL:
>> http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=951774&r1=951773&r2=951774&view=diff
>>
>> ==============================================================================
>> ---
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
>> (original)
>> +++
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
>> Sat Jun 5 21:41:33 2010
>> @@ -24,6 +24,7 @@ import static java.util.Arrays.asList;
>>
>> import static org.apache.openejb.config.ServiceUtils.hasServiceProvider;
>> import org.apache.openejb.OpenEJBException;
>> +import org.apache.openejb.loader.SystemInstance;
>> import org.apache.openejb.config.sys.Resource;
>> import org.apache.openejb.assembler.classic.ContainerInfo;
>> import org.apache.openejb.assembler.classic.ResourceInfo;
>> @@ -869,7 +870,7 @@ public class AutoConfig implements Dynam
>> }
>>
>> private static boolean skipMdb(Object bean) {
>> - return bean instanceof MessageDrivenBean &&
>> System.getProperty("duct tape") != null;
>> + return bean instanceof MessageDrivenBean &&
>> SystemInstance.get().hasProperty("openejb.geronimo");
>> }
>>
>> private static String getType(EnterpriseBean enterpriseBean) throws
>> OpenEJBException {
>>
>> Modified:
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
>> URL:
>> http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=951774&r1=951773&r2=951774&view=diff
>>
>> ==============================================================================
>> ---
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
>> (original)
>> +++
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
>> Sat Jun 5 21:41:33 2010
>> @@ -95,7 +95,6 @@ public class ConfigurationFactory implem
>> static final String CONFIGURATION_PROPERTY = "openejb.configuration";
>> static final String CONF_FILE_PROPERTY = "openejb.conf.file";
>> private static final String DEBUGGABLE_VM_HACKERY_PROPERTY =
>> "openejb.debuggable-vm-hackery";
>> - private static final String DUCT_TAPE_PROPERTY = "duct tape";
>> protected static final String VALIDATION_SKIP_PROPERTY =
>> "openejb.validation.skip";
>> private static final Logger logger =
>> Logger.getInstance(LogCategory.OPENEJB_STARTUP_CONFIG,
>> ConfigurationFactory.class);
>> private static final Messages messages = new
>> Messages(ConfigurationFactory.class);
>> @@ -161,7 +160,7 @@ public class ConfigurationFactory implem
>> // By default all vendor support is enabled
>> Set<Vendor> support =
>> SystemInstance.get().getOptions().getAll("openejb.vendor.config",
>> Vendor.values());
>>
>> - if (support.contains(Vendor.GERONIMO) ||
>> System.getProperty(DUCT_TAPE_PROPERTY) != null) {
>> + if (support.contains(Vendor.GERONIMO) ||
>> SystemInstance.get().hasProperty("openejb.geronimo")) {
>> chain.add(new OpenEjb2Conversion());
>> }
>>
>> @@ -173,7 +172,7 @@ public class ConfigurationFactory implem
>> chain.add(new WlsConversion());
>> }
>>
>> - if (System.getProperty(DUCT_TAPE_PROPERTY) != null){
>> + if (SystemInstance.get().hasProperty("openejb.geronimo")){
>> // must be after CmpJpaConversion since it adds new
>> persistence-context-refs
>> chain.add(new GeronimoMappedName());
>> }
>>
>> Modified:
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
>> URL:
>> http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java?rev=951774&r1=951773&r2=951774&view=diff
>>
>> ==============================================================================
>> ---
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
>> (original)
>> +++
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
>> Sat Jun 5 21:41:33 2010
>> @@ -248,7 +248,7 @@ public class JndiEncInfoBuilder {
>> info.targets.addAll(buildInjectionInfos(ref));
>> infos.add(info);
>>
>> - if (System.getProperty("duct tape") != null) continue;
>> + if (SystemInstance.get().hasProperty("openejb.geronimo"))
>> continue;
>>
>> info.id = ref.getMappedName();
>> info.serviceQName = ref.getServiceQname();
>>
>> Modified:
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java
>> URL:
>> http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java?rev=951774&r1=951773&r2=951774&view=diff
>>
>> ==============================================================================
>> ---
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java
>> (original)
>> +++
>> openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/CoreContainerSystem.java
>> Sat Jun 5 21:41:33 2010
>> @@ -54,17 +54,17 @@ public class CoreContainerSystem impleme
>> }
>> jndiContext = jndiFactory.createRootContext();
>> try {
>> - if (System.getProperty("duct tape") == null) {
>> - jndiContext.bind("openejb/local/.", "");
>> - jndiContext.bind("openejb/remote/.", "");
>> - jndiContext.bind("openejb/client/.", "");
>> - jndiContext.bind("openejb/Deployment/.", "");
>> - } else {
>> + if (SystemInstance.get().hasProperty("openejb.geronimo")) {
>> Context openejb = jndiContext.createSubcontext("openejb");
>> openejb.createSubcontext("local");
>> openejb.createSubcontext("remote");
>> openejb.createSubcontext("client");
>> openejb.createSubcontext("Deployment");
>> + } else {
>> + jndiContext.bind("openejb/local/.", "");
>> + jndiContext.bind("openejb/remote/.", "");
>> + jndiContext.bind("openejb/client/.", "");
>> + jndiContext.bind("openejb/Deployment/.", "");
>> }
>> }
>> catch (javax.naming.NamingException exception) {
>>
>> Modified:
>> openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameTest.java
>> URL:
>> http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameTest.java?rev=951774&r1=951773&r2=951774&view=diff
>>
>> ==============================================================================
>> ---
>> openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameTest.java
>> (original)
>> +++
>> openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameTest.java
>> Sat Jun 5 21:41:33 2010
>> @@ -86,7 +86,7 @@ public class JndiNameTest extends TestCa
>> public void testOpenejbJar2() throws Exception {
>> System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY,
>> InitContextFactory.class.getName());
>>
>> - SystemInstance.get().setProperty("duct tape","true");
>> + SystemInstance.get().setProperty("openejb.geronimo","true");
>> ConfigurationFactory config = new ConfigurationFactory();
>> Assembler assembler = new Assembler();
>>
>>
>>
>>
>
>
> --
> Ivan