diff --git a/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ItemImageAttachment.java b/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ItemImageAttachment.java index 1156a1615..fa9a93149 100755 --- a/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ItemImageAttachment.java +++ b/ccm-cms-assets-imagestep/src/com/arsdigita/cms/contentassets/ItemImageAttachment.java @@ -168,16 +168,16 @@ public class ItemImageAttachment extends ACSObject implements CustomCopy { * Automatically publish an unpublished image */ public boolean copyProperty(final CustomCopy source, - final Property property, - final ItemCopier copier) { + final Property property, + final ItemCopier copier) { String attribute = property.getName(); if (ItemCopier.VERSION_COPY == copier.getCopyType() - && IMAGE.equals(attribute)) { + && IMAGE.equals(attribute)) { ItemImageAttachment attachment = (ItemImageAttachment) source; ReusableImageAsset image = attachment.getImage(); ReusableImageAsset liveImage = - (ReusableImageAsset) image.getLiveVersion(); + (ReusableImageAsset) image.getLiveVersion(); if (null == liveImage) { liveImage = (ReusableImageAsset) image.createLiveVersion(); @@ -210,7 +210,7 @@ public class ItemImageAttachment extends ACSObject implements CustomCopy { // when we delete the link, the image still references it in DB // can't make it composite because then image is deleted if we delete // link. Have to set link to null first (I think) - DomainObject link = DomainObjectFactory.newInstance((DataObject) get(IMAGE_LINK)); + DomainObject link = DomainObjectFactory.newInstance((DataObject)get(IMAGE_LINK)); set(IMAGE_LINK, null); save(); link.delete(); diff --git a/ccm-core/pdl/com/arsdigita/kernel/Package.pdl b/ccm-core/pdl/com/arsdigita/kernel/Package.pdl index 6abb62bd7..8da307ee4 100755 --- a/ccm-core/pdl/com/arsdigita/kernel/Package.pdl +++ b/ccm-core/pdl/com/arsdigita/kernel/Package.pdl @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// $Id: Package.pdl 287 2005-02-22 00:29:02Z sskracic $ +// $Id: Package.pdl 2141 2011-01-16 12:17:15Z pboy $ // $DateTime: 2004/08/16 18:10:38 $ model com.arsdigita.kernel; diff --git a/ccm-core/pdl/com/arsdigita/kernel/SiteNode.pdl b/ccm-core/pdl/com/arsdigita/kernel/SiteNode.pdl index 689071f5b..79febec12 100755 --- a/ccm-core/pdl/com/arsdigita/kernel/SiteNode.pdl +++ b/ccm-core/pdl/com/arsdigita/kernel/SiteNode.pdl @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// $Id: SiteNode.pdl 287 2005-02-22 00:29:02Z sskracic $ +// $Id: SiteNode.pdl 2141 2011-01-16 12:17:15Z pboy $ // $DateTime: 2004/08/16 18:10:38 $ model com.arsdigita.kernel; @@ -24,7 +24,7 @@ model com.arsdigita.kernel; // A "site node" is a node in a URL hierarchy that can be mapped // to an application instance. // -// @version "$Id: SiteNode.pdl 287 2005-02-22 00:29:02Z sskracic $" +// @version "$Id: SiteNode.pdl 2141 2011-01-16 12:17:15Z pboy $" // object type SiteNode extends ACSObject { diff --git a/ccm-core/pdl/com/arsdigita/ui/admin/Admin.pdl b/ccm-core/pdl/com/arsdigita/ui/admin/Admin.pdl index 565b13ec0..99b954532 100755 --- a/ccm-core/pdl/com/arsdigita/ui/admin/Admin.pdl +++ b/ccm-core/pdl/com/arsdigita/ui/admin/Admin.pdl @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// $Id: Admin.pdl 1230 2006-06-22 11:50:59Z apevec $ +// $Id: Admin.pdl 2284 2012-03-11 01:37:17Z pboy $ // $DateTime: 2004/08/16 18:10:38 $ model com.arsdigita.ui.admin; diff --git a/ccm-core/pdl/com/arsdigita/ui/permissions/Permissions.pdl b/ccm-core/pdl/com/arsdigita/ui/permissions/Permissions.pdl index 772e10319..ff3c7987b 100755 --- a/ccm-core/pdl/com/arsdigita/ui/permissions/Permissions.pdl +++ b/ccm-core/pdl/com/arsdigita/ui/permissions/Permissions.pdl @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// $Id: Permissions.pdl 287 2005-02-22 00:29:02Z sskracic $ +// $Id: Permissions.pdl 2284 2012-03-11 01:37:17Z pboy $ // $DateTime: 2004/08/16 18:10:38 $ model com.arsdigita.ui.permissions; diff --git a/ccm-core/pdl/com/arsdigita/ui/sitemap/SiteMap.pdl b/ccm-core/pdl/com/arsdigita/ui/sitemap/SiteMap.pdl index bd28aff4e..56bcaadf4 100755 --- a/ccm-core/pdl/com/arsdigita/ui/sitemap/SiteMap.pdl +++ b/ccm-core/pdl/com/arsdigita/ui/sitemap/SiteMap.pdl @@ -15,7 +15,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// $Id: SiteMap.pdl 287 2005-02-22 00:29:02Z sskracic $ +// $Id: SiteMap.pdl 2284 2012-03-11 01:37:17Z pboy $ // $DateTime: 2004/08/16 18:10:38 $ model com.arsdigita.ui.sitemap; diff --git a/ccm-core/pdl/com/arsdigita/web/WebApp.pdl b/ccm-core/pdl/com/arsdigita/web/WebApp.pdl index f55a94243..562375546 100755 --- a/ccm-core/pdl/com/arsdigita/web/WebApp.pdl +++ b/ccm-core/pdl/com/arsdigita/web/WebApp.pdl @@ -15,14 +15,14 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// $Id: WebApp.pdl 287 2005-02-22 00:29:02Z sskracic $ +// $Id: WebApp.pdl 2190 2011-06-20 22:26:12Z pboy $ // $DateTime: 2004/08/16 18:10:38 $ model com.arsdigita.web; // Subject to change. // // @author Justin Ross (justin@arsdigita.com) -// @version $Id: WebApp.pdl 287 2005-02-22 00:29:02Z sskracic $ +// @version $Id: WebApp.pdl 2190 2011-06-20 22:26:12Z pboy $ // Class WebApp seems to be quit unfinisched work and is commented out. // So we need no table for it. diff --git a/ccm-core/sql/ccm-core/oracle-se-create.sql b/ccm-core/sql/ccm-core/oracle-se-create.sql index 1655a848e..7cbfb727e 100755 --- a/ccm-core/sql/ccm-core/oracle-se-create.sql +++ b/ccm-core/sql/ccm-core/oracle-se-create.sql @@ -15,7 +15,7 @@ -- License along with this library; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- --- $Id: oracle-se-create.sql 2070 2010-01-28 08:47:41Z pboy $ +-- $Id: oracle-se-create.sql 2141 2011-01-16 12:17:15Z pboy $ -- $DateTime: 2004/08/16 18:10:38 $ @@ oracle-se/function-currentDate.sql diff --git a/ccm-core/sql/ccm-core/postgres-create.sql b/ccm-core/sql/ccm-core/postgres-create.sql index 287dbc0cd..aed35dc2e 100755 --- a/ccm-core/sql/ccm-core/postgres-create.sql +++ b/ccm-core/sql/ccm-core/postgres-create.sql @@ -15,7 +15,7 @@ -- License along with this library; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- --- $Id: postgres-create.sql 1704 2008-06-08 14:45:43Z pboy $ +-- $Id: postgres-create.sql 2141 2011-01-16 12:17:15Z pboy $ -- $DateTime: 2004/08/16 18:10:38 $ begin; diff --git a/ccm-core/src/com/arsdigita/auditing/Audited.java b/ccm-core/src/com/arsdigita/auditing/Audited.java index d1e2cf0bf..920936409 100755 --- a/ccm-core/src/com/arsdigita/auditing/Audited.java +++ b/ccm-core/src/com/arsdigita/auditing/Audited.java @@ -29,7 +29,7 @@ import java.util.Date; * * @author Joseph Bank * @version 1.0 - * @version $Id: Audited.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: Audited.java 2089 2010-04-17 07:55:43Z pboy $ **/ public interface Audited { diff --git a/ccm-core/src/com/arsdigita/auditing/AuditedACSObject.java b/ccm-core/src/com/arsdigita/auditing/AuditedACSObject.java index 23d553cce..535093097 100755 --- a/ccm-core/src/com/arsdigita/auditing/AuditedACSObject.java +++ b/ccm-core/src/com/arsdigita/auditing/AuditedACSObject.java @@ -39,7 +39,7 @@ import java.util.Date; * * @author Joseph Bank * @version 1.0 - * @version $Id: AuditedACSObject.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: AuditedACSObject.java 2089 2010-04-17 07:55:43Z pboy $ */ public abstract class AuditedACSObject extends ACSObject implements Audited { diff --git a/ccm-core/src/com/arsdigita/auditing/AuditingObserver.java b/ccm-core/src/com/arsdigita/auditing/AuditingObserver.java index 2b981fd6d..3d219ebf4 100755 --- a/ccm-core/src/com/arsdigita/auditing/AuditingObserver.java +++ b/ccm-core/src/com/arsdigita/auditing/AuditingObserver.java @@ -35,7 +35,7 @@ import org.apache.log4j.Logger; * * @author Joseph Bank * @version 1.0 - * @version $Id: AuditingObserver.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: AuditingObserver.java 2089 2010-04-17 07:55:43Z pboy $ */ public class AuditingObserver implements DomainObjectObserver { diff --git a/ccm-core/src/com/arsdigita/auditing/BasicAuditTrail.java b/ccm-core/src/com/arsdigita/auditing/BasicAuditTrail.java index 75110ac7f..394ad588c 100755 --- a/ccm-core/src/com/arsdigita/auditing/BasicAuditTrail.java +++ b/ccm-core/src/com/arsdigita/auditing/BasicAuditTrail.java @@ -39,7 +39,7 @@ import org.apache.log4j.Logger; * * @author Joseph Bank * @version 1.0 - * @version $Id: BasicAuditTrail.java 1547 2007-03-29 14:24:57Z chrisgilbert23 $ + * @version $Id: BasicAuditTrail.java 2089 2010-04-17 07:55:43Z pboy $ **/ public class BasicAuditTrail extends DomainObject implements Audited { diff --git a/ccm-core/src/com/arsdigita/auditing/WebAuditingSaveInfo.java b/ccm-core/src/com/arsdigita/auditing/WebAuditingSaveInfo.java index 4dd2b8d16..2712c302a 100755 --- a/ccm-core/src/com/arsdigita/auditing/WebAuditingSaveInfo.java +++ b/ccm-core/src/com/arsdigita/auditing/WebAuditingSaveInfo.java @@ -32,7 +32,7 @@ import org.apache.log4j.Logger; * * @author Joseph Bank * @version 1.0 - * @version $Id: WebAuditingSaveInfo.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: WebAuditingSaveInfo.java 2089 2010-04-17 07:55:43Z pboy $ **/ public class WebAuditingSaveInfo implements AuditingSaveInfo { diff --git a/ccm-core/src/com/arsdigita/bebop/demo/AutoDispatcher.java b/ccm-core/src/com/arsdigita/bebop/demo/AutoDispatcher.java index 60058285b..17532d820 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/AutoDispatcher.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/AutoDispatcher.java @@ -33,7 +33,7 @@ import org.apache.log4j.Logger; * A dispatcher that looks for "buildPage*" methods, invokes them, * and constructs an index page with links automatically. * - * @version $Id: AutoDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: AutoDispatcher.java 2089 2010-04-17 07:55:43Z pboy $ */ public class AutoDispatcher extends BebopMapDispatcher { diff --git a/ccm-core/src/com/arsdigita/bebop/demo/BebopDispatcher.java b/ccm-core/src/com/arsdigita/bebop/demo/BebopDispatcher.java index 0a5cf685f..3db27e4ac 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/BebopDispatcher.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/BebopDispatcher.java @@ -34,7 +34,7 @@ import javax.servlet.http.HttpServletResponse; * Serves one page on all urls, notifying visitors about the merging * of demo-bebop into bebop-demo. * - * @version $Id: BebopDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: BebopDispatcher.java 2089 2010-04-17 07:55:43Z pboy $ */ public class BebopDispatcher implements Dispatcher { diff --git a/ccm-core/src/com/arsdigita/bebop/demo/DemoDispatcher.java b/ccm-core/src/com/arsdigita/bebop/demo/DemoDispatcher.java index 7898e64d7..cfb951c06 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/DemoDispatcher.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/DemoDispatcher.java @@ -110,7 +110,7 @@ class Foo extends Label implements PrintListener { * Demonstration dispatcher class. Shows how you would build pages to * display dynamic data from the database using Bebop components. * - * @version $Id: DemoDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: DemoDispatcher.java 2089 2010-04-17 07:55:43Z pboy $ */ public class DemoDispatcher extends AutoDispatcher implements BebopConstants { diff --git a/ccm-core/src/com/arsdigita/bebop/demo/workflow/AddProcess.java b/ccm-core/src/com/arsdigita/bebop/demo/workflow/AddProcess.java index 8aa8ff069..264e646c5 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/workflow/AddProcess.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/workflow/AddProcess.java @@ -40,7 +40,7 @@ import com.arsdigita.bebop.util.GlobalizationUtil; /** * - * @version $Id: AddProcess.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: AddProcess.java 2089 2010-04-17 07:55:43Z pboy $ */ public class AddProcess extends Form implements FormProcessListener, FormInitListener, diff --git a/ccm-core/src/com/arsdigita/bebop/demo/workflow/AddTask.java b/ccm-core/src/com/arsdigita/bebop/demo/workflow/AddTask.java index 10bef12c5..7b4e48ef5 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/workflow/AddTask.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/workflow/AddTask.java @@ -49,7 +49,7 @@ import java.util.TooManyListenersException; /** * - * @version $Id: AddTask.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: AddTask.java 2089 2010-04-17 07:55:43Z pboy $ */ public class AddTask extends Form implements FormProcessListener, FormSubmissionListener { diff --git a/ccm-core/src/com/arsdigita/bebop/demo/workflow/AdminPane.java b/ccm-core/src/com/arsdigita/bebop/demo/workflow/AdminPane.java index 1c9d337c1..2c4f2efef 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/workflow/AdminPane.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/workflow/AdminPane.java @@ -31,7 +31,7 @@ import com.arsdigita.bebop.util.GlobalizationUtil; /** * - * @version $Id: AdminPane.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: AdminPane.java 2089 2010-04-17 07:55:43Z pboy $ */ public class AdminPane extends SimpleContainer implements ActionListener { diff --git a/ccm-core/src/com/arsdigita/bebop/demo/workflow/DisplayTask.java b/ccm-core/src/com/arsdigita/bebop/demo/workflow/DisplayTask.java index 5c549adfa..a1af01a06 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/workflow/DisplayTask.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/workflow/DisplayTask.java @@ -49,7 +49,7 @@ import java.util.TooManyListenersException; /** * - * @version $Id: DisplayTask.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: DisplayTask.java 2089 2010-04-17 07:55:43Z pboy $ */ public class DisplayTask extends Form implements FormProcessListener, FormSubmissionListener { diff --git a/ccm-core/src/com/arsdigita/bebop/demo/workflow/Listing.java b/ccm-core/src/com/arsdigita/bebop/demo/workflow/Listing.java index 6cceffbb8..54c611ed6 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/workflow/Listing.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/workflow/Listing.java @@ -35,7 +35,7 @@ import java.util.NoSuchElementException; /** * - * @version $Id: Listing.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: Listing.java 2089 2010-04-17 07:55:43Z pboy $ */ public class Listing extends BoxPanel implements ChangeListener, ActionListener { diff --git a/ccm-core/src/com/arsdigita/bebop/demo/workflow/Process.java b/ccm-core/src/com/arsdigita/bebop/demo/workflow/Process.java index 03abe9925..b589a2220 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/workflow/Process.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/workflow/Process.java @@ -33,7 +33,7 @@ import java.util.ArrayList; * load. * * @author David Lutterkort - * @version $Id: Process.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: Process.java 2089 2010-04-17 07:55:43Z pboy $ */ public class Process { diff --git a/ccm-core/src/com/arsdigita/bebop/demo/workflow/ProcessDisplay.java b/ccm-core/src/com/arsdigita/bebop/demo/workflow/ProcessDisplay.java index ac13030c6..6b96b9330 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/workflow/ProcessDisplay.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/workflow/ProcessDisplay.java @@ -45,7 +45,7 @@ import java.util.Iterator; * * @author Uday Mathur * @author David Lutterkort - * @version $Id: ProcessDisplay.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ProcessDisplay.java 2089 2010-04-17 07:55:43Z pboy $ */ public class ProcessDisplay extends BoxPanel implements ActionListener, ChangeListener, TableActionListener { diff --git a/ccm-core/src/com/arsdigita/bebop/demo/workflow/SampleProcesses.java b/ccm-core/src/com/arsdigita/bebop/demo/workflow/SampleProcesses.java index a957aeec9..4438716fb 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/workflow/SampleProcesses.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/workflow/SampleProcesses.java @@ -34,7 +34,7 @@ import org.apache.log4j.Logger; * load. * * @author David Lutterkort - * @version $Id: SampleProcesses.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: SampleProcesses.java 2167 2011-06-19 21:12:12Z pboy $ */ public class SampleProcesses { diff --git a/ccm-core/src/com/arsdigita/bebop/demo/workflow/Task.java b/ccm-core/src/com/arsdigita/bebop/demo/workflow/Task.java index 3e1515f2c..74eb73de2 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/workflow/Task.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/workflow/Task.java @@ -34,7 +34,7 @@ import java.util.Iterator; * load. * * @author David Lutterkort - * @version $Id: Task.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: Task.java 2089 2010-04-17 07:55:43Z pboy $ */ public class Task { diff --git a/ccm-core/src/com/arsdigita/bebop/event/ActionEvent.java b/ccm-core/src/com/arsdigita/bebop/event/ActionEvent.java index 164bc4716..28e7e089b 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/ActionEvent.java +++ b/ccm-core/src/com/arsdigita/bebop/event/ActionEvent.java @@ -32,7 +32,7 @@ import com.arsdigita.bebop.PageState; * * @author David Lutterkort * - * @version $Id: ActionEvent.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ActionEvent.java 2089 2010-04-17 07:55:43Z pboy $ */ public class ActionEvent extends PageEvent { diff --git a/ccm-core/src/com/arsdigita/bebop/event/ActionListener.java b/ccm-core/src/com/arsdigita/bebop/event/ActionListener.java index 969a29cb4..9012c8e41 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/ActionListener.java +++ b/ccm-core/src/com/arsdigita/bebop/event/ActionListener.java @@ -32,7 +32,7 @@ import java.util.EventListener; * * @author David Lutterkort * - * @version $Id: ActionListener.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: ActionListener.java 2089 2010-04-17 07:55:43Z pboy $ */ public interface ActionListener extends EventListener { diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineCheckboxGroup.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineCheckboxGroup.java index c86e07c44..f5c7e6f3a 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineCheckboxGroup.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineCheckboxGroup.java @@ -30,7 +30,7 @@ import com.arsdigita.bebop.form.OptionGroup; * </define:checkboxGroup> * * - * @version $Id: DefineCheckboxGroup.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: DefineCheckboxGroup.java 2089 2010-04-17 07:55:43Z pboy $ */ public class DefineCheckboxGroup extends DefineOptionGroup { diff --git a/ccm-core/src/com/arsdigita/bebop/page/BebopApplicationServlet.java b/ccm-core/src/com/arsdigita/bebop/page/BebopApplicationServlet.java index 38a1ca88b..7c37b622b 100755 --- a/ccm-core/src/com/arsdigita/bebop/page/BebopApplicationServlet.java +++ b/ccm-core/src/com/arsdigita/bebop/page/BebopApplicationServlet.java @@ -60,7 +60,7 @@ import org.apache.log4j.Logger; * @author Justin Ross <jross@redhat.com> * @author chris gilbert - allow BebopApplicationServlet pages to disable * client/middleware - * @version $Id: BebopApplicationServlet.java 1372 2006-11-13 09:22:54Z chrisgilbert23 $ + * @version $Id: BebopApplicationServlet.java 2292 2012-04-22 15:42:43Z pboy $ */ public class BebopApplicationServlet extends BaseApplicationServlet { diff --git a/ccm-core/src/com/arsdigita/bebop/page/BebopMapDispatcher.java b/ccm-core/src/com/arsdigita/bebop/page/BebopMapDispatcher.java index a281d362e..7b8fa562d 100755 --- a/ccm-core/src/com/arsdigita/bebop/page/BebopMapDispatcher.java +++ b/ccm-core/src/com/arsdigita/bebop/page/BebopMapDispatcher.java @@ -42,7 +42,7 @@ import org.xml.sax.helpers.DefaultHandler; * to be coded with a specific map or to override the map lookup for certain * sets of URLs. * - * @version $Id: BebopMapDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: BebopMapDispatcher.java 2284 2012-03-11 01:37:17Z pboy $ */ public class BebopMapDispatcher extends MapDispatcher { diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/DateInRangeValidationListener.java b/ccm-core/src/com/arsdigita/bebop/parameters/DateInRangeValidationListener.java index 98df5c470..099523170 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/DateInRangeValidationListener.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/DateInRangeValidationListener.java @@ -33,7 +33,7 @@ import com.arsdigita.bebop.event.ParameterEvent; * @author Uday Mathur * @author Stas Freidin * @author Rory Solomon - * @version $Id: DateInRangeValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: DateInRangeValidationListener.java 2089 2010-04-17 07:55:43Z pboy $ */ public class DateInRangeValidationListener implements ParameterListener { diff --git a/ccm-docmgr/src/com/arsdigita/cms/docmgr/Initializer.java b/ccm-docmgr/src/com/arsdigita/cms/docmgr/Initializer.java index 6ce9c37c1..43e0b0974 100755 --- a/ccm-docmgr/src/com/arsdigita/cms/docmgr/Initializer.java +++ b/ccm-docmgr/src/com/arsdigita/cms/docmgr/Initializer.java @@ -17,8 +17,6 @@ package com.arsdigita.cms.docmgr; import org.apache.log4j.Logger; -// import com.arsdigita.cms.docmgr.ui.CategoryDocsNavigatorPortlet; -// import com.arsdigita.cms.docmgr.ui.LegacyCategoryDocsNavigatorPortlet; import com.arsdigita.cms.docmgr.ui.RecentUpdatedDocsPortlet; import com.arsdigita.domain.DomainObject; import com.arsdigita.domain.DomainObjectFactory; @@ -26,12 +24,8 @@ import com.arsdigita.kernel.ACSObjectInstantiator; import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.TransactionContext; -// import com.arsdigita.portal.PortletType; -// import com.arsdigita.portal.apportlet.AppPortletSetup; import com.arsdigita.runtime.CompoundInitializer; import com.arsdigita.runtime.DomainInitEvent; -// import com.arsdigita.web.ApplicationSetup; -// import com.arsdigita.web.ApplicationType; /** diff --git a/ccm-ldn-aplaws/bundles/custom/cfg/project.xml b/ccm-ldn-aplaws/bundles/custom/cfg/project.xml index c4ba11bb4..54fb689b6 100755 --- a/ccm-ldn-aplaws/bundles/custom/cfg/project.xml +++ b/ccm-ldn-aplaws/bundles/custom/cfg/project.xml @@ -11,7 +11,7 @@ prettyName="APLAWS plus Custom Spin" version="2-0-0" release="custom-beta-1-r2234" - webxml="web.xml-aplaws" + webxml="web.xml" webapp="ROOT" xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd"> diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java index 4f5d01024..348653ef2 100755 --- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java +++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java @@ -60,7 +60,7 @@ import org.apache.log4j.Logger; * configuration files and adds jsp templates to navigation. * * @author Justin Ross <jross@redhat.com> - * @version $Id: Loader.java 2223 2011-08-01 07:33:57Z pboy $ + * @version $Id: Loader.java 2255 2011-11-17 08:46:40Z pboy $ */ public class Loader extends PackageLoader { diff --git a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/Initializer.java b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/Initializer.java index 1bd50ad00..881510a40 100755 --- a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/Initializer.java +++ b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/Initializer.java @@ -35,7 +35,7 @@ import org.apache.log4j.Logger; * Initializes ccm-simplesurvey at each system startup. * * @author Justin Ross <jross@redhat.com> - * @version $Id: Initializer.java 759 2005-09-02 15:25:32Z sskracic $ + * @version $Id: Initializer.java 2297 2012-05-01 07:57:05Z pboy $ */ public class Initializer extends CompoundInitializer { diff --git a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/Loader.java b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/Loader.java index 44b0d8355..e9ec9a2a4 100755 --- a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/Loader.java +++ b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/Loader.java @@ -36,7 +36,7 @@ import org.apache.log4j.Logger; * application type in database. * * @author Justin Ross <jross@redhat.com> - * @version $Id: Loader.java 759 2005-09-02 15:25:32Z sskracic $ + * @version $Id: Loader.java 2297 2012-05-01 07:57:05Z pboy $ */ public class Loader extends PackageLoader { diff --git a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ResponseCollection.java b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ResponseCollection.java index 3146be7b9..0204e9074 100755 --- a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ResponseCollection.java +++ b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ResponseCollection.java @@ -28,7 +28,7 @@ import com.arsdigita.util.Assert; * * @see Survey * @author Justin Ross - * @version $Id: ResponseCollection.java 755 2005-09-02 13:42:47Z sskracic $ + * @version $Id: ResponseCollection.java 1940 2009-05-29 07:15:05Z terry $ */ public class ResponseCollection extends DomainCollection { diff --git a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/Survey.java b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/Survey.java index 57603a569..32ff3b0c1 100755 --- a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/Survey.java +++ b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/Survey.java @@ -43,7 +43,7 @@ import java.util.Date; * the main domain object of the Simple Survey application. * * @author Peter Marklund - * @version $Id: Survey.java 755 2005-09-02 13:42:47Z sskracic $ + * @version $Id: Survey.java 2286 2012-03-11 09:14:14Z pboy $ */ public class Survey extends ACSObject { diff --git a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/SurveyCollection.java b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/SurveyCollection.java index 8209ab21c..04e06104e 100755 --- a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/SurveyCollection.java +++ b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/SurveyCollection.java @@ -28,7 +28,7 @@ import com.arsdigita.util.Assert; * * @see Survey * @author Justin Ross - * @version $Id: SurveyCollection.java 755 2005-09-02 13:42:47Z sskracic $ + * @version $Id: SurveyCollection.java 1940 2009-05-29 07:15:05Z terry $ */ public class SurveyCollection extends DomainCollection { diff --git a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/ConfirmationPanel.java b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/ConfirmationPanel.java index c2148b4eb..40b8890dc 100755 --- a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/ConfirmationPanel.java +++ b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/ConfirmationPanel.java @@ -26,7 +26,7 @@ import com.arsdigita.ui.UI; * A page confirming that a survey response has been submitted. * * @author Peter Marklund - * @version $Id: ConfirmationPanel.java 755 2005-09-02 13:42:47Z sskracic $ + * @version $Id: ConfirmationPanel.java 2164 2011-06-19 20:31:22Z pboy $ */ public class ConfirmationPanel extends SimpleSurveyPanel { diff --git a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/SimpleSurveyPanel.java b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/SimpleSurveyPanel.java index d7d1a7500..a671341d2 100755 --- a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/SimpleSurveyPanel.java +++ b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/SimpleSurveyPanel.java @@ -42,7 +42,7 @@ import javax.servlet.http.HttpServletRequest; * The Page class that all pages in the Simple Survey application extend. * * @author Peter Marklund - * @version $Id: SimpleSurveyPanel.java 755 2005-09-02 13:42:47Z sskracic $ + * @version $Id: SimpleSurveyPanel.java 2286 2012-03-11 09:14:14Z pboy $ */ public abstract class SimpleSurveyPanel extends SimpleContainer { diff --git a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/SurveyTable.java b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/SurveyTable.java index be0c60268..38494784c 100755 --- a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/SurveyTable.java +++ b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/SurveyTable.java @@ -50,7 +50,7 @@ import com.arsdigita.bebop.PageState; * Tables all Simple Surveys in the system. * * @author Peter Marklund - * @version $Id: SurveyTable.java 755 2005-09-02 13:42:47Z sskracic $ + * @version $Id: SurveyTable.java 2286 2012-03-11 09:14:14Z pboy $ */ public class SurveyTable extends Table { diff --git a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/admin/AdminSurveyTable.java b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/admin/AdminSurveyTable.java index edb29e379..81a41271b 100755 --- a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/admin/AdminSurveyTable.java +++ b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/admin/AdminSurveyTable.java @@ -52,7 +52,7 @@ import com.arsdigita.util.LockableImpl; * Tables all Simple Surveys in the system. * * @author Peter Marklund - * @version $Id: AdminSurveyTable.java 755 2005-09-02 13:42:47Z sskracic $ + * @version $Id: AdminSurveyTable.java 2286 2012-03-11 09:14:14Z pboy $ */ public class AdminSurveyTable extends Table { diff --git a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/admin/AdminSurveyTableModel.java b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/admin/AdminSurveyTableModel.java index e33b76d24..5c1d2f5f3 100755 --- a/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/admin/AdminSurveyTableModel.java +++ b/ccm-simplesurvey/src/com/arsdigita/simplesurvey/ui/admin/AdminSurveyTableModel.java @@ -35,7 +35,7 @@ import com.arsdigita.util.Assert; * * * @author Peter Marklund - * @version $Id: AdminSurveyTableModel.java 755 2005-09-02 13:42:47Z sskracic $ + * @version $Id: AdminSurveyTableModel.java 2099 2010-04-17 15:35:14Z pboy $ */ public class AdminSurveyTableModel implements TableModel {