You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2013/05/30 18:12:04 UTC
svn commit: r1487908 - in /roller/trunk: ./ planet-business/
planet-business/src/main/java/org/apache/roller/planet/business/
planet-business/src/main/java/org/apache/roller/planet/pojos/
planet-business/src/main/resources/org/apache/roller/planet/conf...
Author: gmazza
Date: Thu May 30 16:12:03 2013
New Revision: 1487908
URL: http://svn.apache.org/r1487908
Log:
Removed largely unused catalina.base system variable, created test-resource persistence.xml's to allow for use also with EclipseLink (slight risk of persistence.xml falling out of sync with one in src/main/resources though), upgrading EclipseLink to 2.5 which is now on Maven Central, moving output logs to easier-to-see target instead of target/test-classes folder
Added:
roller/trunk/weblogger-business/src/test/resources/META-INF/
roller/trunk/weblogger-business/src/test/resources/META-INF/persistence.xml
Modified:
roller/trunk/planet-business/pom.xml
roller/trunk/planet-business/src/main/java/org/apache/roller/planet/business/DatabaseProvider.java
roller/trunk/planet-business/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java
roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/config/planet.properties
roller/trunk/planet-business/src/test/resources/log4j.properties
roller/trunk/planet-business/src/test/resources/planet-custom.properties
roller/trunk/pom.xml
roller/trunk/weblogger-business/pom.xml
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/runnable/TaskRunner.java
roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties
roller/trunk/weblogger-business/src/test/resources/roller-custom.properties
roller/trunk/weblogger-docs/examples/rollertask/rollertask.sh
roller/trunk/weblogger-docs/examples/scripting/groovy/examples/rollerapi/groovy
roller/trunk/weblogger-docs/examples/scripting/groovy/src/org/apache/roller/scripting/GroovyRunner.java
roller/trunk/weblogger-web/pom.xml
roller/trunk/weblogger-webapp/pom.xml
Modified: roller/trunk/planet-business/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/planet-business/pom.xml?rev=1487908&r1=1487907&r2=1487908&view=diff
==============================================================================
--- roller/trunk/planet-business/pom.xml (original)
+++ roller/trunk/planet-business/pom.xml Thu May 30 16:12:03 2013
@@ -34,6 +34,7 @@
</dependency>
<!-- OpenJPA deps -->
+
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
@@ -49,25 +50,23 @@
</exclusions>
</dependency>
-<!-- EclipseLink deps (for sometimes testing purposes)
+
+<!-- EclipseLink deps (for sometimes testing purposes)
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>eclipselink</artifactId>
- <version>2.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
- <version>1.1</version>
<scope>provided</scope>
- </dependency
+ </dependency>
-->
<!-- Hibernate deps (for sometimes testing purposes)
@@ -81,7 +80,8 @@
<artifactId>slf4j-jdk14</artifactId>
<version>1.5.6</version>
<scope>runtime</scope>
- </dependency> -->
+ </dependency>
+-->
<dependency>
<groupId>javax.mail</groupId>
@@ -196,14 +196,10 @@
<!-- Ensure tests will run even if 'openjpa' profile not active -->
<forkMode>once</forkMode>
- <argLine>-javaagent:"${user.home}/.m2/repository/org/apache/openjpa/openjpa/2.0.1/openjpa-2.0.1.jar"</argLine>
+ <argLine>-javaagent:"${user.home}/.m2/repository/org/apache/openjpa/openjpa/${openjpa.version}/openjpa-${openjpa.version}.jar"</argLine>
<systemProperties>
<property>
- <name>catalina.base</name>
- <value>${project.build.testOutputDirectory}</value>
- </property>
- <property>
<name>context.realpath</name>
<value>${project.basedir}/src/main/webapp</value>
</property>
@@ -249,12 +245,6 @@
<version>${derby.version}</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- <scope>runtime</scope>
- </dependency>
</dependencies>
<executions>
@@ -420,5 +410,3 @@
</profiles>
</project>
-
-
Modified: roller/trunk/planet-business/src/main/java/org/apache/roller/planet/business/DatabaseProvider.java
URL: http://svn.apache.org/viewvc/roller/trunk/planet-business/src/main/java/org/apache/roller/planet/business/DatabaseProvider.java?rev=1487908&r1=1487907&r2=1487908&view=diff
==============================================================================
--- roller/trunk/planet-business/src/main/java/org/apache/roller/planet/business/DatabaseProvider.java (original)
+++ roller/trunk/planet-business/src/main/java/org/apache/roller/planet/business/DatabaseProvider.java Thu May 30 16:12:03 2013
@@ -82,8 +82,9 @@ public class DatabaseProvider {
*/
public DatabaseProvider() throws StartupException {
- String connectionTypeString =
- PlanetConfig.getProperty("database.configurationType");
+ String connectionTypeString =
+ PlanetConfig.getProperty("database.configurationType");
+
if ("jdbc".equals(connectionTypeString)) {
type = ConfigurationType.JDBC_PROPERTIES;
}
@@ -104,7 +105,7 @@ public class DatabaseProvider {
try {
Class.forName(getJdbcDriverClass());
} catch (ClassNotFoundException ex) {
- String errorMsg =
+ String errorMsg =
"ERROR: cannot load JDBC driver class [" + getJdbcDriverClass()+ "]. "
+"Likely problem: JDBC driver jar missing from server classpath.";
errorMessage(errorMsg);
Modified: roller/trunk/planet-business/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java
URL: http://svn.apache.org/viewvc/roller/trunk/planet-business/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java?rev=1487908&r1=1487907&r2=1487908&view=diff
==============================================================================
--- roller/trunk/planet-business/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java (original)
+++ roller/trunk/planet-business/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java Thu May 30 16:12:03 2013
@@ -209,8 +209,8 @@ public class PlanetGroup implements Seri
private String[] getCategoryRestrictionAsArray() {
- if (catArray == null && categoryRestriction != null) {
- StringTokenizer toker = new StringTokenizer(categoryRestriction,",");
+ if (catArray == null && getCategoryRestriction() != null) {
+ StringTokenizer toker = new StringTokenizer(getCategoryRestriction(),",");
catArray = new String[toker.countTokens()];
int i = 0;
Modified: roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/config/planet.properties
URL: http://svn.apache.org/viewvc/roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/config/planet.properties?rev=1487908&r1=1487907&r2=1487908&view=diff
==============================================================================
--- roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/config/planet.properties (original)
+++ roller/trunk/planet-business/src/main/resources/org/apache/roller/planet/config/planet.properties Thu May 30 16:12:03 2013
@@ -42,8 +42,8 @@
#----------------------------------------------------
-# Manditory properties
-# You MUST ensure that these properies are set correctly.
+# Mandatory properties
+# You MUST ensure that these properties are set correctly.
# If not, you MUST override them in your planet-custom.properties file.
cache.dir=/var/planet/cache
Modified: roller/trunk/planet-business/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/roller/trunk/planet-business/src/test/resources/log4j.properties?rev=1487908&r1=1487907&r2=1487908&view=diff
==============================================================================
--- roller/trunk/planet-business/src/test/resources/log4j.properties (original)
+++ roller/trunk/planet-business/src/test/resources/log4j.properties Thu May 30 16:12:03 2013
@@ -19,7 +19,7 @@
log4j.rootCategory=INFO, roller
log4j.appender.roller=org.apache.log4j.RollingFileAppender
-log4j.appender.roller.File=${catalina.base}/planet-test.log
+log4j.appender.roller.File=${project.build.directory}/planet-test.log
log4j.appender.roller.layout=org.apache.log4j.PatternLayout
log4j.appender.roller.layout.ConversionPattern=%-5p %d{yyyy-MM-dd HH:mm:ss,SSS} %C{1}:%M - %m%n
Modified: roller/trunk/planet-business/src/test/resources/planet-custom.properties
URL: http://svn.apache.org/viewvc/roller/trunk/planet-business/src/test/resources/planet-custom.properties?rev=1487908&r1=1487907&r2=1487908&view=diff
==============================================================================
--- roller/trunk/planet-business/src/test/resources/planet-custom.properties (original)
+++ roller/trunk/planet-business/src/test/resources/planet-custom.properties Thu May 30 16:12:03 2013
@@ -1,4 +1,4 @@
-
+# Test properties overriding those in src/main/resources/org/apache/roller/planet/config/planet.properties
# Pluggable backend
#guice.backend.module=org.apache.roller.planet.business.hibernate.PlanetModule
Modified: roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=1487908&r1=1487907&r2=1487908&view=diff
==============================================================================
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Thu May 30 16:12:03 2013
@@ -29,6 +29,7 @@
<roller.version>5.1.0-SNAPSHOT</roller.version>
<!-- avoid CLOB/BLOB error in all later versions of Derby -->
<derby.version>10.1.3.1</derby.version>
+ <openjpa.version>2.2.2</openjpa.version>
</properties>
<modules>
@@ -118,15 +119,6 @@
<url>http://oss.sonatype.org/content/groups/public</url>
</repository>
- <!-- EclipseLink repo
- <repository>
- <id>EclipseLink Repo</id>
- <url>http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/rt/eclipselink/maven.repo</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository> -->
-
<!-- JBoss Hibernate JPA repo
<repository>
<id>JBoss Repo</id>
@@ -353,10 +345,30 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.2.2</version>
+ <version>${openjpa.version}</version>
<scope>compile</scope>
</dependency>
+ <!-- Next three EclipseLink usage only -->
+
+ <dependency>
+ <groupId>org.eclipse.persistence</groupId>
+ <artifactId>eclipselink</artifactId>
+ <version>2.5.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
Modified: roller/trunk/weblogger-business/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/pom.xml?rev=1487908&r1=1487907&r2=1487908&view=diff
==============================================================================
--- roller/trunk/weblogger-business/pom.xml (original)
+++ roller/trunk/weblogger-business/pom.xml Thu May 30 16:12:03 2013
@@ -58,23 +58,22 @@
</exclusions>
</dependency>
-<!-- EclipseLink deps (for sometimes testing purposes)
+<!-- EclipseLink deps (for sometimes testing purposes) -->
+
+<!--
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>eclipselink</artifactId>
- <version>2.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
- <version>1.1</version>
<scope>provided</scope>
</dependency>
-->
@@ -258,14 +257,10 @@
<!-- Ensure tests will run even if 'openjpa' profile not active -->
<forkMode>once</forkMode>
- <argLine>-javaagent:"${user.home}/.m2/repository/org/apache/openjpa/openjpa/2.0.1/openjpa-2.0.1.jar"</argLine>
+ <argLine>-javaagent:"${user.home}/.m2/repository/org/apache/openjpa/openjpa/${openjpa.version}/openjpa-${openjpa.version}.jar"</argLine>
<systemProperties>
<property>
- <name>catalina.base</name>
- <value>${project.build.testOutputDirectory}</value>
- </property>
- <property>
<name>context.realpath</name>
<value>${project.basedir}/src/main/webapp</value>
</property>
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/runnable/TaskRunner.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/runnable/TaskRunner.java?rev=1487908&r1=1487907&r2=1487908&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/runnable/TaskRunner.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/runnable/TaskRunner.java Thu May 30 16:12:03 2013
@@ -68,7 +68,6 @@ public class TaskRunner {
java \
-Dplanet.custom.config=planet-custom.properties \
- -Dcatalina.base=. \
-cp ./build/webapp/WEB-INF/lib/roller-business.jar \
org.apache.roller.weblogger.business.runnable.TaskRunner \
~/roller_trunk/sandbox/planetroller/build/webapp \
Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties?rev=1487908&r1=1487907&r2=1487908&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties Thu May 30 16:12:03 2013
@@ -658,7 +658,7 @@ plugins.topictag.ignoreBookmarks=true
log4j.rootLogger=ERROR, roller
log4j.appender.roller=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.roller.File=${catalina.base}/logs/roller.log
+log4j.appender.roller.File=logs/roller.log
log4j.appender.roller.layout=org.apache.log4j.PatternLayout
log4j.appender.roller.layout.ConversionPattern=%-5p %d{yyyy-MM-dd HH:mm:ss,SSS} %C{1}:%M - %m%n
Added: roller/trunk/weblogger-business/src/test/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/test/resources/META-INF/persistence.xml?rev=1487908&view=auto
==============================================================================
--- roller/trunk/weblogger-business/src/test/resources/META-INF/persistence.xml (added)
+++ roller/trunk/weblogger-business/src/test/resources/META-INF/persistence.xml Thu May 30 16:12:03 2013
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence">
+ <persistence-unit name="RollerPU" transaction-type="RESOURCE_LOCAL">
+ <!-- Activate below & comment out non-jta-data-source if using EclipseLink-->
+ <!--properties>
+ <property name="javax.persistence.jdbc.driver" value="org.apache.derby.jdbc.ClientDriver" />
+ <property name="javax.persistence.jdbc.url"
+ value="jdbc:derby://localhost:3221/rollerdb" />
+ <property name="javax.persistence.jdbc.user" value="APP" />
+ <property name="javax.persistence.jdbc.password" value="APP" />
+ <property name="eclipselink.target-database" value="Derby"/>
+ </properties-->
+ <non-jta-data-source>${datasourceName}</non-jta-data-source>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogBookmark.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntryComment.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntryAttribute.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/PingTarget.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/UserRole.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/TaskLock.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/User.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogCategory.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogEntryTag.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogTemplate.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/ObjectPermission.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/WeblogPermission.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/Weblog.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/UserAttribute.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/OAuthConsumerRecord.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/OAuthAccessorRecord.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/MediaFile.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/MediaFileTag.orm.xml </mapping-file>
+ <mapping-file>org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml </mapping-file>
+ <class>org.apache.roller.weblogger.pojos.AutoPing</class>
+ <class>org.apache.roller.weblogger.pojos.WeblogThemeAssoc</class>
+ <class>org.apache.roller.weblogger.pojos.WeblogThemeTemplateCode</class>
+ </persistence-unit>
+</persistence>
Modified: roller/trunk/weblogger-business/src/test/resources/roller-custom.properties
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/test/resources/roller-custom.properties?rev=1487908&r1=1487907&r2=1487908&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/test/resources/roller-custom.properties (original)
+++ roller/trunk/weblogger-business/src/test/resources/roller-custom.properties Thu May 30 16:12:03 2013
@@ -42,7 +42,7 @@ tasks.TestTask.leaseTime=300
# logging
log4j.rootCategory=ERROR, roller
-log4j.appender.roller.File=${testOutputDirectory}/roller.log
+log4j.appender.roller.File=${project.build.directory}/roller.log
log4j.category.org.apache.roller=INFO
log4j.category.net.java.roller=ERROR
Modified: roller/trunk/weblogger-docs/examples/rollertask/rollertask.sh
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-docs/examples/rollertask/rollertask.sh?rev=1487908&r1=1487907&r2=1487908&view=diff
==============================================================================
--- roller/trunk/weblogger-docs/examples/rollertask/rollertask.sh (original)
+++ roller/trunk/weblogger-docs/examples/rollertask/rollertask.sh Thu May 30 16:12:03 2013
@@ -31,10 +31,7 @@ export CONFIG_OVERRIDE
# --- YOU SHOULD NOT NEED TO EDIT BELOW THIS LINE ---
-# Hack: setting catalina.base=. allows us to save log in ./logs
-
${JAVA_HOME}/bin/java \
- -Dcatalina.base=. \
-Droller.custom.config=${CONFIG_OVERRIDE} \
-cp ${WEBAPP_DIR}/WEB-INF/lib/roller-business.jar \
${WEBAPP_DIR}/WEB-INF/lib/roller-core.jar \
Modified: roller/trunk/weblogger-docs/examples/scripting/groovy/examples/rollerapi/groovy
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-docs/examples/scripting/groovy/examples/rollerapi/groovy?rev=1487908&r1=1487907&r2=1487908&view=diff
==============================================================================
--- roller/trunk/weblogger-docs/examples/scripting/groovy/examples/rollerapi/groovy (original)
+++ roller/trunk/weblogger-docs/examples/scripting/groovy/examples/rollerapi/groovy Thu May 30 16:12:03 2013
@@ -30,8 +30,6 @@ done
export RGPATH
-# Hack: setting catalina.base=. allows us to save log in ./logs
java \
-Droller.custom.config=roller-custom.properties \
--Dcatalina.base=. \
-classpath ${RGPATH} groovy.lang.GroovyShell $1 $2 $3 $4 $5 $6 $7 $8 $9 $10
Modified: roller/trunk/weblogger-docs/examples/scripting/groovy/src/org/apache/roller/scripting/GroovyRunner.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-docs/examples/scripting/groovy/src/org/apache/roller/scripting/GroovyRunner.java?rev=1487908&r1=1487907&r2=1487908&view=diff
==============================================================================
--- roller/trunk/weblogger-docs/examples/scripting/groovy/src/org/apache/roller/scripting/GroovyRunner.java (original)
+++ roller/trunk/weblogger-docs/examples/scripting/groovy/src/org/apache/roller/scripting/GroovyRunner.java Thu May 30 16:12:03 2013
@@ -86,9 +86,7 @@ ${GROOVY_HOME}/lib/commons-cli-1.0.jar:\
${WEBAPP_DIR}/WEB-INF/lib/roller-business.jar
echo ${RGPATH}
-# Hack: setting catalina.base=. allows us to save log in ./logs
java \
-Droller.custom.config=roller-custom.properties \
--Dcatalina.base=. \
-cp ${RGPATH} org.apache.roller.scripting.GroovyRunner $WEBAPP_DIR $JARS_DIR $1
*/
Modified: roller/trunk/weblogger-web/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/pom.xml?rev=1487908&r1=1487907&r2=1487908&view=diff
==============================================================================
--- roller/trunk/weblogger-web/pom.xml (original)
+++ roller/trunk/weblogger-web/pom.xml Thu May 30 16:12:03 2013
@@ -60,6 +60,7 @@
</dependency>
<!-- OpenJPA deps -->
+
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
@@ -81,25 +82,23 @@
<scope>test</scope>
</dependency>
-<!-- EclipseLink deps (for sometimes testing purposes)
+<!-- EclipseLink deps (for sometimes testing purposes) -->
+<!--
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>eclipselink</artifactId>
- <version>2.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
- <version>1.1</version>
<scope>provided</scope>
- </dependency
+ </dependency>
-->
<!-- Hibernate deps (for sometimes testing purposes)
@@ -129,7 +128,7 @@
<!-- needed by Struts, except on JBoss -->
<dependency>
- <groupId>javassist</groupId>
+ <groupId>jboss</groupId>
<artifactId>javassist</artifactId>
<version>3.0</version>
</dependency>
@@ -531,14 +530,10 @@
<!-- Ensure tests will run even if 'openjpa' profile not active -->
<forkMode>once</forkMode>
- <argLine>-javaagent:"${user.home}/.m2/repository/org/apache/openjpa/openjpa/2.0.1/openjpa-2.0.1.jar"</argLine>
-
+ <argLine>-javaagent:"${user.home}/.m2/repository/org/apache/openjpa/openjpa/${openjpa.version}/openjpa-${openjpa.version}.jar"</argLine>
+
<systemProperties>
<property>
- <name>catalina.base</name>
- <value>${project.build.testOutputDirectory}</value>
- </property>
- <property>
<name>context.realpath</name>
<value>${project.basedir}/src/main/webapp</value>
</property>
Modified: roller/trunk/weblogger-webapp/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/pom.xml?rev=1487908&r1=1487907&r2=1487908&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/pom.xml (original)
+++ roller/trunk/weblogger-webapp/pom.xml Thu May 30 16:12:03 2013
@@ -189,14 +189,10 @@
<!-- Ensure tests will run even if 'openjpa' profile not active -->
<forkMode>once</forkMode>
- <argLine>-javaagent:"${user.home}/.m2/repository/org/apache/openjpa/openjpa/2.0.1/openjpa-2.0.1.jar"</argLine>
+ <argLine>-javaagent:"${user.home}/.m2/repository/org/apache/openjpa/openjpa/${openjpa.version}/openjpa-${openjpa.version}.jar"</argLine>
<systemProperties>
<property>
- <name>catalina.base</name>
- <value>${project.build.testOutputDirectory}</value>
- </property>
- <property>
<name>context.realpath</name>
<value>${project.basedir}/src/main/webapp</value>
</property>