roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1508898 - in /roller/trunk/app: pom.xml src/main/webapp/WEB-INF/jetty-env.xml src/test/resources/jetty.xml
Date Wed, 31 Jul 2013 15:03:58 GMT
Author: gmazza
Date: Wed Jul 31 15:03:58 2013
New Revision: 1508898

URL: http://svn.apache.org/r1508898
Log:
Removing no longer needed jetty-env.xml file.

Removed:
    roller/trunk/app/src/main/webapp/WEB-INF/jetty-env.xml
Modified:
    roller/trunk/app/pom.xml
    roller/trunk/app/src/test/resources/jetty.xml

Modified: roller/trunk/app/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1508898&r1=1508897&r2=1508898&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Wed Jul 31 15:03:58 2013
@@ -83,7 +83,7 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
-            <version>4.2.1.Final</version>
+            <version>4.2.3.Final</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.javassist</groupId>
@@ -499,6 +499,7 @@
                     <webApp>
                         <contextPath>/roller</contextPath>
                     </webApp>
+                    <jettyXml>src/test/resources/jetty.xml</jettyXml>
                     <systemProperties>
                         <systemProperty>
                             <name>roller.custom.config</name>

Modified: roller/trunk/app/src/test/resources/jetty.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/resources/jetty.xml?rev=1508898&r1=1508897&r2=1508898&view=diff
==============================================================================
--- roller/trunk/app/src/test/resources/jetty.xml (original)
+++ roller/trunk/app/src/test/resources/jetty.xml Wed Jul 31 15:03:58 2013
@@ -1,40 +1,37 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+<!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">
 
-<Configure id="Server" class="org.mortbay.jetty.Server">
+    <!-- Dummy values used only when testing with Jetty via mvn jetty:run -->
 
-<!-- Configure a log -->
-
-<!--    <New id="ServerLog" class="java.io.PrintStream">
+    <New id="ds" class="org.eclipse.jetty.plus.jndi.Resource">
+        <Arg>
+            <Ref id="wac_ds"/>
+        </Arg>
+        <Arg>jdbc/rollerdb</Arg>
         <Arg>
-            <New class="org.mortbay.util.RolloverFileOutputStream">
-                <Arg>${project.build.directory}/yyyy_mm_dd.stderrout.log</Arg>
-                <Arg type="boolean">false</Arg>
-                <Arg type="int">90</Arg>
-                <Arg>
-                    <Call class="java.util.TimeZone" name="getTimeZone">
-                        <Arg>GMT</Arg>
-                    </Call>
-                </Arg>
-                <Get id="ServerLogName" name="datedFilename"/>
+            <New class="org.apache.derby.jdbc.EmbeddedDataSource">
+                <Set name="databaseName">rollerdb</Set>
+                <Set name="createDatabase">create</Set>
             </New>
         </Arg>
-    </New>-->
+    </New>
 
-<!--    <Call class="org.mortbay.log.Log" name="info">
-        <Arg>Redirecting stderr/stdout to 
-            <Ref id="ServerLogName"/>
-        </Arg>
-    </Call>
-    <Call class="java.lang.System" name="setErr">
+    <New id="mail" class="org.eclipse.jetty.plus.jndi.Resource">
         <Arg>
-            <Ref id="ServerLog"/>
+            <Ref id="wac_mail"/>
         </Arg>
-    </Call>
-    <Call class="java.lang.System" name="setOut">
+        <Arg>mail/Session</Arg>
         <Arg>
-            <Ref id="ServerLog"/>
+            <New class="org.eclipse.jetty.jndi.factories.MailSessionReference">
+                <Set name="properties">
+                    <New class="java.util.Properties">
+                        <Put name="mail.smtp.host">mail</Put>
+                        <Put name="mail.debug">true</Put>
+                    </New>
+                </Set>
+            </New>
         </Arg>
-    </Call>-->
+    </New>
 
 </Configure>



Mime
View raw message