From 9683c8d13e5b340458b7880a78138e951d703869 Mon Sep 17 00:00:00 2001
From: Shane Bryzak <sbryzak@gmail.com>
Date: Wed, 24 Aug 2011 13:14:41 +1000
Subject: [PATCH] update parent and bom versions, fix compiler errors, fix
 distribution

---
 dist/src/main/assembly/assembly.xml                           | 3 +++
 docs/src/main/docbook/en-US/version_info.xml                  | 1 +
 .../timeanddate/worldclock/AvailableTimeZonesBean.java        | 2 +-
 .../datetimezone/DefaultDateTimeZoneProducer.java             | 2 +-
 .../international/jdktimezone/DefaultTimeZoneProducer.java    | 2 +-
 .../org/jboss/seam/international/locale/AvailableLocales.java | 2 +-
 .../seam/international/locale/DefaultLocaleProducer.java      | 2 +-
 .../status/TypedStatusMessageBundleExtension.java             | 2 +-
 .../status/builder/BundleTemplateMessageImpl.java             | 2 +-
 pom.xml                                                       | 4 ++--
 10 files changed, 13 insertions(+), 9 deletions(-)
 create mode 100644 docs/src/main/docbook/en-US/version_info.xml

diff --git a/dist/src/main/assembly/assembly.xml b/dist/src/main/assembly/assembly.xml
index 11d8dfd..0deda41 100644
--- a/dist/src/main/assembly/assembly.xml
+++ b/dist/src/main/assembly/assembly.xml
@@ -3,6 +3,8 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
 
+   <id>distribution</id>
+
    <formats>
       <format>zip</format>
    </formats>
@@ -29,6 +31,7 @@
          <outputDirectory>artifacts</outputDirectory>
          <useProjectArtifact>false</useProjectArtifact>
          <includes>
+            <include>org.jboss.seam.international:seam-international-api</include>
             <include>org.jboss.seam.international:seam-international</include>
          </includes>
          <excludes>
diff --git a/docs/src/main/docbook/en-US/version_info.xml b/docs/src/main/docbook/en-US/version_info.xml
new file mode 100644
index 0000000..f24bb77
--- /dev/null
+++ b/docs/src/main/docbook/en-US/version_info.xml
@@ -0,0 +1 @@
+<releaseinfo>3.1.0-SNAPSHOT</releaseinfo>
\ No newline at end of file
diff --git a/examples/timeanddate/src/main/java/org/jboss/seam/international/examples/timeanddate/worldclock/AvailableTimeZonesBean.java b/examples/timeanddate/src/main/java/org/jboss/seam/international/examples/timeanddate/worldclock/AvailableTimeZonesBean.java
index 8382d89..847b463 100644
--- a/examples/timeanddate/src/main/java/org/jboss/seam/international/examples/timeanddate/worldclock/AvailableTimeZonesBean.java
+++ b/examples/timeanddate/src/main/java/org/jboss/seam/international/examples/timeanddate/worldclock/AvailableTimeZonesBean.java
@@ -12,7 +12,7 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import org.jboss.seam.solder.logging.Logger;
+import org.jboss.seam.logging.Logger;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.joda.time.format.DateTimeFormat;
diff --git a/impl/src/main/java/org/jboss/seam/international/datetimezone/DefaultDateTimeZoneProducer.java b/impl/src/main/java/org/jboss/seam/international/datetimezone/DefaultDateTimeZoneProducer.java
index f2cbeab..477d4ea 100644
--- a/impl/src/main/java/org/jboss/seam/international/datetimezone/DefaultDateTimeZoneProducer.java
+++ b/impl/src/main/java/org/jboss/seam/international/datetimezone/DefaultDateTimeZoneProducer.java
@@ -25,7 +25,7 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import org.jboss.seam.solder.logging.Logger;
+import org.jboss.seam.logging.Logger;
 import org.jboss.seam.international.timezone.DefaultTimeZone;
 import org.joda.time.DateTimeZone;
 
diff --git a/impl/src/main/java/org/jboss/seam/international/jdktimezone/DefaultTimeZoneProducer.java b/impl/src/main/java/org/jboss/seam/international/jdktimezone/DefaultTimeZoneProducer.java
index ab7a0d9..4330501 100644
--- a/impl/src/main/java/org/jboss/seam/international/jdktimezone/DefaultTimeZoneProducer.java
+++ b/impl/src/main/java/org/jboss/seam/international/jdktimezone/DefaultTimeZoneProducer.java
@@ -26,7 +26,7 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import org.jboss.seam.solder.logging.Logger;
+import org.jboss.seam.logging.Logger;
 import org.jboss.seam.international.timezone.DefaultTimeZone;
 
 /**
diff --git a/impl/src/main/java/org/jboss/seam/international/locale/AvailableLocales.java b/impl/src/main/java/org/jboss/seam/international/locale/AvailableLocales.java
index 9e58b49..f25bec3 100644
--- a/impl/src/main/java/org/jboss/seam/international/locale/AvailableLocales.java
+++ b/impl/src/main/java/org/jboss/seam/international/locale/AvailableLocales.java
@@ -28,7 +28,7 @@
 import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
 
-import org.jboss.seam.solder.logging.Logger;
+import org.jboss.seam.logging.Logger;
 
 @ApplicationScoped
 public class AvailableLocales {
diff --git a/impl/src/main/java/org/jboss/seam/international/locale/DefaultLocaleProducer.java b/impl/src/main/java/org/jboss/seam/international/locale/DefaultLocaleProducer.java
index a6f6aef..a41d911 100644
--- a/impl/src/main/java/org/jboss/seam/international/locale/DefaultLocaleProducer.java
+++ b/impl/src/main/java/org/jboss/seam/international/locale/DefaultLocaleProducer.java
@@ -26,7 +26,7 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import org.jboss.seam.solder.logging.Logger;
+import org.jboss.seam.logging.Logger;
 
 @ApplicationScoped
 public class DefaultLocaleProducer implements Serializable {
diff --git a/impl/src/main/java/org/jboss/seam/international/status/TypedStatusMessageBundleExtension.java b/impl/src/main/java/org/jboss/seam/international/status/TypedStatusMessageBundleExtension.java
index ee85ed2..e4cdd06 100644
--- a/impl/src/main/java/org/jboss/seam/international/status/TypedStatusMessageBundleExtension.java
+++ b/impl/src/main/java/org/jboss/seam/international/status/TypedStatusMessageBundleExtension.java
@@ -46,7 +46,7 @@
 import javax.enterprise.inject.spi.Extension;
 import javax.enterprise.inject.spi.ProcessInjectionTarget;
 
-import org.jboss.seam.solder.logging.Logger;
+import org.jboss.seam.logging.Logger;
 import org.jboss.seam.solder.literal.MessageBundleLiteral;
 import org.jboss.seam.solder.messages.MessageBundle;
 import org.jboss.seam.solder.reflection.annotated.AnnotatedTypeBuilder;
diff --git a/impl/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessageImpl.java b/impl/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessageImpl.java
index d30c9a7..5a46677 100644
--- a/impl/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessageImpl.java
+++ b/impl/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessageImpl.java
@@ -20,7 +20,7 @@
 
 import javax.inject.Inject;
 
-import org.jboss.seam.solder.logging.Logger;
+import org.jboss.seam.logging.Logger;
 import org.jboss.seam.international.status.ApplicationBundles;
 import org.jboss.seam.international.status.Level;
 import org.jboss.seam.international.status.Message;
diff --git a/pom.xml b/pom.xml
index c3f8753..4b1b75a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
    <parent>
       <groupId>org.jboss.seam</groupId>
       <artifactId>seam-parent</artifactId>
-      <version>12</version>
+      <version>14</version>
    </parent>
 
    <groupId>org.jboss.seam.international</groupId>
@@ -25,7 +25,7 @@
    </modules>
 
    <properties>
-      <seam.version>3.1.0.Beta1</seam.version>
+      <seam.version>3.1.0.Beta2</seam.version>
    </properties>
 
    <dependencyManagement>