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/05/18 01:03:36 UTC
svn commit: r1104618 - in /myfaces/extensions/cdi/trunk/core/impl/src:
main/java/org/apache/myfaces/extensions/cdi/core/impl/activation/
main/java/org/apache/myfaces/extensions/cdi/core/impl/config/
test/java/org/apache/myfaces/extensions/cdi/core/test...
Author: gpetracek
Date: Tue May 17 23:03:35 2011
New Revision: 1104618
URL: http://svn.apache.org/viewvc?rev=1104618&view=rev
Log:
EXTCDI-174 @ExpressionActivated
Modified:
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/activation/ActivationExtension.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/activation/PropertyExpressionInterpreter.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/PropertyFileResolver.java
myfaces/extensions/cdi/trunk/core/impl/src/test/java/org/apache/myfaces/extensions/cdi/core/test/impl/activation/testbeans/ExpressionActivatedTestBeanMockImpl.java
myfaces/extensions/cdi/trunk/core/impl/src/test/resources/myfaces-extcdi.properties
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/activation/ActivationExtension.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/activation/ActivationExtension.java?rev=1104618&r1=1104617&r2=1104618&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/activation/ActivationExtension.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/activation/ActivationExtension.java Tue May 17 23:03:35 2011
@@ -117,7 +117,7 @@ public class ActivationExtension impleme
return;
}
- expressions = "config:" + expressionActivated.configName() + ";" + expressions;
+ expressions = "configName:" + expressionActivated.configName() + ";" + expressions;
if (!expressionInterpreter.evaluate(expressions))
{
// this alternative shall not get used
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/activation/PropertyExpressionInterpreter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/activation/PropertyExpressionInterpreter.java?rev=1104618&r1=1104617&r2=1104618&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/activation/PropertyExpressionInterpreter.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/activation/PropertyExpressionInterpreter.java Tue May 17 23:03:35 2011
@@ -49,9 +49,11 @@ public class PropertyExpressionInterpret
{
operation = SimpleOperationEnum.NOT;
}
- else if(expression.startsWith("config:"))
+ else if(expression.startsWith("configName:"))
{
configFileName = expression.split(":")[1];
+ //TODO refactor it - current impl. ensures backward compatibility (see PropertyFileResolver)
+ configFileName = configFileName.replace(".", "@");
continue;
}
else
@@ -69,8 +71,11 @@ public class PropertyExpressionInterpret
if("".equals(configuredValue))
{
+ //TODO refactor it - current impl. ensures backward compatibility (see PropertyFileResolver)
+ String internalKey = keyValue[0] + "_";
+
configuredValue = CodiUtils
- .lookupConfigFromEnvironment(configFileName + "." + keyValue[0], String.class, "");
+ .lookupConfigFromEnvironment(configFileName + "." + internalKey, String.class, "");
configuredValue = configuredValue.trim();
}
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/PropertyFileResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/PropertyFileResolver.java?rev=1104618&r1=1104617&r2=1104618&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/PropertyFileResolver.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/PropertyFileResolver.java Tue May 17 23:03:35 2011
@@ -51,7 +51,24 @@ public class PropertyFileResolver extend
return Collections.emptyList();
}
- String bundleName = BASE_NAME + key.substring(0, key.indexOf("."));
+ //TODO
+ if(key.endsWith("_"))
+ {
+ key = key.substring(0, key.length() - 1);
+ }
+
+ String bundleName;
+
+ //TODO
+ if(key.contains("@") && key.lastIndexOf("@") < key.indexOf("."))
+ {
+ bundleName = key.substring(0, key.indexOf("."));
+ bundleName = bundleName.replace("@", ".");
+ }
+ else
+ {
+ bundleName= BASE_NAME + key.substring(0, key.indexOf("."));
+ }
ResourceBundle resourceBundle;
Modified: myfaces/extensions/cdi/trunk/core/impl/src/test/java/org/apache/myfaces/extensions/cdi/core/test/impl/activation/testbeans/ExpressionActivatedTestBeanMockImpl.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/test/java/org/apache/myfaces/extensions/cdi/core/test/impl/activation/testbeans/ExpressionActivatedTestBeanMockImpl.java?rev=1104618&r1=1104617&r2=1104618&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/test/java/org/apache/myfaces/extensions/cdi/core/test/impl/activation/testbeans/ExpressionActivatedTestBeanMockImpl.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/test/java/org/apache/myfaces/extensions/cdi/core/test/impl/activation/testbeans/ExpressionActivatedTestBeanMockImpl.java Tue May 17 23:03:35 2011
@@ -26,7 +26,7 @@ import javax.enterprise.inject.Alternati
@ApplicationScoped
@Alternative
-@ExpressionActivated("db_env!=prod-db")
+@ExpressionActivated("db!=prod-db")
public class ExpressionActivatedTestBeanMockImpl implements ExpressionActivatedTestBean
{
public void test()
Modified: myfaces/extensions/cdi/trunk/core/impl/src/test/resources/myfaces-extcdi.properties
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/test/resources/myfaces-extcdi.properties?rev=1104618&r1=1104617&r2=1104618&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/test/resources/myfaces-extcdi.properties (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/test/resources/myfaces-extcdi.properties Tue May 17 23:03:35 2011
@@ -1,2 +1,2 @@
-db_env=test-db
+db=test-db
server_name=s1
\ No newline at end of file