Merge branch 'release/3.1.0.Beta2'

seam · Aug 23, 2011 · 694ef0b · 694ef0b
2 parents 548a33d + 366cd2b
commit 694ef0b
Show file tree

Hide file tree

Showing 258 changed files with 11,381 additions and 2,312 deletions.
diff --git a/...g/jboss/seam/solder/logging/Category.java → ...java/org/jboss/seam/logging/Category.java b/...g/jboss/seam/solder/logging/Category.java → ...java/org/jboss/seam/logging/Category.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.seam.solder.logging;
+package org.jboss.seam.logging;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import org.jboss.seam.solder.logging.Logger;
-
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;

diff --git a/...va/org/jboss/seam/solder/logging/Log.java → ...main/java/org/jboss/seam/logging/Log.java b/...va/org/jboss/seam/solder/logging/Log.java → ...main/java/org/jboss/seam/logging/Log.java
@@ -15,15 +15,14 @@
  * limitations under the License.
  */
 
-package org.jboss.seam.solder.logging;
+package org.jboss.seam.logging;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.jboss.seam.solder.logging.Logger;
 import org.jboss.seam.solder.messages.Message;
 
 /**