You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2011/06/17 00:20:59 UTC
svn commit: r1136710 - in /myfaces/extensions/cdi/trunk:
core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/
jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/
Author: gpetracek
Date: Thu Jun 16 22:20:59 2011
New Revision: 1136710
URL: http://svn.apache.org/viewvc?rev=1136710&view=rev
Log:
cleanup of old implementations
Modified:
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java
myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/ScriptEngineManagerProducer.java
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java?rev=1136710&r1=1136709&r2=1136710&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java Thu Jun 16 22:20:59 2011
@@ -42,7 +42,6 @@ import java.util.ArrayList;
import java.util.Set;
import java.util.Collections;
import java.util.Arrays;
-import java.util.concurrent.CopyOnWriteArrayList;
/**
* This is a collection of a few useful static helper functions.
@@ -487,65 +486,6 @@ public abstract class CodiUtils
}
/**
- * Resolves a custom configuration which is configured via a ServiceLoader config
- * @param configurationType type of the configuration
- * @param <T> target type
- * @return resolved configuration
- */
- public static <T extends CodiConfig> T lookupAlternativeConfig(Class<T> configurationType)
- {
- final List<CodiConfig> configs = new CopyOnWriteArrayList<CodiConfig>();
- CodiUtils.lookupFromEnvironment(CodiConfig.class, new Aggregatable<CodiConfig>()
- {
- /**
- * {@inheritDoc}
- */
- public void add(CodiConfig codiConfig)
- {
- configs.add(codiConfig);
- }
-
- /**
- * {@inheritDoc}
- */
- public CodiConfig create()
- {
- return null;
- }
- });
-
- //remove other configs
- for(CodiConfig codiConfig : configs)
- {
- if(!configurationType.isAssignableFrom(codiConfig.getClass()))
- {
- configs.remove(codiConfig);
- }
- }
-
- if(configs.size() > 1)
- {
- //user provided a custom implementation -> remove codi implementations
- for(CodiConfig codiConfig : configs)
- {
- if(!codiConfig.getClass().getName().startsWith("org.apache.myfaces.extensions.cdi."))
- {
- configs.remove(codiConfig);
- }
- }
- }
- else if(configs.size() == 0)
- {
- RuntimeException runtimeException = new RuntimeException();
- throw new IllegalStateException("no alternative configuration found for " + configurationType
- + " please add a module with an alternative configuration implementation or remove the jar file"
- + " which contains " + runtimeException.getStackTrace()[1].getClassName());
- }
-
- return (T)configs.iterator().next();
- }
-
- /**
* Resolves resources outside of CDI for the given class.
* @param targetType target type
* @param defaultImplementation default implementation
Modified: myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/ScriptEngineManagerProducer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/ScriptEngineManagerProducer.java?rev=1136710&r1=1136709&r2=1136710&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/ScriptEngineManagerProducer.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/scripting-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/scripting/impl/ScriptEngineManagerProducer.java Thu Jun 16 22:20:59 2011
@@ -148,28 +148,6 @@ public class ScriptEngineManagerProducer
return new InjectableScriptEngine(result, language);
}
- /*
- @Produces
- @ScriptExtension("")
- public ScriptEngine createScriptEngineByExtension(InjectionPoint injectionPoint,
- ScriptEngineManager scriptEngineManager)
- {
- String extension = injectionPoint.getAnnotated().getAnnotation(ScriptExtension.class).value();
-
- return checkedScriptEngine(scriptEngineManager.getEngineByExtension(extension), extension);
- }
-
- @Produces
- @ScriptMimeType("")
- public ScriptEngine createScriptEngineByMimeType(InjectionPoint injectionPoint,
- ScriptEngineManager scriptEngineManager)
- {
- String mimeType = injectionPoint.getAnnotated().getAnnotation(ScriptMimeType.class).value();
-
- return checkedScriptEngine(scriptEngineManager.getEngineByMimeType(mimeType), mimeType);
- }
- */
-
private ScriptEngine checkedScriptEngine(ScriptEngine scriptEngine, String type)
{
if (scriptEngine != null)