Author: ghuber
Date: Thu Jan 9 08:10:47 2014
New Revision: 1556757
URL: http://svn.apache.org/r1556757
Log:
Change port from 3223 to 4224 for unit testing as port 3223 is used by DIGIVOTE
on centos 6x
Modified:
roller/trunk/app/pom.xml
roller/trunk/app/src/test/resources/roller-custom.properties
roller/trunk/app/src/test/resources/roller-jettyrun.properties
roller/trunk/it-selenium/pom.xml
roller/trunk/it-selenium/src/test/resources/roller-jettyrun.properties
roller/trunk/pom.xml
Modified: roller/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1556757&r1=1556756&r2=1556757&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Thu Jan 9 08:10:47 2014
@@ -453,7 +453,7 @@
<database>rollerdb</database>
<username>APP</username>
<password>APP</password>
- <port>3223</port>
+ <port>4224</port>
<sources>
<script>
<sourceFile>${pom.basedir}/target/dbscripts/derby/createdb.sql</sourceFile>
Modified: roller/trunk/app/src/test/resources/roller-custom.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/test/resources/roller-custom.properties?rev=1556757&r1=1556756&r2=1556757&view=diff
==============================================================================
--- roller/trunk/app/src/test/resources/roller-custom.properties (original)
+++ roller/trunk/app/src/test/resources/roller-custom.properties Thu Jan 9
08:10:47 2014
@@ -1,6 +1,6 @@
database.configurationType=jdbc
database.jdbc.driverClass=org.apache.derby.jdbc.ClientDriver
-database.jdbc.connectionURL=jdbc:derby://localhost:3223/memory:rollerdb
+database.jdbc.connectionURL=jdbc:derby://localhost:4224/memory:rollerdb
database.jdbc.username=APP
database.jdbc.password=APP
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=1556757&r1=1556756&r2=1556757&view=diff
==============================================================================
--- roller/trunk/app/src/test/resources/roller-jettyrun.properties (original)
+++ roller/trunk/app/src/test/resources/roller-jettyrun.properties Thu Jan 9
08:10:47 2014
@@ -9,7 +9,7 @@ authentication.openid=disabled
database.configurationType=jdbc
database.jdbc.driverClass=org.apache.derby.jdbc.ClientDriver
# In-memory Derby database activated via "startdb" execution in app/pom.xml
-database.jdbc.connectionURL=jdbc:derby://localhost:3223/memory:rollerdb;create=true
+database.jdbc.connectionURL=jdbc:derby://localhost:4224/memory:rollerdb;create=true
database.jdbc.username=app
database.jdbc.password=app
Modified: roller/trunk/it-selenium/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/it-selenium/pom.xml?rev=1556757&r1=1556756&r2=1556757&view=diff
==============================================================================
--- roller/trunk/it-selenium/pom.xml (original)
+++ roller/trunk/it-selenium/pom.xml Thu Jan 9 08:10:47 2014
@@ -115,7 +115,7 @@
<database>rollerdb</database>
<username>APP</username>
<password>APP</password>
- <port>3223</port>
+ <port>4224</port>
<sources>
<script>
<sourceFile>target/roller-selenium-tests-5.1.0-SNAPSHOT/WEB-INF/classes/dbscripts/derby/createdb.sql</sourceFile>
Modified: roller/trunk/it-selenium/src/test/resources/roller-jettyrun.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/it-selenium/src/test/resources/roller-jettyrun.properties?rev=1556757&r1=1556756&r2=1556757&view=diff
==============================================================================
--- roller/trunk/it-selenium/src/test/resources/roller-jettyrun.properties
(original)
+++ roller/trunk/it-selenium/src/test/resources/roller-jettyrun.properties Thu
Jan 9 08:10:47 2014
@@ -7,7 +7,7 @@ planet.aggregator.enabled=true
database.configurationType=jdbc
database.jdbc.driverClass=org.apache.derby.jdbc.ClientDriver
# In-memory Derby database activated via "startdb" execution in app/pom.xml
-database.jdbc.connectionURL=jdbc:derby://localhost:3223/memory:rollerdb;create=true
+database.jdbc.connectionURL=jdbc:derby://localhost:4224/memory:rollerdb;create=true
database.jdbc.username=app
database.jdbc.password=app
Modified: roller/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=1556757&r1=1556756&r2=1556757&view=diff
==============================================================================
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Thu Jan 9 08:10:47 2014
@@ -66,7 +66,7 @@
<plugin>
<groupId>com.btmatthews.maven.plugins.inmemdb</groupId>
<artifactId>inmemdb-maven-plugin</artifactId>
- <version>1.3.0</version>
+ <version>1.4.2</version>
<configuration>
<monitorKey>inmemdb</monitorKey>
<monitorPort>11527</monitorPort>
