Seam SVN: r13892 - tags.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-10-18 10:22:29 -0400 (Mon, 18 Oct 2010)
New Revision: 13892
Added:
tags/JBPAPP_4_3_9-CR1/
Log:
created tag for EAP 4.3.9 CR1 - Seam 2.0.2 fixed drools pom files
Copied: tags/JBPAPP_4_3_9-CR1 (from rev 13891, branches/enterprise/JBPAPP_4_3_FP01)
13 years, 6 months
- 1
- 0
Seam SVN: r13891 - tags.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-10-18 10:21:15 -0400 (Mon, 18 Oct 2010)
New Revision: 13891
Removed:
tags/JBPAPP_4_3_9-CR1/
Log:
13 years, 6 months
- 1
- 0
Seam SVN: r13890 - in branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools: drools-core/4.0.7-SOA-P and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2010-10-18 10:19:18 -0400 (Mon, 18 Oct 2010)
New Revision: 13890
Modified:
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/4.0.7-SOA-P/drools-compiler-4.0.7-SOA-P.pom
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/4.0.7-SOA-P/drools-compiler-4.0.7-SOA-P.pom.md5
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/4.0.7-SOA-P/drools-compiler-4.0.7-SOA-P.pom.sha1
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/4.0.7-SOA-P/drools-core-4.0.7-SOA-P.pom
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/4.0.7-SOA-P/drools-core-4.0.7-SOA-P.pom.md5
branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/4.0.7-SOA-P/drools-core-4.0.7-SOA-P.pom.sha1
Log:
fixed drools pom files
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/4.0.7-SOA-P/drools-compiler-4.0.7-SOA-P.pom
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/4.0.7-SOA-P/drools-compiler-4.0.7-SOA-P.pom 2010-10-18 07:37:15 UTC (rev 13889)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/4.0.7-SOA-P/drools-compiler-4.0.7-SOA-P.pom 2010-10-18 14:19:18 UTC (rev 13890)
@@ -5,7 +5,7 @@
<parent>
<artifactId>drools</artifactId>
<groupId>org.drools</groupId>
- <version>4.0.7</version>
+ <version>4.0.7-SOA-P</version>
</parent>
<artifactId>drools-compiler</artifactId>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/4.0.7-SOA-P/drools-compiler-4.0.7-SOA-P.pom.md5
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/4.0.7-SOA-P/drools-compiler-4.0.7-SOA-P.pom.md5 2010-10-18 07:37:15 UTC (rev 13889)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/4.0.7-SOA-P/drools-compiler-4.0.7-SOA-P.pom.md5 2010-10-18 14:19:18 UTC (rev 13890)
@@ -1 +1 @@
-d1990b5893d33a041b8b62faf3d8a2bd
\ No newline at end of file
+6795a659ef4a6e875a76f3cd658e0049
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/4.0.7-SOA-P/drools-compiler-4.0.7-SOA-P.pom.sha1
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/4.0.7-SOA-P/drools-compiler-4.0.7-SOA-P.pom.sha1 2010-10-18 07:37:15 UTC (rev 13889)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-compiler/4.0.7-SOA-P/drools-compiler-4.0.7-SOA-P.pom.sha1 2010-10-18 14:19:18 UTC (rev 13890)
@@ -1 +1 @@
-d61092483236f1523ed1701c56762386a9ff1855
\ No newline at end of file
+81e3e32e8f89a479678a7dbe8dcd858603154b2a
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/4.0.7-SOA-P/drools-core-4.0.7-SOA-P.pom
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/4.0.7-SOA-P/drools-core-4.0.7-SOA-P.pom 2010-10-18 07:37:15 UTC (rev 13889)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/4.0.7-SOA-P/drools-core-4.0.7-SOA-P.pom 2010-10-18 14:19:18 UTC (rev 13890)
@@ -5,7 +5,7 @@
<parent>
<artifactId>drools</artifactId>
<groupId>org.drools</groupId>
- <version>4.0.7</version>
+ <version>4.0.7-SOA-P</version>
</parent>
<artifactId>drools-core</artifactId>
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/4.0.7-SOA-P/drools-core-4.0.7-SOA-P.pom.md5
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/4.0.7-SOA-P/drools-core-4.0.7-SOA-P.pom.md5 2010-10-18 07:37:15 UTC (rev 13889)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/4.0.7-SOA-P/drools-core-4.0.7-SOA-P.pom.md5 2010-10-18 14:19:18 UTC (rev 13890)
@@ -1 +1 @@
-0d19424a8d29e51d3748f1f5aeafdeb3
\ No newline at end of file
+ebda726b8a8ac16678718bae00040d77
Modified: branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/4.0.7-SOA-P/drools-core-4.0.7-SOA-P.pom.sha1
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/4.0.7-SOA-P/drools-core-4.0.7-SOA-P.pom.sha1 2010-10-18 07:37:15 UTC (rev 13889)
+++ branches/enterprise/JBPAPP_4_3_FP01/build/localRepo/org/drools/drools-core/4.0.7-SOA-P/drools-core-4.0.7-SOA-P.pom.sha1 2010-10-18 14:19:18 UTC (rev 13890)
@@ -1 +1 @@
-c8638917f59aa36265decd0db38ba0801fb6137c
\ No newline at end of file
+596e4f945e499658cae620f3962626d4a16453f4
13 years, 6 months
- 1
- 0
Seam SVN: r13889 - branches/community/Seam_2_2/src/test/ftest.
by seam-commits＠lists.jboss.org
Author: plenyi(a)redhat.com
Date: 2010-10-18 03:37:15 -0400 (Mon, 18 Oct 2010)
New Revision: 13889
Modified:
branches/community/Seam_2_2/src/test/ftest/build.xml
Log:
JBQA-3275: Fixed bugs regarding relative paths, failure counting and other minor fixes in the Groovy script.
Modified: branches/community/Seam_2_2/src/test/ftest/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/build.xml 2010-10-16 05:42:05 UTC (rev 13888)
+++ branches/community/Seam_2_2/src/test/ftest/build.xml 2010-10-18 07:37:15 UTC (rev 13889)
@@ -396,6 +396,7 @@
<echo message="Rewriting ftest output xml files." />
<groovy>
<arg value="@{container}" />
+ <arg value="${seam.dir}" />
<classpath>
<pathelement location="../../../lib/ftest/xmlunit.jar" />
</classpath>
@@ -404,7 +405,8 @@
import org.custommonkey.xmlunit.XMLUnit
import groovy.xml.StreamingMarkupBuilder
- def container = args[0];
+ String container = args[0];
+ String seamHome = args[1];
def slurper = new XmlSlurper();
def builder = new StreamingMarkupBuilder();
builder.encoding = "UTF-8";
@@ -415,8 +417,9 @@
replace 'SKIP' with 'FAIL'
insert child '<exception class="java.lang.Error"><message><![CDATA[Deployment in error.] ]></message><full-stacktrace><![CDATA[ ] ]></full-stacktrace></exception>'
*/
- def xmlFile = new File("../../../test-output/testng-results.xml");
- ant.echo 'Checking "../../../test-output/testng-results.xml"';
+ String xmlFilePath = seamHome + "/test-output/testng-results.xml";
+ File xmlFile = new File(xmlFilePath);
+ ant.echo 'Checking: ' + xmlFilePath;
assert xmlFile.exists() && xmlFile.isFile();
def root = slurper.parse(xmlFile);
@@ -428,14 +431,15 @@
it.appendNode { exception(class:'java.lang.Error') { message("Deployment in error.") } }
}
- def writer = new FileWriter("../../../test-output/testng-results-edit.xml");
+ String xmlFileEditPath = seamHome + "/test-output/testng-results-edit.xml";
+ def writer = new FileWriter(xmlFileEditPath);
writer << "<testng-results>";
writer << builder.bind(root.getBody());
writer << "</testng-results>";
writer.close();
- ant.delete(file:'../../../test-output/testng-results.xml');
- ant.move(file:'../../../test-output/testng-results-edit.xml',tofile:'../../../test-output/testng-results.xml');
+ ant.delete(file:xmlFilePath);
+ ant.move(file:xmlFileEditPath,tofile:xmlFilePath);
/*
for each ${SEAM}/${EXAMPLE} example/
@@ -443,13 +447,11 @@
remove elements containing '@' - beforeMethod and afterMethod failures incorrectly counted as testcases
replace '<skipped />' with '<failure message="Test skipped." type="java.lang.Error" />'
*/
- def testOutDir = new File("../../../test-output");
+ File testOutDir = new File(seamHome + "/test-output");
assert testOutDir.exists() && testOutDir.isDirectory();
testOutDir.eachDir { dir ->
ant.echo "Checking " + dir.getName();
- String exampleName;
- String xmlFilePath;
- String xmlFileEditPath;
+ String exampleName = null;
dir.eachFile { f ->
if (f.isFile() && f.getName().matches(".*_" + container + ".*\\.xml")) {
@@ -457,20 +459,24 @@
xmlFilePath = f.getAbsolutePath();
xmlFileEditPath = xmlFilePath.substring(0, xmlFilePath.length() - 4) + "-edit.xml";
xmlFile = new File(xmlFilePath);
- ant.echo "DEBUG Parsing file " + xmlFile.getName();
if (xmlFile.exists() && xmlFile.isFile()) {
root = slurper.parse(xmlFile);
def tsName = root.attributes().get("name");
def tsTime = root.attributes().get("time");
def tsTests = root.attributes().get("tests");
+ def tsFailures = root.attributes().get("failures");
+ def tsErrors = root.attributes().get("errors");
serviceMethods = root.testcase.findAll { it.(a)name.toString().contains("@") }
serviceMethods.each { it.replaceNode {} }
- root.testcase.skipped.replaceNode { node -> failure(message:'Test skipped.',type:'java.lang.Error.') }
+ root.testcase.skipped.replaceNode { node ->
+ failure(message:'Test skipped.',type:'java.lang.Error.');
+ tsErrors++;
+ }
writer = new FileWriter(xmlFileEditPath);
writer << "<" + "?xml version=\"1.0\" encoding=\"UTF-8\" ?" + ">";
- writer << '<testsuite name="' + tsName + '" failures="0" tests="' + tsTests + '" time="' + tsTime + '" errors="' + tsTests + '">';
+ writer << '<testsuite name="' + tsName + '" failures="' + tsFailures + '" tests="' + tsTests + '" time="' + tsTime + '" errors="' + tsErrors + '">';
writer << builder.bind(root.getBody());
writer << "</testsuite>";
writer.close();
@@ -478,9 +484,6 @@
ant.delete(file:xmlFilePath);
ant.move(file:xmlFileEditPath,tofile:xmlFilePath);
}
- else {
- println dir.getName() + "does not contain any xml file with test results (Looking for " + xmlFilePath + "). Skipping this directory."
- }
}
}
}
13 years, 6 months
- 1
- 0
Seam SVN: r13888 - in modules/faces/trunk: impl/src/main/java/org/jboss/seam/faces/viewdata and 1 other directory.
by seam-commits＠lists.jboss.org
Author: swd847
Date: 2010-10-16 01:42:05 -0400 (Sat, 16 Oct 2010)
New Revision: 13888
Modified:
modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/viewdata/ViewDataStore.java
modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/viewdata/ViewDataStoreImpl.java
Log:
minor changes to ViewDataStore
Modified: modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/viewdata/ViewDataStore.java
===================================================================
--- modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/viewdata/ViewDataStore.java 2010-10-16 05:40:40 UTC (rev 13887)
+++ modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/viewdata/ViewDataStore.java 2010-10-16 05:42:05 UTC (rev 13888)
@@ -49,7 +49,7 @@
/**
* gets the most specific data for the current viewId
*/
- public abstract <T extends Annotation> T getData(Class<T> type);
+ public abstract <T extends Annotation> T getDataForCurrentViewId(Class<T> type);
/**
* returns all data for a given viewId, with the most specific data at the
@@ -61,6 +61,6 @@
* returns all data for the current viewId, with the most specific data at
* the start of the list
*/
- public abstract <T extends Annotation> List<T> getAllData(Class<T> type);
+ public abstract <T extends Annotation> List<T> getAllDataForCurrentViewId(Class<T> type);
}
\ No newline at end of file
Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/viewdata/ViewDataStoreImpl.java
===================================================================
--- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/viewdata/ViewDataStoreImpl.java 2010-10-16 05:40:40 UTC (rev 13887)
+++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/viewdata/ViewDataStoreImpl.java 2010-10-16 05:42:05 UTC (rev 13888)
@@ -92,7 +92,7 @@
return null;
}
- public <T extends Annotation> T getData(Class<T> type)
+ public <T extends Annotation> T getDataForCurrentViewId(Class<T> type)
{
return getData(FacesContext.getCurrentInstance().getViewRoot().getViewId(), type);
}
@@ -107,7 +107,7 @@
return null;
}
- public <T extends Annotation> List<T> getAllData(Class<T> type)
+ public <T extends Annotation> List<T> getAllDataForCurrentViewId(Class<T> type)
{
return getAllData(FacesContext.getCurrentInstance().getViewRoot().getViewId(), type);
}
13 years, 6 months
- 1
- 0
Seam SVN: r13887 - in modules/faces/trunk/impl: src/main/java/org/jboss/seam/faces/event and 1 other directories.
by seam-commits＠lists.jboss.org
Author: swd847
Date: 2010-10-16 01:40:40 -0400 (Sat, 16 Oct 2010)
New Revision: 13887
Modified:
modules/faces/trunk/impl/pom.xml
modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/DelegatingPhaseListener.java
modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/transaction/TransactionPhaseListener.java
Log:
make seam persistence optional
Modified: modules/faces/trunk/impl/pom.xml
===================================================================
--- modules/faces/trunk/impl/pom.xml 2010-10-16 02:59:34 UTC (rev 13886)
+++ modules/faces/trunk/impl/pom.xml 2010-10-16 05:40:40 UTC (rev 13887)
@@ -33,7 +33,8 @@
<dependency>
<artifactId>seam-persistence-api</artifactId>
<groupId>org.jboss.seam.persistence</groupId>
- <scope>compile</scope>
+ <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.interceptor</groupId>
Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/DelegatingPhaseListener.java
===================================================================
--- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/DelegatingPhaseListener.java 2010-10-16 02:59:34 UTC (rev 13886)
+++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/DelegatingPhaseListener.java 2010-10-16 05:40:40 UTC (rev 13887)
@@ -29,6 +29,7 @@
import org.jboss.seam.faces.context.FlashScopedContext;
import org.jboss.seam.faces.transaction.TransactionPhaseListener;
+import org.jboss.weld.extensions.reflection.Reflections;
/**
* Provide CDI injection to PhaseListener artifacts by delegating through this
@@ -80,7 +81,17 @@
@SuppressWarnings("unchecked")
private List<PhaseListener> getPhaseListeners()
{
- return getListeners(FlashScopedContext.class, PhaseEventBridge.class, TransactionPhaseListener.class);
+ try
+ {
+ // if seam persistence is not on the CP then don't add the phase
+ // listener
+ Reflections.classForName("org.jboss.seam.persistence.transaction.SeamTransaction", getClass().getClassLoader());
+ return getListeners(FlashScopedContext.class, PhaseEventBridge.class, TransactionPhaseListener.class);
+ }
+ catch (ClassNotFoundException e)
+ {
+ return getListeners(FlashScopedContext.class, PhaseEventBridge.class);
+ }
}
}
Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/transaction/TransactionPhaseListener.java
===================================================================
--- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/transaction/TransactionPhaseListener.java 2010-10-16 02:59:34 UTC (rev 13886)
+++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/transaction/TransactionPhaseListener.java 2010-10-16 05:40:40 UTC (rev 13887)
@@ -36,8 +36,8 @@
import org.jboss.seam.persistence.transaction.SeamTransaction;
/**
- * Phase listener that is resposible for seam managed transactions. It is also
- * resposible for setting the correct flush mode on the persistence context
+ * Phase listener that is responsible for seam managed transactions. It is also
+ * responsible for setting the correct flush mode on the persistence context
* during the render response phase
*
* @author Stuart Douglas
@@ -169,7 +169,7 @@
private boolean seamManagedTransactionStatus(PhaseId phase)
{
- SeamManagedTransaction an = dataStore.getData(SeamManagedTransaction.class);
+ SeamManagedTransaction an = dataStore.getDataForCurrentViewId(SeamManagedTransaction.class);
SeamManagedTransactionType config;
if (an == null)
{
13 years, 6 months
- 1
- 0
Seam SVN: r13886 - in modules/persistence/trunk: dist and 4 other directories.
by seam-commits＠lists.jboss.org
Author: swd847
Date: 2010-10-15 22:59:34 -0400 (Fri, 15 Oct 2010)
New Revision: 13886
Added:
modules/persistence/trunk/dist/
modules/persistence/trunk/dist/pom.xml
modules/persistence/trunk/dist/src/
modules/persistence/trunk/dist/src/main/
modules/persistence/trunk/dist/src/main/assembly/
modules/persistence/trunk/dist/src/main/assembly/assembly.xml
modules/persistence/trunk/dist/src/main/assembly/lgpl.txt
Modified:
modules/persistence/trunk/docs/pom.xml
modules/persistence/trunk/pom.xml
Log:
fix up distribution profile
Property changes on: modules/persistence/trunk/dist
___________________________________________________________________
Name: svn:ignore
+ target
.classpath
.settings
.project
Added: modules/persistence/trunk/dist/pom.xml
===================================================================
--- modules/persistence/trunk/dist/pom.xml (rev 0)
+++ modules/persistence/trunk/dist/pom.xml 2010-10-16 02:59:34 UTC (rev 13886)
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.jboss.seam.persistence</groupId>
+ <artifactId>seam-persistence-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>seam-persistence-distribution</artifactId>
+ <name>Seam Persistence Distribution</name>
+ <description>Builds a Seam Persistence release distribution</description>
+ <packaging>pom</packaging>
+
+ <properties>
+ <maven.deploy.skip>true</maven.deploy.skip>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.seam.persistence</groupId>
+ <artifactId>seam-persistence-impl</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam.persistence</groupId>
+ <artifactId>seam-persistence-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam.persistence</groupId>
+ <artifactId>seam-persistence-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam.persistence</groupId>
+ <artifactId>seam-persistence-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam.persistence</groupId>
+ <artifactId>seam-persistence-impl</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam.persistence</groupId>
+ <artifactId>seam-persistence-impl</artifactId>
+ <version>${project.version}</version>
+ <classifier>javadoc</classifier>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam.persistence</groupId>
+ <artifactId>seam-persistence-reference-guide</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <optional>true</optional>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <finalName>seam-persistence</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: modules/persistence/trunk/dist/src/main/assembly/assembly.xml
===================================================================
--- modules/persistence/trunk/dist/src/main/assembly/assembly.xml (rev 0)
+++ modules/persistence/trunk/dist/src/main/assembly/assembly.xml 2010-10-16 02:59:34 UTC (rev 13886)
@@ -0,0 +1,60 @@
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ 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">
+
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <baseDirectory>${project.build.finalName}-${project.version}</baseDirectory>
+
+ <!-- Add distribution files -->
+ <fileSets>
+ <fileSet>
+ <directory>src/main/assembly</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>readme.txt</include>
+ <include>lgpl.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <!-- Add necessary binaries -->
+ <dependencySet>
+ <outputDirectory>artifacts</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.jboss.seam.persistence:seam-persistence-impl</include>
+ <include>org.jboss.seam.persistence:seam-persistence-api</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+ <!-- Add necessary dependencies -->
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <excludes>
+ <exclude>org.jboss.seam.persistence:*</exclude>
+ </excludes>
+ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+ <!-- Pull in docbook artifacts -->
+ <dependencySet>
+ <outputDirectory>doc/reference</outputDirectory>
+ <unpack>true</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.jboss.seam.persistence:seam-persistence-reference-guide</include>
+ </includes>
+ <unpackOptions>
+ <excludes>
+ <exclude>META-INF/</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Added: modules/persistence/trunk/dist/src/main/assembly/lgpl.txt
===================================================================
--- modules/persistence/trunk/dist/src/main/assembly/lgpl.txt (rev 0)
+++ modules/persistence/trunk/dist/src/main/assembly/lgpl.txt 2010-10-16 02:59:34 UTC (rev 13886)
@@ -0,0 +1,502 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
Modified: modules/persistence/trunk/docs/pom.xml
===================================================================
--- modules/persistence/trunk/docs/pom.xml 2010-10-15 20:23:50 UTC (rev 13885)
+++ modules/persistence/trunk/docs/pom.xml 2010-10-16 02:59:34 UTC (rev 13886)
@@ -54,26 +54,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>distribution</id>
- <activation>
- <property>
- <name>release</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/persistence/trunk/docs</connection>
<developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/persistence/trunk/docs</developerConnection>
Modified: modules/persistence/trunk/pom.xml
===================================================================
--- modules/persistence/trunk/pom.xml 2010-10-15 20:23:50 UTC (rev 13885)
+++ modules/persistence/trunk/pom.xml 2010-10-16 02:59:34 UTC (rev 13886)
@@ -252,7 +252,7 @@
</property>
</activation>
<modules>
- <!-- <module>dist</module> -->
+ <module>dist</module>
<module>docs</module>
</modules>
</profile>
13 years, 6 months
- 1
- 0
Seam SVN: r13885 - in modules/international/trunk: api/src/main/java/org/jboss/seam/international and 9 other directories.
by seam-commits＠lists.jboss.org
Author: kenfinni
Date: 2010-10-15 16:23:50 -0400 (Fri, 15 Oct 2010)
New Revision: 13885
Added:
modules/international/trunk/api/src/main/java/org/jboss/seam/international/locale/
modules/international/trunk/api/src/main/java/org/jboss/seam/international/locale/DefaultLocaleKeyConfig.java
modules/international/trunk/api/src/main/java/org/jboss/seam/international/locale/SupportedLocaleKeys.java
modules/international/trunk/api/src/main/java/org/jboss/seam/international/timezone/DefaultTimeZoneConfig.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleKeyBean.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleKeyFailBean.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/SupportedLocaleKeysBean.java
modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/default-locale.xml
modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/timezone/user-timezone.xml
Removed:
modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-available.xml
modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-fail.xml
Modified:
modules/international/trunk/impl/pom.xml
modules/international/trunk/impl/src/main/java/org/jboss/seam/international/locale/AvailableLocales.java
modules/international/trunk/impl/src/main/java/org/jboss/seam/international/locale/DefaultLocaleProducer.java
modules/international/trunk/impl/src/main/java/org/jboss/seam/international/timezone/DefaultTimeZoneProducer.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/AvailableLocalesTest.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideFailTest.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangCountryTest.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangCountryVariantTest.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangTest.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleTest.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/UserLocaleTest.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneOverrideFailTest.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneOverrideTest.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneTest.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/UserTimeZoneTest.java
modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-lang-country-variant.xml
modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-lang-country.xml
modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-lang.xml
modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/timezone/override-fail.xml
modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/timezone/override.xml
modules/international/trunk/pom.xml
Log:
Update to Seam XML Alpha 3 and fix previously failing tests
Added: modules/international/trunk/api/src/main/java/org/jboss/seam/international/locale/DefaultLocaleKeyConfig.java
===================================================================
--- modules/international/trunk/api/src/main/java/org/jboss/seam/international/locale/DefaultLocaleKeyConfig.java (rev 0)
+++ modules/international/trunk/api/src/main/java/org/jboss/seam/international/locale/DefaultLocaleKeyConfig.java 2010-10-15 20:23:50 UTC (rev 13885)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.seam.international.locale;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+@Target({METHOD, FIELD})
+@Documented
+@Retention(RUNTIME)
+@Inherited
+/**
+ * Qualifier for specifying the default locale of an application.
+ *
+ * @author Ken Finnigan
+ */
+public @interface DefaultLocaleKeyConfig
+{
+
+}
Added: modules/international/trunk/api/src/main/java/org/jboss/seam/international/locale/SupportedLocaleKeys.java
===================================================================
--- modules/international/trunk/api/src/main/java/org/jboss/seam/international/locale/SupportedLocaleKeys.java (rev 0)
+++ modules/international/trunk/api/src/main/java/org/jboss/seam/international/locale/SupportedLocaleKeys.java 2010-10-15 20:23:50 UTC (rev 13885)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.seam.international.locale;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+@Target({METHOD, FIELD})
+@Documented
+@Retention(RUNTIME)
+@Inherited
+/**
+ * Qualifier for specifing a list of locales that the application will support.
+ *
+ * @author Ken Finnigan
+ */
+public @interface SupportedLocaleKeys
+{
+
+}
Added: modules/international/trunk/api/src/main/java/org/jboss/seam/international/timezone/DefaultTimeZoneConfig.java
===================================================================
--- modules/international/trunk/api/src/main/java/org/jboss/seam/international/timezone/DefaultTimeZoneConfig.java (rev 0)
+++ modules/international/trunk/api/src/main/java/org/jboss/seam/international/timezone/DefaultTimeZoneConfig.java 2010-10-15 20:23:50 UTC (rev 13885)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.seam.international.timezone;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+@Target({METHOD, FIELD})
+@Documented
+@Retention(RUNTIME)
+@Inherited
+/**
+ * Qualifier for specifying the id of a Default TimeZone for an application.
+ *
+ * @author Ken Finnigan
+ */
+public @interface DefaultTimeZoneConfig
+{
+
+}
Modified: modules/international/trunk/impl/pom.xml
===================================================================
--- modules/international/trunk/impl/pom.xml 2010-10-15 16:32:43 UTC (rev 13884)
+++ modules/international/trunk/impl/pom.xml 2010-10-15 20:23:50 UTC (rev 13885)
@@ -81,6 +81,14 @@
</dependency>
</dependencies>
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+ </build>
+
<profiles>
<profile>
<id>code-coverage</id>
Modified: modules/international/trunk/impl/src/main/java/org/jboss/seam/international/locale/AvailableLocales.java
===================================================================
--- modules/international/trunk/impl/src/main/java/org/jboss/seam/international/locale/AvailableLocales.java 2010-10-15 16:32:43 UTC (rev 13884)
+++ modules/international/trunk/impl/src/main/java/org/jboss/seam/international/locale/AvailableLocales.java 2010-10-15 20:23:50 UTC (rev 13885)
@@ -37,11 +37,13 @@
@ApplicationScoped
public class AvailableLocales
{
- private String[] supportedLocaleKeys;
-
@Inject
private Logger log;
+ @Inject
+ @SupportedLocaleKeys
+ private String[] supportedLocaleKeys;
+
@Produces
private List<Locale> locales = null;
@@ -50,17 +52,20 @@
{
locales = new ArrayList<Locale>();
- for (String localeKey : supportedLocaleKeys)
+ if (null != supportedLocaleKeys)
{
- try
+ for (String localeKey : supportedLocaleKeys)
{
- Locale lc = LocaleUtils.toLocale(localeKey);
- locales.add(lc);
+ try
+ {
+ Locale lc = LocaleUtils.toLocale(localeKey);
+ locales.add(lc);
+ }
+ catch (IllegalArgumentException e)
+ {
+ log.error("AvailableLocales: Supported Locale key of " + localeKey + " was not formatted correctly", e);
+ }
}
- catch (IllegalArgumentException e)
- {
- log.error("AvailableLocales: Supported Locale key of " + localeKey + " was not formatted correctly", e);
- }
}
Collections.sort(locales, new Comparator<Locale>()
Modified: modules/international/trunk/impl/src/main/java/org/jboss/seam/international/locale/DefaultLocaleProducer.java
===================================================================
--- modules/international/trunk/impl/src/main/java/org/jboss/seam/international/locale/DefaultLocaleProducer.java 2010-10-15 16:32:43 UTC (rev 13884)
+++ modules/international/trunk/impl/src/main/java/org/jboss/seam/international/locale/DefaultLocaleProducer.java 2010-10-15 20:23:50 UTC (rev 13885)
@@ -37,11 +37,13 @@
{
private static final long serialVersionUID = -4534087316489937649L;
- private String defaultLocaleKey;
-
@Inject
private Logger log;
+ @Inject
+ @DefaultLocaleKeyConfig
+ private String defaultLocaleKey;
+
@Produces
@Named
private Locale defaultLocale;
Modified: modules/international/trunk/impl/src/main/java/org/jboss/seam/international/timezone/DefaultTimeZoneProducer.java
===================================================================
--- modules/international/trunk/impl/src/main/java/org/jboss/seam/international/timezone/DefaultTimeZoneProducer.java 2010-10-15 16:32:43 UTC (rev 13884)
+++ modules/international/trunk/impl/src/main/java/org/jboss/seam/international/timezone/DefaultTimeZoneProducer.java 2010-10-15 20:23:50 UTC (rev 13885)
@@ -44,10 +44,12 @@
{
private static final long serialVersionUID = 6181892144731122500L;
+ @Inject
+ @DefaultTimeZoneConfig
private String defaultTimeZoneId;
@Inject
- Logger log;
+ private Logger log;
@Produces
@Named
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/AvailableLocalesTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/AvailableLocalesTest.java 2010-10-15 16:32:43 UTC (rev 13884)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/AvailableLocalesTest.java 2010-10-15 20:23:50 UTC (rev 13885)
@@ -27,35 +27,36 @@
import javax.inject.Inject;
import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.international.locale.AvailableLocales;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.runner.RunWith;
-//(a)RunWith(Arquillian.class)
+(a)RunWith(Arquillian.class)
public class AvailableLocalesTest
{
@Deployment
public static JavaArchive createTestArchive()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(AvailableLocales.class).addManifestResource("org/jboss/seam/international/test/locale/override-available.xml", ArchivePaths.create("beans.xml"));
+ JavaArchive ja = ShrinkWrap.create("test.jar", JavaArchive.class)
+ .addClass(AvailableLocales.class)
+ .addClass(SupportedLocaleKeysBean.class)
+ .addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
+ return ja;
}
@Inject
List<Locale> locales;
- // FIXME XML Override not working
- // @Test
+ @Test
public void testAvailableLocalesProducer()
{
Assert.assertNotNull(locales);
Assert.assertEquals(2, locales.size());
}
-
- @Test
- public void testNothing()
- {
- }
}
Added: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleKeyBean.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleKeyBean.java (rev 0)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleKeyBean.java 2010-10-15 20:23:50 UTC (rev 13885)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.seam.international.test.locale;
+
+import javax.enterprise.inject.Produces;
+
+import org.jboss.seam.international.locale.DefaultLocaleKeyConfig;
+
+public class DefaultLocaleKeyBean
+{
+
+ @SuppressWarnings("unused")
+ @Produces
+ @DefaultLocaleKeyConfig
+ private String defaultLocaleKey = "en";
+}
Added: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleKeyFailBean.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleKeyFailBean.java (rev 0)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleKeyFailBean.java 2010-10-15 20:23:50 UTC (rev 13885)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.seam.international.test.locale;
+
+import javax.enterprise.inject.Produces;
+
+import org.jboss.seam.international.locale.DefaultLocaleKeyConfig;
+
+public class DefaultLocaleKeyFailBean
+{
+
+ @SuppressWarnings("unused")
+ @Produces
+ @DefaultLocaleKeyConfig
+ private String defaultLocaleKey = "z";
+}
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideFailTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideFailTest.java 2010-10-15 16:32:43 UTC (rev 13884)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideFailTest.java 2010-10-15 20:23:50 UTC (rev 13885)
@@ -42,7 +42,10 @@
@Deployment
public static JavaArchive createTestArchive()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")).addManifestResource("org/jboss/seam/international/test/locale/override-fail.xml", ArchivePaths.create("seam-beans.xml"));
+ return ShrinkWrap.create("test.jar", JavaArchive.class)
+ .addClass(DefaultLocaleProducer.class)
+ .addClass(DefaultLocaleKeyFailBean.class)
+ .addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
}
@Inject
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangCountryTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangCountryTest.java 2010-10-15 16:32:43 UTC (rev 13884)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangCountryTest.java 2010-10-15 20:23:50 UTC (rev 13885)
@@ -26,36 +26,35 @@
import javax.inject.Inject;
import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.international.locale.DefaultLocaleKeyConfig;
import org.jboss.seam.international.locale.DefaultLocaleProducer;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.runner.RunWith;
-//(a)RunWith(Arquillian.class)
+(a)RunWith(Arquillian.class)
public class DefaultLocaleOverrideLangCountryTest
{
@Deployment
public static JavaArchive createTestArchive()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")).addManifestResource("org/jboss/seam/international/test/locale/override-lang-country.xml", ArchivePaths.create("seam-beans.xml"));
+ return ShrinkWrap.create("test.jar", JavaArchive.class)
+ .addClass(DefaultLocaleProducer.class)
+ .addClass(DefaultLocaleKeyConfig.class)
+ .addManifestResource("org/jboss/seam/international/test/locale/override-lang-country.xml", ArchivePaths.create("beans.xml"));
}
@Inject
Locale locale;
- // FIXME XML Override not working
- // @Test
+ @Test
public void testDefaultLocaleProducerDirect()
{
Assert.assertNotNull(locale);
Assert.assertEquals("en_US", locale.toString());
}
-
- @Test
- public void testNothing()
- {
- }
}
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangCountryVariantTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangCountryVariantTest.java 2010-10-15 16:32:43 UTC (rev 13884)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangCountryVariantTest.java 2010-10-15 20:23:50 UTC (rev 13885)
@@ -26,36 +26,31 @@
import javax.inject.Inject;
import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.international.locale.DefaultLocaleProducer;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.runner.RunWith;
-//(a)RunWith(Arquillian.class)
+(a)RunWith(Arquillian.class)
public class DefaultLocaleOverrideLangCountryVariantTest
{
@Deployment
public static JavaArchive createTestArchive()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")).addManifestResource("org/jboss/seam/international/test/locale/override-lang-country-variant.xml", ArchivePaths.create("seam-beans.xml"));
+ return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(DefaultLocaleProducer.class).addManifestResource("org/jboss/seam/international/test/locale/override-lang-country-variant.xml", ArchivePaths.create("beans.xml"));
}
@Inject
Locale locale;
- // FIXME XML Override not working
- // @Test
+ @Test
public void testDefaultLocaleProducerDirect()
{
Assert.assertNotNull(locale);
Assert.assertEquals("en_US_UNIX", locale.toString());
}
-
- @Test
- public void testNothing()
- {
- }
}
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangTest.java 2010-10-15 16:32:43 UTC (rev 13884)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangTest.java 2010-10-15 20:23:50 UTC (rev 13885)
@@ -26,36 +26,31 @@
import javax.inject.Inject;
import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.international.locale.DefaultLocaleProducer;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.runner.RunWith;
-//(a)RunWith(Arquillian.class)
+(a)RunWith(Arquillian.class)
public class DefaultLocaleOverrideLangTest
{
@Deployment
public static JavaArchive createTestArchive()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")).addManifestResource("org/jboss/seam/international/test/locale/override-lang.xml", ArchivePaths.create("seam-beans.xml"));
+ return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(DefaultLocaleProducer.class).addManifestResource("org/jboss/seam/international/test/locale/override-lang.xml", ArchivePaths.create("beans.xml"));
}
@Inject
Locale locale;
- // FIXME XML Override not working
- // @Test
+ @Test
public void testDefaultLocaleProducerDirect()
{
Assert.assertNotNull(locale);
Assert.assertEquals("fr", locale.toString());
}
-
- @Test
- public void testNothing()
- {
- }
}
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleTest.java 2010-10-15 16:32:43 UTC (rev 13884)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleTest.java 2010-10-15 20:23:50 UTC (rev 13885)
@@ -42,7 +42,11 @@
@Deployment
public static JavaArchive createTestArchive()
{
- return ShrinkWrap.create("defaultlocaletest.jar", JavaArchive.class).addClasses(DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
+ JavaArchive ja = ShrinkWrap.create("defaultlocaletest.jar", JavaArchive.class)
+ .addClass(DefaultLocaleProducer.class)
+ .addClass(DefaultLocaleKeyBean.class)
+ .addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
+ return ja;
}
@Inject
Added: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/SupportedLocaleKeysBean.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/SupportedLocaleKeysBean.java (rev 0)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/SupportedLocaleKeysBean.java 2010-10-15 20:23:50 UTC (rev 13885)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.seam.international.test.locale;
+
+import javax.enterprise.inject.Produces;
+
+import org.jboss.seam.international.locale.SupportedLocaleKeys;
+
+public class SupportedLocaleKeysBean
+{
+
+ @SuppressWarnings("unused")
+ @Produces
+ @SupportedLocaleKeys
+ private String[] supportedLocaleKeys = {"en", "fr"};
+}
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/UserLocaleTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/UserLocaleTest.java 2010-10-15 16:32:43 UTC (rev 13884)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/UserLocaleTest.java 2010-10-15 20:23:50 UTC (rev 13885)
@@ -35,7 +35,6 @@
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.jboss.weld.extensions.core.Client;
import org.junit.Assert;
import org.junit.Test;
@@ -47,7 +46,10 @@
@Deployment
public static JavaArchive createTestArchive()
{
- return ShrinkWrap.create("userlocaletest.jar", JavaArchive.class).addClasses(UserLocaleProducer.class, DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
+ return ShrinkWrap.create("userlocaletest.jar", JavaArchive.class)
+ .addClass(UserLocaleProducer.class)
+ .addClass(DefaultLocaleProducer.class)
+ .addManifestResource("org/jboss/seam/international/test/locale/default-locale.xml", ArchivePaths.create("beans.xml"));
}
@Inject
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneOverrideFailTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneOverrideFailTest.java 2010-10-15 16:32:43 UTC (rev 13884)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneOverrideFailTest.java 2010-10-15 20:23:50 UTC (rev 13885)
@@ -24,6 +24,8 @@
import javax.inject.Inject;
import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.international.timezone.DefaultTimeZoneConfig;
import org.jboss.seam.international.timezone.DefaultTimeZoneProducer;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -31,30 +33,28 @@
import org.joda.time.DateTimeZone;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.runner.RunWith;
-//(a)RunWith(Arquillian.class)
+(a)RunWith(Arquillian.class)
public class DefaultTimeZoneOverrideFailTest
{
@Deployment
public static JavaArchive createTestArchive()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(DefaultTimeZoneProducer.class).addManifestResource("org/jboss/seam/international/test/timezone/override-fail.xml", ArchivePaths.create("beans.xml"));
+ return ShrinkWrap.create("test.jar", JavaArchive.class)
+ .addClass(DefaultTimeZoneProducer.class)
+ .addClass(DefaultTimeZoneConfig.class)
+ .addManifestResource("org/jboss/seam/international/test/timezone/override-fail.xml", ArchivePaths.create("beans.xml"));
}
@Inject
DateTimeZone timeZone;
- // FIXME XML override not working
- // @Test
+ @Test
public void testDefaultTimeZoneProducerDirect()
{
Assert.assertNotNull(timeZone);
Assert.assertNotSame("America/Tijuana", timeZone.getID());
Assert.assertEquals(DateTimeZone.getDefault().getID(), timeZone.getID());
}
-
- @Test
- public void testNothing()
- {
- }
}
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneOverrideTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneOverrideTest.java 2010-10-15 16:32:43 UTC (rev 13884)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneOverrideTest.java 2010-10-15 20:23:50 UTC (rev 13885)
@@ -24,6 +24,7 @@
import javax.inject.Inject;
import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.international.timezone.DefaultTimeZoneProducer;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -31,8 +32,9 @@
import org.joda.time.DateTimeZone;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.runner.RunWith;
-//(a)RunWith(Arquillian.class)
+(a)RunWith(Arquillian.class)
public class DefaultTimeZoneOverrideTest
{
@Deployment
@@ -44,16 +46,10 @@
@Inject
DateTimeZone timeZone;
- // FIXME XML override not working
- // @Test
+ @Test
public void testDefaultTimeZoneProducerDirect()
{
Assert.assertNotNull(timeZone);
Assert.assertEquals("America/Tijuana", timeZone.getID());
}
-
- @Test
- public void testNothing()
- {
- }
}
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneTest.java 2010-10-15 16:32:43 UTC (rev 13884)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneTest.java 2010-10-15 20:23:50 UTC (rev 13885)
@@ -25,11 +25,11 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.international.timezone.DefaultTimeZoneConfig;
import org.jboss.seam.international.timezone.DefaultTimeZoneProducer;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.joda.time.DateTimeZone;
import org.junit.Assert;
import org.junit.Test;
@@ -41,7 +41,10 @@
@Deployment
public static JavaArchive createTestArchive()
{
- return ShrinkWrap.create("defaulttimezonetest.jar", JavaArchive.class).addClasses(DefaultTimeZoneProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
+ return ShrinkWrap.create("defaulttimezonetest.jar", JavaArchive.class)
+ .addClass(DefaultTimeZoneProducer.class)
+ .addClass(DefaultTimeZoneConfig.class)
+ .addManifestResource("org/jboss/seam/international/test/timezone/user-timezone.xml", ArchivePaths.create("beans.xml"));
}
@Inject
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/UserTimeZoneTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/UserTimeZoneTest.java 2010-10-15 16:32:43 UTC (rev 13884)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/UserTimeZoneTest.java 2010-10-15 20:23:50 UTC (rev 13885)
@@ -28,12 +28,12 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.international.Changed;
+import org.jboss.seam.international.timezone.DefaultTimeZoneConfig;
import org.jboss.seam.international.timezone.DefaultTimeZoneProducer;
import org.jboss.seam.international.timezone.UserTimeZoneProducer;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.jboss.weld.extensions.core.Client;
import org.joda.time.DateTimeZone;
import org.junit.Assert;
@@ -46,7 +46,11 @@
@Deployment
public static JavaArchive createTestArchive()
{
- return ShrinkWrap.create("usertimezonetest.jar", JavaArchive.class).addClasses(UserTimeZoneProducer.class, DefaultTimeZoneProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
+ return ShrinkWrap.create("usertimezonetest.jar", JavaArchive.class)
+ .addClass(UserTimeZoneProducer.class)
+ .addClass(DefaultTimeZoneProducer.class)
+ .addClass(DefaultTimeZoneConfig.class)
+ .addManifestResource("org/jboss/seam/international/test/timezone/user-timezone.xml", ArchivePaths.create("beans.xml"));
}
@Inject
Added: modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/default-locale.xml
===================================================================
--- modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/default-locale.xml (rev 0)
+++ modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/default-locale.xml 2010-10-15 20:23:50 UTC (rev 13885)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="urn:java:ee"
+ xmlns:lc="urn:java:org.jboss.seam.international.locale">
+
+ <String>
+ <Produces/>
+ <lc:DefaultLocaleKeyConfig/>
+ <value>fr</value>
+ </String>
+
+</beans>
\ No newline at end of file
Deleted: modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-available.xml
===================================================================
--- modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-available.xml 2010-10-15 16:32:43 UTC (rev 13884)
+++ modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-available.xml 2010-10-15 20:23:50 UTC (rev 13885)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-JBoss, Home of Professional Open Source
-Copyright 2010, Red Hat, Inc., and individual contributors
-by the @authors tag. See the copyright.txt in the distribution for a
-full listing of individual contributors.
-
-This is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as
-published by the Free Software Foundation; either version 2.1 of
-the License, or (at your option) any later version.
-
-This software is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this software; if not, write to the Free
-Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
-<beans xmlns="urn:java:ee"
- xmlns:lc="urn:java:org.jboss.seam.international.locale">
-
- <lc:AvailableLocales>
- <specializes/>
- <lc:supportedLocaleKeys>
- <value>en</value>
- <value>fr</value>
- </lc:supportedLocaleKeys>
- </lc:AvailableLocales>
-</beans>
\ No newline at end of file
Deleted: modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-fail.xml
===================================================================
--- modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-fail.xml 2010-10-15 16:32:43 UTC (rev 13884)
+++ modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-fail.xml 2010-10-15 20:23:50 UTC (rev 13885)
@@ -1,34 +0,0 @@
-<!--
-JBoss, Home of Professional Open Source
-Copyright 2010, Red Hat, Inc., and individual contributors
-by the @authors tag. See the copyright.txt in the distribution for a
-full listing of individual contributors.
-
-This is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as
-published by the Free Software Foundation; either version 2.1 of
-the License, or (at your option) any later version.
-
-This software is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this software; if not, write to the Free
-Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
-<beans xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:s="urn:java:seam:core"
- xmlns:lc="urn:java:org.jboss.seam.international.locale"
- xsi:schemaLocation="
- http://java.sun.com/xml/ns/javaee
- http://docs.jboss.org/cdi/beans_1_0.xsd">
-
- <lc:DefaultLocaleProducer>
- <s:specializes/>
- <lc:defaultLocaleKey>z</lc:defaultLocaleKey>
- </lc:DefaultLocaleProducer>
-</beans>
\ No newline at end of file
Modified: modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-lang-country-variant.xml
===================================================================
--- modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-lang-country-variant.xml 2010-10-15 16:32:43 UTC (rev 13884)
+++ modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-lang-country-variant.xml 2010-10-15 20:23:50 UTC (rev 13885)
@@ -1,34 +1,10 @@
-<!--
-JBoss, Home of Professional Open Source
-Copyright 2010, Red Hat, Inc., and individual contributors
-by the @authors tag. See the copyright.txt in the distribution for a
-full listing of individual contributors.
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="urn:java:ee"
+ xmlns:lc="urn:java:org.jboss.seam.international.locale">
-This is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as
-published by the Free Software Foundation; either version 2.1 of
-the License, or (at your option) any later version.
-
-This software is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this software; if not, write to the Free
-Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
-<beans xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:s="urn:java:seam:core"
- xmlns:lc="urn:java:org.jboss.seam.international.locale"
- xsi:schemaLocation="
- http://java.sun.com/xml/ns/javaee
- http://docs.jboss.org/cdi/beans_1_0.xsd">
-
- <lc:DefaultLocaleProducer>
- <s:specializes/>
- <lc:defaultLocaleKey>en_US_UNIX</lc:defaultLocaleKey>
- </lc:DefaultLocaleProducer>
+ <String>
+ <Produces/>
+ <lc:DefaultLocaleKeyConfig/>
+ <value>en_US_UNIX</value>
+ </String>
</beans>
\ No newline at end of file
Modified: modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-lang-country.xml
===================================================================
--- modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-lang-country.xml 2010-10-15 16:32:43 UTC (rev 13884)
+++ modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-lang-country.xml 2010-10-15 20:23:50 UTC (rev 13885)
@@ -1,34 +1,10 @@
-<!--
-JBoss, Home of Professional Open Source
-Copyright 2010, Red Hat, Inc., and individual contributors
-by the @authors tag. See the copyright.txt in the distribution for a
-full listing of individual contributors.
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="urn:java:ee"
+ xmlns:lc="urn:java:org.jboss.seam.international.locale">
-This is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as
-published by the Free Software Foundation; either version 2.1 of
-the License, or (at your option) any later version.
-
-This software is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this software; if not, write to the Free
-Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
-<beans xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:s="urn:java:seam:core"
- xmlns:lc="urn:java:org.jboss.seam.international.locale"
- xsi:schemaLocation="
- http://java.sun.com/xml/ns/javaee
- http://docs.jboss.org/cdi/beans_1_0.xsd">
-
- <lc:DefaultLocaleProducer>
- <s:specializes/>
- <lc:defaultLocaleKey>en_US</lc:defaultLocaleKey>
- </lc:DefaultLocaleProducer>
+ <String>
+ <Produces/>
+ <lc:DefaultLocaleKeyConfig/>
+ <value>en_US</value>
+ </String>
</beans>
\ No newline at end of file
Modified: modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-lang.xml
===================================================================
--- modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-lang.xml 2010-10-15 16:32:43 UTC (rev 13884)
+++ modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/locale/override-lang.xml 2010-10-15 20:23:50 UTC (rev 13885)
@@ -1,34 +1,10 @@
-<!--
-JBoss, Home of Professional Open Source
-Copyright 2010, Red Hat, Inc., and individual contributors
-by the @authors tag. See the copyright.txt in the distribution for a
-full listing of individual contributors.
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="urn:java:ee"
+ xmlns:lc="urn:java:org.jboss.seam.international.locale">
-This is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as
-published by the Free Software Foundation; either version 2.1 of
-the License, or (at your option) any later version.
-
-This software is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this software; if not, write to the Free
-Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
-<beans xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:s="urn:java:seam:core"
- xmlns:lc="urn:java:org.jboss.seam.international.locale"
- xsi:schemaLocation="
- http://java.sun.com/xml/ns/javaee
- http://docs.jboss.org/cdi/beans_1_0.xsd">
-
- <lc:DefaultLocaleProducer>
- <s:specializes/>
- <lc:defaultLocaleKey>fr</lc:defaultLocaleKey>
- </lc:DefaultLocaleProducer>
+ <String>
+ <Produces/>
+ <lc:DefaultLocaleKeyConfig/>
+ <value>fr</value>
+ </String>
</beans>
\ No newline at end of file
Modified: modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/timezone/override-fail.xml
===================================================================
--- modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/timezone/override-fail.xml 2010-10-15 16:32:43 UTC (rev 13884)
+++ modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/timezone/override-fail.xml 2010-10-15 20:23:50 UTC (rev 13885)
@@ -1,34 +1,10 @@
-<!--
-JBoss, Home of Professional Open Source
-Copyright 2010, Red Hat, Inc., and individual contributors
-by the @authors tag. See the copyright.txt in the distribution for a
-full listing of individual contributors.
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="urn:java:ee"
+ xmlns:tz="urn:java:org.jboss.seam.international.timezone">
-This is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as
-published by the Free Software Foundation; either version 2.1 of
-the License, or (at your option) any later version.
-
-This software is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this software; if not, write to the Free
-Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
-<beans xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:s="urn:java:seam:core"
- xmlns:tz="urn:java:org.jboss.seam.international.timezone"
- xsi:schemaLocation="
- http://java.sun.com/xml/ns/javaee
- http://docs.jboss.org/cdi/beans_1_0.xsd">
-
- <tz:DefaultTimeZoneProducer>
- <s:specializes/>
- <tz:defaultTimeZoneId>America/Tijuanas</tz:defaultTimeZoneId>
- </tz:DefaultTimeZoneProducer>
+ <String>
+ <Produces/>
+ <tz:DefaultTimeZoneConfig/>
+ <value>America/Tijuanas</value>
+ </String>
</beans>
\ No newline at end of file
Modified: modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/timezone/override.xml
===================================================================
--- modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/timezone/override.xml 2010-10-15 16:32:43 UTC (rev 13884)
+++ modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/timezone/override.xml 2010-10-15 20:23:50 UTC (rev 13885)
@@ -1,32 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-JBoss, Home of Professional Open Source
-Copyright 2010, Red Hat, Inc., and individual contributors
-by the @authors tag. See the copyright.txt in the distribution for a
-full listing of individual contributors.
-
-This is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as
-published by the Free Software Foundation; either version 2.1 of
-the License, or (at your option) any later version.
-
-This software is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this software; if not, write to the Free
-Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-02110-1301 USA, or see the FSF site: http://www.fsf.org.
--->
<beans xmlns="urn:java:ee"
xmlns:tz="urn:java:org.jboss.seam.international.timezone">
- <tz:DefaultTimeZoneProducer>
- <specializes/>
- <tz:defaultTimeZoneId>
- <value>America/Tijuana</value>
- </tz:defaultTimeZoneId>
- </tz:DefaultTimeZoneProducer>
+ <String>
+ <Produces/>
+ <tz:DefaultTimeZoneConfig/>
+ <value>America/Tijuana</value>
+ </String>
</beans>
\ No newline at end of file
Added: modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/timezone/user-timezone.xml
===================================================================
--- modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/timezone/user-timezone.xml (rev 0)
+++ modules/international/trunk/impl/src/test/resources/org/jboss/seam/international/test/timezone/user-timezone.xml 2010-10-15 20:23:50 UTC (rev 13885)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="urn:java:ee"
+ xmlns:tz="urn:java:org.jboss.seam.international.timezone">
+
+ <String>
+ <Produces/>
+ <tz:DefaultTimeZoneConfig/>
+ <value>America/NewYork</value>
+ </String>
+</beans>
\ No newline at end of file
Modified: modules/international/trunk/pom.xml
===================================================================
--- modules/international/trunk/pom.xml 2010-10-15 16:32:43 UTC (rev 13884)
+++ modules/international/trunk/pom.xml 2010-10-15 20:23:50 UTC (rev 13885)
@@ -32,6 +32,7 @@
<!-- Use snapshot WeldX -->
<weld.extensions.version>1.0.0.Beta1</weld.extensions.version>
<jboss-logging.version>3.0.0.Beta4</jboss-logging.version>
+ <seam-xml.version>3.0.0.Alpha3</seam-xml.version>
</properties>
<dependencyManagement>
@@ -53,9 +54,10 @@
</dependency>
<dependency>
- <groupId>org.jboss.seam.international</groupId>
- <artifactId>seam-international</artifactId>
- <version>${project.version}</version>
+ <groupId>org.jboss.seam.xml</groupId>
+ <artifactId>seam-xml-config</artifactId>
+ <version>${seam-xml.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
13 years, 6 months
- 1
- 0
Seam SVN: r13884 - modules/international/trunk/impl.
by seam-commits＠lists.jboss.org
Author: lincolnthree
Date: 2010-10-15 12:32:43 -0400 (Fri, 15 Oct 2010)
New Revision: 13884
Modified:
modules/international/trunk/impl/pom.xml
Log:
For some reason the project compiles in eclipse without this, but it should be in the POM... odd
Modified: modules/international/trunk/impl/pom.xml
===================================================================
--- modules/international/trunk/impl/pom.xml 2010-10-15 15:24:34 UTC (rev 13883)
+++ modules/international/trunk/impl/pom.xml 2010-10-15 16:32:43 UTC (rev 13884)
@@ -22,6 +22,11 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<scope>provided</scope>
13 years, 6 months
- 1
- 0
Seam SVN: r13883 - in modules/international/trunk: api and 11 other directories.
by seam-commits＠lists.jboss.org
Author: lincolnthree
Date: 2010-10-15 11:24:34 -0400 (Fri, 15 Oct 2010)
New Revision: 13883
Removed:
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/MockLogger.java
Modified:
modules/international/trunk/api/pom.xml
modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/MessageFactory.java
modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessage.java
modules/international/trunk/impl/pom.xml
modules/international/trunk/impl/src/main/java/org/jboss/seam/international/locale/AvailableLocales.java
modules/international/trunk/impl/src/main/java/org/jboss/seam/international/locale/DefaultLocaleProducer.java
modules/international/trunk/impl/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessageImpl.java
modules/international/trunk/impl/src/main/java/org/jboss/seam/international/timezone/DefaultTimeZoneProducer.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/AvailableLocalesTest.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideFailTest.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangCountryTest.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangCountryVariantTest.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangTest.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleTest.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/UserLocaleTest.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/MessagesTest.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/BundleTemplateMessageImplTest.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneOverrideFailTest.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneOverrideTest.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneTest.java
modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/UserTimeZoneTest.java
modules/international/trunk/pom.xml
Log:
Updated to use JBoss Logging
Modified: modules/international/trunk/api/pom.xml
===================================================================
--- modules/international/trunk/api/pom.xml 2010-10-15 13:02:19 UTC (rev 13882)
+++ modules/international/trunk/api/pom.xml 2010-10-15 15:24:34 UTC (rev 13883)
@@ -16,6 +16,11 @@
<dependencies>
<dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
Modified: modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/MessageFactory.java
===================================================================
--- modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/MessageFactory.java 2010-10-15 13:02:19 UTC (rev 13882)
+++ modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/MessageFactory.java 2010-10-15 15:24:34 UTC (rev 13883)
@@ -52,42 +52,42 @@
*/
public BundleTemplateMessage info(final BundleKey message)
{
- return getContextualInstance(BundleTemplateMessage.class).text(message).level(Level.INFO);
+ return getContextualInstance(BundleTemplateMessage.class).key(message).level(Level.INFO);
}
public BundleTemplateMessage info(final BundleKey message, final Object... params)
{
- return getContextualInstance(BundleTemplateMessage.class).text(message).level(Level.INFO).textParams(params);
+ return getContextualInstance(BundleTemplateMessage.class).key(message).level(Level.INFO).params(params);
}
public BundleTemplateMessage warn(final BundleKey message)
{
- return getContextualInstance(BundleTemplateMessage.class).text(message).level(Level.WARN);
+ return getContextualInstance(BundleTemplateMessage.class).key(message).level(Level.WARN);
}
public BundleTemplateMessage warn(final BundleKey message, final Object... params)
{
- return getContextualInstance(BundleTemplateMessage.class).text(message).level(Level.WARN).textParams(params);
+ return getContextualInstance(BundleTemplateMessage.class).key(message).level(Level.WARN).params(params);
}
public BundleTemplateMessage error(final BundleKey message)
{
- return getContextualInstance(BundleTemplateMessage.class).text(message).level(Level.ERROR);
+ return getContextualInstance(BundleTemplateMessage.class).key(message).level(Level.ERROR);
}
public BundleTemplateMessage error(final BundleKey message, final Object... params)
{
- return getContextualInstance(BundleTemplateMessage.class).text(message).level(Level.ERROR).textParams(params);
+ return getContextualInstance(BundleTemplateMessage.class).key(message).level(Level.ERROR).params(params);
}
public BundleTemplateMessage fatal(final BundleKey message)
{
- return getContextualInstance(BundleTemplateMessage.class).text(message).level(Level.FATAL);
+ return getContextualInstance(BundleTemplateMessage.class).key(message).level(Level.FATAL);
}
public BundleTemplateMessage fatal(final BundleKey message, final Object... params)
{
- return getContextualInstance(BundleTemplateMessage.class).text(message).level(Level.FATAL).textParams(params);
+ return getContextualInstance(BundleTemplateMessage.class).key(message).level(Level.FATAL).params(params);
}
/*
Modified: modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessage.java
===================================================================
--- modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessage.java 2010-10-15 13:02:19 UTC (rev 13882)
+++ modules/international/trunk/api/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessage.java 2010-10-15 15:24:34 UTC (rev 13883)
@@ -61,14 +61,14 @@
public interface BundleTemplateMessage extends MessageBuilder
{
/**
- * Set the template for this message, using the given {@link BundleKey} to
- * perform a resource lookup.
+ * Use the given {@link BundleKey} to perform a resource lookup, resolving
+ * the template to render for this message.
* <p>
* Any expressions of the form "{0}, {1} ... {N}" found in the template will
* be interpolated; numbers reference the index of any given parameters, and
* can be used more than once per template.
*/
- public BundleTemplateMessage text(final BundleKey text);
+ public BundleTemplateMessage key(final BundleKey text);
/**
* Set the default template text.
@@ -81,7 +81,7 @@
* be interpolated; numbers reference the index of any given parameters, and
* can be used more than once per template.
*/
- public BundleTemplateMessage textDefault(final String text);
+ public BundleTemplateMessage defaults(final String text);
/**
* Set the parameters for this builder's template.
@@ -91,7 +91,7 @@
* {N}". The same parameters will be used when interpolating default text, in
* the case when a {@link BundleKey} cannot be resolved.
*/
- public BundleTemplateMessage textParams(final Object... textParams);
+ public BundleTemplateMessage params(final Object... textParams);
/**
* Set the targets for this message. If supported by the consuming
Modified: modules/international/trunk/impl/pom.xml
===================================================================
--- modules/international/trunk/impl/pom.xml 2010-10-15 13:02:19 UTC (rev 13882)
+++ modules/international/trunk/impl/pom.xml 2010-10-15 15:24:34 UTC (rev 13883)
@@ -1,110 +1,101 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.jboss.seam.international</groupId>
- <artifactId>seam-international-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <parent>
+ <groupId>org.jboss.seam.international</groupId>
+ <artifactId>seam-international-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
- </parent>
+ </parent>
- <artifactId>seam-international</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <artifactId>seam-international</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Seam International Module Core Implementation</name>
+ <packaging>jar</packaging>
+ <name>Seam International Module Core Implementation</name>
- <properties>
- <jboss-logging.version>3.0.0.Beta4</jboss-logging.version>
- </properties>
+ <dependencies>
+ <dependency>
+ <artifactId>seam-international-api</artifactId>
+ <groupId>org.jboss.seam.international</groupId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-extensions</artifactId>
+ </dependency>
- <dependencies>
- <dependency>
- <artifactId>seam-international-api</artifactId>
- <groupId>org.jboss.seam.international</groupId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-extensions</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.ocpsoft</groupId>
- <artifactId>ocpsoft-pretty-time</artifactId>
- <optional>true</optional>
- </dependency>
+ <dependency>
+ <groupId>com.ocpsoft</groupId>
+ <artifactId>ocpsoft-pretty-time</artifactId>
+ <optional>true</optional>
+ </dependency>
- <!-- Test Dependencies -->
- <dependency>
- <groupId>org.jboss.seam.xml</groupId>
- <artifactId>seam-xml-config</artifactId>
- <scope>test</scope>
- </dependency>
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>org.jboss.seam.xml</groupId>
+ <artifactId>seam-xml-config</artifactId>
+ <scope>test</scope>
+ </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-weld-embedded</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- <version>${jboss-logging.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-weld-embedded</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <profiles>
- <profile>
- <id>code-coverage</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>emma-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.sonatype.maven.plugin</groupId>
- <artifactId>emma4it-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <profiles>
+ <profile>
+ <id>code-coverage</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>emma-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.sonatype.maven.plugin</groupId>
+ <artifactId>emma4it-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: modules/international/trunk/impl/src/main/java/org/jboss/seam/international/locale/AvailableLocales.java
===================================================================
--- modules/international/trunk/impl/src/main/java/org/jboss/seam/international/locale/AvailableLocales.java 2010-10-15 13:02:19 UTC (rev 13882)
+++ modules/international/trunk/impl/src/main/java/org/jboss/seam/international/locale/AvailableLocales.java 2010-10-15 15:24:34 UTC (rev 13883)
@@ -32,7 +32,7 @@
import javax.enterprise.inject.Produces;
import javax.inject.Inject;
-import org.slf4j.Logger;
+import org.jboss.logging.Logger;
@ApplicationScoped
public class AvailableLocales
@@ -40,7 +40,7 @@
private String[] supportedLocaleKeys;
@Inject
- Logger log;
+ private Logger log;
@Produces
private List<Locale> locales = null;
Modified: modules/international/trunk/impl/src/main/java/org/jboss/seam/international/locale/DefaultLocaleProducer.java
===================================================================
--- modules/international/trunk/impl/src/main/java/org/jboss/seam/international/locale/DefaultLocaleProducer.java 2010-10-15 13:02:19 UTC (rev 13882)
+++ modules/international/trunk/impl/src/main/java/org/jboss/seam/international/locale/DefaultLocaleProducer.java 2010-10-15 15:24:34 UTC (rev 13883)
@@ -30,7 +30,7 @@
import javax.inject.Inject;
import javax.inject.Named;
-import org.slf4j.Logger;
+import org.jboss.logging.Logger;
@ApplicationScoped
public class DefaultLocaleProducer implements Serializable
@@ -40,7 +40,7 @@
private String defaultLocaleKey;
@Inject
- Logger log;
+ private Logger log;
@Produces
@Named
Modified: modules/international/trunk/impl/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessageImpl.java
===================================================================
--- modules/international/trunk/impl/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessageImpl.java 2010-10-15 13:02:19 UTC (rev 13882)
+++ modules/international/trunk/impl/src/main/java/org/jboss/seam/international/status/builder/BundleTemplateMessageImpl.java 2010-10-15 15:24:34 UTC (rev 13883)
@@ -23,10 +23,10 @@
import javax.inject.Inject;
+import org.jboss.logging.Logger;
import org.jboss.seam.international.status.Bundles;
import org.jboss.seam.international.status.Level;
import org.jboss.seam.international.status.Message;
-import org.slf4j.Logger;
/**
*
@@ -73,19 +73,19 @@
* Setters
*/
- public BundleTemplateMessageImpl text(final BundleKey text)
+ public BundleTemplateMessageImpl key(final BundleKey text)
{
this.textKey = text;
return this;
}
- public BundleTemplateMessage textDefault(final String text)
+ public BundleTemplateMessage defaults(final String text)
{
this.textDefault = text;
return this;
}
- public BundleTemplateMessageImpl textParams(final Object... textParams)
+ public BundleTemplateMessageImpl params(final Object... textParams)
{
this.template.textParams(textParams);
return this;
Modified: modules/international/trunk/impl/src/main/java/org/jboss/seam/international/timezone/DefaultTimeZoneProducer.java
===================================================================
--- modules/international/trunk/impl/src/main/java/org/jboss/seam/international/timezone/DefaultTimeZoneProducer.java 2010-10-15 13:02:19 UTC (rev 13882)
+++ modules/international/trunk/impl/src/main/java/org/jboss/seam/international/timezone/DefaultTimeZoneProducer.java 2010-10-15 15:24:34 UTC (rev 13883)
@@ -29,13 +29,13 @@
import javax.inject.Inject;
import javax.inject.Named;
+import org.jboss.logging.Logger;
import org.joda.time.DateTimeZone;
-import org.slf4j.Logger;
/**
* Default TimeZone of the application. If configuration of the default TimeZone
* is found that will be used, otherwise the JVM default TimeZone otherwise.
- *
+ *
* @author Ken Finnigan
*/
Deleted: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/MockLogger.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/MockLogger.java 2010-10-15 13:02:19 UTC (rev 13882)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/MockLogger.java 2010-10-15 15:24:34 UTC (rev 13883)
@@ -1,292 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.seam.international.test;
-
-import org.slf4j.Logger;
-import org.slf4j.Marker;
-
-/**
- * Provide a completely empty logger implementation for Unit Tests. This entire
- * class is a no-op; it does <i>nothing</i>.
- *
- * @author <a href="mailto:lincolnbaxter@gmail.com>Lincoln Baxter, III</a>
- *
- */
-public class MockLogger implements Logger
-{
-
- public void debug(final String arg0)
- {
- }
-
- public void debug(final String arg0, final Object arg1)
- {
- }
-
- public void debug(final String arg0, final Object[] arg1)
- {
- }
-
- public void debug(final String arg0, final Throwable arg1)
- {
- }
-
- public void debug(final Marker arg0, final String arg1)
- {
- }
-
- public void debug(final String arg0, final Object arg1, final Object arg2)
- {
- }
-
- public void debug(final Marker arg0, final String arg1, final Object arg2)
- {
- }
-
- public void debug(final Marker arg0, final String arg1, final Object[] arg2)
- {
- }
-
- public void debug(final Marker arg0, final String arg1, final Throwable arg2)
- {
- }
-
- public void debug(final Marker arg0, final String arg1, final Object arg2, final Object arg3)
- {
- }
-
- public void error(final String arg0)
- {
- }
-
- public void error(final String arg0, final Object arg1)
- {
- }
-
- public void error(final String arg0, final Object[] arg1)
- {
- }
-
- public void error(final String arg0, final Throwable arg1)
- {
- }
-
- public void error(final Marker arg0, final String arg1)
- {
- }
-
- public void error(final String arg0, final Object arg1, final Object arg2)
- {
- }
-
- public void error(final Marker arg0, final String arg1, final Object arg2)
- {
- }
-
- public void error(final Marker arg0, final String arg1, final Object[] arg2)
- {
- }
-
- public void error(final Marker arg0, final String arg1, final Throwable arg2)
- {
- }
-
- public void error(final Marker arg0, final String arg1, final Object arg2, final Object arg3)
- {
- }
-
- public String getName()
- {
- return null;
- }
-
- public void info(final String arg0)
- {
- }
-
- public void info(final String arg0, final Object arg1)
- {
- }
-
- public void info(final String arg0, final Object[] arg1)
- {
- }
-
- public void info(final String arg0, final Throwable arg1)
- {
- }
-
- public void info(final Marker arg0, final String arg1)
- {
- }
-
- public void info(final String arg0, final Object arg1, final Object arg2)
- {
- }
-
- public void info(final Marker arg0, final String arg1, final Object arg2)
- {
- }
-
- public void info(final Marker arg0, final String arg1, final Object[] arg2)
- {
- }
-
- public void info(final Marker arg0, final String arg1, final Throwable arg2)
- {
- }
-
- public void info(final Marker arg0, final String arg1, final Object arg2, final Object arg3)
- {
- }
-
- public boolean isDebugEnabled()
- {
- return false;
- }
-
- public boolean isDebugEnabled(final Marker arg0)
- {
- return false;
- }
-
- public boolean isErrorEnabled()
- {
- return false;
- }
-
- public boolean isErrorEnabled(final Marker arg0)
- {
- return false;
- }
-
- public boolean isInfoEnabled()
- {
- return false;
- }
-
- public boolean isInfoEnabled(final Marker arg0)
- {
- return false;
- }
-
- public boolean isTraceEnabled()
- {
- return false;
- }
-
- public boolean isTraceEnabled(final Marker arg0)
- {
- return false;
- }
-
- public boolean isWarnEnabled()
- {
- return false;
- }
-
- public boolean isWarnEnabled(final Marker arg0)
- {
- return false;
- }
-
- public void trace(final String arg0)
- {
- }
-
- public void trace(final String arg0, final Object arg1)
- {
- }
-
- public void trace(final String arg0, final Object[] arg1)
- {
- }
-
- public void trace(final String arg0, final Throwable arg1)
- {
- }
-
- public void trace(final Marker arg0, final String arg1)
- {
- }
-
- public void trace(final String arg0, final Object arg1, final Object arg2)
- {
- }
-
- public void trace(final Marker arg0, final String arg1, final Object arg2)
- {
- }
-
- public void trace(final Marker arg0, final String arg1, final Object[] arg2)
- {
- }
-
- public void trace(final Marker arg0, final String arg1, final Throwable arg2)
- {
- }
-
- public void trace(final Marker arg0, final String arg1, final Object arg2, final Object arg3)
- {
- }
-
- public void warn(final String arg0)
- {
- }
-
- public void warn(final String arg0, final Object arg1)
- {
- }
-
- public void warn(final String arg0, final Object[] arg1)
- {
- }
-
- public void warn(final String arg0, final Throwable arg1)
- {
- }
-
- public void warn(final Marker arg0, final String arg1)
- {
- }
-
- public void warn(final String arg0, final Object arg1, final Object arg2)
- {
- }
-
- public void warn(final Marker arg0, final String arg1, final Object arg2)
- {
- }
-
- public void warn(final Marker arg0, final String arg1, final Object[] arg2)
- {
- }
-
- public void warn(final Marker arg0, final String arg1, final Throwable arg2)
- {
- }
-
- public void warn(final Marker arg0, final String arg1, final Object arg2, final Object arg3)
- {
- }
-
-}
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/AvailableLocalesTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/AvailableLocalesTest.java 2010-10-15 13:02:19 UTC (rev 13882)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/AvailableLocalesTest.java 2010-10-15 15:24:34 UTC (rev 13883)
@@ -27,15 +27,12 @@
import javax.inject.Inject;
import org.jboss.arquillian.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.international.locale.AvailableLocales;
-import org.jboss.seam.international.test.MockLogger;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Assert;
import org.junit.Test;
-import org.junit.runner.RunWith;
//(a)RunWith(Arquillian.class)
public class AvailableLocalesTest
@@ -43,14 +40,14 @@
@Deployment
public static JavaArchive createTestArchive()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(AvailableLocales.class, MockLogger.class).addManifestResource("org/jboss/seam/international/test/locale/override-available.xml", ArchivePaths.create("beans.xml"));
+ return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(AvailableLocales.class).addManifestResource("org/jboss/seam/international/test/locale/override-available.xml", ArchivePaths.create("beans.xml"));
}
@Inject
List<Locale> locales;
-//FIXME XML Override not working
-// @Test
+ // FIXME XML Override not working
+ // @Test
public void testAvailableLocalesProducer()
{
Assert.assertNotNull(locales);
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideFailTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideFailTest.java 2010-10-15 13:02:19 UTC (rev 13882)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideFailTest.java 2010-10-15 15:24:34 UTC (rev 13883)
@@ -28,7 +28,6 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.international.locale.DefaultLocaleProducer;
-import org.jboss.seam.international.test.MockLogger;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -43,7 +42,7 @@
@Deployment
public static JavaArchive createTestArchive()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MockLogger.class, DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")).addManifestResource("org/jboss/seam/international/test/locale/override-fail.xml", ArchivePaths.create("seam-beans.xml"));
+ return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")).addManifestResource("org/jboss/seam/international/test/locale/override-fail.xml", ArchivePaths.create("seam-beans.xml"));
}
@Inject
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangCountryTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangCountryTest.java 2010-10-15 13:02:19 UTC (rev 13882)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangCountryTest.java 2010-10-15 15:24:34 UTC (rev 13883)
@@ -26,16 +26,13 @@
import javax.inject.Inject;
import org.jboss.arquillian.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.international.locale.DefaultLocaleProducer;
-import org.jboss.seam.international.test.MockLogger;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Assert;
import org.junit.Test;
-import org.junit.runner.RunWith;
//(a)RunWith(Arquillian.class)
public class DefaultLocaleOverrideLangCountryTest
@@ -43,14 +40,14 @@
@Deployment
public static JavaArchive createTestArchive()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MockLogger.class, DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")).addManifestResource("org/jboss/seam/international/test/locale/override-lang-country.xml", ArchivePaths.create("seam-beans.xml"));
+ return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")).addManifestResource("org/jboss/seam/international/test/locale/override-lang-country.xml", ArchivePaths.create("seam-beans.xml"));
}
@Inject
Locale locale;
-//FIXME XML Override not working
-// @Test
+ // FIXME XML Override not working
+ // @Test
public void testDefaultLocaleProducerDirect()
{
Assert.assertNotNull(locale);
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangCountryVariantTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangCountryVariantTest.java 2010-10-15 13:02:19 UTC (rev 13882)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangCountryVariantTest.java 2010-10-15 15:24:34 UTC (rev 13883)
@@ -26,16 +26,13 @@
import javax.inject.Inject;
import org.jboss.arquillian.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.international.locale.DefaultLocaleProducer;
-import org.jboss.seam.international.test.MockLogger;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Assert;
import org.junit.Test;
-import org.junit.runner.RunWith;
//(a)RunWith(Arquillian.class)
public class DefaultLocaleOverrideLangCountryVariantTest
@@ -43,14 +40,14 @@
@Deployment
public static JavaArchive createTestArchive()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MockLogger.class, DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")).addManifestResource("org/jboss/seam/international/test/locale/override-lang-country-variant.xml", ArchivePaths.create("seam-beans.xml"));
+ return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")).addManifestResource("org/jboss/seam/international/test/locale/override-lang-country-variant.xml", ArchivePaths.create("seam-beans.xml"));
}
@Inject
Locale locale;
-//FIXME XML Override not working
-// @Test
+ // FIXME XML Override not working
+ // @Test
public void testDefaultLocaleProducerDirect()
{
Assert.assertNotNull(locale);
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangTest.java 2010-10-15 13:02:19 UTC (rev 13882)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleOverrideLangTest.java 2010-10-15 15:24:34 UTC (rev 13883)
@@ -26,16 +26,13 @@
import javax.inject.Inject;
import org.jboss.arquillian.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.international.locale.DefaultLocaleProducer;
-import org.jboss.seam.international.test.MockLogger;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.junit.Assert;
import org.junit.Test;
-import org.junit.runner.RunWith;
//(a)RunWith(Arquillian.class)
public class DefaultLocaleOverrideLangTest
@@ -43,14 +40,14 @@
@Deployment
public static JavaArchive createTestArchive()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MockLogger.class, DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")).addManifestResource("org/jboss/seam/international/test/locale/override-lang.xml", ArchivePaths.create("seam-beans.xml"));
+ return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml")).addManifestResource("org/jboss/seam/international/test/locale/override-lang.xml", ArchivePaths.create("seam-beans.xml"));
}
@Inject
Locale locale;
-//FIXME XML Override not working
-// @Test
+ // FIXME XML Override not working
+ // @Test
public void testDefaultLocaleProducerDirect()
{
Assert.assertNotNull(locale);
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleTest.java 2010-10-15 13:02:19 UTC (rev 13882)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/DefaultLocaleTest.java 2010-10-15 15:24:34 UTC (rev 13883)
@@ -28,7 +28,6 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.international.locale.DefaultLocaleProducer;
-import org.jboss.seam.international.test.MockLogger;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -43,7 +42,7 @@
@Deployment
public static JavaArchive createTestArchive()
{
- return ShrinkWrap.create("defaultlocaletest.jar", JavaArchive.class).addClasses(MockLogger.class, DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
+ return ShrinkWrap.create("defaultlocaletest.jar", JavaArchive.class).addClasses(DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
}
@Inject
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/UserLocaleTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/UserLocaleTest.java 2010-10-15 13:02:19 UTC (rev 13882)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/locale/UserLocaleTest.java 2010-10-15 15:24:34 UTC (rev 13883)
@@ -32,7 +32,6 @@
import org.jboss.seam.international.Changed;
import org.jboss.seam.international.locale.DefaultLocaleProducer;
import org.jboss.seam.international.locale.UserLocaleProducer;
-import org.jboss.seam.international.test.MockLogger;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -48,7 +47,7 @@
@Deployment
public static JavaArchive createTestArchive()
{
- return ShrinkWrap.create("userlocaletest.jar", JavaArchive.class).addClasses(MockLogger.class, UserLocaleProducer.class, DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
+ return ShrinkWrap.create("userlocaletest.jar", JavaArchive.class).addClasses(UserLocaleProducer.class, DefaultLocaleProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
}
@Inject
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/MessagesTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/MessagesTest.java 2010-10-15 13:02:19 UTC (rev 13882)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/MessagesTest.java 2010-10-15 15:24:34 UTC (rev 13883)
@@ -36,7 +36,6 @@
import org.jboss.seam.international.status.builder.BundleKey;
import org.jboss.seam.international.status.builder.BundleTemplateMessageImpl;
import org.jboss.seam.international.status.builder.TemplateMessageImpl;
-import org.jboss.seam.international.test.MockLogger;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -57,7 +56,7 @@
@Deployment
public static JavaArchive createTestArchive()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MessagesImpl.class, MessageFactory.class, BundleTemplateMessageImpl.class, TemplateMessageImpl.class, Bundles.class, MockLogger.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
+ return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MessagesImpl.class, MessageFactory.class, BundleTemplateMessageImpl.class, TemplateMessageImpl.class, Bundles.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
}
@Inject
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/BundleTemplateMessageImplTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/BundleTemplateMessageImplTest.java 2010-10-15 13:02:19 UTC (rev 13882)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/status/builder/BundleTemplateMessageImplTest.java 2010-10-15 15:24:34 UTC (rev 13883)
@@ -32,7 +32,6 @@
import org.jboss.seam.international.status.builder.BundleTemplateMessageImpl;
import org.jboss.seam.international.status.builder.TemplateMessage;
import org.jboss.seam.international.status.builder.TemplateMessageImpl;
-import org.jboss.seam.international.test.MockLogger;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -51,7 +50,7 @@
@Deployment
public static Archive<?> createTestArchive()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MessageFactory.class, BundleTemplateMessageImpl.class, TemplateMessageImpl.class, Bundles.class, MockLogger.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
+ return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MessageFactory.class, BundleTemplateMessageImpl.class, TemplateMessageImpl.class, Bundles.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
}
@Inject
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneOverrideFailTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneOverrideFailTest.java 2010-10-15 13:02:19 UTC (rev 13882)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneOverrideFailTest.java 2010-10-15 15:24:34 UTC (rev 13883)
@@ -24,17 +24,13 @@
import javax.inject.Inject;
import org.jboss.arquillian.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.seam.international.test.MockLogger;
import org.jboss.seam.international.timezone.DefaultTimeZoneProducer;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
import org.joda.time.DateTimeZone;
import org.junit.Assert;
import org.junit.Test;
-import org.junit.runner.RunWith;
//(a)RunWith(Arquillian.class)
public class DefaultTimeZoneOverrideFailTest
@@ -42,14 +38,14 @@
@Deployment
public static JavaArchive createTestArchive()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MockLogger.class, DefaultTimeZoneProducer.class).addManifestResource("org/jboss/seam/international/test/timezone/override-fail.xml", ArchivePaths.create("beans.xml"));
+ return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(DefaultTimeZoneProducer.class).addManifestResource("org/jboss/seam/international/test/timezone/override-fail.xml", ArchivePaths.create("beans.xml"));
}
@Inject
DateTimeZone timeZone;
-//FIXME XML override not working
-// @Test
+ // FIXME XML override not working
+ // @Test
public void testDefaultTimeZoneProducerDirect()
{
Assert.assertNotNull(timeZone);
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneOverrideTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneOverrideTest.java 2010-10-15 13:02:19 UTC (rev 13882)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneOverrideTest.java 2010-10-15 15:24:34 UTC (rev 13883)
@@ -24,8 +24,6 @@
import javax.inject.Inject;
import org.jboss.arquillian.api.Deployment;
-import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.seam.international.test.MockLogger;
import org.jboss.seam.international.timezone.DefaultTimeZoneProducer;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -33,7 +31,6 @@
import org.joda.time.DateTimeZone;
import org.junit.Assert;
import org.junit.Test;
-import org.junit.runner.RunWith;
//(a)RunWith(Arquillian.class)
public class DefaultTimeZoneOverrideTest
@@ -41,14 +38,14 @@
@Deployment
public static JavaArchive createTestArchive()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(MockLogger.class, DefaultTimeZoneProducer.class).addManifestResource("org/jboss/seam/international/test/timezone/override.xml", ArchivePaths.create("beans.xml"));
+ return ShrinkWrap.create("test.jar", JavaArchive.class).addClasses(DefaultTimeZoneProducer.class).addManifestResource("org/jboss/seam/international/test/timezone/override.xml", ArchivePaths.create("beans.xml"));
}
@Inject
DateTimeZone timeZone;
-//FIXME XML override not working
-// @Test
+ // FIXME XML override not working
+ // @Test
public void testDefaultTimeZoneProducerDirect()
{
Assert.assertNotNull(timeZone);
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneTest.java 2010-10-15 13:02:19 UTC (rev 13882)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/DefaultTimeZoneTest.java 2010-10-15 15:24:34 UTC (rev 13883)
@@ -25,7 +25,6 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.seam.international.test.MockLogger;
import org.jboss.seam.international.timezone.DefaultTimeZoneProducer;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -42,7 +41,7 @@
@Deployment
public static JavaArchive createTestArchive()
{
- return ShrinkWrap.create("defaulttimezonetest.jar", JavaArchive.class).addClasses(MockLogger.class, DefaultTimeZoneProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
+ return ShrinkWrap.create("defaulttimezonetest.jar", JavaArchive.class).addClasses(DefaultTimeZoneProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
}
@Inject
Modified: modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/UserTimeZoneTest.java
===================================================================
--- modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/UserTimeZoneTest.java 2010-10-15 13:02:19 UTC (rev 13882)
+++ modules/international/trunk/impl/src/test/java/org/jboss/seam/international/test/timezone/UserTimeZoneTest.java 2010-10-15 15:24:34 UTC (rev 13883)
@@ -28,7 +28,6 @@
import org.jboss.arquillian.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.international.Changed;
-import org.jboss.seam.international.test.MockLogger;
import org.jboss.seam.international.timezone.DefaultTimeZoneProducer;
import org.jboss.seam.international.timezone.UserTimeZoneProducer;
import org.jboss.shrinkwrap.api.ArchivePaths;
@@ -47,7 +46,7 @@
@Deployment
public static JavaArchive createTestArchive()
{
- return ShrinkWrap.create("usertimezonetest.jar", JavaArchive.class).addClasses(MockLogger.class, UserTimeZoneProducer.class, DefaultTimeZoneProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
+ return ShrinkWrap.create("usertimezonetest.jar", JavaArchive.class).addClasses(UserTimeZoneProducer.class, DefaultTimeZoneProducer.class).addManifestResource(new ByteArrayAsset(new byte[0]), ArchivePaths.create("beans.xml"));
}
@Inject
Modified: modules/international/trunk/pom.xml
===================================================================
--- modules/international/trunk/pom.xml 2010-10-15 13:02:19 UTC (rev 13882)
+++ modules/international/trunk/pom.xml 2010-10-15 15:24:34 UTC (rev 13883)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -30,6 +31,7 @@
<seam.version>3.0.0.b01</seam.version>
<!-- Use snapshot WeldX -->
<weld.extensions.version>1.0.0.Beta1</weld.extensions.version>
+ <jboss-logging.version>3.0.0.Beta4</jboss-logging.version>
</properties>
<dependencyManagement>
@@ -61,19 +63,15 @@
<artifactId>weld-extensions</artifactId>
<version>${weld.extensions.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>${jboss-logging.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
- <dependencies>
-
- <!-- Environment Dependencies -->
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
<profiles>
<profile>
<id>distribution</id>
@@ -130,6 +128,13 @@
<developers>
<developer>
+ <name>Ken Finnigan</name>
+ <timezone>GMT</timezone>
+ <roles>
+ <role>Project Lead</role>
+ </roles>
+ </developer>
+ <developer>
<name>Lincoln Baxter, III</name>
<email>lincolnbaxter(a)gmail.com</email>
<url>http://ocpsoft.com</url>
@@ -140,13 +145,6 @@
<role>Project Lead</role>
</roles>
</developer>
- <developer>
- <name>Ken Finnigan</name>
- <timezone>GMT</timezone>
- <roles>
- <role>Project Lead</role>
- </roles>
- </developer>
</developers>
<scm>
13 years, 6 months
- 1
- 0