roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1505430 - in /roller/trunk/app: pom.xml src/main/webapp/WEB-INF/jetty-env.xml src/test/resources/roller-jettyrun.properties
Date Sun, 21 Jul 2013 17:27:07 GMT
Author: gmazza
Date: Sun Jul 21 17:27:07 2013
New Revision: 1505430

URL: http://svn.apache.org/r1505430
Log:
Upgrade from Jetty 6.1.26 to 9.0.4.v20130625; mvn jetty:run runs noticably faster.

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

Modified: roller/trunk/app/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1505430&r1=1505429&r2=1505430&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Sun Jul 21 17:27:07 2013
@@ -473,24 +473,22 @@
             </plugin>
 
             <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.26</version>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>9.0.4.v20130625</version>
                 <configuration>
-                    <contextPath>roller</contextPath>
-                    <jettyConfig>${project.build.directory}/test-classes/jetty.xml</jettyConfig>
-                    <classesDirectory>${project.build.directory}/classes</classesDirectory>
+                    <webApp>
+                        <contextPath>/roller</contextPath>
+                    </webApp>
                     <systemProperties>
-
                         <systemProperty>
                             <name>roller.custom.config</name>
                             <value>${project.build.directory}/test-classes/roller-jettyrun.properties</value>
                         </systemProperty>
-
                     </systemProperties>
                 </configuration>
                 <dependencies>
-                    <!-- Dependencies not needed during mvn test when using mvn jetty:run
-->
+                    <!-- Dependencies needed when using mvn jetty:run, not mvn test -->
                     <dependency>
                         <groupId>org.apache.derby</groupId>
                         <artifactId>derby</artifactId>

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jetty-env.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jetty-env.xml?rev=1505430&r1=1505429&r2=1505430&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jetty-env.xml (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jetty-env.xml Sun Jul 21 17:27:07 2013
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
-<Configure id='wac' class="org.mortbay.jetty.webapp.WebAppContext">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<Configure id='wac' class="org.eclipse.jetty.webapp.WebAppContext">
     
     <!-- Dummy values to allow Jetty to run via Maven build process -->
     
-    <New id="ds" class="org.mortbay.jetty.plus.naming.Resource">
+    <New id="ds" class="org.eclipse.jetty.plus.jndi.Resource">
         <Arg>
             <Ref id="wac"/>
         </Arg>
@@ -17,13 +17,13 @@
         </Arg> 
     </New>
     
-    <New id="mail" class="org.mortbay.jetty.plus.naming.Resource">
+    <New id="mail" class="org.eclipse.jetty.plus.jndi.Resource">
         <Arg>
             <Ref id="wac"/>
         </Arg>
         <Arg>mail/Session</Arg>
         <Arg>
-            <New class="org.mortbay.naming.factories.MailSessionReference">
+            <New class="org.eclipse.jetty.jndi.factories.MailSessionReference">
                 <Set name="properties">
                     <New class="java.util.Properties">
                         <Put name="mail.smtp.host">mail</Put>

Modified: roller/trunk/app/src/test/resources/roller-jettyrun.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/test/resources/roller-jettyrun.properties?rev=1505430&r1=1505429&r2=1505430&view=diff
==============================================================================
--- roller/trunk/app/src/test/resources/roller-jettyrun.properties (original)
+++ roller/trunk/app/src/test/resources/roller-jettyrun.properties Sun Jul 21 17:27:07 2013
@@ -10,10 +10,10 @@ database.jdbc.connectionURL=jdbc:derby:/
 database.jdbc.username=app
 database.jdbc.password=app
 
-#openjpa.IgnoreChanges=true
-#openjpa.FlushBeforeQueries=true
-openjpa.ConnectionRetainMode=transaction
-openjpa.Log=commons
+#see http://wiki.eclipse.org/EclipseLink/Examples/JPA/Logging
+#eclipselink.logging.file=target/eclipselink.log
+# OFF, SEVERE, WARNING, INFO, CONFIG, FINE, FINER, ALL
+#eclipselink.logging.level=FINER
 
 # use plain text passwords in testing
 passwds.encryption.enabled=false



Mime
View raw message