EMPIREDB-229 Project: http://git-wip-us.apache.org/repos/asf/empire-db/repo Commit: http://git-wip-us.apache.org/repos/asf/empire-db/commit/cedc9788 Tree: http://git-wip-us.apache.org/repos/asf/empire-db/tree/cedc9788 Diff: http://git-wip-us.apache.org/repos/asf/empire-db/diff/cedc9788
Branch: refs/heads/master Commit: cedc9788e441be593c6fe4a6d6f06194ab72f1a9 Parents: c6b7714 Author: Rainer Döbele <[email protected]> Authored: Thu Sep 24 09:59:38 2015 +0200 Committer: Rainer Döbele <[email protected]> Committed: Thu Sep 24 09:59:38 2015 +0200 ---------------------------------------------------------------------- empire-db-examples/empire-db-example-struts2-cxf/pom.xml | 2 +- .../src/main/webapp/WEB-INF/web.xml | 4 +++- empire-db-examples/empire-db-example-struts2/pom.xml | 2 +- .../empire-db-example-struts2/src/main/webapp/WEB-INF/web.xml | 4 ++-- empire-db/src/main/java/org/apache/empire/db/DBCommand.java | 3 +-- 5 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/empire-db/blob/cedc9788/empire-db-examples/empire-db-example-struts2-cxf/pom.xml ---------------------------------------------------------------------- diff --git a/empire-db-examples/empire-db-example-struts2-cxf/pom.xml b/empire-db-examples/empire-db-example-struts2-cxf/pom.xml index dc97de5..c57a731 100644 --- a/empire-db-examples/empire-db-example-struts2-cxf/pom.xml +++ b/empire-db-examples/empire-db-example-struts2-cxf/pom.xml @@ -80,7 +80,7 @@ <configuration> <m2eclipse>true</m2eclipse> <downloadSources>true</downloadSources> - <wtpversion>1.5</wtpversion> + <wtpversion>2.0</wtpversion> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/empire-db/blob/cedc9788/empire-db-examples/empire-db-example-struts2-cxf/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/empire-db-examples/empire-db-example-struts2-cxf/src/main/webapp/WEB-INF/web.xml b/empire-db-examples/empire-db-example-struts2-cxf/src/main/webapp/WEB-INF/web.xml index f6bd799..424f751 100644 --- a/empire-db-examples/empire-db-example-struts2-cxf/src/main/webapp/WEB-INF/web.xml +++ b/empire-db-examples/empire-db-example-struts2-cxf/src/main/webapp/WEB-INF/web.xml @@ -17,7 +17,9 @@ specific language governing permissions and limitations under the License. --> -<web-app id="WSWebSample" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";> +<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";> + <display-name>Empire WSWebSample</display-name> <welcome-file-list> http://git-wip-us.apache.org/repos/asf/empire-db/blob/cedc9788/empire-db-examples/empire-db-example-struts2/pom.xml ---------------------------------------------------------------------- diff --git a/empire-db-examples/empire-db-example-struts2/pom.xml b/empire-db-examples/empire-db-example-struts2/pom.xml index 6800168..b8034a4 100644 --- a/empire-db-examples/empire-db-example-struts2/pom.xml +++ b/empire-db-examples/empire-db-example-struts2/pom.xml @@ -68,7 +68,7 @@ <configuration> <m2eclipse>true</m2eclipse> <downloadSources>true</downloadSources> - <wtpversion>1.5</wtpversion> + <wtpversion>2.0</wtpversion> </configuration> </plugin> <!-- Sysdeo Tomcat Eclipse --> http://git-wip-us.apache.org/repos/asf/empire-db/blob/cedc9788/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/web.xml b/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/web.xml index 9ea8c21..ec3f404 100644 --- a/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/web.xml +++ b/empire-db-examples/empire-db-example-struts2/src/main/webapp/WEB-INF/web.xml @@ -17,8 +17,8 @@ specific language governing permissions and limitations under the License. --> -<web-app id="DBWebSample" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";> - <display-name>Empire DBWebSample</display-name> +<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";> <welcome-file-list> <welcome-file>index.html</welcome-file> http://git-wip-us.apache.org/repos/asf/empire-db/blob/cedc9788/empire-db/src/main/java/org/apache/empire/db/DBCommand.java ---------------------------------------------------------------------- diff --git a/empire-db/src/main/java/org/apache/empire/db/DBCommand.java b/empire-db/src/main/java/org/apache/empire/db/DBCommand.java index 746f1d7..7c1fad9 100644 --- a/empire-db/src/main/java/org/apache/empire/db/DBCommand.java +++ b/empire-db/src/main/java/org/apache/empire/db/DBCommand.java @@ -1082,8 +1082,7 @@ public abstract class DBCommand extends DBCommandExpr if (where!=null && !where.isEmpty()) { // add where condition buf.append("\r\nWHERE "); - if (where != null) - addListExpr(buf, where, CTX_NAME|CTX_VALUE, " AND "); + addListExpr(buf, where, CTX_NAME|CTX_VALUE, " AND "); } return buf.toString(); }
