roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [roller] branch roller-5.2.x updated: Fix regression that was preventing mvn jetty:run from working properly.
Date Sun, 09 Jun 2019 17:54:01 GMT
This is an automated email from the ASF dual-hosted git repository.

snoopdave pushed a commit to branch roller-5.2.x
in repository https://gitbox.apache.org/repos/asf/roller.git


The following commit(s) were added to refs/heads/roller-5.2.x by this push:
     new 1e25666  Fix regression that was preventing mvn jetty:run from working properly.
1e25666 is described below

commit 1e25666d1d1a23293558a9b373f77da32f2ac7f0
Author: snoopdave@gmail.com <snoopdave@gmail.com>
AuthorDate: Sun Jun 9 13:53:55 2019 -0400

    Fix regression that was preventing mvn jetty:run from working properly.
---
 app/pom.xml                            |  6 +++++
 app/src/test/resources/jetty.xml       | 42 +++++++++++++++++++++++-----------
 app/src/test/resources/jndi.properties |  4 ----
 pom.xml                                |  2 +-
 4 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/app/pom.xml b/app/pom.xml
index e6357bd..b6c9d57 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -464,6 +464,12 @@ limitations under the License.
                 <dependencies>
                     <!-- Dependencies needed when using mvn jetty:run, not mvn test -->
                     <dependency>
+                        <groupId>commons-dbcp</groupId>
+                        <artifactId>commons-dbcp</artifactId>
+                        <version>1.4</version>
+                        <scope>runtime</scope>
+                    </dependency>
+                    <dependency>
                         <groupId>org.apache.derby</groupId>
                         <artifactId>derby</artifactId>
                         <version>${derby.version}</version>
diff --git a/app/src/test/resources/jetty.xml b/app/src/test/resources/jetty.xml
index 0209086..0809395 100644
--- a/app/src/test/resources/jetty.xml
+++ b/app/src/test/resources/jetty.xml
@@ -1,26 +1,42 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-<Configure id='Server' class="org.eclipse.jetty.webapp.WebAppContext">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  The ASF licenses this file to You
+  under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License.
+  You may obtain a copy of the License at
 
-    <!-- Dummy values used only when testing with Jetty via mvn jetty:run -->
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.  For additional information regarding
+  copyright in this work, please see the NOTICE file in the top level
+  directory of this distribution.
+-->
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<!-- Dummy values used only when testing with Jetty via mvn jetty:run -->
+
+<Configure>
 
     <New id="ds" class="org.eclipse.jetty.plus.jndi.Resource">
-        <Arg>
-            <Ref id="wac_ds"/>
-        </Arg>
+        <Arg> <Ref id="wac_ds"/> </Arg>
         <Arg>jdbc/rollerdb</Arg>
         <Arg>
-            <New class="org.apache.derby.jdbc.EmbeddedDataSource">
-                <Set name="databaseName">rollerdb</Set>
-                <Set name="createDatabase">create</Set>
+            <New class="org.apache.commons.dbcp.BasicDataSource">
+                <Set name="driverClassName">org.apache.derby.jdbc.ClientDriver</Set>
+                <Set name="url">jdbc:derby://localhost:4224/memory:rollerdb;create=true</Set>
+                <Set name="username">app</Set>
+                <Set name="password">app</Set>
             </New>
         </Arg>
     </New>
 
     <New id="mail" class="org.eclipse.jetty.plus.jndi.Resource">
-        <Arg>
-            <Ref id="wac_mail"/>
-        </Arg>
+        <Arg> <Ref id="wac_mail"/> </Arg>
         <Arg>mail/Session</Arg>
         <Arg>
             <New class="org.eclipse.jetty.jndi.factories.MailSessionReference">
diff --git a/app/src/test/resources/jndi.properties b/app/src/test/resources/jndi.properties
deleted file mode 100644
index e11ee86..0000000
--- a/app/src/test/resources/jndi.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-java.naming.factory.initial=org.osjava.sj.SimpleContextFactory
-org.osjava.sj.root=src/test/resources/simple-jndi
-org.osjava.sj.colon.replace=--
-org.osjava.sj.delimiter=/
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 1add2fd..bce05b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@ limitations under the License.
                 <plugin>
                     <groupId>org.eclipse.jetty</groupId>
                     <artifactId>jetty-maven-plugin</artifactId>
-                    <version>9.2.6.v20141205</version>
+                    <version>9.4.17.v20190418</version>
                 </plugin>
                 <plugin>
                     <groupId>com.btmatthews.maven.plugins.inmemdb</groupId>


Mime
View raw message