Author: snoopdave Date: Sun Apr 20 14:23:00 2014 New Revision: 1588766 URL: http://svn.apache.org/r1588766 Log: Merged from trunk using this command:
svn merge -r 1546817:HEAD https://svn.apache.org/repos/asf/roller/trunk . Removed: roller/branches/rome2/docs/roller-dev-guide.odt Modified: roller/branches/rome2/ (props changed) roller/branches/rome2/app/pom.xml roller/branches/rome2/assembly-release/pom.xml roller/branches/rome2/docs/README.txt roller/branches/rome2/docs/roller-install-guide.odt roller/branches/rome2/docs/roller-template-guide.odt roller/branches/rome2/docs/roller-user-guide.odt roller/branches/rome2/docs/testing/junit-cleartables-mysql.sql roller/branches/rome2/it-selenium/pom.xml roller/branches/rome2/it-selenium/src/test/resources/roller-jettyrun.properties roller/branches/rome2/pom.xml Propchange: roller/branches/rome2/ ------------------------------------------------------------------------------ Merged /roller/trunk:r1546818-1588713 Modified: roller/branches/rome2/app/pom.xml URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/pom.xml?rev=1588766&r1=1588765&r2=1588766&view=diff ============================================================================== --- roller/branches/rome2/app/pom.xml (original) +++ roller/branches/rome2/app/pom.xml Sun Apr 20 14:23:00 2014 @@ -22,9 +22,9 @@ <testThemesDir>${project.build.testOutputDirectory}${file.separator}themes</testThemesDir> <testIndexDir>${project.build.testOutputDirectory}${file.separator}index</testIndexDir> <testPlanetCache>${project.build.testOutputDirectory}${file.separator}planetcache</testPlanetCache> - <lucene.version>4.4.0</lucene.version> - <spring.version>3.2.4.RELEASE</spring.version> - <spring.security.version>3.1.4.RELEASE</spring.security.version> + <lucene.version>4.7.0</lucene.version> + <spring.version>4.0.2.RELEASE</spring.version> + <spring.security.version>3.2.2.RELEASE</spring.security.version> </properties> <dependencies> @@ -40,7 +40,7 @@ <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>eclipselink</artifactId> - <version>2.5.0</version> + <version>2.5.1</version> </dependency> <!-- Alternative testing with Hibernate (used by default with JBoss) @@ -267,13 +267,13 @@ <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-spring-plugin</artifactId> - <version>2.3.15.1</version> + <version>2.3.16.1</version> </dependency> <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-tiles-plugin</artifactId> - <version>2.3.15.1</version> + <version>2.3.16.1</version> </dependency> <dependency> @@ -330,12 +330,12 @@ <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.8.3</version> + <version>1.9.1</version> </dependency> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.8</version> + <version>1.9</version> </dependency> <!-- test deps --> @@ -350,7 +350,7 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.9.2</version> + <version>1.9.3</version> <scope>test</scope> </dependency> @@ -445,7 +445,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> @@ -542,6 +542,9 @@ <value>${basedir}/target</value> </property> </systemProperties> + <!--excludes> + <exclude>**/??.java</exclude> + </excludes--> </configuration> </plugin> Modified: roller/branches/rome2/assembly-release/pom.xml URL: http://svn.apache.org/viewvc/roller/branches/rome2/assembly-release/pom.xml?rev=1588766&r1=1588765&r2=1588766&view=diff ============================================================================== --- roller/branches/rome2/assembly-release/pom.xml (original) +++ roller/branches/rome2/assembly-release/pom.xml Sun Apr 20 14:23:00 2014 @@ -29,7 +29,7 @@ <artifactId>roller-release</artifactId> <packaging>pom</packaging> - <name>Roller release assembly</name> + <name>Roller Release Assembly</name> <description>Assembles Roller into a distribution package</description> <!-- Modified: roller/branches/rome2/docs/README.txt URL: http://svn.apache.org/viewvc/roller/branches/rome2/docs/README.txt?rev=1588766&r1=1588765&r2=1588766&view=diff ============================================================================== --- roller/branches/rome2/docs/README.txt (original) +++ roller/branches/rome2/docs/README.txt Sun Apr 20 14:23:00 2014 @@ -4,7 +4,6 @@ test plans. roller-install-guide.odt - How to install Roller roller-user-guide.odt - How to use Roller roller-template-guide.odt - How to create Roller templates and themes - roller-dev-guide.odt - Incomplete developer guide examples/ - example configuration and script files testing/ - Various test scripts Modified: roller/branches/rome2/docs/roller-install-guide.odt URL: http://svn.apache.org/viewvc/roller/branches/rome2/docs/roller-install-guide.odt?rev=1588766&r1=1588765&r2=1588766&view=diff ============================================================================== Binary files - no diff available. Modified: roller/branches/rome2/docs/roller-template-guide.odt URL: http://svn.apache.org/viewvc/roller/branches/rome2/docs/roller-template-guide.odt?rev=1588766&r1=1588765&r2=1588766&view=diff ============================================================================== Binary files - no diff available. Modified: roller/branches/rome2/docs/roller-user-guide.odt URL: http://svn.apache.org/viewvc/roller/branches/rome2/docs/roller-user-guide.odt?rev=1588766&r1=1588765&r2=1588766&view=diff ============================================================================== Binary files - no diff available. Modified: roller/branches/rome2/docs/testing/junit-cleartables-mysql.sql URL: http://svn.apache.org/viewvc/roller/branches/rome2/docs/testing/junit-cleartables-mysql.sql?rev=1588766&r1=1588765&r2=1588766&view=diff ============================================================================== --- roller/branches/rome2/docs/testing/junit-cleartables-mysql.sql (original) +++ roller/branches/rome2/docs/testing/junit-cleartables-mysql.sql Sun Apr 20 14:23:00 2014 @@ -14,12 +14,22 @@ -- copyright in this work, please see the NOTICE file in the top level -- directory of this distribution. +-- Running local tests in eclipse. + -- Script is used to clear old data prior to running local tests +-- Copy this file to app/src/test/resources/dbscripts/junit-cleartables-mysql.sql + +-- Any changes here should also be in docs/testing/junit-cleartables-mysql.sql. + delete mt from website w, roller_mediafile mf, roller_mediafiletag mt where w.id = mf.weblogid and mt.mediafile_id = mf.id and w.creator like 'junit_%'; delete mf from website w, roller_mediafile mf where w.id = mf.weblogid and w.creator like 'junit_%'; delete md from website w, roller_mediafiledir md where w.id = md.websiteid and w.creator like 'junit_%'; +-- no weblog +-- delete from roller_mediafile WHERE creator like 'junit_%'; +-- delete from roller_mediafiledir; + delete r from website w, referer r WHERE w.id = r.websiteid and w.creator like 'junit_%'; delete from website WHERE creator like 'junit_%'; @@ -33,4 +43,5 @@ delete from rolleruser WHERE username li delete from roller_userattribute WHERE username like 'junit_%'; delete from roller_oauthconsumer WHERE username like 'junit_%'; delete from roller_oauthaccessor WHERE username like 'junit_%'; +delete from roller_tasklock WHERE name = 'TestTask'; Modified: roller/branches/rome2/it-selenium/pom.xml URL: http://svn.apache.org/viewvc/roller/branches/rome2/it-selenium/pom.xml?rev=1588766&r1=1588765&r2=1588766&view=diff ============================================================================== --- roller/branches/rome2/it-selenium/pom.xml (original) +++ roller/branches/rome2/it-selenium/pom.xml Sun Apr 20 14:23:00 2014 @@ -28,11 +28,12 @@ <relativePath>../pom.xml</relativePath> </parent> + <name>Roller Selenium tests</name> <artifactId>roller-selenium-tests</artifactId> <packaging>war</packaging> <properties> - <selenium.version>2.33.0</selenium.version> + <selenium.version>2.39.0</selenium.version> </properties> <!-- Process to run Selenium tests (actually no tests right now, just a skeleton) @@ -114,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/branches/rome2/it-selenium/src/test/resources/roller-jettyrun.properties URL: http://svn.apache.org/viewvc/roller/branches/rome2/it-selenium/src/test/resources/roller-jettyrun.properties?rev=1588766&r1=1588765&r2=1588766&view=diff ============================================================================== --- roller/branches/rome2/it-selenium/src/test/resources/roller-jettyrun.properties (original) +++ roller/branches/rome2/it-selenium/src/test/resources/roller-jettyrun.properties Sun Apr 20 14:23:00 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/branches/rome2/pom.xml URL: http://svn.apache.org/viewvc/roller/branches/rome2/pom.xml?rev=1588766&r1=1588765&r2=1588766&view=diff ============================================================================== --- roller/branches/rome2/pom.xml (original) +++ roller/branches/rome2/pom.xml Sun Apr 20 14:23:00 2014 @@ -12,7 +12,7 @@ <maven>3.0.5</maven> </prerequisites> - <name>Roller project</name> + <name>Roller</name> <description> Roller is an open source blog server built with open source Java libraries including Spring, Struts2, Velocity and Commons. @@ -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>
