Propchange: roller/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -1 +1,2 @@ +/roller/branches/roller_mavenized:894711-895418 /roller/branches/roller_mediablogging:713070-782269
Modified: roller/trunk/.classpath URL: http://svn.apache.org/viewvc/roller/trunk/.classpath?rev=895563&r1=895562&r2=895563&view=diff ============================================================================== --- roller/trunk/.classpath (original) +++ roller/trunk/.classpath Mon Jan 4 05:09:13 2010 @@ -1,87 +1,6 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="src" path="build/generated/business"/> - <classpathentry kind="src" path="build/generated/web"/> - <classpathentry kind="src" path="sandbox/jdobackend/src"/> - <classpathentry kind="src" path="contrib/plugins/src"/> - <classpathentry kind="src" path="tests"/> - <classpathentry sourcepath="JRE_SRC" kind="var" path="JRE_LIB"/> - <classpathentry kind="lib" path="tools/buildtime/mockrunner-0.35/lib/nekohtml.jar"/> - <classpathentry kind="lib" path="tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar"/> - <classpathentry kind="lib" path="tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar"/> - <classpathentry kind="lib" path="tools/buildtime/mockrunner-0.35/lib/mockrunner.jar"/> - <classpathentry kind="lib" path="tools/buildtime/tomcat-5.0.28/servlet-api.jar"/> - <classpathentry kind="lib" path="tools/buildtime/tomcat-5.0.28/jsp-api.jar"/> - <classpathentry kind="lib" path="tools/buildtime/xmlParserAPIs-2.3.0.jar"/> - <classpathentry kind="lib" path="tools/buildtime/xercesImpl-2.3.0.jar"/> - <classpathentry kind="lib" path="tools/buildtime/hsqldb.jar"/> - <classpathentry kind="lib" path="tools/buildtime/ejb-1.1.jar"/> - <classpathentry kind="lib" path="tools/buildtime/ant-1.6.2/jakarta-oro-2.0.8.jar"/> - <classpathentry kind="lib" path="tools/buildtime/ant-1.6.2/commons-net-1.2.2.jar"/> - <classpathentry kind="lib" path="tools/buildtime/ant-1.6.2/ant-launcher.jar"/> - <classpathentry kind="lib" path="tools/buildtime/ant-1.6.2/ant-junit.jar"/> - <classpathentry kind="lib" path="tools/buildtime/ant-1.6.2/ant-commons-net.jar"/> - <classpathentry kind="lib" path="tools/buildtime/ant-1.6.2/ant.jar"/> - <classpathentry kind="lib" path="tools/lib/xmlrpc-1.2-b1.jar"/> - <classpathentry kind="lib" path="tools/lib/velocity-dep-1.4.jar"/> - <classpathentry kind="lib" path="tools/lib/velocity-1.4.jar"/> - <classpathentry kind="lib" path="tools/lib/taglibs-string.jar"/> - <classpathentry kind="lib" path="tools/lib/mail.jar"/> - <classpathentry kind="lib" path="tools/lib/lucene-1.4.3.jar"/> - <classpathentry kind="lib" path="tools/lib/concurrent-1.3.2.jar"/> - <classpathentry kind="lib" path="tools/lib/commons-httpclient-2.0.2.jar"/> - <classpathentry kind="lib" path="tools/lib/commons-betwixt-1.0-beta-1.jar"/> - <classpathentry kind="lib" path="tools/lib/activation.jar"/> - <classpathentry kind="lib" path="tools/struts-1.2.4/lib/struts-el.jar"/> - <classpathentry kind="lib" path="tools/struts-1.2.4/lib/struts.jar"/> - <classpathentry kind="lib" path="tools/struts-1.2.4/lib/jakarta-oro.jar"/> - <classpathentry kind="lib" path="tools/struts-1.2.4/lib/commons-validator.jar"/> - <classpathentry kind="lib" path="tools/struts-1.2.4/lib/commons-logging.jar"/> - <classpathentry kind="lib" path="tools/struts-1.2.4/lib/commons-lang-2.0.jar"/> - <classpathentry kind="lib" path="tools/struts-1.2.4/lib/commons-fileupload.jar"/> - <classpathentry kind="lib" path="tools/struts-1.2.4/lib/commons-digester.jar"/> - <classpathentry kind="lib" path="tools/struts-1.2.4/lib/commons-collections.jar"/> - <classpathentry kind="lib" path="tools/struts-1.2.4/lib/commons-beanutils.jar"/> - <classpathentry kind="lib" path="tools/struts-1.2.4/lib/antlr.jar"/> - <classpathentry kind="lib" path="contrib/lib/textile4j-1.20.jar"/> - <classpathentry kind="lib" path="tools/lib/jdom.jar"/> - <classpathentry kind="lib" path="tools/lib/log4j-1.2.11.jar"/> - <classpathentry kind="lib" path="tools/lib/commons-codec-1.3.jar"/> - <classpathentry kind="lib" path="tools/spring-1.2/spring.jar"/> - <classpathentry kind="lib" path="sandbox/jdobackend/lib/jdo2-api-2.0.jar"/> - <classpathentry kind="lib" path="sandbox/jdobackend/lib/jdom.jar"/> - <classpathentry kind="lib" path="sandbox/jdobackend/lib/jpox-1.1.0-beta-5.jar"/> - <classpathentry kind="lib" path="sandbox/jdobackend/lib/jpox-enhancer-1.1.0-beta-5.jar"/> - <classpathentry kind="lib" path="sandbox/standalone/lib/catalina.jar"/> - <classpathentry kind="lib" path="tools/hibernate-3.1/lib/asm.jar"/> - <classpathentry kind="lib" path="tools/hibernate-3.1/hibernate3.jar"/> - <classpathentry kind="lib" path="tools/hibernate-3.1/lib/asm-attrs.jar"/> - <classpathentry kind="lib" path="tools/hibernate-3.1/lib/cglib-2.1.3.jar"/> - <classpathentry kind="lib" path="tools/hibernate-3.1/lib/dom4j-1.6.1.jar"/> - <classpathentry kind="lib" path="tools/hibernate-3.1/lib/ehcache-1.1.jar"/> - <classpathentry kind="lib" path="tools/hibernate-3.1/lib/jdbc2_0-stdext.jar"/> - <classpathentry kind="lib" path="tools/hibernate-3.1/lib/jta.jar"/> - <classpathentry kind="lib" path="tools/lib/jaxen-full.jar"/> - <classpathentry kind="lib" path="tools/lib/rome-0.8.jar"/> - <classpathentry kind="lib" path="tools/lib/rome-fetcher-0.8.jar"/> - <classpathentry kind="lib" path="tools/lib/saxpath.jar"/> - <classpathentry kind="lib" path="tools/spring-1.2/acegi-security-1.0.1.jar"/> - <classpathentry kind="lib" path="tools/jakarta-taglibs-standard-1.1.2/lib/jstl.jar"/> - <classpathentry kind="lib" path="tools/jakarta-taglibs-standard-1.1.2/lib/standard.jar"/> - <classpathentry kind="lib" path="tools/jakarta-taglibs-standard-1.1.2/lib/xalan.jar"/> - <classpathentry kind="lib" path="tools/buildtime/junit-3.8.1.jar"/> - <classpathentry kind="lib" path="tools/buildtime/strutstest-2.0.0.jar"/> - <classpathentry kind="lib" path="tools/buildtime/velocidoc-app.jar"/> - <classpathentry kind="lib" path="tools/buildtime/xdoclet-1.2.3/lib/xdoclet-1.2.3.jar"/> - <classpathentry kind="lib" path="tools/buildtime/xdoclet-1.2.3/lib/xdoclet-apache-module-1.2.3.jar"/> - <classpathentry kind="lib" path="tools/buildtime/xdoclet-1.2.3/lib/xdoclet-ejb-module-1.2.3.jar"/> - <classpathentry kind="lib" path="tools/buildtime/xdoclet-1.2.3/lib/xdoclet-hibernate-module-1.2.3.jar"/> - <classpathentry kind="lib" path="tools/buildtime/xdoclet-1.2.3/lib/xdoclet-java-module-1.2.3.jar"/> - <classpathentry kind="lib" path="tools/buildtime/xdoclet-1.2.3/lib/xdoclet-jdo-module-1.2.3.jar"/> - <classpathentry kind="lib" path="tools/buildtime/xdoclet-1.2.3/lib/xdoclet-web-module-1.2.3.jar"/> - <classpathentry kind="lib" path="tools/buildtime/xdoclet-1.2.3/lib/xdoclet-xdoclet-module-1.2.3.jar"/> - <classpathentry kind="lib" path="tools/buildtime/xdoclet-1.2.3/lib/xjavadoc-1.1.jar"/> - <classpathentry kind="lib" path="tools/buildtime/mockrunner-0.3/lib/mockrunner.jar"/> - <classpathentry kind="output" path="classes.eclipse"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Modified: roller/trunk/.project URL: http://svn.apache.org/viewvc/roller/trunk/.project?rev=895563&r1=895562&r2=895563&view=diff ============================================================================== --- roller/trunk/.project (original) +++ roller/trunk/.project Mon Jan 4 05:09:13 2010 @@ -1,11 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>roller_3.0</name> + <name>roller-project</name> <comment></comment> <projects> </projects> <buildSpec> <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> <arguments> </arguments> @@ -25,9 +30,16 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>org.maven.ide.eclipse.maven2Nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>com.ibm.etools.struts.StrutsNature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> </natures> </projectDescription> Modified: roller/trunk/README.txt URL: http://svn.apache.org/viewvc/roller/trunk/README.txt?rev=895563&r1=895562&r2=895563&view=diff ============================================================================== --- roller/trunk/README.txt (original) +++ roller/trunk/README.txt Mon Jan 4 05:09:13 2010 @@ -2,12 +2,28 @@ This file exists at the top-level of the Roller source tree. -There are two applicatons here and one component: +Roller is made up of the following Maven projects: - apps/weblogger - The Apache Roller Weblogger (blog server) - apps/planet - The Roller Planet server (experimental) - compoenents/core - core component, used by both Weblogger and Planet + roller-project: Top level project + roller-core: Core Roller component + planet-business: Planet POJOs and business logic + planet-web: Planet webapp (under construction as before) + weblogger-business: Weblogger POJOs and business logic + weblogger-web: The Roller Weblogger webapp, rendering system, Struts2 UI + weblogger-assembly: Assembly that builds Roller distro + test-utils: Test utils (e.g. start/stop Derby task) -If you want to build and deploy Roller from source follow these instructions: +To build and run all unit tests, you do this: + + svn co https://svn.apache.org/repos/asf/roller/branches/roller_mavenized + cd roller_mavenized + mvn install + +You'll find the Roller webapp in weblogger-web/target/roller. To build +a Roller distribution, you do this: + + cd weblogger-assembly + mvn assembly:single + +And you will find Roller distribution files in weblogger-assembly/target - http://cwiki.apache.org/confluence/display/ROLLER/Build+Guide Propchange: roller/trunk/planet-business/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1,4 @@ +.classpath +.project +target +.settings Propchange: roller/trunk/planet-business/src/main/java/org/apache/roller/planet/business/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/business:894711-895418 +/roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/business:713070-782269 +/roller/branches/roller_mediablogging/planet-business/src/main/java/org/apache/roller/planet/business:713070-782269 Propchange: roller/trunk/planet-business/src/main/java/org/apache/roller/planet/config/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/config:894711-895418 +/roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/config:713070-782269 +/roller/branches/roller_mediablogging/planet-business/src/main/java/org/apache/roller/planet/config:713070-782269 Propchange: roller/trunk/planet-business/src/main/java/org/apache/roller/planet/pojos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/pojos:894711-895418 +/roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/pojos:713070-782269 +/roller/branches/roller_mediablogging/planet-business/src/main/java/org/apache/roller/planet/pojos:713070-782269 Propchange: roller/trunk/planet-business/src/main/java/org/apache/roller/planet/tasks/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/tasks:894711-895418 +/roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/tasks:713070-782269 +/roller/branches/roller_mediablogging/planet-business/src/main/java/org/apache/roller/planet/tasks:713070-782269 Propchange: roller/trunk/planet-business/src/main/java/org/apache/roller/planet/util/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/planet-business/src/main/java/org/apache/roller/planet/util:894711-895418 +/roller/branches/roller_mediablogging/apps/planet/src/java/org/apache/roller/planet/util:713070-782269 +/roller/branches/roller_mediablogging/planet-business/src/main/java/org/apache/roller/planet/util:713070-782269 Propchange: roller/trunk/planet-business/src/main/resources/META-INF/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/planet-business/src/main/resources/META-INF:894711-895418 +/roller/branches/roller_mediablogging/apps/planet/src/java/META-INF:713070-782269 +/roller/branches/roller_mediablogging/planet-business/src/main/resources/META-INF:713070-782269 Propchange: roller/trunk/planet-business/src/main/resources/sql/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/planet-business/src/main/resources/sql:894711-895418 +/roller/branches/roller_mediablogging/apps/planet/src/sql:713070-782269 +/roller/branches/roller_mediablogging/planet-business/src/main/resources/sql:713070-782269 Propchange: roller/trunk/planet-business/src/test/java/org/apache/roller/planet/business/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/planet-business/src/test/java/org/apache/roller/planet/business:894711-895418 +/roller/branches/roller_mediablogging/apps/planet/test/java/org/apache/roller/planet/business:713070-782269 +/roller/branches/roller_mediablogging/planet-business/src/test/java/org/apache/roller/planet/business:713070-782269 Propchange: roller/trunk/planet-business/src/test/java/org/apache/roller/planet/util/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/planet-business/src/test/java/org/apache/roller/planet/util:894711-895418 +/roller/branches/roller_mediablogging/apps/planet/test/java/org/apache/roller/planet/util:713070-782269 +/roller/branches/roller_mediablogging/planet-business/src/test/java/org/apache/roller/planet/util:713070-782269 Propchange: roller/trunk/roller-core/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1,4 @@ +.classpath +.project +target +.settings Propchange: roller/trunk/roller-core/src/main/java/org/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/roller-core/src/main/java/org:894711-895418 +/roller/branches/roller_mediablogging/components/core/src/java/org:713070-782269 +/roller/branches/roller_mediablogging/roller-core/src/main/java/org:713070-782269 Propchange: roller/trunk/roller-core/src/test/java/org/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/roller-core/src/test/java/org:894711-895418 +/roller/branches/roller_mediablogging/components/core/test/java/org:713070-782269 +/roller/branches/roller_mediablogging/roller-core/src/test/java/org:713070-782269 Propchange: roller/trunk/test-utils/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1,4 @@ +.classpath +.project +target +.settings Propchange: roller/trunk/test-utils/src/main/java/org/apache/roller/weblogger/ant/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/test-utils/src/main/java/org/apache/roller/weblogger/ant:894711-895418 +/roller/branches/roller_mediablogging/apps/weblogger/test/java/org/apache/roller/weblogger/ant:713070-782269 +/roller/branches/roller_mediablogging/test-utils/src/main/java/org/apache/roller/weblogger/ant:713070-782269 Propchange: roller/trunk/weblogger-assembly/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1 @@ +target Propchange: roller/trunk/weblogger-business/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1,4 @@ +.classpath +.project +target +.settings Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/business:894711-895418 +/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/business:713070-782269 +/roller/branches/roller_mediablogging/weblogger-business/src/main/java/org/apache/roller/weblogger/business:713070-782269 Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/search/operations/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1,2 @@ +.LCKIndexOperation.java~ +.LCKReIndexEntryOperation.java~ Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/config/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/config:894711-895418 +/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/config:713070-782269 +/roller/branches/roller_mediablogging/weblogger-business/src/main/java/org/apache/roller/weblogger/config:713070-782269 Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/business/jpa/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/business/jpa:894711-895418 +/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/jpa:713070-782269 +/roller/branches/roller_mediablogging/weblogger-business/src/main/java/org/apache/roller/weblogger/planet/business/jpa:713070-782269 Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1,4 @@ +.LCKWeblogEntryData.java~ +.LCKRefererData.java~ +.LCKPlanetEntryData.java~ +.LCKUserData.java~ Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos:894711-895418 +/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos:713070-782269 +/roller/branches/roller_mediablogging/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos:713070-782269 Propchange: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/util/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/weblogger-business/src/main/java/org/apache/roller/weblogger/util:894711-895418 +/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/util:713070-782269 +/roller/branches/roller_mediablogging/weblogger-business/src/main/java/org/apache/roller/weblogger/util:713070-782269 Propchange: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/wrapper/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/wrapper:894711-895418 +/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper:713070-782269 +/roller/branches/roller_mediablogging/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/wrapper:713070-782269 Propchange: roller/trunk/weblogger-business/src/main/resources/sql/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/weblogger-business/src/main/resources/sql:894711-895418 +/roller/branches/roller_mediablogging/apps/weblogger/src/sql:713070-782269 +/roller/branches/roller_mediablogging/weblogger-business/src/main/resources/sql:713070-782269 Propchange: roller/trunk/weblogger-business/src/test/java/org/apache/roller/weblogger/business/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +.LCKPlanetManagerTest.java~ +.LCKPlanetManagerLocalTest.java~ +.LCKWeblogEntryTest.java~ Propchange: roller/trunk/weblogger-business/src/test/java/org/apache/roller/weblogger/business/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/weblogger-business/src/test/java/org/apache/roller/weblogger/business:894711-895418 +/roller/branches/roller_mediablogging/apps/weblogger/test/java/org/apache/roller/weblogger/business:713070-782269 +/roller/branches/roller_mediablogging/weblogger-business/src/test/java/org/apache/roller/weblogger/business:713070-782269 Propchange: roller/trunk/weblogger-business/src/test/java/org/apache/roller/weblogger/planet/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/weblogger-business/src/test/java/org/apache/roller/weblogger/planet:894711-895418 +/roller/branches/roller_mediablogging/apps/weblogger/test/java/org/apache/roller/weblogger/planet:713070-782269 +/roller/branches/roller_mediablogging/weblogger-business/src/test/java/org/apache/roller/weblogger/planet:713070-782269 Propchange: roller/trunk/weblogger-business/src/test/java/org/apache/roller/weblogger/util/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1 @@ +.LCKUtilitiesTest.java~ Propchange: roller/trunk/weblogger-business/src/test/java/org/apache/roller/weblogger/util/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/weblogger-business/src/test/java/org/apache/roller/weblogger/util:894711-895418 +/roller/branches/roller_mediablogging/apps/weblogger/test/java/org/apache/roller/weblogger/util:713070-782269 +/roller/branches/roller_mediablogging/weblogger-business/src/test/java/org/apache/roller/weblogger/util:713070-782269 Propchange: roller/trunk/weblogger-business/src/test/resources/WEB-INF/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/weblogger-business/src/test/resources/WEB-INF:894711-895418 +/roller/branches/roller_mediablogging/apps/weblogger/testdata/WEB-INF:713070-782269 +/roller/branches/roller_mediablogging/weblogger-business/src/test/resources/WEB-INF:713070-782269 Propchange: roller/trunk/weblogger-business/src/test/resources/adminapi-testdata/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/weblogger-business/src/test/resources/adminapi-testdata:894711-895418 +/roller/branches/roller_mediablogging/apps/weblogger/testdata/adminapi-testdata:713070-782269 +/roller/branches/roller_mediablogging/weblogger-business/src/test/resources/adminapi-testdata:713070-782269 Propchange: roller/trunk/weblogger-business/src/test/resources/uploadsdir/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/weblogger-business/src/test/resources/uploadsdir:894711-895418 +/roller/branches/roller_mediablogging/apps/weblogger/testdata/uploadsdir:713070-782269 +/roller/branches/roller_mediablogging/weblogger-business/src/test/resources/uploadsdir:713070-782269 Propchange: roller/trunk/weblogger-docs/examples/plugins/pluginmodel/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +build +dist +.crap.swp Propchange: roller/trunk/weblogger-docs/examples/rollertask/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1 @@ +logs Propchange: roller/trunk/weblogger-docs/examples/scripting/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1 @@ +build Propchange: roller/trunk/weblogger-docs/examples/scripting/bsf/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1,2 @@ +build +dist Propchange: roller/trunk/weblogger-docs/examples/scripting/groovy/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +logs +build +dist Propchange: roller/trunk/weblogger-docs/userguide/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1 @@ +.~lock.roller-user-guide.odt# Propchange: roller/trunk/weblogger-web/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1,5 @@ +roller-startup.log +.classpath +.project +target +.settings Propchange: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/weblogger-web/src/main/java/org/apache/roller/weblogger/ui:894711-895418 +/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/ui:713070-782269 +/roller/branches/roller_mediablogging/weblogger-web/src/main/java/org/apache/roller/weblogger/ui:713070-782269 Propchange: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/core/filters/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1 @@ +.LCKBreadCrumbFilter.java~ Propchange: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/filters/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1,2 @@ +.LCKWeblogPageCacheFilter.java~ +.LCKIfModifiedWeblogPageCacheFilter.java~ Propchange: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/model/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1 @@ +.LCKPlanetModel.java~ Propchange: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1 @@ +.LCKPlanetEntriesPager.java~ Propchange: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +.LCKCommentServlet.java~ +.LCKPageServlet.java~ +.LCKPlanetFeedServlet.java~ Propchange: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1 @@ +.LCKOldPageHelper.java~ Propchange: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/webservices/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/weblogger-web/src/main/java/org/apache/roller/weblogger/webservices:894711-895418 +/roller/branches/roller_mediablogging/apps/weblogger/src/java/org/apache/roller/weblogger/webservices:713070-782269 +/roller/branches/roller_mediablogging/weblogger-web/src/main/java/org/apache/roller/weblogger/webservices:713070-782269 Propchange: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1 @@ +.LCKRollerAtomHandler.java~ Propchange: roller/trunk/weblogger-web/src/main/webapp/WEB-INF/classes/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1 @@ +ApplicationResources.properties~ Propchange: roller/trunk/weblogger-web/src/main/webapp/theme/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1,2 @@ +tiles-simplepage.jsp~ +tiles-mainmenupage.jsp~ Propchange: roller/trunk/weblogger-web/src/main/webapp/themes/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1,2 @@ +asf +asffrontpage Propchange: roller/trunk/weblogger-web/src/main/webapp/themes/sotto/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 4 05:09:13 2010 @@ -0,0 +1 @@ +.LCKWeblog.vm~ Propchange: roller/trunk/weblogger-web/src/test/java/org/apache/roller/weblogger/ui/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 4 05:09:13 2010 @@ -0,0 +1,3 @@ +/roller/branches/roller_mavenized/weblogger-web/src/test/java/org/apache/roller/weblogger/ui:894711-895418 +/roller/branches/roller_mediablogging/apps/weblogger/test/java/org/apache/roller/weblogger/ui:713070-782269 +/roller/branches/roller_mediablogging/weblogger-web/src/test/java/org/apache/roller/weblogger/ui:713070-782269
