-
Notifications
You must be signed in to change notification settings - Fork 692
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
EE10 Concurrency work
- Loading branch information
Showing
77 changed files
with
3,224 additions
and
715 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -777,4 +777,3 @@ | |
| </profile> | ||
| </profiles> | ||
| </project> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
108 changes: 108 additions & 0 deletions
108
...penejb-core/src/main/java/org/apache/openejb/config/ConvertContextServiceDefinitions.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| /* | ||
| * 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.openejb.config; | ||
|
|
||
| import org.apache.openejb.OpenEJBException; | ||
| import org.apache.openejb.config.sys.Resource; | ||
| import org.apache.openejb.jee.ContextService; | ||
| import org.apache.openejb.jee.JndiConsumer; | ||
| import org.apache.openejb.jee.KeyedCollection; | ||
| import org.apache.openejb.util.Join; | ||
| import org.apache.openejb.util.PropertyPlaceHolderHelper; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Properties; | ||
|
|
||
| /** | ||
| * @version $Rev$ $Date$ | ||
| */ | ||
| public class ConvertContextServiceDefinitions extends BaseConvertDefinitions { | ||
|
|
||
| @Override | ||
| public AppModule deploy(final AppModule appModule) throws OpenEJBException { | ||
|
|
||
| final List<JndiConsumer> jndiConsumers = collectConsumers(appModule); | ||
|
|
||
| final KeyedCollection<String, ContextService> contextServices = new KeyedCollection<>(); | ||
| final KeyedCollection<String, ContextService> contextServicesFromCompManagedBeans = new KeyedCollection<>(); | ||
|
|
||
| for (final JndiConsumer consumer : jndiConsumers) { | ||
| if (consumer == null) { | ||
| continue; | ||
| } | ||
|
|
||
| if (consumer instanceof CompManagedBean) { | ||
| /* | ||
| * TOMEE-2053: It may contain invalid context service definitions | ||
| * because it is never updated with content from the ejb-jar.xml | ||
| * Wait until all other consumers have been processed, to safely | ||
| * decide which context services to transfer; | ||
| */ | ||
|
|
||
| contextServicesFromCompManagedBeans.addAll(consumer.getContextServiceMap().values()); | ||
| continue; | ||
| } | ||
| contextServices.addAll(consumer.getContextServiceMap().values()); | ||
| } | ||
|
|
||
| final Map<String, ContextService> dataSourcesMap = contextServices.toMap(); | ||
| for(ContextService contextService : contextServicesFromCompManagedBeans){ | ||
| //Interested only in ContextServices that come from non-JndiConsumers | ||
| if(!dataSourcesMap.containsKey(contextService.getName().getvalue())){ | ||
| contextServices.add(contextService); | ||
| } | ||
| } | ||
|
|
||
| for (final ContextService dataSource : contextServices) { | ||
| appModule.getResources().add(toResource(dataSource)); | ||
| } | ||
| return appModule; | ||
| } | ||
|
|
||
|
|
||
| private Resource toResource(final ContextService contextService) { | ||
| final String name = cleanUpName(contextService.getName().getvalue()); | ||
|
|
||
| final Resource def = new Resource(name, jakarta.enterprise.concurrent.ContextService.class.getName()); | ||
|
|
||
| def.setJndi(contextService.getName().getvalue().replaceFirst("java:", "")); | ||
| def.setType(jakarta.enterprise.concurrent.ContextService.class.getName()); | ||
|
|
||
| final Properties p = def.getProperties(); | ||
| put(p, "propagated", Join.join(",", contextService.getPropagated())); | ||
| put(p, "cleared", Join.join(",", contextService.getCleared())); | ||
| put(p, "unchanged", Join.join(",", contextService.getUnchanged())); | ||
|
|
||
| // to force it to be bound in JndiEncBuilder | ||
| put(p, "JndiName", def.getJndi()); | ||
|
|
||
| return def; | ||
| } | ||
|
|
||
| private static void put(final Properties properties, final String key, final Object value) { | ||
| if (key == null) { | ||
| return; | ||
| } | ||
| if (value == null) { | ||
| return; | ||
| } | ||
|
|
||
| properties.put(key, PropertyPlaceHolderHelper.value(String.valueOf(value))); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.