Yes, that would be helpful. I'll send out a note if I give up on finishing the merge this weekend; don't want to hold others back too long.
Thanks, - Dave On Sat, Jun 8, 2013 at 10:30 AM, Glen Mazza <[email protected]> wrote: > Sounds good. Let me know if you'd like me to stop committing to trunk > while you're doing this, I have other non-Roller things I can look at. > > Glen > > > On 06/08/2013 10:15 AM, [email protected] wrote: > >> Author: snoopdave >> Date: Sat Jun 8 14:15:16 2013 >> New Revision: 1490985 >> >> URL: http://svn.apache.org/r1490985 >> Log: >> Down to two Maven Modules and two Maven Assemblies >> >> 100% tests pass and now able to run, create user, login and post a blog >> post. >> >> Next step is to merge all changes that have happened in the trunk into >> this branch and then, merge back to trunk. >> >> Added: >> roller/branches/fewer_modules/**weblogger-webapp/src/main/** >> webapp/WEB-INF/classes/ >> roller/branches/fewer_modules/**weblogger-webapp/src/main/** >> webapp/WEB-INF/taglib.tld >> - copied unchanged from r1488714, roller/branches/fewer_modules/** >> weblogger-webapp/src/main/**resources/META-INF/taglib.tld >> roller/branches/fewer_modules/**weblogger-webapp/src/test/** >> resources/roller-jettyrun.**properties >> - copied unchanged from r1488748, roller/trunk/weblogger-web/** >> src/test/resources/roller-**custom.properties >> Removed: >> roller/branches/fewer_modules/**weblogger-webapp/src/main/** >> resources/META-INF/taglib.tld >> Modified: >> roller/branches/fewer_modules/**weblogger-webapp/pom.xml >> roller/branches/fewer_modules/**weblogger-webapp/src/main/** >> java/org/apache/roller/**weblogger/business/startup/** >> WebloggerStartup.java >> roller/branches/fewer_modules/**weblogger-webapp/src/main/** >> resources/org/apache/roller/**weblogger/config/roller.**properties >> roller/branches/fewer_modules/**weblogger-webapp/src/test/** >> resources/roller-custom.**properties >> >> Modified: roller/branches/fewer_modules/**weblogger-webapp/pom.xml >> URL: http://svn.apache.org/viewvc/**roller/branches/fewer_modules/** >> weblogger-webapp/pom.xml?rev=**1490985&r1=1490984&r2=1490985&**view=diff<http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/pom.xml?rev=1490985&r1=1490984&r2=1490985&view=diff> >> ==============================**==============================** >> ================== >> --- roller/branches/fewer_modules/**weblogger-webapp/pom.xml (original) >> +++ roller/branches/fewer_modules/**weblogger-webapp/pom.xml Sat Jun 8 >> 14:15:16 2013 >> @@ -16,7 +16,10 @@ >> <artifactId>roller-weblogger-**webapp</artifactId> >> <packaging>war</packaging> >> + >> <properties> >> + <project.build.sourceEncoding>**UTF-8</project.build.** >> sourceEncoding> >> + <openjpa.version>2.2.2</**openjpa.version> >> <testOutputDirectory>${**project.build.**testOutputDirectory}</ >> **testOutputDirectory> >> <testMediaDir> ${project.build.**testOutputDirectory}${file.** >> separator}mediafiles</**testMediaDir> >> <testUploadsDir>${project.**build.testOutputDirectory}${** >> file.separator}uploadsdir</**testUploadsDir> >> @@ -87,7 +90,8 @@ >> <dependency> >> <groupId>org.apache.openjpa</**groupId> >> <artifactId>openjpa</**artifactId> >> - <version>2.2.1</version> >> + <version>${openjpa.version}</**version> >> + <scope>compile</scope> >> <exclusions> >> <exclusion> >> <groupId>commons-pool</**groupId> >> @@ -230,6 +234,40 @@ >> <!-- web --> >> + >> + <dependency> >> + <groupId>org.apache.struts</**groupId> >> + <artifactId>struts2-core</**artifactId> >> + <version>2.3.12</version> >> + </dependency> >> + >> + <!-- needed by Struts, except on JBoss --> >> + <dependency> >> + <groupId>jboss</groupId> >> + <artifactId>javassist</**artifactId> >> + <version>3.0</version> >> + </dependency> >> + >> + <dependency> >> + <version>2.3.12</version> >> + <groupId>org.apache.struts</**groupId> >> + <artifactId>struts2-spring-**plugin</artifactId> >> + <exclusions> >> + <exclusion> >> + <groupId>org.springframework</**groupId> >> + <artifactId>spring-core</**artifactId> >> + </exclusion> >> + <exclusion> >> + <groupId>org.springframework</**groupId> >> + <artifactId>spring-beans</**artifactId> >> + </exclusion> >> + <exclusion> >> + <groupId>org.springframework</**groupId> >> + <artifactId>spring-context</**artifactId> >> + </exclusion> >> + </exclusions> >> + </dependency> >> + >> <dependency> >> <groupId>org.apache.struts</**groupId> >> <artifactId>struts2-tiles-**plugin</artifactId> >> @@ -577,9 +615,9 @@ >> <groupId>org.apache.maven.**plugins</groupId> >> <artifactId>maven-war-plugin</**artifactId> >> <version>2.1.1</version> >> - <configuration> >> +<!-- <configuration> >> <archiveClasses>true</**archiveClasses> >> - </configuration> >> + </configuration>--> >> </plugin> >> <plugin> >> @@ -594,7 +632,7 @@ >> <configuration> >> <contextPath>roller</**contextPath> >> <jettyConfig>${project.build.** >> directory}/test-classes/jetty.**xml</jettyConfig> >> - <build.plugins.plugin.version>** >> </build.plugins.plugin.**version> >> + <classesDirectory>${project.** >> build.directory}/classes</**classesDirectory> >> <systemProperties> >> <systemProperty> >> @@ -608,28 +646,13 @@ >> </systemProperty> >> <systemProperty> >> - <name>jetty.home</name> >> - <value>${basedir}/src/test/** >> resources</value> >> - </systemProperty> >> - >> - <systemProperty> >> - <name>jetty.logs</name> >> - <value>${basedir}/src/test/** >> resources</value> >> - </systemProperty> >> - >> - <systemProperty> >> <name>derby.port</name> >> <value>3223</value> >> </systemProperty> >> <systemProperty> >> <name>roller.custom.config</**name> >> - <value>${project.build.** >> directory}/test-classes/**roller-custom.properties</**value> >> - </systemProperty> >> - >> - <systemProperty> >> - <name>planet.custom.config</**name> >> - <value>${project.build.** >> directory}/test-classes/**planet-custom.properties</**value> >> + <value>${project.build.** >> directory}/test-classes/**roller-jettyrun.properties</**value> >> </systemProperty> >> </systemProperties> >> @@ -691,24 +714,6 @@ >> </execution> >> <execution> >> - <id>copy-test-properties</id> >> - <phase>validate</phase> >> - <goals> >> - <goal>copy-resources</goal> >> - </goals> >> - <configuration> >> - <outputDirectory>${basedir}/** >> target/testsetup</**outputDirectory> >> - <resources> >> - <resource> >> - <directory>src/test/resources<** >> /directory> >> - <filtering>true</filtering> >> - </resource> >> - </resources> >> - </configuration> >> - </execution> >> - >> - >> - <execution> >> <id>copy-dbscripts-resources</**id> >> <phase>process-resources</**phase> >> <goals> >> @@ -760,7 +765,7 @@ >> <!-- Ensure tests will run even if 'openjpa' >> profile not active --> >> <forkMode>once</forkMode> >> - <argLine>-javaagent:"${user.** >> home}/.m2/repository/org/**apache/openjpa/openjpa/2.2.1/** >> openjpa-2.2.1.jar"</argLine> >> + <argLine>-javaagent:"${user.** >> home}/.m2/repository/org/**apache/openjpa/openjpa/${** >> openjpa.version}/openjpa-${**openjpa.version}.jar"</**argLine> >> <systemProperties> >> <property> >> @@ -973,8 +978,8 @@ >> <dependency> >> <groupId>org.apache.openjpa</**groupId> >> <artifactId>openjpa</**artifactId> >> - <scope>provided</scope> >> - <version>2.2.1</version> >> + <scope>compile</scope> >> + <version>${openjpa.version}</** >> version> >> </dependency> >> </dependencies> >> <properties> >> >> Modified: roller/branches/fewer_modules/**weblogger-webapp/src/main/** >> java/org/apache/roller/**weblogger/business/startup/** >> WebloggerStartup.java >> URL: http://svn.apache.org/viewvc/**roller/branches/fewer_modules/** >> weblogger-webapp/src/main/**java/org/apache/roller/** >> weblogger/business/startup/**WebloggerStartup.java?rev=** >> 1490985&r1=1490984&r2=1490985&**view=diff<http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/java/org/apache/roller/weblogger/business/startup/WebloggerStartup.java?rev=1490985&r1=1490984&r2=1490985&view=diff> >> ==============================**==============================** >> ================== >> --- roller/branches/fewer_modules/**weblogger-webapp/src/main/** >> java/org/apache/roller/**weblogger/business/startup/**WebloggerStartup.java >> (original) >> +++ roller/branches/fewer_modules/**weblogger-webapp/src/main/** >> java/org/apache/roller/**weblogger/business/startup/**WebloggerStartup.java >> Sat Jun 8 14:15:16 2013 >> @@ -177,10 +177,10 @@ public final class WebloggerStartup { >> mailProvider = new MailProvider(); >> } catch(StartupException ex) { >> if (log.isDebugEnabled()) { >> - log.debug("Failed to setup mail provider, continuing >> anways.\n" >> + log.debug("Failed to setup mail provider, continuing >> anyways.\n" >> + "Reason: " + ex.getMessage(), ex); >> } else { >> - log.warn("Failed to setup mail provider, continuing >> anways.\n" >> + log.warn("Failed to setup mail provider, continuing >> anyways.\n" >> + "Reason: " + ex.getMessage()); >> } >> } >> >> Modified: roller/branches/fewer_modules/**weblogger-webapp/src/main/** >> resources/org/apache/roller/**weblogger/config/roller.**properties >> URL: http://svn.apache.org/viewvc/**roller/branches/fewer_modules/** >> weblogger-webapp/src/main/**resources/org/apache/roller/** >> weblogger/config/roller.**properties?rev=1490985&r1=** >> 1490984&r2=1490985&view=diff<http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/main/resources/org/apache/roller/weblogger/config/roller.properties?rev=1490985&r1=1490984&r2=1490985&view=diff> >> ==============================**==============================** >> ================== >> --- roller/branches/fewer_modules/**weblogger-webapp/src/main/** >> resources/org/apache/roller/**weblogger/config/roller.**properties >> (original) >> +++ roller/branches/fewer_modules/**weblogger-webapp/src/main/** >> resources/org/apache/roller/**weblogger/config/roller.**properties Sat >> Jun 8 14:15:16 2013 >> @@ -689,17 +689,7 @@ log4j.logger.com.danga.**MemCached=ERROR >> # Ask OpenJPA to log to Log4J via Apache Commons Logging >> openjpa.Log=commons >> -log4j.logger.openjpa.Tool=**ERROR >> -log4j.logger.openjpa.Runtime=**ERROR >> -log4j.logger.openjpa.Remote=**ERROR >> -log4j.logger.openjpa.**DataCache=ERROR >> -log4j.logger.openjpa.**MetaData=ERROR >> -log4j.logger.openjpa.Enhance=**ERROR >> -log4j.logger.openjpa.Query=**ERROR >> -log4j.logger.openjpa.jdbc.**SQL=ERROR >> -log4j.logger.openjpa.jdbc.**JDBC=ERROR >> -log4j.logger.openjpa.jdbc.**Schema=ERROR >> - >> +log4j.logger.openjpa=ERROR >> #-----------------------------**------------------------------** >> ------------------ >> # Other settings >> >> Modified: roller/branches/fewer_modules/**weblogger-webapp/src/test/** >> resources/roller-custom.**properties >> URL: http://svn.apache.org/viewvc/**roller/branches/fewer_modules/** >> weblogger-webapp/src/test/**resources/roller-custom.** >> properties?rev=1490985&r1=**1490984&r2=1490985&view=diff<http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-webapp/src/test/resources/roller-custom.properties?rev=1490985&r1=1490984&r2=1490985&view=diff> >> ==============================**==============================** >> ================== >> --- roller/branches/fewer_modules/**weblogger-webapp/src/test/** >> resources/roller-custom.**properties (original) >> +++ roller/branches/fewer_modules/**weblogger-webapp/src/test/** >> resources/roller-custom.**properties Sat Jun 8 14:15:16 2013 >> @@ -45,19 +45,20 @@ tasks.TestTask.interval=1800 >> tasks.TestTask.leaseTime=300 >> # logging >> -log4j.rootCategory=ERROR, roller >> +log4j.rootCategory=INFO, roller >> log4j.appender.roller.File=${**project.build.directory}/**roller.log >> log4j.category.org.apache.**roller=INFO >> log4j.category.net.java.**roller=ERROR >> +log4j.category.org.apache.**struts=DEBUG >> #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.weblogger.business=**DEBUG >> #log4j.category.org.apache.**roller.planet.config.** >> PlanetConfig=DEBUG >> #log4j.category.org.apache.**roller.weblogger.config.** >> WebloggerConfig=DEBUG >> -log4j.category.org.apache.**roller.weblogger.planet.tasks=**DEBUG >> -log4j.category.org.apache.**roller.planet.business=DEBUG >> -log4j.category.org.apache.**roller.weblogger.planet.**business=DEBUG >> +#log4j.category.org.apache.**roller.weblogger.planet.tasks=**DEBUG >> +#log4j.category.org.apache.**roller.planet.business=DEBUG >> +#log4j.category.org.apache.**roller.weblogger.planet.**business=DEBUG >> >> >> >
