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 2012/02/04 18:13:35 UTC
svn commit: r1240552 - in /myfaces/extensions/cdi/trunk/core: api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/tools/ impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/

Author: gpetracek
Date: Sat Feb  4 17:13:34 2012
New Revision: 1240552

URL: http://svn.apache.org/viewvc?rev=1240552&view=rev
Log:
EXTCDI-249 move SystemAwareExpressionInterpreter to the api module to allow users to use it

Added:
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/tools/SystemAwareExpressionInterpreter.java
      - copied, changed from r1230736, myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/SystemPropertyExpressionInterpreter.java
Removed:
    myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/SystemPropertyExpressionInterpreter.java
Modified:
    myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/DefaultServiceProviderContext.java

Copied: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/tools/SystemAwareExpressionInterpreter.java (from r1230736, myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/SystemPropertyExpressionInterpreter.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/tools/SystemAwareExpressionInterpreter.java?p2=myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/tools/SystemAwareExpressionInterpreter.java&p1=myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/SystemPropertyExpressionInterpreter.java&r1=1230736&r2=1240552&rev=1240552&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/SystemPropertyExpressionInterpreter.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/tools/SystemAwareExpressionInterpreter.java Sat Feb  4 17:13:34 2012
@@ -16,15 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.core.impl.provider;
-
-import org.apache.myfaces.extensions.cdi.core.api.tools.AbstractPropertyExpressionInterpreter;
+package org.apache.myfaces.extensions.cdi.core.api.tools;
 
 /**
- * {@link org.apache.myfaces.extensions.cdi.core.impl.activation.PropertyExpressionInterpreter} which resolves
- * system/env. properties
+ * {@link org.apache.myfaces.extensions.cdi.core.api.interpreter.ExpressionInterpreter} which resolves
+ * system/env. properties.
+ * <p/>
+ * Furthermore, this interpreter is the default interpreter for services configured via the
+ * {@link org.apache.myfaces.extensions.cdi.core.api.provider.ServiceProvider} and annotated with
+ * {@link org.apache.myfaces.extensions.cdi.core.api.activation.ExpressionActivated}
  */
-public class SystemPropertyExpressionInterpreter extends AbstractPropertyExpressionInterpreter
+public class SystemAwareExpressionInterpreter extends AbstractPropertyExpressionInterpreter
 {
     /**
      * {@inheritDoc}

Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/DefaultServiceProviderContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/DefaultServiceProviderContext.java?rev=1240552&r1=1240551&r2=1240552&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/DefaultServiceProviderContext.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/provider/DefaultServiceProviderContext.java Sat Feb  4 17:13:34 2012
@@ -19,6 +19,7 @@
 package org.apache.myfaces.extensions.cdi.core.impl.provider;
 
 import org.apache.myfaces.extensions.cdi.core.api.tools.InvocationOrderComparator;
+import org.apache.myfaces.extensions.cdi.core.api.tools.SystemAwareExpressionInterpreter;
 import org.apache.myfaces.extensions.cdi.core.api.util.ClassUtils;
 import org.apache.myfaces.extensions.cdi.core.impl.provider.spi.EditableServiceProviderContext;
 import org.apache.myfaces.extensions.cdi.core.impl.util.ActivationUtils;
@@ -65,7 +66,7 @@ public class DefaultServiceProviderConte
      */
     public boolean filterService(Class<T> serviceClass)
     {
-        return !ActivationUtils.isActivated(serviceClass, SystemPropertyExpressionInterpreter.class);
+        return !ActivationUtils.isActivated(serviceClass, SystemAwareExpressionInterpreter.class);
     }
 
     /**