roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r598076 - in /roller/branches/roller_4.1_dev: ./ apps/planet/ apps/planet/src/java/org/apache/roller/planet/ui/rendering/pagers/ apps/weblogger/ apps/weblogger/docs/examples/plugins/pluginmodel/ apps/weblogger/docs/examples/plugins/pluginmo...
Date Sun, 25 Nov 2007 22:54:19 GMT
Author: snoopdave
Date: Sun Nov 25 14:54:17 2007
New Revision: 598076

URL: http://svn.apache.org/viewvc?rev=598076&view=rev
Log:
Merging, result of svn merge -r 590842:596879 https://svn.apache.org/repos/asf/roller/trunk

Added:
    roller/branches/roller_4.1_dev/apps/planet/pom_ant_planet.xml
      - copied unchanged from r596879, roller/trunk/apps/planet/pom_ant_planet.xml
    roller/branches/roller_4.1_dev/apps/planet/pom_ant_planet_business.xml
      - copied unchanged from r596879, roller/trunk/apps/planet/pom_ant_planet_business.xml
    roller/branches/roller_4.1_dev/apps/planet/pom_ant_planet_web.xml
      - copied unchanged from r596879, roller/trunk/apps/planet/pom_ant_planet_web.xml
    roller/branches/roller_4.1_dev/apps/weblogger/pom_ant_weblogger_business.xml
      - copied unchanged from r596879, roller/trunk/apps/weblogger/pom_ant_weblogger_business.xml
    roller/branches/roller_4.1_dev/apps/weblogger/pom_ant_weblogger_web.xml
      - copied unchanged from r596879, roller/trunk/apps/weblogger/pom_ant_weblogger_web.xml
Removed:
    roller/branches/roller_4.1_dev/tools/buildtime/ejb-1.1.jar
    roller/branches/roller_4.1_dev/tools/buildtime/xdoclet-1.2.3/
Modified:
    roller/branches/roller_4.1_dev/apps/planet/src/java/org/apache/roller/planet/ui/rendering/pagers/PlanetEntriesPager.java
    roller/branches/roller_4.1_dev/apps/weblogger/build.xml
    roller/branches/roller_4.1_dev/apps/weblogger/docs/examples/plugins/pluginmodel/   (props changed)
    roller/branches/roller_4.1_dev/apps/weblogger/docs/examples/plugins/pluginmodel/build.xml
    roller/branches/roller_4.1_dev/apps/weblogger/docs/examples/plugins/pluginmodel/src/org/apache/roller/examples/plugins/pagemodel/AuthenticatedUserModel.java
    roller/branches/roller_4.1_dev/apps/weblogger/docs/examples/rollertask/rollertask.sh
    roller/branches/roller_4.1_dev/apps/weblogger/nbproject/project.xml
    roller/branches/roller_4.1_dev/apps/weblogger/pom_ant_weblogger.xml
    roller/branches/roller_4.1_dev/apps/weblogger/sign-release.sh
    roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
    roller/branches/roller_4.1_dev/apps/weblogger/web/WEB-INF/jsps/admin/ModifyUser.jsp
    roller/branches/roller_4.1_dev/build.xml
    roller/branches/roller_4.1_dev/metadata/database/macros.vm
    roller/branches/roller_4.1_dev/sandbox/scripting/groovy/ant.properties
    roller/branches/roller_4.1_dev/sandbox/scripting/groovy/build.xml
    roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/checkuser.gy
    roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createblog.gy
    roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createcomment.gy
    roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createentry.gy
    roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createtestdata.gy
    roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createuser.gy
    roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/groovy
    roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/listusers.gy
    roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/removeuser.gy
    roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GSPRenderer.java
    roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GSPRendererFactory.java
    roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GroovletRenderer.java
    roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GroovletRendererFactory.java
    roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GroovyRollerBinding.java
    roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GroovyRunner.java

Modified: roller/branches/roller_4.1_dev/apps/planet/src/java/org/apache/roller/planet/ui/rendering/pagers/PlanetEntriesPager.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/planet/src/java/org/apache/roller/planet/ui/rendering/pagers/PlanetEntriesPager.java?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/apps/planet/src/java/org/apache/roller/planet/ui/rendering/pagers/PlanetEntriesPager.java (original)
+++ roller/branches/roller_4.1_dev/apps/planet/src/java/org/apache/roller/planet/ui/rendering/pagers/PlanetEntriesPager.java Sun Nov 25 14:54:17 2007
@@ -42,7 +42,6 @@
     
     private String feedURL = null;
     private PlanetGroup group = null;
-    private String locale = null;
     private int sinceDays = -1;
     private int length = 0;
     
@@ -65,7 +64,6 @@
         
         this.feedURL = feedURL;
         this.group = group;
-        this.locale = locale;
         this.sinceDays = sinceDays;
         this.length = length;
         

Modified: roller/branches/roller_4.1_dev/apps/weblogger/build.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/build.xml?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/apps/weblogger/build.xml (original)
+++ roller/branches/roller_4.1_dev/apps/weblogger/build.xml Sun Nov 25 14:54:17 2007
@@ -500,10 +500,7 @@
         <copy todir="${build.dist.sources}">
             <fileset dir="${basedir}/../.."> 
                 
-                <include name="**/**" />
-                
-                <!-- Don't ship top level build script, it's confusing -->
-                <exclude name="build.xml"/>    
+                <include name="**/**" />  
                 
                 <!-- Or marginalia -->
                 <exclude name="doap_roller.rdf"/>    

Propchange: roller/branches/roller_4.1_dev/apps/weblogger/docs/examples/plugins/pluginmodel/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Nov 25 14:54:17 2007
@@ -1,2 +1,3 @@
 build
 dist
+.crap.swp

Modified: roller/branches/roller_4.1_dev/apps/weblogger/docs/examples/plugins/pluginmodel/build.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/docs/examples/plugins/pluginmodel/build.xml?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/apps/weblogger/docs/examples/plugins/pluginmodel/build.xml (original)
+++ roller/branches/roller_4.1_dev/apps/weblogger/docs/examples/plugins/pluginmodel/build.xml Sun Nov 25 14:54:17 2007
@@ -1,17 +1,19 @@
 
 <project name="pluginmodel" default="dist">
     
-    <property name="rollerdir" value="../../../.." />
+    <property name="tools" value="../../../../../../tools" />
+    <property name="buildlib" value="../../../../build/lib" />
     
     <target name="dist">
         <mkdir dir="build" />
         <mkdir dir="dist" />
         <javac srcdir="src" destdir="build">
             <classpath>
-                <pathelement path="${rollerdir}/build/lib/roller-business.jar" />
-                <pathelement path="${rollerdir}/build/lib/roller-web.jar" />
-                <pathelement path="${rollerdir}/tools/lib/commons-logging-1.0.4.jar" />
-                <pathelement path="${rollerdir}/tools/buildtime/tomcat-5.0.28/servlet-api.jar" />
+                <pathelement path="${buildlib}/roller-business.jar" />
+                <pathelement path="${buildlib}/roller-web.jar" />
+                <pathelement path="${tools}/roller-core/roller-core.jar" />
+                <pathelement path="${tools}/lib/commons-logging-1.0.4.jar" />
+                <pathelement path="${tools}/buildtime/tomcat-5.0.28/servlet-api.jar" />
             </classpath>
         </javac>
         <jar basedir="build" destfile="dist/authusermodel.jar" />

Modified: roller/branches/roller_4.1_dev/apps/weblogger/docs/examples/plugins/pluginmodel/src/org/apache/roller/examples/plugins/pagemodel/AuthenticatedUserModel.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/docs/examples/plugins/pluginmodel/src/org/apache/roller/examples/plugins/pagemodel/AuthenticatedUserModel.java?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/apps/weblogger/docs/examples/plugins/pluginmodel/src/org/apache/roller/examples/plugins/pagemodel/AuthenticatedUserModel.java (original)
+++ roller/branches/roller_4.1_dev/apps/weblogger/docs/examples/plugins/pluginmodel/src/org/apache/roller/examples/plugins/pagemodel/AuthenticatedUserModel.java Sun Nov 25 14:54:17 2007
@@ -5,10 +5,10 @@
 import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
-import org.apache.roller.pojos.wrapper.UserDataWrapper;
-import org.apache.roller.ui.core.RollerSession;
-import org.apache.roller.ui.rendering.model.Model;
+import org.apache.roller.weblogger.ui.core.RollerSession;
+import org.apache.roller.weblogger.WebloggerException;
+import org.apache.roller.weblogger.pojos.wrapper.UserWrapper;
+import org.apache.roller.weblogger.ui.rendering.model.Model;
 
 
 public class AuthenticatedUserModel implements Model {
@@ -19,15 +19,15 @@
         return "authenticated";
     }
 
-    public void init(Map params) throws RollerException {
+    public void init(Map params) throws WebloggerException {
         this.request = (HttpServletRequest)params.get("request");
     }
     
-    public UserDataWrapper getUser() {
+    public UserWrapper getUser() {
         try {
             RollerSession rses = RollerSession.getRollerSession(request);
             if (rses != null && rses.getAuthenticatedUser() != null) {
-                return UserDataWrapper.wrap(rses.getAuthenticatedUser());
+                return UserWrapper.wrap(rses.getAuthenticatedUser());
             }
         } catch (Exception e) {
             log.warn("ERROR: checking user authorization", e);

Modified: roller/branches/roller_4.1_dev/apps/weblogger/docs/examples/rollertask/rollertask.sh
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/docs/examples/rollertask/rollertask.sh?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/apps/weblogger/docs/examples/rollertask/rollertask.sh (original)
+++ roller/branches/roller_4.1_dev/apps/weblogger/docs/examples/rollertask/rollertask.sh Sun Nov 25 14:54:17 2007
@@ -37,6 +37,7 @@
     -Dcatalina.base=. \
     -Droller.custom.config=${CONFIG_OVERRIDE} \
     -cp ${WEBAPP_DIR}/WEB-INF/lib/roller-business.jar \
+    ${WEBAPP_DIR}/WEB-INF/lib/roller-core.jar \
     org.apache.roller.business.runnable.TaskRunner \
     ${WEBAPP_DIR} ${JARS_DIR} \
     $1

Modified: roller/branches/roller_4.1_dev/apps/weblogger/nbproject/project.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/nbproject/project.xml?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/apps/weblogger/nbproject/project.xml (original)
+++ roller/branches/roller_4.1_dev/apps/weblogger/nbproject/project.xml Sun Nov 25 14:54:17 2007
@@ -121,8 +121,8 @@
             <compilation-unit>
                 <package-root>src/java</package-root>
                 <package-root>test/java</package-root>
-                <package-root>src/sql</package-root>
-                <classpath mode="compile">../../tools/lib/commons-betwixt-1.0-beta-1.jar:../../tools/lib/commons-codec-1.3.jar:../../tools/lib/commons-collections-3.2.jar:../../tools/lib/commons-digester-1.6.jar:../../tools/lib/commons-id-0.1-SNAPSHOT.jar:../../tools/lib/commons-lang-2.1.jar:../../tools/lib/commons-logging-1.0.4.jar:../../tools/lib/concurrent-1.3.2.jar:../../tools/lib/guice-1.0.jar:../../tools/lib/jaxen-full.jar:../../tools/lib/jdom.jar:../../tools/lib/log4j-1.2.11.jar:../../tools/lib/lucene-1.4.3.jar:../../tools/lib/rome-fetcher-0.9.jar:../../tools/lib/saxpath.jar:../../tools/lib/taglibs-string.jar:../../tools/lib/velocity-1.5.jar:../../tools/hibernate-3.1/hibernate3.jar:../../tools/openjpa-0.9.7/geronimo-j2ee-connector_1.5_spec-1.0.1.jar:../../tools/openjpa-0.9.7/geronimo-jpa_3.0_spec-1.0.jar:../../tools/openjpa-0.9.7/geronimo-jta_1.0.1B_spec-1.0.1.jar:../../tools/openjpa-0.9.7/openjpa-0.9.7-incubating.jar:../../tools/openjpa-0.9.7/serp-1.11.0.jar:../../to
 ols/xmlrpc-3.0/lib/ws-commons-util-1.0.1.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-client-3.0.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-common-3.0.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-server-3.0.jar:../../tools/spring-1.2/acegi-security-1.0.3.jar:../../tools/spring-1.2/spring.jar:../../tools/roller-core/roller-core.jar:../../tools/roller-planet/roller-planet-business.jar:../../tools/struts-1.2.4/lib/antlr.jar:../../tools/struts-1.2.4/lib/commons-beanutils.jar:../../tools/struts-1.2.4/lib/commons-digester.jar:../../tools/struts-1.2.4/lib/commons-validator.jar:../../tools/struts-1.2.4/lib/jakarta-oro.jar:../../tools/struts-1.2.4/lib/struts-el.jar:../../tools/struts-1.2.4/lib/struts.jar:../../tools/buildtime/tomcat-5.0.28/jsp-api.jar:../../tools/buildtime/tomcat-5.0.28/servlet-api.jar:../../tools/buildtime/activation.jar:../../tools/buildtime/mail.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/jstl.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/serializer.jar:../../tools/jakar
 ta-taglibs-standard-1.1.2/lib/standard.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/xalan.jar:../../tools/buildtime/junit-4.1.jar:../../tools/buildtime/ant-1.7.0/ant.jar:../../tools/buildtime/derbyclient.jar:../../tools/buildtime/derby.jar:../../tools/buildtime/derbyclient.jar:../../tools/buildtime/derbynet.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:../../tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:../../tools/struts-2.0.9/lib/antlr-2.7.2.jar:../../tools/struts-2.0.9/lib/commons-beanutils-1.6.jar:../../tools/struts-2.0.9/lib/commons-chain-1.1.jar:../../tools/struts-2.0.9/lib/commons-fileupload-1.2.jar:../../tools/struts-2.0.9/lib/commons-io-1.3.1.jar:../../tools/struts-2.0.9/lib/commons-validator-1.3.0.jar:../../tools/struts-2.0.9/lib/freemarker-2.3.8.jar:../../tools/struts-2.0.9/lib/ognl-2.6.11.jar:../../tools/struts-2
 .0.9/lib/oro-2.0.8.jar:../../tools/struts-2.0.9/lib/struts2-core-2.0.9.jar:../../tools/struts-2.0.9/lib/struts2-spring-plugin-2.0.9.jar:../../tools/struts-2.0.9/lib/struts2-tiles-plugin-2.0.9.jar:../../tools/struts-2.0.9/lib/tiles-api-2.0.4.jar:../../tools/struts-2.0.9/lib/tiles-core-2.0.4.jar:../../tools/struts-2.0.9/lib/tiles-jsp-2.0.4.jar:../../tools/struts-2.0.9/lib/xwork-2.0.4.jar:../../tools/lib/commons-httpclient-3.0.1.jar:../../tools/lib/rome-0.9.1-dev.jar:../../tools/lib/rome-propono-0.7.jar</classpath>
+                <package-root>docs/examples/plugins/pluginmodel/src</package-root>
+                <classpath mode="compile">../../tools/lib/commons-codec-1.3.jar:../../tools/lib/commons-collections-3.2.jar:../../tools/lib/commons-digester-1.6.jar:../../tools/lib/commons-httpclient-2.0.2.jar:../../tools/lib/commons-id-0.1-SNAPSHOT.jar:../../tools/lib/commons-lang-2.1.jar:../../tools/lib/commons-logging-1.0.4.jar:../../tools/lib/concurrent-1.3.2.jar:../../tools/lib/guice-1.0.jar:../../tools/lib/jaxen-full.jar:../../tools/lib/jdom.jar:../../tools/lib/log4j-1.2.11.jar:../../tools/lib/lucene-1.4.3.jar:../../tools/lib/rome-0.9.jar:../../tools/lib/rome-fetcher-0.9.jar:../../tools/lib/saxpath.jar:../../tools/lib/taglibs-string.jar:../../tools/lib/velocity-1.5.jar:../../tools/hibernate-3.1/hibernate3.jar:../../tools/openjpa-0.9.7/geronimo-j2ee-connector_1.5_spec-1.0.1.jar:../../tools/openjpa-0.9.7/geronimo-jpa_3.0_spec-1.0.jar:../../tools/openjpa-0.9.7/geronimo-jta_1.0.1B_spec-1.0.1.jar:../../tools/openjpa-0.9.7/openjpa-0.9.7-incubating.jar:../../tools/openjpa-0.9
 .7/serp-1.11.0.jar:../../tools/xmlrpc-3.0/lib/ws-commons-util-1.0.1.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-client-3.0.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-common-3.0.jar:../../tools/xmlrpc-3.0/lib/xmlrpc-server-3.0.jar:../../tools/spring-1.2/acegi-security-1.0.3.jar:../../tools/spring-1.2/spring.jar:../../tools/roller-core/roller-core.jar:../../tools/roller-planet/roller-planet-business.jar:../../tools/struts-1.2.4/lib/antlr.jar:../../tools/struts-1.2.4/lib/commons-beanutils.jar:../../tools/struts-1.2.4/lib/commons-digester.jar:../../tools/struts-1.2.4/lib/commons-validator.jar:../../tools/struts-1.2.4/lib/jakarta-oro.jar:../../tools/struts-1.2.4/lib/struts-el.jar:../../tools/struts-1.2.4/lib/struts.jar:../../tools/buildtime/tomcat-5.0.28/jsp-api.jar:../../tools/buildtime/tomcat-5.0.28/servlet-api.jar:../../tools/buildtime/activation.jar:../../tools/buildtime/mail.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/jstl.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/seria
 lizer.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/standard.jar:../../tools/jakarta-taglibs-standard-1.1.2/lib/xalan.jar:../../tools/hibernate-3.1/lib/asm-attrs.jar:../../tools/hibernate-3.1/lib/asm.jar:../../tools/hibernate-3.1/lib/cglib-2.1.3.jar:../../tools/hibernate-3.1/lib/dom4j-1.6.1.jar:../../tools/hibernate-3.1/lib/ehcache-1.1.jar:../../tools/hibernate-3.1/lib/jdbc2_0-stdext.jar:../../tools/hibernate-3.1/lib/jta.jar:../../tools/buildtime/junit-4.1.jar:../../tools/buildtime/ant-1.7.0/ant.jar:../../tools/buildtime/derbyclient.jar:../../tools/buildtime/derby.jar:../../tools/buildtime/derbyclient.jar:../../tools/buildtime/derbynet.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner-servlet.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner-struts.jar:../../tools/buildtime/mockrunner-0.35/lib/mockrunner.jar:../../tools/buildtime/mockrunner-0.35/lib/nekohtml.jar:../../tools/struts-2.0.9/lib/antlr-2.7.2.jar:../../tools/struts-2.0.9/lib/commons-beanutils-1.6
 .jar:../../tools/struts-2.0.9/lib/commons-chain-1.1.jar:../../tools/struts-2.0.9/lib/commons-fileupload-1.2.jar:../../tools/struts-2.0.9/lib/commons-io-1.3.1.jar:../../tools/struts-2.0.9/lib/commons-validator-1.3.0.jar:../../tools/struts-2.0.9/lib/freemarker-2.3.8.jar:../../tools/struts-2.0.9/lib/ognl-2.6.11.jar:../../tools/struts-2.0.9/lib/oro-2.0.8.jar:../../tools/struts-2.0.9/lib/struts2-core-2.0.9.jar:../../tools/struts-2.0.9/lib/struts2-spring-plugin-2.0.9.jar:../../tools/struts-2.0.9/lib/struts2-tiles-plugin-2.0.9.jar:../../tools/struts-2.0.9/lib/tiles-api-2.0.4.jar:../../tools/struts-2.0.9/lib/tiles-core-2.0.4.jar:../../tools/struts-2.0.9/lib/tiles-jsp-2.0.4.jar:../../tools/struts-2.0.9/lib/xwork-2.0.4.jar</classpath>
                 <source-level>1.5</source-level>
             </compilation-unit>
         </java-data>

Modified: roller/branches/roller_4.1_dev/apps/weblogger/pom_ant_weblogger.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/pom_ant_weblogger.xml?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/apps/weblogger/pom_ant_weblogger.xml (original)
+++ roller/branches/roller_4.1_dev/apps/weblogger/pom_ant_weblogger.xml Sun Nov 25 14:54:17 2007
@@ -1,11 +1,26 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.roller</groupId>
-  <artifactId>roller-weblogger</artifactId>
-  <name>Roller :: Weblogger :: Ant-WAR</name>
-  <version>4.0-SNAPSHOT</version>
-  <packaging>war</packaging>
-  
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache</groupId>
+        <artifactId>apache</artifactId>
+        <version>4</version>
+    </parent>
+
+    <groupId>org.apache.roller</groupId>
+    <artifactId>roller-weblogger</artifactId>
+    <name>Roller :: Weblogger :: WAR</name>
+
+    <version>4.0</version>
+
+    <packaging>war</packaging>
+
+    <url>http://roller.apache.org/</url>
+    <description>The roller weblogger war built using ant</description>
+    <scm>
+        <connection>scm:svn:https://svn.apache.org/repos/asf/roller</connection>
+        <url>https://svn.apache.org/viewvc/roller</url>
+    </scm>
 </project>  

Modified: roller/branches/roller_4.1_dev/apps/weblogger/sign-release.sh
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/sign-release.sh?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/apps/weblogger/sign-release.sh (original)
+++ roller/branches/roller_4.1_dev/apps/weblogger/sign-release.sh Sun Nov 25 14:54:17 2007
@@ -1,5 +1,5 @@
 
-export rcstring="-rc8"
+export rcstring="-rc10"
 export vstring="4.0"
 
 cp dist/apache-roller-${vstring}.tar.gz dist/apache-roller-${vstring}${rcstring}.tar.gz

Modified: roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java (original)
+++ roller/branches/roller_4.1_dev/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java Sun Nov 25 14:54:17 2007
@@ -237,8 +237,7 @@
             Weblogger roller = WebloggerFactory.getWeblogger();
             WeblogEntryManager weblogMgr = roller.getWeblogEntryManager();
             User user = roller.getUserManager().getUserByUserName(userid);
-            Timestamp current =
-                    new Timestamp(System.currentTimeMillis());
+            Timestamp current = new Timestamp(System.currentTimeMillis());
             
             WeblogEntry entry = new WeblogEntry();
             entry.setTitle(title);
@@ -249,6 +248,13 @@
             entry.setWebsite(website);
             entry.setCreatorUserName(user.getUserName());
             entry.setCommentDays(new Integer(website.getDefaultCommentDays()));
+            entry.setAllowComments(website.getDefaultAllowComments());
+        
+            // apply weblog default plugins
+            if (website.getDefaultPlugins() != null) {
+                entry.setPlugins(website.getDefaultPlugins());
+            }
+            
             if (Boolean.valueOf(publish).booleanValue()) {
                 entry.setStatus(WeblogEntry.PUBLISHED);
             } else {

Modified: roller/branches/roller_4.1_dev/apps/weblogger/web/WEB-INF/jsps/admin/ModifyUser.jsp
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/apps/weblogger/web/WEB-INF/jsps/admin/ModifyUser.jsp?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/apps/weblogger/web/WEB-INF/jsps/admin/ModifyUser.jsp (original)
+++ roller/branches/roller_4.1_dev/apps/weblogger/web/WEB-INF/jsps/admin/ModifyUser.jsp Sun Nov 25 14:54:17 2007
@@ -99,7 +99,7 @@
         
         <p><s:text name="userAdmin.userMemberOf" /></p>  
         <table class="rollertable" style="width: 80%">
-            <s:iterator id="perms" value="#user.permissions">
+            <s:iterator id="perms" value="user.permissions">
                 <tr>
                     <td width="%30">
                         <a href='<s:property value="baseURL" />/<s:property value="#perms.website.handle" />'>

Modified: roller/branches/roller_4.1_dev/build.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/build.xml?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/build.xml (original)
+++ roller/branches/roller_4.1_dev/build.xml Sun Nov 25 14:54:17 2007
@@ -38,25 +38,86 @@
         <ant dir="apps/planet" target="test" />
         <ant dir="apps/weblogger" target="tests" />
     </target>
-	
-	<target name="mvn-init">
-	    <xmlproperty file="pom.xml" prefix="pom.xml" />
-		<path id="maven-ant-tasks.classpath" path="tools/buildtime/maven/maven-ant-tasks-2.0.7.jar" />
-		<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" 
-			classpathref="maven-ant-tasks.classpath" />
-	</target>	
-	
-  	<!--This target will place the roller-weblogger.war file in a maven repository alongside with its 
-  	    corresponding pom.xml file. Before deploying be sure to check the version tag in the 
-  	    pom_ant_weblogger.xml file.
-  	    For real usage change the repository url to http://www.ibiblio.org/maven2 or some other 
-  	    public repository of your choice. To test deployment localy use somting like file://localhost/xxx -->  
-	<target name="mvn-deploy" depends="build, mvn-init">
-	  <artifact:pom id="maven.project" file="apps/weblogger/pom_ant_weblogger.xml" />
-	  <artifact:deploy file="apps/weblogger/dist/webapp/roller-weblogger.war">
-	  	<remoteRepository url="file://localhost/maven/deploy/test"/>
-	    <pom refid="maven.project"/>
-	  </artifact:deploy>
-	</target>		
+
+    <!-- get the ant maven tasks.  I wish I could understand ant logic so we could run this whenever the jar is missing -->
+    <target name="mvn-get">
+        <mkdir dir="tools/buildtime/maven"/>
+        <get src="http://repo1.maven.org/maven2/org/apache/maven/maven-ant-tasks/2.0.7/maven-ant-tasks-2.0.7.jar" dest="tools/buildtime/maven/maven-ant-tasks-2.0.7.jar"/>
+    </target>
+
+    <target name="mvn-init">
+        <echo>If this fails with a message like '  [typedef] Could not load definitions from resource org/apache/maven/artifact/ant/antlib.xml. It could not be found.' try running mvn-get first.</echo>
+        <xmlproperty file="pom.xml" prefix="pom.xml"/>
+        <path id="maven-ant-tasks.classpath" path="tools/buildtime/maven/maven-ant-tasks-2.0.7.jar"/>
+        <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant"
+                 classpathref="maven-ant-tasks.classpath"/>
+    </target>
+
+    <!--This target will place the roller-weblogger.war file in a maven repository alongside with its
+              corresponding pom.xml file. Before deploying be sure to check the version tag in the
+              pom_ant_weblogger.xml file.
+              For real usage change the repository url to http://www.ibiblio.org/maven2 or some other
+              public repository of your choice. To test deployment localy use somting like file://localhost/xxx -->
+    <target name="mvn-deploy" depends="build, mvn-init">
+        <artifact:install-provider artifactId="wagon-ssh" version="1.0-alpha-5"/>
+        <artifact:pom id="maven.project.weblogger.business.jar" file="apps/weblogger/pom_ant_weblogger_business.xml"/>
+        <artifact:deploy file="apps/weblogger/dist/lib/roller-business.jar">
+            <remoteRepository url="scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository"/>
+            <pom refid="maven.project.weblogger.business.jar"/>
+        </artifact:deploy>
+        <artifact:pom id="maven.project.weblogger.web.jar" file="apps/weblogger/pom_ant_weblogger_web.xml"/>
+        <artifact:deploy file="apps/weblogger/dist/lib/roller-web.jar">
+            <remoteRepository url="scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository"/>
+            <pom refid="maven.project.weblogger.web.jar"/>
+        </artifact:deploy>
+        <artifact:pom id="maven.project.weblogger.war" file="apps/weblogger/pom_ant_weblogger.xml"/>
+        <artifact:deploy file="apps/weblogger/dist/webapp/roller-weblogger.war">
+            <remoteRepository url="scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository"/>
+            <pom refid="maven.project.weblogger.war"/>
+        </artifact:deploy>
+        <artifact:pom id="maven.project.planet.business.jar" file="apps/planet/pom_ant_planet_business.xml"/>
+        <artifact:deploy file="apps/planet/dist/lib/roller-planet-business.jar">
+            <remoteRepository url="scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository"/>
+            <pom refid="maven.project.planet.business.jar"/>
+        </artifact:deploy>
+        <artifact:pom id="maven.project.planet.web.jar" file="apps/planet/pom_ant_planet_web.xml"/>
+        <artifact:deploy file="apps/planet/dist/webapp/roller-planet-web.jar">
+            <remoteRepository url="scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository"/>
+            <pom refid="maven.project.planet.web.jar"/>
+        </artifact:deploy>
+        <artifact:pom id="maven.project.planet.war" file="apps/planet/pom_ant_planet.xml"/>
+        <artifact:deploy file="apps/planet/dist/webapp/roller-planet.war">
+            <remoteRepository url="scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository"/>
+            <pom refid="maven.project.planet.war"/>
+        </artifact:deploy>
+    </target>
+
+    <!-- Install roller-weblogger.war in the local maven repository -->
+    <target name="mvn-install" depends="build, mvn-init">
+        <artifact:pom id="maven.project.weblogger.business.jar" file="apps/weblogger/pom_ant_weblogger_business.xml"/>
+        <artifact:install file="apps/weblogger/dist/lib/roller-business.jar">
+            <pom refid="maven.project.weblogger.business.jar"/>
+        </artifact:install>
+        <artifact:pom id="maven.project.weblogger.web.jar" file="apps/weblogger/pom_ant_weblogger_web.xml"/>
+        <artifact:install file="apps/weblogger/dist/lib/roller-web.jar">
+            <pom refid="maven.project.weblogger.web.jar"/>
+        </artifact:install>
+        <artifact:pom id="maven.project.weblogger.war" file="apps/weblogger/pom_ant_weblogger.xml"/>
+        <artifact:install file="apps/weblogger/dist/webapp/roller-weblogger.war">
+            <pom refid="maven.project.weblogger.war"/>
+        </artifact:install>
+        <artifact:pom id="maven.project.planet.business.jar" file="apps/planet/pom_ant_planet_business.xml"/>
+        <artifact:install file="apps/planet/dist/lib/roller-planet-business.jar">
+            <pom refid="maven.project.planet.business.jar"/>
+        </artifact:install>
+        <artifact:pom id="maven.project.planet.web.jar" file="apps/planet/pom_ant_planet_web.xml"/>
+        <artifact:install file="apps/planet/dist/lib/roller-planet-web.jar">
+            <pom refid="maven.project.planet.web.jar"/>
+        </artifact:install>
+        <artifact:pom id="maven.project.planet.war" file="apps/planet/pom_ant_planet.xml"/>
+        <artifact:install file="apps/planet/dist/webapp/roller-planet.war">
+            <pom refid="maven.project.planet.war"/>
+        </artifact:install>
+    </target>
 
 </project>

Modified: roller/branches/roller_4.1_dev/metadata/database/macros.vm
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/metadata/database/macros.vm?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
Binary files /tmp/tmpT3vabv and /tmp/tmpTNQcZ2 differ

Modified: roller/branches/roller_4.1_dev/sandbox/scripting/groovy/ant.properties
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/sandbox/scripting/groovy/ant.properties?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/sandbox/scripting/groovy/ant.properties (original)
+++ roller/branches/roller_4.1_dev/sandbox/scripting/groovy/ant.properties Sun Nov 25 14:54:17 2007
@@ -1,2 +1,4 @@
-rollersrc.dir=../../..
-groovy.home=/Applications/Java/groovy
\ No newline at end of file
+
+tools.dir=../../../tools
+rollersrc.dir=../../../apps/weblogger
+groovy.home=/Applications/Java/groovy

Modified: roller/branches/roller_4.1_dev/sandbox/scripting/groovy/build.xml
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/sandbox/scripting/groovy/build.xml?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/sandbox/scripting/groovy/build.xml (original)
+++ roller/branches/roller_4.1_dev/sandbox/scripting/groovy/build.xml Sun Nov 25 14:54:17 2007
@@ -6,9 +6,15 @@
         
     <path id="scripting.path">
         <fileset dir="${rollersrc.dir}/build/webapp/WEB-INF/lib">   
-            <include name="roller-web.jar"/>   
+            <include name="roller-core.jar"/>   
             <include name="roller-business.jar"/>   
-            <include name="commons-logging.jar"/>   
+            <include name="roller-web.jar"/>   
+        </fileset>
+        <fileset dir="${tools.dir}/lib">   
+            <include name="commons-logging-1.0.4.jar"/>   
+        </fileset>
+        <fileset dir="${tools.dir}/openjpa-0.9.7">   
+            <include name="openjpa-0.9.7-incubating.jar"/>   
         </fileset>
         <fileset dir="${groovy.home}/lib">
             <include name="groovy-1.0.jar"/>

Modified: roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/checkuser.gy
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/checkuser.gy?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/checkuser.gy (original)
+++ roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/checkuser.gy Sun Nov 25 14:54:17 2007
@@ -21,7 +21,10 @@
     return;
 }
 
+org.apache.roller.weblogger.business.startup.WebloggerStartup.prepare();
+org.apache.roller.weblogger.business.WebloggerFactory.bootstrap();
 roller = org.apache.roller.weblogger.business.WebloggerFactory.getWeblogger();
+
 user = roller.getUserManager().getUserByUserName(args[0]);
 
 if (user == null) {

Modified: roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createblog.gy
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createblog.gy?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createblog.gy (original)
+++ roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createblog.gy Sun Nov 25 14:54:17 2007
@@ -28,6 +28,8 @@
 description = handle;
 theme =       "basic";
 
+org.apache.roller.weblogger.business.startup.WebloggerStartup.prepare();
+org.apache.roller.weblogger.business.WebloggerFactory.bootstrap();
 roller = org.apache.roller.weblogger.business.WebloggerFactory.getWeblogger();
 
 user = roller.getUserManager().getUserByUserName(username);
@@ -35,18 +37,12 @@
     println "ERROR: user ${username} not found";
     System.exit(-1);
 } 
-website = new org.apache.roller.weblogger.pojos.Weblog(
-   handle, 
-   user,
-   blogname,
-   description,
-   user.getEmailAddress(),
-   user.getEmailAddress(),
-   theme,
-   user.getLocale(),
-   user.getTimeZone());
+weblog = new org.apache.roller.weblogger.pojos.Weblog(
+   handle, user, blogname, description,
+   user.getEmailAddress(), user.getEmailAddress(), theme,
+   user.getLocale(), user.getTimeZone());
 try {
-   roller.getUserManager().addWebsite(website);
+   roller.getUserManager().addWebsite(weblog);
    roller.flush();
 } catch (Exception e) {
    e.printStackTrace();

Modified: roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createcomment.gy
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createcomment.gy?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createcomment.gy (original)
+++ roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createcomment.gy Sun Nov 25 14:54:17 2007
@@ -23,6 +23,8 @@
 email =   "test@example.com";
 content = "Testing 1 2 3 <em>Hello World!</em>";
  
+org.apache.roller.weblogger.business.startup.WebloggerStartup.prepare();
+org.apache.roller.weblogger.business.WebloggerFactory.bootstrap();
 roller = org.apache.roller.weblogger.business.WebloggerFactory.getWeblogger();
 
 blog = roller.getUserManager().getWebsiteByHandle(handle);

Modified: roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createentry.gy
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createentry.gy?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createentry.gy (original)
+++ roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createentry.gy Sun Nov 25 14:54:17 2007
@@ -27,7 +27,10 @@
 text =     args[3];
 catpath =  args[4];
  
+org.apache.roller.weblogger.business.startup.WebloggerStartup.prepare();
+org.apache.roller.weblogger.business.WebloggerFactory.bootstrap();
 roller = org.apache.roller.weblogger.business.WebloggerFactory.getWeblogger();
+
 user = roller.getUserManager().getUser(username);
 if (user == null) {
    println "ERROR: user ${username} not found";

Modified: roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createtestdata.gy
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createtestdata.gy?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createtestdata.gy (original)
+++ roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createtestdata.gy Sun Nov 25 14:54:17 2007
@@ -15,10 +15,10 @@
 
     def roller = null;
 
-    def userCount = 30 
+    def userCount = 10 
     def blogCount = 2*userCount
-    def entryCount = 50 
-    def commentCount = 6
+    def entryCount = 10 
+    def commentCount = 3
 
     def users = []
 

Modified: roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createuser.gy
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createuser.gy?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createuser.gy (original)
+++ roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/createuser.gy Sun Nov 25 14:54:17 2007
@@ -39,7 +39,10 @@
 user.setTimeZone(timeZone);
 user.setDateCreated(new java.util.Date());
 
+org.apache.roller.weblogger.business.startup.WebloggerStartup.prepare();
+org.apache.roller.weblogger.business.WebloggerFactory.bootstrap();
 roller = org.apache.roller.weblogger.business.WebloggerFactory.getWeblogger();
+
 roller.getUserManager().addUser(user);
 roller.flush();
 

Modified: roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/groovy
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/groovy?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/groovy (original)
+++ roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/groovy Sun Nov 25 14:54:17 2007
@@ -3,13 +3,13 @@
 # -- ENSURE THESE ARE CORRECT ---
 
 # Directory where Groovy release is installed
-export GROOVY_HOME=/usr/local/groovy
+export GROOVY_HOME=/Applications/Java/groovy
 
 # Directory of Roller webapp context
 export WEBAPP_DIR=../../../../../apps/weblogger/build/webapp
 
 # Directory of additional jars
-export JARS_DIR=/usr/local/tomcat/common/lib
+export JARS_DIR=/Applications/Java/tomcat/common/lib
 
 
 # --- SHOULD NOT NEED TO EDIT BELOW THIS LINE ---

Modified: roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/listusers.gy
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/listusers.gy?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/listusers.gy (original)
+++ roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/listusers.gy Sun Nov 25 14:54:17 2007
@@ -17,7 +17,10 @@
 */
 
 try {
+    org.apache.roller.weblogger.business.startup.WebloggerStartup.prepare();
+    org.apache.roller.weblogger.business.WebloggerFactory.bootstrap();
     roller = org.apache.roller.weblogger.business.WebloggerFactory.getWeblogger();
+    
     users = roller.getUserManager().getUsers(null, null, null, null, 0, -1);
     for (u in users) {
        println "   User [${u.userName}] has password [${u.password}]";

Modified: roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/removeuser.gy
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/removeuser.gy?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/removeuser.gy (original)
+++ roller/branches/roller_4.1_dev/sandbox/scripting/groovy/examples/rollerapi/removeuser.gy Sun Nov 25 14:54:17 2007
@@ -16,10 +16,22 @@
 * directory of this distribution.
 */
 
-username = "scratch";
+if (args.length < 2) {
+    println "USAGE: groovy removeuser.gy <username>"; 
+    return;
+}
 
+username = args[0];
+
+org.apache.roller.weblogger.business.startup.WebloggerStartup.prepare();
+org.apache.roller.weblogger.business.WebloggerFactory.bootstrap();
 roller = org.apache.roller.weblogger.business.WebloggerFactory.getWeblogger();
+
 user = roller.getUserManager().getUserByUserName(username);
+if (user == null) {
+    println "User ${username} not found";
+    return;
+}
 roller.getUserManager().removeUser(user);
 roller.flush();
 

Modified: roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GSPRenderer.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GSPRenderer.java?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GSPRenderer.java (original)
+++ roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GSPRenderer.java Sun Nov 25 14:54:17 2007
@@ -26,9 +26,10 @@
 import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.pojos.Template;
-import org.apache.roller.ui.rendering.Renderer;
-import org.apache.roller.ui.rendering.RenderingException;
+import org.apache.roller.weblogger.pojos.Template;
+import org.apache.roller.weblogger.pojos.WeblogTemplate;
+import org.apache.roller.weblogger.ui.rendering.Renderer;
+import org.apache.roller.weblogger.ui.rendering.RenderingException;
 
 /**
  * Renderer that compiles/executes Roller Template as a Groovy Template.
@@ -45,10 +46,10 @@
 public class GSPRenderer implements Renderer {
     private static Log log = LogFactory.getLog(GroovletRenderer.class);
     private groovy.text.Template groovyTemplate = null;   
-    private Template template = null;
+    private WeblogTemplate template = null;
     private Exception parseException = null;
     
-    public GSPRenderer(TemplateEngine templateEngine, Template template) {
+    public GSPRenderer(TemplateEngine templateEngine, WeblogTemplate template) {
         this.template = template;
         try {
             // TODO: implement caching for compiled templates

Modified: roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GSPRendererFactory.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GSPRendererFactory.java?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GSPRendererFactory.java (original)
+++ roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GSPRendererFactory.java Sun Nov 25 14:54:17 2007
@@ -22,9 +22,10 @@
 import groovy.text.TemplateEngine;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.pojos.Template;
-import org.apache.roller.ui.rendering.Renderer;
-import org.apache.roller.ui.rendering.RendererFactory;
+import org.apache.roller.weblogger.pojos.Template;
+import org.apache.roller.weblogger.pojos.WeblogTemplate;
+import org.apache.roller.weblogger.ui.rendering.Renderer;
+import org.apache.roller.weblogger.ui.rendering.RendererFactory;
 
 /**
  * RendererFactory that handles Groovy Server Page (GSP) style templates 
@@ -39,9 +40,9 @@
         if(template.getTemplateLanguage() == null || template.getId() == null) {
             return null;
         }
-        if("gsp".equals(template.getTemplateLanguage())) {
+        if("gsp".equals(template.getTemplateLanguage()) && template instanceof WeblogTemplate) {
             try {
-                renderer = new GSPRenderer(templateEngine, template); 
+                renderer = new GSPRenderer(templateEngine, (WeblogTemplate)template); 
             } catch(Exception ex) {
                 return null;
             }

Modified: roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GroovletRenderer.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GroovletRenderer.java?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GroovletRenderer.java (original)
+++ roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GroovletRenderer.java Sun Nov 25 14:54:17 2007
@@ -25,9 +25,9 @@
 import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.pojos.Template;
-import org.apache.roller.ui.rendering.Renderer;
-import org.apache.roller.ui.rendering.RenderingException;
+import org.apache.roller.weblogger.pojos.WeblogTemplate;
+import org.apache.roller.weblogger.ui.rendering.Renderer;
+import org.apache.roller.weblogger.ui.rendering.RenderingException;
 
 /**
  * Renderer that evaluates Roller Template as Groovy script.
@@ -44,9 +44,9 @@
  */
 public class GroovletRenderer implements Renderer {
     private static Log log = LogFactory.getLog(GroovletRenderer.class);
-    private Template template = null;
+    private WeblogTemplate template = null;
     
-    public GroovletRenderer(Template template) {
+    public GroovletRenderer(WeblogTemplate template) {
         this.template = template;
     }
     

Modified: roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GroovletRendererFactory.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GroovletRendererFactory.java?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GroovletRendererFactory.java (original)
+++ roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GroovletRendererFactory.java Sun Nov 25 14:54:17 2007
@@ -20,9 +20,10 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.pojos.Template;
-import org.apache.roller.ui.rendering.Renderer;
-import org.apache.roller.ui.rendering.RendererFactory;
+import org.apache.roller.weblogger.pojos.Template;
+import org.apache.roller.weblogger.pojos.WeblogTemplate;
+import org.apache.roller.weblogger.ui.rendering.Renderer;
+import org.apache.roller.weblogger.ui.rendering.RendererFactory;
 
 /**
  * RendererFactory that handles Groovlet-style templates w/language name "groovlet"
@@ -35,9 +36,9 @@
         if(template.getTemplateLanguage() == null || template.getId() == null) {
             return null;
         }        
-        if("groovlet".equals(template.getTemplateLanguage())) {             
+        if("groovlet".equals(template.getTemplateLanguage()) && template instanceof WeblogTemplate) {             
             try {
-               renderer = new GroovletRenderer(template);
+               renderer = new GroovletRenderer((WeblogTemplate)template);
             } catch(Exception ex) {
                 return null;
             }                        

Modified: roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GroovyRollerBinding.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GroovyRollerBinding.java?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GroovyRollerBinding.java (original)
+++ roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GroovyRollerBinding.java Sun Nov 25 14:54:17 2007
@@ -25,7 +25,7 @@
 import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.roller.ui.rendering.model.UtilitiesModel;
+import org.apache.roller.weblogger.ui.rendering.model.UtilitiesModel;
 
 /**
  * Binds Roller model objects along with Groovlet and GSP style "out" and "html" variables.

Modified: roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GroovyRunner.java
URL: http://svn.apache.org/viewvc/roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GroovyRunner.java?rev=598076&r1=598075&r2=598076&view=diff
==============================================================================
--- roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GroovyRunner.java (original)
+++ roller/branches/roller_4.1_dev/sandbox/scripting/groovy/src/org/apache/roller/scripting/GroovyRunner.java Sun Nov 25 14:54:17 2007
@@ -23,7 +23,7 @@
 
 import java.io.File;
 import groovy.lang.*;
-import org.apache.roller.util.*;
+import org.apache.roller.weblogger.util.*;
 
 /**
  * Setup Roller classloader and run a Groovy script



Mime
View raw message