roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1509745 - in /roller/trunk: app/pom.xml app/src/test/java/org/apache/roller/derby/ it-selenium/pom.xml pom.xml
Date Fri, 02 Aug 2013 15:34:39 GMT
Author: gmazza
Date: Fri Aug  2 15:34:39 2013
New Revision: 1509745

URL: http://svn.apache.org/r1509745
Log:
Switched to inmemdb-maven-plugin; removed Ant Derby start/stop scripts.

Removed:
    roller/trunk/app/src/test/java/org/apache/roller/derby/
Modified:
    roller/trunk/app/pom.xml
    roller/trunk/it-selenium/pom.xml
    roller/trunk/pom.xml

Modified: roller/trunk/app/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1509745&r1=1509744&r2=1509745&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Fri Aug  2 15:34:39 2013
@@ -536,6 +536,41 @@
                 </configuration>
             </plugin>
 
+            <!-- Activates the Derby database for unit tests and mvn jetty:run -->
+            <plugin>
+                <groupId>com.btmatthews.maven.plugins.inmemdb</groupId>
+                <artifactId>inmemdb-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>run</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <daemon>true</daemon>
+                            <type>derby</type>
+                            <database>rollerdb</database>
+                            <username>APP</username>
+                            <password>APP</password>
+                            <port>3223</port>
+                            <sources>
+                                <script>
+                                    <sourceFile>${pom.basedir}/target/dbscripts/derby/createdb.sql</sourceFile>
+                                </script>
+                            </sources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>stop</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>2.6</version>
@@ -654,47 +689,6 @@
                             </target>
                         </configuration>
                     </execution>
-
-                    <!-- Derby only for unit testing and jetty:run dev testing: skipped
when maven.test.skip is set -->
-                    <execution>
-                        <id>startdb</id>
-                        <phase>test-compile</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target unless="${maven.test.skip}">
-                                <delete dir="${basedir}/target/derby-system" verbose="true"
failonerror="false" />
-                                <taskdef name="startdb" classname="org.apache.roller.derby.ant.StartDerbyTask"
-                                         classpathref="maven.test.classpath"/>
-                                <startdb databaseDir="${basedir}/target/derby-system"
-                                         port="3223"
-                                         databaseScriptsDir="${basedir}/target/dbscripts"
>
-                                </startdb>
-                            </target>
-                        </configuration>
-                    </execution>
-
-                    <!-- Derby only for unit testing: skipped when maven.test.skip is
set -->
-                    <execution>
-                        <id>stopdb</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target unless="${maven.test.skip}">
-                                <taskdef name="stopdb" classname="org.apache.roller.derby.ant.StopDerbyTask"
-                                         classpathref="maven.test.classpath"/>
-                                <stopdb databaseDir="${basedir}/target/derby-system"
-                                        port="3223"
-                                        databaseScriptsDir="${basedir}/target/dbscripts"
>
-                                </stopdb>
-                                <delete dir="${basedir}/target/derby-system" verbose="true"
failonerror="false" />
-                            </target>
-                        </configuration>
-                    </execution>
-
                 </executions>
             </plugin>
 

Modified: roller/trunk/it-selenium/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/it-selenium/pom.xml?rev=1509745&r1=1509744&r2=1509745&view=diff
==============================================================================
--- roller/trunk/it-selenium/pom.xml (original)
+++ roller/trunk/it-selenium/pom.xml Fri Aug  2 15:34:39 2013
@@ -102,11 +102,6 @@
             <plugin>
                 <groupId>com.btmatthews.maven.plugins.inmemdb</groupId>
                 <artifactId>inmemdb-maven-plugin</artifactId>
-                <version>1.3.0</version>
-                <configuration>
-                    <monitorKey>inmemdb</monitorKey>
-                    <monitorPort>11527</monitorPort>
-                </configuration>
                 <executions>
                     <execution>
                         <id>run</id>
@@ -129,6 +124,9 @@
                     </execution>
                     <execution>
                         <id>stop</id>
+                        <!-- Moving later to verify phase from post-integration-test.
 Reason: Jetty shutdown wants
+                             to close database or will raise error messages. -->
+                        <phase>verify</phase>
                         <goals>
                             <goal>stop</goal>
                         </goals>
@@ -140,6 +138,8 @@
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
                 <configuration>
+                    <stopKey>selenium</stopKey>
+                    <stopPort>9999</stopPort>
                     <webApp>
                         <contextPath>/roller</contextPath>
                     </webApp>

Modified: roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=1509745&r1=1509744&r2=1509745&view=diff
==============================================================================
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Fri Aug  2 15:34:39 2013
@@ -9,7 +9,8 @@
     <packaging>pom</packaging>
 
     <prerequisites>
-        <maven>3.0</maven>
+        <!-- 3.0.5 required by inmemdb-maven-plugin V1.3.0 -->
+        <maven>3.0.5</maven>
     </prerequisites>
 
     <name>Roller project</name>
@@ -64,6 +65,15 @@
                     <artifactId>jetty-maven-plugin</artifactId>
                     <version>9.0.4.v20130625</version>
                 </plugin>
+                <plugin>
+                    <groupId>com.btmatthews.maven.plugins.inmemdb</groupId>
+                    <artifactId>inmemdb-maven-plugin</artifactId>
+                    <version>1.3.0</version>
+                    <configuration>
+                        <monitorKey>inmemdb</monitorKey>
+                        <monitorPort>11527</monitorPort>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
      </build>



Mime
View raw message