Kleinere Anpassungen durch Abgleich mit APLAWS svn.

git-svn-id: https://svn.libreccm.org/ccm/trunk@1645 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2012-05-05 10:48:29 +00:00
parent 37a0b45da5
commit bd190c911c
45 changed files with 50 additions and 56 deletions

View File

@ -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();

View File

@ -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;

View File

@ -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 {

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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.

View File

@ -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

View File

@ -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;

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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,

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -30,7 +30,7 @@ import com.arsdigita.bebop.form.OptionGroup;
* </define:checkboxGroup>
* </pre>
*
* @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 {

View File

@ -60,7 +60,7 @@ import org.apache.log4j.Logger;
* @author Justin Ross &lt;jross@redhat.com&gt;
* @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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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;
/**

View File

@ -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">

View File

@ -60,7 +60,7 @@ import org.apache.log4j.Logger;
* configuration files and adds jsp templates to navigation.
*
* @author Justin Ross &lt;jross@redhat.com&gt;
* @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 {

View File

@ -35,7 +35,7 @@ import org.apache.log4j.Logger;
* Initializes ccm-simplesurvey at each system startup.
*
* @author Justin Ross &lt;jross@redhat.com&gt;
* @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 {

View File

@ -36,7 +36,7 @@ import org.apache.log4j.Logger;
* application type in database.
*
* @author Justin Ross &lt;jross@redhat.com&gt;
* @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 {

View File

@ -28,7 +28,7 @@ import com.arsdigita.util.Assert;
*
* @see Survey
* @author <a href="mailto:justin@arsdigita.com">Justin Ross</a>
* @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 {

View File

@ -43,7 +43,7 @@ import java.util.Date;
* the main domain object of the Simple Survey application.
*
* @author <a href="mailto:pmarklun@arsdigita.com">Peter Marklund</a>
* @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 {

View File

@ -28,7 +28,7 @@ import com.arsdigita.util.Assert;
*
* @see Survey
* @author <a href="mailto:justin@arsdigita.com">Justin Ross</a>
* @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 {

View File

@ -26,7 +26,7 @@ import com.arsdigita.ui.UI;
* A page confirming that a survey response has been submitted.
*
* @author <a href="mailto:pmarklun@arsdigita.com">Peter Marklund</a>
* @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 {

View File

@ -42,7 +42,7 @@ import javax.servlet.http.HttpServletRequest;
* The Page class that all pages in the Simple Survey application extend.
*
* @author <a href="mailto:pmarklun@arsdigita.com">Peter Marklund</a>
* @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 {

View File

@ -50,7 +50,7 @@ import com.arsdigita.bebop.PageState;
* Tables all Simple Surveys in the system.
*
* @author <a href="mailto:pmarklun@arsdigita.com">Peter Marklund</a>
* @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 {

View File

@ -52,7 +52,7 @@ import com.arsdigita.util.LockableImpl;
* Tables all Simple Surveys in the system.
*
* @author <a href="mailto:pmarklun@arsdigita.com">Peter Marklund</a>
* @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 {

View File

@ -35,7 +35,7 @@ import com.arsdigita.util.Assert;
*
*
* @author <a href="mailto:pmarklun@arsdigita.com">Peter Marklund</a>
* @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 {