roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r911806 - in /roller/trunk: ./ planet-business/ planet-business/src/test/resources/ planet-web/ weblogger-business/ weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/ weblogger-business/src/test/resources/
Date Fri, 19 Feb 2010 13:20:20 GMT
Author: snoopdave
Date: Fri Feb 19 13:20:20 2010
New Revision: 911806

URL: http://svn.apache.org/viewvc?rev=911806&view=rev
Log:
Fixes to make more of the Maven build work on Windows XP. Currently, at least on my machine,
the build fails while running weblogger-business tests. After the bind exception below all
tests fail. Maybe we are hitting some weird OpenJPA or Derby Client bug?

<openjpa-1.2.1-r752877:753278 nonfatal general error> 
org.apache.openjpa.persistence.PersistenceException: java.net.BindException : 
Error connecting to server localhost on port 3219 with message Address already in use: connect.
	at org.apache.openjpa.jdbc.sql.DBDictionary.narrow(DBDictionary.java:4232)
[...]
	at org.apache.openjpa.persistence.QueryImpl.getResultList(QueryImpl.java:294)
	at org.apache.roller.weblogger.business.jpa.JPAUserManagerImpl.getUsers(JPAUserManagerImpl.java:309)
	at org.apache.roller.weblogger.business.jpa.JPAUserManagerImpl.addUser(JPAUserManagerImpl.java:97)
	at org.apache.roller.weblogger.TestUtils.setupUser(TestUtils.java:132)
	at org.apache.roller.weblogger.business.WeblogEntryTest.setUp(WeblogEntryTest.java:76)

Removed:
    roller/trunk/planet-web/
Modified:
    roller/trunk/planet-business/pom.xml
    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/jpa/JPAMediaFileManagerImpl.java
    roller/trunk/weblogger-business/src/test/resources/roller-custom.properties

Modified: roller/trunk/planet-business/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/planet-business/pom.xml?rev=911806&r1=911805&r2=911806&view=diff
==============================================================================
--- roller/trunk/planet-business/pom.xml (original)
+++ roller/trunk/planet-business/pom.xml Fri Feb 19 13:20:20 2010
@@ -20,6 +20,11 @@
     <artifactId>roller-planet-business</artifactId>
     <version>5.0-BETA2-SNAPSHOT</version>
 
+    <properties>
+        <testOutputDirectory>${project.build.testOutputDirectory}</testOutputDirectory>
+	<cacheDir>${project.build.testOutputDirectory}${file.separator}planetcache</cacheDir>
+    </properties>
+
     <dependencies>
 
         <dependency>

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=911806&r1=911805&r2=911806&view=diff
==============================================================================
--- roller/trunk/planet-business/src/test/resources/planet-custom.properties (original)
+++ roller/trunk/planet-business/src/test/resources/planet-custom.properties Fri Feb 19 13:20:20
2010
@@ -17,7 +17,7 @@
 
 #openjpa.Log=DefaultLevel=WARN, Runtime=INFO, Tool=INFO, SQL=TRACE
 
-cache.dir=${project.build.directory}/planetcache
-output.dir=${project.build.directory}/planetoutput
+cache.dir=${cacheDir}/planetcache
+output.dir=${testOutputDir}/planetoutput
 #template.dir=./testcontext/WEB-INF/templates
 

Modified: roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=911806&r1=911805&r2=911806&view=diff
==============================================================================
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Fri Feb 19 13:20:20 2010
@@ -13,7 +13,7 @@
     <name>Apache Roller Project</name>
     <description>
         Roller is an open source blog server built with open source Java
-        libraries primarily Apache OpenJPA, Struts2, Velocity and Commons.
+        libraries including Apache OpenJPA, Struts2, Velocity and Commons.
     </description>
     <url>http://roller.apache.org</url>
     <inceptionYear>2002</inceptionYear>
@@ -67,15 +67,9 @@
                 </plugin>
 
                 <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>sql-maven-plugin</artifactId>
-                    <version>1.3</version>
-                </plugin>
-
-                <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>2.4</version>
+                    <version>2.4.1</version>
                 </plugin>
 
             </plugins>

Modified: roller/trunk/weblogger-business/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/pom.xml?rev=911806&r1=911805&r2=911806&view=diff
==============================================================================
--- roller/trunk/weblogger-business/pom.xml (original)
+++ roller/trunk/weblogger-business/pom.xml Fri Feb 19 13:20:20 2010
@@ -21,6 +21,10 @@
 
     <properties>
         <testOutputDirectory>${project.build.testOutputDirectory}</testOutputDirectory>
+	<testMediaDir>  ${project.build.testOutputDirectory}${file.separator}mediafiles</testMediaDir>
+	<testUploadsDir>${project.build.testOutputDirectory}${file.separator}uploadsdir</testUploadsDir>
+	<testThemesDir> ${project.build.testOutputDirectory}${file.separator}themes</testThemesDir>
+	<testIndexDir>  ${project.build.testOutputDirectory}${file.separator}index</testIndexDir>
     </properties>
 
     <dependencies>
@@ -200,7 +204,7 @@
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>
+	    </plugin>
 
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -221,13 +225,8 @@
                     </systemProperties>
                     <excludes>
                         <exclude>**/TestUtils.java</exclude>
-                        <exclude>**/TestTask.java</exclude>
+			<exclude>**/TestTask.java</exclude>
                     </excludes>
-                    <!--
-                    <includes>
-                        <include>**/PlanetManagerLocalTest.java</include>
-                    </includes>
-                    -->
                 </configuration>
             </plugin>
 
@@ -297,7 +296,7 @@
                         <configuration>
                             <tasks>
                                 <!-- Derby only for unit testing: skip when maven.text.skip
is set -->
-                                <delete dir="${project.build.directory}/derby-system1"
verbose="true" failonerror="false" />
+                                <delete dir="${project.build.directory}/derby-system"
verbose="true" failonerror="false" />
                                 <taskdef name="startdb" classname="org.apache.roller.weblogger.ant.StartDerbyTask"
                                          classpathref="maven.test.classpath"/>
                                 <startdb databaseDir="${project.build.directory}/derby-system"
@@ -323,7 +322,7 @@
                                         port="3219"
                                         databaseScriptsDir="${project.build.directory}/dbscripts"
                                         skip="${maven.test.skip}" ></stopdb>
-                                <delete dir="${project.build.directory}/derby-system"
verbose="true" failonerror="false" />
+				<delete dir="${project.build.directory}/derby-system" verbose="true" failonerror="false"
/> 
                             </tasks>
                         </configuration>
                     </execution>
@@ -352,16 +351,19 @@
 
         <testResources>
             <testResource>
-                <directory>${project.basedir}/src/test/resources</directory>
-                <filtering>true</filtering>
-            </testResource>
-            <testResource>
                 <directory>${project.basedir}/../weblogger-web/src/main/webapp/</directory>
                 <filtering>false</filtering>
                 <includes>
                     <include>themes/**</include>
                 </includes>
             </testResource>
+            <testResource>
+		<directory>${project.basedir}/src/test/resources</directory>
+		<filtering>true</filtering>
+                <includes>
+                    <include>**/**</include>
+                </includes>
+            </testResource>
         </testResources>
 
         <resources>

Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java?rev=911806&r1=911805&r2=911806&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
(original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
Fri Feb 19 13:20:20 2010
@@ -701,7 +701,9 @@
                     + File.separator + MIGRATION_STATUS_FILENAME),
                     "Migration is complete!");
 
-            } catch (Exception ioex) {}
+            } catch (Exception ioex) {
+		    log.error("ERROR upgrading", ioex);
+	    }
         }
         msgs.add("Migration complete!");
         return msgs;

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=911806&r1=911805&r2=911806&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/test/resources/roller-custom.properties (original)
+++ roller/trunk/weblogger-business/src/test/resources/roller-custom.properties Fri Feb 19
13:20:20 2010
@@ -19,10 +19,10 @@
 newuser.categories=
 
 # put directories in ${build.tests}
-themes.dir=${testOutputDirectory}/themes
-search.index.dir=${testOutputDirectory}/search-index
-uploads.dir=${testOutputDirectory}/uploadsdir
-mediafiles.storage.dir=${testOutputDirectory}/mediafiles
+themes.dir=${testThemesDir}
+search.index.dir=${testIndexDir}
+uploads.dir=${testUploadsDir}
+mediafiles.storage.dir=${testMediaDir}
 
 # don't auto migrate during tests
 uploads.migrate.auto=false
@@ -38,11 +38,12 @@
 
 # logging
 log4j.rootCategory=ERROR, roller
-log4j.category.org.apache.roller=ERROR
+log4j.category.org.apache.roller=INFO
 log4j.category.net.java.roller=ERROR
 
 #log4j.category.org.apache.roller.planet.business.jpa.JPAPropertiesManagerImpl=DEBUG
 #log4j.category.org.apache.roller.weblogger.business.jpa.JPAPropertiesManagerImpl=DEBUG
+log4j.category.org.apache.roller.weblogger.business=DEBUG
 
 #log4j.category.org.apache.roller.planet.config.PlanetConfig=DEBUG
 #log4j.category.org.apache.roller.weblogger.config.WebloggerConfig=DEBUG



Mime
View raw message