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/13 18:37:46 UTC
svn commit: r1135167 - in /myfaces/extensions/cdi/trunk: ./
examples/jsf-playground/hello_myfaces-codi_jsf12/
examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/
examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/
examples/jsf-playgr...
Author: gpetracek
Date: Mon Jun 13 16:37:45 2011
New Revision: 1135167
URL: http://svn.apache.org/viewvc?rev=1135167&view=rev
Log:
moved el tests of the message module to avoid juel as dependency
Added:
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/AbstractMessageTest.java
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/AllMessageTests.java
- copied, changed from r1130646, myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/AllTests.java
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/ArgumentDescriptorTest.java
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/LocalizableMessageArgumentTest.java
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/ParametrizedMessageInterpolationTest.java
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/SimpleLocaleResolver.java
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/SimpleMessageResolver.java
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestArgument.java
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestCar.java
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestELContext.java
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestELProvider.java
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/messages_en.properties
Removed:
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/ArgumentDescriptorTest.java
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/LocalizableMessageArgumentTest.java
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/ParametrizedMessageInterpolationTest.java
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestArgument.java
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestCar.java
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestELContext.java
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestELProvider.java
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestStorage.java
Modified:
myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/pom.xml
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/pom.xml
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/AllTests.java
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/HelperTest.java
myfaces/extensions/cdi/trunk/pom.xml
Modified: myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/pom.xml?rev=1135167&r1=1135166&r2=1135167&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/pom.xml Mon Jun 13 16:37:45 2011
@@ -209,16 +209,10 @@
<!-- el -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_1.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>juel</groupId>
- <artifactId>juel-impl</artifactId>
- <version>2.1.0</version>
- <scope>compile</scope>
+ <artifactId>juel</artifactId>
+ <version>2.2.1</version>
+ <scope>provided</scope>
</dependency>
<!--dependency>
@@ -316,7 +310,45 @@
<scanIntervalSeconds>10</scanIntervalSeconds>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.7.1</version>
+ <configuration>
+ <parallel>methods</parallel>
+ <threadCount>10</threadCount>
+ <properties>
+ <property>
+ <name>junit</name>
+ <value>true</value>
+ </property>
+ </properties>
+ <excludes>
+ <exclude>**/Test*.java</exclude>
+ <exclude>**/Abstract*.java</exclude>
+ <exclude>**/*$*.java</exclude>
+ </excludes>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>2.7.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
+ <testResources>
+ <testResource>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
</build>
</profile>
</profiles>
Added: myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/AbstractMessageTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/AbstractMessageTest.java?rev=1135167&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/AbstractMessageTest.java (added)
+++ myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/AbstractMessageTest.java Mon Jun 13 16:37:45 2011
@@ -0,0 +1,41 @@
+/*
+ * 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.myfaces.extensions.cdi.message.test;
+
+import org.apache.myfaces.extensions.cdi.message.api.MessageContext;
+import org.apache.myfaces.extensions.cdi.message.impl.DefaultMessageContext;
+import org.junit.Before;
+
+/**
+ * @author Gerhard Petracek
+ */
+public abstract class AbstractMessageTest
+{
+ protected MessageContext messageContext;
+
+ @SuppressWarnings({"serial"})
+ @Before
+ public void setupFactory()
+ {
+ this.messageContext = new DefaultMessageContext(){}.config().use()
+ .messageResolver(new SimpleMessageResolver())
+ .localeResolver(new SimpleLocaleResolver())
+ .create();
+ }
+}
Copied: myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/AllMessageTests.java (from r1130646, myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/AllTests.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/AllMessageTests.java?p2=myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/AllMessageTests.java&p1=myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/AllTests.java&r1=1130646&r2=1135167&rev=1135167&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/AllTests.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/AllMessageTests.java Mon Jun 13 16:37:45 2011
@@ -27,17 +27,10 @@ import org.junit.runners.Suite;
*/
@RunWith(Suite.class)
@Suite.SuiteClasses({
- SimpleMessageTest.class,
- MessageSeverityTest.class,
- ParametrizedMessageInterpolationTest.class,
- FormattedMessageArgumentTest.class,
- PayloadTest.class,
- ExtensibilityTest.class,
- MessageFilterTest.class,
- HelperTest.class,
- SerializationTest.class,
+ ArgumentDescriptorTest.class,
LocalizableMessageArgumentTest.class,
- ArgumentDescriptorTest.class})
-public class AllTests extends TestCase
+ ParametrizedMessageInterpolationTest.class
+})
+public class AllMessageTests extends TestCase
{
}
Added: myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/ArgumentDescriptorTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/ArgumentDescriptorTest.java?rev=1135167&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/ArgumentDescriptorTest.java (added)
+++ myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/ArgumentDescriptorTest.java Mon Jun 13 16:37:45 2011
@@ -0,0 +1,102 @@
+/*
+ * 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.myfaces.extensions.cdi.message.test;
+
+import org.apache.myfaces.extensions.cdi.message.impl.NumberedArgumentAwareMessageInterpolator;
+import org.apache.myfaces.extensions.cdi.message.impl.ELAwareMessageInterpolator;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * @author Gerhard Petracek
+ */
+public class ArgumentDescriptorTest extends AbstractMessageTest
+{
+ @Test
+ public void lazyNumberedArgumentsTest()
+ {
+ TestArgument dynArgument = new TestArgument("brand_key");
+
+ Assert.assertEquals("{brand_key}", dynArgument.getKey());
+
+ String messageText = this.messageContext.config().use().messageInterpolator(new NumberedArgumentAwareMessageInterpolator()).create()
+ .message().text("{info}").argument(dynArgument.getKey()).toText();
+
+ Assert.assertEquals("jCar", dynArgument.toString(this.messageContext));
+ assertEquals("value: jCar", messageText);
+ }
+
+ @Test
+ public void lazyNamedArgumentsTest()
+ {
+ TestArgument dynArgument = new TestArgument("brand_key");
+
+ Assert.assertEquals("{brand_key}", dynArgument.getKey());
+
+ String messageText = this.messageContext.config().use().messageInterpolator(new ELAwareMessageInterpolator(new TestELProvider())).create()
+ .message().text("{brand_info}").namedArgument("brand", dynArgument.getKey()).toText();
+
+ Assert.assertEquals("jCar", dynArgument.toString(this.messageContext));
+ assertEquals("value: jCar", messageText);
+ }
+
+ @Test
+ public void normalTextAsNumberedArgumentsTest()
+ {
+ TestArgument dynArgument = new TestArgument("brand-value") {
+ private static final long serialVersionUID = -5398006578422304127L;
+
+ @Override
+ public String getKey()
+ {
+ return this.key;
+ }
+ };
+
+ Assert.assertEquals("brand-value", dynArgument.getKey());
+
+ String messageText = this.messageContext.config().use().messageInterpolator(new NumberedArgumentAwareMessageInterpolator()).create()
+ .message().text("{info}").argument(dynArgument.getKey()).toText();
+
+ assertEquals("value: brand-value", messageText);
+ }
+
+ @Test
+ public void normalTextAsNamedArgumentsTest()
+ {
+ TestArgument dynArgument = new TestArgument("brand-value") {
+ private static final long serialVersionUID = -5398006578422304127L;
+
+ @Override
+ public String getKey()
+ {
+ return this.key;
+ }
+ };
+
+ Assert.assertEquals("brand-value", dynArgument.getKey());
+
+ String messageText = this.messageContext.config().use().messageInterpolator(new ELAwareMessageInterpolator(new TestELProvider())).create()
+ .message().text("{brand_info}").namedArgument("brand", dynArgument.getKey()).toText();
+
+ assertEquals("value: brand-value", messageText);
+ }
+}
\ No newline at end of file
Added: myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/LocalizableMessageArgumentTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/LocalizableMessageArgumentTest.java?rev=1135167&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/LocalizableMessageArgumentTest.java (added)
+++ myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/LocalizableMessageArgumentTest.java Mon Jun 13 16:37:45 2011
@@ -0,0 +1,50 @@
+/*
+ * 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.myfaces.extensions.cdi.message.test;
+
+import org.apache.myfaces.extensions.cdi.message.impl.NumberedArgumentAwareMessageInterpolator;
+import org.apache.myfaces.extensions.cdi.message.impl.ELAwareMessageInterpolator;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
+/**
+ * @author Gerhard Petracek
+ */
+public class LocalizableMessageArgumentTest extends AbstractMessageTest
+{
+ @Test
+ public void createMessageWithLocalizableNumberedAttributeTest()
+ {
+ String messageText = this.messageContext.config().use()
+ .messageInterpolator(new NumberedArgumentAwareMessageInterpolator()).create()
+ .message().text("{info}").argument(new TestCar()).toText();
+
+ assertEquals("value: jCar", messageText);
+ }
+
+ @Test
+ public void createMessageWithLocalizableNamedAttributeTest()
+ {
+ this.messageContext.config().change().messageInterpolator(new ELAwareMessageInterpolator(new TestELProvider())).create();
+
+ String messageText = this.messageContext.message().text("{brand_info}").namedArgument("brand", new TestCar()).toText();
+
+ assertEquals("value: jCar", messageText);
+ }
+}
Added: myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/ParametrizedMessageInterpolationTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/ParametrizedMessageInterpolationTest.java?rev=1135167&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/ParametrizedMessageInterpolationTest.java (added)
+++ myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/ParametrizedMessageInterpolationTest.java Mon Jun 13 16:37:45 2011
@@ -0,0 +1,128 @@
+/*
+ * 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.myfaces.extensions.cdi.message.test;
+
+import org.apache.myfaces.extensions.cdi.message.api.MessageInterpolator;
+import org.apache.myfaces.extensions.cdi.message.impl.CompositeMessageInterpolator;
+import org.apache.myfaces.extensions.cdi.message.impl.ELAwareMessageInterpolator;
+import org.apache.myfaces.extensions.cdi.message.impl.NamedArgumentMessageInterpolator;
+import org.apache.myfaces.extensions.cdi.message.impl.NumberedArgumentAwareMessageInterpolator;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import org.junit.Test;
+
+import java.io.Serializable;
+
+/**
+ * @author Gerhard Petracek
+ */
+public class ParametrizedMessageInterpolationTest extends AbstractMessageTest
+{
+ @Test
+ public void createElAwareMessageTest()
+ {
+ String messageText = this.messageContext.config().change().messageInterpolator(createELAwareInterpolator()).create()
+ .message().text("hello {person.name}").namedArgument("person", new TestPerson()).toText();
+
+ assertEquals("hello Thomas", messageText);
+ }
+
+ @Test
+ public void createNumberedArgumentAwareMessageTest()
+ {
+ MessageInterpolator messageInterpolator = new CompositeMessageInterpolator(createELAwareInterpolator(), new NumberedArgumentAwareMessageInterpolator());
+ String messageText = this.messageContext.config().change().messageInterpolator(messageInterpolator).create()
+ .message().text("\\{0} greets {1}")
+ .argument("Gerhard", "Manfred").argument(new TestPerson()).toText();
+
+ assertEquals("Gerhard greets Manfred", messageText);
+ }
+
+ @Test
+ public void createNamedArgumentAwareMessageTest()
+ {
+ String messageText = this.messageContext.config().change().messageInterpolator(createELAwareInterpolator()).create()
+ .message().text("\\{p1} and {p2} greet {p3.name}")
+ .namedArgument("p2", "Gerhard").namedArgument("p1", "Manfred").namedArgument("p3", new TestPerson())
+ .toText();
+
+ assertEquals("Manfred and Gerhard greet Thomas", messageText);
+ }
+
+ @Test
+ public void overrideNamedArgumentTest()
+ {
+ try
+ {
+ this.messageContext.config().change().messageInterpolator(createELAwareInterpolator()).create()
+ .message().text("\\{p1} and {p2} greet {p3.name}")
+ .namedArgument("p2", "Gerhard").namedArgument("p2", "Manfred").namedArgument("p3", new TestPerson())
+ .toText();
+ }
+ catch (UnsupportedOperationException e)
+ {
+ return;
+ }
+
+ fail();
+ }
+
+ private ELAwareMessageInterpolator createELAwareInterpolator()
+ {
+ return new ELAwareMessageInterpolator(new TestELProvider());
+ }
+
+ @Test
+ public void createMixedArgumentAwareMessageTest()
+ {
+ MessageInterpolator messageInterpolator = new CompositeMessageInterpolator(createELAwareInterpolator(), new NumberedArgumentAwareMessageInterpolator());
+ String messageText = this.messageContext.config().change().messageInterpolator(messageInterpolator).create()
+ .message().text("[hello] {0} and {firstName} ({1} and {lastName}) greet {person.name}")
+ .argument("Gerhard", "Petracek")
+ .namedArgument("person", new TestPerson())
+ .namedArgument("lastName", "Geiler").namedArgument("firstName", "Manfred").toText();
+
+ assertEquals("[hello] Gerhard and Manfred (Petracek and Geiler) greet Thomas", messageText);
+ }
+
+ @Test
+ public void createMixedArgumentAwareMessageWithSimpleNamedArgumentMessageInterpolatorTest()
+ {
+ MessageInterpolator messageInterpolator = new CompositeMessageInterpolator(new NamedArgumentMessageInterpolator(), new NumberedArgumentAwareMessageInterpolator());
+ String messageText = this.messageContext.config().change().messageInterpolator(messageInterpolator).create()
+ .message().text("[hello] {0} and {firstName} ({1} and {lastName})")
+ .argument("Gerhard", "Petracek")
+ .namedArgument("person", new TestPerson())
+ .namedArgument("firstName", "Manfred")
+ .namedArgument("lastName", "Geiler")
+ .toText();
+
+ assertEquals("[hello] Gerhard and Manfred (Petracek and Geiler)", messageText);
+ }
+
+ private class TestPerson implements Serializable
+ {
+ private static final long serialVersionUID = 1505396194005924707L;
+
+ public String getName()
+ {
+ return "Thomas";
+ }
+ }
+}
\ No newline at end of file
Added: myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/SimpleLocaleResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/SimpleLocaleResolver.java?rev=1135167&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/SimpleLocaleResolver.java (added)
+++ myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/SimpleLocaleResolver.java Mon Jun 13 16:37:45 2011
@@ -0,0 +1,36 @@
+/*
+ * 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.myfaces.extensions.cdi.message.test;
+
+import org.apache.myfaces.extensions.cdi.message.api.LocaleResolver;
+
+import java.util.Locale;
+
+/**
+ * @author Gerhard Petracek
+ */
+class SimpleLocaleResolver implements LocaleResolver
+{
+ private static final long serialVersionUID = 1927000487639667773L;
+
+ public Locale getLocale()
+ {
+ return Locale.ENGLISH;
+ }
+}
\ No newline at end of file
Added: myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/SimpleMessageResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/SimpleMessageResolver.java?rev=1135167&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/SimpleMessageResolver.java (added)
+++ myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/SimpleMessageResolver.java Mon Jun 13 16:37:45 2011
@@ -0,0 +1,81 @@
+/*
+ * 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.myfaces.extensions.cdi.message.test;
+
+import org.apache.myfaces.extensions.cdi.message.api.MessageContext;
+import org.apache.myfaces.extensions.cdi.message.api.MessageResolver;
+import org.apache.myfaces.extensions.cdi.message.api.payload.MessagePayload;
+
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+/**
+ * @author Gerhard Petracek
+ */
+class SimpleMessageResolver implements MessageResolver
+{
+ private static final long serialVersionUID = -2511565654167302283L;
+
+ private static final String TEST_MESSAGES = "org.apache.myfaces.extensions.cdi.message.test.messages";
+ private static final String TEST_TECHNICAL_MESSAGES = "org.apache.myfaces.extensions.cdi.message.test.t_messages";
+ private static final String TEST_LABELS = "org.apache.myfaces.extensions.cdi.message.test.labels";
+
+ public String getMessage(MessageContext messageContext,
+ String key,
+ Map<Class, MessagePayload> messagePayload)
+ {
+ if (!isKey(key))
+ {
+ return key;
+ }
+
+ try
+ {
+ key = extractKey(key);
+
+ return ResourceBundle.getBundle(
+ TEST_MESSAGES, messageContext.getLocale(), getClassLoader()).getString(key);
+ }
+ catch (MissingResourceException e)
+ {
+ return key;
+ }
+ }
+
+ private boolean isKey(String key)
+ {
+ return key.startsWith("{") && key.endsWith("}");
+ }
+
+ private String extractKey(String key)
+ {
+ return key.substring(1, key.length() - 1);
+ }
+
+ private ClassLoader getClassLoader()
+ {
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ if (classLoader == null)
+ {
+ classLoader = SimpleMessageResolver.class.getClassLoader();
+ }
+ return classLoader;
+ }
+}
Added: myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestArgument.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestArgument.java?rev=1135167&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestArgument.java (added)
+++ myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestArgument.java Mon Jun 13 16:37:45 2011
@@ -0,0 +1,54 @@
+/*
+ * 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.myfaces.extensions.cdi.message.test;
+
+import org.apache.myfaces.extensions.cdi.message.api.Localizable;
+import org.apache.myfaces.extensions.cdi.message.api.MessageContext;
+
+import java.io.Serializable;
+
+/**
+ * @author Gerhard Petracek
+ */
+class TestArgument implements Localizable, Serializable
+{
+ private static final long serialVersionUID = -4503818588255027507L;
+ protected String key;
+
+ TestArgument(String key)
+ {
+ this.key = key;
+ }
+
+ public String getKey()
+ {
+ return "{" + key + "}";
+ }
+
+ public String toString(MessageContext messageContext)
+ {
+ return messageContext.message().text(getKey()).toText();
+ }
+
+ @Override
+ public String toString()
+ {
+ return "???" + key + "???";
+ }
+}
Added: myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestCar.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestCar.java?rev=1135167&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestCar.java (added)
+++ myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestCar.java Mon Jun 13 16:37:45 2011
@@ -0,0 +1,37 @@
+/*
+ * 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.myfaces.extensions.cdi.message.test;
+
+import org.apache.myfaces.extensions.cdi.message.api.Localizable;
+import org.apache.myfaces.extensions.cdi.message.api.MessageContext;
+
+import java.io.Serializable;
+
+/**
+ * @author Gerhard Petracek
+ */
+class TestCar implements Localizable, Serializable
+{
+ private static final long serialVersionUID = -6656106590590481348L;
+
+ public String toString(MessageContext messageContext)
+ {
+ return messageContext.message().text("{brand}").toText();
+ }
+}
Added: myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestELContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestELContext.java?rev=1135167&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestELContext.java (added)
+++ myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestELContext.java Mon Jun 13 16:37:45 2011
@@ -0,0 +1,63 @@
+/*
+ * 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.myfaces.extensions.cdi.message.test;
+
+import de.odysseus.el.util.SimpleContext;
+import org.apache.myfaces.extensions.cdi.message.impl.spi.SimpleELContext;
+
+import javax.el.ELResolver;
+import javax.el.FunctionMapper;
+import javax.el.ValueExpression;
+import javax.el.VariableMapper;
+
+/**
+ * @author Manfred Geiler
+ */
+class TestELContext extends SimpleELContext
+{
+ private SimpleContext simpleContext;
+
+ public TestELContext(ELResolver elResolver)
+ {
+ this.simpleContext = new SimpleContext(elResolver);
+ }
+
+ /*
+ * generated
+ */
+ public ValueExpression setVariable(String s, ValueExpression valueExpression)
+ {
+ return simpleContext.setVariable(s, valueExpression);
+ }
+
+ public FunctionMapper getFunctionMapper()
+ {
+ return simpleContext.getFunctionMapper();
+ }
+
+ public VariableMapper getVariableMapper()
+ {
+ return simpleContext.getVariableMapper();
+ }
+
+ public ELResolver getELResolver()
+ {
+ return simpleContext.getELResolver();
+ }
+}
Added: myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestELProvider.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestELProvider.java?rev=1135167&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestELProvider.java (added)
+++ myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/TestELProvider.java Mon Jun 13 16:37:45 2011
@@ -0,0 +1,48 @@
+/*
+ * 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.myfaces.extensions.cdi.message.test;
+
+import de.odysseus.el.ExpressionFactoryImpl;
+import de.odysseus.el.util.SimpleResolver;
+import org.apache.myfaces.extensions.cdi.message.impl.spi.ELProvider;
+import org.apache.myfaces.extensions.cdi.message.impl.spi.SimpleELContext;
+
+import javax.el.ELResolver;
+import javax.el.ExpressionFactory;
+
+/**
+ * @author Manfred Geiler
+ */
+class TestELProvider implements ELProvider
+{
+ public ExpressionFactory createExpressionFactory()
+ {
+ return new ExpressionFactoryImpl();
+ }
+
+ public SimpleELContext createELContext(ELResolver elResolver)
+ {
+ return new TestELContext(elResolver);
+ }
+
+ public ELResolver createELResolver()
+ {
+ return new SimpleResolver(true /*readonly*/);
+ }
+}
Added: myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/messages_en.properties
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/messages_en.properties?rev=1135167&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/messages_en.properties (added)
+++ myfaces/extensions/cdi/trunk/examples/jsf-playground/hello_myfaces-codi_jsf12/src/test/java/org/apache/myfaces/extensions/cdi/message/test/messages_en.properties Mon Jun 13 16:37:45 2011
@@ -0,0 +1,23 @@
+# 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.
+
+hello=test message
+formatted_number=value: {0}
+info=value: {0}
+brand_info=value: {brand}
+brand=jCar
+brand_key=jCar
\ No newline at end of file
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/pom.xml?rev=1135167&r1=1135166&r2=1135167&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/pom.xml Mon Jun 13 16:37:45 2011
@@ -44,8 +44,8 @@
</dependency>
<dependency>
- <groupId>juel</groupId>
- <artifactId>juel</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/AllTests.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/AllTests.java?rev=1135167&r1=1135166&r2=1135167&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/AllTests.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/AllTests.java Mon Jun 13 16:37:45 2011
@@ -29,15 +29,12 @@ import org.junit.runners.Suite;
@Suite.SuiteClasses({
SimpleMessageTest.class,
MessageSeverityTest.class,
- ParametrizedMessageInterpolationTest.class,
FormattedMessageArgumentTest.class,
PayloadTest.class,
ExtensibilityTest.class,
MessageFilterTest.class,
HelperTest.class,
- SerializationTest.class,
- LocalizableMessageArgumentTest.class,
- ArgumentDescriptorTest.class})
+ SerializationTest.class})
public class AllTests extends TestCase
{
}
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/HelperTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/HelperTest.java?rev=1135167&r1=1135166&r2=1135167&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/HelperTest.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/message/test/HelperTest.java Mon Jun 13 16:37:45 2011
@@ -21,7 +21,6 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.message.api.Message;
import org.apache.myfaces.extensions.cdi.message.api.MessageContextConfigAware;
import org.apache.myfaces.extensions.cdi.message.impl.DefaultMessage;
-import org.apache.myfaces.extensions.cdi.message.impl.ELAwareMessageInterpolator;
import org.apache.myfaces.extensions.cdi.message.impl.NamedArguments;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
@@ -40,8 +39,6 @@ public class HelperTest extends Abstract
@Test
public void namedArgumentBuilderTest()
{
- this.messageContext.config().change().messageInterpolator(new ELAwareMessageInterpolator(new TestELProvider()));
-
Number arg1 = new BigDecimal("123.4567");
Date arg2 = new Date();
String text = "#1: {arg1} and #2: {arg2}";
@@ -60,8 +57,6 @@ public class HelperTest extends Abstract
@Test
public void convertNamedArgumentTest()
{
- this.messageContext.config().change().messageInterpolator(new ELAwareMessageInterpolator(new TestELProvider()));
-
Number arg1 = new BigDecimal("123.4567");
Date arg2 = new Date();
String text = "#1: {arg1} and #2: {arg2}";
Modified: myfaces/extensions/cdi/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/pom.xml?rev=1135167&r1=1135166&r2=1135167&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/pom.xml Mon Jun 13 16:37:45 2011
@@ -346,6 +346,7 @@
<version>1.0.2</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_2.2_spec</artifactId>
@@ -396,13 +397,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>juel</groupId>
- <artifactId>juel</artifactId>
- <version>2.2.1</version>
- <scope>provided</scope>
- </dependency>
-
</dependencies>
</dependencyManagement>