Merge remote branch 'origin/master'

jharting · Mar 19, 2011 · 9e36922 · 9e36922
2 parents 84494d7 + d876d37
commit 9e36922
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 19 deletions.
diff --git a/...m/international/status/StatusMessage.java → ...oss/seam/international/status/Status.java b/...m/international/status/StatusMessage.java → ...oss/seam/international/status/Status.java
@@ -51,7 +51,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-public @interface StatusMessage {
+public @interface Status {
 
     /**
      * The UI target for the message.

diff --git a/impl/pom.xml b/impl/pom.xml
@@ -30,13 +30,21 @@
       <dependency>
          <groupId>org.jboss.seam.solder</groupId>
          <artifactId>seam-solder</artifactId>
+         <version>3.0.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
          <groupId>org.jboss.seam.solder</groupId>
          <artifactId>seam-solder-tooling</artifactId>
-         <version>3.0.0.CR2</version>
+         <version>3.0.0-SNAPSHOT</version>
+         <scope>provided</scope>
          <optional>true</optional>
+         <exclusions>
+            <exclusion>
+               <groupId>org.jboss.seam.solder</groupId>
+               <artifactId>seam-solder-api</artifactId>
+            </exclusion>
+         </exclusions>
       </dependency>
 
       <dependency>

diff --git a/...ternational/status/MessagesExtension.java → ...us/TypedStatusMessageBundleExtension.java b/...ternational/status/MessagesExtension.java → ...us/TypedStatusMessageBundleExtension.java
@@ -48,16 +48,15 @@
 
 import org.jboss.logging.Logger;
 import org.jboss.seam.solder.literal.MessageBundleLiteral;
-import org.jboss.seam.solder.logging.MessageBundle;
+import org.jboss.seam.solder.messages.MessageBundle;
 import org.jboss.seam.solder.reflection.annotated.AnnotatedTypeBuilder;
 
 /**
  * @author <a href="http://community.jboss.org/people/kenfinni">Ken Finnigan</a>
- * 
  */
-public class MessagesExtension implements Extension {
+public class TypedStatusMessageBundleExtension implements Extension {
 
-    private static final Logger log = Logger.getLogger(MessagesExtension.class);
+    private static final Logger log = Logger.getLogger(TypedStatusMessageBundleExtension.class);
 
     <X> void detectBundleInjectionTargets(@Observes ProcessInjectionTarget<X> event, BeanManager beanManager) {
         AnnotatedType<X> type = event.getAnnotatedType();

diff --git a/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
@@ -1 +1 @@
-org.jboss.seam.international.status.MessagesExtension
+org.jboss.seam.international.status.TypedStatusMessageBundleExtension
diff --git a/impl/src/test/java/org/jboss/seam/international/test/status/RegistrationStatusMessages.java b/impl/src/test/java/org/jboss/seam/international/test/status/RegistrationStatusMessages.java
@@ -16,16 +16,15 @@
  */
 package org.jboss.seam.international.test.status;
 
-import org.jboss.seam.international.status.StatusMessage;
-import org.jboss.seam.solder.log.Locale;
-import org.jboss.seam.solder.logging.Message;
-import org.jboss.seam.solder.logging.MessageBundle;
+import org.jboss.seam.international.status.Status;
+import org.jboss.seam.solder.messages.Locale;
+import org.jboss.seam.solder.messages.Message;
+import org.jboss.seam.solder.messages.MessageBundle;
 
 @MessageBundle
 public interface RegistrationStatusMessages {
-
-    @Message("Username {0} is already taken.  Please choose another.")
-    @StatusMessage()
+    @Status
+    @Message("Username {0} is already taken. Please choose another.")
     @Locale("en_US")
     String duplicateUsername(String username);
 }
diff --git a/impl/src/test/java/org/jboss/seam/international/test/status/RegistrationStatusTest.java b/impl/src/test/java/org/jboss/seam/international/test/status/RegistrationStatusTest.java
@@ -32,11 +32,6 @@
 
 //@RunWith(Arquillian.class)
 public class RegistrationStatusTest {
-    // TODO temporary, test with dynamic proxies until tool accepts "BirdLogger extends BirdMessages"
-    static {
-        System.setProperty("jboss.i18n.generate-proxies", "true");
-    }
-
     // @Deployment
     public static JavaArchive createTestArchive() {
         return ShrinkWrap.create(JavaArchive.class, "test.jar").addPackage(MessagesImpl.class.getPackage())