Seam SVN: r11465 - branches/enterprise/JBPAPP_5_0/build.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-09-03 10:57:45 -0400 (Thu, 03 Sep 2009)
New Revision: 11465
Modified:
branches/enterprise/JBPAPP_5_0/build/core.pom.xml
branches/enterprise/JBPAPP_5_0/build/root.pom.xml
Log:
JBPAPP-2660
Modified: branches/enterprise/JBPAPP_5_0/build/core.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/core.pom.xml 2009-09-03 14:28:22 UTC (rev 11464)
+++ branches/enterprise/JBPAPP_5_0/build/core.pom.xml 2009-09-03 14:57:45 UTC (rev 11465)
@@ -334,6 +334,12 @@
</dependency>
<dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
<optional>true</optional>
Modified: branches/enterprise/JBPAPP_5_0/build/root.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2009-09-03 14:28:22 UTC (rev 11464)
+++ branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2009-09-03 14:57:45 UTC (rev 11465)
@@ -247,7 +247,7 @@
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
</exclusion>
- </exclusions>
+ </exclusions>
</dependency>
<dependency>
@@ -882,6 +882,12 @@
</dependency>
<dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>2.1.0.GA</version>
+ </dependency>
+
+ <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-common-logging-spi</artifactId>
<version>2.1.0.GA</version>
@@ -904,10 +910,6 @@
<groupId>apache-slide</groupId>
<artifactId>webdavlib</artifactId>
</exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </exclusion>
</exclusions>
</dependency>
14 years, 7 months
Seam SVN: r11464 - tags.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-09-03 10:28:22 -0400 (Thu, 03 Sep 2009)
New Revision: 11464
Added:
tags/JBPAPP_4_3_CP05_FP/
Removed:
tags/JBPAPP_4_3_CP05_FP_CR2/
Log:
Copied: tags/JBPAPP_4_3_CP05_FP (from rev 11463, tags/JBPAPP_4_3_CP05_FP_CR2)
14 years, 7 months
Seam SVN: r11463 - branches/enterprise/JBPAPP_5_0/build.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-09-03 09:49:14 -0400 (Thu, 03 Sep 2009)
New Revision: 11463
Modified:
branches/enterprise/JBPAPP_5_0/build/ioc.pom.xml
branches/enterprise/JBPAPP_5_0/build/root.pom.xml
Log:
JBPAPP-2728 - upgraded cglib to 2.2 and asm to 3.1
Modified: branches/enterprise/JBPAPP_5_0/build/ioc.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/ioc.pom.xml 2009-09-03 13:43:30 UTC (rev 11462)
+++ branches/enterprise/JBPAPP_5_0/build/ioc.pom.xml 2009-09-03 13:49:14 UTC (rev 11463)
@@ -23,9 +23,15 @@
<dependency>
<groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
+ <artifactId>cglib</artifactId>
<optional>true</optional>
</dependency>
+
+ <dependency>
+ <groupId>org.objectweb.asm</groupId>
+ <artifactId>asm</artifactId>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
Modified: branches/enterprise/JBPAPP_5_0/build/root.pom.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2009-09-03 13:43:30 UTC (rev 11462)
+++ branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2009-09-03 13:49:14 UTC (rev 11463)
@@ -819,9 +819,15 @@
<dependency>
<groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
+ <artifactId>cglib</artifactId>
+ <version>2.2</version>
</dependency>
+
+ <dependency>
+ <groupId>org.objectweb.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.1</version>
+ </dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
14 years, 7 months
Seam SVN: r11462 - branches/enterprise/JBPAPP_5_0/build.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2009-09-03 09:43:30 -0400 (Thu, 03 Sep 2009)
New Revision: 11462
Modified:
branches/enterprise/JBPAPP_5_0/build/utilities.build.xml
Log:
added useful options to maven runtime for debugging - commented code
Modified: branches/enterprise/JBPAPP_5_0/build/utilities.build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/build/utilities.build.xml 2009-09-03 05:35:34 UTC (rev 11461)
+++ branches/enterprise/JBPAPP_5_0/build/utilities.build.xml 2009-09-03 13:43:30 UTC (rev 11462)
@@ -212,7 +212,10 @@
<sysproperty key="maven.home" value="${maven.dir}" />
<arg line="-Dseam.version=${complete.version}" />
<arg line="--settings ${maven.settings.xml}" />
- <!--<arg line="-X" /> -->
+ <!-- offline option -->
+ <!-- <arg line="-o" />-->
+ <!-- debug option -->
+ <!-- <arg line="-X" /> -->
<args />
<arg line="@{target}" />
</java>
14 years, 7 months
Seam SVN: r11461 - branches/community/Seam_2_2/src/main/org/jboss/seam/mock.
by seam-commits＠lists.jboss.org
Author: christian.bauer(a)jboss.com
Date: 2009-09-03 01:35:34 -0400 (Thu, 03 Sep 2009)
New Revision: 11461
Modified:
branches/community/Seam_2_2/src/main/org/jboss/seam/mock/DBUnitSeamTest.java
Log:
JBSEAM-4402, fixed implied but wrong BeforeClass order in DBUnitSeamTest
Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/mock/DBUnitSeamTest.java
===================================================================
--- branches/community/Seam_2_2/src/main/org/jboss/seam/mock/DBUnitSeamTest.java 2009-09-02 08:43:22 UTC (rev 11460)
+++ branches/community/Seam_2_2/src/main/org/jboss/seam/mock/DBUnitSeamTest.java 2009-09-03 05:35:34 UTC (rev 11461)
@@ -110,44 +110,85 @@
protected String datasourceJndiName;
protected String binaryDir;
protected Database database = HSQL;
+ protected boolean replaceNull = true;
protected List<DataSetOperation> beforeTestOperations = new ArrayList<DataSetOperation>();
protected List<DataSetOperation> afterTestOperations = new ArrayList<DataSetOperation>();
+ private boolean prepared = false;
+
@BeforeClass
@Parameters("datasourceJndiName")
public void setDatasourceJndiName(@Optional String datasourceJndiName)
{
+ if (datasourceJndiName == null) return;
+ log.debug("Setting datasource name: " + datasourceJndiName);
this.datasourceJndiName = datasourceJndiName;
}
+ public String getDatasourceJndiName()
+ {
+ return datasourceJndiName;
+ }
+
@BeforeClass
@Parameters("binaryDir")
public void setBinaryDir(@Optional String binaryDir)
{
+ if (binaryDir == null) return;
+ log.debug("Setting binary directory: " + binaryDir);
this.binaryDir = binaryDir;
}
+ public String getBinaryDir()
+ {
+ return binaryDir;
+ }
+
@BeforeClass
@Parameters("database")
public void setDatabase(@Optional String database)
{
- if (database != null)
- {
- this.database = Database.valueOf(database.toUpperCase());
- }
+ if (database == null) return;
+ log.debug("Setting database: " + database);
+ this.database = Database.valueOf(database.toUpperCase());
}
+ // We don't have a getDatabase() getter because subclasses might use a different Enum!
+
@BeforeClass
- @Override
- public void setupClass() throws Exception
+ @Parameters("replaceNull")
+ public void setReplaceNull(@Optional Boolean replaceNull)
{
- super.setupClass();
- prepareDBUnitOperations();
+ if (replaceNull == null) return;
+ log.debug("Setting replace null: " + replaceNull);
+ this.replaceNull = replaceNull;
}
+ public Boolean isReplaceNull()
+ {
+ return replaceNull;
+ }
+
@BeforeMethod
public void prepareDataBeforeTest()
{
+ // This is not pretty but we unfortunately can not have dependencies between @BeforeClass methods.
+ // This was a basic design mistake and we can't change it now because we need to be backwards
+ // compatible. We can only "prepare" the datasets once all @BeforeClass have been executed.
+ if (!prepared) {
+ log.debug("Before test method runs, preparing datasets");
+ prepareDBUnitOperations();
+ for (DataSetOperation beforeTestOperation : beforeTestOperations)
+ {
+ beforeTestOperation.prepare(this);
+ }
+ for (DataSetOperation afterTestOperation : afterTestOperations)
+ {
+ afterTestOperation.prepare(this);
+ }
+ prepared = true;
+ }
+
executeOperations(beforeTestOperations);
}
@@ -159,6 +200,7 @@
private void executeOperations(List<DataSetOperation> list)
{
+ log.debug("Executing DataSetOperations: " + list.size());
IDatabaseConnection con = null;
try
{
@@ -166,7 +208,9 @@
disableReferentialIntegrity(con);
for (DataSetOperation op : list)
{
+ prepareExecution(con, op);
op.execute(con);
+ afterExecution(con, op);
}
enableReferentialIntegrity(con);
}
@@ -186,12 +230,20 @@
}
}
- protected class DataSetOperation
+ protected static class DataSetOperation
{
+
+ private LogProvider log = Logging.getLogProvider(DataSetOperation.class);
+
String dataSetLocation;
ReplacementDataSet dataSet;
DatabaseOperation operation;
+ protected DataSetOperation()
+ {
+ // Support subclassing
+ }
+
/**
* Defaults to <tt>DatabaseOperation.CLEAN_INSERT</tt>
*
@@ -204,15 +256,31 @@
/**
* Defaults to <tt>DatabaseOperation.CLEAN_INSERT</tt>
+ *
+ * @param dataSetLocation location of DBUnit dataset
+ * @param dtdLocation optional (can be null) location of XML file DTD on classpath
*/
public DataSetOperation(String dataSetLocation, String dtdLocation)
{
this(dataSetLocation, dtdLocation, DatabaseOperation.CLEAN_INSERT);
}
+ /**
+ * @param dataSetLocation location of DBUnit dataset
+ * @param operation operation to execute
+ */
+ public DataSetOperation(String dataSetLocation, DatabaseOperation operation)
+ {
+ this(dataSetLocation, null, operation);
+ }
+
public DataSetOperation(String dataSetLocation, String dtdLocation, DatabaseOperation operation)
{
- log.debug(">>> Preparing dataset: " + dataSetLocation + " <<<");
+ if (dataSetLocation == null)
+ {
+ this.operation = operation;
+ return;
+ }
// Load the base dataset file
InputStream input = Thread.currentThread().getContextClassLoader().getResourceAsStream(dataSetLocation);
@@ -236,21 +304,10 @@
{
throw new RuntimeException(ex);
}
- this.dataSet.addReplacementObject("[NULL]", null);
- if (binaryDir != null)
- {
- this.dataSet.addReplacementSubstring("[BINARY_DIR]", getBinaryDirFullpath().toString());
- }
this.operation = operation;
this.dataSetLocation = dataSetLocation;
}
-
- public DataSetOperation(String dataSetLocation, DatabaseOperation operation)
- {
- this(dataSetLocation, null, operation);
- }
-
public IDataSet getDataSet()
{
return dataSet;
@@ -261,10 +318,29 @@
return operation;
}
+ public void prepare(DBUnitSeamTest test)
+ {
+ if (dataSet == null) return;
+ log.debug("Preparing DataSetOperation replacement values");
+
+ if (test.isReplaceNull())
+ {
+ log.debug("Replacing [NULL] placeholder with real null value");
+ dataSet.addReplacementObject("[NULL]", null);
+ }
+ if (test.getBinaryDir() != null)
+ {
+ log.debug("Replacing [BINARY_DIR] placeholder with path: " + test.getBinaryDirFullpath().toString());
+ dataSet.addReplacementSubstring("[BINARY_DIR]", test.getBinaryDirFullpath().toString());
+ }
+ }
+
public void execute(IDatabaseConnection connection)
{
+ if (dataSet == null || operation == null) return;
try
{
+ log.debug("Executing: " + this);
this.operation.execute(connection, dataSet);
}
catch (Exception ex)
@@ -276,8 +352,7 @@
@Override
public String toString()
{
- // TODO: This is not pretty because DBUnit's DatabaseOperation doesn't implement toString() properly
- return operation.getClass() + " with dataset: " + dataSetLocation;
+ return getClass().getName() + " with dataset location: " + dataSetLocation;
}
}
@@ -295,12 +370,12 @@
{
try
{
- if (datasourceJndiName == null)
+ if (getDatasourceJndiName() == null)
{
throw new RuntimeException("Please set datasourceJndiName TestNG property");
}
- DataSource datasource = ((DataSource) getInitialContext().lookup(datasourceJndiName));
+ DataSource datasource = ((DataSource) getInitialContext().lookup(getDatasourceJndiName()));
// Get a JDBC connection from JNDI datasource
Connection con = datasource.getConnection();
@@ -315,8 +390,6 @@
}
/**
- * Override this method if you aren't using HSQL DB.
- * <p/>
* Execute whatever statement is necessary to either defer or disable foreign
* key constraint checking on the given database connection, which is used by
* DBUnit to import datasets.
@@ -343,8 +416,6 @@
}
/**
- * Override this method if you aren't using HSQL DB.
- * <p/>
* Execute whatever statement is necessary to enable integrity constraint checks after
* dataset operations.
*
@@ -400,6 +471,28 @@
}
/**
+ * Callback for each operation before DBUnit executes the operation, useful if extra preparation of
+ * data/tables is necessary, e.g. additional SQL commands on a per-operation (per table?) granularity
+ * on the given database connection.
+ *
+ * @param con A DBUnit connection wrapper
+ * @param operation The operation to be executed, call <tt>getDataSet()</tt> to access the data.
+ */
+ protected void prepareExecution(IDatabaseConnection con, DataSetOperation operation)
+ {
+ }
+
+ /**
+ * Callback for each operation, useful if extra preparation of data/tables is necessary.
+ *
+ * @param con A DBUnit connection wrapper
+ * @param operation The operation that was executed, call <tt>getDataSet()</tt> to access the data.
+ */
+ protected void afterExecution(IDatabaseConnection con, DataSetOperation operation)
+ {
+ }
+
+ /**
* Resolves the binary dir location with the help of the classloader, we need the
* absolute full path of that directory.
*
@@ -407,11 +500,11 @@
*/
protected URL getBinaryDirFullpath()
{
- if (binaryDir == null)
+ if (getBinaryDir() == null)
{
throw new RuntimeException("Please set binaryDir TestNG property to location of binary test files");
}
- return getResourceURL(binaryDir);
+ return getResourceURL(getBinaryDir());
}
protected URL getResourceURL(String resource)
@@ -424,13 +517,21 @@
return url;
}
+ /**
+ * Load a file and return it as a <tt>byte[]</tt>. Useful for comparison operations in an actual
+ * unit test, e.g. to compare an imported database record against a known file state.
+ *
+ * @param filename the path of the file on the classpath, relative to configured <tt>binaryDir</tt> base path
+ * @return the file content as bytes
+ * @throws Exception when the file could not be found or read
+ */
protected byte[] getBinaryFile(String filename) throws Exception
{
- if (binaryDir == null)
+ if (getBinaryDir() == null)
{
throw new RuntimeException("Please set binaryDir TestNG property to location of binary test files");
}
- File file = new File(getResourceURL(binaryDir + "/" + filename).toURI());
+ File file = new File(getResourceURL(getBinaryDir() + "/" + filename).toURI());
InputStream is = new FileInputStream(file);
// Get the size of the file
14 years, 7 months
Seam SVN: r11460 - branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium.
by seam-commits＠lists.jboss.org
Author: kpiwko(a)redhat.com
Date: 2009-09-02 04:43:22 -0400 (Wed, 02 Sep 2009)
New Revision: 11460
Modified:
branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeleniumDateSelector.java
Log:
JBSEAM-4400
Modified: branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeleniumDateSelector.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeleniumDateSelector.java 2009-09-02 06:42:10 UTC (rev 11459)
+++ branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/selenium/SeleniumDateSelector.java 2009-09-02 08:43:22 UTC (rev 11460)
@@ -178,7 +178,7 @@
*/
protected int monthStepsCount(String calMonth, int month)
{
- final List<String> months = Arrays.asList(DateFormatSymbols.getInstance().getMonths());
+ final List<String> months = Arrays.asList((new DateFormatSymbols()).getMonths());
int mindex = months.indexOf(calMonth);
if (mindex == -1)
throw new IllegalArgumentException("Unknown month: " + calMonth + " for locale: " + Locale.getDefault());
14 years, 7 months
Seam SVN: r11459 - branches/community/Seam_2_2/src/test/ftest.
by seam-commits＠lists.jboss.org
Author: oskutka(a)redhat.com
Date: 2009-09-02 02:42:10 -0400 (Wed, 02 Sep 2009)
New Revision: 11459
Modified:
branches/community/Seam_2_2/src/test/ftest/ftest.ci.properties
branches/community/Seam_2_2/src/test/ftest/ftest.properties
Log:
Setting Permgen space to 512 MB.
Modified: branches/community/Seam_2_2/src/test/ftest/ftest.ci.properties
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/ftest.ci.properties 2009-09-01 20:02:19 UTC (rev 11458)
+++ branches/community/Seam_2_2/src/test/ftest/ftest.ci.properties 2009-09-02 06:42:10 UTC (rev 11459)
@@ -47,10 +47,10 @@
# container settings
jboss4.profile=default
-jboss4.jvm.arguments=-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512 -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000
+jboss4.jvm.arguments=-Xms512m -Xmx1024m -XX:MaxPermSize=512m -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000
jboss5.profile=default
-jboss5.jvm.arguments=-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512 -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000
+jboss5.jvm.arguments=-Xms512m -Xmx1024m -XX:MaxPermSize=512m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000
run.container.per.suite=true
jboss.deployments.restart=10
Modified: branches/community/Seam_2_2/src/test/ftest/ftest.properties
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/ftest.properties 2009-09-01 20:02:19 UTC (rev 11458)
+++ branches/community/Seam_2_2/src/test/ftest/ftest.properties 2009-09-02 06:42:10 UTC (rev 11459)
@@ -60,10 +60,10 @@
# container settings
jboss4.profile=default
-jboss4.jvm.arguments=-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512 -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000
+jboss4.jvm.arguments=-Xms512m -Xmx1024m -XX:MaxPermSize=512m -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000
jboss5.profile=default
-jboss5.jvm.arguments=-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512 -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000
+jboss5.jvm.arguments=-Xms512m -Xmx1024m -XX:MaxPermSize=512m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000
run.container.per.suite=false
jboss.deployments.restart=10
14 years, 7 months
Seam SVN: r11458 - branches/community/Seam_2_2/doc/Seam_Reference_Guide/fr-FR.
by seam-commits＠lists.jboss.org
Author: essaidetest
Date: 2009-09-01 16:02:19 -0400 (Tue, 01 Sep 2009)
New Revision: 11458
Modified:
branches/community/Seam_2_2/doc/Seam_Reference_Guide/fr-FR/Configuration.po
Log:
Modified: branches/community/Seam_2_2/doc/Seam_Reference_Guide/fr-FR/Configuration.po
===================================================================
--- branches/community/Seam_2_2/doc/Seam_Reference_Guide/fr-FR/Configuration.po 2009-08-31 12:01:54 UTC (rev 11457)
+++ branches/community/Seam_2_2/doc/Seam_Reference_Guide/fr-FR/Configuration.po 2009-09-01 20:02:19 UTC (rev 11458)
@@ -2310,4 +2310,4 @@
" // ...\n"
" }\n"
"}]]>"
-msgstr ""
+msgstr ""
\ No newline at end of file
14 years, 7 months